autonomic-cooperative/ojuso-map
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Weblate 2017-09-22 15:23:03 +00:00
parent 7ad263fff7
commit 141f3c8dea
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
support/locale/es/LC_MESSAGES/django.po
View File

@ -7,9 +7,15 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-09-22 14:59+0000\n" "POT-Creation-Date: 2017-09-22 14:59+0000\n"
"PO-Revision-Date: 2017-06-16 17:00+0000\n" "PO-Revision-Date: 2017-06-16 17:00+0000\n"
"Last-Translator: Livvy <livvy@base.nu>\n" "Last-Translator: Livvy <livvy@base.nu>\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 <tom@ojuso.org>\n"
>>>>>>> Manually commit changes from weblate
"Language-Team: Spanish <http://translate.ojuso.org/projects/platform/map/es/>" "Language-Team: Spanish <http://translate.ojuso.org/projects/platform/map/es/>"
"\n" "\n"
"Language: es\n" "Language: es\n"
@ -21,7 +27,7 @@ msgstr ""
#: apps/map/templates/map/base.html:15 apps/map/templates/map/index.html:15 #: apps/map/templates/map/base.html:15 apps/map/templates/map/index.html:15
msgid "Ojuso Platform Map" msgid "Ojuso Platform Map"
msgstr "" msgstr "Mapa del Plataforma Ojuso"
#: apps/map/templates/map/form.html:15 apps/map/templates/map/index.html:108 #: apps/map/templates/map/form.html:15 apps/map/templates/map/index.html:108
msgid "Submit a Case Study" msgid "Submit a Case Study"