From a54c2574f01150d6f1c5b68a018d87006834df42 Mon Sep 17 00:00:00 2001 From: Anna Sidwell Date: Sun, 21 Apr 2019 13:31:29 +0100 Subject: [PATCH] Recompile messages --- support/locale/en_GB/LC_MESSAGES/django.po | 99 ++++++----- support/locale/es/LC_MESSAGES/django.po | 190 +++++++++++++-------- support/locale/fr/LC_MESSAGES/django.po | 99 ++++++----- 3 files changed, 216 insertions(+), 172 deletions(-) diff --git a/support/locale/en_GB/LC_MESSAGES/django.po b/support/locale/en_GB/LC_MESSAGES/django.po index 615b360..bb41789 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: 2019-04-07 15:12+0000\n" +"POT-Creation-Date: 2019-04-21 12:30+0000\n" "PO-Revision-Date: 2019-03-18 19:01+0000\n" "Last-Translator: Weblate Admin \n" "Language-Team: English (United Kingdom) Please describe the source of the fuel and how it is processed/used. " -"Please consider:

\n" +"

Please describe the source of the fuel and how it " +"is processed/used. Please consider:

\n" "
    \n" "
  • where the fuel came from e.g. corn, forestry, algae, commercial food " "waste, landfill gas, sewage, livestock farm, etc.
    • \n" @@ -1109,7 +1103,7 @@ msgid "" "pyrolysis, artificial photosynthesis, fuel cell, etc.\n" "
\n" "

We do not expect users to know this information, but if you do it may be " -"useful to give a fuller picture.

" +"useful to give a fuller picture.

