Merge branch 'master' into walkanimation

.luacheckrc

@@ -12,7 +12,9 @@ read_globals = {
 	"Settings",
 	"unpack",
 	-- Silence errors about custom table methods.
-	table = { fields = { "copy", "indexof" } }
+	table = { fields = { "copy", "indexof" } },
+	-- Silence warnings about accessing undefined fields of global 'math'
+	math = { fields = { "sign" } }
 }
 
 -- Overwrites minetest.handle_node_drops

.travis.yml

@@ -1,12 +1,11 @@
 language: generic
-sudo: false
 addons:
   apt:
     packages:
     - luarocks
 before_install:
   - luarocks install --local luacheck
-script: 
-- $HOME/.luarocks/bin/luacheck --no-color ./mods
+script:
+- $HOME/.luarocks/bin/luacheck ./mods
 notifications:
   email: false

README.md

@@ -0,0 +1,35 @@
+# Minetest Game
+
+The default game bundled in the Minetest engine.  
+
+For further information, check 
+[this forum topic](https://forum.minetest.net/viewtopic.php?f=15&t=9724).   
+Also see the [Minetest Wiki](https://wiki.minetest.net/Subgames/Minetest_Game) 
+for more information.
+
+## Installation
+
+- Unzip the archive, rename the folder to minetest_game and
+place it in .. minetest/games/
+
+- GNU/Linux: If you use a system-wide installation place
+    it in ~/.minetest/games/.
+
+The Minetest engine can be found at [GitHub](https://github.com/minetest/minetest).
+
+For further information or help, see:  
+https://wiki.minetest.net/Installing_Mods
+
+## Compatibility
+
+The Minetest Game GitHub master HEAD is generally compatible with the GitHub
+master HEAD of the Minetest engine.  
+Additionally, when the Minetest engine is tagged to be a certain version (e.g.
+0.4.10), Minetest Game is tagged with the version too.
+
+When stable releases are made, Minetest Game and the Minetest engine is packaged 
+and made available at [www.minetest.net](https://www.minetest.net/downloads/).
+
+## Licensing
+
+See `LICENSE.txt`

README.txt

@@ -1,28 +0,0 @@
-Minetest Game [minetest_game]
-=============================
-The main game for the Minetest engine
-=====================================
-
-To use this game with the Minetest engine, insert this repository as
-	/games/minetest_game
-
-The Minetest engine can be found in:
-	https://github.com/minetest/minetest/
-
-Compatibility
---------------
-The Minetest Game github master HEAD is generally compatible with the github
-master HEAD of the Minetest engine.
-
-Additionally, when the Minetest engine is tagged to be a certain version (eg.
-0.4.10), Minetest Game is tagged with the version too.
-
-When stable releases are made, Minetest Game is packaged and made available in
-	http://minetest.net/downloads/
-and in case the repository has grown too much, it may be reset. In that sense,
-this is not a "real" git repository. (Package maintainers please note!)
-
-Licensing
----------
-
-See LICENSE.txt

game_api.txt

@@ -276,7 +276,7 @@ The mod that places chests with loot in dungeons provides an API to register add
 	name = "item:name",
 	chance = 0.5,
 	-- ^ chance value from 0.0 to 1.0 that the item will appear in the chest when chosen
-	--   due to an extra step in the selection process, 0.5 does not(!) mean that
+	--   Due to an extra step in the selection process, 0.5 does not(!) mean that
 	--   on average every second chest will have this item
 	count = {1, 4},
 	-- ^ table with minimum and maximum amounts of this item
@@ -286,7 +286,8 @@ The mod that places chests with loot in dungeons provides an API to register add
 	--   optional, defaults to no height restrictions
 	types = {"desert"},
 	-- ^ table with types of dungeons this item can be found in
-	--   supported types: "normal" (the cobble/mossycobble one), "sandstone", "desert"
+	--   supported types: "normal" (the cobble/mossycobble one), "sandstone"
+	--   "desert" and "ice"
 	--   optional, defaults to no type restrictions
 
 
@@ -358,6 +359,8 @@ The farming API allows you to easily register plants and hoes.
 
 	{
 		description = "",                      -- Description of seed item
+		harvest_description = "",              -- Description of harvest item
+		                                       -- (optional, derived automatically if not provided)
 		inventory_image = "unknown_item.png",  -- Image to be used as seed's wield- and inventory image
 		steps = 8,                             -- How many steps the plant has to grow, until it can be harvested
 		-- ^ Always provide a plant texture for each step, format: modname_plantname_i.png (i = stepnumber)
@@ -725,27 +728,29 @@ delivered with Minetest Game, to keep them compatible with other mods.
  * `sounds`: See [#Default sounds]
  * `worldaligntex`: A bool to set all textures world-aligned. Default false. See [Tile definition]
 
-`stairs.register_stair_inner(subname, recipeitem, groups, images, description, sounds, worldaligntex)`
+`stairs.register_stair_inner(subname, recipeitem, groups, images, description, sounds, worldaligntex, full_description)`
 
  * Registers an inner corner stair
  * `subname`: Basically the material name (e.g. cobble) used for the stair name. Nodename pattern: "stairs:stair_inner_subname"
  * `recipeitem`: Item used in the craft recipe, e.g. "default:cobble", may be `nil`
  * `groups`: See [Known damage and digging time defining groups]
  * `images`: See [Tile definition]
- * `description`: Used for the description field in the stair's definition
+ * `description`: Used for the description field in the stair's definition with "Inner" prepended
  * `sounds`: See [#Default sounds]
  * `worldaligntex`: A bool to set all textures world-aligned. Default false. See [Tile definition]
+ * `full_description`: Overrides the description, bypassing string concatenation. This is useful for translation. (optional)
 
-`stairs.register_stair_outer(subname, recipeitem, groups, images, description, sounds, worldaligntex)`
+`stairs.register_stair_outer(subname, recipeitem, groups, images, description, sounds, worldaligntex, full_description)`
 
  * Registers an outer corner stair
  * `subname`: Basically the material name (e.g. cobble) used for the stair name. Nodename pattern: "stairs:stair_outer_subname"
  * `recipeitem`: Item used in the craft recipe, e.g. "default:cobble", may be `nil`
  * `groups`: See [Known damage and digging time defining groups]
  * `images`: See [Tile definition]
- * `description`: Used for the description field in the stair's definition
+ * `description`: Used for the description field in the stair's definition with "Outer" prepended
  * `sounds`: See [#Default sounds]
  * `worldaligntex`: A bool to set all textures world-aligned. Default false. See [Tile definition]
+ * `full_description`: Overrides the description, bypassing string concatenation. This is useful for translation. (optional)
 
 `stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, sounds, worldaligntex)`
 
@@ -768,7 +773,11 @@ Creates panes that automatically connect to each other
 ### Pane definition
 
 	{
-		textures = {"texture for sides", (unused), "texture for top and bottom"}, -- More tiles aren't supported
+		textures = {
+			"texture for front and back",
+			(unused),
+			"texture for the 4 edges"
+		}, -- More tiles aren't supported
 		groups = {group = rating}, -- Uses the known node groups, see [Known damage and digging time defining groups]
 		sounds = SoundSpec,        -- See [#Default sounds]
 		recipe = {{"","","","","","","","",""}}, -- Recipe field only

minetest.conf.example

@@ -60,7 +60,18 @@ default:torch 99,default:cobble 99
 # Default value is true.
 #enable_bed_night_skip = true
 
+# If enabled, fences and walls cannot be jumped over.
+#enable_fence_tall = false
+
 # Whether the engine's spawn search, which does not check for a suitable
 # starting biome, is used.
 # Default value is false.
 #engine_spawn = false
+
+# Whether river water source nodes create flowing sounds.
+# Helps rivers create more sound, especially on level sections.
+#river_source_sounds = false
+
+# Enable cloud variation by the 'weather' mod.
+# Non-functional in V6 or Singlenode mapgens.
+#enable_weather = true

mods/beds/README.txt

@@ -15,11 +15,11 @@ BlockMen (CC BY-SA 3.0)
 TumeniNodes (CC BY-SA 3.0)
  beds_bed_under.png
 
-This mod adds a bed to Minetest which allows to skip the night.
-To sleep, rightclick the bed. If playing in singleplayer mode the night gets skipped
+This mod adds a bed to Minetest which allows players to skip the night.
+To sleep, right click on the bed. If playing in singleplayer mode the night gets skipped
 immediately. If playing multiplayer you get shown how many other players are in bed too,
 if all players are sleeping the night gets skipped. The night skip can be forced if more
-than 50% of the players are lying in bed and use this option.
+than half of the players are lying in bed and use this option.
 
 Another feature is a controlled respawning. If you have slept in bed (not just lying in
 it) your respawn point is set to the beds location and you will respawn there after

mods/beds/beds.lua

@@ -1,7 +1,12 @@
+-- beds/beds.lua
+
+-- support for MT game translation.
+local S = beds.get_translator
+
 -- Fancy shaped bed
 
 beds.register_bed("beds:fancy_bed", {
-	description = "Fancy Bed",
+	description = S("Fancy Bed"),
 	inventory_image = "beds_bed_fancy.png",
 	wield_image = "beds_bed_fancy.png",
 	tiles = {
@@ -52,7 +57,7 @@ beds.register_bed("beds:fancy_bed", {
 -- Simple shaped bed
 
 beds.register_bed("beds:bed", {
-	description = "Simple Bed",
+	description = S("Simple Bed"),
 	inventory_image = "beds_bed.png",
 	wield_image = "beds_bed.png",
 	tiles = {

mods/beds/depends.txt

@@ -1,2 +0,0 @@
-default
-wool

mods/beds/functions.lua

@@ -5,6 +5,9 @@ if enable_respawn == nil then
 	enable_respawn = true
 end
 
+-- support for MT game translation.
+local S = beds.get_translator
+
 -- Helper functions
 
 local function get_look_yaw(pos)
@@ -108,17 +111,19 @@ end
 
 local function update_formspecs(finished)
 	local ges = #minetest.get_connected_players()
-	local form_n
 	local player_in_bed = get_player_in_bed_count()
 	local is_majority = (ges / 2) < player_in_bed
 
+	local form_n
+	local esc = minetest.formspec_escape
 	if finished then
-		form_n = beds.formspec .. "label[2.7,9; Good morning.]"
+		form_n = beds.formspec .. "label[2.7,9;" .. esc(S("Good morning.")) .. "]"
 	else
-		form_n = beds.formspec .. "label[2.2,9;" .. tostring(player_in_bed) ..
-			" of " .. tostring(ges) .. " players are in bed]"
+		form_n = beds.formspec .. "label[2.2,9;" ..
+			esc(S("@1 of @2 players are in bed", player_in_bed, ges)) .. "]"
 		if is_majority and is_night_skip_enabled() then
-			form_n = form_n .. "button_exit[2,6;4,0.75;force;Force night skip]"
+			form_n = form_n .. "button_exit[2,6;4,0.75;force;" ..
+				esc(S("Force night skip")) .. "]"
 		end
 	end
 
@@ -150,7 +155,7 @@ function beds.on_rightclick(pos, player)
 		if beds.player[name] then
 			lay_down(player, nil, nil, false)
 		end
-		minetest.chat_send_player(name, "You can only sleep at night.")
+		minetest.chat_send_player(name, S("You can only sleep at night."))
 		return
 	end
 

mods/beds/init.lua

@@ -1,13 +1,20 @@
+-- beds/init.lua
+
+-- Load support for MT game translation.
+local S = minetest.get_translator("beds")
+local esc = minetest.formspec_escape
+
 beds = {}
 beds.player = {}
 beds.bed_position = {}
 beds.pos = {}
 beds.spawn = {}
+beds.get_translator = S
 
 beds.formspec = "size[8,11;true]" ..
 	"no_prepend[]" ..
 	"bgcolor[#080808BB;true]" ..
-	"button_exit[2,10;4,0.75;leave;Leave Bed]"
+	"button_exit[2,10;4,0.75;leave;" .. esc(S("Leave Bed")) .. "]"
 
 local modpath = minetest.get_modpath("beds")
 

mods/beds/locale/beds.de.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Schickes Bett
+Simple Bed=Schlichtes Bett
+Leave Bed=Bett verlassen
+Good morning.=Guten Morgen.
+@1 of @2 players are in bed=@1 von @2 Spielern sind im Bett
+Force night skip=Überspringen der Nacht erzwingen
+You can only sleep at night.=Sie können nur nachts schlafen.

mods/beds/locale/beds.es.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Cama de lujo
+Simple Bed=Cama sencilla
+Leave Bed=Abandonar cama
+Good morning.=Buenos días.
+@1 of @2 players are in bed=@1 de @2 jugadores están en cama
+Force night skip=Forzar evitar noche
+You can only sleep at night.=Sólo puedes dormir por la noche.

mods/beds/locale/beds.fr.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Lit chic
+Simple Bed=Lit simple
+Leave Bed=Se lever du lit
+Good morning.=Bonjour.
+@1 of @2 players are in bed=@1 joueur(s) sur @2 sont au lit
+Force night skip=Forcer le passage de la nuit
+You can only sleep at night.=Vous ne pouvez dormir que la nuit.

mods/beds/locale/beds.it.tr

@@ -0,0 +1,4 @@
+# textdomain: beds
+Fancy Bed=Letto decorato
+Simple Bed=Letto semplice
+Leave Bed=Alzati dal letto

mods/beds/locale/beds.ms.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Katil Beragam
+Simple Bed=Katil Biasa
+Leave Bed=Bangun
+Good morning.=Selamat pagi.
+@1 of @2 players are in bed=@1 daripada @2 pemain sedang tidur
+Force night skip=Paksa langkau malam
+You can only sleep at night.=Anda hanya boleh tidur pada waktu malam.

mods/beds/locale/beds.ru.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Детализированная Кровать
+Simple Bed=Обычная Кровать
+Leave Bed=Встать с кровати
+Good morning.=Доброе утро.
+@1 of @2 players are in bed=@1 из @2 игроков в кровати
+Force night skip=Пропустить ночь
+You can only sleep at night.=Вы можете спать только ночью.

mods/beds/locale/beds.se.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Fin säng
+Simple Bed=Enkel Säng
+Leave Bed=Lämna Säng
+Good morning.= God morgon.
+@1 of @2 players are in bed=@1 av @2 spelar försöker sover.
+Force night skip=Tvinga över natten
+You can only sleep at night.=Du kan bara sova på natten.

mods/beds/locale/template.txt

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=
+Simple Bed=
+Leave Bed=
+Good morning.=
+@1 of @2 players are in bed=
+Force night skip=
+You can only sleep at night.=

mods/beds/mod.conf

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

mods/binoculars/depends.txt

@@ -1,2 +0,0 @@
-default
-creative?

mods/binoculars/init.lua

@@ -1,7 +1,12 @@
+-- binoculars/init.lua
+
 -- Mod global namespace
 
 binoculars = {}
 
+-- Load support for MT game translation.
+local S = minetest.get_translator("binoculars")
+
 
 -- Detect creative mod
 local creative_mod = minetest.get_modpath("creative")
@@ -54,7 +59,7 @@ minetest.after(4.7, cyclic_update)
 -- Binoculars item
 
 minetest.register_craftitem("binoculars:binoculars", {
-	description = "Binoculars\nUse with 'Zoom' key",
+	description = S("Binoculars") .. "\n" .. S("Use with 'Zoom' key"),
 	inventory_image = "binoculars_binoculars.png",
 	stack_max = 1,
 

mods/binoculars/locale/binoculars.de.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Fernglas
+Use with 'Zoom' key=Mit „Zoom“-Taste benutzen

mods/binoculars/locale/binoculars.es.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Prismáticos
+Use with 'Zoom' key=Usar con la tecla 'Zoom'

mods/binoculars/locale/binoculars.fr.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Jumelles
+Use with 'Zoom' key=Utiliser avec le bouton « Zoom »

mods/binoculars/locale/binoculars.it.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Binocolo
+Use with 'Zoom' key=Usalo col tasto 'Ingrandimento'

mods/binoculars/locale/binoculars.ms.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Binokular
+Use with 'Zoom' key=Guna dengan kekunci 'Zum'

mods/binoculars/locale/binoculars.ru.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Бинокль
+Use with 'Zoom' key=Используется с привилегией 'Zoom'

mods/binoculars/locale/binoculars.se.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Kikare
+Use with 'Zoom' key=Används med 'Zoom' knappen

mods/binoculars/locale/template.txt

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=
+Use with 'Zoom' key=

mods/binoculars/mod.conf

@@ -0,0 +1,4 @@
+name = binoculars
+description = Minetest Game mod: binoculars
+depends = default
+optional_depends = creative

mods/boats/depends.txt

@@ -1,2 +0,0 @@
-default
-player_api

mods/boats/init.lua

@@ -1,3 +1,8 @@
+-- boats/init.lua
+
+-- Load support for MT game translation.
+local S = minetest.get_translator("boats")
+
 --
 -- Helper functions
 --
@@ -8,15 +13,6 @@ local function is_water(pos)
 end
 
 
-local function get_sign(i)
-	if i == 0 then
-		return 0
-	else
-		return i / math.abs(i)
-	end
-end
-
-
 local function get_velocity(v, yaw, y)
 	local x = -math.sin(yaw) * v
 	local z =  math.cos(yaw) * v
@@ -141,7 +137,7 @@ end
 
 
 function boat.on_step(self, dtime)
-	self.v = get_v(self.object:get_velocity()) * get_sign(self.v)
+	self.v = get_v(self.object:get_velocity()) * math.sign(self.v)
 	if self.driver then
 		local driver_objref = minetest.get_player_by_name(self.driver)
 		if driver_objref then
@@ -149,16 +145,16 @@ function boat.on_step(self, dtime)
 			if ctrl.up and ctrl.down then
 				if not self.auto then
 					self.auto = true
-					minetest.chat_send_player(self.driver, "[boats] Cruise on")
+					minetest.chat_send_player(self.driver, S("Boat cruise mode on"))
 				end
 			elseif ctrl.down then
-				self.v = self.v - dtime * 1.8
+				self.v = self.v - dtime * 2.0
 				if self.auto then
 					self.auto = false
-					minetest.chat_send_player(self.driver, "[boats] Cruise off")
+					minetest.chat_send_player(self.driver, S("Boat cruise mode off"))
 				end
 			elseif ctrl.up or self.auto then
-				self.v = self.v + dtime * 1.8
+				self.v = self.v + dtime * 2.0
 			end
 			if ctrl.left then
 				if self.v < -0.001 then
@@ -180,15 +176,14 @@ function boat.on_step(self, dtime)
 		self.object:set_pos(self.object:get_pos())
 		return
 	end
-	local s = get_sign(self.v)
-	self.v = self.v - dtime * 0.6 * s
-	if s ~= get_sign(self.v) then
-		self.object:set_velocity({x = 0, y = 0, z = 0})
+	-- We need to preserve velocity sign to properly apply drag force
+	-- while moving backward
+	local drag = dtime * math.sign(self.v) * (0.01 + 0.0796 * self.v * self.v)
+	-- If drag is larger than velocity, then stop horizontal movement
+	if math.abs(self.v) <= math.abs(drag) then
 		self.v = 0
-		return
-	end
-	if math.abs(self.v) > 5 then
-		self.v = 5 * get_sign(self.v)
+	else
+		self.v = self.v - drag
 	end
 
 	local p = self.object:get_pos()
@@ -242,7 +237,7 @@ minetest.register_entity("boats:boat", boat)
 
 
 minetest.register_craftitem("boats:boat", {
-	description = "Boat",
+	description = S("Boat"),
 	inventory_image = "boats_inventory.png",
 	wield_image = "boats_wield.png",
 	wield_scale = {x = 2, y = 2, z = 1},

mods/boats/locale/boats.de.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Schneller Bootsmodus an
+Boat cruise mode off=Schneller Bootsmodus aus
+Boat=Boot

mods/boats/locale/boats.es.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Modo crucero en bote activado
+Boat cruise mode off=Modo crucero en bote desactivado
+Boat=Bote

mods/boats/locale/boats.fr.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Bateau mode rapide activé
+Boat cruise mode off=Bateau mode rapide désactivé
+Boat=Bateau

mods/boats/locale/boats.it.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Modalità movimento automatico barca attivata
+Boat cruise mode off=Modalità movimento automatico barca disattivata
+Boat=Barca

mods/boats/locale/boats.ms.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Mod bot layar makan angin dibolehkan
+Boat cruise mode off=Mod bot layar makan angin dilumpuhkan
+Boat=Bot

mods/boats/locale/boats.ru.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Режим путешествия на лодке включен
+Boat cruise mode off=Режим путешествия на лодке выключен
+Boat=Лодка

mods/boats/locale/boats.se.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Båtkryssningsläge på
+Boat cruise mode off=Båtkryssningsläge av
+Boat=Båt

mods/boats/locale/template.txt

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=
+Boat cruise mode off=
+Boat=

mods/boats/mod.conf

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

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
@@ -242,8 +246,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)
@@ -266,7 +269,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)
@@ -276,6 +279,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.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/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

mods/bucket/depends.txt

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

mods/bucket/init.lua

@@ -1,15 +1,19 @@
 -- Minetest 0.4 mod: bucket
 -- See README.txt for licensing and other information.
 
+-- Load support for MT game translation.
+local S = minetest.get_translator("bucket")
+
+
 minetest.register_alias("bucket", "bucket:bucket_empty")
 minetest.register_alias("bucket_water", "bucket:bucket_water")
 minetest.register_alias("bucket_lava", "bucket:bucket_lava")
 
 minetest.register_craft({
-	output = 'bucket:bucket_empty 1',
+	output = "bucket:bucket_empty 1",
 	recipe = {
-		{'default:steel_ingot', '', 'default:steel_ingot'},
-		{'', 'default:steel_ingot', ''},
+		{"default:steel_ingot", "", "default:steel_ingot"},
+		{"", "default:steel_ingot", ""},
 	}
 })
 
@@ -111,9 +115,9 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 end
 
 minetest.register_craftitem("bucket:bucket_empty", {
-	description = "Empty Bucket",
+	description = S("Empty Bucket"),
 	inventory_image = "bucket.png",
-	stack_max = 99,
+	groups = {tool = 1},
 	liquids_pointable = true,
 	on_use = function(itemstack, user, pointed_thing)
 		if pointed_thing.type == "object" then
@@ -185,8 +189,8 @@ bucket.register_liquid(
 	"default:water_flowing",
 	"bucket:bucket_water",
 	"bucket_water.png",
-	"Water Bucket",
-	{water_bucket = 1}
+	S("Water Bucket"),
+	{tool = 1, water_bucket = 1}
 )
 
 -- River water source is 'liquid_renewable = false' to avoid horizontal spread
@@ -200,8 +204,8 @@ bucket.register_liquid(
 	"default:river_water_flowing",
 	"bucket:bucket_river_water",
 	"bucket_river_water.png",
-	"River Water Bucket",
-	{water_bucket = 1},
+	S("River Water Bucket"),
+	{tool = 1, water_bucket = 1},
 	true
 )
 
@@ -210,7 +214,8 @@ bucket.register_liquid(
 	"default:lava_flowing",
 	"bucket:bucket_lava",
 	"bucket_lava.png",
-	"Lava Bucket"
+	S("Lava Bucket"),
+	{tool = 1}
 )
 
 minetest.register_craft({

mods/bucket/locale/bucket.de.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Leerer Eimer
+Water Bucket=Wassereimer
+River Water Bucket=Flusswassereimer
+Lava Bucket=Lavaeimer

mods/bucket/locale/bucket.es.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Cubo vacío
+Water Bucket=Cubo con agua
+River Water Bucket=Cubo con agua de río
+Lava Bucket=Cubo con lava

mods/bucket/locale/bucket.fr.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Seau vide
+Water Bucket=Seau d'eau
+River Water Bucket=Seau d'eau de rivière
+Lava Bucket=Seau de lave

mods/bucket/locale/bucket.it.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Secchio vuoto
+Water Bucket=Secchio d'acqua
+River Water Bucket=Secchio d'acqua di fiume
+Lava Bucket=Secchio di lava

mods/bucket/locale/bucket.ms.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Baldi Kosong
+Water Bucket=Baldi Air
+River Water Bucket=Baldi Air Sungai
+Lava Bucket=Baldi Lava

mods/bucket/locale/bucket.ru.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Пустое Ведро
+Water Bucket=Ведро с Водой
+River Water Bucket=Ведро с Речной Водой
+Lava Bucket=Ведро с Лавой

mods/bucket/locale/bucket.se.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Tom hink
+Water Bucket=Vatten hink
+River Water Bucket=Flodvatten hink
+Lava Bucket=Lava hink

mods/bucket/locale/template.txt

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=
+Water Bucket=
+River Water Bucket=
+Lava Bucket=

mods/bucket/mod.conf

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

mods/butterflies/depends.txt

@@ -1,2 +0,0 @@
-default
-flowers

mods/butterflies/init.lua

@@ -1,8 +1,13 @@
+-- butterflies/init.lua
+
+-- Load support for MT game translation.
+local S = minetest.get_translator("butterflies")
+
 -- register butterflies
 local butter_list = {
-	{"white", "White"},
-	{"red", "Red"},
-	{"violet", "Violet"}
+	{"white",  S("White Butterfly")},
+	{"red",    S("Red Butterfly")},
+	{"violet", S("Violet Butterfly")}
 }
 
 for i in ipairs (butter_list) do
@@ -10,7 +15,7 @@ for i in ipairs (butter_list) do
 	local desc = butter_list[i][2]
 
 	minetest.register_node("butterflies:butterfly_"..name, {
-		description = desc.." Butterfly",
+		description = desc,
 		drawtype = "plantlike",
 		tiles = {{
 			name = "butterflies_butterfly_"..name.."_animated.png",
@@ -56,10 +61,9 @@ for i in ipairs (butter_list) do
 	})
 
 	minetest.register_node("butterflies:hidden_butterfly_"..name, {
-		description = "Hidden "..desc.." Butterfly",
 		drawtype = "airlike",
-		inventory_image = "insects_butterfly_"..name..".png",
-		wield_image =  "insects_butterfly_"..name..".png",
+		inventory_image = "butterflies_butterfly_"..name..".png",
+		wield_image =  "butterflies_butterfly_"..name..".png",
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
@@ -98,7 +102,7 @@ minetest.register_decoration({
 	place_offset_y = 2,
 	sidelen = 80,
 	fill_ratio = 0.005,
-	biomes = {"grassland", "deciduous_forest", "floatland_grassland"},
+	biomes = {"grassland", "deciduous_forest"},
 	y_max = 31000,
 	y_min = 1,
 	decoration = {

mods/butterflies/locale/butterflies.de.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Weißer Schmetterling
+Red Butterfly=Roter Schmetterling
+Violet Butterfly=Violetter Schmetterling

mods/butterflies/locale/butterflies.es.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Mariposa blanca
+Red Butterfly=Mariposa roja
+Violet Butterfly=Mariposa violeta

mods/butterflies/locale/butterflies.fr.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Papillon blanc
+Red Butterfly=Papillon rouge
+Violet Butterfly=Papillon violet

mods/butterflies/locale/butterflies.it.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Farfalla bianca
+Red Butterfly=Farfalla rossa
+Violet Butterfly=Farfalla viola

mods/butterflies/locale/butterflies.ms.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Rama-Rama Putih
+Red Butterfly=Rama-Rama Merah
+Violet Butterfly=Rama-Rama Ungu

mods/butterflies/locale/butterflies.ru.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Белая Бабочка
+Red Butterfly=Красная Бабочка
+Violet Butterfly=Фиолетовая Бабочка

mods/butterflies/locale/butterflies.se.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Vit fjäril
+Red Butterfly=Röd fjäril
+Violet Butterfly=Violett fjäril

mods/butterflies/locale/template.txt

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=
+Red Butterfly=
+Violet Butterfly=

mods/butterflies/mod.conf

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

mods/carts/cart_entity.lua

@@ -1,3 +1,8 @@
+-- carts/cart_entity.lua
+
+-- support for MT game translation.
+local S = carts.get_translator
+
 local cart_entity = {
 	initial_properties = {
 		physical = false, -- otherwise going uphill breaks
@@ -383,7 +388,7 @@ end
 minetest.register_entity("carts:cart", cart_entity)
 
 minetest.register_craftitem("carts:cart", {
-	description = "Cart (Sneak+Click to pick up)",
+	description = S("Cart") .. "\n" .. S("(Sneak+Click to pick up)"),
 	inventory_image = minetest.inventorycube("carts_cart_top.png", "carts_cart_side.png", "carts_cart_side.png"),
 	wield_image = "carts_cart_side.png",
 	on_place = function(itemstack, placer, pointed_thing)

mods/carts/depends.txt

@@ -1,2 +0,0 @@
-default
-player_api

mods/carts/init.lua

@@ -1,7 +1,12 @@
+-- carts/init.lua
+
+-- Load support for MT game translation.
+local S = minetest.get_translator("carts")
 
 carts = {}
 carts.modpath = minetest.get_modpath("carts")
 carts.railparams = {}
+carts.get_translator = S
 
 -- Maximal speed of the cart in m/s (min = -1)
 carts.speed_max = 7

mods/carts/locale/carts.de.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Lore
+(Sneak+Click to pick up)=(Schleichen u. Klicken zum Aufheben)
+Rail=Schiene
+Powered Rail=Antriebsschiene
+Brake Rail=Bremsschiene

mods/carts/locale/carts.es.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Vagoneta
+(Sneak+Click to pick up)=(Agacharse+Clic para recoger)
+Rail=Raíl
+Powered Rail=Raíl energizado
+Brake Rail=Raíl de frenado

mods/carts/locale/carts.fr.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Chariot
+(Sneak+Click to pick up)=(Se baisser + clic pour ramasser)
+Rail=Rail
+Powered Rail=Rail de traction
+Brake Rail=Rail de freinage

mods/carts/locale/carts.it.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Vagone
+(Sneak+Click to pick up)=(Strisciare+Click per raccoglierlo)
+Rail=Binario
+Powered Rail=Binario alimentato
+Brake Rail=Binario freno

mods/carts/locale/carts.ms.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Pedati
+(Sneak+Click to pick up)=(Selinap+Klik untuk ambil balik)
+Rail=Landasan
+Powered Rail=Landasan Berkuasa
+Brake Rail=Landasan Brek

mods/carts/locale/carts.ru.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Вагонетка
+(Sneak+Click to pick up)=(Пригнитесь и кликните по вагонетке, чтобы забрать)
+Rail=Рельса
+Powered Rail=Механизированная Рельса
+Brake Rail=Рельса с тормозом

mods/carts/locale/carts.se.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Vagn
+(Sneak+Click to pick up)=(Shift+Klicka för att plocka upp)
+Rail=Räls
+Powered Rail=Aktiverad räls
+Brake Rail=Broms räls

mods/carts/locale/template.txt

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=
+(Sneak+Click to pick up)=
+Rail=
+Powered Rail=
+Brake Rail=

mods/carts/mod.conf

@@ -0,0 +1,3 @@
+name = carts
+description = Carts (formerly boost_cart)
+depends = default, player_api

mods/carts/rails.lua

@@ -1,5 +1,10 @@
+-- carts/rails.lua
+
+-- support for MT game translation.
+local S = carts.get_translator
+
 carts:register_rail("carts:rail", {
-	description = "Rail",
+	description = S("Rail"),
 	tiles = {
 		"carts_rail_straight.png", "carts_rail_curved.png",
 		"carts_rail_t_junction.png", "carts_rail_crossing.png"
@@ -22,7 +27,7 @@ minetest.register_alias("default:rail", "carts:rail")
 
 
 carts:register_rail("carts:powerrail", {
-	description = "Powered Rail",
+	description = S("Powered Rail"),
 	tiles = {
 		"carts_rail_straight_pwr.png", "carts_rail_curved_pwr.png",
 		"carts_rail_t_junction_pwr.png", "carts_rail_crossing_pwr.png"
@@ -41,7 +46,7 @@ minetest.register_craft({
 
 
 carts:register_rail("carts:brakerail", {
-	description = "Brake Rail",
+	description = S("Brake Rail"),
 	tiles = {
 		"carts_rail_straight_brk.png", "carts_rail_curved_brk.png",
 		"carts_rail_t_junction_brk.png", "carts_rail_crossing_brk.png"

mods/creative/depends.txt

@@ -1,2 +0,0 @@
-default
-sfinv

mods/creative/init.lua

@@ -1,4 +1,10 @@
+-- creative/init.lua
+
+-- Load support for MT game translation.
+local S = minetest.get_translator("creative")
+
 creative = {}
+creative.get_translator = S
 
 local function update_sfinv(name)
 	minetest.after(0, function()
@@ -14,7 +20,7 @@ local function update_sfinv(name)
 end
 
 minetest.register_privilege("creative", {
-	description = "Allow player to use creative inventory",
+	description = S("Allow player to use creative inventory"),
 	give_to_singleplayer = false,
 	give_to_admin = false,
 	on_grant = update_sfinv,
@@ -40,10 +46,8 @@ if creative_mode_cache then
 	local digtime = 42
 	local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 256}
 
-	minetest.register_item(":", {
-		type = "none",
-		wield_image = "wieldhand.png",
-		wield_scale = {x = 1, y = 1, z = 2.5},
+	-- Override the hand tool
+	minetest.override_item("", {
 		range = 10,
 		tool_capabilities = {
 			full_punch_interval = 0.5,
@@ -54,6 +58,9 @@ if creative_mode_cache then
 				snappy  = caps,
 				choppy  = caps,
 				oddly_breakable_by_hand = caps,
+				-- dig_immediate group doesn't use value 1. Value 3 is instant dig
+				dig_immediate =
+					{times = {[2] = digtime, [3] = 0}, uses = 0, maxlevel = 256},
 			},
 			damage_groups = {fleshy = 10},
 		}

mods/creative/inventory.lua

@@ -1,3 +1,8 @@
+-- creative/inventory.lua
+
+-- support for MT game translation.
+local S = creative.get_translator
+
 local player_inventory = {}
 local inventory_cache = {}
 
@@ -54,22 +59,36 @@ function creative.init_creative_inventory(player)
 	return player_inventory[player_name]
 end
 
+local function match(s, filter)
+	if filter == "" then
+		return 0
+	end
+	if s:lower():find(filter, 1, true) then
+		return #s - #filter
+	end
+	return nil
+end
+
 function creative.update_creative_inventory(player_name, tab_content)
-	local creative_list = {}
 	local inv = player_inventory[player_name] or
 			creative.init_creative_inventory(minetest.get_player_by_name(player_name))
 	local player_inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name})
 
 	local items = inventory_cache[tab_content] or init_creative_cache(tab_content)
 
+	local creative_list = {}
+	local order = {}
 	for name, def in pairs(items) do
-		if def.name:find(inv.filter, 1, true) or
-				def.description:lower():find(inv.filter, 1, true) then
+		local m = match(def.description, inv.filter) or match(def.name, inv.filter)
+		if m then
 			creative_list[#creative_list+1] = name
+			-- Sort by description length first so closer matches appear earlier
+			order[name] = string.format("%02d", m) .. name
 		end
 	end
 
-	table.sort(creative_list)
+	table.sort(creative_list, function(a, b) return order[a] < order[b] end)
+
 	player_inv:set_size("main", #creative_list)
 	player_inv:set_list("main", creative_list)
 	inv.size = #creative_list
@@ -101,32 +120,31 @@ function creative.register_tab(name, title, items)
 			creative.update_creative_inventory(player_name, items)
 			local inv = player_inventory[player_name]
 			local start_i = inv.start_i or 0
-			local pagenum = math.floor(start_i / (3*8) + 1)
-			local pagemax = math.ceil(inv.size / (3*8))
+			local pagenum = math.floor(start_i / (4*8) + 1)
+			local pagemax = math.ceil(inv.size / (4*8))
+			local esc = minetest.formspec_escape
 			return sfinv.make_formspec(player, context,
-				"label[6.2,3.35;" .. minetest.colorize("#FFFF00", tostring(pagenum)) .. " / " .. tostring(pagemax) .. "]" ..
+				"label[5.8,4.15;" .. minetest.colorize("#FFFF00", tostring(pagenum)) .. " / " .. tostring(pagemax) .. "]" ..
 				[[
-					image[4.06,3.4;0.8,0.8;creative_trash_icon.png]
+					image[4.08,4.2;0.8,0.8;creative_trash_icon.png]
 					listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]
-					list[current_player;main;0,4.7;8,1;]
-					list[current_player;main;0,5.85;8,3;8]
-					list[detached:creative_trash;main;4,3.3;1,1;]
+					list[detached:creative_trash;main;4.02,4.1;1,1;]
 					listring[]
-					image_button[5.4,3.25;0.8,0.8;creative_prev_icon.png;creative_prev;]
-					image_button[7.2,3.25;0.8,0.8;creative_next_icon.png;creative_next;]
-					image_button[2.1,3.25;0.8,0.8;creative_search_icon.png;creative_search;]
-					image_button[2.75,3.25;0.8,0.8;creative_clear_icon.png;creative_clear;]
-					tooltip[creative_search;Search]
-					tooltip[creative_clear;Reset]
-					tooltip[creative_prev;Previous page]
-					tooltip[creative_next;Next page]
-					listring[current_player;main]
-					field_close_on_enter[creative_filter;false]
+					image_button[5,4.05;0.8,0.8;creative_prev_icon.png;creative_prev;]
+					image_button[7.2,4.05;0.8,0.8;creative_next_icon.png;creative_next;]
+					image_button[2.63,4.05;0.8,0.8;creative_search_icon.png;creative_search;]
+					image_button[3.25,4.05;0.8,0.8;creative_clear_icon.png;creative_clear;]
 				]] ..
-				"field[0.3,3.5;2.2,1;creative_filter;;" .. minetest.formspec_escape(inv.filter) .. "]" ..
+				"tooltip[creative_search;" .. esc(S("Search")) .. "]" ..
+				"tooltip[creative_clear;" .. esc(S("Reset")) .. "]" ..
+				"tooltip[creative_prev;" .. esc(S("Previous page")) .. "]" ..
+				"tooltip[creative_next;" .. esc(S("Next page")) .. "]" ..
+				"listring[current_player;main]" ..
+				"field_close_on_enter[creative_filter;false]" ..
+				"field[0.3,4.2;2.8,1.2;creative_filter;;" .. esc(inv.filter) .. "]" ..
 				"listring[detached:creative_" .. player_name .. ";main]" ..
-				"list[detached:creative_" .. player_name .. ";main;0,0;8,3;" .. tostring(start_i) .. "]" ..
-				default.get_hotbar_bg(0,4.7) .. creative.formspec_add, false)
+				"list[detached:creative_" .. player_name .. ";main;0,0;8,4;" .. tostring(start_i) .. "]" ..
+				creative.formspec_add, true)
 		end,
 		on_enter = function(self, player, context)
 			local player_name = player:get_player_name()
@@ -155,15 +173,15 @@ function creative.register_tab(name, title, items)
 				local start_i = inv.start_i or 0
 
 				if fields.creative_prev then
-					start_i = start_i - 3*8
+					start_i = start_i - 4*8
 					if start_i < 0 then
-						start_i = inv.size - (inv.size % (3*8))
+						start_i = inv.size - (inv.size % (4*8))
 						if inv.size == start_i then
-							start_i = math.max(0, inv.size - (3*8))
+							start_i = math.max(0, inv.size - (4*8))
 						end
 					end
 				elseif fields.creative_next then
-					start_i = start_i + 3*8
+					start_i = start_i + 4*8
 					if start_i >= inv.size then
 						start_i = 0
 					end
@@ -176,10 +194,10 @@ function creative.register_tab(name, title, items)
 	})
 end
 
-creative.register_tab("all", "All", minetest.registered_items)
-creative.register_tab("nodes", "Nodes", minetest.registered_nodes)
-creative.register_tab("tools", "Tools", minetest.registered_tools)
-creative.register_tab("craftitems", "Items", minetest.registered_craftitems)
+creative.register_tab("all", S("All"), minetest.registered_items)
+creative.register_tab("nodes", S("Nodes"), minetest.registered_nodes)
+creative.register_tab("tools", S("Tools"), minetest.registered_tools)
+creative.register_tab("craftitems", S("Items"), minetest.registered_craftitems)
 
 local old_homepage_name = sfinv.get_homepage_name
 function sfinv.get_homepage_name(player)

mods/creative/locale/creative.de.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Spieler erlauben, das Kreativinventar zu benutzen
+Search=Suchen
+Reset=Zurücksetzen
+Previous page=Vorherige Seite
+Next page=Nächste Seite
+All=Alles
+Nodes=Blöcke
+Tools=Werkzeuge
+Items=Gegenstände

mods/creative/locale/creative.es.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Permitir al jugador usar el inventario creativo
+Search=Buscar
+Reset=Resetear
+Previous page=Pág. siguiente
+Next page=Pág. anterior
+All=Todos
+Nodes=Nodos
+Tools=Herramientas
+Items=Objetos

mods/creative/locale/creative.fr.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Permettre aux joueurs d'utiliser l'inventaire du mode créatif
+Search=Rechercher
+Reset=Réinitialiser
+Previous page=Page précédente
+Next page=Page suivante
+All=Tout
+Nodes=Nœuds
+Tools=Outils
+Items=Article

mods/creative/locale/creative.it.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Permette al giocatore di usare l'inventario creativo
+Search=Cerca
+Reset=Azzera
+Previous page=Pagina precedente
+Next page=Pagina successiva
+All=Tutto
+Nodes=Nodi
+Tools=Strumenti
+Items=Oggetti

mods/creative/locale/creative.ms.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Benarkan pemain menggunakan inventori kreatif
+Search=Cari
+Reset=Set semula
+Previous page=Halaman sebelumnya
+Next page=Halaman seterusnya
+All=Semua
+Nodes=Nod
+Tools=Alatan
+Items=Item

mods/creative/locale/creative.ru.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Разрешить игроку использовать творческий инвентарь
+Search=Поиск
+Reset=Сброс
+Previous page=Предыдущая страница
+Next page=Следующая страница
+All=Всё
+Nodes=Ноды
+Tools=Инструменты
+Items=Предметы

mods/creative/locale/creative.se.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Tilllåt spelare att används kreativa saker
+Search=Sök
+Reset=Återställ
+Previous page=Förra sidan
+Next page=Nästa sidan
+All=Alla
+Nodes=Noder
+Tools=Verktyg
+Items=Saker

mods/creative/locale/template.txt

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=
+Search=
+Reset=
+Previous page=
+Next page=
+All=
+Nodes=
+Tools=
+Items=