diff --git a/apps/map/templates/map/index.html b/apps/map/templates/map/index.html index 5c545eb..10cbb5e 100644 --- a/apps/map/templates/map/index.html +++ b/apps/map/templates/map/index.html @@ -93,11 +93,33 @@ html, body, #main {
- -

ojuso’s aim is to promote best practice in the renewable energy industry, to encourage divestment from ecologically and socially destructive projects, and to foster improvements in supply chain and lifecycle management in the sector.

-

ojuso provides a platform for information exchange and cooperation between different sectors involved in the renewable energy economy and is supportive of ethical and ecologically sound practices. This platform consists of an online map and database of positive and negative case studies, contributed by communities affected by and leading the transition, and a series of discussion fora and features, contributed by a diversity of players.

You are welcome to submit a case study through this map tool. Following submission cases will be moderated and, if successful, placed on the map. If you need any help or have any suggestions, please post messages on our forum.

-

ojuso is a project of Yansa and Gaia Foundation, with support from Swift Foundation.

- + {% blocktrans trimmed with forum_url='//forum.ojuso.org' %} +

+ ojuso’s aim is to promote best practice in the renewable energy + industry, to encourage divestment from ecologically and socially + destructive projects, and to foster improvements in supply chain and + lifecycle management in the sector. +

+

+ ojuso provides a platform for information exchange and + cooperation between different sectors involved in the renewable energy + economy and is supportive of ethical and ecologically sound practices. + This platform consists of an online map and database of positive and + negative case studies, contributed by communities affected by and + leading the transition, and a series of discussion fora and features, + contributed by a diversity of players. +

+

+ You are welcome to submit a case study through this map tool. + Following submission, cases will be moderated and, if successful, + placed on the map. If you need any help or have any suggestions, + please post messages on our forum. +

+ {% endblocktrans %} +

+ {% trans "ojuso is a project of Yansa and Gaia Foundation, with support from Swift Foundation." %} +

+
diff --git a/support/locale/en_GB/LC_MESSAGES/django.po b/support/locale/en_GB/LC_MESSAGES/django.po index 3caa418..cad13bc 100644 --- a/support/locale/en_GB/LC_MESSAGES/django.po +++ b/support/locale/en_GB/LC_MESSAGES/django.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: apps/map/forms.py:82 apps/map/forms.py:83 +#: apps/map/forms.py:98 apps/map/forms.py:99 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-04 16:54+0000\n" +"POT-Creation-Date: 2018-04-19 17:00+0000\n" "PO-Revision-Date: 2017-11-08 12:41+0000\n" "Last-Translator: Emilie Heidtmann \n" "Language-Team: English (United Kingdom) ojuso’s aim is to promote best practice in the renewable energy " +"industry, to encourage divestment from ecologically and socially destructive " +"projects, and to foster improvements in supply chain and lifecycle " +"management in the sector.

ojuso provides a platform for " +"information exchange and cooperation between different sectors involved in " +"the renewable energy economy and is supportive of ethical and ecologically " +"sound practices. This platform consists of an online map and database of " +"positive and negative case studies, contributed by communities affected by " +"and leading the transition, and a series of discussion fora and features, " +"contributed by a diversity of players.

You are welcome to submit a " +"case study through this map tool. Following submission, cases will be " +"moderated and, if successful, placed on the map. If you need any help or " +"have any suggestions, please post messages on our " +"forum.