" msgstr "" #: apps/map/models.py:679 @@ -1276,7 +1270,7 @@ msgstr "" #: apps/map/models.py:875 msgid "" "Describe the ownership structure of the project and its relation with the " -"local community" +"local community." msgstr "" #: apps/map/models.py:885 @@ -1503,10 +1497,6 @@ msgstr "" msgid "Social media" msgstr "" -#: apps/map/templates/map/detail.html:253 -msgid "What is being generated?" -msgstr "" - #: apps/map/templates/map/detail.html:272 msgid "Total generation capacity" msgstr "" @@ -1658,6 +1648,13 @@ msgid "" "Marking somewhere as being of interest to the renewable energy transition" msgstr "" +#: apps/map/templates/map/form-selector.html:83 +msgid "" +"If you are interested in writing a technology assessment or policy analysis " +"to appear on this site, please email info@ojuso.org." +msgstr "" + #: apps/map/templates/map/form-success.html:32 msgid "Thanks!" msgstr "" @@ -1732,7 +1729,7 @@ msgid "Go to the homepage" msgstr "" #: ojusomap/templates/500.html:5 -msgid "Oops" +msgid "Oops!" msgstr "" #: ojusomap/templates/500.html:9 diff --git a/support/locale/es/LC_MESSAGES/django.po b/support/locale/es/LC_MESSAGES/django.po index e4f7af1..9cc24db 100644 --- a/support/locale/es/LC_MESSAGES/django.po +++ b/support/locale/es/LC_MESSAGES/django.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-07 15:12+0000\n" +"POT-Creation-Date: 2019-04-21 12:30+0000\n" "PO-Revision-Date: 2019-04-20 15:55+0000\n" "Last-Translator: Tom (ojuso) \n" -"Language-Team: Spanish " -"\n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,13 +35,13 @@ msgstr "Descripción de la imagen" msgid "Image credit" msgstr "Autor(es) de la imagen" -#: apps/map/forms.py:19 +#: apps/map/forms.py:20 msgid "Including electricity, heat or combined heat and power generation" msgstr "" "Puede referirse a la generación de electricidad, de calor, o a la generación " "combinada de electricidad y calor" -#: apps/map/forms.py:21 +#: apps/map/forms.py:22 msgid "" "Biological, chemical, electrical, electromagnetic, electrochemical, " "mechanical including gravitational potential, thermal, etc." @@ -49,44 +49,60 @@ msgstr "" "Biológico, químico, eléctrico, electromagnético, electroquímico, mecánico " "incluyendo energía potencial gravitatoria, termal, etc." -#: apps/map/forms.py:23 +#: apps/map/forms.py:24 msgid "Including supply of minerals" msgstr "Incluyendo el suministro de minerales" -#: apps/map/forms.py:28 +#: apps/map/forms.py:29 msgid "Lines, transformers, machinery, etc." msgstr "Líneas, transformadores, maquinaria, etc." -#: apps/map/forms.py:29 +#: apps/map/forms.py:30 msgid "District heating/cooling, etc." msgstr "Redes de calefacción/refrigeración urbana, etc." -#: apps/map/forms.py:63 apps/map/forms.py:115 apps/map/forms.py:454 +#: apps/map/forms.py:64 apps/map/forms.py:116 apps/map/forms.py:497 #: ojusomap/templates/registration/password_change_form.html:9 #: ojusomap/templates/registration/password_reset_confirm.html:12 #: ojusomap/templates/registration/password_reset_form.html:17 msgid "Submit" msgstr "Enviar" -#: apps/map/forms.py:248 +#: apps/map/forms.py:160 +msgid "Previous" +msgstr "Previo" + +#: apps/map/forms.py:169 +msgid "Next" +msgstr "Siguiente" + +#: apps/map/forms.py:265 msgid "Socio-environmental impacts (negative and potentially positive)" msgstr "Impactos socioambientales (negativos y potencialmente positivos)" -#: apps/map/forms.py:251 +#: apps/map/forms.py:267 msgid "Socio-environmental impacts (positive and potentially negative)" msgstr "Impactos socioambientales (positivos y potencialmente negativos)" -#: apps/map/forms.py:254 +#: apps/map/forms.py:269 msgid "Socio-environmental impacts (positive and negative)" msgstr "Impactos socioambientales (positivos y negativos)" -#: apps/map/forms.py:259 +#: apps/map/forms.py:283 +#, fuzzy +#| msgid "" +#| "Please expand on your response given in the full description on page one. " +#| "For example, for positive impacts you need to go beyond emissions " +#| "savings, paying rent for land, or complying with environmental or social " +#| "legislation. For negative impacts you need to focus on substantive " +#| "impacts on vulnerable groups, violations of land rights or abusive " +#| "labour practices." msgid "" "Please expand on your response given in the full description on page one. " "For example, for positive impacts you need to go beyond emissions savings, " "paying rent for land, or complying with environmental or social legislation. " "For negative impacts you need to focus on substantive impacts on vulnerable " -"groups, violations of land rights or abusive labour practices." +"groups, violations of land rights or abusive labour practices." msgstr "" "Por favor amplíe su respuesta dada en la descripción completa de la página " "de información básica. Por ejemplo, para casos positivos, esperaríamos que " @@ -96,7 +112,17 @@ msgstr "" "con impactos en grupos vulnerables, violaciones a los derechos sobre la " "tierra o practicas laborales abusivas." -#: apps/map/forms.py:266 +#: apps/map/forms.py:291 +#, fuzzy +#| msgid "" +#| "Please expand on your response given in the description. Note that we aim " +#| "to focus on violation of land rights / human rights / collective rights, " +#| "substantive negative impacts on vulnerable groups, aggression / threats / " +#| "violence, severe environmental and/or cultural impacts, abusive labor " +#| "practices, and corruption / governance issues, but feel free to cover any " +#| "additional aspect that you consider relevant. Please also describe and " +#| "analyze socio-environmental impacts that could be presented or considered " +#| "as positive." msgid "" "Please expand on your response given in the description. Note that we aim to " "focus on violation of land rights / human rights / collective rights, " @@ -117,7 +143,7 @@ msgstr "" "impactos socioambientales que puedan ser presentados o considerados como " "positivos." -#: apps/map/forms.py:275 +#: apps/map/forms.py:301 msgid "" "Please expand on your response given in the description. Please also " "describe and analyze socio-environmental impacts that could be considered as " @@ -127,37 +153,31 @@ msgstr "" "describa y analice los impactos socioambientales que pueden ser considerados " "como negativos." -#: apps/map/forms.py:282 +#: apps/map/forms.py:320 msgid "Basic information" msgstr "Información básica" -#: apps/map/forms.py:309 +#: apps/map/forms.py:347 msgid "Owners and financiers" msgstr "Propiedad y finanzas" -#: apps/map/forms.py:317 +#: apps/map/forms.py:355 msgid "Media reports and other communications" msgstr "Informes de prensa y otras comunicaciones" -#: apps/map/forms.py:325 apps/map/forms.py:388 apps/map/forms.py:428 -#: apps/map/forms.py:443 -msgid "Next" -msgstr "Siguiente" - -#: apps/map/forms.py:329 +#: apps/map/forms.py:367 msgid "Technical and economic analysis" msgstr "Análisis técnico y económico" -#: apps/map/forms.py:387 apps/map/forms.py:427 apps/map/forms.py:442 -#: apps/map/forms.py:453 -msgid "Previous" -msgstr "Previo" - -#: apps/map/forms.py:392 +#: apps/map/forms.py:430 msgid "Socio-environmental analysis" msgstr "Análisis socioambiental" -#: apps/map/forms.py:395 +#: apps/map/forms.py:435 +#, fuzzy +#| msgid "" +#| "In the following, we expect the analysis to reflect the perspective of " +#| "the organization(s) or person(s) describing the case." msgid "" "In the following, we expect the analysis to reflect the perspective of the " "organization(s) or person(s) describing the case." @@ -165,15 +185,15 @@ msgstr "" "En la siguiente parte, esperamos que el análisis refleje la perspectiva de " "la organización (es) o de la persona (s) que está presentando el caso." -#: apps/map/forms.py:403 apps/map/models.py:891 +#: apps/map/forms.py:445 apps/map/models.py:891 msgid "What kind of case is this entry about?" msgstr "¿De qué tipo de caso se trata esta entrada?" -#: apps/map/forms.py:432 +#: apps/map/forms.py:475 msgid "Contact details" msgstr "Detalles de contacto" -#: apps/map/forms.py:447 +#: apps/map/forms.py:490 msgid "Uploads" msgstr "Documentos / archivos" @@ -383,8 +403,8 @@ msgid "" "Nederlandse Financieringsmaatschappij voor Ontwikkelingslanden NV " "(Netherlands Development Finance Company, FMO)" msgstr "" -"Nederlandse Financieringsmaatschappij voor Ontwikkelingslanden NV (" -"Corporación Holandesa de Financiamiento del Desarrollo, FMO)" +"Nederlandse Financieringsmaatschappij voor Ontwikkelingslanden NV " +"(Corporación Holandesa de Financiamiento del Desarrollo, FMO)" #: apps/map/models.py:126 msgid "New Development Bank (NDB) (formerly BRICS Development Bank)" @@ -698,7 +718,7 @@ msgstr "Zinc" msgid "Concentrated solar power (CSP) tower" msgstr "Central termosolar de torre central" -#: apps/map/models.py:235 +#: apps/map/models.py:235 apps/map/models.py:261 msgid "Electrical power transmission/distribution infrastructure" msgstr "Infraestructura para la transmisión/distribución de energía eléctrica" @@ -754,10 +774,6 @@ msgstr "Solar fotovoltaica" msgid "Concentrated solar power (CSP)" msgstr "Energía termosolar de concentración" -#: apps/map/models.py:261 -msgid "Electrical power transmission infrastructure" -msgstr "Infraestructura para la transmisión/distribución de energía eléctrica" - #: apps/map/models.py:265 msgid "Unknown" msgstr "Desconocido" @@ -821,9 +837,13 @@ msgstr "" "indígenas y/o otros derechos colectivos" #: apps/map/models.py:292 +#, fuzzy +#| msgid "" +#| "Environmental impacts (severe impacts on ecosystems / violation of laws " +#| "plans or programs of environmental conservation, etc." msgid "" -"Environmental impacts (severe impacts on ecosystems / violation of laws " -"plans or programs of environmental conservation, etc." +"Environmental impacts (severe impacts on ecosystems / violation of laws, " +"plans or programs of environmental conservation, etc.)" msgstr "" "Impactos ambientales (impactos severos sobre ecosistemas, violación de " "leyes, planes o programas de conservación ambiental, etc.)" @@ -877,9 +897,9 @@ msgid "" msgstr "" "Por ejemplo, limites del territorio ocupado por el proyecto, o sitios de " "particular importancia impactados. Puede subir fotos, mapas, planos, etc., " -"con varios formatos (ESRI Shapefiles con extensiones como: .cpg, .dbf, .prj, " -".qpj, .shp, .shx, o GeoPackage gpkg, GeoJSON, KML, GML, etc.) Si necesita " -"ayuda, escribamos a database@ojuso.org." +"con varios formatos (ESRI Shapefiles con extensiones como: .cpg, .dbf, ." +"prj, .qpj, .shp, .shx, o GeoPackage gpkg, GeoJSON, KML, GML, etc.) Si " +"necesita ayuda, escribamos a database@ojuso.org." #: apps/map/models.py:374 msgid "Name of territory or area" @@ -937,8 +957,8 @@ msgstr "" "hay derechos consuetudinarios o tradicionales que no son legalmente " "reconocidos, conflictos en torno a contratos de arrendamiento o compra de " "tierras, etc.

Entendemos que esta es una pregunta " -"difícil, por favor trate de proporcionar solo la información que " -"conoce.

" +"difícil, por favor trate de proporcionar solo la información que conoce.

" #: apps/map/models.py:426 msgid "Location" @@ -1186,7 +1206,7 @@ msgid "" "focuses on." msgstr "Por favor proporcione mas información sobre la tecnología." -#: apps/map/models.py:642 +#: apps/map/models.py:642 apps/map/templates/map/detail.html:253 msgid "What kind of energy is generated?" msgstr "¿Qué tipo de energía se genera?" @@ -1207,10 +1227,23 @@ msgstr "" msgid "Bio-energy feedstock" msgstr "Materia prima para la bioenergía" -#: apps/map/models.py:661 +#: apps/map/models.py:660 +#, fuzzy +#| msgid "" +#| "

Please describe the source of the fuel and how it is processed/used. " +#| "Please consider:

\n" +#| "
    \n" +#| "
  • where the fuel came from e.g. corn, forestry, algae, commercial food " +#| "waste, landfill gas, sewage, livestock farm, etc.
    • \n" +#| "
  • how it is processed e.g. direct-fired, co-firing with other renewable " +#| "input, gasification, bacterial decomposition (anaerobic digestion, AD), " +#| "pyrolysis, artificial photosynthesis, fuel cell, etc.
    • \n" +#| "
\n" +#| "

We do not expect users to know this information, but if you do it may " +#| "be useful to give a fuller picture.

" msgid "" -"

Please describe the source of the fuel and how it is processed/used. " -"Please consider:

\n" +"

Please describe the source of the fuel and how it " +"is processed/used. Please consider:

\n" "
    \n" "
  • where the fuel came from e.g. corn, forestry, algae, commercial food " "waste, landfill gas, sewage, livestock farm, etc.
    • \n" @@ -1219,7 +1252,7 @@ msgid "" "pyrolysis, artificial photosynthesis, fuel cell, etc.\n" "
\n" "

We do not expect users to know this information, but if you do it may be " -"useful to give a fuller picture.

" +"useful to give a fuller picture.

" msgstr "" "

Por favor describa la fuente del combustible y cómo es procesado/usado. " "considere:

\n" @@ -1365,8 +1398,8 @@ msgid "" "For example, \"40 million tonnes of iron ore per year\", \"200 million " "tonnes over 5 year life of mine\".\"" msgstr "" -"Por favor describa la producción de minerales proyectada por año y el " -"total.
\n" +"Por favor describa la producción de minerales proyectada por año y el total." +"
\n" "Por ejemplo \"40 millones de toneladas de hierro por año\", \"200 millones " "de toneladas en los 5 años de vida útil de la mina\"" @@ -1425,9 +1458,13 @@ msgid "Please describe these factors." msgstr "Por favor describa estos factores." #: apps/map/models.py:875 +#, fuzzy +#| msgid "" +#| "Describe the ownership structure of the project and its relation with the " +#| "local community" msgid "" "Describe the ownership structure of the project and its relation with the " -"local community" +"local community." msgstr "" "Por favor describa la estructura de propiedad del proyecto y su relación con " "la comunidad local." @@ -1540,9 +1577,9 @@ msgid "" "Before the project started? During project implementation? After project " "implementation? Please describe in your own words." msgstr "" -"¿Antes de que inicie el proyecto? ¿Durante la implementación del proyecto? ¿" -"Después de la implementación del proyecto? Por favor describa en sus propias " -"palabras." +"¿Antes de que inicie el proyecto? ¿Durante la implementación del proyecto? " +"¿Después de la implementación del proyecto? Por favor describa en sus " +"propias palabras." #: apps/map/models.py:975 msgid "Which communities, groups and organisations have been involved?" @@ -1689,10 +1726,6 @@ msgstr "Medios de comunicación independientes o de base" msgid "Social media" msgstr "Redes sociales" -#: apps/map/templates/map/detail.html:253 -msgid "What is being generated?" -msgstr "¿Qué tipo de energía se genera?" - #: apps/map/templates/map/detail.html:272 msgid "Total generation capacity" msgstr "Capacidad total de generación" @@ -1852,13 +1885,21 @@ msgstr "" "Para marcar algún lugar de interés para la transición a las energías " "renovables" +#: apps/map/templates/map/form-selector.html:83 +msgid "" +"If you are interested in writing a technology assessment or policy analysis " +"to appear on this site, please email info@ojuso.org." +msgstr "" + #: apps/map/templates/map/form-success.html:32 msgid "Thanks!" msgstr "¡Gracias!" #: apps/map/templates/map/form-success.html:34 msgid "Your submission will be reviewed shortly. We will update you via email." -msgstr "Su envío será revisado pronto. Le contactaremos por correo electrónico." +msgstr "" +"Su envío será revisado pronto. Le contactaremos por correo electrónico." #: apps/map/templates/map/forms/widgets/file.html:7 msgid "Add files" @@ -1901,8 +1942,8 @@ msgstr "" "

Los objetivos de ojuso son promover las mejores prácticas en la " "industria de las energías renovables, detener la inversión en proyectos " "ecológica y socialmente destructivos, y fomentar mejoras en las cadenas de " -"suministro y la gestión del ciclo de vida en el sector.

ojuso" -" provee una plataforma para el intercambio de información y la cooperación " +"suministro y la gestión del ciclo de vida en el sector.

ojuso provee una plataforma para el intercambio de información y la cooperación " "entre los diferentes sectores involucrados en la economía de las energías " "renovables, y apoya buenas prácticas éticas y ambientales. Esta plataforma " "se compone de un mapa en línea y una base de datos con estudios de caso " @@ -1911,8 +1952,8 @@ msgstr "" "enriquecidos por diversos actores.

Le invitamos a enviar un estudio " "de caso a través de esta herramienta. Seguidamente del envío, los casos " "serán moderados y publicados en nuestra plataforma. Si necesita alguna ayuda " -"o tiene sugerencias, por favor envíenos un mensaje a our forum.

" +"o tiene sugerencias, por favor envíenos un mensaje a our forum.

" #: apps/map/templates/map/index.html:58 msgid "" @@ -1947,7 +1988,9 @@ msgid "Go to the homepage" msgstr "Ir a la página de inicio" #: ojusomap/templates/500.html:5 -msgid "Oops" +#, fuzzy +#| msgid "Oops" +msgid "Oops!" msgstr "Ups!" #: ojusomap/templates/500.html:9 @@ -2070,6 +2113,13 @@ msgstr "Registro" msgid "Create your account and get active!" msgstr "¡Genere su cuenta!" +#~ msgid "Electrical power transmission infrastructure" +#~ msgstr "" +#~ "Infraestructura para la transmisión/distribución de energía eléctrica" + +#~ msgid "What is being generated?" +#~ msgstr "¿Qué tipo de energía se genera?" + #~ msgid "Initiation/ideation" #~ msgstr "Iniciación / ideación" diff --git a/support/locale/fr/LC_MESSAGES/django.po b/support/locale/fr/LC_MESSAGES/django.po index 71d1870..45fbcbd 100644 --- a/support/locale/fr/LC_MESSAGES/django.po +++ b/support/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-07 15:12+0000\n" +"POT-Creation-Date: 2019-04-21 12:30+0000\n" "PO-Revision-Date: 2017-11-08 12:40+0000\n" "Last-Translator: Emilie Heidtmann \n" "Language-Team: French Please describe the source of the fuel and how it is processed/used. " -"Please consider:

\n" +"

Please describe the source of the fuel and how it " +"is processed/used. Please consider:

\n" "
    \n" "
  • where the fuel came from e.g. corn, forestry, algae, commercial food " "waste, landfill gas, sewage, livestock farm, etc.
    • \n" @@ -1295,7 +1289,7 @@ msgid "" "pyrolysis, artificial photosynthesis, fuel cell, etc.\n" "
\n" "

We do not expect users to know this information, but if you do it may be " -"useful to give a fuller picture.

" +"useful to give a fuller picture.

" msgstr "" #: apps/map/models.py:679 @@ -1484,7 +1478,7 @@ msgstr "Décrivez l'écosystème" #: apps/map/models.py:875 msgid "" "Describe the ownership structure of the project and its relation with the " -"local community" +"local community." msgstr "" #: apps/map/models.py:885 @@ -1735,10 +1729,6 @@ msgstr "Rapports au niveau local indépendants" msgid "Social media" msgstr "Liens de médias sociaux" -#: apps/map/templates/map/detail.html:253 -msgid "What is being generated?" -msgstr "" - #: apps/map/templates/map/detail.html:272 #, fuzzy #| msgid "Total generation capacity (in kW)" @@ -1904,6 +1894,13 @@ msgid "" "Marking somewhere as being of interest to the renewable energy transition" msgstr "" +#: apps/map/templates/map/form-selector.html:83 +msgid "" +"If you are interested in writing a technology assessment or policy analysis " +"to appear on this site, please email info@ojuso.org." +msgstr "" + #: apps/map/templates/map/form-success.html:32 msgid "Thanks!" msgstr "Merci!" @@ -1979,7 +1976,7 @@ msgid "Go to the homepage" msgstr "" #: ojusomap/templates/500.html:5 -msgid "Oops" +msgid "Oops!" msgstr "" #: ojusomap/templates/500.html:9