Merge branch 'village' into 'master'

Village

Closes #41, #38, #37, #36, and #18

See merge request ynerant/squirrel-battle!44

squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squirrelbattle 3.14.1\n"
 "Report-Msgid-Bugs-To: squirrel-battle@crans.org\n"
-"POT-Creation-Date: 2020-12-05 14:46+0100\n"
+"POT-Creation-Date: 2020-12-11 18:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,31 +16,52 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: squirrelbattle/display/menudisplay.py:105
+#: squirrelbattle/display/menudisplay.py:113
 msgid "== INVENTORY =="
 msgstr "== INVENTAIRE =="
 
+#: squirrelbattle/display/menudisplay.py:134
+msgid "== STALL =="
+msgstr "== STAND =="
+
 #: squirrelbattle/display/statsdisplay.py:34
 msgid "Inventory:"
 msgstr "Inventaire :"
 
-#: squirrelbattle/display/statsdisplay.py:50
+#: squirrelbattle/display/statsdisplay.py:53
 msgid "YOU ARE DEAD"
 msgstr "VOUS ÊTES MORT"
 
+#. TODO
+#: squirrelbattle/entities/friendly.py:33
+msgid "I don't sell any squirrel"
+msgstr "Je ne vends pas d'écureuil"
+
+#: squirrelbattle/entities/friendly.py:46
+msgid "Flower power!!"
+msgstr "Pouvoir des fleurs !"
+
+#: squirrelbattle/entities/friendly.py:46
+msgid "The sun is warm today"
+msgstr "Le soleil est chaud aujourd'hui"
+
 #. The bomb is exploding.
 #. Each entity that is close to the bomb takes damages.
 #. The player earn XP if the entity was killed.
-#: squirrelbattle/entities/items.py:128
+#: squirrelbattle/entities/items.py:151
 msgid "Bomb is exploding."
 msgstr "La bombe explose."
 
-#: squirrelbattle/entities/items.py:172
+#: squirrelbattle/entities/items.py:224
 #, python-brace-format
 msgid "{player} exchanged its body with {entity}."
 msgstr "{player} a échangé son corps avec {entity}."
 
-#: squirrelbattle/game.py:177
+#: squirrelbattle/game.py:199 squirrelbattle/tests/game_test.py:537
+msgid "You do not have enough money"
+msgstr ""
+
+#: squirrelbattle/game.py:243
 msgid ""
 "Some keys are missing in your save file.\n"
 "Your save seems to be corrupt. It got deleted."
@@ -48,7 +69,7 @@ msgstr ""
 "Certaines clés de votre ficher de sauvegarde sont manquantes.\n"
 "Votre sauvegarde semble corrompue. Elle a été supprimée."
 
-#: squirrelbattle/game.py:185
+#: squirrelbattle/game.py:251
 msgid ""
 "No player was found on this map!\n"
 "Maybe you died?"
@@ -56,7 +77,7 @@ msgstr ""
 "Aucun joueur n'a été trouvé sur la carte !\n"
 "Peut-être êtes-vous mort ?"
 
-#: squirrelbattle/game.py:205
+#: squirrelbattle/game.py:271
 msgid ""
 "The JSON file is not correct.\n"
 "Your save seems corrupted. It got deleted."
@@ -64,27 +85,27 @@ msgstr ""
 "Le fichier JSON de sauvegarde est incorrect.\n"
 "Votre sauvegarde semble corrompue. Elle a été supprimée."
 
-#: squirrelbattle/interfaces.py:400
+#: squirrelbattle/interfaces.py:429
 #, python-brace-format
 msgid "{name} hits {opponent}."
 msgstr "{name} frappe {opponent}."
 
-#: squirrelbattle/interfaces.py:412
+#: squirrelbattle/interfaces.py:441
 #, python-brace-format
 msgid "{name} takes {amount} damage."
 msgstr "{name} prend {amount} points de dégât."
 
-#: squirrelbattle/interfaces.py:414
+#: squirrelbattle/interfaces.py:443
 #, python-brace-format
 msgid "{name} dies."
 msgstr "{name} meurt."
 
-#: squirrelbattle/menus.py:72
+#: squirrelbattle/menus.py:73
 msgid "Back"
 msgstr "Retour"
 
-#: squirrelbattle/tests/game_test.py:300 squirrelbattle/tests/game_test.py:303
-#: squirrelbattle/tests/game_test.py:306
+#: squirrelbattle/tests/game_test.py:314 squirrelbattle/tests/game_test.py:317
+#: squirrelbattle/tests/game_test.py:320
 #: squirrelbattle/tests/translations_test.py:16
 msgid "New game"
 msgstr "Nouvelle partie"
@@ -162,41 +183,49 @@ msgid "Key used to drop an item in the inventory"
 msgstr "Touche pour jeter un objet de l'inventaire"
 
 #: squirrelbattle/tests/translations_test.py:53
+msgid "Key used to talk to a friendly entity"
+msgstr "Touche pour parler à une entité pacifique"
+
+#: squirrelbattle/tests/translations_test.py:55
 msgid "Texture pack"
 msgstr "Pack de textures"
 
-#: squirrelbattle/tests/translations_test.py:54
+#: squirrelbattle/tests/translations_test.py:56
 msgid "Language"
 msgstr "Langue"
 
-#: squirrelbattle/tests/translations_test.py:57
+#: squirrelbattle/tests/translations_test.py:59
 msgid "player"
 msgstr "joueur"
 
-#: squirrelbattle/tests/translations_test.py:59
+#: squirrelbattle/tests/translations_test.py:61
 msgid "tiger"
 msgstr "tigre"
 
-#: squirrelbattle/tests/translations_test.py:60
+#: squirrelbattle/tests/translations_test.py:62
 msgid "hedgehog"
 msgstr "hérisson"
 
-#: squirrelbattle/tests/translations_test.py:61
+#: squirrelbattle/tests/translations_test.py:63
 msgid "rabbit"
 msgstr "lapin"
 
-#: squirrelbattle/tests/translations_test.py:62
+#: squirrelbattle/tests/translations_test.py:64
 msgid "teddy bear"
 msgstr "nounours"
 
-#: squirrelbattle/tests/translations_test.py:64
+#: squirrelbattle/tests/translations_test.py:66
 msgid "body snatch potion"
 msgstr "potion d'arrachage de corps"
 
-#: squirrelbattle/tests/translations_test.py:65
+#: squirrelbattle/tests/translations_test.py:67
 msgid "bomb"
 msgstr "bombe"
 
-#: squirrelbattle/tests/translations_test.py:66
+#: squirrelbattle/tests/translations_test.py:68
 msgid "heart"
 msgstr "cœur"
+
+#: squirrelbattle/tests/translations_test.py:69
+msgid "sword"
+msgstr "épée"