From 3201509ea7a9db60c48298f89683f84271c9faff Mon Sep 17 00:00:00 2001
From: Livvy Mackintosh <livvy@base.nu>
Date: Fri, 27 Oct 2017 15:35:31 +0100
Subject: [PATCH] Add new gettext messages to support/locale

---
 support/locale/en_GB/LC_MESSAGES/django.po | 299 ++++++++++++++++-----
 support/locale/es/LC_MESSAGES/django.po    | 282 ++++++++++++++-----
 support/locale/fr/LC_MESSAGES/django.po    | 290 +++++++++++++++-----
 3 files changed, 682 insertions(+), 189 deletions(-)

diff --git a/support/locale/en_GB/LC_MESSAGES/django.po b/support/locale/en_GB/LC_MESSAGES/django.po
index d119cf1..d2fbf79 100644
--- a/support/locale/en_GB/LC_MESSAGES/django.po
+++ b/support/locale/en_GB/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-11 21:16+0000\n"
+"POT-Creation-Date: 2017-10-27 14:34+0000\n"
 "PO-Revision-Date: 2017-10-08 20:18+0000\n"
 "Last-Translator: Livvy Mackintosh <livvy@base.nu>\n"
 "Language-Team: English (United Kingdom) <http://translate.ojuso.org/projects/"
@@ -131,64 +131,150 @@ msgstr "Under Construction"
 msgid "Projected Project"
 msgstr "Projected Project"
 
-#: apps/map/models.py:91
+#: apps/map/models.py:65
+msgid "Wind energy"
+msgstr ""
+
+#: apps/map/models.py:66 apps/map/models.py:70
+msgid "Small-scale (less than 500kW)"
+msgstr ""
+
+#: apps/map/models.py:67 apps/map/models.py:71
+msgid "Large-scale (more than 500kW)"
+msgstr ""
+
+#: apps/map/models.py:69
+msgid "Photovoltaic electricity"
+msgstr ""
+
+#: apps/map/models.py:73
+msgid "Hydroelectric"
+msgstr ""
+
+#: apps/map/models.py:74
+msgid "Small-scale (less than 1MW)"
+msgstr ""
+
+#: apps/map/models.py:75
+msgid "Medium-scale (between 1-20MW)"
+msgstr ""
+
+#: apps/map/models.py:76
+msgid "Large-scale (more than 20MW - often not considered renewable)"
+msgstr ""
+
+#: apps/map/models.py:78
+msgid "Solar thermal electricity (e.g using parabolic reflectors)"
+msgstr ""
+
+#: apps/map/models.py:79
+msgid "Geothermal electricity"
+msgstr ""
+
+#: apps/map/models.py:80
+msgid "Biogas turbine"
+msgstr ""
+
+#: apps/map/models.py:81
+msgid "Other biomass (including liquid/solid biofuel)"
+msgstr ""
+
+#: apps/map/models.py:82
+msgid "Other (tidal, wave etc)"
+msgstr ""
+
+#: apps/map/models.py:86
+msgid "Power transmission (grid lines, substations etc)"
+msgstr ""
+
+#: apps/map/models.py:87
+msgid "Energy storage (pumped storage, compressed air, battery systems etc"
+msgstr ""
+
+#: apps/map/models.py:88
+#, fuzzy
+#| msgid "Other"
+msgid "Others"
+msgstr "Other"
+
+#: apps/map/models.py:122
 msgid "Entry Name"
 msgstr "Entry Name"
 
-#: apps/map/models.py:92
+#: apps/map/models.py:123
 msgid ""
 "Enter the name of the entry. This should usually be the                   "
 "name of project."
 msgstr ""
 "Enter the name of the entry. This should usually be the name of the project."
 
-#: apps/map/models.py:102
+#: apps/map/models.py:130
+#, fuzzy
+#| msgid "Projected Project"
+msgid "Project location"
+msgstr "Projected Project"
+
+#: apps/map/models.py:131
+msgid ""
+"Place a marker using the tools on the left of the map. Zoom in as far as you "
+"can so the placement                     is accurate (important)"
+msgstr ""
+
+#: apps/map/models.py:137
 msgid "Sector of economy"
 msgstr "Sector of economy"
 
-#: apps/map/models.py:103
+#: apps/map/models.py:138
 msgid ""
 "Which sector of the renewable energy economy is most                    "
 "relevant?"
 msgstr "Which sector of the renewable energy economy is most relevant?"
 
-#: apps/map/models.py:111
+#: apps/map/models.py:146
 msgid "Positive or negative?"
 msgstr "Positive or negative?"
 
-#: apps/map/models.py:112
+#: apps/map/models.py:147
 msgid "Is the case study a positive case or a negative case?"
 msgstr "Is the case study a positive case or a negative case?"
 
-#: apps/map/models.py:122 apps/map/templates/map/detail.html:88
+#: apps/map/models.py:154
+msgid "Country field"
+msgstr ""
+
+#: apps/map/models.py:155
+msgid "Select the country of the project"
+msgstr ""
+
+#: apps/map/models.py:160 apps/map/templates/map/detail.html:88
 msgid "Approximate land area"
 msgstr "Approximate land area"
 
-#: apps/map/models.py:123
+#: apps/map/models.py:161
 msgid "The area of land covered by the project (in km²)"
 msgstr "The area of land covered by the project (in km²)"
 
-#: apps/map/models.py:128
+#: apps/map/models.py:166
 msgid "Land ownership"
 msgstr "Land ownership"
 
-#: apps/map/models.py:129
+#: apps/map/models.py:167
 msgid "What type of ownership does the land fall under?"
 msgstr "What type of ownership does the land fall under?"
 
-#: apps/map/models.py:136
+#: apps/map/models.py:174
 msgid "Land ownership details"
 msgstr "Land ownership details"
 
