Merge remote-tracking branch 'weblate/master'

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

support/locale/es/LC_MESSAGES/django.po

@@ -21,115 +21,116 @@ msgstr ""
 
 #: apps/contact/views.py:10
 msgid "There was an error in the contact form."
-msgstr ""
+msgstr "Hubo un error en el formulario de contacto."
 
 #: apps/contact/views.py:11
+#, fuzzy
 msgid "Thank you for your message."
-msgstr ""
+msgstr "Gracias por el mensaje."
 
 #: apps/map/models.py:17
 msgid "Renewable Energy Generation"
-msgstr ""
+msgstr "Generación de energía por fuentes renovables"
 
 #: apps/map/models.py:18
 msgid "Wind"
-msgstr ""
+msgstr "Eólica"
 
 #: apps/map/models.py:19
 msgid "Solar"
-msgstr ""
+msgstr "Solar"
 
 #: apps/map/models.py:20
 msgid "Hydro"
-msgstr ""
+msgstr "Hidraúlica"
 
 #: apps/map/models.py:22
 msgid "Power Grids"
-msgstr ""
+msgstr "Redes eléctricas"
 
 #: apps/map/models.py:23
 msgid "Supply of Minerals"
-msgstr ""
+msgstr "Suministro de minerales"
 
 #: apps/map/models.py:27
 msgid "Positive"
-msgstr ""
+msgstr "Positivo"
 
 #: apps/map/models.py:28
 msgid "Negative"
-msgstr ""
+msgstr "Negativo"
 
 #: apps/map/models.py:32
 msgid "Private Land"
-msgstr ""
+msgstr "Privada"
 
 #: apps/map/models.py:33
 msgid "Public Land"
-msgstr ""
+msgstr "Pública"
 
 #: apps/map/models.py:34
 msgid "Community Land"
-msgstr ""
+msgstr "Comunal"
 
 #: apps/map/models.py:35
 msgid "Other"
-msgstr ""
+msgstr "Otros"
 
 #: apps/map/models.py:39
 msgid "Rural"
-msgstr ""
+msgstr "Rural"
 
 #: apps/map/models.py:40 apps/map/models.py:54
 msgid "Urban"
-msgstr ""
+msgstr "Urbano"
 
 #: apps/map/models.py:44
 msgid "Water Based"
-msgstr ""
+msgstr "Ecosistema Acuáticos y Costeros"
 
 #: apps/map/models.py:45
 msgid "Marine (e.g. Ocean, Sea)"
-msgstr ""
+msgstr "Marino"
 
 #: apps/map/models.py:46
 msgid "Freshwater (e.g. Freshwater, Lake)"
-msgstr ""
+msgstr "De agua dulce (p.e. rios, lagos)"
 
 #: apps/map/models.py:48
 msgid "Land Based"
-msgstr ""
+msgstr "Terrestre"
 
 #: apps/map/models.py:49
 msgid "Forest/Jungle"
-msgstr ""
+msgstr "Bosques/Selva"
 
 #: apps/map/models.py:50
 msgid "Agricultural Land"
-msgstr ""
+msgstr "Tierra de cultivo"
 
 #: apps/map/models.py:51
 msgid "Grassland"
-msgstr ""
+msgstr "Pastizal"
 
 #: apps/map/models.py:52
 msgid "Desert (Tundra, Ice or Sand)"
-msgstr ""
+msgstr "Desierto (tundra, hielo o arena)"
 
 #: apps/map/models.py:53
 msgid "Wetland (Marsh, Mangrove, Peat Soil)"
-msgstr ""
+msgstr "Vegetación riparia (humedal, manglar, turberas, etc)"
 
 #: apps/map/models.py:59
 msgid "Existing Project"
-msgstr ""
+msgstr "Proyecto Existente"
 
 #: apps/map/models.py:60
 msgid "Under Construction"
-msgstr ""
+msgstr "En Construcción"
 
 #: apps/map/models.py:61
 msgid "Projected Project"
-msgstr ""
+msgstr "En Planeación"
 
 #: apps/map/models.py:65
 msgid "Wind energy"
@@ -197,13 +198,15 @@ msgstr ""
 
 #: apps/map/models.py:122
 msgid "Entry Name"
-msgstr ""
+msgstr "Nombre"
 
 #: apps/map/models.py:123
 msgid ""
 "Enter the name of the entry. This should usually be the                   "
 "name of project."
 msgstr ""
+"Entrar el nombre de la Entrada. Este debería ser generalmente el nombre del "
+"proyecto."
 
 #: apps/map/models.py:130
 msgid "Project location"
@@ -217,21 +220,21 @@ msgstr ""
 
 #: apps/map/models.py:137
 msgid "Sector of economy"
