Fix merge
This commit is contained in:
		@@ -247,10 +247,6 @@ msgstr "Textur-Packung"
 | 
			
		||||
msgid "Language"
 | 
			
		||||
msgstr "Sprache"
 | 
			
		||||
 | 
			
		||||
#: squirrelbattle/tests/translations_test.py:62
 | 
			
		||||
msgid "player"
 | 
			
		||||
msgstr "Spieler"
 | 
			
		||||
 | 
			
		||||
#: squirrelbattle/tests/translations_test.py:64
 | 
			
		||||
msgid "hedgehog"
 | 
			
		||||
msgstr "Igel"
 | 
			
		||||
 
 | 
			
		||||
@@ -246,10 +246,6 @@ msgstr "Paquete de texturas"
 | 
			
		||||
msgid "Language"
 | 
			
		||||
msgstr "Languaje"
 | 
			
		||||
 | 
			
		||||
#: squirrelbattle/tests/translations_test.py:62
 | 
			
		||||
msgid "player"
 | 
			
		||||
msgstr "jugador"
 | 
			
		||||
 | 
			
		||||
#: squirrelbattle/tests/translations_test.py:64
 | 
			
		||||
msgid "hedgehog"
 | 
			
		||||
msgstr "erizo"
 | 
			
		||||
 
 | 
			
		||||
@@ -247,10 +247,6 @@ msgstr "Pack de textures"
 | 
			
		||||
msgid "Language"
 | 
			
		||||
msgstr "Langue"
 | 
			
		||||
 | 
			
		||||
#: squirrelbattle/tests/translations_test.py:62
 | 
			
		||||
msgid "player"
 | 
			
		||||
msgstr "joueur"
 | 
			
		||||
 | 
			
		||||
#: squirrelbattle/tests/translations_test.py:64
 | 
			
		||||
msgid "hedgehog"
 | 
			
		||||
msgstr "hérisson"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user