-#: apps/map/models.py:137
+#: apps/map/models.py:175
 msgid "Please specify details about land ownership if you chose 'other'"
 msgstr ""
 
-#: apps/map/models.py:145
+#: apps/map/models.py:183
 msgid "Location"
 msgstr "Location"
 
-#: apps/map/models.py:146
+#: apps/map/models.py:184
 msgid ""
 "Select the context that is most applicable to this case                    "
 "study."
@@ -196,37 +282,37 @@ msgstr ""
 "Select the context that is most applicable to this case                    "
 "study."
 
-#: apps/map/models.py:154
+#: apps/map/models.py:192
 msgid "Type of ecosystem"
 msgstr "Type of ecosystem"
 
-#: apps/map/models.py:155
+#: apps/map/models.py:193
 msgid "Select the most relevant type of ecosystem."
 msgstr "Select the most relevant type of ecosystem."
 
-#: apps/map/models.py:162
+#: apps/map/models.py:200
 msgid "Describe the ecosystem"
 msgstr "Describe the ecosystem"
 
-#: apps/map/models.py:163
+#: apps/map/models.py:201
 msgid "In your own words, add more detail about the ecosystem."
 msgstr "In your own words, add more detail about the ecosystem."
 
-#: apps/map/models.py:169
+#: apps/map/models.py:207
 msgid "Affects indigenous people?"
 msgstr "Affects indigenous people?"
 
-#: apps/map/models.py:170
+#: apps/map/models.py:208
 #, fuzzy
 #| msgid "Does the project affect indigenous people?"
 msgid "Does the project affect indigenous communities?"
 msgstr "Does the project affect indigenous people?"
 
-#: apps/map/models.py:175
+#: apps/map/models.py:213
 msgid "Affects Indigenous - Details"
 msgstr "Affects Indigenous - Details"
 
-#: apps/map/models.py:176
+#: apps/map/models.py:214
 msgid ""
 "What group of indigenous people does the community belong                    "
 "to?"
@@ -234,39 +320,39 @@ msgstr ""
 "What group of indigenous people does the community belong                    "
 "to?"
 
-#: apps/map/models.py:183
+#: apps/map/models.py:221
 msgid "Status of Project"
 msgstr "Status of Project"
 
-#: apps/map/models.py:184
+#: apps/map/models.py:222
 msgid "What is the status of the current project?"
 msgstr "What is the status of the current project?"
 
-#: apps/map/models.py:191
+#: apps/map/models.py:229
 msgid "Start year"
 msgstr ""
 
-#: apps/map/models.py:192
+#: apps/map/models.py:230
 msgid ""
 "Select the year the project was started.                     If the project "
 "hasn't begun, select the projected start year."
 msgstr ""
 
-#: apps/map/models.py:202
+#: apps/map/models.py:240
 msgid "Completion year"
 msgstr ""
 
-#: apps/map/models.py:203
+#: apps/map/models.py:241
 msgid ""
 "Select the year the project was completed.                     If the "
 "project hasn't finished, select the projected completion year."
 msgstr ""
 
-#: apps/map/models.py:213
+#: apps/map/models.py:251
 msgid "Synopsis"
 msgstr "Synopsis"
 
-#: apps/map/models.py:214
+#: apps/map/models.py:252
 msgid ""
 "Briefly describe the project. This will be displayed at                    "
 "the top of the case study page. Maximum 500 chars (about                     "
@@ -276,11 +362,11 @@ msgstr ""
 "the top of the case study page. Maximum 500 chars (about                     "
 "3½ tweets)"
 
-#: apps/map/models.py:222 apps/map/templates/map/detail.html:53
+#: apps/map/models.py:260 apps/map/templates/map/detail.html:53
 msgid "Full Description"
 msgstr "Full Description"
 
-#: apps/map/models.py:223
+#: apps/map/models.py:261
 msgid ""
 "Describe the project in full. Separate paragraphs with a                    "
 "new line Please add as much detail as you feel is "
@@ -290,99 +376,99 @@ msgstr ""
 "new line Please add as much detail as you feel is "
 "necessary                    here."
 
-#: apps/map/models.py:230
+#: apps/map/models.py:268
 msgid "Project and facility owners"
 msgstr ""
 
-#: apps/map/models.py:231
+#: apps/map/models.py:269
 msgid ""
 "List companies or organisations that own the project and/or facilities. "
 "Separate with a comma."
 msgstr ""
 
-#: apps/map/models.py:240
+#: apps/map/models.py:278
 msgid "Shareholders of the project owners"
 msgstr ""
 
-#: apps/map/models.py:241
+#: apps/map/models.py:279
 msgid ""
 "List shareholders of the project owners you've just listed. Separate with a "
 "comma."
 msgstr ""
 
-#: apps/map/models.py:250
+#: apps/map/models.py:288
 msgid "Financial institutions"
 msgstr ""
 
-#: apps/map/models.py:251
+#: apps/map/models.py:289
 msgid ""
 "List banks and other financial institutions that have or are considering "
 "extending loans                      or guarantees to the project. Separate "
 "with a comma."
 msgstr ""
 
-#: apps/map/models.py:261
+#: apps/map/models.py:299
 msgid "Energy consumers"
 msgstr ""
 
-#: apps/map/models.py:262
+#: apps/map/models.py:300
 msgid ""
 "List any wholesale energy customers that take energy from the development. E."
 "g. 'national                     grids' or private energy suppliers."
 msgstr ""
 
-#: apps/map/models.py:272
+#: apps/map/models.py:310
 msgid "Image"
 msgstr "Image"
 
-#: apps/map/models.py:277
+#: apps/map/models.py:315
 msgid "Image caption"
 msgstr ""
 
-#: apps/map/models.py:285
+#: apps/map/models.py:323
 msgid "Image credit(s)"
 msgstr ""
 