-msgstr ""
+msgstr "Sector de Energía Renovable"
 
 #: apps/map/models.py:138
 msgid ""
 "Which sector of the renewable energy economy is most                    "
 "relevant?"
-msgstr ""
+msgstr "¿Cuál sector de las energías renovable es más relevante?"
 
 #: apps/map/models.py:146
 msgid "Positive or negative?"
-msgstr ""
+msgstr "¿Positivo o negativo?"
 
 #: apps/map/models.py:147
 msgid "Is the case study a positive case or a negative case?"
-msgstr ""
+msgstr "¿Es un caso positivo o negativo?"
 
 #: apps/map/models.py:154
 msgid "Country field"
@@ -243,23 +246,23 @@ msgstr ""
 
 #: apps/map/models.py:160 apps/map/templates/map/detail.html:88
 msgid "Approximate land area"
-msgstr ""
+msgstr "Superficie aproximada del proyecto"
 
 #: apps/map/models.py:161
 msgid "The area of land covered by the project (in km²)"
-msgstr ""
+msgstr "Superficie del proyecto (en km²)"
 
 #: apps/map/models.py:166
 msgid "Land ownership"
-msgstr ""
+msgstr "Tenencia de la Tierra"
 
 #: apps/map/models.py:167
 msgid "What type of ownership does the land fall under?"
-msgstr ""
+msgstr "¿De qué tipo de tenencia se encuentra la tierra?"
 
 #: apps/map/models.py:174
 msgid "Land ownership details"
-msgstr ""
+msgstr "Detalles de tenencia de la tierra"
 
 #: apps/map/models.py:175
 msgid "Please specify details about land ownership if you chose 'other'"
@@ -267,33 +270,33 @@ msgstr ""
 
 #: apps/map/models.py:183
 msgid "Location"
-msgstr ""
+msgstr "Ubicación"
 
 #: apps/map/models.py:184
 msgid ""
 "Select the context that is most applicable to this case                    "
 "study."
-msgstr ""
+msgstr "Seleccione el contexto que sea más aplicable a esta Entrada."
 
 #: apps/map/models.py:192
 msgid "Type of ecosystem"
-msgstr ""
+msgstr "Tipo de Ecosistema"
 
 #: apps/map/models.py:193
 msgid "Select the most relevant type of ecosystem."
-msgstr ""
+msgstr "Seleccione el ecosistema más relevante."
 
 #: apps/map/models.py:200
 msgid "Describe the ecosystem"
-msgstr ""
+msgstr "Describe el ecosistema."
 
 #: apps/map/models.py:201
 msgid "In your own words, add more detail about the ecosystem."
-msgstr ""
+msgstr "En sus propias palabras, añade más detalle sobre el ecosistema."
 
 #: apps/map/models.py:207
 msgid "Affects indigenous people?"
-msgstr ""
+msgstr "¿Afecta alguna(s) comunidad(es) indígena(s)?"
 
 #: apps/map/models.py:208
 msgid "Does the project affect indigenous communities?"
@@ -301,21 +304,21 @@ msgstr ""
 
 #: apps/map/models.py:213
 msgid "Affects Indigenous - Details"
-msgstr ""
+msgstr "Afecta comunidad(es) indígena(s) - detalles"
 
 #: apps/map/models.py:214
 msgid ""
 "What group of indigenous people does the community belong                    "
 "to?"
-msgstr ""
+msgstr "¿A qué pueblo(s) indígena(s)?"
 
 #: apps/map/models.py:221
 msgid "Status of Project"
-msgstr ""
+msgstr "Estatus del Proyecto"
 
 #: apps/map/models.py:222
 msgid "What is the status of the current project?"
-msgstr ""
+msgstr "¿Qué está el estatus del proyecto actual?"
 
 #: apps/map/models.py:229
 msgid "Start year"
@@ -339,7 +342,7 @@ msgstr ""
 
 #: apps/map/models.py:251
 msgid "Synopsis"
-msgstr ""
+msgstr "Sinopsis"
 
 #: apps/map/models.py:252
 msgid ""
@@ -347,10 +350,12 @@ msgid ""
 "the top of the case study page. Maximum 500 chars (about                     "
 "3½ tweets)"
 msgstr ""
+"Describe brevemente el proyecto. Este será fijado lo más alto de la página "
+"de la Entrada. Máximo 500 carácters (como 3½ tweets)"
 
 #: apps/map/models.py:260 apps/map/templates/map/detail.html:53
 msgid "Full Description"
-msgstr ""
+msgstr "Descripción General"
 
 #: apps/map/models.py:261
 msgid ""
@@ -358,6 +363,8 @@ msgid ""
 "new line Please add as much detail as you feel is "
 "necessary                    here."
 msgstr ""
