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

Fix merge

This commit is contained in:
Yohann D'ANELLO 2021-01-08 02:15:13 +01:00
parent 451dd9cba7
commit affc1bae59
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
4 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
squirrelbattle/entities/player.py
View File

@ -2,10 +2,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
from random import randint from random import randint
<<<<<<< squirrelbattle/entities/player.py
from typing import Dict, Optional, Tuple from typing import Dict, Optional, Tuple
=======
>>>>>>> squirrelbattle/entities/player.py
from .items import Item from .items import Item
from ..interfaces import FightingEntity, InventoryHolder from ..interfaces import FightingEntity, InventoryHolder

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

@ -247,10 +247,6 @@ msgstr "Textur-Packung"
msgid "Language" msgid "Language"
msgstr "Sprache" msgstr "Sprache"
#: squirrelbattle/tests/translations_test.py:62
msgid "player"
msgstr "Spieler"
#: squirrelbattle/tests/translations_test.py:64 #: squirrelbattle/tests/translations_test.py:64
msgid "hedgehog" msgid "hedgehog"
msgstr "Igel" msgstr "Igel"

4
squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
View File

@ -246,10 +246,6 @@ msgstr "Paquete de texturas"
msgid "Language" msgid "Language"
msgstr "Languaje" msgstr "Languaje"
#: squirrelbattle/tests/translations_test.py:62
msgid "player"
msgstr "jugador"
#: squirrelbattle/tests/translations_test.py:64 #: squirrelbattle/tests/translations_test.py:64
msgid "hedgehog" msgid "hedgehog"
msgstr "erizo" msgstr "erizo"

4
squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
View File

@ -247,10 +247,6 @@ msgstr "Pack de textures"
msgid "Language" msgid "Language"
msgstr "Langue" msgstr "Langue"
#: squirrelbattle/tests/translations_test.py:62
msgid "player"
msgstr "joueur"
#: squirrelbattle/tests/translations_test.py:64 #: squirrelbattle/tests/translations_test.py:64
msgid "hedgehog" msgid "hedgehog"
msgstr "hérisson" msgstr "hérisson"