-#: apps/map/models.py:293
-msgid "Video"
-msgstr "Video"
+#: apps/map/models.py:331
+msgid "YouTube Video"
+msgstr ""
 
-#: apps/map/models.py:294
+#: apps/map/models.py:332
 msgid ""
 "Copy the URL to a related YouTube™ video that relates to the case study."
 msgstr ""
 
-#: apps/map/models.py:301
+#: apps/map/models.py:339
 #, fuzzy
 #| msgid "Location"
 msgid "Video caption"
 msgstr "Location"
 
-#: apps/map/models.py:309
+#: apps/map/models.py:347
 msgid "Video credit(s)"
 msgstr ""
 
-#: apps/map/models.py:316
+#: apps/map/models.py:354
 msgid "Links to media reports"
 msgstr ""
 
-#: apps/map/models.py:317
+#: apps/map/models.py:355
 msgid "Provide any links to mainstream media coverage."
 msgstr ""
 
-#: apps/map/models.py:325
+#: apps/map/models.py:363
 msgid "Independent grassroots reports"
 msgstr ""
 
-#: apps/map/models.py:326
+#: apps/map/models.py:364
 msgid "Provide any links to grassroots/independent media coverage."
 msgstr ""
 
-#: apps/map/models.py:334 apps/map/templates/map/detail.html:68
+#: apps/map/models.py:372 apps/map/templates/map/detail.html:68
 msgid "Community Voices"
 msgstr "Community Voices"
 
-#: apps/map/models.py:335
+#: apps/map/models.py:373
 #, fuzzy
 #| msgid ""
 #| "Add any direct quotes from members of the community that                  "
@@ -394,25 +480,105 @@ msgstr ""
 "Add any direct quotes from members of the community that                  "
 "relate to this project"
 
-#: apps/map/models.py:341
+#: apps/map/models.py:379
 msgid "Reports of direct communications"
 msgstr ""
 
-#: apps/map/models.py:342
+#: apps/map/models.py:380
 msgid ""
 "Add any reports of direct communication between community members "
 "and                     representatives of developers/companies/investors."
 msgstr ""
 
-#: apps/map/models.py:351
+#: apps/map/models.py:389
 msgid "Social media links"
 msgstr ""
 
-#: apps/map/models.py:352
+#: apps/map/models.py:390
 msgid ""
 "Add any links to social media accounts directly relating to the project."
 msgstr ""
 
+#: apps/map/models.py:403
+msgid "Generation technology"
+msgstr ""
+
+#: apps/map/models.py:404
+#, fuzzy
+#| msgid ""
+#| "Select the context that is most applicable to this "
+#| "case                    study."
+msgid ""
+"Select the type of renewable energy generation that most applies to this "
+"case study."
+msgstr ""
+"Select the context that is most applicable to this case                    "
+"study."
+
+#: apps/map/models.py:415
+msgid "Generation technology detail"
+msgstr ""
+
+#: apps/map/models.py:416
+msgid ""
+"If you selected biogas or biomass, please describe the feedstock (where the "
+"fuel came from e.g.                    corn, algae, anaerobic digestion, "
+"commercial waste etc)"
+msgstr ""
+
+#: apps/map/models.py:426
+msgid "Other generation type"
+msgstr ""
+
+#: apps/map/models.py:427
+msgid ""
+"If you selected other, please specify the generation technology (e.g. tidal, "
+"wave etc)"
+msgstr ""
+
+#: apps/map/models.py:436
+msgid "Total generation capacity (in kW)"
+msgstr ""
+
+#: apps/map/models.py:437
+msgid "Please enter the total generation capacity of the project in kW"
+msgstr ""
+
+#: apps/map/models.py:447
+msgid "Total investment (in USD)"
+msgstr ""
+
+#: apps/map/models.py:448
+msgid "The approximate total investment for the project in USD."
+msgstr ""
+
+#: apps/map/models.py:456
+msgid "Additional technical or economic details"
+msgstr ""
+
+#: apps/map/models.py:457
+msgid ""
+"Specify any additional technical or economic details relating to the project."
+msgstr ""
+
+#: apps/map/models.py:467
+msgid "Power technology"
+msgstr ""
+
+#: apps/map/models.py:468
+#, fuzzy
+#| msgid "Select the most relevant type of ecosystem."
+msgid "Select the related energy technology."
+msgstr "Select the most relevant type of ecosystem."
+
+#: apps/map/models.py:477
+msgid "Other power technology"
+msgstr ""
+
+#: apps/map/models.py:478
+msgid "If you answered 'others', please specify the power technologies."
+msgstr ""
+
 #: apps/map/templates/map/detail.html:20
 msgid "Back to Map"
 msgstr "Back to Map"
@@ -479,17 +645,21 @@ msgstr "French"
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ojusomap/templates/base.html:35
+#: ojusomap/templates/base.html:31
+msgid "Toggle navigation"
+msgstr ""
+
+#: ojusomap/templates/base.html:37
 msgid "Map"
 msgstr ""
 
-#: ojusomap/templates/base.html:47 ojusomap/templates/registration/login.html:7
+#: ojusomap/templates/base.html:59 ojusomap/templates/registration/login.html:7
 #: ojusomap/templates/registration/login.html:12
 #: ojusomap/templates/registration/login.html:21
 msgid "Login"
 msgstr "Login"
 
-#: ojusomap/templates/base.html:48
+#: ojusomap/templates/base.html:60
 #: ojusomap/templates/registration/registration_form.html:20
 msgid "Register"
 msgstr ""
@@ -574,6 +744,9 @@ msgstr ""
 msgid "Create your account and get active!"
 msgstr ""
 
+#~ msgid "Video"
+#~ msgstr "Video"
+
 #~ msgid ""
 #~ "Add any details and other remarks about the land                    "
 #~ "ownership"