+"Describe el proyecto por completo. Separa párrafos con una nueva línea. Por "
+"favor, aquí añade tanto detalle como siente es necesario/a."
 
 #: apps/map/models.py:268
 msgid "Project and facility owners"
@@ -402,7 +409,7 @@ msgstr ""
 
 #: apps/map/models.py:310
 msgid "Image"
-msgstr ""
+msgstr "Imagen"
 
 #: apps/map/models.py:315
 msgid "Image caption"
@@ -447,13 +454,15 @@ msgstr ""
 
 #: apps/map/models.py:372 apps/map/templates/map/detail.html:68
 msgid "Community Voices"
-msgstr ""
+msgstr "Voces de la Comunidad"
 
 #: apps/map/models.py:373
 msgid ""
 "Add any direct quotes from members of the community that                   "
 "relate to this project"
 msgstr ""
+"Añade algúnas expresiones de la comunidad (¿Qué piensa/siente la comunidad "
+"sobre este proyecto?)"
 
 #: apps/map/models.py:379
 msgid "Reports of direct communications"
@@ -547,12 +556,14 @@ msgid "If you answered 'others', please specify the power technologies."
 msgstr ""
 
 #: apps/map/templates/map/detail.html:20
+#, fuzzy
 msgid "Back to Map"
-msgstr ""
+msgstr "De vuelta a la Mapa"
 
 #: apps/map/templates/map/detail.html:83
+#, fuzzy
 msgid "Factbar"
-msgstr ""
+msgstr "Caja de información (infobox)"
 
 #: apps/map/templates/map/form-success.html:32
 msgid "Thanks!"
@@ -564,22 +575,26 @@ msgstr ""
 
 #: apps/map/templates/map/form.html:15 apps/map/templates/map/index.html:107
 msgid "Submit a Case Study"
-msgstr "Submitir una entrada"
+msgstr "Enviar una Entrada"
 
 #: apps/map/templates/map/form.html:16
+#, fuzzy
 msgid ""
 "Here you can submit a case study for review and it will be added to the map."
 msgstr ""
+"Aquí puede enviar una Entrada para su revisión y será añadido a la Mapa."
 
 #: apps/map/templates/map/how_much_time.html:32
 msgid "How much time do you have?"
-msgstr ""
+msgstr "¿Cuánto tiempo tienes?"
 
 #: apps/map/templates/map/how_much_time.html:34
+#, fuzzy
 msgid ""
 "A complete picture is always more helpful but sometimes you don't have the "
 "time"
 msgstr ""
+"Una imagen completa es siempre más provechosa pero a veces no tiene el tiempo"
 
 #: apps/map/templates/map/index.html:14
 msgid "Ojuso Platform Map"
@@ -587,7 +602,7 @@ msgstr "Mapa de la Plataforma Ojuso"
 
 #: apps/map/templates/map/index.html:50
 msgid "View"
-msgstr ""
+msgstr "Ver"
 
 #: apps/map/templates/map/index.html:57 apps/map/templates/map/index.html:88
 msgid "Close"
@@ -595,19 +610,19 @@ msgstr "Cerrar"
 
 #: apps/map/templates/map/index.html:91
 msgid "Save changes"
-msgstr ""
+msgstr "Guardar cambios"
 
 #: ojusomap/settings.py:165
 msgid "English (British)"
-msgstr ""
+msgstr "inglés (británico)"
 
 #: ojusomap/settings.py:166
 msgid "French"
-msgstr ""
+msgstr "francés"
 
 #: ojusomap/settings.py:167
 msgid "Spanish"
-msgstr ""
+msgstr "español"
 
 #: ojusomap/templates/base.html:31
 msgid "Toggle navigation"
@@ -621,7 +636,7 @@ msgstr ""
 #: ojusomap/templates/registration/login.html:12
 #: ojusomap/templates/registration/login.html:21
 msgid "Login"
-msgstr ""
+msgstr "Login"
 
 #: ojusomap/templates/base.html:60
 #: ojusomap/templates/registration/registration_form.html:20
@@ -651,11 +666,11 @@ msgstr ""
 
 #: ojusomap/templates/registration/login.html:13
 msgid "Welcome!"
-msgstr ""
+msgstr "¡Bienvenido!"
 
 #: ojusomap/templates/registration/login.html:20
 msgid "Lost password?"
-msgstr ""
+msgstr "¿Ha perdido/olvidado su contraseña?"
 
 #: ojusomap/templates/registration/logout.html:5
 msgid "Logged out"
@@ -691,6 +706,8 @@ msgstr ""
 #, python-format
 msgid "Reset password at %(site_name)s"
 msgstr ""
+"Está recibiendo este correo electrónico porque solicitó un restablecimiento "
+"de contraseña en %(site_name)s"
 
 #: ojusomap/templates/registration/registration_closed.html:5
 msgid "Registration is currently closed."