Merge remote-tracking branch 'upstream/master'

homedecor_seating/init.lua

@@ -72,8 +72,8 @@ end
 function lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
 	local node = minetest.get_node(pos)
 	local colorbits = node.param2 - (node.param2 % 8)
-	local yaw = placer:get_look_yaw()
-	local dir = minetest.yaw_to_dir(yaw-1.5)
+	local yaw = placer:get_look_horizontal()
+	local dir = minetest.yaw_to_dir(yaw)
 	local fdir = minetest.dir_to_wallmounted(dir)
 	minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits })
 end

homedecor_seating/locale/homedecor_seating.de.tr

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=Sessel
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=Jemanden gehört schon die Stelle, wo das mittlere oder ferne Stück hingehen würde.
 Someone else owns the spot where the other end goes!=Jemanden gehört schon die Stelle, wo das andere Ende hingehen würde.
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=Jemanden gehört schon die Stelle, wo das mittlere oder ferne Stück hingehen würde.
 Long Sofa=Langes Sofa
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=Kein Platz, um das Sofa zu platzieren!
-
-### sofas.lua ###
-
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
 Sofa=Sofa

homedecor_seating/locale/homedecor_seating.es.tr

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=Sillón
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=Alguien ya es dueño del lugar donde va la cabecera.
 Someone else owns the spot where the other end goes!=Alguien ya es dueño del lugar donde va la cabecera.
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=Alguien ya es dueño del lugar donde va la cabecera.
 Long Sofa=Sofá largo
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=¡No hay lugar para colocar el sofá!
-
-### sofas.lua ###
-
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
 Sofa=Sofá

homedecor_seating/locale/homedecor_seating.fr.tr

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=Fauteuil
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=Quelqu'un d'autre est propriétaire de l'endroit où va le milieu ou l'autre bout !
 Someone else owns the spot where the other end goes!=Quelqu'un d'autre est propriétaire de l'endroit où va l'autre bout !
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=Quelqu'un d'autre est propriétaire de l'endroit où va le milieu ou l'autre bout !
 Long Sofa=Canapé long
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=Pas assez de place pour poser le canapé !
-
-### sofas.lua ###
-
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
 Sofa=Canapé

homedecor_seating/locale/homedecor_seating.it.tr

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=Poltrona
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=
 Someone else owns the spot where the other end goes!=
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=
 Long Sofa=
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=
-
-### sofas.lua ###
-
-Sofa=
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
+Sofa=sofà

homedecor_seating/locale/homedecor_seating.ms.tr

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=Kerusi Berlengan
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=Tempat untuk letak pertengahan atau hujung objek itu kawasan kepunyaan orang lain!
 Someone else owns the spot where the other end goes!=Tempat untuk letak hujung objek itu kawasan kepunyaan orang lain!
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=Tempat untuk letak pertengahan atau hujung objek itu kawasan kepunyaan orang lain!
 Long Sofa=Sofa Panjang
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=Tiada ruang untuk letak sofa!
-
-### sofas.lua ###
-
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
 Sofa=Sofa

homedecor_seating/locale/homedecor_seating.pt.tr

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=Poltrona
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=Alguém já é proprietário do local onde a cabeceira vai.
 Someone else owns the spot where the other end goes!=Alguém já é proprietário do local onde a cabeceira vai.
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=Alguém já é proprietário do local onde a cabeceira vai.
 Long Sofa=Sofá Grande
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=Sem espaço para colocar o sofá!
-
-### sofas.lua ###
-
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
 Sofa=Sofá

homedecor_seating/locale/homedecor_seating.pt_BR.tr

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=Poltrona
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=Alguém já é proprietário do local onde a cabeceira vai.
 Someone else owns the spot where the other end goes!=Alguém já é proprietário do local onde a cabeceira vai.
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=Alguém já é proprietário do local onde a cabeceira vai.
 Long Sofa=Sofá Grande
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=Sem espaço para colocar o sofá!
-
-### sofas.lua ###
-
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
 Sofa=Sofá

homedecor_seating/locale/homedecor_seating.ru.tr

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=Кресло
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=Кому-то другому принадлежит точка, куда выходит средний или дальний конец!
 Someone else owns the spot where the other end goes!=Кому-то другому принадлежит точка, где выходит другой конец!
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=Кому-то другому принадлежит точка, куда выходит средний или дальний конец!
 Long Sofa=Длинный диван
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=Нет места для дивана!
-
-### sofas.lua ###
-
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
 Sofa=Диван