diff --git a/support/locale/es/LC_MESSAGES/django.po b/support/locale/es/LC_MESSAGES/django.po
index 6161b21..dbb6761 100644
--- a/support/locale/es/LC_MESSAGES/django.po
+++ b/support/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-11 21:16+0000\n"
+"POT-Creation-Date: 2017-10-27 14:34+0000\n"
 "PO-Revision-Date: 2017-09-22 15:06+0000\n"
 "Last-Translator: Tom Wragg <tom@ojuso.org>\n"
 "Language-Team: Spanish <http://translate.ojuso.org/projects/platform/map/es/"
@@ -131,267 +131,421 @@ msgstr ""
 msgid "Projected Project"
 msgstr ""
 
-#: apps/map/models.py:91
+#: apps/map/models.py:65
+msgid "Wind energy"
+msgstr ""
+
+#: apps/map/models.py:66 apps/map/models.py:70
+msgid "Small-scale (less than 500kW)"
+msgstr ""
+
+#: apps/map/models.py:67 apps/map/models.py:71
+msgid "Large-scale (more than 500kW)"
+msgstr ""
+
+#: apps/map/models.py:69
+msgid "Photovoltaic electricity"
+msgstr ""
+
+#: apps/map/models.py:73
+msgid "Hydroelectric"
+msgstr ""
+
+#: apps/map/models.py:74
+msgid "Small-scale (less than 1MW)"
+msgstr ""
+
+#: apps/map/models.py:75
+msgid "Medium-scale (between 1-20MW)"
+msgstr ""
+
+#: apps/map/models.py:76
+msgid "Large-scale (more than 20MW - often not considered renewable)"
+msgstr ""
+
+#: apps/map/models.py:78
+msgid "Solar thermal electricity (e.g using parabolic reflectors)"
+msgstr ""
+
+#: apps/map/models.py:79
+msgid "Geothermal electricity"
+msgstr ""
+
+#: apps/map/models.py:80
+msgid "Biogas turbine"
+msgstr ""
+
+#: apps/map/models.py:81
+msgid "Other biomass (including liquid/solid biofuel)"
+msgstr ""
+
+#: apps/map/models.py:82
+msgid "Other (tidal, wave etc)"
+msgstr ""
+
+#: apps/map/models.py:86
+msgid "Power transmission (grid lines, substations etc)"
+msgstr ""
+
+#: apps/map/models.py:87
+msgid "Energy storage (pumped storage, compressed air, battery systems etc"
+msgstr ""
+
+#: apps/map/models.py:88
+msgid "Others"
+msgstr ""
+
+#: apps/map/models.py:122
 msgid "Entry Name"
 msgstr ""
 
-#: apps/map/models.py:92
+#: apps/map/models.py:123
 msgid ""
 "Enter the name of the entry. This should usually be the                   "
 "name of project."
 msgstr ""
 
-#: apps/map/models.py:102
+#: apps/map/models.py:130
+msgid "Project location"
+msgstr ""
+
+#: apps/map/models.py:131
+msgid ""
+"Place a marker using the tools on the left of the map. Zoom in as far as you "
+"can so the placement                     is accurate (important)"
+msgstr ""
+
+#: apps/map/models.py:137
 msgid "Sector of economy"
 msgstr ""
 
-#: apps/map/models.py:103
+#: apps/map/models.py:138
 msgid ""
 "Which sector of the renewable energy economy is most                    "
 "relevant?"
 msgstr ""
 
-#: apps/map/models.py:111
+#: apps/map/models.py:146
 msgid "Positive or negative?"
 msgstr ""
 
-#: apps/map/models.py:112
+#: apps/map/models.py:147
 msgid "Is the case study a positive case or a negative case?"
 msgstr ""
 
-#: apps/map/models.py:122 apps/map/templates/map/detail.html:88
+#: apps/map/models.py:154
+msgid "Country field"
+msgstr ""
+
+#: apps/map/models.py:155
+msgid "Select the country of the project"
+msgstr ""
+
+#: apps/map/models.py:160 apps/map/templates/map/detail.html:88
 msgid "Approximate land area"
 msgstr ""
 
-#: apps/map/models.py:123
+#: apps/map/models.py:161
 msgid "The area of land covered by the project (in km²)"
 msgstr ""
 
-#: apps/map/models.py:128
+#: apps/map/models.py:166
 msgid "Land ownership"
 msgstr ""
 
-#: apps/map/models.py:129
+#: apps/map/models.py:167
 msgid "What type of ownership does the land fall under?"
 msgstr ""
 
-#: apps/map/models.py:136
+#: apps/map/models.py:174
 msgid "Land ownership details"
 msgstr ""
 
-#: apps/map/models.py:137
+#: apps/map/models.py:175
 msgid "Please specify details about land ownership if you chose 'other'"
 msgstr ""
 
-#: apps/map/models.py:145
+#: apps/map/models.py:183
 msgid "Location"
 msgstr ""
 
-#: apps/map/models.py:146
+#: apps/map/models.py:184
 msgid ""
 "Select the context that is most applicable to this case                    "
 "study."
 msgstr ""
 
-#: apps/map/models.py:154
+#: apps/map/models.py:192
 msgid "Type of ecosystem"
 msgstr ""
 
-#: apps/map/models.py:155
+#: apps/map/models.py:193
 msgid "Select the most relevant type of ecosystem."
 msgstr ""
 
-#: apps/map/models.py:162
+#: apps/map/models.py:200
 msgid "Describe the ecosystem"
 msgstr ""
 
-#: apps/map/models.py:163
+#: apps/map/models.py:201
 msgid "In your own words, add more detail about the ecosystem."
 msgstr ""
 
-#: apps/map/models.py:169
+#: apps/map/models.py:207
 msgid "Affects indigenous people?"
 msgstr ""
 
-#: apps/map/models.py:170
+#: apps/map/models.py:208
 msgid "Does the project affect indigenous communities?"
 msgstr ""
 
