From d5cb745def516ebe7462e51aed3cc8f878ab7ab3 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Thu, 9 Mar 2023 16:56:43 +0000 Subject: [PATCH] Fixed thorns death message incorrect order --- mods/HUD/mcl_death_messages/init.lua | 2 +- mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr | 2 +- mods/HUD/mcl_death_messages/locale/mcl_death_messages.es.tr | 5 +++-- mods/HUD/mcl_death_messages/locale/mcl_death_messages.fr.tr | 2 +- mods/HUD/mcl_death_messages/locale/mcl_death_messages.ja.tr | 2 +- mods/HUD/mcl_death_messages/locale/mcl_death_messages.pl.tr | 2 +- mods/HUD/mcl_death_messages/locale/mcl_death_messages.ru.tr | 3 ++- mods/HUD/mcl_death_messages/locale/template.txt | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/mods/HUD/mcl_death_messages/init.lua b/mods/HUD/mcl_death_messages/init.lua index 00de9228c..54ca990ff 100644 --- a/mods/HUD/mcl_death_messages/init.lua +++ b/mods/HUD/mcl_death_messages/init.lua @@ -132,7 +132,7 @@ mcl_death_messages = { thorns = { _translator = S, killer = "@1 was killed trying to hurt @2", - item = "@1 was killed by @3 trying to hurt @2", -- yes, the order is intentional: @1 @3 @2 + item = "@1 tried to hurt @2 and died by @3", }, explosion = { _translator = S, diff --git a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr index 39235dff7..7e1126b69 100644 --- a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr +++ b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr @@ -48,7 +48,7 @@ @1 was fireballed by @2=@1 wurde von @2 gefeuerballt @1 was fireballed by @2 using @3=@1 wurde von @2 mit @3 gefeuerballt @1 was killed trying to hurt @2=@1 ist bei dem Versuch, @2 zu verletzten gestorben -@1 was killed by @3 trying to hurt @2=@1 ist bei dem Versuch, @2 zu verletzten, von @3 getötet worden +@1 tried to hurt @2 and died by @3=@1 versuchte @2 zu verletzen und starb von @3 @1 blew up=@1 ist gesprengt worden @1 was blown up by @2=@1 wurde von @2 gesprengt @1 was blown up by @2 using @3=@1 wurde von @2 mit @3 gesprengt diff --git a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.es.tr b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.es.tr index a56199e00..eb55d2e74 100644 --- a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.es.tr +++ b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.es.tr @@ -20,6 +20,8 @@ A ghast scared @1 to death.=Se ha asustado @1 hasta morir. @1 took fatal fall damage.=@1 se hizo daño crítico por una caída. @1 fell victim to gravity.=@1 cayó víctima de la gravedad. @1 died.=@1 murió. +@1 was slain by @2.= +@1 tried to hurt @2 and died by @3=@1 trató de lastimar a @2 y murió por @3 @1 was killed by a zombie.=@1 fue asesinado por un zombie. @1 was killed by a baby zombie.=@1 fue asesinado por un bebé zombie. @1 was killed by a blaze.=@1 fue asesinado por una llamarada. @@ -54,5 +56,4 @@ A ghast scared @1 to death.=Se ha asustado @1 hasta morir. @1 was killed by a husk.=@1 fue asesinado por un husk. @1 was killed by a baby husk.=@1 fue asesinado por un bebé husk. @1 was killed by a zombie pigman.=@1 fue asesinado por un cerdo zombie. -@1 was killed by a baby zombie pigman.=@1 fue asesinado por un bebé cerdo zombie. -@1 was slain by @2.= +@1 was killed by a baby zombie pigman.=@1 fue asesinado por un bebé cerdo zombie. \ No newline at end of file diff --git a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.fr.tr b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.fr.tr index 6bf704400..2d7a5392b 100644 --- a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.fr.tr +++ b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.fr.tr @@ -45,7 +45,7 @@ @1 was fireballed by @2=@1 a reçu une balle de feu lancée par @2 @1 was fireballed by @2 using @3=@1 a reçu une balle de feu lancée par @2 en utilisant @3 @1 was killed trying to hurt @2=@1 a été tué(e) en essayant de blesser @2 -@1 was killed by @3 trying to hurt @2=@1 a été tué(e) par @3 en essayant de blesser @2 +@1 tried to hurt @2 and died by @3=@1 a essayé de blesser @2 et est mort par @3 @1 blew up=@1 a explosé @1 was blown up by @2=@2 a fait exploser @1 @1 was blown up by @2 using @3=@2 a fait exploser @1 en utilisant @3 diff --git a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.ja.tr b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.ja.tr index a725b261f..c695001f6 100644 --- a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.ja.tr +++ b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.ja.tr @@ -45,7 +45,7 @@ @1 was fireballed by @2=@1は@2によって火だるまにされた @1 was fireballed by @2 using @3=@1は@2の使った@3によって火だるまにされた @1 was killed trying to hurt @2=@1は@2を傷めつけようとして殺された -@1 was killed by @3 trying to hurt @2=@1は@2を傷めつけようとした@3に殺された +@1 tried to hurt @2 and died by @3=@1は@2を傷めつけようとした@3に殺された @1 blew up=@1は消し飛んだ @1 was blown up by @2=@1は@2によって爆破された @1 was blown up by @2 using @3=@1は@2の使った@3によって爆破された diff --git a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.pl.tr b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.pl.tr index 65fcde760..d22b31bc1 100644 --- a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.pl.tr +++ b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.pl.tr @@ -48,7 +48,7 @@ @1 was fireballed by @2=@1 została zabita kulą ognia przez @2 @1 was fireballed by @2 using @3=@1 została zabita kulą ognia przez @2 przy użyciu @3 @1 was killed trying to hurt @2=@1 została zabita gdy próbowała skrzywdzić @2 -@1 was killed by @3 trying to hurt @2=@1 została zabita przez @3 gdy próbowała skrzywdzić @2 +@1 tried to hurt @2 and died by @3=@1 próbował skrzywdzić @2 i zginął przed @3 @1 blew up=@1 wybuchła @1 was blown up by @2=@1 została wysadzona przez @2 @1 was blown up by @2 using @3=@1 została wysadzona przez @2 przy użyciu @3 diff --git a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.ru.tr b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.ru.tr index d5b6ec396..fd04bd860 100644 --- a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.ru.tr +++ b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.ru.tr @@ -21,6 +21,8 @@ A ghast scared @1 to death.=Гаст напугал @1 до смерти. @1 took fatal fall damage.=@1 получил(а) смертельный урон от падения. @1 fell victim to gravity.=@1 стал(а) жертвой гравитации. @1 died.=@1 умер(ла). +@1 was slain by @2.= +@1 tried to hurt @2 and died by @3=@1 пытался навредить @2 и умер от @3 @1 was killed by a zombie.=@1 был(а) убит(а) зомби. @1 was killed by a baby zombie.=@1 был(а) убит(а) малышом-зомби. @1 was killed by a blaze.=@1 был(а) убит(а) ифритом. @@ -56,4 +58,3 @@ A ghast scared @1 to death.=Гаст напугал @1 до смерти. @1 was killed by a baby husk.=@1 был(а) убит(а) машылом-кадавром. @1 was killed by a zombie pigman.=@1 был(а) убит(а) зомби-свиночеловеком. @1 was killed by a baby zombie pigman.=@1 был(а) убит(а) малышом-зомби-свиночеловеком. -@1 was slain by @2.= diff --git a/mods/HUD/mcl_death_messages/locale/template.txt b/mods/HUD/mcl_death_messages/locale/template.txt index 711dfb89b..38af64379 100644 --- a/mods/HUD/mcl_death_messages/locale/template.txt +++ b/mods/HUD/mcl_death_messages/locale/template.txt @@ -45,7 +45,7 @@ @1 was fireballed by @2= @1 was fireballed by @2 using @3= @1 was killed trying to hurt @2= -@1 was killed by @3 trying to hurt @2= +@1 tried to hurt @2 and died by @3= @1 blew up= @1 was blown up by @2= @1 was blown up by @2 using @3=