Merge branch 'master' into 'equipment'

# Conflicts:
#   squirrelbattle/display/statsdisplay.py
#   squirrelbattle/entities/items.py
#   squirrelbattle/entities/player.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/tests/game_test.py

squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po

@@ -83,11 +83,21 @@ msgstr "Die Bombe explodiert."
 msgid "{player} exchanged its body with {entity}."
 msgstr "{player} täuscht seinem Körper mit {entity} aus."
 
-#: squirrelbattle/game.py:228 squirrelbattle/tests/game_test.py:595
+#: squirrelbattle/game.py:182
+#, python-brace-format
+msgid "The player climbs down to the floor {floor}."
+msgstr "Der Spieler klettert auf dem Stock {floor} hinunter."
+
+#: squirrelbattle/game.py:195
+#, python-brace-format
+msgid "The player climbs up the floor {floor}."
+msgstr "Der Spieler klettert auf dem Stock {floor} hinoben."
+
+#: squirrelbattle/game.py:285 squirrelbattle/tests/game_test.py:592
 msgid "The buyer does not have enough money"
 msgstr "Der Kaufer hat nicht genug Geld"
 
-#: squirrelbattle/game.py:271
+#: squirrelbattle/game.py:328
 msgid ""
 "Some keys are missing in your save file.\n"
 "Your save seems to be corrupt. It got deleted."
@@ -95,7 +105,7 @@ msgstr ""
 "In Ihrer Speicherdatei fehlen einige Schlüssel.\n"
 "Ihre Speicherung scheint korrupt zu sein. Es wird gelöscht."
 
-#: squirrelbattle/game.py:279
+#: squirrelbattle/game.py:336
 msgid ""
 "No player was found on this map!\n"
 "Maybe you died?"
@@ -103,7 +113,7 @@ msgstr ""
 "Auf dieser Karte wurde kein Spieler gefunden!\n"
 "Vielleicht sind Sie gestorben?"
 
-#: squirrelbattle/game.py:299
+#: squirrelbattle/game.py:356
 msgid ""
 "The JSON file is not correct.\n"
 "Your save seems corrupted. It got deleted."
@@ -120,17 +130,17 @@ msgstr ""
 msgid "{name} hits {opponent}."
 msgstr "{name} schlägt {opponent}."
 
-#: squirrelbattle/interfaces.py:466
+#: squirrelbattle/interfaces.py:465
 #, python-brace-format
 msgid "{name} takes {damage} damage."
 msgstr ""
 
-#: squirrelbattle/interfaces.py:468
+#: squirrelbattle/interfaces.py:467
 #, python-brace-format
 msgid "{name} dies."
 msgstr "{name} stirbt."
 
-#: squirrelbattle/interfaces.py:502
+#: squirrelbattle/interfaces.py:501
 #, python-brace-format
 msgid "{entity} said: {message}"
 msgstr "{entity} hat gesagt: {message}"
@@ -139,8 +149,8 @@ msgstr "{entity} hat gesagt: {message}"
 msgid "Back"
 msgstr "Zurück"
 
-#: squirrelbattle/tests/game_test.py:361 squirrelbattle/tests/game_test.py:364
-#: squirrelbattle/tests/game_test.py:367 squirrelbattle/tests/game_test.py:370
+#: squirrelbattle/tests/game_test.py:358 squirrelbattle/tests/game_test.py:361
+#: squirrelbattle/tests/game_test.py:364 squirrelbattle/tests/game_test.py:367
 #: squirrelbattle/tests/translations_test.py:16
 msgid "New game"
 msgstr "Neu Spiel"
@@ -226,53 +236,61 @@ msgid "Key used to wait"
 msgstr "Wartentaste"
 
 #: squirrelbattle/tests/translations_test.py:56
+msgid "Key used to use ladders"
+msgstr "Leitertaste"
+
+#: squirrelbattle/tests/translations_test.py:58
 msgid "Texture pack"
 msgstr "Textur-Packung"
 
-#: squirrelbattle/tests/translations_test.py:57
+#: squirrelbattle/tests/translations_test.py:59
 msgid "Language"
 msgstr "Sprache"
 
 #: squirrelbattle/tests/translations_test.py:62
+msgid "player"
+msgstr "Spieler"
+
+#: squirrelbattle/tests/translations_test.py:64
 msgid "hedgehog"
 msgstr "Igel"
 
-#: squirrelbattle/tests/translations_test.py:63
+#: squirrelbattle/tests/translations_test.py:65
 msgid "merchant"
 msgstr "Kaufmann"
 
-#: squirrelbattle/tests/translations_test.py:64
+#: squirrelbattle/tests/translations_test.py:66
 msgid "rabbit"
 msgstr "Kanninchen"
 
-#: squirrelbattle/tests/translations_test.py:65
+#: squirrelbattle/tests/translations_test.py:67
 msgid "sunflower"
 msgstr "Sonnenblume"
 
-#: squirrelbattle/tests/translations_test.py:66
+#: squirrelbattle/tests/translations_test.py:68
 msgid "teddy bear"
 msgstr "Teddybär"
 
-#: squirrelbattle/tests/translations_test.py:67
+#: squirrelbattle/tests/translations_test.py:69
 msgid "tiger"
 msgstr "Tiger"
 
-#: squirrelbattle/tests/translations_test.py:69
+#: squirrelbattle/tests/translations_test.py:71
 msgid "body snatch potion"
 msgstr "Leichenfleddererzaubertrank"
 
-#: squirrelbattle/tests/translations_test.py:70
+#: squirrelbattle/tests/translations_test.py:72
 msgid "bomb"
 msgstr "Bombe"
 
-#: squirrelbattle/tests/translations_test.py:71
+#: squirrelbattle/tests/translations_test.py:73
 msgid "explosion"
 msgstr "Explosion"
 
-#: squirrelbattle/tests/translations_test.py:72
+#: squirrelbattle/tests/translations_test.py:74
 msgid "heart"
 msgstr "Herz"
 
-#: squirrelbattle/tests/translations_test.py:73
+#: squirrelbattle/tests/translations_test.py:75
 msgid "sword"
 msgstr "schwert"