-#: apps/map/models.py:175
+#: apps/map/models.py:213
 msgid "Affects Indigenous - Details"
 msgstr ""
 
-#: apps/map/models.py:176
+#: apps/map/models.py:214
 msgid ""
 "What group of indigenous people does the community belong                    "
 "to?"
 msgstr ""
 
-#: apps/map/models.py:183
+#: apps/map/models.py:221
 msgid "Status of Project"
 msgstr ""
 
-#: apps/map/models.py:184
+#: apps/map/models.py:222
 msgid "What is the status of the current project?"
 msgstr ""
 
-#: apps/map/models.py:191
+#: apps/map/models.py:229
 msgid "Start year"
 msgstr ""
 
-#: apps/map/models.py:192
+#: apps/map/models.py:230
 msgid ""
 "Select the year the project was started.                     If the project "
 "hasn't begun, select the projected start year."
 msgstr ""
 
-#: apps/map/models.py:202
+#: apps/map/models.py:240
 msgid "Completion year"
 msgstr ""
 
-#: apps/map/models.py:203
+#: apps/map/models.py:241
 msgid ""
 "Select the year the project was completed.                     If the "
 "project hasn't finished, select the projected completion year."
 msgstr ""
 
-#: apps/map/models.py:213
+#: apps/map/models.py:251
 msgid "Synopsis"
 msgstr ""
 
-#: apps/map/models.py:214
+#: apps/map/models.py:252
 msgid ""
 "Briefly describe the project. This will be displayed at                    "
 "the top of the case study page. Maximum 500 chars (about                     "
 "3½ tweets)"
 msgstr ""
 
-#: apps/map/models.py:222 apps/map/templates/map/detail.html:53
+#: apps/map/models.py:260 apps/map/templates/map/detail.html:53
 msgid "Full Description"
 msgstr ""
 
-#: apps/map/models.py:223
+#: apps/map/models.py:261
 msgid ""
 "Describe the project in full. Separate paragraphs with a                    "
 "new line Please add as much detail as you feel is "
 "necessary                    here."
 msgstr ""
 
-#: apps/map/models.py:230
+#: apps/map/models.py:268
 msgid "Project and facility owners"
 msgstr ""
 
-#: apps/map/models.py:231
+#: apps/map/models.py:269
 msgid ""
 "List companies or organisations that own the project and/or facilities. "
 "Separate with a comma."
 msgstr ""
 
-#: apps/map/models.py:240
+#: apps/map/models.py:278
 msgid "Shareholders of the project owners"
 msgstr ""
 
-#: apps/map/models.py:241
+#: apps/map/models.py:279
 msgid ""
 "List shareholders of the project owners you've just listed. Separate with a "
 "comma."
 msgstr ""
 
-#: apps/map/models.py:250
+#: apps/map/models.py:288
 msgid "Financial institutions"
 msgstr ""
 
-#: apps/map/models.py:251
+#: apps/map/models.py:289
 msgid ""
 "List banks and other financial institutions that have or are considering "
 "extending loans                      or guarantees to the project. Separate "
 "with a comma."
 msgstr ""
 
-#: apps/map/models.py:261
+#: apps/map/models.py:299
 msgid "Energy consumers"
 msgstr ""
 
-#: apps/map/models.py:262
+#: apps/map/models.py:300
 msgid ""
 "List any wholesale energy customers that take energy from the development. E."
 "g. 'national                     grids' or private energy suppliers."
 msgstr ""
 
-#: apps/map/models.py:272
+#: apps/map/models.py:310
 msgid "Image"
 msgstr ""
 
-#: apps/map/models.py:277
+#: apps/map/models.py:315
 msgid "Image caption"
 msgstr ""
 
-#: apps/map/models.py:285
+#: apps/map/models.py:323
 msgid "Image credit(s)"
 msgstr ""
 
-#: apps/map/models.py:293
-msgid "Video"
+#: apps/map/models.py:331
+msgid "YouTube Video"
 msgstr ""
 
-#: apps/map/models.py:294
+#: apps/map/models.py:332
 msgid ""
 "Copy the URL to a related YouTube™ video that relates to the case study."
 msgstr ""
 
-#: apps/map/models.py:301
+#: apps/map/models.py:339
 msgid "Video caption"
 msgstr ""
 
-#: apps/map/models.py:309
+#: apps/map/models.py:347
 msgid "Video credit(s)"
 msgstr ""
 
-#: apps/map/models.py:316
+#: apps/map/models.py:354
 msgid "Links to media reports"
 msgstr ""
 
-#: apps/map/models.py:317
+#: apps/map/models.py:355
 msgid "Provide any links to mainstream media coverage."
 msgstr ""
 
-#: apps/map/models.py:325
+#: apps/map/models.py:363
 msgid "Independent grassroots reports"
 msgstr ""
 
-#: apps/map/models.py:326
+#: apps/map/models.py:364
 msgid "Provide any links to grassroots/independent media coverage."
 msgstr ""
 
-#: apps/map/models.py:334 apps/map/templates/map/detail.html:68
+#: apps/map/models.py:372 apps/map/templates/map/detail.html:68
 msgid "Community Voices"
 msgstr ""
 
-#: apps/map/models.py:335
+#: apps/map/models.py:373
 msgid ""
 "Add any direct quotes from members of the community that                   "
 "relate to this project"
 msgstr ""
 
-#: apps/map/models.py:341
+#: apps/map/models.py:379
 msgid "Reports of direct communications"
 msgstr ""
 
-#: apps/map/models.py:342
+#: apps/map/models.py:380
 msgid ""
 "Add any reports of direct communication between community members "
 "and                     representatives of developers/companies/investors."
 msgstr ""
 
-#: apps/map/models.py:351
+#: apps/map/models.py:389
 msgid "Social media links"
 msgstr ""
 