" +msgstr "" + +#: apps/map/templates/map/index.html:120 +msgid "" +"ojuso is a project of Yansa and Gaia Foundation, with support from " +"Swift Foundation." +msgstr "" + +#: apps/map/templates/map/index.html:122 +msgid "OK" +msgstr "" + +#: apps/map/templates/map/index.html:157 msgid "View full case study" msgstr "" -#: apps/map/templates/map/index.html:112 apps/map/templates/map/index.html:143 -msgid "Close" -msgstr "Close" - -#: apps/map/templates/map/index.html:146 -msgid "Save changes" -msgstr "Save changes" - -#: ojusomap/settings.py:177 +#: ojusomap/settings.py:181 msgid "English (British)" msgstr "English (British)" -#: ojusomap/settings.py:178 +#: ojusomap/settings.py:182 msgid "French" msgstr "French" -#: ojusomap/settings.py:179 +#: ojusomap/settings.py:183 msgid "Spanish" msgstr "Spanish" @@ -1647,21 +1717,21 @@ msgstr "" msgid "Change Name" msgstr "" -#: ojusomap/templates/base.html:45 +#: ojusomap/templates/base.html:74 msgid "Map" msgstr "Map" -#: ojusomap/templates/base.html:62 +#: ojusomap/templates/base.html:91 msgid "Logout" msgstr "" -#: ojusomap/templates/base.html:67 ojusomap/templates/registration/login.html:7 +#: ojusomap/templates/base.html:96 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:68 +#: ojusomap/templates/base.html:97 #: ojusomap/templates/registration/registration_form.html:20 msgid "Register" msgstr "Register" @@ -1750,6 +1820,22 @@ msgstr "Registration" msgid "Create your account and get active!" msgstr "Create your account and get active!" +#~ 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 "" +#~ "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)." + +#~ msgid "Country field" +#~ msgstr "Country field" + +#~ msgid "Close" +#~ msgstr "Close" + +#~ msgid "Save changes" +#~ msgstr "Save changes" + #~ msgid "Wind" #~ msgstr "Wind" diff --git a/support/locale/es/LC_MESSAGES/django.po b/support/locale/es/LC_MESSAGES/django.po index 26e24b4..bfddd00 100644 --- a/support/locale/es/LC_MESSAGES/django.po +++ b/support/locale/es/LC_MESSAGES/django.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: apps/map/forms.py:82 apps/map/forms.py:83 +#: apps/map/forms.py:98 apps/map/forms.py:99 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-04 16:54+0000\n" +"POT-Creation-Date: 2018-04-19 17:00+0000\n" "PO-Revision-Date: 2018-02-20 23:25+0000\n" "Last-Translator: Ximena Montaño \n" "Language-Team: Spanish ojuso’s aim is to promote best practice in the renewable energy " +"industry, to encourage divestment from ecologically and socially destructive " +"projects, and to foster improvements in supply chain and lifecycle " +"management in the sector.

ojuso provides a platform for " +"information exchange and cooperation between different sectors involved in " +"the renewable energy economy and is supportive of ethical and ecologically " +"sound practices. This platform consists of an online map and database of " +"positive and negative case studies, contributed by communities affected by " +"and leading the transition, and a series of discussion fora and features, " +"contributed by a diversity of players.

You are welcome to submit a " +"case study through this map tool. Following submission, cases will be " +"moderated and, if successful, placed on the map. If you need any help or " +"have any suggestions, please post messages on our " +"forum.

" +msgstr "" + +#: apps/map/templates/map/index.html:120 +msgid "" +"ojuso is a project of Yansa and Gaia Foundation, with support from " +"Swift Foundation." +msgstr "" + +#: apps/map/templates/map/index.html:122 +msgid "OK" +msgstr "" + +#: apps/map/templates/map/index.html:157 msgid "View full case study" msgstr "" -#: apps/map/templates/map/index.html:112 apps/map/templates/map/index.html:143 -msgid "Close" -msgstr "Cerrar" - -#: apps/map/templates/map/index.html:146 -msgid "Save changes" -msgstr "Guardar cambios" - -#: ojusomap/settings.py:177 +#: ojusomap/settings.py:181 msgid "English (British)" msgstr "Inglés (británico)" -#: ojusomap/settings.py:178 +#: ojusomap/settings.py:182 msgid "French" msgstr "Francés" -#: ojusomap/settings.py:179 +#: ojusomap/settings.py:183 msgid "Spanish" msgstr "Español" @@ -1667,21 +1736,21 @@ msgstr "" msgid "Change Name" msgstr "" -#: ojusomap/templates/base.html:45 +#: ojusomap/templates/base.html:74 msgid "Map" msgstr "Mapa" -#: ojusomap/templates/base.html:62 +#: ojusomap/templates/base.html:91 msgid "Logout" msgstr "" -#: ojusomap/templates/base.html:67 ojusomap/templates/registration/login.html:7 +#: ojusomap/templates/base.html:96 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:68 +#: ojusomap/templates/base.html:97 #: ojusomap/templates/registration/registration_form.html:20 msgid "Register" msgstr "Inscribir" @@ -1776,6 +1845,23 @@ msgstr "Inscripción" msgid "Create your account and get active!" msgstr "¡Cree su cuenta y ponerse activo!" +#~ 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 "" +#~ "Pon un marcador, usando las herramientas de la izquierde de la mapa. " +#~ "Acerque tanto como se puede, así que el ubicación es " +#~ "precisa (importante)." + +#~ msgid "Country field" +#~ msgstr "País (campo de datos)" + +#~ msgid "Close" +#~ msgstr "Cerrar" + +#~ msgid "Save changes" +#~ msgstr "Guardar cambios" + #~ msgid "Wind" #~ msgstr "Eólica" diff --git a/support/locale/fr/LC_MESSAGES/django.po b/support/locale/fr/LC_MESSAGES/django.po index f75bb72..c9a9600 100644 --- a/support/locale/fr/LC_MESSAGES/django.po +++ b/support/locale/fr/LC_MESSAGES/django.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: apps/map/forms.py:82 apps/map/forms.py:83 +#: apps/map/forms.py:98 apps/map/forms.py:99 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-04 16:54+0000\n" +"POT-Creation-Date: 2018-04-19 17:00+0000\n" "PO-Revision-Date: 2017-11-08 12:40+0000\n" "Last-Translator: Emilie Heidtmann \n" "Language-Team: French ojuso’s aim is to promote best practice in the renewable energy " +"industry, to encourage divestment from ecologically and socially destructive " +"projects, and to foster improvements in supply chain and lifecycle " +"management in the sector.

