Merge pull request #215 from ungleich/develop

Develop
This commit is contained in:
Levi Velázquez 2017-04-26 11:15:03 -05:00 committed by GitHub
commit 0a5a9630cf
3 changed files with 14 additions and 3 deletions

11
.travis.yml Normal file
View file

@ -0,0 +1,11 @@
language: python
python:
- "3.5"
- "3.6"
env:
# Set a dummy secret key
- DJANGO_SECRET_KEY=0
# install dependencies
install: "pip install -r requirements.txt"
script: python manage.py test

View file

@ -29,7 +29,7 @@ msgstr "Über"
#: templates/alplora/index.html:103 templates/alplora/index.html.py:249
#: templates/alplora/index.html:519
msgid "Why Alplora?"
msgstr "Warum Alplora"
msgstr "Warum Alplora?"
#: templates/alplora/index.html:106 templates/alplora/index.html.py:516
msgid "Usecase"
@ -131,7 +131,7 @@ msgstr ""
#: templates/alplora/index.html:236
msgid "Find your animal"
msgstr "Sind deine Tiere..."
msgstr "Finde deine Tiere"
#: templates/alplora/index.html:239
msgid ""
@ -288,7 +288,7 @@ msgstr "Klicke unten auf Kontakt und hinterlasse uns deine Angaben."
#: templates/alplora/index.html:420
msgid "Team Alplora will contact you and visit you with a tracking device."
msgstr "Das Alpora Team wird sich mit Dir schnellstens in Verbindung setzen"
msgstr "Das Alpora Team wird sich mit Dir schnellstens in Verbindung setzen."
#: templates/alplora/index.html:437
msgid "New message"