-#: apps/map/models.py:352
+#: apps/map/models.py:390
 msgid ""
 "Add any links to social media accounts directly relating to the project."
 msgstr ""
 
+#: apps/map/models.py:403
+msgid "Generation technology"
+msgstr ""
+
+#: apps/map/models.py:404
+msgid ""
+"Select the type of renewable energy generation that most applies to this "
+"case study."
+msgstr ""
+
+#: apps/map/models.py:415
+msgid "Generation technology detail"
+msgstr ""
+
+#: apps/map/models.py:416
+msgid ""
+"If you selected biogas or biomass, please describe the feedstock (where the "
+"fuel came from e.g.                    corn, algae, anaerobic digestion, "
+"commercial waste etc)"
+msgstr ""
+
+#: apps/map/models.py:426
+msgid "Other generation type"
+msgstr ""
+
+#: apps/map/models.py:427
+msgid ""
+"If you selected other, please specify the generation technology (e.g. tidal, "
+"wave etc)"
+msgstr ""
+
+#: apps/map/models.py:436
+msgid "Total generation capacity (in kW)"
+msgstr ""
+
+#: apps/map/models.py:437
+msgid "Please enter the total generation capacity of the project in kW"
+msgstr ""
+
+#: apps/map/models.py:447
+msgid "Total investment (in USD)"
+msgstr ""
+
+#: apps/map/models.py:448
+msgid "The approximate total investment for the project in USD."
+msgstr ""
+
+#: apps/map/models.py:456
+msgid "Additional technical or economic details"
+msgstr ""
+
+#: apps/map/models.py:457
+msgid ""
+"Specify any additional technical or economic details relating to the project."
+msgstr ""
+
+#: apps/map/models.py:467
+msgid "Power technology"
+msgstr ""
+
+#: apps/map/models.py:468
+msgid "Select the related energy technology."
+msgstr ""
+
+#: apps/map/models.py:477
+msgid "Other power technology"
+msgstr ""
+
+#: apps/map/models.py:478
+msgid "If you answered 'others', please specify the power technologies."
+msgstr ""
+
 #: apps/map/templates/map/detail.html:20
 msgid "Back to Map"
 msgstr ""
@@ -455,17 +609,21 @@ msgstr ""
 msgid "Spanish"
 msgstr ""
 
-#: ojusomap/templates/base.html:35
+#: ojusomap/templates/base.html:31
+msgid "Toggle navigation"
+msgstr ""
+
+#: ojusomap/templates/base.html:37
 msgid "Map"
 msgstr ""
 
-#: ojusomap/templates/base.html:47 ojusomap/templates/registration/login.html:7
+#: ojusomap/templates/base.html:59 ojusomap/templates/registration/login.html:7
 #: ojusomap/templates/registration/login.html:12
 #: ojusomap/templates/registration/login.html:21
 msgid "Login"
 msgstr ""
 
-#: ojusomap/templates/base.html:48
+#: ojusomap/templates/base.html:60
 #: ojusomap/templates/registration/registration_form.html:20
 msgid "Register"
 msgstr ""
diff --git a/support/locale/fr/LC_MESSAGES/django.po b/support/locale/fr/LC_MESSAGES/django.po
index 3caa2c0..25aa3cd 100644
--- a/support/locale/fr/LC_MESSAGES/django.po
+++ b/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-08 19:45+0000\n"
+"POT-Creation-Date: 2017-10-27 14:34+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"
@@ -131,269 +131,427 @@ msgstr "Sous construction"
 msgid "Projected Project"
 msgstr "Projet Projeté"
 
-#: apps/map/models.py:91
+#: apps/map/models.py:65
+msgid "Wind energy"
+msgstr ""
+
+#: apps/map/models.py:66 apps/map/models.py:70
+msgid "Small-scale (less than 500kW)"
+msgstr ""
+
+#: apps/map/models.py:67 apps/map/models.py:71
+msgid "Large-scale (more than 500kW)"
+msgstr ""
+
+#: apps/map/models.py:69
+msgid "Photovoltaic electricity"
+msgstr ""
+
+#: apps/map/models.py:73
+msgid "Hydroelectric"
+msgstr ""
+
+#: apps/map/models.py:74
+msgid "Small-scale (less than 1MW)"
+msgstr ""
+
+#: apps/map/models.py:75
+msgid "Medium-scale (between 1-20MW)"
+msgstr ""
+
+#: apps/map/models.py:76
+msgid "Large-scale (more than 20MW - often not considered renewable)"
+msgstr ""
+
+#: apps/map/models.py:78
+msgid "Solar thermal electricity (e.g using parabolic reflectors)"
+msgstr ""
+
+#: apps/map/models.py:79
+msgid "Geothermal electricity"
+msgstr ""
+
+#: apps/map/models.py:80
+msgid "Biogas turbine"
+msgstr ""
+
+#: apps/map/models.py:81
+msgid "Other biomass (including liquid/solid biofuel)"
+msgstr ""
+
+#: apps/map/models.py:82
+msgid "Other (tidal, wave etc)"
+msgstr ""
+
+#: apps/map/models.py:86
+msgid "Power transmission (grid lines, substations etc)"
+msgstr ""
+
+#: apps/map/models.py:87
+msgid "Energy storage (pumped storage, compressed air, battery systems etc"
+msgstr ""
+
+#: apps/map/models.py:88
+#, fuzzy
+#| msgid "Other"
+msgid "Others"
+msgstr "Autre"
+
+#: apps/map/models.py:122
 msgid "Entry Name"
 msgstr "Nom d'entrée"
 
-#: apps/map/models.py:92
+#: apps/map/models.py:123
 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