ojuso provides a platform for " +"information exchange and cooperation between different sectors involved in " +"the renewable energy economy and is supportive of ethical and ecologically " +"sound practices. This platform consists of an online map and database of " +"positive and negative case studies, contributed by communities affected by " +"and leading the transition, and a series of discussion fora and features, " +"contributed by a diversity of players.

You are welcome to submit a " +"case study through this map tool. Following submission, cases will be " +"moderated and, if successful, placed on the map. If you need any help or " +"have any suggestions, please post messages on our " +"forum.

" +msgstr "" + +#: apps/map/templates/map/index.html:120 +msgid "" +"ojuso is a project of Yansa and Gaia Foundation, with support from " +"Swift Foundation." +msgstr "" + +#: apps/map/templates/map/index.html:122 +msgid "OK" +msgstr "" + +#: apps/map/templates/map/index.html:157 msgid "View full case study" msgstr "" -#: apps/map/templates/map/index.html:112 apps/map/templates/map/index.html:143 -msgid "Close" -msgstr "Fermer" - -#: apps/map/templates/map/index.html:146 -msgid "Save changes" -msgstr "Sauvegarder" - -#: ojusomap/settings.py:177 +#: ojusomap/settings.py:181 msgid "English (British)" msgstr "Anglais (Britannique)" -#: ojusomap/settings.py:178 +#: ojusomap/settings.py:182 msgid "French" msgstr "Français" -#: ojusomap/settings.py:179 +#: ojusomap/settings.py:183 msgid "Spanish" msgstr "Espagnol" @@ -1656,21 +1725,21 @@ msgstr "" msgid "Change Name" msgstr "" -#: ojusomap/templates/base.html:45 +#: ojusomap/templates/base.html:74 msgid "Map" msgstr "Carte" -#: ojusomap/templates/base.html:62 +#: ojusomap/templates/base.html:91 msgid "Logout" msgstr "" -#: ojusomap/templates/base.html:67 ojusomap/templates/registration/login.html:7 +#: ojusomap/templates/base.html:96 ojusomap/templates/registration/login.html:7 #: ojusomap/templates/registration/login.html:12 #: ojusomap/templates/registration/login.html:21 msgid "Login" msgstr "Connexion" -#: ojusomap/templates/base.html:68 +#: ojusomap/templates/base.html:97 #: ojusomap/templates/registration/registration_form.html:20 msgid "Register" msgstr "S'inscrire" @@ -1763,6 +1832,23 @@ msgstr "Inscription" msgid "Create your account and get active!" msgstr "Créez votre compte et devenez actif!" +#~ 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 "" +#~ "Placez une marque en utilisant les outils sur la gauche de la carte. " +#~ "Zoomez aussi prèt que vous le pouvez, pour que l'emplacement soit précis " +#~ "(important)." + +#~ msgid "Country field" +#~ msgstr "Pays" + +#~ msgid "Close" +#~ msgstr "Fermer" + +#~ msgid "Save changes" +#~ msgstr "Sauvegarder" + #~ msgid "Wind" #~ msgstr "Éolienne"