homedecor_seating/locale/homedecor_seating.zh_CN.tr

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=扶手椅
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=中间或远端去的地方是别人的！
 Someone else owns the spot where the other end goes!=另一端去的地方是别人的！
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=中间或远端去的地方是别人的！
 Long Sofa=长沙发
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=没有地方放沙发！
-
-### sofas.lua ###
-
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
 Sofa=沙发

homedecor_seating/locale/template.txt

@@ -1,24 +1,15 @@
 # textdomain: homedecor_seating
-
-
-### armchairs.lua ###
-
 Armchair=
-
-### init.lua ###
-
-Someone else owns the spot where the middle or far end goes!=
 Someone else owns the spot where the other end goes!=
-
-### longsofas.lua ###
-
+Someone else owns the spot where the middle or far end goes!=
 Long Sofa=
-
-### longsofas.lua ###
-### sofas.lua ###
-
 No room to place the sofa!=
-
-### sofas.lua ###
-
+Deck Chair=
+Deck Chair (blue striped)=
+Simple Bench=
+Garden Bench (style 1)=
+Garden Bench (style 2)=
+Kitchen chair=
+Basic office chair=
+Upscale office chair=
 Sofa=

homedecor_seating/misc.lua

@@ -1,6 +1,8 @@
 -- this component contains all of the random types of seating previously
 -- scattered among homedecor's other mods
 
+local S = minetest.get_translator("homedecor_seating")
+
 local dc_cbox = {
 	type = "fixed",
 	fixed = { -0.5, -0.5, -0.5, 0.5, 0, 1 }
@@ -9,7 +11,7 @@ local dc_cbox = {
 homedecor.register("deckchair", {
 	mesh = "homedecor_deckchair.obj",
 	tiles = {"homedecor_deckchair.png"},
-	description = "Deck Chair",
+	description = S("Deck Chair"),
 	groups = { snappy = 3, dig_tree=2 },
 	expand = { forward="placeholder" },
 	_sound_def = {
@@ -29,7 +31,7 @@ minetest.register_alias("homedecor:deckchair_head", "air")
 homedecor.register("deckchair_striped_blue", {
 	mesh = "homedecor_deckchair.obj",
 	tiles = {"homedecor_deckchair_striped_blue.png"},
-	description = "Deck Chair (blue striped)",
+	description = S("Deck Chair (blue striped)"),
 	groups = { snappy = 3, dig_tree=2 },
 	expand = { forward="placeholder" },
 	_sound_def = {
@@ -45,7 +47,7 @@ homedecor.register("deckchair_striped_blue", {
 
 homedecor.register("simple_bench", {
 	tiles = { "homedecor_generic_wood_old.png" },
-	description = "Simple Bench",
+	description = S("Simple Bench"),
 	groups = {snappy=3, dig_tree=2},
 	node_box = {
 	type = "fixed",
@@ -82,7 +84,7 @@ homedecor.register("bench_large_1", {
 		"homedecor_generic_wood_old.png",
 		"homedecor_generic_metal_wrought_iron.png"
 	},
-	description = "Garden Bench (style 1)",
+	description = S("Garden Bench (style 1)"),
 	inventory_image = "homedecor_bench_large_1_inv.png",
 	groups = { snappy = 3, dig_tree=2 },
 	expand = { right="placeholder" },
@@ -111,7 +113,7 @@ local bl2_cbox = {
 }
 
 homedecor.register("bench_large_2", {
-	description = "Garden Bench (style 2)",
+	description = S("Garden Bench (style 2)"),
 	mesh = "homedecor_bench_large_2.obj",
 	tiles = { "homedecor_generic_wood_old.png" },
 	inventory_image = "homedecor_bench_large_2_inv.png",
@@ -134,7 +136,7 @@ local kc_cbox = {
 }
 
 homedecor.register("kitchen_chair_wood", {
-	description = "Kitchen chair",
+	description = S("Kitchen chair"),
 	mesh = "homedecor_kitchen_chair.obj",
 	tiles = {
 		homedecor.plain_wood,
@@ -156,7 +158,7 @@ homedecor.register("kitchen_chair_wood", {
 })
 
 homedecor.register("kitchen_chair_padded", {
-	description = "Kitchen chair",
+	description = S("Kitchen chair"),
 	mesh = "homedecor_kitchen_chair.obj",
 	tiles = {
 		homedecor.plain_wood,
@@ -196,8 +198,8 @@ local ofchairs_cbox = {
 }
 
 local chairs = {
-	{ "basic",   "Basic office chair" },
-	{ "upscale", "Upscale office chair" },
+	{ "basic",   S("Basic office chair") },
+	{ "upscale", S("Upscale office chair") },
 }
 
 for _, c in pairs(chairs) do