+#: apps/map/models.py:130
+#, fuzzy
+#| msgid "Projected Project"
+msgid "Project location"
+msgstr "Projet Projeté"
+
+#: apps/map/models.py:131
+msgid ""
+"Place a marker using the tools on the left of the map. Zoom in as far as you "
+"can so the placement                     is accurate (important)"
+msgstr ""
+
+#: apps/map/models.py:137
 msgid "Sector of economy"
 msgstr "Secteur d'économie"
 
-#: apps/map/models.py:103
+#: apps/map/models.py:138
 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
+#: apps/map/models.py:146
 msgid "Positive or negative?"
 msgstr "Positif ou négatif?"
 
-#: apps/map/models.py:112
+#: apps/map/models.py:147
 msgid "Is the case study a positive case or a negative case?"
 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
+#: apps/map/models.py:154
+msgid "Country field"
+msgstr ""
+
+#: apps/map/models.py:155
+msgid "Select the country of the project"
+msgstr ""
+
+#: apps/map/models.py:160 apps/map/templates/map/detail.html:88
 msgid "Approximate land area"
 msgstr "Superficie approximative"
 
-#: apps/map/models.py:123
+#: apps/map/models.py:161
 msgid "The area of land covered by the project (in km²)"
 msgstr "La superficie de terrain couverte par le projet (en km²)"
 
-#: apps/map/models.py:128
+#: apps/map/models.py:166
 msgid "Land ownership"
 msgstr "Propriété foncière"
 
-#: apps/map/models.py:129
+#: apps/map/models.py:167
 msgid "What type of ownership does the land fall under?"
 msgstr ""
 
-#: apps/map/models.py:136
+#: apps/map/models.py:174
 msgid "Land ownership details"
 msgstr ""
 
-#: apps/map/models.py:137
+#: apps/map/models.py:175
 msgid "Please specify details about land ownership if you chose 'other'"
 msgstr ""
 
-#: apps/map/models.py:145
+#: apps/map/models.py:183
 msgid "Location"
 msgstr ""
 
-#: apps/map/models.py:146
+#: apps/map/models.py:184
 msgid ""
 "Select the context that is most applicable to this case                    "
 "study."
 msgstr ""
 
-#: apps/map/models.py:154
+#: apps/map/models.py:192
 msgid "Type of ecosystem"
 msgstr ""
 
-#: apps/map/models.py:155
+#: apps/map/models.py:193
 msgid "Select the most relevant type of ecosystem."
 msgstr ""
 
-#: apps/map/models.py:162
+#: apps/map/models.py:200
 msgid "Describe the ecosystem"
 msgstr ""
 
-#: apps/map/models.py:163
+#: apps/map/models.py:201
 msgid "In your own words, add more detail about the ecosystem."
 msgstr ""
 
-#: apps/map/models.py:169
+#: apps/map/models.py:207
 msgid "Affects indigenous people?"
 msgstr ""
 
-#: apps/map/models.py:170
+#: apps/map/models.py:208
 msgid "Does the project affect indigenous communities?"
 msgstr ""
 
-#: apps/map/models.py:175
+#: apps/map/models.py:213
 msgid "Affects Indigenous - Details"
 msgstr ""
 
-#: apps/map/models.py:176
+#: apps/map/models.py:214
 msgid ""
 "What group of indigenous people does the community belong                    "
 "to?"
 msgstr ""
 
-#: apps/map/models.py:183
+#: apps/map/models.py:221
 msgid "Status of Project"
 msgstr ""
 
-#: apps/map/models.py:184
+#: apps/map/models.py:222
 msgid "What is the status of the current project?"
 msgstr ""
 
-#: apps/map/models.py:191
+#: apps/map/models.py:229
 msgid "Start year"
 msgstr ""
 
-#: apps/map/models.py:192
+#: apps/map/models.py:230
 msgid ""
 "Select the year the project was started.                     If the project "
 "hasn't begun, select the projected start year."
 msgstr ""
 
-#: apps/map/models.py:202
+#: apps/map/models.py:240
 msgid "Completion year"
 msgstr ""
 
-#: apps/map/models.py:203
+#: apps/map/models.py:241
 msgid ""
 "Select the year the project was completed.                     If the "
 "project hasn't finished, select the projected completion year."
 msgstr ""
 
-#: apps/map/models.py:213
+#: apps/map/models.py:251
 msgid "Synopsis"
 msgstr ""
 
-#: apps/map/models.py:214
+#: apps/map/models.py:252
 msgid ""
 "Briefly describe the project. This will be displayed at                    "
 "the top of the case study page. Maximum 500 chars (about                     "
 "3½ tweets)"
 msgstr ""
 
-#: apps/map/models.py:222 apps/map/templates/map/detail.html:53
+#: apps/map/models.py:260 apps/map/templates/map/detail.html:53
 msgid "Full Description"
 msgstr ""
 
-#: apps/map/models.py:223
+#: apps/map/models.py:261
 msgid ""
 "Describe the project in full. Separate paragraphs with a                    "
 "new line Please add as much detail as you feel is "
 "necessary                    here."
 msgstr ""
 
-#: apps/map/models.py:230
+#: apps/map/models.py:268
 msgid "Project and facility owners"
 msgstr ""
 
-#: apps/map/models.py:231
+#: apps/map/models.py:269
 msgid ""
 "List companies or organisations that own the project and/or facilities. "
 "Separate with a comma."
 msgstr ""
 
-#: apps/map/models.py:240
+#: apps/map/models.py:278
 msgid "Shareholders of the project owners"
 msgstr ""
 
-#: apps/map/models.py:241
+#: apps/map/models.py:279
 msgid ""
 "List shareholders of the project owners you've just listed. Separate with a "
 "comma."
 msgstr ""
 
-#: apps/map/models.py:250
+#: apps/map/models.py:288
 msgid "Financial institutions"
 msgstr ""
 
-#: apps/map/models.py:251
+#: apps/map/models.py:289
 msgid ""
 "List banks and other financial institutions that have or are considering "
 "extending loans                      or guarantees to the project. Separate "
 "with a comma."
 msgstr ""
 
