Merge and update translations (#186)

.luacheckrc

@@ -25,7 +25,6 @@ stds.minetest = {
 }
 
 read_globals = {
-	"intllib",
 	"protector",
 	"isprotect",
 	"IsPlayerNodeOwner",

circular_saw.lua

@@ -13,8 +13,7 @@ circular_saw = {}
 circular_saw.known_stairs = setmetatable({}, {
 	__newindex = function(k, v)
 		local modname = minetest.get_current_modname()
-		print(("WARNING: mod %s tried to add node %s to the circular saw"
-				.. " manually."):format(modname, v))
+		print(("WARNING: mod %s tried to add node %s to the circular saw manually."):format(modname, v))
 	end,
 })
 
@@ -131,7 +130,7 @@ function circular_saw:reset(pos)
 	local owned_by = meta:get_string("owner")
 
 	if owned_by and owned_by ~= "" then
-		owned_by = (" (%s)"):format(S("owned by @1", meta:get_string("owner")))
+		owned_by = (" ("..S("owned by @1", meta:get_string("owner"))..")")
 	else
 		owned_by = ""
 	end
@@ -178,7 +177,7 @@ function circular_saw:update_inventory(pos, amount)
 	local owned_by = meta:get_string("owner")
 
 	if owned_by and owned_by ~= "" then
-		owned_by = (" (%s)"):format(S("owned by @1", meta:get_string("owner")))
+		owned_by = (" ("..S("owned by @1", meta:get_string("owner"))..")")
 	else
 		owned_by = ""
 	end
@@ -377,15 +376,16 @@ function circular_saw.on_construct(pos)
 		fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots
 	end
 	meta:set_string(
+		--FIXME Not work with @n in this part bug in minetest/minetest#7450.
 		"formspec", "size[11,10]"..fancy_inv..
-		"label[0,0;" ..F(S("Input\nmaterial")).. "]" ..
-		"list[current_name;input;1.5,0;1,1;]" ..
+		"label[0,0;" ..S("Input material").. "]" ..
+		"list[current_name;input;1.7,0;1,1;]" ..
 		"label[0,1;" ..F(S("Left-over")).. "]" ..
-		"list[current_name;micro;1.5,1;1,1;]" ..
-		"label[0,2;" ..F(S("Recycle\noutput")).. "]" ..
-		"list[current_name;recycle;1.5,2;1,1;]" ..
+		"list[current_name;micro;1.7,1;1,1;]" ..
+		"label[0,2;" ..F(S("Recycle output")).. "]" ..
+		"list[current_name;recycle;1.7,2;1,1;]" ..
 		"field[0.3,3.5;1,1;max_offered;" ..F(S("Max")).. ":;${max_offered}]" ..
-		"button[1,3.2;1,1;Set;" ..F(S("Set")).. "]" ..
+		"button[1,3.2;1.7,1;Set;" ..F(S("Set")).. "]" ..
 		"list[current_name;output;2.8,0;8,6;]" ..
 		"list[current_player;main;1.5,6.25;8,4;]" ..
 		"listring[current_name;output]" ..

init.lua

@@ -12,9 +12,7 @@ moreblocks = {}
 
 local modpath = minetest.get_modpath("moreblocks")
 
-local S, NS = dofile(modpath .. "/intllib.lua")
-moreblocks.S = S
-moreblocks.NS = NS
+moreblocks.S = minetest.get_translator("moreblocks")
 
 dofile(modpath .. "/config.lua")
 dofile(modpath .. "/sounds.lua")