Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Thorns translation crash fix' (#3525) from translation_thorns_issue into master 

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3525
make-new-music-louder
ancientmarinerdev 2023-03-12 21:23:04 +00:00
parent 639cec4989 4e363049e1
commit 4fe4559e6d
8 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/HUD/mcl_death_messages/init.lua
View File

@ -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,
@ -149,7 +149,7 @@ mcl_death_messages = {
fireworks = {
_translator = S,
plain = "@1 went off with a bang",
item = "@1 went off with a bang due to a firework fired from @3 by @2", -- order is intentional
item = "@1 went off with a bang due to a firework fired by @2 from @3",
},
sweet_berry = {
_translator = S,

4
mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr
View File

@ -48,11 +48,11 @@
@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
@1 was squished too much=@1 war zu gequetscht
@1 was squashed by @2=@1 wurde von @2 erquetscht
@1 went off with a bang=@1 ging mit einem Knall ab
@1 went off with a bang due to a firework fired from @3 by @2=@1 ging mit einem Knall wegen eines Feuerwerks, das mit @3 von @2 gefeuert wurde, ab
@1 went off with a bang due to a firework fired by @2 from @3=@1 ging mit einem Knall los aufgrund eines Feuerwerks, das von @2 von @3 abgefeuert wurde

6
mods/HUD/mcl_death_messages/locale/mcl_death_messages.es.tr
View File

@ -20,6 +20,9 @@ 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 went off with a bang due to a firework fired by @2 from @3=@1 se disparó con fuerza debido a un fuego artificial disparado por @2 desde @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 +57,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.

4
mods/HUD/mcl_death_messages/locale/mcl_death_messages.fr.tr
View File

@ -45,11 +45,11 @@
@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
@1 was squished too much=@1 a été pressé(e) un peu trop
@1 was squashed by @2=@1 a été écrasé(e) par @2
@1 went off with a bang=@1 est parti(e) avec un bang
@1 went off with a bang due to a firework fired from @3 by @2=@1 est parti(e) avec un bang dû à un feu d'artifice tiré depuis @3 par @2
@1 went off with a bang due to a firework fired by @2 from @3=@1 a explosé à cause d'un feu d'artifice tiré par @2 depuis @3

4
mods/HUD/mcl_death_messages/locale/mcl_death_messages.ja.tr
View File

@ -45,11 +45,11 @@
@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によって爆破された
@1 was squished too much=@1はペラッペラになった
@1 was squashed by @2=@1は@2に潰された
@1 went off with a bang=@1は爆散した
@1 went off with a bang due to a firework fired from @3 by @2=@1は@2が@3から発射した花火により爆散した
@1 went off with a bang due to a firework fired by @2 from @3=@1は@2が@3から発射した花火により爆散した

4
mods/HUD/mcl_death_messages/locale/mcl_death_messages.pl.tr
View File

@ -48,12 +48,12 @@
@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
@1 was squished too much=@1 została zbyt mocno ściśnięta
@1 was squashed by @2=@1 została ściśnięta przez @2
@1 went off with a bang=@1 odeszła z hukiem
@1 went off with a bang due to a firework fired from @3 by @2=@1 odeszła z hukiem przez fajerwerki wystrzelone z @3 przez @2
@1 went off with a bang due to a firework fired by @2 from @3=@1 wybuchł z hukiem z powodu fajerwerków wystrzelonych przez @2 z @3

4
mods/HUD/mcl_death_messages/locale/mcl_death_messages.ru.tr
View File

@ -21,6 +21,9 @@ 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 went off with a bang due to a firework fired by @2 from @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 +59,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.=

4
mods/HUD/mcl_death_messages/locale/template.txt
View File

@ -45,11 +45,11 @@
@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=
@1 was squished too much=
@1 was squashed by @2=
@1 went off with a bang=
@1 went off with a bang due to a firework fired from @3 by @2=
@1 went off with a bang due to a firework fired by @2 from @3=