-#: apps/map/models.py:261
+#: apps/map/models.py:299
 msgid "Energy consumers"
 msgstr ""
 
-#: apps/map/models.py:262
+#: apps/map/models.py:300
 msgid ""
 "List any wholesale energy customers that take energy from the development. E."
 "g. 'national                     grids' or private energy suppliers."
 msgstr ""
 
-#: apps/map/models.py:272
+#: apps/map/models.py:310
 msgid "Image"
 msgstr ""
 
-#: apps/map/models.py:277
+#: apps/map/models.py:315
 msgid "Image caption"
 msgstr ""
 
-#: apps/map/models.py:285
+#: apps/map/models.py:323
 msgid "Image credit(s)"
 msgstr ""
 
-#: apps/map/models.py:293
-msgid "Video"
+#: apps/map/models.py:331
+msgid "YouTube Video"
 msgstr ""
 
-#: apps/map/models.py:294
+#: apps/map/models.py:332
 msgid ""
 "Copy the URL to a related YouTube™ video that relates to the case study."
 msgstr ""
 
-#: apps/map/models.py:301
+#: apps/map/models.py:339
 msgid "Video caption"
 msgstr ""
 
-#: apps/map/models.py:309
+#: apps/map/models.py:347
 msgid "Video credit(s)"
 msgstr ""
 
-#: apps/map/models.py:316
+#: apps/map/models.py:354
 msgid "Links to media reports"
 msgstr ""
 
-#: apps/map/models.py:317
+#: apps/map/models.py:355
 msgid "Provide any links to mainstream media coverage."
 msgstr ""
 
-#: apps/map/models.py:325
+#: apps/map/models.py:363
 msgid "Independent grassroots reports"
 msgstr ""
 
-#: apps/map/models.py:326
+#: apps/map/models.py:364
 msgid "Provide any links to grassroots/independent media coverage."
 msgstr ""
 
-#: apps/map/models.py:334 apps/map/templates/map/detail.html:68
+#: apps/map/models.py:372 apps/map/templates/map/detail.html:68
 msgid "Community Voices"
 msgstr ""
 
-#: apps/map/models.py:335
+#: apps/map/models.py:373
 msgid ""
 "Add any direct quotes from members of the community that                   "
 "relate to this project"
 msgstr ""
 
-#: apps/map/models.py:341
+#: apps/map/models.py:379
 msgid "Reports of direct communications"
 msgstr ""
 
-#: apps/map/models.py:342
+#: apps/map/models.py:380
 msgid ""
 "Add any reports of direct communication between community members "
 "and                     representatives of developers/companies/investors."
 msgstr ""
 
-#: apps/map/models.py:351
+#: apps/map/models.py:389
 msgid "Social media links"
 msgstr ""
 
-#: apps/map/models.py:352
+#: apps/map/models.py:390
 msgid ""
 "Add any links to social media accounts directly relating to the project."
 msgstr ""
 
+#: apps/map/models.py:403
+msgid "Generation technology"
+msgstr ""
+
+#: apps/map/models.py:404
+msgid ""
+"Select the type of renewable energy generation that most applies to this "
+"case study."
+msgstr ""
+
+#: apps/map/models.py:415
+msgid "Generation technology detail"
+msgstr ""
+
+#: apps/map/models.py:416
+msgid ""
+"If you selected biogas or biomass, please describe the feedstock (where the "
+"fuel came from e.g.                    corn, algae, anaerobic digestion, "
+"commercial waste etc)"
+msgstr ""
+
+#: apps/map/models.py:426
+msgid "Other generation type"
+msgstr ""
+
+#: apps/map/models.py:427
+msgid ""
+"If you selected other, please specify the generation technology (e.g. tidal, "
+"wave etc)"
+msgstr ""
+
+#: apps/map/models.py:436
+msgid "Total generation capacity (in kW)"
+msgstr ""
+
+#: apps/map/models.py:437
+msgid "Please enter the total generation capacity of the project in kW"
+msgstr ""
+
+#: apps/map/models.py:447
+msgid "Total investment (in USD)"
+msgstr ""
+
+#: apps/map/models.py:448
+msgid "The approximate total investment for the project in USD."
+msgstr ""
+
+#: apps/map/models.py:456
+msgid "Additional technical or economic details"
+msgstr ""
+
+#: apps/map/models.py:457
+msgid ""
+"Specify any additional technical or economic details relating to the project."
+msgstr ""
+
+#: apps/map/models.py:467
+msgid "Power technology"
+msgstr ""
+
+#: apps/map/models.py:468
+msgid "Select the related energy technology."
+msgstr ""
+
+#: apps/map/models.py:477
+msgid "Other power technology"
+msgstr ""
+
+#: apps/map/models.py:478
+msgid "If you answered 'others', please specify the power technologies."
+msgstr ""
+
 #: apps/map/templates/map/detail.html:20
 msgid "Back to Map"
 msgstr ""
@@ -459,17 +617,21 @@ msgstr "Français"
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ojusomap/templates/base.html:35
+#: ojusomap/templates/base.html:31
+msgid "Toggle navigation"
+msgstr ""
+
+#: ojusomap/templates/base.html:37
 msgid "Map"
 msgstr ""
 
-#: ojusomap/templates/base.html:47 ojusomap/templates/registration/login.html:7
+#: ojusomap/templates/base.html:59 ojusomap/templates/registration/login.html:7
 #: ojusomap/templates/registration/login.html:12
 #: ojusomap/templates/registration/login.html:21
 msgid "Login"
 msgstr ""
 
-#: ojusomap/templates/base.html:48
+#: ojusomap/templates/base.html:60
 #: ojusomap/templates/registration/registration_form.html:20
 msgid "Register"
 msgstr ""