From b1ca4b069ac8710a8bda73b8487a954a8478fab2 Mon Sep 17 00:00:00 2001
From: Adimgar <adimgar@gmail.com>
Date: Fri, 15 May 2015 12:40:29 -0600
Subject: [PATCH] Transaltion - Updated langfiles and templates; using params

---
 mods/bones/init.lua                         |  7 ++--
 mods/bones/locale/es.txt                    |  4 +-
 mods/bones/locale/template.txt              |  5 +++
 mods/default/locale/es.txt                  | 31 ++++++++--------
 mods/default/locale/template.txt            | 28 +++++++-------
 mods/default/nodes.lua                      | 41 +++++++++++----------
 mods/default/trees.lua                      | 16 ++++----
 mods/give_initial_stuff/init.lua            |  2 +-
 mods/give_initial_stuff/locale/es.txt       |  2 +-
 mods/give_initial_stuff/locale/template.txt |  2 +-
 mods/vessels/init.lua                       | 12 +++---
 mods/vessels/locale/es.txt                  |  6 +--
 mods/vessels/locale/template.txt            |  6 +--
 mods/wool/init.lua                          |  2 +-
 mods/wool/locale/es.txt                     |  2 +-
 15 files changed, 88 insertions(+), 78 deletions(-)
 create mode 100755 mods/bones/locale/template.txt

diff --git a/mods/bones/init.lua b/mods/bones/init.lua
index 78d36bbf..bde1e7b7 100644
--- a/mods/bones/init.lua
+++ b/mods/bones/init.lua
@@ -109,7 +109,8 @@ 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("'s old bones"))
+			meta:set_string("infotext", S("@1's old bones", meta:get_string("owner")))
+			--meta:get_string("owner")..S("'s old bones"))
 			meta:set_string("owner", "")
 		else
 			meta:set_int("time", time)
@@ -212,7 +213,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))--player_name.."'s fresh bones")
 
 		if share_bones_time_early == 0 or not minetest.is_protected(pos, player_name) then
 			meta:set_int("time", 0)
@@ -222,6 +223,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))--player_name.."'s bones")
 	end
 end)
diff --git a/mods/bones/locale/es.txt b/mods/bones/locale/es.txt
index 2a3dd4c7..62f49691 100755
--- a/mods/bones/locale/es.txt
+++ b/mods/bones/locale/es.txt
@@ -1,3 +1,5 @@
 #init.lua
 Bones = Huesos
-'s old bones = 's old bones
+@1's old bones = Huesos de @1
+@1's fresh bones = Huesos frescos de @1
+@1's bones = Huesos de @1
diff --git a/mods/bones/locale/template.txt b/mods/bones/locale/template.txt
new file mode 100755
index 00000000..5b67d78b
--- /dev/null
+++ b/mods/bones/locale/template.txt
@@ -0,0 +1,5 @@
+#init.lua
+Bones = 
+@1's old bones = 
+@1's fresh bones = 
+@1's bones = 
diff --git a/mods/default/locale/es.txt b/mods/default/locale/es.txt
index e5f608a9..0aa07613 100755
--- a/mods/default/locale/es.txt
+++ b/mods/default/locale/es.txt
@@ -86,20 +86,19 @@ Lava Source = Fuente de lava
 Flowing Lava = Lava fluyendo
 Torch = Antorcha
 Chest = Cofre
- moves stuff in chest at  =  mueve objetos en el cofre en 
- moves stuff to chest at  =  coloca objetos en el cofre en 
- takes stuff from chest at  =  retira objetos del cofre en 
+@1 moves stuff in chest at @2 = @1 mueve objetos dentro del cofre en @2
+@1 moves stuff to chest at @2 = @1 coloca objetos en el cofre en @2
+@1 takes stuff from chest at @2 = @1 retira objetos del cofre en @2
 Locked Chest = Cofre con cerradura
