Clean up more potion-related strings

mods/HUD/mcl_inventory/locale/mcl_inventory.de.tr

@@ -7,6 +7,7 @@ Building Blocks=Baublöcke
 Decoration Blocks=Dekoblöcke
 Redstone=Redstone
 Transportation=Transport
+Brewing=Gebräu
 Miscellaneous=Sonstiges
 Search Items=Gegenstände durchsuchen
 Foodstuffs=Lebensmittel

mods/HUD/mcl_inventory/locale/mcl_inventory.es.tr

@@ -7,6 +7,7 @@ Building Blocks=Bloques de construcción
 Decoration Blocks=Bloques de decoración
 Redstone=Redstone
 Transportation=Transporte
+Brewing=
 Miscellaneous=Variado
 Search Items=Buscar artículos
 Foodstuffs=Productos alimenticios

mods/HUD/mcl_inventory/locale/mcl_inventory.fr.tr

@@ -7,6 +7,7 @@ Building Blocks=Blocs de Construction
 Decoration Blocks=Blocs de Décoration
 Redstone=Redstone
 Transportation=Transport
+Brewing=
 Miscellaneous=Divers
 Search Items=Rechercher des objets
 Foodstuffs=Denrées alimentaires

mods/HUD/mcl_inventory/locale/mcl_inventory.ru.tr

@@ -7,6 +7,7 @@ Building Blocks=Строительные блоки
 Decoration Blocks=Декоративные блоки
 Redstone=Редстоун (красный камень)
 Transportation=Транспорт
+Brewing=
 Miscellaneous=Прочее
 Search Items=Искать предметы
 Foodstuffs=Продовольствие

mods/HUD/mcl_inventory/locale/template.txt

@@ -7,6 +7,7 @@ Building Blocks=
 Decoration Blocks=
 Redstone=
 Transportation=
+Brewing=
 Miscellaneous=
 Search Items=
 Foodstuffs=

mods/ITEMS/mcl_potions/init.lua

@@ -278,8 +278,8 @@ minetest.register_craftitem("mcl_potions:river_water", {
 })
 
 -- TODO: Extinguish fire, damage mobs
-mcl_potions.register_splash("water", S("Splash Water Bottle"), "#0022FF", {tt="No effect", potion_fun=function() end})
-mcl_potions.register_lingering("water", S("Lingering Water Bottle"), "#0022FF", {tt="No effect", potion_fun=function() end})
+mcl_potions.register_splash("water", S("Splash Water Bottle"), "#0022FF", {tt=S("No effect"), potion_fun=function() end})
+mcl_potions.register_lingering("water", S("Lingering Water Bottle"), "#0022FF", {tt=S("No effect"), potion_fun=function() end})
 
 minetest.register_craftitem("mcl_potions:speckled_melon", {
 	description = S("Glistering Melon"),

mods/ITEMS/mcl_potions/potions.lua

@@ -67,10 +67,10 @@ local function register_potion(def)
 		if effect and def.is_dur then
 			_tt = perc_string(effect).." | "..time_string(dur)
 			if def.name == "poison" or def.name == "regeneration" then
-				_tt = "1/2 heart/"..effect.."s | "..time_string(dur)
+				_tt = S("1 HP/@1s | @2", effect, time_string(dur))
 			end
 		elseif def.name == "healing" or def.name == "harming" then
-				_tt = ((effect / 2) - ((effect / 2)% 0.5)).." hearts"
+				_tt = S("@1 HP", effect)
  		else
 			_tt = tt or time_string(dur) or S("No effect")
 		end
@@ -109,7 +109,11 @@ local function register_potion(def)
 
 	local desc
 	if not def.no_potion then
+		if def.description_potion then
+			desc = def.description_potion
+		else
 			desc = S("@1 Potion", def.description)
+		end
 	else
 		desc = def.description
 	end
@@ -173,8 +177,19 @@ local function register_potion(def)
 	}
 
 	if def.color and not def.no_throwable then
-		mcl_potions.register_splash(def.name, S("Splash @1 Potion", def.description), def.color, splash_def)
-		mcl_potions.register_lingering(def.name, S("Lingering @1 Potion", def.description), def.color, ling_def)
+		local desc
+		if def.description_splash then
+			desc = def.description_splash
+		else
+			desc = S("Splash @1 Potion", def.description)
+		end
+		mcl_potions.register_splash(def.name, desc, def.color, splash_def)
+		if def.description_lingering then
+			desc = def.description_lingering
+		else
+			desc = S("Lingering @1 Potion", def.description)
+		end
+		mcl_potions.register_lingering(def.name, desc, def.color, ling_def)
 		if not def.no_arrow then
 			mcl_potions.register_arrow(def.name, S("Arrow of @1", def.description), def.color, arrow_def)
 		end
@@ -357,7 +372,9 @@ end
 
 local awkward_def = {
 	name = "awkward",
-	description = S("Awkward"),
+	description_potion = S("Awkward Potion"),
+	description_splash = S("Awkward Splash Potion"),
+	description_lingering = S("Awkward Lingering Potion"),
 	no_arrow = true,
 	no_effect = true,
 	_tt = S("No effect"),
@@ -369,7 +386,9 @@ local awkward_def = {
 
 local mundane_def = {
 	name = "mundane",
-	description = S("Mundane"),
+	description_potion = S("Mundane Potion"),
+	description_splash = S("Mundane Splash Potion"),
+	description_lingering = S("Mundane Lingering Potion"),
 	no_arrow = true,
 	no_effect = true,
 	_tt = S("No effect"),
@@ -380,7 +399,9 @@ local mundane_def = {
 
 local thick_def = {
 	name = "thick",
-	description = S("Thick"),
+	description_potion = S("Thick Potion"),
+	description_splash = S("Thick Splash Potion"),
+	description_lingering = S("Thick Lingering Potion"),
 	no_arrow = true,
 	no_effect = true,
 	_tt = S("No effect"),
@@ -406,8 +427,8 @@ local dragon_breath_def = {
 local healing_def = {
 	name = "healing",
 	description = S("Healing"),
-	_tt = S("+2 hearts"),
-	_tt_2 = S("+4 hearts"),
+	_tt = S("+4 HP"),
+	_tt_2 = S("+8 HP"),
 	_longdesc = S("Instantly heals."),
 	color = "#CC0000",
 	effect = 4,
@@ -419,8 +440,8 @@ local healing_def = {
 local harming_def = {
 	name = "harming",
 	description = S("Harming"),
-	_tt = S("-3 hearts"),
-	_tt_II = S("-6 hearts"),
+	_tt = S("-6 HP"),
+	_tt_II = S("-12 HP"),
 	_longdesc = S("Instantly deals damage."),
 	color = "#660099",
 	effect = -6,

mods/ITEMS/mcl_potions/tipped_arrow.lua

@@ -41,7 +41,9 @@ function mcl_potions.register_arrow(name, desc, color, def)
 	minetest.register_craftitem("mcl_potions:"..name.."_arrow", {
 		description = desc,
 		_tt_help = arrow_tt .. "\n" .. def.tt,
-		_doc_items_longdesc = arrow_longdesc .. "\n" .. longdesc,
+		_doc_items_longdesc = arrow_longdesc .. "\n" ..
+			S("This particular arrow is tipped and will give an effect when it hits a player or mob.") .. "\n" ..
+			longdesc,
 		_doc_items_usagehelp = how_to_shoot,
 		inventory_image = "mcl_bows_arrow_inv.png^(mcl_potions_arrow_inv.png^[colorize:"..color..":100)",
 		groups = { ammo=1, ammo_bow=1, brewitem=1},