Merge branch 'master' into luacheck-script

2021-05-03 23:24:55 +02:00 · 2021-05-03 23:24:55 +02:00 · f0ec64528c
commit f0ec64528c
parent cbb014ed38 f528b31d48
5 changed files with 5 additions and 1 deletions
--- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.de.tr
+++ b/mods/ENTITIES/mobs_mc/locale/mobs_mc.de.tr
@ -28,6 +28,7 @@ Pig=Schwein
 Polar Bear=Eisbär
 Rabbit=Kaninchen
 Killer Bunny=Killerkaninchen
+The Killer Bunny=Das Killerkaninchen
 Sheep=Schaf
 Shulker=Shulker
 Silverfish=Silberfischchen
--- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr
+++ b/mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr
@ -28,6 +28,7 @@ Pig=Cerdo
 Polar Bear=Oso polar
 Rabbit=Conejo
 Killer Bunny=Conejo asesino
+The Killer Bunny=El Conejo asesino
 Sheep=Oveja
 Shulker=Shulker
 Silverfish=Lepisma
--- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr
+++ b/mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr
@ -28,6 +28,7 @@ Pig=Cochon
 Polar Bear=Ours blanc
 Rabbit=Lapin
 Killer Bunny=Lapin tueur
+The Killer Bunny=Le Lapin tueur
 Sheep=Mouton
 Shulker=Shulker
 Silverfish=Poisson d'argent
--- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.ru.tr
+++ b/mods/ENTITIES/mobs_mc/locale/mobs_mc.ru.tr
@ -28,6 +28,7 @@ Pig=Свинья
 Polar Bear=Полярный медведь
 Rabbit=Кролик
 Killer Bunny=Кролик-убийца
+The Killer Bunny=Кролик-убийца
 Sheep=Овца
 Shulker=Шалкер
 Silverfish=Чешуйница
--- a/mods/ENTITIES/mobs_mc/rabbit.lua
+++ b/mods/ENTITIES/mobs_mc/rabbit.lua
@ -99,7 +99,7 @@ killer_bunny.on_rightclick = nil
 killer_bunny.run_velocity = 6
 killer_bunny.do_custom = function(self)
 	if not self._killer_bunny_nametag_set then
-		self.nametag = "The Killer Bunny"
+		self.nametag = S("The Killer Bunny")
 		self._killer_bunny_nametag_set = true
 	end
 end