Merge branch 'master' into village

squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po

@@ -8,11 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squirrelbattle 3.14.1\n"
 "Report-Msgid-Bugs-To: squirrel-battle@crans.org\n"
-<<<<<<< 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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,10 +31,8 @@ msgstr "Inventaire :"
 msgid "YOU ARE DEAD"
 msgstr "VOUS ÊTES MORT"
 
-<<<<<<< HEAD
 #: squirrelbattle/interfaces.py:394 squirrelbattle/interfaces.py:398
 #: squirrelbattle/interfaces.py:408
-=======
 #. The bomb is exploding.
 #. Each entity that is close to the bomb takes damages.
 #. The player earn XP if the entity was killed.
@@ -74,17 +70,13 @@ msgstr ""
 "Votre sauvegarde semble corrompue. Elle a été supprimée."
 
 #: squirrelbattle/interfaces.py:400
->>>>>>> master
 #, python-brace-format
 msgid "{name} hits {opponent}."
 msgstr "{name} frappe {opponent}."
 
-<<<<<<< HEAD
 #: squirrelbattle/interfaces.py:405 squirrelbattle/interfaces.py:410
 #: squirrelbattle/interfaces.py:420
-=======
 #: squirrelbattle/interfaces.py:412
->>>>>>> master
 #, python-brace-format
 msgid "{name} takes {amount} damage."
 msgstr "{name} prend {amount} points de dégât."
@@ -185,7 +177,6 @@ msgstr "Pack de textures"
 msgid "Language"
 msgstr "Langue"
 
-<<<<<<< HEAD
 #: squirrelbattle/interfaces.py:407 squirrelbattle/interfaces.py:412
 #: squirrelbattle/interfaces.py:422
 #, python-brace-format
@@ -194,9 +185,7 @@ msgstr "{name} meurt."
 
 #: squirrelbattle/tests/translations_test.py:47
 #: squirrelbattle/tests/translations_test.py:49
-=======
 #: squirrelbattle/tests/translations_test.py:57
->>>>>>> master
 msgid "player"
 msgstr "joueur"