diff --git a/support/locale/es/LC_MESSAGES/django.po b/support/locale/es/LC_MESSAGES/django.po index aa5742d..ee99314 100644 --- a/support/locale/es/LC_MESSAGES/django.po +++ b/support/locale/es/LC_MESSAGES/django.po @@ -7,9 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2017-09-22 14:59+0000\n" "PO-Revision-Date: 2017-06-16 17:00+0000\n" "Last-Translator: Livvy \n" +======= +"POT-Creation-Date: 2017-06-16 16:18+0000\n" +"PO-Revision-Date: 2017-09-22 15:06+0000\n" +"Last-Translator: Tom Wragg \n" +>>>>>>> Manually commit changes from weblate "Language-Team: Spanish " "\n" "Language: es\n" @@ -21,7 +27,7 @@ msgstr "" #: apps/map/templates/map/base.html:15 apps/map/templates/map/index.html:15 msgid "Ojuso Platform Map" -msgstr "" +msgstr "Mapa del Plataforma Ojuso" #: apps/map/templates/map/form.html:15 apps/map/templates/map/index.html:108 msgid "Submit a Case Study"