-Locked Chest (owned by  = Cofre con cerradura (propiedad de 
- moves stuff to locked chest at  = 
- takes stuff from locked chest at  =
+Locked Chest (owned by @1) = Cofre con cerradura (propiedad de @1)
+@1 moves stuff to locked chest at @2 = @1 coloca objetos dentro del cofre con cerradura en @2
+@1 takes stuff from locked chest at @2 = @1 retira objetos del cofre con cerradura en @2
 Bookshelf = Librero
- moves stuff in bookshelf at  =  mueve objetos en el librero en 
- moves stuff to bookshelf at  =  coloca objetos en el librero en 
- takes stuff from bookshelf at  =  retira objetos del librero en 
+@1 moves stuff in bookshelf at @2 = @1 mueve objetos en el librero en @2
+@1 moves stuff to bookshelf at @2 = @1 coloca objetos en el librero en @2
+@1 takes stuff from bookshelf at @2 = @1 retira objetos del librero en @2
 Sign = Señal
- wrote \" =  escribió \"
- "\" to sign at  = 
+@1 wrote \"@2\" to sign at @3 = @1 escribió \"@2\" en una señal en @3
 Ladder = Escalera
 Wooden Fence = Valla de madera
 Glass = Vidrio
@@ -138,8 +137,8 @@ Mese Sword = Espada de mese
 Diamond Sword = Espada de diamante
 
 #trees.lua
-A sapling grows into a tree at  = Un brote crece en un árbol en 
-A jungle sapling grows into a tree at  = Un brote selvático crece en un árbol en 
-A pine sapling grows into a tree at  = Un brote de pino crece en un árbol en 
-
-
+A sapling grows into a tree at @1 = Un brote crece en un árbol en @2
+A jungle sapling grows into a tree at @1 = Un brote selvático crece en un árbol en @2
+A pine sapling grows into a tree at @1 = Un brote de pino crece en un árbol en @2
+Deprecated use of default.grow_tree = Uso descontinuado de default.grow_tree
+Deprecated use of default.grow_jungle_tree = Uso descontinuado de default.grow_jungle_tree
diff --git a/mods/default/locale/template.txt b/mods/default/locale/template.txt
index 3cb49a15..28c4b161 100755
--- a/mods/default/locale/template.txt
+++ b/mods/default/locale/template.txt
@@ -86,17 +86,18 @@ Lava Source =
 Flowing Lava = 
 Torch = 
 Chest = 
- moves stuff in chest at  =  
- moves stuff to chest at  =  
- takes stuff from chest at  =  
+@1 moves stuff in chest at @2 =  
+@1 moves stuff to chest at @2 =  
+@1 takes stuff from chest at @2 =  
 Locked Chest = 
-Locked Chest (owned by  = 
+Locked Chest (owned by @1) = 
+@1 moves stuff to locked chest at @2 = 
+@1 takes stuff from locked chest at @2 = 
 Bookshelf = 
- moves stuff in bookshelf at  =  
- moves stuff to bookshelf at  =  
- takes stuff from bookshelf at  =  
-Sign = 
- wrote \" =  
+@1 moves stuff in bookshelf at @2 =  
+@1 moves stuff to bookshelf at @2 =  
+@1 takes stuff from bookshelf at @2 =  
+@1 wrote \"@2\" to sign at @3 =  
 Ladder = 
 Wooden Fence = 
 Glass = 
@@ -135,7 +136,8 @@ Mese Sword =
 Diamond Sword = 
 
 #trees.lua
-A sapling grows into a tree at  = 
-A jungle sapling grows into a tree at  = 
-A pine sapling grows into a tree at  = 
-
+A sapling grows into a tree at @1 = 
+A jungle sapling grows into a tree at @1 = 
+A pine sapling grows into a tree at @1 = 
+Deprecated use of default.grow_tree = 
+Deprecated use of default.grow_jungle_tree = 
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index d0aa8304..0d260420 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -1226,16 +1226,16 @@ minetest.register_node("default:chest", {
 		return inv:is_empty("main")
 	end,
 	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		minetest.log("action", player:get_player_name()..
-				S(" moves stuff in chest at ")..minetest.pos_to_string(pos))
+		minetest.log("action", S("@1 moves stuff in chest at @2",
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
     on_metadata_inventory_put = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				S(" moves stuff to chest at ")..minetest.pos_to_string(pos))
+    minetest.log("action", S("@1 moves stuff to chest at @2",
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
     on_metadata_inventory_take = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				S(" takes stuff from chest at ")..minetest.pos_to_string(pos))
+    minetest.log("action", S("@1 takes stuff from chest at @2",
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
 })
 
@@ -1252,8 +1252,7 @@ minetest.register_node("default:chest_locked", {
 	after_place_node = function(pos, placer)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner", placer:get_player_name() or "")
-		meta:set_string("infotext", S("Locked Chest (owned by ")..
-				meta:get_string("owner")..")")
+		meta:set_string("infotext", S("Locked Chest (owned by @1)", meta:get_string("owner")))
 	end,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@@ -1289,12 +1288,12 @@ minetest.register_node("default:chest_locked", {
 		return stack:get_count()
 	end,
     on_metadata_inventory_put = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				S(" moves stuff to locked chest at ")..minetest.pos_to_string(pos))
+    minetest.log("action", S("@1 moves stuff to locked chest at @2",
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
     on_metadata_inventory_take = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-				S(" takes stuff from locked chest at ")..minetest.pos_to_string(pos))
+    minetest.log("action", S("@1 takes stuff from locked chest at @2",
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
 	on_rightclick = function(pos, node, clicker)
 		local meta = minetest.get_meta(pos)
@@ -1367,16 +1366,16 @@ minetest.register_node("default:bookshelf", {
 	end,
 
 	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		minetest.log("action", player:get_player_name()..
-			   S(" moves stuff in bookshelf at ")..minetest.pos_to_string(pos))
+	  minetest.log("action", S("@1 moves stuff in bookshelf at @2",
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
 	on_metadata_inventory_put = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-			   S(" moves stuff to bookshelf at ")..minetest.pos_to_string(pos))
+		minetest.log("action", S("@1 moves stuff to bookshelf at @2",
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
 	on_metadata_inventory_take = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-			   S(" takes stuff from bookshelf at ")..minetest.pos_to_string(pos))
+	  minetest.log("action", S("@1 takes stuff from bookshelf at @2",
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
 })
 
@@ -1415,8 +1414,10 @@ minetest.register_node("default:sign_wall", {
 		end
 		local meta = minetest.get_meta(pos)
 		if not fields.text then return end
-		minetest.log("action", (sender:get_player_name() or "")..S(" wrote \"")..fields.text..
-				S("\" to sign at ")..minetest.pos_to_string(pos))
+		minetest.log("action", S("@1 wrote \"@2\" to sign at @3",
+		  (sender:get_player_name() or ""), fields.text, minetest.pos_to_string(pos))) 
+--		minetest.log("action", (sender:get_player_name() or "")..S(" wrote \"")..fields.text..
+--				S("\" to sign at ")..minetest.pos_to_string(pos))
 		meta:set_string("text", fields.text)
 		meta:set_string("infotext", '"'..fields.text..'"')
 	end,
diff --git a/mods/default/trees.lua b/mods/default/trees.lua
index 9a89fc96..2ffcc6f2 100644
--- a/mods/default/trees.lua
+++ b/mods/default/trees.lua
@@ -30,8 +30,8 @@ minetest.register_abm({
 			return
 		end
 
-		minetest.log("action", S("A sapling grows into a tree at ")..
-				minetest.pos_to_string(pos))
+		minetest.log("action", S("A sapling grows into a tree at @1",
+		  minetest.pos_to_string(pos)))
 		default.grow_tree(pos, random(1, 4) == 1)
 	end
 })
@@ -45,8 +45,8 @@ minetest.register_abm({
 			return
 		end
 
-		minetest.log("action", S("A jungle sapling grows into a tree at ")..
-				minetest.pos_to_string(pos))
+		minetest.log("action", S("A jungle sapling grows into a tree at @1",
+		  minetest.pos_to_string(pos)))
 		default.grow_jungle_tree(pos)
 	end
 })
@@ -60,8 +60,8 @@ minetest.register_abm({
 			return
 		end
 
-		minetest.log("action", S("A pine sapling grows into a tree at ")..
-				minetest.pos_to_string(pos))
+		minetest.log("action", S("A pine sapling grows into a tree at @1",
+		  minetest.pos_to_string(pos)))
 		default.grow_pine_tree(pos)
 	end
 })
@@ -134,7 +134,7 @@ function default.grow_tree(pos, is_apple_tree, bad)
 		replaced yet
 	--]]
 	if bad then
-		error("Deprecated use of default.grow_tree")
+		error(S("Deprecated use of default.grow_tree"))
 	end
 
 	local x, y, z = pos.x, pos.y, pos.z
@@ -166,7 +166,7 @@ function default.grow_jungle_tree(pos, bad)
 		replaced yet
 	--]]
 	if bad then
-		error("Deprecated use of default.grow_jungle_tree")
+		error(S("Deprecated use of default.grow_jungle_tree"))
 	end
 
 	local x, y, z = pos.x, pos.y, pos.z
diff --git a/mods/give_initial_stuff/init.lua b/mods/give_initial_stuff/init.lua
index 5cf6cee6..a71e14b6 100644
--- a/mods/give_initial_stuff/init.lua
+++ b/mods/give_initial_stuff/init.lua
@@ -12,7 +12,7 @@ give_initial_stuff.intllib = S
 minetest.register_on_newplayer(function(player)
 	--print("on_newplayer")
 	if minetest.setting_getbool("give_initial_stuff") then
-		minetest.log("action", S("Giving initial stuff to player ")..player:get_player_name())
+		minetest.log("action", S("Giving initial stuff to player @1", player:get_player_name()))
 		player:get_inventory():add_item('main', 'default:pick_steel')
 		player:get_inventory():add_item('main', 'default:torch 99')
 		player:get_inventory():add_item('main', 'default:axe_steel')
diff --git a/mods/give_initial_stuff/locale/es.txt b/mods/give_initial_stuff/locale/es.txt
index f226eb78..62e2252a 100755
--- a/mods/give_initial_stuff/locale/es.txt
+++ b/mods/give_initial_stuff/locale/es.txt
@@ -1 +1 @@
-Giving initial stuff to player  = Otorgando objetos iniciales al jugador 
+Giving initial stuff to player @1 = Otorgando objetos iniciales al jugador @1
diff --git a/mods/give_initial_stuff/locale/template.txt b/mods/give_initial_stuff/locale/template.txt
index d7cfa0d6..7dbf5bd6 100755
--- a/mods/give_initial_stuff/locale/template.txt
+++ b/mods/give_initial_stuff/locale/template.txt
@@ -1 +1 @@
-Giving initial stuff to player  = 
+Giving initial stuff to player @1 = 
diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua
index 72e345cd..2dc731b0 100644
--- a/mods/vessels/init.lua
+++ b/mods/vessels/init.lua
@@ -70,16 +70,16 @@ minetest.register_node("vessels:shelf", {
 	end,
 
 	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		minetest.log("action", player:get_player_name()..
-			   S(" moves stuff in vessels shelf at ")..minetest.pos_to_string(pos))
+		minetest.log("action", S("@1 moves stuff in vessels shelf at @2", 
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
 	on_metadata_inventory_put = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-			   S(" moves stuff to vessels shelf at ")..minetest.pos_to_string(pos))
+	  minetest.log("action", S("@1 moves stuff to vessels shelf at @2", 
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
 	on_metadata_inventory_take = function(pos, listname, index, stack, player)
-		minetest.log("action", player:get_player_name()..
-			   S(" takes stuff from vessels shelf at ")..minetest.pos_to_string(pos))
+	  minetest.log("action", S("@1 takes stuff from vessels shelf at @2", 
+		  player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
 })
 
diff --git a/mods/vessels/locale/es.txt b/mods/vessels/locale/es.txt
index 4cbfcaed..75a9baf3 100755
--- a/mods/vessels/locale/es.txt
+++ b/mods/vessels/locale/es.txt
@@ -1,8 +1,8 @@
 #init.lua
 Vessels shelf = Estantería
- moves stuff in vessels shelf at  =  mueve objetos en la estantería en 
- moves stuff to vessels shelf at  =  coloca objetos en la estantería en
- takes stuff from vessels shelf at  =  retira objetos de la estantería en
+@1 moves stuff in vessels shelf at @2 = @1 mueve objetos en la estantería en @2
+@1 moves stuff to vessels shelf at @2 = @1 coloca objetos en la estantería en @2
+@1 takes stuff from vessels shelf at @2 = @1 retira objetos de la estantería en @2
 Glass Bottle (empty) = Botella de vidrio (vacía)
 Drinking Glass (empty) = Vaso de vidrio (vacío)
 Heavy Steel Bottle (empty) = Bote pesado de acero (vacío)
diff --git a/mods/vessels/locale/template.txt b/mods/vessels/locale/template.txt
index 6876b4d8..ee1d1d51 100755
--- a/mods/vessels/locale/template.txt
+++ b/mods/vessels/locale/template.txt
@@ -1,8 +1,8 @@
 #init.lua
 Vessels shelf = 
- moves stuff in vessels shelf at  =  
- moves stuff to vessels shelf at  =  
- takes stuff from vessels shelf at  =  
+@1 moves stuff in vessels shelf at @2 =  
+@1 moves stuff to vessels shelf at @2 =  
+@1 takes stuff from vessels shelf at @2 =  
 Glass Bottle (empty) = 
 Drinking Glass (empty) = 
 Heavy Steel Bottle (empty) = 
diff --git a/mods/wool/init.lua b/mods/wool/init.lua
index 7cebe02e..f8344bea 100644
--- a/mods/wool/init.lua
+++ b/mods/wool/init.lua
@@ -42,7 +42,7 @@ for _, row in ipairs(wool.dyes) do
 	local craft_color_group = row[3]
 	-- Node Definition
 	minetest.register_node("wool:"..name, {
-		description = desc..S(" Wool"),
+		description = S("@1 Wool", desc), --desc..S(" Wool"),
 		tiles = {"wool_"..name..".png"},
 		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1},
 		sounds = default.node_sound_defaults(),
diff --git a/mods/wool/locale/es.txt b/mods/wool/locale/es.txt
index 4e1d85a3..9effe73e 100755
--- a/mods/wool/locale/es.txt
+++ b/mods/wool/locale/es.txt
@@ -14,4 +14,4 @@ Brown = Marrón
 Pink = Rosa
 Dark Grey = Gris oscruo
 Dark Green = Verde oscuro
- Wool =  Lana
+@1 Wool = Lana @1