resolve mergeconflicts

mods/bones/depends.txt

@@ -1 +0,0 @@
-default

mods/bones/init.lua

@@ -1,6 +1,11 @@
+-- bones/init.lua
+
 -- Minetest 0.4 mod: bones
 -- See README.txt for licensing and other information.
 
+-- Load support for MT game translation.
+local S = minetest.get_translator("bones")
+
 bones = {}
 
 local function is_owner(pos, name)
@@ -24,7 +29,7 @@ local share_bones_time = tonumber(minetest.settings:get("share_bones_time")) or
 local share_bones_time_early = tonumber(minetest.settings:get("share_bones_time_early")) or share_bones_time / 4
 
 minetest.register_node("bones:bones", {
-	description = "Bones",
+	description = S("Bones"),
 	tiles = {
 		"bones_top.png^[transform2",
 		"bones_bottom.png",
@@ -116,7 +121,7 @@ minetest.register_node("bones:bones", {
 		local meta = minetest.get_meta(pos)
 		local time = meta:get_int("time") + elapsed
 		if time >= share_bones_time then
-			meta:set_string("infotext", meta:get_string("owner") .. "'s old bones")
+			meta:set_string("infotext", S("@1's old bones", meta:get_string("owner")))
 			meta:set_string("owner", "")
 		else
 			meta:set_int("time", time)
@@ -194,7 +199,7 @@ minetest.register_on_dieplayer(function(player)
 		minetest.log("action", player_name .. " dies at " .. pos_string ..
 			". No bones placed")
 		if bones_position_message then
-			minetest.chat_send_player(player_name, player_name .. " died at " .. pos_string .. ".")
+			minetest.chat_send_player(player_name, S("@1 died at @2.", player_name, pos_string))
 		end
 		return
 	end
@@ -204,7 +209,7 @@ minetest.register_on_dieplayer(function(player)
 		minetest.log("action", player_name .. " dies at " .. pos_string ..
 			". No bones placed")
 		if bones_position_message then
-			minetest.chat_send_player(player_name, player_name .. " died at " .. pos_string .. ".")
+			minetest.chat_send_player(player_name, S("@1 died at @2.", player_name, pos_string))
 		end
 		return
 	end
@@ -230,8 +235,7 @@ minetest.register_on_dieplayer(function(player)
 		minetest.log("action", player_name .. " dies at " .. pos_string ..
 			". Inventory dropped")
 		if bones_position_message then
-			minetest.chat_send_player(player_name, player_name .. " died at " .. pos_string ..
-				", and dropped their inventory.")
+			minetest.chat_send_player(player_name, S("@1 died at @2, and dropped their inventory.", player_name, pos_string))
 		end
 		return
 	end
@@ -244,8 +248,7 @@ minetest.register_on_dieplayer(function(player)
 	minetest.log("action", player_name .. " dies at " .. pos_string ..
 		". Bones placed")
 	if bones_position_message then
-		minetest.chat_send_player(player_name, player_name .. " died at " .. pos_string ..
-			", and bones were placed.")
+		minetest.chat_send_player(player_name, S("@1 died at @2, and bones were placed.", player_name, pos_string))
 	end
 
 	local meta = minetest.get_meta(pos)
@@ -268,7 +271,7 @@ minetest.register_on_dieplayer(function(player)
 	meta:set_string("owner", player_name)
 
 	if share_bones_time ~= 0 then
-		meta:set_string("infotext", player_name .. "'s fresh bones")
+		meta:set_string("infotext", S("@1's fresh bones", player_name))
 
 		if share_bones_time_early == 0 or not minetest.is_protected(pos, player_name) then
 			meta:set_int("time", 0)
@@ -278,6 +281,6 @@ minetest.register_on_dieplayer(function(player)
 
 		minetest.get_node_timer(pos):start(10)
 	else
-		meta:set_string("infotext", player_name.."'s bones")
+		meta:set_string("infotext", S("@1's bones", player_name))
 	end
 end)

mods/bones/locale/bones.de.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Knochen
+@1's old bones=Alte Knochen von @1
+@1 died at @2.=@1 starb bei @2.
+@1 died at @2, and dropped their inventory.=@1 starb bei @2 und ließ das Inventar fallen.
+@1 died at @2, and bones were placed.=@1 starb bei @2 und Knochen wurden platziert.
+@1's fresh bones=Frische Knochen von @1
+@1's bones=Knochen von @1

mods/bones/locale/bones.es.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Huesos
+@1's old bones=Huesos antiguos de @1
+@1 died at @2.=@1 murió en @2.
+@1 died at @2, and dropped their inventory.=@1 murió en @2, y su inventario se desprendió.
+@1 died at @2, and bones were placed.=@1 murió en @2, y sus huesos fueron depositados.
+@1's fresh bones=Huesos recientes de @1
+@1's bones=Huesos de @1

mods/bones/locale/bones.fr.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Os
+@1's old bones=Vieux os de @1
+@1 died at @2.=@1 est mort à @2.
+@1 died at @2, and dropped their inventory.=@1 est mort à @2 et a laissé tomber son inventaire.
+@1 died at @2, and bones were placed.=@1 est mort à @2 et ses os ont été placés.
+@1's fresh bones=Os frais de @1
+@1's bones=Os de @1

mods/bones/locale/bones.id.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Tulang
+@1's old bones=Tulang lama @1
+@1 died at @2.=@1 mati di @2.
+@1 died at @2, and dropped their inventory.=@1 mati di @2 dan meninggalkan barangnya.
+@1 died at @2, and bones were placed.=@1 mati di @2 dan tulangnya diletakkan.
+@1's fresh bones=Tulang segar @1
+@1's bones=Tulang @1

mods/bones/locale/bones.it.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Ossa
+@1's old bones=Ossa vecchie di @1
+@1 died at @2.=@1 è morto alla posizione @2.
+@1 died at @2, and dropped their inventory.=@1 è morto alla posizione @2, e ha lasciato a terra il contenuto del suo inventario.
+@1 died at @2, and bones were placed.=@1 è morto alla posizione @2, e vi sono state posizionate delle ossa.
+@1's fresh bones=Ossa fresche di @1
+@1's bones=Ossa di @1

mods/bones/locale/bones.ms.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Tulang
+@1's old bones=Tulang lama @1
+@1 died at @2.=@1 mati di @2.
+@1 died at @2, and dropped their inventory.=@1 mati di @2, dan menjatuhkan inventorinya.
+@1 died at @2, and bones were placed.=@1 mati di @2, dan tulang diletakkan.
+@1's fresh bones=Tulang segar @1
+@1's bones=Tulang @1

mods/bones/locale/bones.ru.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Кости
+@1's old bones=Старые кости @1
+@1 died at @2.=@1 умер в @2.
+@1 died at @2, and dropped their inventory.=@1 умер в @2 и потерял содержимое своего инвентаря. 
+@1 died at @2, and bones were placed.=@1 умер в @2, помещены кости.
+@1's fresh bones=новые кости @1
+@1's bones=кости @1

mods/bones/locale/bones.se.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Ben
+@1's old bones=@1s Gamla ben
+@1 died at @2.=@1 dog på @a.
+@1 died at @2, and dropped their inventory.=@1 dog på @a, och tappade deras saker.
+@1 died at @2, and bones were placed.=@1 dog på @2, och deras ben var placerade.
+@1's fresh bones=@1s färska ben
+@1's bones=@1s ben

mods/bones/locale/bones.zh_CN.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=骨骸
+@1's old bones=@1的旧骨骸
+@1 died at @2.=@1在@2死亡。
+@1 died at @2, and dropped their inventory.=@1在@2死亡，丢掉了物品栏。
+@1 died at @2, and bones were placed.=@1在@2死亡，骨骸被放置。
+@1's fresh bones=@1的新鲜骨骸
+@1's bones=@1的骨骸

mods/bones/locale/bones.zh_TW.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=骨骸
+@1's old bones=@1的舊骨骸
+@1 died at @2.=@1在@2死亡。
+@1 died at @2, and dropped their inventory.=@1在@2死亡，丟掉了物品欄。
+@1 died at @2, and bones were placed.=@1在@2死亡，骨骸被放置。
+@1's fresh bones=@1的新鮮骨骸
+@1's bones=@1的骨骸

mods/bones/locale/template.txt

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=
+@1's old bones=
+@1 died at @2.=
+@1 died at @2, and dropped their inventory.=
+@1 died at @2, and bones were placed.=
+@1's fresh bones=
+@1's bones=

mods/bones/mod.conf

@@ -0,0 +1,3 @@
+name = bones
+description = Minetest Game mod: bones
+depends = default