Merge remote-tracking branch 'upstream/master'

3d_armor_stand/init.lua

@@ -1,5 +1,5 @@
 -- support for i18n
-local S = armor_i18n.gettext
+local S = minetest.get_translator(minetest.get_current_modname())
 
 local armor_stand_formspec = "size[8,7]" ..
 	default.gui_bg ..
@@ -97,7 +97,7 @@ local function update_entity(pos)
 				yaw = math.pi / 2
 			end
 		end
-		object:setyaw(yaw)
+		object:set_yaw(yaw)
 		object:set_properties({textures={texture}})
 	end
 end

3d_armor_stand/locale/3d_armor_stand.fr.tr

@@ -0,0 +1,10 @@
+# textdomain: 3d_armor_stand
+
+
+### init.lua ###
+
+Armor Stand=Support d'armure
+Armor Stand (owned by @1)=Support d'armure (propriété de @1)
+Armor stand=Support d'armure
+Armor stand top=Haut de support d'armure
+Locked Armor stand=Support d'armure verrouillé

3d_armor_stand/locale/template.txt

@@ -0,0 +1,10 @@
+# textdomain: 3d_armor_stand
+
+
+### init.lua ###
+
+Armor Stand=
+Armor Stand (owned by @1)=
+Armor stand=
+Armor stand top=
+Locked Armor stand=

3d_armor_stand/mod.conf

@@ -0,0 +1,2 @@
+name = 3d_armor_stand
+depends = 3d_armor