ynerant/squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Merge branch 'master' into village

Browse Source
This commit is contained in:
eichhornchen
2020-12-06 11:50:11 +01:00
parent 866af98fe4 6fa11d9dfe
commit d39427f978
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
View File

@ -9,10 +9,14 @@ msgstr ""
"Project-Id-Version: squirrelbattle 3.14.1\n"
"Report-Msgid-Bugs-To: squirrel-battle@crans.org\n"
<<<<<<< HEAD
<<<<<<< HEAD
"POT-Creation-Date: 2020-12-01 17:10+0100\n"
=======
"POT-Creation-Date: 2020-12-05 14:46+0100\n"
>>>>>>> master
=======
"POT-Creation-Date: 2020-12-05 14:46+0100\n"
>>>>>>> master
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -206,7 +210,6 @@ msgstr "Bombe"
#: squirrelbattle/tests/translations_test.py:66
msgid "heart"
msgstr "Herz"
<<<<<<< HEAD
#: squirrelbattle/display/statsdisplay.py:34
msgid "Inventory:"
@ -266,5 +269,3 @@ msgstr "Blumenmacht!!"
#: squirrelbattle/entities/friendly.py:31
msgid "The sun is warm today"
msgstr "Die Sonne ist warm heute"
=======
>>>>>>> master