From fb31bd3806c56b467dbaaf4dba26aaff4224fdc6 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sun, 15 May 2016 14:49:15 +0200
Subject: [PATCH 001/418] Continue with 0.4.14-dev

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 998cdc9a3..592feb997 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(VERSION_PATCH 14)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
 # Change to false for releases
-set(DEVELOPMENT_BUILD FALSE)
+set(DEVELOPMENT_BUILD TRUE)
 
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 if(VERSION_EXTRA)

From 01a784bd11d833724fdf826d805429d3a6f7b1f5 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Thu, 12 May 2016 04:39:05 +0100
Subject: [PATCH 002/418] Documentation: Remove incorrect and excessive mapgen
 flags text

---
 builtin/settingtypes.txt | 10 ----------
 minetest.conf.example    | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index ad269d8b0..93fb8e952 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -848,8 +848,6 @@ map_generation_limit (Map generation limit) int 31000 0 31000
 #    Global map generation attributes.
 #    In Mapgen v6 the 'decorations' flag controls all decorations except trees
 #    and junglegrass, in all other mapgens this flag controls all decorations.
-#    The default flags set in the engine are: caves, light, decorations
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 mg_flags (Mapgen flags) flags caves,dungeons,light,decorations caves,dungeons,light,decorations,nocaves,nodungeons,nolight,nodecorations
@@ -910,8 +908,6 @@ mgv5_np_cave2 (Mapgen v5 cave2 noise parameters) noise_params 0, 12, (50, 50, 50
 
 #    Map generation attributes specific to Mapgen v6.
 #    When snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored.
-#    The default flags set in the engine are: biomeblend, mudflow
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 mgv6_spflags (Mapgen v6 flags) flags jungles,biomeblend,mudflow,snowbiomes,trees jungles,biomeblend,mudflow,snowbiomes,flat,trees,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat,notrees
@@ -937,8 +933,6 @@ mgv6_np_apple_trees (Mapgen v6 apple trees noise parameters) noise_params 0, 1,
 
 #    Map generation attributes specific to Mapgen v7.
 #    The 'ridges' flag controls the rivers.
-#    The default flags set in the engine are: mountains, ridges
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,nomountains,noridges
@@ -962,8 +956,6 @@ mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (100, 100,
 
 #    Map generation attributes specific to Mapgen flat.
 #    Occasional lakes and hills can be added to the flat world.
-#    The default flags set in the engine are: none
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 mgflat_spflags (Mapgen flat flags) flags  lakes,hills,,nolakes,nohills
@@ -1079,8 +1071,6 @@ mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, (
 #    'altitude_chill' makes higher elevations colder, which may cause biome issues.
 #    'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool,
 #    it may interfere with delicately adjusted biomes.
-#    The default flags set in the engine are: altitude_chill, humid_rivers
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 mg_valleys_spflags (Valleys C Flags) flags altitude_chill,humid_rivers altitude_chill,noaltitude_chill,humid_rivers,nohumid_rivers
diff --git a/minetest.conf.example b/minetest.conf.example
index 5090a620b..a5ca16e51 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1046,8 +1046,6 @@
 #    Global map generation attributes.
 #    In Mapgen v6 the 'decorations' flag controls all decorations except trees
 #    and junglegrass, in all other mapgens this flag controls all decorations.
-#    The default flags set in the engine are: caves, light, decorations
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 #    type: flags possible values: caves, dungeons, light, decorations, nocaves, nodungeons, nolight, nodecorations
@@ -1121,8 +1119,6 @@
 
 #    Map generation attributes specific to Mapgen v6.
 #    When snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored.
-#    The default flags set in the engine are: biomeblend, mudflow
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 #    type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, flat, trees, nojungles, nobiomeblend, nomudflow, nosnowbiomes, noflat, notrees
@@ -1173,8 +1169,6 @@
 
 #    Map generation attributes specific to Mapgen v7.
 #    The 'ridges' flag controls the rivers.
-#    The default flags set in the engine are: mountains, ridges
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 #    type: flags possible values: mountains, ridges, nomountains, noridges
@@ -1221,8 +1215,6 @@
 
 #    Map generation attributes specific to Mapgen flat.
 #    Occasional lakes and hills can be added to the flat world.
-#    The default flags set in the engine are: none
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 #    type: flags possible values: lakes, hills, , nolakes, nohills
@@ -1367,8 +1359,6 @@
 #    'altitude_chill' makes higher elevations colder, which may cause biome issues.
 #    'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool,
 #    it may interfere with delicately adjusted biomes.
-#    The default flags set in the engine are: altitude_chill, humid_rivers
-#    The flags string modifies the engine defaults.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 #    type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers

From 7a828de1bc658938243c0ddf85b7aab7a1087ccd Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 13 May 2016 00:14:24 +0200
Subject: [PATCH 003/418] Android: enable parallelism for main target too

This adds to the changes that commit

98d16e0d9a945f5f48462c05f26ae4bde2db5731 "Android: Tell make about sub-makes to speed up build"

did, and enables parallel builds for minetest
itself as well.
---
 build/android/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/android/Makefile b/build/android/Makefile
index 4ac9760f8..380296993 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -752,7 +752,7 @@ clean_assets :
 apk: local.properties assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) $(LEVELDB_TARGET)       \
 	$(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ANDR_ROOT)/jni/src/android_version.h    \
 	$(ANDR_ROOT)/jni/src/android_version_githash.h sqlite3_download
-	@${ANDROID_NDK}/ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH}               \
+	+ @${ANDROID_NDK}/ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH}             \
 		GPROF=${GPROF} APP_ABI=${TARGET_ABI} HAVE_LEVELDB=${HAVE_LEVELDB}      \
 		APP_PLATFORM=${APP_PLATFORM}                                           \
 		TARGET_LIBDIR=${TARGET_LIBDIR}                                         \

From decbd396df0855f0a356c836cf7c0c5b133964cf Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Mon, 16 May 2016 12:42:51 +0200
Subject: [PATCH 004/418] Really fix ncurses lookup on Arch Linux

Commit 27ee8d8943080a5dd735c9faa47c726604bafdff forgot to add the paths
without ncursesw/ to the find_path() call
---
 cmake/Modules/FindNcursesw.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/Modules/FindNcursesw.cmake b/cmake/Modules/FindNcursesw.cmake
index b8c7f78f2..e572c704a 100644
--- a/cmake/Modules/FindNcursesw.cmake
+++ b/cmake/Modules/FindNcursesw.cmake
@@ -115,7 +115,7 @@ if(CURSES_USE_NCURSESW)
   get_filename_component(_cursesParentDir "${_cursesLibDir}" PATH)
 
   find_path(CURSES_INCLUDE_PATH
-    NAMES ncursesw/ncurses.h ncursesw/curses.h
+    NAMES ncursesw/ncurses.h ncursesw/curses.h ncurses.h curses.h
     HINTS "${_cursesParentDir}/include"
     )
 

From 143401451c457da5079b2970fe260acea45bd85a Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 14 May 2016 12:23:15 +0200
Subject: [PATCH 005/418] DB::loadBlock copy removal & DB backend cleanup *
 Remove the copy from db::loadBlock by using a pointer to the destination *
 cleanup db backend, the child backend doesn't have to set their functions as
 virtual

---
 src/database-dummy.cpp   | 11 +++++++----
 src/database-dummy.h     |  8 ++++----
 src/database-leveldb.cpp |  7 ++-----
 src/database-leveldb.h   |  8 ++++----
 src/database-redis.cpp   | 11 +++++++----
 src/database-redis.h     | 12 ++++++------
 src/database-sqlite3.cpp | 11 ++++-------
 src/database-sqlite3.h   | 18 +++++++++---------
 src/database.h           |  2 +-
 src/main.cpp             |  3 ++-
 src/map.cpp              |  3 +--
 11 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/database-dummy.cpp b/src/database-dummy.cpp
index b38db1fb9..ef2148f70 100644
--- a/src/database-dummy.cpp
+++ b/src/database-dummy.cpp
@@ -30,13 +30,16 @@ bool Database_Dummy::saveBlock(const v3s16 &pos, const std::string &data)
 	return true;
 }
 
-std::string Database_Dummy::loadBlock(const v3s16 &pos)
+void Database_Dummy::loadBlock(const v3s16 &pos, std::string *block)
 {
 	s64 i = getBlockAsInteger(pos);
 	std::map<s64, std::string>::iterator it = m_database.find(i);
-	if (it == m_database.end())
-		return "";
-	return it->second;
+	if (it == m_database.end()) {
+		*block = "";
+		return;
+	}
+
+	*block = it->second;
 }
 
 bool Database_Dummy::deleteBlock(const v3s16 &pos)
diff --git a/src/database-dummy.h b/src/database-dummy.h
index 0cf56928e..72100edd0 100644
--- a/src/database-dummy.h
+++ b/src/database-dummy.h
@@ -28,10 +28,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class Database_Dummy : public Database
 {
 public:
-	virtual bool saveBlock(const v3s16 &pos, const std::string &data);
-	virtual std::string loadBlock(const v3s16 &pos);
-	virtual bool deleteBlock(const v3s16 &pos);
-	virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
+	bool saveBlock(const v3s16 &pos, const std::string &data);
+	void loadBlock(const v3s16 &pos, std::string *block);
+	bool deleteBlock(const v3s16 &pos);
+	void listAllLoadableBlocks(std::vector<v3s16> &dst);
 
 private:
 	std::map<s64, std::string> m_database;
diff --git a/src/database-leveldb.cpp b/src/database-leveldb.cpp
index acd0fd1eb..f46f82b98 100644
--- a/src/database-leveldb.cpp
+++ b/src/database-leveldb.cpp
@@ -65,16 +65,13 @@ bool Database_LevelDB::saveBlock(const v3s16 &pos, const std::string &data)
 	return true;
 }
 
-std::string Database_LevelDB::loadBlock(const v3s16 &pos)
+void Database_LevelDB::loadBlock(const v3s16 &pos, std::string *block)
 {
 	std::string datastr;
 	leveldb::Status status = m_database->Get(leveldb::ReadOptions(),
 		i64tos(getBlockAsInteger(pos)), &datastr);
 
-	if(status.ok())
-		return datastr;
-	else
-		return "";
+	*block = (status.ok()) ? datastr : "";
 }
 
 bool Database_LevelDB::deleteBlock(const v3s16 &pos)
diff --git a/src/database-leveldb.h b/src/database-leveldb.h
index 4afe2fdc7..3993db0c3 100644
--- a/src/database-leveldb.h
+++ b/src/database-leveldb.h
@@ -34,10 +34,10 @@ public:
 	Database_LevelDB(const std::string &savedir);
 	~Database_LevelDB();
 
-	virtual bool saveBlock(const v3s16 &pos, const std::string &data);
-	virtual std::string loadBlock(const v3s16 &pos);
-	virtual bool deleteBlock(const v3s16 &pos);
-	virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
+	bool saveBlock(const v3s16 &pos, const std::string &data);
+	void loadBlock(const v3s16 &pos, std::string *block);
+	bool deleteBlock(const v3s16 &pos);
+	void listAllLoadableBlocks(std::vector<v3s16> &dst);
 
 private:
 	leveldb::DB *m_database;
diff --git a/src/database-redis.cpp b/src/database-redis.cpp
index 498e9d39a..01427b6f9 100644
--- a/src/database-redis.cpp
+++ b/src/database-redis.cpp
@@ -101,7 +101,7 @@ bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
 	return true;
 }
 
-std::string Database_Redis::loadBlock(const v3s16 &pos)
+void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
 {
 	std::string tmp = i64tos(getBlockAsInteger(pos));
 	redisReply *reply = static_cast<redisReply *>(redisCommand(ctx,
@@ -111,12 +111,13 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
 		throw FileNotGoodException(std::string(
 			"Redis command 'HGET %s %s' failed: ") + ctx->errstr);
 	}
+
 	switch (reply->type) {
 	case REDIS_REPLY_STRING: {
-		std::string str(reply->str, reply->len);
+		*block = std::string(reply->str, reply->len);
 		// std::string copies the memory so this won't cause any problems
 		freeReplyObject(reply);
-		return str;
+		return;
 	}
 	case REDIS_REPLY_ERROR: {
 		std::string errstr(reply->str, reply->len);
@@ -127,11 +128,13 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
 			"Redis command 'HGET %s %s' errored: ") + errstr);
 	}
 	case REDIS_REPLY_NIL: {
+		*block = "";
 		// block not found in database
 		freeReplyObject(reply);
-		return "";
+		return;
 	}
 	}
+
 	errorstream << "loadBlock: loading block " << PP(pos)
 		<< " returned invalid reply type " << reply->type
 		<< ": " << std::string(reply->str, reply->len) << std::endl;
diff --git a/src/database-redis.h b/src/database-redis.h
index 45e702c83..3addaa20a 100644
--- a/src/database-redis.h
+++ b/src/database-redis.h
@@ -36,13 +36,13 @@ public:
 	Database_Redis(Settings &conf);
 	~Database_Redis();
 
-	virtual void beginSave();
-	virtual void endSave();
+	void beginSave();
+	void endSave();
 
-	virtual bool saveBlock(const v3s16 &pos, const std::string &data);
-	virtual std::string loadBlock(const v3s16 &pos);
-	virtual bool deleteBlock(const v3s16 &pos);
-	virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
+	bool saveBlock(const v3s16 &pos, const std::string &data);
+	void loadBlock(const v3s16 &pos, std::string *block);
+	bool deleteBlock(const v3s16 &pos);
+	void listAllLoadableBlocks(std::vector<v3s16> &dst);
 
 private:
 	redisContext *ctx;
diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
index 56f937bf2..2a23e2ea0 100644
--- a/src/database-sqlite3.cpp
+++ b/src/database-sqlite3.cpp
@@ -237,7 +237,7 @@ bool Database_SQLite3::saveBlock(const v3s16 &pos, const std::string &data)
 	return true;
 }
 
-std::string Database_SQLite3::loadBlock(const v3s16 &pos)
+void Database_SQLite3::loadBlock(const v3s16 &pos, std::string *block)
 {
 	verifyDatabase();
 
@@ -245,20 +245,17 @@ std::string Database_SQLite3::loadBlock(const v3s16 &pos)
 
 	if (sqlite3_step(m_stmt_read) != SQLITE_ROW) {
 		sqlite3_reset(m_stmt_read);
-		return "";
+		return;
 	}
+
 	const char *data = (const char *) sqlite3_column_blob(m_stmt_read, 0);
 	size_t len = sqlite3_column_bytes(m_stmt_read, 0);
 
-	std::string s;
-	if (data)
-		s = std::string(data, len);
+	*block = (data) ? std::string(data, len) : "";
 
 	sqlite3_step(m_stmt_read);
 	// We should never get more than 1 row, so ok to reset
 	sqlite3_reset(m_stmt_read);
-
-	return s;
 }
 
 void Database_SQLite3::createDatabase()
diff --git a/src/database-sqlite3.h b/src/database-sqlite3.h
index 04a1825d9..debbc9d8b 100644
--- a/src/database-sqlite3.h
+++ b/src/database-sqlite3.h
@@ -31,17 +31,17 @@ class Database_SQLite3 : public Database
 {
 public:
 	Database_SQLite3(const std::string &savedir);
-
-	virtual void beginSave();
-	virtual void endSave();
-
-	virtual bool saveBlock(const v3s16 &pos, const std::string &data);
-	virtual std::string loadBlock(const v3s16 &pos);
-	virtual bool deleteBlock(const v3s16 &pos);
-	virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
-	virtual bool initialized() const { return m_initialized; }
 	~Database_SQLite3();
 
+	void beginSave();
+	void endSave();
+
+	bool saveBlock(const v3s16 &pos, const std::string &data);
+	void loadBlock(const v3s16 &pos, std::string *block);
+	bool deleteBlock(const v3s16 &pos);
+	void listAllLoadableBlocks(std::vector<v3s16> &dst);
+	bool initialized() const { return m_initialized; }
+
 private:
 	// Open the database
 	void openDatabase();
diff --git a/src/database.h b/src/database.h
index cee7b6fd9..0cf75232f 100644
--- a/src/database.h
+++ b/src/database.h
@@ -38,7 +38,7 @@ public:
 	virtual void endSave() {}
 
 	virtual bool saveBlock(const v3s16 &pos, const std::string &data) = 0;
-	virtual std::string loadBlock(const v3s16 &pos) = 0;
+	virtual void loadBlock(const v3s16 &pos, std::string *block) = 0;
 	virtual bool deleteBlock(const v3s16 &pos) = 0;
 
 	static s64 getBlockAsInteger(const v3s16 &pos);
diff --git a/src/main.cpp b/src/main.cpp
index 1b95a9f1c..f63b6a986 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -948,7 +948,8 @@ static bool migrate_database(const GameParams &game_params, const Settings &cmd_
 	for (std::vector<v3s16>::const_iterator it = blocks.begin(); it != blocks.end(); ++it) {
 		if (kill) return false;
 
-		const std::string &data = old_db->loadBlock(*it);
+		std::string data;
+		old_db->loadBlock(*it, &data);
 		if (!data.empty()) {
 			new_db->saveBlock(*it, data);
 		} else {
diff --git a/src/map.cpp b/src/map.cpp
index 66fabaf87..848d2ef13 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -3442,8 +3442,7 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos)
 	v2s16 p2d(blockpos.X, blockpos.Z);
 
 	std::string ret;
-
-	ret = dbase->loadBlock(blockpos);
+	dbase->loadBlock(blockpos, &ret);
 	if (ret != "") {
 		loadBlock(&ret, blockpos, createSector(p2d), false);
 		return getBlockNoCreateNoEx(blockpos);

From 8b940c005fd13db4e611ec49bc44881048b42cf7 Mon Sep 17 00:00:00 2001
From: Wayward One <calmthefirewithin@gmail.com>
Date: Sat, 30 Apr 2016 10:31:11 -0400
Subject: [PATCH 006/418] Add on_punchnode callback

---
 builtin/game/falling.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 57bb98cfd..fa7ff24bc 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -258,3 +258,8 @@ function on_dignode(p, node)
 	nodeupdate(p)
 end
 core.register_on_dignode(on_dignode)
+
+function on_punchnode(p, node)
+	nodeupdate(p)
+end
+core.register_on_punchnode(on_punchnode)

From 8ba6d9f227398d2004d1fe7ae095f5e342dc6d7b Mon Sep 17 00:00:00 2001
From: nerzhul <loic.blot@unix-experience.fr>
Date: Tue, 17 May 2016 09:59:02 +0200
Subject: [PATCH 007/418] Implement DatabaseException for databases

---
 src/database-leveldb.cpp |  2 +-
 src/database-redis.cpp   | 20 ++++++++++----------
 src/database-sqlite3.cpp |  2 +-
 src/exceptions.h         |  5 +++++
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/database-leveldb.cpp b/src/database-leveldb.cpp
index f46f82b98..4a4904c6a 100644
--- a/src/database-leveldb.cpp
+++ b/src/database-leveldb.cpp
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define ENSURE_STATUS_OK(s) \
 	if (!(s).ok()) { \
-		throw FileNotGoodException(std::string("LevelDB error: ") + \
+		throw DatabaseException(std::string("LevelDB error: ") + \
 				(s).ToString()); \
 	}
 
diff --git a/src/database-redis.cpp b/src/database-redis.cpp
index 01427b6f9..3bcedad9b 100644
--- a/src/database-redis.cpp
+++ b/src/database-redis.cpp
@@ -46,11 +46,11 @@ Database_Redis::Database_Redis(Settings &conf)
 	int port = conf.exists("redis_port") ? conf.getU16("redis_port") : 6379;
 	ctx = redisConnect(addr, port);
 	if (!ctx) {
-		throw FileNotGoodException("Cannot allocate redis context");
+		throw DatabaseException("Cannot allocate redis context");
 	} else if (ctx->err) {
 		std::string err = std::string("Connection error: ") + ctx->errstr;
 		redisFree(ctx);
-		throw FileNotGoodException(err);
+		throw DatabaseException(err);
 	}
 }
 
@@ -62,7 +62,7 @@ Database_Redis::~Database_Redis()
 void Database_Redis::beginSave() {
 	redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "MULTI"));
 	if (!reply) {
-		throw FileNotGoodException(std::string(
+		throw DatabaseException(std::string(
 			"Redis command 'MULTI' failed: ") + ctx->errstr);
 	}
 	freeReplyObject(reply);
@@ -71,7 +71,7 @@ void Database_Redis::beginSave() {
 void Database_Redis::endSave() {
 	redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "EXEC"));
 	if (!reply) {
-		throw FileNotGoodException(std::string(
+		throw DatabaseException(std::string(
 			"Redis command 'EXEC' failed: ") + ctx->errstr);
 	}
 	freeReplyObject(reply);
@@ -108,7 +108,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
 			"HGET %s %s", hash.c_str(), tmp.c_str()));
 
 	if (!reply) {
-		throw FileNotGoodException(std::string(
+		throw DatabaseException(std::string(
 			"Redis command 'HGET %s %s' failed: ") + ctx->errstr);
 	}
 
@@ -124,7 +124,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
 		freeReplyObject(reply);
 		errorstream << "loadBlock: loading block " << PP(pos)
 			<< " failed: " << errstr << std::endl;
-		throw FileNotGoodException(std::string(
+		throw DatabaseException(std::string(
 			"Redis command 'HGET %s %s' errored: ") + errstr);
 	}
 	case REDIS_REPLY_NIL: {
@@ -139,7 +139,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
 		<< " returned invalid reply type " << reply->type
 		<< ": " << std::string(reply->str, reply->len) << std::endl;
 	freeReplyObject(reply);
-	throw FileNotGoodException(std::string(
+	throw DatabaseException(std::string(
 		"Redis command 'HGET %s %s' gave invalid reply."));
 }
 
@@ -150,7 +150,7 @@ bool Database_Redis::deleteBlock(const v3s16 &pos)
 	redisReply *reply = static_cast<redisReply *>(redisCommand(ctx,
 		"HDEL %s %s", hash.c_str(), tmp.c_str()));
 	if (!reply) {
-		throw FileNotGoodException(std::string(
+		throw DatabaseException(std::string(
 			"Redis command 'HDEL %s %s' failed: ") + ctx->errstr);
 	} else if (reply->type == REDIS_REPLY_ERROR) {
 		warningstream << "deleteBlock: deleting block " << PP(pos)
@@ -167,7 +167,7 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
 {
 	redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "HKEYS %s", hash.c_str()));
 	if (!reply) {
-		throw FileNotGoodException(std::string(
+		throw DatabaseException(std::string(
 			"Redis command 'HKEYS %s' failed: ") + ctx->errstr);
 	}
 	switch (reply->type) {
@@ -179,7 +179,7 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
 		}
 		break;
 	case REDIS_REPLY_ERROR:
-		throw FileNotGoodException(std::string(
+		throw DatabaseException(std::string(
 			"Failed to get keys from database: ") +
 			std::string(reply->str, reply->len));
 	}
diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
index 2a23e2ea0..07df976d4 100644
--- a/src/database-sqlite3.cpp
+++ b/src/database-sqlite3.cpp
@@ -47,7 +47,7 @@ SQLite format specification:
 
 #define SQLRES(s, r, m) \
 	if ((s) != (r)) { \
-		throw FileNotGoodException(std::string(m) + ": " +\
+		throw DatabaseException(std::string(m) + ": " +\
 				sqlite3_errmsg(m_database)); \
 	}
 #define SQLOK(s, m) SQLRES(s, SQLITE_OK, m)
diff --git a/src/exceptions.h b/src/exceptions.h
index 4f18f70d9..67a2d0df6 100644
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -65,6 +65,11 @@ public:
 	FileNotGoodException(const std::string &s): BaseException(s) {}
 };
 
+class DatabaseException : public BaseException {
+public:
+	DatabaseException(const std::string &s): BaseException(s) {}
+};
+
 class SerializationError : public BaseException {
 public:
 	SerializationError(const std::string &s): BaseException(s) {}

From 88acda02567d586820867059718cac551dc7a58b Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Fri, 20 May 2016 21:18:59 +1000
Subject: [PATCH 008/418] Fix tooltip height for versions of irrlicht < 1.8.2

Version 1.8.2 of irrlicht changed the way that IGUIStaticText::getTextHeight() works and since that release properly deals with newlines.

From irrlicht changes.txt for 1.8.2, "IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set."
---
 src/guiFormSpecMenu.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 2bf06c1d6..b0215a84a 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -2265,7 +2265,11 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase,
 				this->bringToFront(m_tooltip_element);
 				m_tooltip_element->setText(tooltip_text.c_str());
 				s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height;
+#if IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8 && IRRLICHT_VERSION_REVISION >= 2
 				s32 tooltip_height = m_tooltip_element->getTextHeight() + 5;
+#else
+				s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5;
+#endif
 				v2u32 screenSize = driver->getScreenSize();
 				int tooltip_offset_x = m_btn_height;
 				int tooltip_offset_y = m_btn_height;

From 643ac9dd7aa1852b24348d853e82aa267dade789 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Tue, 17 May 2016 00:22:27 +0100
Subject: [PATCH 009/418] Item entities: Don't show description as infotext

Partially reverts #3547
Infotext remains optional for objects, empty by default
---
 builtin/game/item_entity.lua | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua
index a66bf33d0..be158c119 100644
--- a/builtin/game/item_entity.lua
+++ b/builtin/game/item_entity.lua
@@ -31,7 +31,6 @@ core.register_entity(":__builtin:item", {
 		spritediv = {x = 1, y = 1},
 		initial_sprite_basepos = {x = 0, y = 0},
 		is_visible = false,
-		infotext = "",
 	},
 
 	itemstring = '',
@@ -51,7 +50,6 @@ core.register_entity(":__builtin:item", {
 		local c = s
 		local itemtable = stack:to_table()
 		local itemname = nil
-		local description = ""
 		if itemtable then
 			itemname = stack:to_table().name
 		end
@@ -60,7 +58,6 @@ core.register_entity(":__builtin:item", {
 		if core.registered_items[itemname] then
 			item_texture = core.registered_items[itemname].inventory_image
 			item_type = core.registered_items[itemname].type
-			description = core.registered_items[itemname].description
 		end
 		local prop = {
 			is_visible = true,
@@ -69,7 +66,6 @@ core.register_entity(":__builtin:item", {
 			visual_size = {x = s, y = s},
 			collisionbox = {-c, -c, -c, c, c, c},
 			automatic_rotate = math.pi * 0.5,
-			infotext = description,
 		}
 		self.object:set_properties(prop)
 	end,

From 0f184d77c871b564b773b7fb81e7a3f16a197813 Mon Sep 17 00:00:00 2001
From: HybridDog <ovvv@web.de>
Date: Fri, 20 May 2016 22:08:07 +0200
Subject: [PATCH 010/418] Gitignore: ignore idea and ninja files

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index f9c664da6..d7e0daab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
 tags
 !tags/
 gtags.files
+.idea/*
 
 ## Files related to minetest development cycle
 /*.patch
@@ -71,6 +72,8 @@ locale/
 *.layout
 *.o
 *.a
+*.ninja
+.ninja*
 
 ## Android build files
 build/android/src/main/assets

From ce42ff9cf74ebb8d4b68bc78c95e90ea3db02b78 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 14 May 2016 11:00:42 +0200
Subject: [PATCH 011/418] Implement a PostgreSQL backend

---
 README.txt                    |   5 +-
 src/CMakeLists.txt            |  37 +++++
 src/cmake_config.h.in         |   1 +
 src/database-postgresql.cpp   | 286 ++++++++++++++++++++++++++++++++++
 src/database-postgresql.h     |  95 +++++++++++
 src/map.cpp                   |   7 +
 util/travis/before_install.sh |   4 +-
 7 files changed, 433 insertions(+), 2 deletions(-)
 create mode 100644 src/database-postgresql.cpp
 create mode 100644 src/database-postgresql.h

diff --git a/README.txt b/README.txt
index 9ca9b331e..bd2dadebb 100644
--- a/README.txt
+++ b/README.txt
@@ -169,7 +169,8 @@ ENABLE_CURSES       - Build with (n)curses; Enables a server side terminal (comm
 ENABLE_FREETYPE     - Build with FreeType2; Allows using TTF fonts
 ENABLE_GETTEXT      - Build with Gettext; Allows using translations
 ENABLE_GLES         - Search for Open GLES headers & libraries and use them
-ENABLE_LEVELDB      - Build with LevelDB; Enables use of LevelDB map backend (faster than SQLite3)
+ENABLE_LEVELDB      - Build with LevelDB; Enables use of LevelDB map backend
+ENABLE_POSTGRESQL   - Build with libpq; Enables use of PostgreSQL map backend (PostgreSQL 9.5 or greater required)
 ENABLE_REDIS        - Build with libhiredis; Enables use of Redis map backend
 ENABLE_SPATIAL      - Build with LibSpatial; Speeds up AreaStores
 ENABLE_SOUND        - Build with OpenAL, libogg & libvorbis; in-game Sounds
@@ -203,6 +204,8 @@ IRRLICHT_LIBRARY                - Path to libIrrlicht.a/libIrrlicht.so/libIrrlic
 LEVELDB_INCLUDE_DIR             - Only when building with LevelDB; directory that contains db.h
 LEVELDB_LIBRARY                 - Only when building with LevelDB; path to libleveldb.a/libleveldb.so/libleveldb.dll.a
 LEVELDB_DLL                     - Only when building with LevelDB on Windows; path to libleveldb.dll
+POSTGRESQL_INCLUDE_DIR          - Only when building with PostgreSQL; directory that contains libpq-fe.h
+POSTGRESQL_LIBRARY              - Only when building with PostgreSQL; path to libpq.a/libpq.so
 REDIS_INCLUDE_DIR               - Only when building with Redis; directory that contains hiredis.h
 REDIS_LIBRARY                   - Only when building with Redis; path to libhiredis.a/libhiredis.so
 SPATIAL_INCLUDE_DIR             - Only when building with LibSpatial; directory that contains spatialindex/SpatialIndex.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index feca199c1..ea1564eeb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -189,6 +189,36 @@ if(ENABLE_CURSES)
 	endif()
 endif(ENABLE_CURSES)
 
+option(ENABLE_POSTGRESQL "Enable PostgreSQL backend" TRUE)
+set(USE_POSTGRESQL FALSE)
+
+if(ENABLE_POSTGRESQL)
+	find_program(POSTGRESQL_CONFIG_EXECUTABLE pg_config DOC "pg_config")
+	find_library(POSTGRESQL_LIBRARY pq)
+	if(POSTGRESQL_CONFIG_EXECUTABLE)
+		execute_process(COMMAND ${POSTGRESQL_CONFIG_EXECUTABLE} --includedir-server
+			OUTPUT_VARIABLE POSTGRESQL_SERVER_INCLUDE_DIRS
+			OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND ${POSTGRESQL_CONFIG_EXECUTABLE}
+			OUTPUT_VARIABLE POSTGRESQL_CLIENT_INCLUDE_DIRS
+			OUTPUT_STRIP_TRAILING_WHITESPACE)
+		# This variable is case sensitive for the cmake PostgreSQL module
+		set(PostgreSQL_ADDITIONAL_SEARCH_PATHS ${POSTGRESQL_SERVER_INCLUDE_DIRS} ${POSTGRESQL_CLIENT_INCLUDE_DIRS})
+	endif()
+
+	find_package("PostgreSQL")
+
+	if(POSTGRESQL_FOUND)
+		set(USE_POSTGRESQL TRUE)
+		message(STATUS "PostgreSQL backend enabled")
+		# This variable is case sensitive, don't try to change it to POSTGRESQL_INCLUDE_DIR
+		message(STATUS "PostgreSQL includes: ${PostgreSQL_INCLUDE_DIR}")
+		include_directories(${PostgreSQL_INCLUDE_DIR})
+	else()
+		message(STATUS "PostgreSQL not found!")
+	endif()
+endif(ENABLE_POSTGRESQL)
+
 option(ENABLE_LEVELDB "Enable LevelDB backend" TRUE)
 set(USE_LEVELDB FALSE)
 
@@ -361,6 +391,7 @@ set(common_SRCS
 	craftdef.cpp
 	database-dummy.cpp
 	database-leveldb.cpp
+	database-postgresql.cpp
 	database-redis.cpp
 	database-sqlite3.cpp
 	database.cpp
@@ -592,6 +623,9 @@ if(BUILD_CLIENT)
 	if (USE_CURSES)
 		target_link_libraries(${PROJECT_NAME} ${CURSES_LIBRARIES})
 	endif()
+	if (USE_POSTGRESQL)
+		target_link_libraries(${PROJECT_NAME} ${POSTGRESQL_LIBRARY})
+	endif()
 	if (USE_LEVELDB)
 		target_link_libraries(${PROJECT_NAME} ${LEVELDB_LIBRARY})
 	endif()
@@ -622,6 +656,9 @@ if(BUILD_SERVER)
 	if (USE_CURSES)
 		target_link_libraries(${PROJECT_NAME}server ${CURSES_LIBRARIES})
 	endif()
+	if (USE_POSTGRESQL)
+		target_link_libraries(${PROJECT_NAME}server ${POSTGRESQL_LIBRARY})
+	endif()
 	if (USE_LEVELDB)
 		target_link_libraries(${PROJECT_NAME}server ${LEVELDB_LIBRARY})
 	endif()
diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in
index 018532d13..50f34a0b8 100644
--- a/src/cmake_config.h.in
+++ b/src/cmake_config.h.in
@@ -22,6 +22,7 @@
 #cmakedefine01 USE_CURSES
 #cmakedefine01 USE_LEVELDB
 #cmakedefine01 USE_LUAJIT
+#cmakedefine01 USE_POSTGRESQL
 #cmakedefine01 USE_SPATIAL
 #cmakedefine01 USE_SYSTEM_GMP
 #cmakedefine01 USE_REDIS
diff --git a/src/database-postgresql.cpp b/src/database-postgresql.cpp
new file mode 100644
index 000000000..3b6b42aea
--- /dev/null
+++ b/src/database-postgresql.cpp
@@ -0,0 +1,286 @@
+/*
+Copyright (C) 2016 Loic Blot <loic.blot@unix-experience.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "config.h"
+
+#if USE_POSTGRESQL
+
+#include "database-postgresql.h"
+
+#ifdef _WIN32
+        #ifndef WIN32_LEAN_AND_MEAN
+                #define WIN32_LEAN_AND_MEAN
+        #endif
+        // Without this some of the network functions are not found on mingw
+        #ifndef _WIN32_WINNT
+                #define _WIN32_WINNT 0x0501
+        #endif
+        #include <windows.h>
+        #include <winsock2.h>
+#else
+#include <netinet/in.h>
+#endif
+
+#include "log.h"
+#include "exceptions.h"
+#include "settings.h"
+
+Database_PostgreSQL::Database_PostgreSQL(const Settings &conf) :
+	m_connect_string(""),
+	m_conn(NULL),
+	m_pgversion(0)
+{
+	if (!conf.getNoEx("pgsql_connection", m_connect_string)) {
+		throw SettingNotFoundException(
+			"Set pgsql_connection string in world.mt to "
+			"use the postgresql backend\n"
+			"Notes:\n"
+			"pgsql_connection has the following form: \n"
+			"\tpgsql_connection = host=127.0.0.1 port=5432 user=mt_user "
+			"password=mt_password dbname=minetest_world\n"
+			"mt_user should have CREATE TABLE, INSERT, SELECT, UPDATE and "
+			"DELETE rights on the database.\n"
+			"Don't create mt_user as a SUPERUSER!");
+	}
+
+	connectToDatabase();
+}
+
+Database_PostgreSQL::~Database_PostgreSQL()
+{
+	PQfinish(m_conn);
+}
+
+void Database_PostgreSQL::connectToDatabase()
+{
+	m_conn = PQconnectdb(m_connect_string.c_str());
+
+	if (PQstatus(m_conn) != CONNECTION_OK) {
+		throw DatabaseException(std::string(
+			"PostgreSQL database error: ") +
+			PQerrorMessage(m_conn));
+	}
+
+	m_pgversion = PQserverVersion(m_conn);
+
+	/*
+	* We are using UPSERT feature from PostgreSQL 9.5
+	* to have the better performance,
+	* set the minimum version to 90500
+	*/
+	if (m_pgversion < 90500) {
+		throw DatabaseException("PostgreSQL database error: "
+			"Server version 9.5 or greater required.");
+	}
+
+	infostream << "PostgreSQL Database: Version " << m_pgversion
+			<< " Connection made." << std::endl;
+
+	createDatabase();
+	initStatements();
+}
+
+void Database_PostgreSQL::verifyDatabase()
+{
+	if (PQstatus(m_conn) == CONNECTION_OK)
+		return;
+
+	PQreset(m_conn);
+	ping();
+}
+
+void Database_PostgreSQL::ping()
+{
+	if (PQping(m_connect_string.c_str()) != PQPING_OK) {
+		throw DatabaseException(std::string(
+			"PostgreSQL database error: ") +
+			PQerrorMessage(m_conn));
+	}
+}
+
+bool Database_PostgreSQL::initialized() const
+{
+	return (PQstatus(m_conn) == CONNECTION_OK);
+}
+
+void Database_PostgreSQL::initStatements()
+{
+	prepareStatement("read_block",
+			"SELECT data FROM blocks "
+			"WHERE posX = $1::int4 AND posY = $2::int4 AND "
+			"posZ = $3::int4");
+
+	prepareStatement("write_block",
+			"INSERT INTO blocks (posX, posY, posZ, data) VALUES "
+			"($1::int4, $2::int4, $3::int4, $4::bytea) "
+			"ON CONFLICT ON CONSTRAINT blocks_pkey DO "
+			"UPDATE SET data = $4::bytea");
+
+	prepareStatement("delete_block", "DELETE FROM blocks WHERE "
+			"posX = $1::int4 AND posY = $2::int4 AND posZ = $3::int4");
+
+	prepareStatement("list_all_loadable_blocks",
+			"SELECT posX, posY, posZ FROM blocks");
+}
+
+PGresult *Database_PostgreSQL::checkResults(PGresult *result, bool clear)
+{
+	ExecStatusType statusType = PQresultStatus(result);
+
+	switch (statusType) {
+	case PGRES_COMMAND_OK:
+	case PGRES_TUPLES_OK:
+		break;
+	case PGRES_FATAL_ERROR:
+	default:
+		throw DatabaseException(
+			std::string("PostgreSQL database error: ") +
+			PQresultErrorMessage(result));
+	}
+
+	if (clear)
+		PQclear(result);
+
+	return result;
+}
+
+void Database_PostgreSQL::createDatabase()
+{
+	PGresult *result = checkResults(PQexec(m_conn,
+		"SELECT relname FROM pg_class WHERE relname='blocks';"),
+		false);
+
+	// If table doesn't exist, create it
+	if (!PQntuples(result)) {
+		static const char* dbcreate_sql = "CREATE TABLE blocks ("
+			"posX INT NOT NULL,"
+			"posY INT NOT NULL,"
+			"posZ INT NOT NULL,"
+			"data BYTEA,"
+			"PRIMARY KEY (posX,posY,posZ)"
+		");";
+		checkResults(PQexec(m_conn, dbcreate_sql));
+	}
+
+	PQclear(result);
+
+	infostream << "PostgreSQL: Game Database was inited." << std::endl;
+}
+
+
+void Database_PostgreSQL::beginSave()
+{
+	verifyDatabase();
+	checkResults(PQexec(m_conn, "BEGIN;"));
+}
+
+void Database_PostgreSQL::endSave()
+{
+	checkResults(PQexec(m_conn, "COMMIT;"));
+}
+
+bool Database_PostgreSQL::saveBlock(const v3s16 &pos,
+		const std::string &data)
+{
+	// Verify if we don't overflow the platform integer with the mapblock size
+	if (data.size() > INT_MAX) {
+		errorstream << "Database_PostgreSQL::saveBlock: Data truncation! "
+				<< "data.size() over 0xFFFF (== " << data.size()
+				<< ")" << std::endl;
+		return false;
+	}
+
+	verifyDatabase();
+
+	s32 x, y, z;
+	x = htonl(pos.X);
+	y = htonl(pos.Y);
+	z = htonl(pos.Z);
+
+	const void *args[] = { &x, &y, &z, data.c_str() };
+	const int argLen[] = {
+		sizeof(x), sizeof(y), sizeof(z), (int)data.size()
+	};
+	const int argFmt[] = { 1, 1, 1, 1 };
+
+	execPrepared("write_block", ARRLEN(args), args, argLen, argFmt);
+	return true;
+}
+
+void Database_PostgreSQL::loadBlock(const v3s16 &pos,
+		std::string *block)
+{
+	verifyDatabase();
+
+	s32 x, y, z;
+	x = htonl(pos.X);
+	y = htonl(pos.Y);
+	z = htonl(pos.Z);
+
+	const void *args[] = { &x, &y, &z };
+	const int argLen[] = { sizeof(x), sizeof(y), sizeof(z) };
+	const int argFmt[] = { 1, 1, 1 };
+
+	PGresult *results = execPrepared("read_block", ARRLEN(args), args,
+			argLen, argFmt, false);
+
+	*block = "";
+
+	if (PQntuples(results)) {
+		*block = std::string(PQgetvalue(results, 0, 0),
+				PQgetlength(results, 0, 0));
+	}
+
+	PQclear(results);
+}
+
+bool Database_PostgreSQL::deleteBlock(const v3s16 &pos)
+{
+	verifyDatabase();
+
+	s32 x, y, z;
+	x = htonl(pos.X);
+	y = htonl(pos.Y);
+	z = htonl(pos.Z);
+
+	const void *args[] = { &x, &y, &z };
+	const int argLen[] = { sizeof(x), sizeof(y), sizeof(z) };
+	const int argFmt[] = { 1, 1, 1 };
+
+	execPrepared("read_block", ARRLEN(args), args, argLen, argFmt);
+
+	return true;
+}
+
+void Database_PostgreSQL::listAllLoadableBlocks(std::vector<v3s16> &dst)
+{
+	verifyDatabase();
+
+	PGresult *results = execPrepared("list_all_loadable_blocks", 0,
+			NULL, NULL, NULL, false, false);
+
+	int numrows = PQntuples(results);
+
+	for (int row = 0; row < numrows; ++row) {
+		dst.push_back(pg_to_v3s16(results, 0, 0));
+	}
+
+	PQclear(results);
+}
+
+#endif // USE_POSTGRESQL
diff --git a/src/database-postgresql.h b/src/database-postgresql.h
new file mode 100644
index 000000000..1cfa544e3
--- /dev/null
+++ b/src/database-postgresql.h
@@ -0,0 +1,95 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef DATABASE_POSTGRESQL_HEADER
+#define DATABASE_POSTGRESQL_HEADER
+
+#include <string>
+#include <libpq-fe.h>
+#include "database.h"
+#include "util/basic_macros.h"
+
+class Settings;
+
+class Database_PostgreSQL : public Database
+{
+public:
+	Database_PostgreSQL(const Settings &conf);
+	~Database_PostgreSQL();
+
+	void beginSave();
+	void endSave();
+
+	bool saveBlock(const v3s16 &pos, const std::string &data);
+	void loadBlock(const v3s16 &pos, std::string *block);
+	bool deleteBlock(const v3s16 &pos);
+	void listAllLoadableBlocks(std::vector<v3s16> &dst);
+	bool initialized() const;
+
+private:
+	// Database initialization
+	void connectToDatabase();
+	void initStatements();
+	void createDatabase();
+
+	inline void prepareStatement(const std::string &name, const std::string &sql)
+	{
+		checkResults(PQprepare(m_conn, name.c_str(), sql.c_str(), 0, NULL));
+	}
+
+	// Database connectivity checks
+	void ping();
+	void verifyDatabase();
+
+	// Database usage
+	PGresult *checkResults(PGresult *res, bool clear = true);
+
+	inline PGresult *execPrepared(const char *stmtName, const int paramsNumber,
+			const void **params,
+			const int *paramsLengths = NULL, const int *paramsFormats = NULL,
+			bool clear = true, bool nobinary = true)
+	{
+		return checkResults(PQexecPrepared(m_conn, stmtName, paramsNumber,
+			(const char* const*) params, paramsLengths, paramsFormats,
+			nobinary ? 1 : 0), clear);
+	}
+
+	// Conversion helpers
+	inline int pg_to_int(PGresult *res, int row, int col)
+	{
+		return atoi(PQgetvalue(res, row, col));
+	}
+
+	inline v3s16 pg_to_v3s16(PGresult *res, int row, int col)
+	{
+		return v3s16(
+			pg_to_int(res, row, col),
+			pg_to_int(res, row, col + 1),
+			pg_to_int(res, row, col + 2)
+		);
+	}
+
+	// Attributes
+	std::string m_connect_string;
+	PGconn *m_conn;
+	int m_pgversion;
+};
+
+#endif
+
diff --git a/src/map.cpp b/src/map.cpp
index 848d2ef13..03daf4fa8 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -50,6 +50,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #if USE_REDIS
 #include "database-redis.h"
 #endif
+#if USE_POSTGRESQL
+#include "database-postgresql.h"
+#endif
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
@@ -3240,6 +3243,10 @@ Database *ServerMap::createDatabase(
 	else if (name == "redis")
 		return new Database_Redis(conf);
 	#endif
+	#if USE_POSTGRESQL
+	else if (name == "postgresql")
+		return new Database_PostgreSQL(conf);
+	#endif
 	else
 		throw BaseException(std::string("Database backend ") + name + " not supported.");
 }
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index 58dc42b17..70037389b 100755
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -17,13 +17,15 @@ if [[ $PLATFORM == "Unix" ]]; then
 	if [[ $TRAVIS_OS_NAME == "linux" ]]; then
 		sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \
 			libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
-			libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev gettext
+			libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
+			gettext libpq-dev postgresql-server-dev-all
 		# Linking to LevelDB is broken, use a custom build
 		wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z
 		sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z
 	else
 		brew update
 		brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit
+		brew upgrade postgresql
 	fi
 elif [[ $PLATFORM == "Win32" ]]; then
 	wget http://minetest.kitsunemimi.pw/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z

From f64a6259b2b5e79103cfd4bc151304e6da39bca9 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 22 May 2016 13:31:41 +0200
Subject: [PATCH 012/418] Fix a m_camera not used warning fix pointed by clang

---
 src/content_cao.cpp | 3 +--
 src/content_cao.h   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index d701e4f72..35ab1c508 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -546,7 +546,6 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env):
 		//
 		m_smgr(NULL),
 		m_irr(NULL),
-		m_camera(NULL),
 		m_gamedef(NULL),
 		m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.),
 		m_meshnode(NULL),
@@ -804,7 +803,7 @@ void GenericCAO::removeFromScene(bool permanent)
 	}
 }
 
-void GenericCAO::addToScene(scene::ISceneManager *smgr, 
+void GenericCAO::addToScene(scene::ISceneManager *smgr,
 		ITextureSource *tsrc, IrrlichtDevice *irr)
 {
 	m_smgr = smgr;
diff --git a/src/content_cao.h b/src/content_cao.h
index a166ff494..bf99fd3ba 100644
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -68,7 +68,6 @@ private:
 	//
 	scene::ISceneManager *m_smgr;
 	IrrlichtDevice *m_irr;
-	Camera* m_camera;
 	IGameDef *m_gamedef;
 	aabb3f m_selection_box;
 	scene::IMeshSceneNode *m_meshnode;
@@ -206,7 +205,7 @@ public:
 			float time_from_last_punch=1000000);
 
 	std::string debugInfoText();
-	
+
 	std::string infoText()
 	{
 		return m_prop.infotext;

From 423d8c1b0d3841f6ce9756ab0d6b2e10408fc89b Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 18 May 2016 06:18:08 +0200
Subject: [PATCH 013/418] Tolerate packet reordering in the early init process

Fixes a bug where packet reordering made the server give the
client two peer ids instead of one. This in turn confused
reliable packet sending and made connecting to the server fail.

The client usually sends three packets at init: one "dummy"
packet consisting of two 0 bytes, and the init packet as well as
its legacy counterpart. The last one can be turned off since commit
af30183124d40a969040d7de4b3a487feec466e4, but this is of lower
relevance for the bug. The relevant part here is that network
packet reorder (which is a normal occurence) can make the packets
reach the server in different order.

If reorder puts the dummy packet further behind, the following
would happen before the patch:

1. The server will get one of the init packets on channel 1 and
   assign the client a peer id, as the packet will have zero as
   peer id.

2. The server sends a CONTROLTYPE_SET_PEER_ID packet to inform
   the client of the peer id.

3. The next packet from the client will contain the peer id set by
   the server.

4. The server sets the m_has_sent_with_id member for the client's
   peer structure to true.

5. Now the dummy packet arrives. It has a peer id of zero, therefore
   the server searches whether it already has a peer id for the
   address the packet was sent from. The search fails because
   m_has_sent_with_id was set to true and the server only searched
   for peers with m_has_sent_with_id set to false.

6. In a working setup, the server would assign the dummy packet to
   the correct peer id. However the server instead now assigns a
   second peer id and peer structure to the peer, and assign the
   packet to that new peer.

7. In order to inform the peer of its peer id, the server sends a
   CONTROLTYPE_SET_PEER_ID command packet, reliably, to the peer.
   This packet uses the new peer id.

8. The client sends an ack to that packet, not with the new peer id
   but with the peer id sent in 2.

9. This packet reaches the server, but it drops the ACK as the peer
   id does not map to any un-ACK-ed packets with that seqnum. The
   same time, the server still waits for an ACK with the new peer
   id, which of course won't come. This causes the server to
   periodically re-try sending that packet, and the client ACKing it
   each time.

Steps 7-9 cause annoyances and erroneous output, but don't cause
the connection failure itself.
The actual mistake that causes the connection failure happens in 6:
The server does not assign the dummy packet to the correct peer, but
to a newly created one.
Therefore, all further packets sent by the client on channel 0 are
now buffered by the server as it waits for the dummy packet to reach
the peer, which of course doesn't happen as the server assigned
that packet to the second peer it created for the client.
This makes the connection code indefinitely buffer the
TOSERVER_CLIENT_READY packet, not passing it to higher level code,
which stalls the continuation of the further init process
indefinitely and causes the actual bug.

Maybe this can be caused by reordered init packets as well, the only
studied case was where network has reliably reordered the dummy
packet to get sent after the init packets.

The patch fixes the bug by not ignoring peers where
m_has_sent_with_id has been set anymore. The other changes of the
patch are just cleanups of unused methods and fields and additional
explanatory comments.

One could think of alternate ways to fix the bug:

* The client could simply take the new peer id and continue
  communicating with that. This is however worse than the fix as
  it requires the peer id set command to be sent reliably (which
  currently happens, but it cant be changed anymore). Also, such a
  change would require both server and client to be patched in order
  for the bug to be fixed, as right now the client ignores peer id
  set commands after the peer id is different from
  PEER_ID_INEXISTENT and the server requires modification too to
  change the peer id internally.
  And, most importantly, right now we guarantee higher level server
  code that the peer id for a certain peer does not change. This
  guarantee would have to be broken, and it would require much
  larger changes to the server than this patch means.

* One could stop sending the dummy packet. One may be unsure whether
  this is a good idea, as the meaning of the dummy packet is not
  known (it might be there for something important), and as it is
  possible that the init packets may cause this problem as well
  (although it may be possible too that they can't cause this).

Thanks to @auouymous who had originally reported this bug and who
has helped patiently in finding its cause.
---
 src/network/connection.cpp | 13 ++++---------
 src/network/connection.h   | 19 ++++---------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/network/connection.cpp b/src/network/connection.cpp
index f7452d8e4..02c0aa165 100644
--- a/src/network/connection.cpp
+++ b/src/network/connection.cpp
@@ -2167,12 +2167,12 @@ void ConnectionReceiveThread::receive()
 				throw InvalidIncomingDataException("Channel doesn't exist");
 			}
 
-			/* preserve original peer_id for later usage */
-			u16 packet_peer_id   = peer_id;
-
 			/* Try to identify peer by sender address (may happen on join) */
 			if (peer_id == PEER_ID_INEXISTENT) {
 				peer_id = m_connection->lookupPeer(sender);
+				// We do not have to remind the peer of its
+				// peer id as the CONTROLTYPE_SET_PEER_ID
+				// command was sent reliably.
 			}
 
 			/* The peer was not found in our lists. Add it. */
@@ -2214,11 +2214,6 @@ void ConnectionReceiveThread::receive()
 				}
 			}
 
-
-			/* mark peer as seen with id */
-			if (!(packet_peer_id == PEER_ID_INEXISTENT))
-				peer->setSentWithID();
-
 			peer->ResetTimeout();
 
 			Channel *channel = 0;
@@ -2756,7 +2751,7 @@ u16 Connection::lookupPeer(Address& sender)
 	for(; j != m_peers.end(); ++j)
 	{
 		Peer *peer = j->second;
-		if (peer->isActive())
+		if (peer->isPendingDeletion())
 			continue;
 
 		Address tocheck;
diff --git a/src/network/connection.h b/src/network/connection.h
index fe2c9819d..5ee53b9d4 100644
--- a/src/network/connection.h
+++ b/src/network/connection.h
@@ -663,8 +663,7 @@ class Peer {
 			m_last_rtt(-1.0),
 			m_usage(0),
 			m_timeout_counter(0.0),
-			m_last_timeout_check(porting::getTimeMs()),
-			m_has_sent_with_id(false)
+			m_last_timeout_check(porting::getTimeMs())
 		{
 			m_rtt.avg_rtt = -1.0;
 			m_rtt.jitter_avg = -1.0;
@@ -687,21 +686,16 @@ class Peer {
 		virtual void PutReliableSendCommand(ConnectionCommand &c,
 						unsigned int max_packet_size) {};
 
-		virtual bool isActive() { return false; };
-
 		virtual bool getAddress(MTProtocols type, Address& toset) = 0;
 
+		bool isPendingDeletion()
+		{ MutexAutoLock lock(m_exclusive_access_mutex); return m_pending_deletion; };
+
 		void ResetTimeout()
 			{MutexAutoLock lock(m_exclusive_access_mutex); m_timeout_counter=0.0; };
 
 		bool isTimedOut(float timeout);
 
-		void setSentWithID()
-		{ MutexAutoLock lock(m_exclusive_access_mutex); m_has_sent_with_id = true; };
-
-		bool hasSentWithID()
-		{ MutexAutoLock lock(m_exclusive_access_mutex); return m_has_sent_with_id; };
-
 		unsigned int m_increment_packets_remaining;
 		unsigned int m_increment_bytes_remaining;
 
@@ -776,8 +770,6 @@ class Peer {
 		float m_timeout_counter;
 
 		u32 m_last_timeout_check;
-
-		bool m_has_sent_with_id;
 };
 
 class UDPPeer : public Peer
@@ -795,9 +787,6 @@ public:
 	void PutReliableSendCommand(ConnectionCommand &c,
 							unsigned int max_packet_size);
 
-	bool isActive()
-	{ return ((hasSentWithID()) && (!m_pending_deletion)); };
-
 	bool getAddress(MTProtocols type, Address& toset);
 
 	void setNonLegacyPeer();

From 725edc78b214f8ffa5494ed846755083295c3feb Mon Sep 17 00:00:00 2001
From: Ekdohibs <nathanael.courant@laposte.net>
Date: Sun, 22 May 2016 20:33:06 +0200
Subject: [PATCH 014/418] Move updateTextures and fillTileAttribs to
 ContentFeatures

---
 src/nodedef.cpp | 534 +++++++++++++++++++++++++-----------------------
 src/nodedef.h   |  29 +++
 2 files changed, 302 insertions(+), 261 deletions(-)

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 3a2cb00b1..1691289c2 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -247,6 +247,28 @@ static void deSerializeSimpleSoundSpec(SimpleSoundSpec &ss, std::istream &is)
 	ss.gain = readF1000(is);
 }
 
+void TextureSettings::readSettings()
+{
+	connected_glass                = g_settings->getBool("connected_glass");
+	opaque_water                   = g_settings->getBool("opaque_water");
+	bool enable_shaders            = g_settings->getBool("enable_shaders");
+	bool enable_bumpmapping        = g_settings->getBool("enable_bumpmapping");
+	bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
+	enable_mesh_cache              = g_settings->getBool("enable_mesh_cache");
+	enable_minimap                 = g_settings->getBool("enable_minimap");
+	std::string leaves_style_str   = g_settings->get("leaves_style");
+
+	use_normal_texture = enable_shaders &&
+		(enable_bumpmapping || enable_parallax_occlusion);
+	if (leaves_style_str == "fancy") {
+		leaves_style = LEAVES_FANCY;
+	} else if (leaves_style_str == "simple") {
+		leaves_style = LEAVES_SIMPLE;
+	} else {
+		leaves_style = LEAVES_OPAQUE;
+	}
+}
+
 /*
 	ContentFeatures
 */
@@ -486,6 +508,254 @@ void ContentFeatures::deSerialize(std::istream &is)
 	}catch(SerializationError &e) {};
 }
 
+#ifndef SERVER
+void ContentFeatures::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
+		TileDef *tiledef, u32 shader_id, bool use_normal_texture,
+		bool backface_culling, u8 alpha, u8 material_type)
+{
+	tile->shader_id     = shader_id;
+	tile->texture       = tsrc->getTextureForMesh(tiledef->name, &tile->texture_id);
+	tile->alpha         = alpha;
+	tile->material_type = material_type;
+
+	// Normal texture and shader flags texture
+	if (use_normal_texture) {
+		tile->normal_texture = tsrc->getNormalTexture(tiledef->name);
+	}
+	tile->flags_texture = tsrc->getShaderFlagsTexture(tile->normal_texture ? true : false);
+
+	// Material flags
+	tile->material_flags = 0;
+	if (backface_culling)
+		tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
+	if (tiledef->animation.type == TAT_VERTICAL_FRAMES)
+		tile->material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
+	if (tiledef->tileable_horizontal)
+		tile->material_flags |= MATERIAL_FLAG_TILEABLE_HORIZONTAL;
+	if (tiledef->tileable_vertical)
+		tile->material_flags |= MATERIAL_FLAG_TILEABLE_VERTICAL;
+
+	// Animation parameters
+	int frame_count = 1;
+	if (tile->material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES) {
+		// Get texture size to determine frame count by aspect ratio
+		v2u32 size = tile->texture->getOriginalSize();
+		int frame_height = (float)size.X /
+				(float)tiledef->animation.aspect_w *
+				(float)tiledef->animation.aspect_h;
+		frame_count = size.Y / frame_height;
+		int frame_length_ms = 1000.0 * tiledef->animation.length / frame_count;
+		tile->animation_frame_count = frame_count;
+		tile->animation_frame_length_ms = frame_length_ms;
+	}
+
+	if (frame_count == 1) {
+		tile->material_flags &= ~MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
+	} else {
+		std::ostringstream os(std::ios::binary);
+		tile->frames.resize(frame_count);
+
+		for (int i = 0; i < frame_count; i++) {
+
+			FrameSpec frame;
+
+			os.str("");
+			os << tiledef->name << "^[verticalframe:"
+				<< frame_count << ":" << i;
+
+			frame.texture = tsrc->getTextureForMesh(os.str(), &frame.texture_id);
+			if (tile->normal_texture)
+				frame.normal_texture = tsrc->getNormalTexture(os.str());
+			frame.flags_texture = tile->flags_texture;
+			tile->frames[i] = frame;
+		}
+	}
+}
+#endif
+
+#ifndef SERVER
+void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc,
+	scene::ISceneManager *smgr, scene::IMeshManipulator *meshmanip,
+	IGameDef *gamedef, const TextureSettings &tsettings)
+{
+	// minimap pixel color - the average color of a texture
+	if (tsettings.enable_minimap && tiledef[0].name != "")
+		minimap_color = tsrc->getTextureAverageColor(tiledef[0].name);
+
+	// Figure out the actual tiles to use
+	TileDef tdef[6];
+	for (u32 j = 0; j < 6; j++) {
+		tdef[j] = tiledef[j];
+		if (tdef[j].name == "")
+			tdef[j].name = "unknown_node.png";
+	}
+
+	bool is_liquid = false;
+	bool is_water_surface = false;
+
+	u8 material_type = (alpha == 255) ?
+		TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
+
+	switch (drawtype) {
+	default:
+	case NDT_NORMAL:
+		solidness = 2;
+		break;
+	case NDT_AIRLIKE:
+		solidness = 0;
+		break;
+	case NDT_LIQUID:
+		assert(liquid_type == LIQUID_SOURCE);
+		if (tsettings.opaque_water)
+			alpha = 255;
+		solidness = 1;
+		is_liquid = true;
+		break;
+	case NDT_FLOWINGLIQUID:
+		assert(liquid_type == LIQUID_FLOWING);
+		solidness = 0;
+		if (tsettings.opaque_water)
+			alpha = 255;
+		is_liquid = true;
+		break;
+	case NDT_GLASSLIKE:
+		solidness = 0;
+		visual_solidness = 1;
+		break;
+	case NDT_GLASSLIKE_FRAMED:
+		solidness = 0;
+		visual_solidness = 1;
+		break;
+	case NDT_GLASSLIKE_FRAMED_OPTIONAL:
+		solidness = 0;
+		visual_solidness = 1;
+		drawtype = tsettings.connected_glass ? NDT_GLASSLIKE_FRAMED : NDT_GLASSLIKE;
+		break;
+	case NDT_ALLFACES:
+		solidness = 0;
+		visual_solidness = 1;
+		break;
+	case NDT_ALLFACES_OPTIONAL:
+		if (tsettings.leaves_style == LEAVES_FANCY) {
+			drawtype = NDT_ALLFACES;
+			solidness = 0;
+			visual_solidness = 1;
+		} else if (tsettings.leaves_style == LEAVES_SIMPLE) {
+			for (u32 j = 0; j < 6; j++) {
+				if (tiledef_special[j].name != "")
+					tdef[j].name = tiledef_special[j].name;
+			}
+			drawtype = NDT_GLASSLIKE;
+			solidness = 0;
+			visual_solidness = 1;
+		} else {
+			drawtype = NDT_NORMAL;
+			solidness = 2;
+			for (u32 i = 0; i < 6; i++)
+				tdef[i].name += std::string("^[noalpha");
+		}
+		if (waving == 1)
+			material_type = TILE_MATERIAL_WAVING_LEAVES;
+		break;
+	case NDT_PLANTLIKE:
+		solidness = 0;
+		if (waving == 1)
+			material_type = TILE_MATERIAL_WAVING_PLANTS;
+		break;
+	case NDT_FIRELIKE:
+		solidness = 0;
+		break;
+	case NDT_MESH:
+		solidness = 0;
+		break;
+	case NDT_TORCHLIKE:
+	case NDT_SIGNLIKE:
+	case NDT_FENCELIKE:
+	case NDT_RAILLIKE:
+	case NDT_NODEBOX:
+		solidness = 0;
+		break;
+	}
+
+	if (is_liquid) {
+		material_type = (alpha == 255) ?
+			TILE_MATERIAL_LIQUID_OPAQUE : TILE_MATERIAL_LIQUID_TRANSPARENT;
+		if (name == "default:water_source")
+			is_water_surface = true;
+	}
+
+	u32 tile_shader[6];
+	for (u16 j = 0; j < 6; j++) {
+		tile_shader[j] = shdsrc->getShader("nodes_shader",
+			material_type, drawtype);
+	}
+
+	if (is_water_surface) {
+		tile_shader[0] = shdsrc->getShader("water_surface_shader",
+			material_type, drawtype);
+	}
+
+	// Tiles (fill in f->tiles[])
+	for (u16 j = 0; j < 6; j++) {
+		fillTileAttribs(tsrc, &tiles[j], &tdef[j], tile_shader[j],
+			tsettings.use_normal_texture,
+			tiledef[j].backface_culling, alpha, material_type);
+	}
+
+	// Special tiles (fill in f->special_tiles[])
+	for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) {
+		fillTileAttribs(tsrc, &special_tiles[j], &tiledef_special[j],
+			tile_shader[j], tsettings.use_normal_texture,
+			tiledef_special[j].backface_culling, alpha, material_type);
+	}
+
+	if ((drawtype == NDT_MESH) && (mesh != "")) {
+		// Meshnode drawtype
+		// Read the mesh and apply scale
+		mesh_ptr[0] = gamedef->getMesh(mesh);
+		if (mesh_ptr[0]){
+			v3f scale = v3f(1.0, 1.0, 1.0) * BS * visual_scale;
+			scaleMesh(mesh_ptr[0], scale);
+			recalculateBoundingBox(mesh_ptr[0]);
+			meshmanip->recalculateNormals(mesh_ptr[0], true, false);
+		}
+	} else if ((drawtype == NDT_NODEBOX) &&
+			((node_box.type == NODEBOX_REGULAR) ||
+			(node_box.type == NODEBOX_FIXED)) &&
+			(!node_box.fixed.empty())) {
+		//Convert regular nodebox nodes to meshnodes
+		//Change the drawtype and apply scale
+		drawtype = NDT_MESH;
+		mesh_ptr[0] = convertNodeboxesToMesh(node_box.fixed);
+		v3f scale = v3f(1.0, 1.0, 1.0) * visual_scale;
+		scaleMesh(mesh_ptr[0], scale);
+		recalculateBoundingBox(mesh_ptr[0]);
+		meshmanip->recalculateNormals(mesh_ptr[0], true, false);
+	}
+
+	//Cache 6dfacedir and wallmounted rotated clones of meshes
+	if (tsettings.enable_mesh_cache && mesh_ptr[0] && (param_type_2 == CPT2_FACEDIR)) {
+		for (u16 j = 1; j < 24; j++) {
+			mesh_ptr[j] = cloneMesh(mesh_ptr[0]);
+			rotateMeshBy6dFacedir(mesh_ptr[j], j);
+			recalculateBoundingBox(mesh_ptr[j]);
+			meshmanip->recalculateNormals(mesh_ptr[j], true, false);
+		}
+	} else if (tsettings.enable_mesh_cache && mesh_ptr[0] && (param_type_2 == CPT2_WALLMOUNTED)) {
+		static const u8 wm_to_6d[6] = {20, 0, 16+1, 12+3, 8, 4+2};
+		for (u16 j = 1; j < 6; j++) {
+			mesh_ptr[j] = cloneMesh(mesh_ptr[0]);
+			rotateMeshBy6dFacedir(mesh_ptr[j], wm_to_6d[j]);
+			recalculateBoundingBox(mesh_ptr[j]);
+			meshmanip->recalculateNormals(mesh_ptr[j], true, false);
+		}
+		rotateMeshBy6dFacedir(mesh_ptr[0], wm_to_6d[0]);
+		recalculateBoundingBox(mesh_ptr[0]);
+		meshmanip->recalculateNormals(mesh_ptr[0], true, false);
+	}
+}
+#endif
+
 /*
 	CNodeDefManager
 */
@@ -525,11 +795,6 @@ public:
 
 private:
 	void addNameIdMapping(content_t i, std::string name);
-#ifndef SERVER
-	void fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, TileDef *tiledef,
-		u32 shader_id, bool use_normal_texture, bool backface_culling,
-		u8 alpha, u8 material_type);
-#endif
 
 	// Features indexed by id
 	std::vector<ContentFeatures> m_content_features;
@@ -890,271 +1155,18 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
 	IShaderSource *shdsrc = gamedef->getShaderSource();
 	scene::ISceneManager* smgr = gamedef->getSceneManager();
 	scene::IMeshManipulator* meshmanip = smgr->getMeshManipulator();
-
-	bool connected_glass           = g_settings->getBool("connected_glass");
-	bool opaque_water              = g_settings->getBool("opaque_water");
-	bool enable_shaders            = g_settings->getBool("enable_shaders");
-	bool enable_bumpmapping        = g_settings->getBool("enable_bumpmapping");
-	bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
-	bool enable_mesh_cache         = g_settings->getBool("enable_mesh_cache");
-	bool enable_minimap            = g_settings->getBool("enable_minimap");
-	std::string leaves_style       = g_settings->get("leaves_style");
-
-	bool use_normal_texture = enable_shaders &&
-		(enable_bumpmapping || enable_parallax_occlusion);
+	TextureSettings tsettings;
+	tsettings.readSettings();
 
 	u32 size = m_content_features.size();
 
 	for (u32 i = 0; i < size; i++) {
-		ContentFeatures *f = &m_content_features[i];
-
-		// minimap pixel color - the average color of a texture
-		if (enable_minimap && f->tiledef[0].name != "")
-			f->minimap_color = tsrc->getTextureAverageColor(f->tiledef[0].name);
-
-		// Figure out the actual tiles to use
-		TileDef tiledef[6];
-		for (u32 j = 0; j < 6; j++) {
-			tiledef[j] = f->tiledef[j];
-			if (tiledef[j].name == "")
-				tiledef[j].name = "unknown_node.png";
-		}
-
-		bool is_liquid = false;
-		bool is_water_surface = false;
-
-		u8 material_type = (f->alpha == 255) ?
-			TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
-
-		switch (f->drawtype) {
-		default:
-		case NDT_NORMAL:
-			f->solidness = 2;
-			break;
-		case NDT_AIRLIKE:
-			f->solidness = 0;
-			break;
-		case NDT_LIQUID:
-			assert(f->liquid_type == LIQUID_SOURCE);
-			if (opaque_water)
-				f->alpha = 255;
-			f->solidness = 1;
-			is_liquid = true;
-			break;
-		case NDT_FLOWINGLIQUID:
-			assert(f->liquid_type == LIQUID_FLOWING);
-			f->solidness = 0;
-			if (opaque_water)
-				f->alpha = 255;
-			is_liquid = true;
-			break;
-		case NDT_GLASSLIKE:
-			f->solidness = 0;
-			f->visual_solidness = 1;
-			break;
-		case NDT_GLASSLIKE_FRAMED:
-			f->solidness = 0;
-			f->visual_solidness = 1;
-			break;
-		case NDT_GLASSLIKE_FRAMED_OPTIONAL:
-			f->solidness = 0;
-			f->visual_solidness = 1;
-			f->drawtype = connected_glass ? NDT_GLASSLIKE_FRAMED : NDT_GLASSLIKE;
-			break;
-		case NDT_ALLFACES:
-			f->solidness = 0;
-			f->visual_solidness = 1;
-			break;
-		case NDT_ALLFACES_OPTIONAL:
-			if (leaves_style == "fancy") {
-				f->drawtype = NDT_ALLFACES;
-				f->solidness = 0;
-				f->visual_solidness = 1;
-			} else if (leaves_style == "simple") {
-				for (u32 j = 0; j < 6; j++) {
-					if (f->tiledef_special[j].name != "")
-						tiledef[j].name = f->tiledef_special[j].name;
-				}
-				f->drawtype = NDT_GLASSLIKE;
-				f->solidness = 0;
-				f->visual_solidness = 1;
-			} else {
-				f->drawtype = NDT_NORMAL;
-				f->solidness = 2;
-				for (u32 i = 0; i < 6; i++)
-					tiledef[i].name += std::string("^[noalpha");
-			}
-			if (f->waving == 1)
-				material_type = TILE_MATERIAL_WAVING_LEAVES;
-			break;
-		case NDT_PLANTLIKE:
-			f->solidness = 0;
-			if (f->waving == 1)
-				material_type = TILE_MATERIAL_WAVING_PLANTS;
-			break;
-		case NDT_FIRELIKE:
-			f->solidness = 0;
-			break;
-		case NDT_MESH:
-			f->solidness = 0;
-			break;
-		case NDT_TORCHLIKE:
-		case NDT_SIGNLIKE:
-		case NDT_FENCELIKE:
-		case NDT_RAILLIKE:
-		case NDT_NODEBOX:
-			f->solidness = 0;
-			break;
-		}
-
-		if (is_liquid) {
-			material_type = (f->alpha == 255) ?
-				TILE_MATERIAL_LIQUID_OPAQUE : TILE_MATERIAL_LIQUID_TRANSPARENT;
-			if (f->name == "default:water_source")
-				is_water_surface = true;
-		}
-
-		u32 tile_shader[6];
-		for (u16 j = 0; j < 6; j++) {
-			tile_shader[j] = shdsrc->getShader("nodes_shader",
-				material_type, f->drawtype);
-		}
-
-		if (is_water_surface) {
-			tile_shader[0] = shdsrc->getShader("water_surface_shader",
-				material_type, f->drawtype);
-		}
-
-		// Tiles (fill in f->tiles[])
-		for (u16 j = 0; j < 6; j++) {
-			fillTileAttribs(tsrc, &f->tiles[j], &tiledef[j], tile_shader[j],
-				use_normal_texture, f->tiledef[j].backface_culling, f->alpha, material_type);
-		}
-
-		// Special tiles (fill in f->special_tiles[])
-		for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) {
-			fillTileAttribs(tsrc, &f->special_tiles[j], &f->tiledef_special[j],
-				tile_shader[j], use_normal_texture,
-				f->tiledef_special[j].backface_culling, f->alpha, material_type);
-		}
-
-		if ((f->drawtype == NDT_MESH) && (f->mesh != "")) {
-			// Meshnode drawtype
-			// Read the mesh and apply scale
-			f->mesh_ptr[0] = gamedef->getMesh(f->mesh);
-			if (f->mesh_ptr[0]){
-				v3f scale = v3f(1.0, 1.0, 1.0) * BS * f->visual_scale;
-				scaleMesh(f->mesh_ptr[0], scale);
-				recalculateBoundingBox(f->mesh_ptr[0]);
-				meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
-			}
-		} else if ((f->drawtype == NDT_NODEBOX) &&
-				((f->node_box.type == NODEBOX_REGULAR) ||
-				(f->node_box.type == NODEBOX_FIXED)) &&
-				(!f->node_box.fixed.empty())) {
-			//Convert regular nodebox nodes to meshnodes
-			//Change the drawtype and apply scale
-			f->drawtype = NDT_MESH;
-			f->mesh_ptr[0] = convertNodeboxesToMesh(f->node_box.fixed);
-			v3f scale = v3f(1.0, 1.0, 1.0) * f->visual_scale;
-			scaleMesh(f->mesh_ptr[0], scale);
-			recalculateBoundingBox(f->mesh_ptr[0]);
-			meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
-		}
-
-		//Cache 6dfacedir and wallmounted rotated clones of meshes
-		if (enable_mesh_cache && f->mesh_ptr[0] && (f->param_type_2 == CPT2_FACEDIR)) {
-			for (u16 j = 1; j < 24; j++) {
-				f->mesh_ptr[j] = cloneMesh(f->mesh_ptr[0]);
-				rotateMeshBy6dFacedir(f->mesh_ptr[j], j);
-				recalculateBoundingBox(f->mesh_ptr[j]);
-				meshmanip->recalculateNormals(f->mesh_ptr[j], true, false);
-			}
-		} else if (enable_mesh_cache && f->mesh_ptr[0] && (f->param_type_2 == CPT2_WALLMOUNTED)) {
-			static const u8 wm_to_6d[6] = {20, 0, 16+1, 12+3, 8, 4+2};
-			for (u16 j = 1; j < 6; j++) {
-				f->mesh_ptr[j] = cloneMesh(f->mesh_ptr[0]);
-				rotateMeshBy6dFacedir(f->mesh_ptr[j], wm_to_6d[j]);
-				recalculateBoundingBox(f->mesh_ptr[j]);
-				meshmanip->recalculateNormals(f->mesh_ptr[j], true, false);
-			}
-			rotateMeshBy6dFacedir(f->mesh_ptr[0], wm_to_6d[0]);
-			recalculateBoundingBox(f->mesh_ptr[0]);
-			meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
-		}
-
+		m_content_features[i].updateTextures(tsrc, shdsrc, smgr, meshmanip, gamedef, tsettings);
 		progress_callback(progress_callback_args, i, size);
 	}
 #endif
 }
 
-
-#ifndef SERVER
-void CNodeDefManager::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
-		TileDef *tiledef, u32 shader_id, bool use_normal_texture,
-		bool backface_culling, u8 alpha, u8 material_type)
-{
-	tile->shader_id     = shader_id;
-	tile->texture       = tsrc->getTextureForMesh(tiledef->name, &tile->texture_id);
-	tile->alpha         = alpha;
-	tile->material_type = material_type;
-
-	// Normal texture and shader flags texture
-	if (use_normal_texture) {
-		tile->normal_texture = tsrc->getNormalTexture(tiledef->name);
-	}
-	tile->flags_texture = tsrc->getShaderFlagsTexture(tile->normal_texture ? true : false);
-
-	// Material flags
-	tile->material_flags = 0;
-	if (backface_culling)
-		tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
-	if (tiledef->animation.type == TAT_VERTICAL_FRAMES)
-		tile->material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
-	if (tiledef->tileable_horizontal)
-		tile->material_flags |= MATERIAL_FLAG_TILEABLE_HORIZONTAL;
-	if (tiledef->tileable_vertical)
-		tile->material_flags |= MATERIAL_FLAG_TILEABLE_VERTICAL;
-
-	// Animation parameters
-	int frame_count = 1;
-	if (tile->material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES) {
-		// Get texture size to determine frame count by aspect ratio
-		v2u32 size = tile->texture->getOriginalSize();
-		int frame_height = (float)size.X /
-				(float)tiledef->animation.aspect_w *
-				(float)tiledef->animation.aspect_h;
-		frame_count = size.Y / frame_height;
-		int frame_length_ms = 1000.0 * tiledef->animation.length / frame_count;
-		tile->animation_frame_count = frame_count;
-		tile->animation_frame_length_ms = frame_length_ms;
-	}
-
-	if (frame_count == 1) {
-		tile->material_flags &= ~MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
-	} else {
-		std::ostringstream os(std::ios::binary);
-		tile->frames.resize(frame_count);
-
-		for (int i = 0; i < frame_count; i++) {
-
-			FrameSpec frame;
-
-			os.str("");
-			os << tiledef->name << "^[verticalframe:"
-				<< frame_count << ":" << i;
-
-			frame.texture = tsrc->getTextureForMesh(os.str(), &frame.texture_id);
-			if (tile->normal_texture)
-				frame.normal_texture = tsrc->getNormalTexture(os.str());
-			frame.flags_texture = tile->flags_texture;
-			tile->frames[i] = frame;
-		}
-	}
-}
-#endif
-
-
 void CNodeDefManager::serialize(std::ostream &os, u16 protocol_version) const
 {
 	writeU8(os, 1); // version
diff --git a/src/nodedef.h b/src/nodedef.h
index 58d0faffa..1c2f792d8 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -112,6 +112,26 @@ struct NodeBox
 struct MapNode;
 class NodeMetadata;
 
+enum LeavesStyle {
+	LEAVES_FANCY,
+	LEAVES_SIMPLE,
+	LEAVES_OPAQUE,
+};
+
+class TextureSettings {
+public:
+	LeavesStyle leaves_style;
+	bool opaque_water;
+	bool connected_glass;
+	bool use_normal_texture;
+	bool enable_mesh_cache;
+	bool enable_minimap;
+
+	TextureSettings() {}
+
+	void readSettings();
+};
+
 enum NodeDrawType
 {
 	NDT_NORMAL, // A basic solid block
@@ -304,6 +324,15 @@ struct ContentFeatures
 		if(!isLiquid() || !f.isLiquid()) return false;
 		return (liquid_alternative_flowing == f.liquid_alternative_flowing);
 	}
+
+#ifndef SERVER
+	void fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, TileDef *tiledef,
+		u32 shader_id, bool use_normal_texture, bool backface_culling,
+		u8 alpha, u8 material_type);
+	void updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc,
+		scene::ISceneManager *smgr, scene::IMeshManipulator *meshmanip,
+		IGameDef *gamedef, const TextureSettings &tsettings);
+#endif
 };
 
 class INodeDefManager {

From 22f78ea38e415c40ef445786b77788a40f4ddac3 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Tue, 24 May 2016 00:27:11 +1000
Subject: [PATCH 015/418] Fix irrlicht version checking macro for
 tooltip_height calculation

---
 src/guiFormSpecMenu.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index b0215a84a..99b1153c1 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -2265,10 +2265,10 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase,
 				this->bringToFront(m_tooltip_element);
 				m_tooltip_element->setText(tooltip_text.c_str());
 				s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height;
-#if IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8 && IRRLICHT_VERSION_REVISION >= 2
-				s32 tooltip_height = m_tooltip_element->getTextHeight() + 5;
-#else
+#if IRRLICHT_VERSION_MAJOR <= 1 && IRRLICHT_VERSION_MINOR <= 8 && IRRLICHT_VERSION_REVISION < 2
 				s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5;
+#else
+				s32 tooltip_height = m_tooltip_element->getTextHeight() + 5;
 #endif
 				v2u32 screenSize = driver->getScreenSize();
 				int tooltip_offset_x = m_btn_height;

From ef100f12a1346f7bfd2a05dc606cb22e97179c02 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Fri, 12 Feb 2016 18:39:03 -0500
Subject: [PATCH 016/418] Fix rollback.txt migration

Broken by b1965ac20922e3722392114bd63a22b403dcbe98.
This also prepares the begin and commit statements only once.
---
 src/rollback.cpp | 41 +++++++++++++++++++++++++++--------------
 src/rollback.h   |  2 +-
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/rollback.cpp b/src/rollback.cpp
index 2367c3a21..ac4324cab 100644
--- a/src/rollback.cpp
+++ b/src/rollback.cpp
@@ -93,10 +93,10 @@ RollbackManager::RollbackManager(const std::string & world_path,
 	std::string migrating_flag = txt_filename + ".migrating";
 	database_path = world_path + DIR_DELIM "rollback.sqlite";
 
-	initDatabase();
+	bool created = initDatabase();
 
-	if (fs::PathExists(txt_filename) && (fs::PathExists(migrating_flag) ||
-			!fs::PathExists(database_path))) {
+	if (fs::PathExists(txt_filename) && (created ||
+			fs::PathExists(migrating_flag))) {
 		std::ofstream of(migrating_flag.c_str());
 		of.close();
 		migrate(txt_filename);
@@ -250,15 +250,15 @@ bool RollbackManager::createTables()
 }
 
 
-void RollbackManager::initDatabase()
+bool RollbackManager::initDatabase()
 {
 	verbosestream << "RollbackManager: Database connection setup" << std::endl;
 
-	bool needsCreate = !fs::PathExists(database_path);
+	bool needs_create = !fs::PathExists(database_path);
 	SQLOK(sqlite3_open_v2(database_path.c_str(), &db,
 			SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL));
 
-	if (needsCreate) {
+	if (needs_create) {
 		createTables();
 	}
 
@@ -374,6 +374,8 @@ void RollbackManager::initDatabase()
 		);
 	}
 	SQLOK(sqlite3_reset(stmt_knownNode_select));
+
+	return needs_create;
 }
 
 
@@ -672,23 +674,27 @@ void RollbackManager::migrate(const std::string & file_path)
 
 	std::streampos file_size = fh.tellg();
 
-	if (file_size > 10) {
+	if (file_size < 10) {
 		errorstream << "Empty rollback log." << std::endl;
 		return;
 	}
 
 	fh.seekg(0);
 
+	sqlite3_stmt *stmt_begin;
+	sqlite3_stmt *stmt_commit;
+	SQLOK(sqlite3_prepare_v2(db, "BEGIN", -1, &stmt_begin, NULL));
+	SQLOK(sqlite3_prepare_v2(db, "COMMIT", -1, &stmt_commit, NULL));
+
 	std::string bit;
 	int i = 0;
-	int id = 1;
 	time_t start = time(0);
 	time_t t = start;
-	sqlite3_exec(db, "BEGIN", NULL, NULL, NULL);
+	SQLRES(sqlite3_step(stmt_begin), SQLITE_DONE);
+	sqlite3_reset(stmt_begin);
 	do {
 		ActionRow row;
-
-		row.id = id;
+		row.id = 0;
 
 		// Get the timestamp
 		std::getline(fh, bit, ' ');
@@ -758,17 +764,24 @@ void RollbackManager::migrate(const std::string & file_path)
 		++i;
 
 		if (time(0) - t >= 1) {
-			sqlite3_exec(db, "COMMIT", NULL, NULL, NULL);
+			SQLRES(sqlite3_step(stmt_commit), SQLITE_DONE);
+			sqlite3_reset(stmt_commit);
 			t = time(0);
 			std::cout
 				<< " Done: " << static_cast<int>((static_cast<float>(fh.tellg()) / static_cast<float>(file_size)) * 100) << "%"
 				<< " Speed: " << i / (t - start) << "/second     \r" << std::flush;
-			sqlite3_exec(db, "BEGIN", NULL, NULL, NULL);
+			SQLRES(sqlite3_step(stmt_begin), SQLITE_DONE);
+			sqlite3_reset(stmt_begin);
 		}
 	} while (fh.good());
+	SQLRES(sqlite3_step(stmt_commit), SQLITE_DONE);
+	sqlite3_reset(stmt_commit);
+
+	SQLOK(sqlite3_finalize(stmt_begin));
+	SQLOK(sqlite3_finalize(stmt_commit));
 
 	std::cout
-		<< " Done: 100%                                   " << std::endl
+		<< " Done: 100%                                  " << std::endl
 		<< "Now you can delete the old rollback.txt file." << std::endl;
 }
 
diff --git a/src/rollback.h b/src/rollback.h
index c57e38ab0..a05ef8b78 100644
--- a/src/rollback.h
+++ b/src/rollback.h
@@ -61,7 +61,7 @@ private:
 	const char * getActorName(const int id);
 	const char * getNodeName(const int id);
 	bool createTables();
-	void initDatabase();
+	bool initDatabase();
 	bool registerRow(const ActionRow & row);
 	const std::list<ActionRow> actionRowsFromSelect(sqlite3_stmt * stmt);
 	ActionRow actionRowFromRollbackAction(const RollbackAction & action);

From fa6b21a15b415cd82dce6896b94a5341b7dd76f0 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Sat, 14 May 2016 16:25:57 +0200
Subject: [PATCH 017/418] Tell irrlicht if we handle a key or not.

We can remove the function in MtNativeActivity now
as it serves precisely that purpose: to tell irrlicht
that we handled the esc key.

TODO for later:
 * Perhaps try to find a more performant container than KeyList
---
 .../MtNativeActivity.java                     |  5 ---
 src/client/inputhandler.h                     | 37 ++++++++++++++++---
 src/game.cpp                                  | 23 +++++++++++-
 src/game.h                                    |  3 ++
 4 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
index 3173a71f4..159521a50 100644
--- a/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
+++ b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
@@ -19,11 +19,6 @@ public class MtNativeActivity extends NativeActivity {
 	public void onDestroy() {
 		super.onDestroy();
 	}
-	
-	@Override
-	public void onBackPressed() {
-	}
-
 
 	public void copyAssets() {
 		Intent intent = new Intent(this, MinetestAssetCopy.class);
diff --git a/src/client/inputhandler.h b/src/client/inputhandler.h
index 69e4b25fa..73e507fdc 100644
--- a/src/client/inputhandler.h
+++ b/src/client/inputhandler.h
@@ -42,11 +42,15 @@ public:
 
 		// Remember whether each key is down or up
 		if (event.EventType == irr::EET_KEY_INPUT_EVENT) {
-			if (event.KeyInput.PressedDown) {
-				keyIsDown.set(event.KeyInput);
-				keyWasDown.set(event.KeyInput);
-			} else {
-				keyIsDown.unset(event.KeyInput);
+			const KeyPress &keyCode = event.KeyInput;
+			if (keysListenedFor[keyCode]) {
+				if (event.KeyInput.PressedDown) {
+					keyIsDown.set(keyCode);
+					keyWasDown.set(keyCode);
+				} else {
+					keyIsDown.unset(keyCode);
+				}
+				return true;
 			}
 		}
 
@@ -116,6 +120,15 @@ public:
 		return b;
 	}
 
+	void listenForKey(const KeyPress &keyCode)
+	{
+		keysListenedFor.set(keyCode);
+	}
+	void dontListenForKeys()
+	{
+		keysListenedFor.clear();
+	}
+
 	s32 getMouseWheel()
 	{
 		s32 a = mouse_wheel;
@@ -168,6 +181,12 @@ private:
 	KeyList keyIsDown;
 	// Whether a key has been pressed or not
 	KeyList keyWasDown;
+	// List of keys we listen for
+	// TODO perhaps the type of this is not really
+	// performant as KeyList is designed for few but
+	// often changing keys, and keysListenedFor is expected
+	// to change seldomly but contain lots of keys.
+	KeyList keysListenedFor;
 };
 
 
@@ -192,6 +211,14 @@ public:
 	{
 		return m_receiver->WasKeyDown(keyCode);
 	}
+	virtual void listenForKey(const KeyPress &keyCode)
+	{
+		m_receiver->listenForKey(keyCode);
+	}
+	virtual void dontListenForKeys()
+	{
+		m_receiver->dontListenForKeys();
+	}
 	virtual v2s32 getMousePos()
 	{
 		if (m_device->getCursorControl()) {
diff --git a/src/game.cpp b/src/game.cpp
index 23f261cfd..c5211a042 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1297,7 +1297,11 @@ static void updateChat(Client &client, f32 dtime, bool show_debug,
  */
 struct KeyCache {
 
-	KeyCache() { populate(); }
+	KeyCache()
+	{
+		handler = NULL;
+		populate();
+	}
 
 	enum {
 		// Player movement
@@ -1349,6 +1353,7 @@ struct KeyCache {
 	void populate();
 
 	KeyPress key[KEYMAP_INTERNAL_ENUM_COUNT];
+	InputHandler *handler;
 };
 
 void KeyCache::populate()
@@ -1399,6 +1404,19 @@ void KeyCache::populate()
 	key[KEYMAP_ID_QUICKTUNE_DEC]  = getKeySetting("keymap_quicktune_dec");
 
 	key[KEYMAP_ID_DEBUG_STACKS]   = getKeySetting("keymap_print_debug_stacks");
+
+	if (handler) {
+		// First clear all keys, then re-add the ones we listen for
+		handler->dontListenForKeys();
+		for (size_t i = 0; i < KEYMAP_INTERNAL_ENUM_COUNT; i++) {
+			handler->listenForKey(key[i]);
+		}
+		handler->listenForKey(EscapeKey);
+		handler->listenForKey(CancelKey);
+		for (size_t i = 0; i < 10; i++) {
+			handler->listenForKey(NumberKey[i]);
+		}
+	}
 }
 
 
@@ -1829,6 +1847,9 @@ bool Game::startup(bool *kill,
 	this->chat_backend        = chat_backend;
 	this->simple_singleplayer_mode = simple_singleplayer_mode;
 
+	keycache.handler = input;
+	keycache.populate();
+
 	driver              = device->getVideoDriver();
 	smgr                = device->getSceneManager();
 
diff --git a/src/game.h b/src/game.h
index e1f4e9346..5465ecdc6 100644
--- a/src/game.h
+++ b/src/game.h
@@ -110,6 +110,9 @@ public:
 	virtual bool isKeyDown(const KeyPress &keyCode) = 0;
 	virtual bool wasKeyDown(const KeyPress &keyCode) = 0;
 
+	virtual void listenForKey(const KeyPress &keyCode) {}
+	virtual void dontListenForKeys() {}
+
 	virtual v2s32 getMousePos() = 0;
 	virtual void setMousePos(s32 x, s32 y) = 0;
 

From 76f485647983ebd7eb4c3abbca0869d13f76920b Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Thu, 28 Apr 2016 03:43:09 -0400
Subject: [PATCH 018/418] Move biome calculation to BiomeGen

BiomeGen defines an interface that, given a set of BiomeParams, computes biomes
for a given area using the algorithm implemented by that specific BiomeGen.
This abstracts away the old system where each mapgen supplied the noises
required for biome generation.
---
 src/emerge.cpp                  |   2 -
 src/mapgen.cpp                  |  38 ++++---
 src/mapgen.h                    |  21 ++--
 src/mapgen_flat.cpp             |  48 +++------
 src/mapgen_flat.h               |   2 +-
 src/mapgen_fractal.cpp          |  48 +++------
 src/mapgen_fractal.h            |   7 +-
 src/mapgen_v5.cpp               |  46 +++-----
 src/mapgen_v5.h                 |   7 +-
 src/mapgen_v7.cpp               |  61 +++--------
 src/mapgen_v7.h                 |   8 +-
 src/mapgen_valleys.cpp          |  70 ++++++------
 src/mapgen_valleys.h            |  11 +-
 src/mg_biome.cpp                | 185 ++++++++++++++++++++++++--------
 src/mg_biome.h                  | 155 ++++++++++++++++++++++++--
 src/script/lua_api/l_mapgen.cpp |  16 +--
 16 files changed, 421 insertions(+), 304 deletions(-)

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 93e8f2b30..a2a10a177 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -181,8 +181,6 @@ EmergeManager::~EmergeManager()
 	delete oremgr;
 	delete decomgr;
 	delete schemmgr;
-
-	delete params.sparams;
 }
 
 
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index b3c9380a0..e269bf454 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -76,10 +76,9 @@ Mapgen::Mapgen()
 
 	vm        = NULL;
 	ndef      = NULL;
-	heightmap = NULL;
+	biomegen  = NULL;
 	biomemap  = NULL;
-	heatmap   = NULL;
-	humidmap  = NULL;
+	heightmap = NULL;
 }
 
 
@@ -94,11 +93,10 @@ Mapgen::Mapgen(int mapgenid, MapgenParams *params, EmergeManager *emerge) :
 	csize       = v3s16(1, 1, 1) * (params->chunksize * MAP_BLOCKSIZE);
 
 	vm        = NULL;
-	ndef      = NULL;
-	heightmap = NULL;
+	ndef      = emerge->ndef;
+	biomegen  = NULL;
 	biomemap  = NULL;
-	heatmap   = NULL;
-	humidmap  = NULL;
+	heightmap = NULL;
 }
 
 
@@ -444,6 +442,14 @@ void GenerateNotifier::getEvents(
 //// MapgenParams
 ////
 
+
+MapgenParams::~MapgenParams()
+{
+	delete bparams;
+	delete sparams;
+}
+
+
 void MapgenParams::load(const Settings &settings)
 {
 	std::string seed_str;
@@ -458,10 +464,13 @@ void MapgenParams::load(const Settings &settings)
 	settings.getS16NoEx("water_level", water_level);
 	settings.getS16NoEx("chunksize", chunksize);
 	settings.getFlagStrNoEx("mg_flags", flags, flagdesc_mapgen);
-	settings.getNoiseParams("mg_biome_np_heat", np_biome_heat);
-	settings.getNoiseParams("mg_biome_np_heat_blend", np_biome_heat_blend);
-	settings.getNoiseParams("mg_biome_np_humidity", np_biome_humidity);
-	settings.getNoiseParams("mg_biome_np_humidity_blend", np_biome_humidity_blend);
+
+	delete bparams;
+	bparams = BiomeManager::createBiomeParams(BIOMEGEN_ORIGINAL);
+	if (bparams) {
+		bparams->readParams(&settings);
+		bparams->seed = seed;
+	}
 
 	delete sparams;
 	MapgenFactory *mgfactory = EmergeManager::getMapgenFactory(mg_name);
@@ -479,10 +488,9 @@ void MapgenParams::save(Settings &settings) const
 	settings.setS16("water_level", water_level);
 	settings.setS16("chunksize", chunksize);
 	settings.setFlagStr("mg_flags", flags, flagdesc_mapgen, U32_MAX);
-	settings.setNoiseParams("mg_biome_np_heat", np_biome_heat);
-	settings.setNoiseParams("mg_biome_np_heat_blend", np_biome_heat_blend);
-	settings.setNoiseParams("mg_biome_np_humidity", np_biome_humidity);
-	settings.setNoiseParams("mg_biome_np_humidity_blend", np_biome_humidity_blend);
+
+	if (bparams)
+		bparams->writeParams(&settings);
 
 	if (sparams)
 		sparams->writeParams(&settings);
diff --git a/src/mapgen.h b/src/mapgen.h
index abc3d2e89..554ec6084 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -44,6 +44,8 @@ extern FlagDesc flagdesc_mapgen[];
 extern FlagDesc flagdesc_gennotify[];
 
 class Biome;
+class BiomeGen;
+struct BiomeParams;
 class EmergeManager;
 class MapBlock;
 class VoxelManipulator;
@@ -115,11 +117,7 @@ struct MapgenParams {
 	s16 water_level;
 	u32 flags;
 
-	NoiseParams np_biome_heat;
-	NoiseParams np_biome_heat_blend;
-	NoiseParams np_biome_humidity;
-	NoiseParams np_biome_humidity_blend;
-
+	BiomeParams *bparams;
 	MapgenSpecificParams *sparams;
 
 	MapgenParams() :
@@ -128,12 +126,12 @@ struct MapgenParams {
 		seed(0),
 		water_level(1),
 		flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS),
-		np_biome_heat(NoiseParams(50, 50, v3f(750.0, 750.0, 750.0), 5349, 3, 0.5, 2.0)),
-		np_biome_heat_blend(NoiseParams(0, 1.5, v3f(8.0, 8.0, 8.0), 13, 2, 1.0, 2.0)),
-		np_biome_humidity(NoiseParams(50, 50, v3f(750.0, 750.0, 750.0), 842, 3, 0.5, 2.0)),
-		np_biome_humidity_blend(NoiseParams(0, 1.5, v3f(8.0, 8.0, 8.0), 90003, 2, 1.0, 2.0)),
+		bparams(NULL),
 		sparams(NULL)
-	{}
+	{
+	}
+
+	virtual ~MapgenParams();
 
 	void load(const Settings &settings);
 	void save(Settings &settings) const;
@@ -153,10 +151,9 @@ public:
 	u32 blockseed;
 	s16 *heightmap;
 	u8 *biomemap;
-	float *heatmap;
-	float *humidmap;
 	v3s16 csize;
 
+	BiomeGen *biomegen;
 	GenerateNotifier gennotify;
 
 	Mapgen();
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 4669f1716..cb9aa9a8b 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -61,10 +61,7 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge
 	// 1-down overgeneration
 	this->zstride_1d = csize.X * (csize.Y + 1);
 
-	this->biomemap        = new u8[csize.X * csize.Z];
-	this->heightmap       = new s16[csize.X * csize.Z];
-	this->heatmap         = NULL;
-	this->humidmap        = NULL;
+	this->heightmap = new s16[csize.X * csize.Z];
 
 	MapgenFlatParams *sp = (MapgenFlatParams *)params->sparams;
 
@@ -86,15 +83,12 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge
 	noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 1, csize.Z);
 	noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 1, csize.Z);
 
-	//// Biome noise
-	noise_heat           = new Noise(&params->np_biome_heat,           seed, csize.X, csize.Z);
-	noise_humidity       = new Noise(&params->np_biome_humidity,       seed, csize.X, csize.Z);
-	noise_heat_blend     = new Noise(&params->np_biome_heat_blend,     seed, csize.X, csize.Z);
-	noise_humidity_blend = new Noise(&params->np_biome_humidity_blend, seed, csize.X, csize.Z);
+	//// Initialize biome generator
+	biomegen = emerge->biomemgr->createBiomeGen(
+		BIOMEGEN_ORIGINAL, params->bparams, csize);
+	biomemap = biomegen->biomemap;
 
 	//// Resolve nodes to be used
-	INodeDefManager *ndef = emerge->ndef;
-
 	c_stone                = ndef->getId("mapgen_stone");
 	c_water_source         = ndef->getId("mapgen_water_source");
 	c_lava_source          = ndef->getId("mapgen_lava_source");
@@ -128,13 +122,9 @@ MapgenFlat::~MapgenFlat()
 	delete noise_cave1;
 	delete noise_cave2;
 
-	delete noise_heat;
-	delete noise_humidity;
-	delete noise_heat_blend;
-	delete noise_humidity_blend;
+	delete biomegen;
 
 	delete[] heightmap;
-	delete[] biomemap;
 }
 
 
@@ -252,12 +242,10 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 	// Create heightmap
 	updateHeightmap(node_min, node_max);
 
-	// Create biomemap at heightmap surface
-	bmgr->calcBiomes(csize.X, csize.Z, noise_heat->result,
-		noise_humidity->result, heightmap, biomemap);
-
-	// Actually place the biome-specific nodes
-	MgStoneType stone_type = generateBiomes(noise_heat->result, noise_humidity->result);
+	// Init biome generator, place biome-specific nodes, and build biomemap
+	biomegen->calcBiomeNoise(node_min);
+	biomegen->getBiomes(heightmap);
+	MgStoneType stone_type = generateBiomes();
 
 	if (flags & MG_CAVES)
 		generateCaves(stone_surface_max_y);
@@ -343,18 +331,7 @@ void MapgenFlat::calculateNoise()
 	// only if solid terrain is present in mapchunk
 
 	noise_filler_depth->perlinMap2D(x, z);
-	noise_heat->perlinMap2D(x, z);
-	noise_humidity->perlinMap2D(x, z);
-	noise_heat_blend->perlinMap2D(x, z);
-	noise_humidity_blend->perlinMap2D(x, z);
 
-	for (s32 i = 0; i < csize.X * csize.Z; i++) {
-		noise_heat->result[i] += noise_heat_blend->result[i];
-		noise_humidity->result[i] += noise_humidity_blend->result[i];
-	}
-
-	heatmap = noise_heat->result;
-	humidmap = noise_humidity->result;
 	//printf("calculateNoise: %dus\n", t.stop());
 }
 
@@ -406,7 +383,7 @@ s16 MapgenFlat::generateTerrain()
 }
 
 
-MgStoneType MapgenFlat::generateBiomes(float *heat_map, float *humidity_map)
+MgStoneType MapgenFlat::generateBiomes()
 {
 	v3s16 em = vm->m_area.getExtent();
 	u32 index = 0;
@@ -443,7 +420,8 @@ MgStoneType MapgenFlat::generateBiomes(float *heat_map, float *humidity_map)
 			// 3. When stone or water is detected but biome has not yet been calculated.
 			if ((c == c_stone && (air_above || water_above || !biome)) ||
 					(c == c_water_source && (air_above || !biome))) {
-				biome = bmgr->getBiome(heat_map[index], humidity_map[index], y);
+				biome = biomegen->getBiomeAtIndex(index, y);
+
 				depth_top = biome->depth_top;
 				base_filler = MYMAX(depth_top + biome->depth_filler
 					+ noise_filler_depth->result[index], 0);
diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h
index 8aed09be5..53fd66a67 100644
--- a/src/mapgen_flat.h
+++ b/src/mapgen_flat.h
@@ -104,7 +104,7 @@ public:
 	int getSpawnLevelAtPoint(v2s16 p);
 	void calculateNoise();
 	s16 generateTerrain();
-	MgStoneType generateBiomes(float *heat_map, float *humidity_map);
+	MgStoneType generateBiomes();
 	void dustTopNodes();
 	void generateCaves(s16 max_stone_y);
 };
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index e2e29f875..9671a2143 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -59,10 +59,7 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
 	// 1-down overgeneration
 	this->zstride_1d = csize.X * (csize.Y + 1);
 
-	this->biomemap  = new u8[csize.X * csize.Z];
 	this->heightmap = new s16[csize.X * csize.Z];
-	this->heatmap   = NULL;
-	this->humidmap  = NULL;
 
 	MapgenFractalParams *sp = (MapgenFractalParams *)params->sparams;
 
@@ -87,18 +84,15 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
 	noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 1, csize.Z);
 	noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 1, csize.Z);
 
-	//// Biome noise
-	noise_heat           = new Noise(&params->np_biome_heat,           seed, csize.X, csize.Z);
-	noise_humidity       = new Noise(&params->np_biome_humidity,       seed, csize.X, csize.Z);
-	noise_heat_blend     = new Noise(&params->np_biome_heat_blend,     seed, csize.X, csize.Z);
-	noise_humidity_blend = new Noise(&params->np_biome_humidity_blend, seed, csize.X, csize.Z);
+	//// Initialize biome generator
+	biomegen = emerge->biomemgr->createBiomeGen(
+		BIOMEGEN_ORIGINAL, params->bparams, csize);
+	biomemap = biomegen->biomemap;
 
 	this->formula = fractal / 2 + fractal % 2;
 	this->julia   = fractal % 2 == 0;
 
 	//// Resolve nodes to be used
-	INodeDefManager *ndef = emerge->ndef;
-
 	c_stone                = ndef->getId("mapgen_stone");
 	c_water_source         = ndef->getId("mapgen_water_source");
 	c_lava_source          = ndef->getId("mapgen_lava_source");
@@ -132,13 +126,9 @@ MapgenFractal::~MapgenFractal()
 	delete noise_cave1;
 	delete noise_cave2;
 
-	delete noise_heat;
-	delete noise_humidity;
-	delete noise_heat_blend;
-	delete noise_humidity_blend;
+	delete biomegen;
 
 	delete[] heightmap;
-	delete[] biomemap;
 }
 
 
@@ -217,7 +207,7 @@ int MapgenFractal::getSpawnLevelAtPoint(v2s16 p)
 	s16 search_start = MYMAX(seabed_level, water_level + 1);
 	if (seabed_level > water_level)
 		solid_below = true;
-		
+
 	for (s16 y = search_start; y <= search_start + 128; y++) {
 		if (getFractalAtPoint(p.X, y, p.Y)) {  // Fractal node
 			solid_below = true;
@@ -268,12 +258,10 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
 	// Create heightmap
 	updateHeightmap(node_min, node_max);
 
-	// Create biomemap at heightmap surface
-	bmgr->calcBiomes(csize.X, csize.Z, noise_heat->result,
-		noise_humidity->result, heightmap, biomemap);
-
-	// Actually place the biome-specific nodes
-	MgStoneType stone_type = generateBiomes(noise_heat->result, noise_humidity->result);
+	// Init biome generator, place biome-specific nodes, and build biomemap
+	biomegen->calcBiomeNoise(node_min);
+	biomegen->getBiomes(heightmap);
+	MgStoneType stone_type = generateBiomes();
 
 	if (flags & MG_CAVES)
 		generateCaves(stone_surface_max_y);
@@ -358,18 +346,7 @@ void MapgenFractal::calculateNoise()
 	// only if solid terrain is present in mapchunk
 
 	noise_filler_depth->perlinMap2D(x, z);
-	noise_heat->perlinMap2D(x, z);
-	noise_humidity->perlinMap2D(x, z);
-	noise_heat_blend->perlinMap2D(x, z);
-	noise_humidity_blend->perlinMap2D(x, z);
 
-	for (s32 i = 0; i < csize.X * csize.Z; i++) {
-		noise_heat->result[i] += noise_heat_blend->result[i];
-		noise_humidity->result[i] += noise_humidity_blend->result[i];
-	}
-
-	heatmap = noise_heat->result;
-	humidmap = noise_humidity->result;
 	//printf("calculateNoise: %dus\n", t.stop());
 }
 
@@ -530,7 +507,7 @@ s16 MapgenFractal::generateTerrain()
 }
 
 
-MgStoneType MapgenFractal::generateBiomes(float *heat_map, float *humidity_map)
+MgStoneType MapgenFractal::generateBiomes()
 {
 	v3s16 em = vm->m_area.getExtent();
 	u32 index = 0;
@@ -567,7 +544,8 @@ MgStoneType MapgenFractal::generateBiomes(float *heat_map, float *humidity_map)
 			// 3. When stone or water is detected but biome has not yet been calculated.
 			if ((c == c_stone && (air_above || water_above || !biome)) ||
 					(c == c_water_source && (air_above || !biome))) {
-				biome = bmgr->getBiome(heat_map[index], humidity_map[index], y);
+				biome = biomegen->getBiomeAtIndex(index, y);
+
 				depth_top = biome->depth_top;
 				base_filler = MYMAX(depth_top + biome->depth_filler
 					+ noise_filler_depth->result[index], 0);
diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index dd96045e2..a0e51b2c6 100644
--- a/src/mapgen_fractal.h
+++ b/src/mapgen_fractal.h
@@ -88,11 +88,6 @@ public:
 	Noise *noise_cave1;
 	Noise *noise_cave2;
 
-	Noise *noise_heat;
-	Noise *noise_humidity;
-	Noise *noise_heat_blend;
-	Noise *noise_humidity_blend;
-
 	content_t c_stone;
 	content_t c_water_source;
 	content_t c_lava_source;
@@ -114,7 +109,7 @@ public:
 	void calculateNoise();
 	bool getFractalAtPoint(s16 x, s16 y, s16 z);
 	s16 generateTerrain();
-	MgStoneType generateBiomes(float *heat_map, float *humidity_map);
+	MgStoneType generateBiomes();
 	void dustTopNodes();
 	void generateCaves(s16 max_stone_y);
 };
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index b98acb928..829a1f432 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -57,10 +57,7 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	// 1-down overgeneration
 	this->zstride_1d = csize.X * (csize.Y + 1);
 
-	this->biomemap  = new u8[csize.X * csize.Z];
 	this->heightmap = new s16[csize.X * csize.Z];
-	this->heatmap   = NULL;
-	this->humidmap  = NULL;
 
 	MapgenV5Params *sp = (MapgenV5Params *)params->sparams;
 
@@ -79,15 +76,12 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	noise_cave1  = new Noise(&sp->np_cave1,  seed, csize.X, csize.Y + 1, csize.Z);
 	noise_cave2  = new Noise(&sp->np_cave2,  seed, csize.X, csize.Y + 1, csize.Z);
 
-	// Biome noise
-	noise_heat           = new Noise(&params->np_biome_heat,           seed, csize.X, csize.Z);
-	noise_humidity       = new Noise(&params->np_biome_humidity,       seed, csize.X, csize.Z);
-	noise_heat_blend     = new Noise(&params->np_biome_heat_blend,     seed, csize.X, csize.Z);
-	noise_humidity_blend = new Noise(&params->np_biome_humidity_blend, seed, csize.X, csize.Z);
+	//// Initialize biome generator
+	biomegen = emerge->biomemgr->createBiomeGen(
+		BIOMEGEN_ORIGINAL, params->bparams, csize);
+	biomemap = biomegen->biomemap;
 
 	//// Resolve nodes to be used
-	INodeDefManager *ndef = emerge->ndef;
-
 	c_stone                = ndef->getId("mapgen_stone");
 	c_water_source         = ndef->getId("mapgen_water_source");
 	c_lava_source          = ndef->getId("mapgen_lava_source");
@@ -123,13 +117,9 @@ MapgenV5::~MapgenV5()
 	delete noise_cave2;
 	delete noise_ground;
 
-	delete noise_heat;
-	delete noise_humidity;
-	delete noise_heat_blend;
-	delete noise_humidity_blend;
+	delete biomegen;
 
 	delete[] heightmap;
-	delete[] biomemap;
 }
 
 
@@ -248,12 +238,10 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 	// Create heightmap
 	updateHeightmap(node_min, node_max);
 
-	// Create biomemap at heightmap surface
-	bmgr->calcBiomes(csize.X, csize.Z, noise_heat->result,
-		noise_humidity->result, heightmap, biomemap);
-
-	// Actually place the biome-specific nodes
-	MgStoneType stone_type = generateBiomes(noise_heat->result, noise_humidity->result);
+	// Init biome generator, place biome-specific nodes, and build biomemap
+	biomegen->calcBiomeNoise(node_min);
+	biomegen->getBiomes(heightmap);
+	MgStoneType stone_type = generateBiomes();
 
 	// Generate caves
 	if ((flags & MG_CAVES) && (stone_surface_max_y >= node_min.Y))
@@ -343,18 +331,7 @@ void MapgenV5::calculateNoise()
 	// only if solid terrain is present in mapchunk
 
 	noise_filler_depth->perlinMap2D(x, z);
-	noise_heat->perlinMap2D(x, z);
-	noise_humidity->perlinMap2D(x, z);
-	noise_heat_blend->perlinMap2D(x, z);
-	noise_humidity_blend->perlinMap2D(x, z);
 
-	for (s32 i = 0; i < csize.X * csize.Z; i++) {
-		noise_heat->result[i] += noise_heat_blend->result[i];
-		noise_humidity->result[i] += noise_humidity_blend->result[i];
-	}
-
-	heatmap = noise_heat->result;
-	humidmap = noise_humidity->result;
 	//printf("calculateNoise: %dus\n", t.stop());
 }
 
@@ -416,7 +393,7 @@ int MapgenV5::generateBaseTerrain()
 }
 
 
-MgStoneType MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
+MgStoneType MapgenV5::generateBiomes()
 {
 	v3s16 em = vm->m_area.getExtent();
 	u32 index = 0;
@@ -452,7 +429,8 @@ MgStoneType MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
 			// 3. When stone or water is detected but biome has not yet been calculated.
 			if ((c == c_stone && (air_above || water_above || !biome)) ||
 					(c == c_water_source && (air_above || !biome))) {
-				biome = bmgr->getBiome(heat_map[index], humidity_map[index], y);
+				biome = biomegen->getBiomeAtIndex(index, y);
+
 				depth_top = biome->depth_top;
 				base_filler = MYMAX(depth_top + biome->depth_filler
 						+ noise_filler_depth->result[index], 0);
diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index fd2f7f4d8..eef3da617 100644
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -70,11 +70,6 @@ public:
 	Noise *noise_cave2;
 	Noise *noise_ground;
 
-	Noise *noise_heat;
-	Noise *noise_humidity;
-	Noise *noise_heat_blend;
-	Noise *noise_humidity_blend;
-
 	content_t c_stone;
 	content_t c_water_source;
 	content_t c_lava_source;
@@ -95,7 +90,7 @@ public:
 	int getSpawnLevelAtPoint(v2s16 p);
 	void calculateNoise();
 	int generateBaseTerrain();
-	MgStoneType generateBiomes(float *heat_map, float *humidity_map);
+	MgStoneType generateBiomes();
 	void generateCaves(int max_stone_y);
 	void dustTopNodes();
 };
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 9fb65f577..fddb34682 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -64,10 +64,7 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	// 1-down overgeneration
 	this->zstride_1d = csize.X * (csize.Y + 1);
 
-	this->biomemap        = new u8[csize.X * csize.Z];
 	this->heightmap       = new s16[csize.X * csize.Z];
-	this->heatmap         = NULL;
-	this->humidmap        = NULL;
 	this->ridge_heightmap = new s16[csize.X * csize.Z];
 
 	MapgenV7Params *sp = (MapgenV7Params *)params->sparams;
@@ -92,15 +89,13 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	noise_cave1    = new Noise(&sp->np_cave1,    seed, csize.X, csize.Y + 1, csize.Z);
 	noise_cave2    = new Noise(&sp->np_cave2,    seed, csize.X, csize.Y + 1, csize.Z);
 
-	//// Biome noise
-	noise_heat           = new Noise(&params->np_biome_heat,           seed, csize.X, csize.Z);
-	noise_humidity       = new Noise(&params->np_biome_humidity,       seed, csize.X, csize.Z);
-	noise_heat_blend     = new Noise(&params->np_biome_heat_blend,     seed, csize.X, csize.Z);
-	noise_humidity_blend = new Noise(&params->np_biome_humidity_blend, seed, csize.X, csize.Z);
+	// TODO(hmmmm): should we have a way to disable biomemanager biomes?
+	//// Initialize biome generator
+	biomegen = emerge->biomemgr->createBiomeGen(
+		BIOMEGEN_ORIGINAL, params->bparams, csize);
+	biomemap = biomegen->biomemap;
 
 	//// Resolve nodes to be used
-	INodeDefManager *ndef = emerge->ndef;
-
 	c_stone                = ndef->getId("mapgen_stone");
 	c_water_source         = ndef->getId("mapgen_water_source");
 	c_lava_source          = ndef->getId("mapgen_lava_source");
@@ -141,14 +136,10 @@ MapgenV7::~MapgenV7()
 	delete noise_cave1;
 	delete noise_cave2;
 
-	delete noise_heat;
-	delete noise_humidity;
-	delete noise_heat_blend;
-	delete noise_humidity_blend;
+	delete biomegen;
 
 	delete[] ridge_heightmap;
 	delete[] heightmap;
-	delete[] biomemap;
 }
 
 
@@ -279,12 +270,10 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 	// Update heightmap to include mountain terrain
 	updateHeightmap(node_min, node_max);
 
-	// Create biomemap at heightmap surface
-	bmgr->calcBiomes(csize.X, csize.Z, noise_heat->result,
-		noise_humidity->result, heightmap, biomemap);
-
-	// Actually place the biome-specific nodes
-	MgStoneType stone_type = generateBiomes(noise_heat->result, noise_humidity->result);
+	// Init biome generator, place biome-specific nodes, and build biomemap
+	biomegen->calcBiomeNoise(node_min);
+	biomegen->getBiomes(heightmap);
+	MgStoneType stone_type = generateBiomes();
 
 	if (flags & MG_CAVES)
 		generateCaves(stone_surface_max_y);
@@ -384,35 +373,10 @@ void MapgenV7::calculateNoise()
 	// Cave noises are calculated in generateCaves()
 	// only if solid terrain is present in mapchunk
 
-	noise_filler_depth->perlinMap2D(x, z);
-	noise_heat->perlinMap2D(x, z);
-	noise_humidity->perlinMap2D(x, z);
-	noise_heat_blend->perlinMap2D(x, z);
-	noise_humidity_blend->perlinMap2D(x, z);
-
-	for (s32 i = 0; i < csize.X * csize.Z; i++) {
-		noise_heat->result[i] += noise_heat_blend->result[i];
-		noise_humidity->result[i] += noise_humidity_blend->result[i];
-	}
-
-	heatmap = noise_heat->result;
-	humidmap = noise_humidity->result;
 	//printf("calculateNoise: %dus\n", t.stop());
 }
 
 
-Biome *MapgenV7::getBiomeAtPoint(v3s16 p)
-{
-	float heat = NoisePerlin2D(&noise_heat->np, p.X, p.Z, seed) +
-		NoisePerlin2D(&noise_heat_blend->np, p.X, p.Z, seed);
-	float humidity = NoisePerlin2D(&noise_humidity->np, p.X, p.Z, seed) +
-		NoisePerlin2D(&noise_humidity_blend->np, p.X, p.Z, seed);
-	s16 groundlevel = baseTerrainLevelAtPoint(p.X, p.Z);
-
-	return bmgr->getBiome(heat, humidity, groundlevel);
-}
-
-
 float MapgenV7::baseTerrainLevelAtPoint(s16 x, s16 z)
 {
 	float hselect = NoisePerlin2D(&noise_height_select->np, x, z, seed);
@@ -553,7 +517,7 @@ void MapgenV7::generateRidgeTerrain()
 }
 
 
-MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
+MgStoneType MapgenV7::generateBiomes()
 {
 	v3s16 em = vm->m_area.getExtent();
 	u32 index = 0;
@@ -589,7 +553,8 @@ MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
 			// 3. When stone or water is detected but biome has not yet been calculated.
 			if ((c == c_stone && (air_above || water_above || !biome)) ||
 					(c == c_water_source && (air_above || !biome))) {
-				biome = bmgr->getBiome(heat_map[index], humidity_map[index], y);
+				biome = biomegen->getBiomeAtIndex(index, y);
+
 				depth_top = biome->depth_top;
 				base_filler = MYMAX(depth_top + biome->depth_filler
 						+ noise_filler_depth->result[index], 0);
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index c25220646..a8dd9986d 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -84,11 +84,6 @@ public:
 	Noise *noise_cave1;
 	Noise *noise_cave2;
 
-	Noise *noise_heat;
-	Noise *noise_humidity;
-	Noise *noise_heat_blend;
-	Noise *noise_humidity_blend;
-
 	content_t c_stone;
 	content_t c_water_source;
 	content_t c_lava_source;
@@ -107,7 +102,6 @@ public:
 
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
-	Biome *getBiomeAtPoint(v3s16 p);
 
 	float baseTerrainLevelAtPoint(s16 x, s16 z);
 	float baseTerrainLevelFromMap(int index);
@@ -119,7 +113,7 @@ public:
 	int generateTerrain();
 	void generateRidgeTerrain();
 
-	MgStoneType generateBiomes(float *heat_map, float *humidity_map);
+	MgStoneType generateBiomes();
 	void dustTopNodes();
 
 	void generateCaves(s16 max_stone_y);
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 0ec5409cb..44083d9d3 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -68,7 +68,7 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
 	: Mapgen(mapgenid, params, emerge)
 {
 	this->m_emerge = emerge;
-	this->bmgr = emerge->biomemgr;
+	this->bmgr     = emerge->biomemgr;
 
 	//// amount of elements to skip for the next index
 	//// for noise/height/biome maps (not vmanip)
@@ -77,15 +77,13 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
 	// 1-down overgeneration
 	this->zstride_1d = csize.X * (csize.Y + 1);
 
-	this->biomemap  = new u8[csize.X * csize.Z];
 	this->heightmap = new s16[csize.X * csize.Z];
-	this->heatmap   = NULL;
-	this->humidmap  = NULL;
 
 	this->map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT,
 			g_settings->getU16("map_generation_limit"));
 
 	MapgenValleysParams *sp = (MapgenValleysParams *)params->sparams;
+	BiomeParamsOriginal *bp = (BiomeParamsOriginal *)params->bparams;
 
 	this->spflags            = sp->spflags;
 	this->altitude_chill     = sp->altitude_chill;
@@ -113,15 +111,16 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
 	noise_cave2             = new Noise(&sp->np_cave2,             seed, csize.X, csize.Y + 1, csize.Z);
 	noise_massive_caves     = new Noise(&sp->np_massive_caves,     seed, csize.X, csize.Y + 1, csize.Z);
 
-	//// Biome noise
-	noise_heat_blend     = new Noise(&params->np_biome_heat_blend,     seed, csize.X, csize.Z);
-	noise_heat           = new Noise(&params->np_biome_heat,           seed, csize.X, csize.Z);
-	noise_humidity_blend = new Noise(&params->np_biome_humidity_blend, seed, csize.X, csize.Z);
-	noise_humidity       = new Noise(&params->np_biome_humidity,       seed, csize.X, csize.Z);
+	//// Initialize biome generator
+	// NOTE: valleys mapgen can only use BiomeGenOriginal
+	biomegen = emerge->biomemgr->createBiomeGen(
+		BIOMEGEN_ORIGINAL, params->bparams, csize);
+	biomemap = biomegen->biomemap;
+	m_bgen = (BiomeGenOriginal *)biomegen;
 
 	this->humid_rivers       = (spflags & MGVALLEYS_HUMID_RIVERS);
 	this->use_altitude_chill = (spflags & MGVALLEYS_ALT_CHILL);
-	this->humidity_adjust    = params->np_biome_humidity.offset - 50.f;
+	this->humidity_adjust    = bp->np_humidity.offset - 50.f;
 
 	// a small chance of overflows if the settings are very high
 	this->cave_water_max_height = water_level + MYMAX(0, water_features_lim - 4) * 50;
@@ -130,8 +129,6 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
 	tcave_cache = new float[csize.Y + 2];
 
 	//// Resolve nodes to be used
-	INodeDefManager *ndef = emerge->ndef;
-
 	c_cobble               = ndef->getId("mapgen_cobble");
 	c_desert_stone         = ndef->getId("mapgen_desert_stone");
 	c_dirt                 = ndef->getId("mapgen_dirt");
@@ -174,12 +171,8 @@ MapgenValleys::~MapgenValleys()
 	delete noise_valley_depth;
 	delete noise_valley_profile;
 
-	delete noise_heat;
-	delete noise_heat_blend;
-	delete noise_humidity;
-	delete noise_humidity_blend;
+	delete biomegen;
 
-	delete[] biomemap;
 	delete[] heightmap;
 	delete[] tcave_cache;
 }
@@ -293,14 +286,19 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
 	// Generate noise maps and base terrain height.
 	calculateNoise();
 
+	// Generate biome noises.  Note this must be executed strictly before
+	// generateTerrain, because generateTerrain depends on intermediate
+	// biome-related noises.
+	biomegen->calcBiomeNoise(node_min);
+
 	// Generate base terrain with initial heightmaps
 	s16 stone_surface_max_y = generateTerrain();
 
-	// Create biomemap at heightmap surface
-	bmgr->calcBiomes(csize.X, csize.Z, heatmap, humidmap, heightmap, biomemap);
+	// Build biomemap
+	biomegen->getBiomes(heightmap);
 
-	// Actually place the biome-specific nodes
-	MgStoneType stone_type = generateBiomes(heatmap, humidmap);
+	// Place biome-specific nodes
+	MgStoneType stone_type = generateBiomes();
 
 	// Cave creation.
 	if (flags & MG_CAVES)
@@ -391,10 +389,6 @@ void MapgenValleys::calculateNoise()
 	//TimeTaker tcn("actualNoise");
 
 	noise_filler_depth->perlinMap2D(x, z);
-	noise_heat_blend->perlinMap2D(x, z);
-	noise_heat->perlinMap2D(x, z);
-	noise_humidity_blend->perlinMap2D(x, z);
-	noise_humidity->perlinMap2D(x, z);
 	noise_inter_valley_slope->perlinMap2D(x, z);
 	noise_rivers->perlinMap2D(x, z);
 	noise_terrain_height->perlinMap2D(x, z);
@@ -418,9 +412,8 @@ void MapgenValleys::calculateNoise()
 	}
 
 	for (s32 index = 0; index < csize.X * csize.Z; index++) {
-		noise_heat->result[index] += noise_heat_blend->result[index] + heat_offset;
-		noise_humidity->result[index] *= humidity_scale;
-		noise_humidity->result[index] += noise_humidity_blend->result[index];
+		m_bgen->heatmap[index] += heat_offset;
+		m_bgen->humidmap[index] *= humidity_scale;
 	}
 
 	TerrainNoise tn;
@@ -450,9 +443,6 @@ void MapgenValleys::calculateNoise()
 		float mount = terrainLevelFromNoise(&tn);
 		noise_terrain_height->result[index] = mount;
 	}
-
-	heatmap  = noise_heat->result;
-	humidmap = noise_humidity->result;
 }
 
 
@@ -596,7 +586,7 @@ int MapgenValleys::generateTerrain()
 		float river_y = noise_rivers->result[index_2d];
 		float surface_y = noise_terrain_height->result[index_2d];
 		float slope = noise_inter_valley_slope->result[index_2d];
-		float t_heat = noise_heat->result[index_2d];
+		float t_heat = m_bgen->heatmap[index_2d];
 
 		heightmap[index_2d] = -MAX_MAP_GENERATION_LIMIT;
 
@@ -610,7 +600,7 @@ int MapgenValleys::generateTerrain()
 				t_heat -= alt_to_heat * MYMAX(surface_y, river_y) / altitude_chill;
 
 			// If humidity is low or heat is high, lower the water table.
-			float delta = noise_humidity->result[index_2d] - 50.f;
+			float delta = m_bgen->humidmap[index_2d] - 50.f;
 			if (delta < 0.f) {
 				float t_evap = (t_heat - 32.f) / evaporation;
 				river_y += delta * MYMAX(t_evap, 0.08f);
@@ -672,7 +662,7 @@ int MapgenValleys::generateTerrain()
 			// Use base ground (water table) in a riverbed, to
 			// avoid an unnatural rise in humidity.
 			float t_alt = MYMAX(noise_rivers->result[index_2d], (float)heightmap[index_2d]);
-			float humid = noise_humidity->result[index_2d];
+			float humid = m_bgen->humidmap[index_2d];
 			float water_depth = (t_alt - river_y) / humidity_dropoff;
 			humid *= 1.f + pow(0.5f, MYMAX(water_depth, 1.f));
 
@@ -683,7 +673,7 @@ int MapgenValleys::generateTerrain()
 			if (t_alt > 0.f)
 				humid -= alt_to_humid * t_alt / altitude_chill;
 
-			noise_humidity->result[index_2d] = humid;
+			m_bgen->humidmap[index_2d] = humid;
 		}
 
 		// Assign the heat adjusted by any changed altitudes.
@@ -693,9 +683,9 @@ int MapgenValleys::generateTerrain()
 			float t_alt = MYMAX(noise_rivers->result[index_2d], (float)heightmap[index_2d]);
 			if (humid_rivers && heightmap[index_2d] == (s16)myround(surface_y))
 				// The altitude hasn't changed. Use the first result.
-				noise_heat->result[index_2d] = t_heat;
+				m_bgen->heatmap[index_2d] = t_heat;
 			else if (t_alt > 0.f)
-				noise_heat->result[index_2d] -= alt_to_heat * t_alt / altitude_chill;
+				m_bgen->heatmap[index_2d] -= alt_to_heat * t_alt / altitude_chill;
 		}
 	}
 
@@ -703,7 +693,7 @@ int MapgenValleys::generateTerrain()
 }
 
 
-MgStoneType MapgenValleys::generateBiomes(float *heat_map, float *humidity_map)
+MgStoneType MapgenValleys::generateBiomes()
 {
 	v3s16 em = vm->m_area.getExtent();
 	u32 index = 0;
@@ -739,9 +729,9 @@ MgStoneType MapgenValleys::generateBiomes(float *heat_map, float *humidity_map)
 			// 3. When stone or water is detected but biome has not yet been calculated.
 			if ((c == c_stone && (air_above || water_above || !biome))
 					|| ((c == c_water_source || c == c_river_water_source)
-							&& (air_above || !biome))) {
+						&& (air_above || !biome))) {
 				// Both heat and humidity have already been adjusted for altitude.
-				biome = bmgr->getBiome(heat_map[index], humidity_map[index], y);
+				biome = biomegen->getBiomeAtIndex(index, y);
 
 				depth_top = biome->depth_top;
 				base_filler = MYMAX(depth_top
diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index 5224ea54b..0e268c1cf 100644
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MYCUBE(x) (x) * (x) * (x)
 
 class BiomeManager;
+class BiomeGenOriginal;
 
 // Global profiler
 //class Profiler;
@@ -98,6 +99,7 @@ public:
 private:
 	EmergeManager *m_emerge;
 	BiomeManager *bmgr;
+	BiomeGenOriginal *m_bgen;
 
 	int ystride;
 	int zstride;
@@ -136,11 +138,6 @@ private:
 	Noise *noise_valley_depth;
 	Noise *noise_valley_profile;
 
-	Noise *noise_heat;
-	Noise *noise_heat_blend;
-	Noise *noise_humidity;
-	Noise *noise_humidity_blend;
-
 	content_t c_cobble;
 	content_t c_desert_stone;
 	content_t c_dirt;
@@ -164,9 +161,7 @@ private:
 	float terrainLevelFromNoise(TerrainNoise *tn);
 	float adjustedTerrainLevelFromNoise(TerrainNoise *tn);
 
-	float humidityByTerrain(float humidity_base, float mount, float rivers, float valley);
-
-	MgStoneType generateBiomes(float *heat_map, float *humidity_map);
+	MgStoneType generateBiomes();
 	void dustTopNodes();
 
 	void generateCaves(s16 max_stone_y);
diff --git a/src/mg_biome.cpp b/src/mg_biome.cpp
index 9ab8d06cc..dac0f7acc 100644
--- a/src/mg_biome.cpp
+++ b/src/mg_biome.cpp
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "util/mathconstants.h"
 #include "porting.h"
+#include "settings.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -63,49 +64,11 @@ BiomeManager::BiomeManager(IGameDef *gamedef) :
 }
 
 
-
 BiomeManager::~BiomeManager()
 {
-	//if (biomecache)
-	//	delete[] biomecache;
 }
 
 
-
-// just a PoC, obviously needs optimization later on (precalculate this)
-void BiomeManager::calcBiomes(s16 sx, s16 sy, float *heat_map,
-	float *humidity_map, s16 *height_map, u8 *biomeid_map)
-{
-	for (s32 i = 0; i != sx * sy; i++) {
-		Biome *biome = getBiome(heat_map[i], humidity_map[i], height_map[i]);
-		biomeid_map[i] = biome->index;
-	}
-}
-
-
-Biome *BiomeManager::getBiome(float heat, float humidity, s16 y)
-{
-	Biome *b, *biome_closest = NULL;
-	float dist_min = FLT_MAX;
-
-	for (size_t i = 1; i < m_objects.size(); i++) {
-		b = (Biome *)m_objects[i];
-		if (!b || y > b->y_max || y < b->y_min)
-			continue;
-
-		float d_heat     = heat     - b->heat_point;
-		float d_humidity = humidity - b->humidity_point;
-		float dist = (d_heat * d_heat) +
-					 (d_humidity * d_humidity);
-		if (dist < dist_min) {
-			dist_min = dist;
-			biome_closest = b;
-		}
-	}
-
-	return biome_closest ? biome_closest : (Biome *)m_objects[0];
-}
-
 void BiomeManager::clear()
 {
 	EmergeManager *emerge = m_gamedef->getEmergeManager();
@@ -118,17 +81,153 @@ void BiomeManager::clear()
 	}
 
 	// Don't delete the first biome
-	for (size_t i = 1; i < m_objects.size(); i++) {
-		Biome *b = (Biome *)m_objects[i];
-		delete b;
-	}
+	for (size_t i = 1; i < m_objects.size(); i++)
+		delete (Biome *)m_objects[i];
 
 	m_objects.resize(1);
 }
 
+////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////////
 
+void BiomeParamsOriginal::readParams(const Settings *settings)
+{
+	settings->getNoiseParams("mg_biome_np_heat",           np_heat);
+	settings->getNoiseParams("mg_biome_np_heat_blend",     np_heat_blend);
+	settings->getNoiseParams("mg_biome_np_humidity",       np_humidity);
+	settings->getNoiseParams("mg_biome_np_humidity_blend", np_humidity_blend);
+}
+
+
+void BiomeParamsOriginal::writeParams(Settings *settings) const
+{
+	settings->setNoiseParams("mg_biome_np_heat",           np_heat);
+	settings->setNoiseParams("mg_biome_np_heat_blend",     np_heat_blend);
+	settings->setNoiseParams("mg_biome_np_humidity",       np_humidity);
+	settings->setNoiseParams("mg_biome_np_humidity_blend", np_humidity_blend);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+
+BiomeGenOriginal::BiomeGenOriginal(BiomeManager *biomemgr,
+	BiomeParamsOriginal *params, v3s16 chunksize)
+{
+	m_bmgr   = biomemgr;
+	m_params = params;
+	m_csize  = chunksize;
+
+	noise_heat           = new Noise(&params->np_heat,
+									params->seed, m_csize.X, m_csize.Z);
+	noise_humidity       = new Noise(&params->np_humidity,
+									params->seed, m_csize.X, m_csize.Z);
+	noise_heat_blend     = new Noise(&params->np_heat_blend,
+									params->seed, m_csize.X, m_csize.Z);
+	noise_humidity_blend = new Noise(&params->np_humidity_blend,
+									params->seed, m_csize.X, m_csize.Z);
+
+	heatmap  = noise_heat->result;
+	humidmap = noise_humidity->result;
+	biomemap = new u8[m_csize.X * m_csize.Z];
+}
+
+BiomeGenOriginal::~BiomeGenOriginal()
+{
+	delete []biomemap;
+
+	delete noise_heat;
+	delete noise_humidity;
+	delete noise_heat_blend;
+	delete noise_humidity_blend;
+}
+
+
+Biome *BiomeGenOriginal::calcBiomeAtPoint(v3s16 pos) const
+{
+	float heat =
+		NoisePerlin2D(&m_params->np_heat,       pos.X, pos.Z, m_params->seed) +
+		NoisePerlin2D(&m_params->np_heat_blend, pos.X, pos.Z, m_params->seed);
+	float humidity =
+		NoisePerlin2D(&m_params->np_humidity,       pos.X, pos.Z, m_params->seed) +
+		NoisePerlin2D(&m_params->np_humidity_blend, pos.X, pos.Z, m_params->seed);
+
+	return calcBiomeFromNoise(heat, humidity, pos.Y);
+}
+
+
+void BiomeGenOriginal::calcBiomeNoise(v3s16 pmin)
+{
+	m_pmin = pmin;
+
+	noise_heat->perlinMap2D(pmin.X, pmin.Z);
+	noise_humidity->perlinMap2D(pmin.X, pmin.Z);
+	noise_heat_blend->perlinMap2D(pmin.X, pmin.Z);
+	noise_humidity_blend->perlinMap2D(pmin.X, pmin.Z);
+
+	for (s32 i = 0; i < m_csize.X * m_csize.Z; i++) {
+		noise_heat->result[i]     += noise_heat_blend->result[i];
+		noise_humidity->result[i] += noise_humidity_blend->result[i];
+	}
+}
+
+
+u8 *BiomeGenOriginal::getBiomes(s16 *heightmap)
+{
+	for (s32 i = 0; i != m_csize.X * m_csize.Z; i++) {
+		Biome *biome = calcBiomeFromNoise(
+			noise_heat->result[i],
+			noise_humidity->result[i],
+			heightmap[i]);
+
+		biomemap[i] = biome->index;
+	}
+
+	return biomemap;
+}
+
+
+Biome *BiomeGenOriginal::getBiomeAtPoint(v3s16 pos) const
+{
+	return getBiomeAtIndex(
+		(pos.Z - m_pmin.Z) * m_csize.X + (pos.X - m_pmin.X),
+		pos.Y);
+}
+
+
+Biome *BiomeGenOriginal::getBiomeAtIndex(size_t index, s16 y) const
+{
+	return calcBiomeFromNoise(
+		noise_heat->result[index],
+		noise_humidity->result[index],
+		y);
+}
+
+
+Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, s16 y) const
+{
+	Biome *b, *biome_closest = NULL;
+	float dist_min = FLT_MAX;
+
+	for (size_t i = 1; i < m_bmgr->getNumObjects(); i++) {
+		b = (Biome *)m_bmgr->getRaw(i);
+		if (!b || y > b->y_max || y < b->y_min)
+			continue;
+
+		float d_heat     = heat     - b->heat_point;
+		float d_humidity = humidity - b->humidity_point;
+		float dist = (d_heat * d_heat) +
+					 (d_humidity * d_humidity);
+		if (dist < dist_min) {
+			dist_min = dist;
+			biome_closest = b;
+		}
+	}
+
+	return biome_closest ? biome_closest : (Biome *)m_bmgr->getRaw(BIOME_NONE);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
 
 void Biome::resolveNodeNames()
 {
diff --git a/src/mg_biome.h b/src/mg_biome.h
index 8d519f808..e9378fd79 100644
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -22,6 +22,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "objdef.h"
 #include "nodedef.h"
+#include "noise.h"
+
+class Settings;
+class BiomeManager;
+
+////
+//// Biome
+////
+
+#define BIOME_NONE ((u8)0)
 
 enum BiomeType
 {
@@ -56,10 +66,122 @@ public:
 	virtual void resolveNodeNames();
 };
 
+
+////
+//// BiomeGen
+////
+
+enum BiomeGenType {
+	BIOMEGEN_ORIGINAL,
+};
+
+struct BiomeParams {
+	virtual void readParams(const Settings *settings) = 0;
+	virtual void writeParams(Settings *settings) const = 0;
+	virtual ~BiomeParams() {}
+
+	int seed;
+};
+
+class BiomeGen {
+public:
+	virtual ~BiomeGen() {}
+	virtual BiomeGenType getType() const = 0;
+
+	// Calculates the biome at the exact position provided.  This function can
+	// be called at any time, but may be less efficient than the latter methods,
+	// depending on implementation.
+	virtual Biome *calcBiomeAtPoint(v3s16 pos) const = 0;
+
+	// Computes any intermediate results needed for biome generation.  Must be
+	// called before using any of: getBiomes, getBiomeAtPoint, or getBiomeAtIndex.
+	// Calling this invalidates the previous results stored in biomemap.
+	virtual void calcBiomeNoise(v3s16 pmin) = 0;
+
+	// Gets all biomes in current chunk using each corresponding element of
+	// heightmap as the y position, then stores the results by biome index in
+	// biomemap (also returned)
+	virtual u8 *getBiomes(s16 *heightmap) = 0;
+
+	// Gets a single biome at the specified position, which must be contained
+	// in the region formed by m_pmin and (m_pmin + m_csize - 1).
+	virtual Biome *getBiomeAtPoint(v3s16 pos) const = 0;
+
+	// Same as above, but uses a raw numeric index correlating to the (x,z) position.
+	virtual Biome *getBiomeAtIndex(size_t index, s16 y) const = 0;
+
+	// Result of calcBiomes bulk computation.
+	u8 *biomemap;
+
+protected:
+	BiomeManager *m_bmgr;
+	v3s16 m_pmin;
+	v3s16 m_csize;
+};
+
+
+////
+//// BiomeGen implementations
+////
+
+//
+// Original biome algorithm (Whittaker's classification + surface height)
+//
+
+struct BiomeParamsOriginal : public BiomeParams {
+	BiomeParamsOriginal() :
+		np_heat(50, 50, v3f(750.0, 750.0, 750.0), 5349, 3, 0.5, 2.0),
+		np_humidity(50, 50, v3f(750.0, 750.0, 750.0), 842, 3, 0.5, 2.0),
+		np_heat_blend(0, 1.5, v3f(8.0, 8.0, 8.0), 13, 2, 1.0, 2.0),
+		np_humidity_blend(0, 1.5, v3f(8.0, 8.0, 8.0), 90003, 2, 1.0, 2.0)
+	{
+	}
+
+	virtual void readParams(const Settings *settings);
+	virtual void writeParams(Settings *settings) const;
+
+	NoiseParams np_heat;
+	NoiseParams np_humidity;
+	NoiseParams np_heat_blend;
+	NoiseParams np_humidity_blend;
+};
+
+class BiomeGenOriginal : public BiomeGen {
+public:
+	BiomeGenOriginal(BiomeManager *biomemgr,
+		BiomeParamsOriginal *params, v3s16 chunksize);
+	virtual ~BiomeGenOriginal();
+
+	BiomeGenType getType() const { return BIOMEGEN_ORIGINAL; }
+
+	Biome *calcBiomeAtPoint(v3s16 pos) const;
+	void calcBiomeNoise(v3s16 pmin);
+
+	u8 *getBiomes(s16 *heightmap);
+	Biome *getBiomeAtPoint(v3s16 pos) const;
+	Biome *getBiomeAtIndex(size_t index, s16 y) const;
+
+	Biome *calcBiomeFromNoise(float heat, float humidity, s16 y) const;
+
+	float *heatmap;
+	float *humidmap;
+
+private:
+	BiomeParamsOriginal *m_params;
+
+	Noise *noise_heat;
+	Noise *noise_humidity;
+	Noise *noise_heat_blend;
+	Noise *noise_humidity_blend;
+};
+
+
+////
+//// BiomeManager
+////
+
 class BiomeManager : public ObjDefManager {
 public:
-	static const char *OBJECT_TITLE;
-
 	BiomeManager(IGameDef *gamedef);
 	virtual ~BiomeManager();
 
@@ -73,15 +195,36 @@ public:
 		return new Biome;
 	}
 
+	BiomeGen *createBiomeGen(BiomeGenType type, BiomeParams *params, v3s16 chunksize)
+	{
+		switch (type) {
+		case BIOMEGEN_ORIGINAL:
+			return new BiomeGenOriginal(this,
+				(BiomeParamsOriginal *)params, chunksize);
+		default:
+			return NULL;
+		}
+	}
+
+	static BiomeParams *createBiomeParams(BiomeGenType type)
+	{
+		switch (type) {
+		case BIOMEGEN_ORIGINAL:
+			return new BiomeParamsOriginal;
+		default:
+			return NULL;
+		}
+	}
+
 	virtual void clear();
 
-	void calcBiomes(s16 sx, s16 sy, float *heat_map, float *humidity_map,
-		s16 *height_map, u8 *biomeid_map);
-	Biome *getBiome(float heat, float humidity, s16 y);
+	// Looks for pos in the biome cache, and if non-existent, looks up by noise
+	u8 getBiomeAtPoint(v3s16 pos);
 
 private:
 	IGameDef *m_gamedef;
+
 };
 
-#endif
 
+#endif
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index fb839176b..405b93b86 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -528,24 +528,26 @@ int ModApiMapgen::l_get_mapgen_object(lua_State *L)
 		return 1;
 	}
 	case MGOBJ_BIOMEMAP: {
-		if (!mg->biomemap)
+		if (!mg->biomegen)
 			return 0;
 
 		lua_newtable(L);
 		for (size_t i = 0; i != maplen; i++) {
-			lua_pushinteger(L, mg->biomemap[i]);
+			lua_pushinteger(L, mg->biomegen->biomemap[i]);
 			lua_rawseti(L, -2, i + 1);
 		}
 
 		return 1;
 	}
 	case MGOBJ_HEATMAP: {
-		if (!mg->heatmap)
+		if (!mg->biomegen || mg->biomegen->getType() != BIOMEGEN_ORIGINAL)
 			return 0;
 
+		BiomeGenOriginal *bg = (BiomeGenOriginal *)mg->biomegen;
+
 		lua_newtable(L);
 		for (size_t i = 0; i != maplen; i++) {
-			lua_pushnumber(L, mg->heatmap[i]);
+			lua_pushnumber(L, bg->heatmap[i]);
 			lua_rawseti(L, -2, i + 1);
 		}
 
@@ -553,12 +555,14 @@ int ModApiMapgen::l_get_mapgen_object(lua_State *L)
 	}
 
 	case MGOBJ_HUMIDMAP: {
-		if (!mg->humidmap)
+		if (!mg->biomegen || mg->biomegen->getType() != BIOMEGEN_ORIGINAL)
 			return 0;
 
+		BiomeGenOriginal *bg = (BiomeGenOriginal *)mg->biomegen;
+
 		lua_newtable(L);
 		for (size_t i = 0; i != maplen; i++) {
-			lua_pushnumber(L, mg->humidmap[i]);
+			lua_pushnumber(L, bg->humidmap[i]);
 			lua_rawseti(L, -2, i + 1);
 		}
 

From 87bc39dca733a2cc805bc1071794c4d5d7937115 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Mon, 2 May 2016 02:24:57 -0400
Subject: [PATCH 019/418] Mapgen: Combine generateBiomes, dustTopNodes, and
 generateCaves

This commit condenses the above methods into a single implementation used by
V7, V5, Flat, Fractal, and Valleys mapgens and introduces MapgenBasic.
---
 src/mapgen.cpp         | 236 +++++++++++++++++++++++++++++++++++++++++
 src/mapgen.h           |  56 ++++++++++
 src/mapgen_flat.cpp    | 221 +-------------------------------------
 src/mapgen_flat.h      |  29 +----
 src/mapgen_fractal.cpp | 221 +-------------------------------------
 src/mapgen_fractal.h   |  23 +---
 src/mapgen_v5.cpp      | 221 +-------------------------------------
 src/mapgen_v5.h        |  24 +----
 src/mapgen_v7.cpp      | 230 ++-------------------------------------
 src/mapgen_v7.h        |  25 +----
 src/mapgen_valleys.cpp | 165 +---------------------------
 src/mapgen_valleys.h   |  26 +----
 12 files changed, 316 insertions(+), 1161 deletions(-)

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index e269bf454..f491ed9eb 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "filesys.h"
 #include "log.h"
+#include "cavegen.h"
 
 FlagDesc flagdesc_mapgen[] = {
 	{"trees",       MG_TREES},
@@ -369,6 +370,241 @@ void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
 }
 
 
+////
+//// MapgenBasic
+////
+
+MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+	: Mapgen(mapgenid, params, emerge)
+{
+
+}
+
+MgStoneType MapgenBasic::generateBiomes()
+{
+	v3s16 em = vm->m_area.getExtent();
+	u32 index = 0;
+	MgStoneType stone_type = STONE;
+
+	for (s16 z = node_min.Z; z <= node_max.Z; z++)
+	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
+		Biome *biome = NULL;
+		u16 depth_top = 0;
+		u16 base_filler = 0;
+		u16 depth_water_top = 0;
+		u32 vi = vm->m_area.index(x, node_max.Y, z);
+
+		// Check node at base of mapchunk above, either a node of a previously
+		// generated mapchunk or if not, a node of overgenerated base terrain.
+		content_t c_above = vm->m_data[vi + em.X].getContent();
+		bool air_above = c_above == CONTENT_AIR;
+		bool water_above = (c_above == c_water_source || c_above == c_river_water_source);
+
+		// If there is air or water above enable top/filler placement, otherwise force
+		// nplaced to stone level by setting a number exceeding any possible filler depth.
+		u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
+
+		for (s16 y = node_max.Y; y >= node_min.Y; y--) {
+			content_t c = vm->m_data[vi].getContent();
+
+			// Biome is recalculated each time an upper surface is detected while
+			// working down a column. The selected biome then remains in effect for
+			// all nodes below until the next surface and biome recalculation.
+			// Biome is recalculated:
+			// 1. At the surface of stone below air or water.
+			// 2. At the surface of water below air.
+			// 3. When stone or water is detected but biome has not yet been calculated.
+			if ((c == c_stone && (air_above || water_above || !biome))
+					|| ((c == c_water_source || c == c_river_water_source)
+						&& (air_above || !biome))) {
+				biome = biomegen->getBiomeAtIndex(index, y);
+
+				depth_top = biome->depth_top;
+				base_filler = MYMAX(depth_top
+						+ biome->depth_filler
+						+ noise_filler_depth->result[index], 0.f);
+				depth_water_top = biome->depth_water_top;
+
+				// Detect stone type for dungeons during every biome calculation.
+				// This is more efficient than detecting per-node and will not
+				// miss any desert stone or sandstone biomes.
+				if (biome->c_stone == c_desert_stone)
+					stone_type = DESERT_STONE;
+				else if (biome->c_stone == c_sandstone)
+					stone_type = SANDSTONE;
+			}
+
+			if (c == c_stone) {
+				content_t c_below = vm->m_data[vi - em.X].getContent();
+
+				// If the node below isn't solid, make this node stone, so that
+				// any top/filler nodes above are structurally supported.
+				// This is done by aborting the cycle of top/filler placement
+				// immediately by forcing nplaced to stone level.
+				if (c_below == CONTENT_AIR
+						|| c_below == c_water_source
+						|| c_below == c_river_water_source)
+					nplaced = U16_MAX;
+
+				if (nplaced < depth_top) {
+					vm->m_data[vi] = MapNode(biome->c_top);
+					nplaced++;
+				} else if (nplaced < base_filler) {
+					vm->m_data[vi] = MapNode(biome->c_filler);
+					nplaced++;
+				} else {
+					vm->m_data[vi] = MapNode(biome->c_stone);
+				}
+
+				air_above = false;
+				water_above = false;
+			} else if (c == c_water_source) {
+				vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top))
+						? biome->c_water_top : biome->c_water);
+				nplaced = 0;  // Enable top/filler placement for next surface
+				air_above = false;
+				water_above = true;
+			} else if (c == c_river_water_source) {
+				vm->m_data[vi] = MapNode(biome->c_river_water);
+				nplaced = depth_top;  // Enable filler placement for next surface
+				air_above = false;
+				water_above = true;
+			} else if (c == CONTENT_AIR) {
+				nplaced = 0;  // Enable top/filler placement for next surface
+				air_above = true;
+				water_above = false;
+			} else {  // Possible various nodes overgenerated from neighbouring mapchunks
+				nplaced = U16_MAX;  // Disable top/filler placement
+				air_above = false;
+				water_above = false;
+			}
+
+			vm->m_area.add_y(em, vi, -1);
+		}
+	}
+
+	return stone_type;
+}
+
+
+void MapgenBasic::dustTopNodes()
+{
+	if (node_max.Y < water_level)
+		return;
+
+	v3s16 em = vm->m_area.getExtent();
+	u32 index = 0;
+
+	for (s16 z = node_min.Z; z <= node_max.Z; z++)
+	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
+		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
+
+		if (biome->c_dust == CONTENT_IGNORE)
+			continue;
+
+		u32 vi = vm->m_area.index(x, full_node_max.Y, z);
+		content_t c_full_max = vm->m_data[vi].getContent();
+		s16 y_start;
+
+		if (c_full_max == CONTENT_AIR) {
+			y_start = full_node_max.Y - 1;
+		} else if (c_full_max == CONTENT_IGNORE) {
+			vi = vm->m_area.index(x, node_max.Y + 1, z);
+			content_t c_max = vm->m_data[vi].getContent();
+
+			if (c_max == CONTENT_AIR)
+				y_start = node_max.Y;
+			else
+				continue;
+		} else {
+			continue;
+		}
+
+		vi = vm->m_area.index(x, y_start, z);
+		for (s16 y = y_start; y >= node_min.Y - 1; y--) {
+			if (vm->m_data[vi].getContent() != CONTENT_AIR)
+				break;
+
+			vm->m_area.add_y(em, vi, -1);
+		}
+
+		content_t c = vm->m_data[vi].getContent();
+		if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
+			vm->m_area.add_y(em, vi, 1);
+			vm->m_data[vi] = MapNode(biome->c_dust);
+		}
+	}
+}
+
+
+void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
+{
+	if (max_stone_y < node_min.Y)
+		return;
+
+	noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
+	noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
+
+	v3s16 em = vm->m_area.getExtent();
+	u32 index2d = 0;
+
+	for (s16 z = node_min.Z; z <= node_max.Z; z++)
+	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
+		bool column_is_open = false;  // Is column open to overground
+		bool is_tunnel = false;  // Is tunnel or tunnel floor
+		u32 vi = vm->m_area.index(x, node_max.Y, z);
+		u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride +
+			(x - node_min.X);
+		// Biome of column
+		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]);
+
+		// Don't excavate the overgenerated stone at node_max.Y + 1,
+		// this creates a 'roof' over the tunnel, preventing light in
+		// tunnels at mapchunk borders when generating mapchunks upwards.
+		// This 'roof' is removed when the mapchunk above is generated.
+		for (s16 y = node_max.Y; y >= node_min.Y - 1; y--,
+				index3d -= ystride,
+				vm->m_area.add_y(em, vi, -1)) {
+
+			content_t c = vm->m_data[vi].getContent();
+			if (c == CONTENT_AIR || c == biome->c_water_top ||
+					c == biome->c_water) {
+				column_is_open = true;
+				continue;
+			}
+			// Ground
+			float d1 = contour(noise_cave1->result[index3d]);
+			float d2 = contour(noise_cave2->result[index3d]);
+
+			if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) {
+				// In tunnel and ground content, excavate
+				vm->m_data[vi] = MapNode(CONTENT_AIR);
+				is_tunnel = true;
+			} else {
+				// Not in tunnel or not ground content
+				if (is_tunnel && column_is_open &&
+						(c == biome->c_filler || c == biome->c_stone))
+					// Tunnel entrance floor
+					vm->m_data[vi] = MapNode(biome->c_top);
+
+				column_is_open = false;
+				is_tunnel = false;
+			}
+		}
+	}
+
+	if (node_max.Y > large_cave_depth)
+		return;
+
+	PseudoRandom ps(blockseed + 21343);
+	u32 bruises_count = ps.range(0, 2);
+	for (u32 i = 0; i < bruises_count; i++) {
+		CaveV5 cave(this, &ps);       ////caves version varies  ---- todo- fix this!
+		cave.makeCave(node_min, node_max, max_stone_y);
+	}
+}
+
+
 ////
 //// GenerateNotifier
 ////
diff --git a/src/mapgen.h b/src/mapgen.h
index 554ec6084..bee8e786a 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -46,6 +46,7 @@ extern FlagDesc flagdesc_gennotify[];
 class Biome;
 class BiomeGen;
 struct BiomeParams;
+class BiomeManager;
 class EmergeManager;
 class MapBlock;
 class VoxelManipulator;
@@ -137,6 +138,16 @@ struct MapgenParams {
 	void save(Settings &settings) const;
 };
 
+
+/*
+	Generic interface for map generators.  All mapgens must inherit this class.
+	If a feature exposed by a public member pointer is not supported by a
+	certain mapgen, it must be set to NULL.
+
+	Apart from makeChunk, getGroundLevelAtPoint, and getSpawnLevelAtPoint, all
+	methods can be used by constructing a Mapgen base class and setting the
+	appropriate public members (e.g. vm, ndef, and so on).
+*/
 class Mapgen {
 public:
 	int seed;
@@ -189,6 +200,51 @@ private:
 	DISABLE_CLASS_COPY(Mapgen);
 };
 
+/*
+	MapgenBasic is a Mapgen implementation that handles basic functionality
+	the majority of conventional mapgens will probably want to use, but isn't
+	generic enough to be included as part of the base Mapgen class (such as
+	generating biome terrain over terrain node skeletons, generating caves,
+	dungeons, etc.)
+
+	Inherit MapgenBasic instead of Mapgen to add this basic functionality to
+	your mapgen without having to reimplement it.  Feel free to override any of
+	these methods if you desire different or more advanced behavior.
+
+	Note that you must still create your own generateTerrain implementation when
+	inheriting MapgenBasic.
+*/
+class MapgenBasic : public Mapgen {
+public:
+	EmergeManager *m_emerge;
+	BiomeManager *bmgr;
+
+	Noise *noise_filler_depth;
+	Noise *noise_cave1;
+	Noise *noise_cave2;
+
+	v3s16 node_min;
+	v3s16 node_max;
+	v3s16 full_node_min;
+	v3s16 full_node_max;
+
+	content_t c_stone;
+	content_t c_water_source;
+	content_t c_river_water_source;
+	content_t c_desert_stone;
+	content_t c_sandstone;
+
+	int ystride;
+	int zstride_1d;
+	float cave_width;
+
+	MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+
+	virtual MgStoneType generateBiomes();
+	virtual void dustTopNodes();
+	virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
+};
+
 struct MapgenFactory {
 	virtual Mapgen *createMapgen(int mgid, MapgenParams *params,
 		EmergeManager *emerge) = 0;
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index cb9aa9a8b..97f1c4b2a 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -50,7 +50,7 @@ FlagDesc flagdesc_mapgen_flat[] = {
 
 
 MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge)
-	: Mapgen(mapgenid, params, emerge)
+	: MapgenBasic(mapgenid, params, emerge)
 {
 	this->m_emerge = emerge;
 	this->bmgr     = emerge->biomemgr;
@@ -248,7 +248,7 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 	MgStoneType stone_type = generateBiomes();
 
 	if (flags & MG_CAVES)
-		generateCaves(stone_surface_max_y);
+		generateCaves(stone_surface_max_y, large_cave_depth);
 
 	if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
 		DungeonParams dp;
@@ -381,220 +381,3 @@ s16 MapgenFlat::generateTerrain()
 
 	return stone_surface_max_y;
 }
-
-
-MgStoneType MapgenFlat::generateBiomes()
-{
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-	MgStoneType stone_type = STONE;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = NULL;
-		u16 depth_top = 0;
-		u16 base_filler = 0;
-		u16 depth_water_top = 0;
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-
-		// Check node at base of mapchunk above, either a node of a previously
-		// generated mapchunk or if not, a node of overgenerated base terrain.
-		content_t c_above = vm->m_data[vi + em.X].getContent();
-		bool air_above = c_above == CONTENT_AIR;
-		bool water_above = c_above == c_water_source;
-
-		// If there is air or water above enable top/filler placement, otherwise force
-		// nplaced to stone level by setting a number exceeding any possible filler depth.
-		u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
-
-
-		for (s16 y = node_max.Y; y >= node_min.Y; y--) {
-			content_t c = vm->m_data[vi].getContent();
-
-			// Biome is recalculated each time an upper surface is detected while
-			// working down a column. The selected biome then remains in effect for
-			// all nodes below until the next surface and biome recalculation.
-			// Biome is recalculated:
-			// 1. At the surface of stone below air or water.
-			// 2. At the surface of water below air.
-			// 3. When stone or water is detected but biome has not yet been calculated.
-			if ((c == c_stone && (air_above || water_above || !biome)) ||
-					(c == c_water_source && (air_above || !biome))) {
-				biome = biomegen->getBiomeAtIndex(index, y);
-
-				depth_top = biome->depth_top;
-				base_filler = MYMAX(depth_top + biome->depth_filler
-					+ noise_filler_depth->result[index], 0);
-				depth_water_top = biome->depth_water_top;
-
-				// Detect stone type for dungeons during every biome calculation.
-				// This is more efficient than detecting per-node and will not
-				// miss any desert stone or sandstone biomes.
-				if (biome->c_stone == c_desert_stone)
-					stone_type = DESERT_STONE;
-				else if (biome->c_stone == c_sandstone)
-					stone_type = SANDSTONE;
-			}
-
-			if (c == c_stone) {
-				content_t c_below = vm->m_data[vi - em.X].getContent();
-
-				// If the node below isn't solid, make this node stone, so that
-				// any top/filler nodes above are structurally supported.
-				// This is done by aborting the cycle of top/filler placement
-				// immediately by forcing nplaced to stone level.
-				if (c_below == CONTENT_AIR || c_below == c_water_source)
-					nplaced = U16_MAX;
-
-				if (nplaced < depth_top) {
-					vm->m_data[vi] = MapNode(biome->c_top);
-					nplaced++;
-				} else if (nplaced < base_filler) {
-					vm->m_data[vi] = MapNode(biome->c_filler);
-					nplaced++;
-				} else {
-					vm->m_data[vi] = MapNode(biome->c_stone);
-				}
-
-				air_above = false;
-				water_above = false;
-			} else if (c == c_water_source) {
-				vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top)) ?
-						biome->c_water_top : biome->c_water);
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = false;
-				water_above = true;
-			} else if (c == CONTENT_AIR) {
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = true;
-				water_above = false;
-			} else {  // Possible various nodes overgenerated from neighbouring mapchunks
-				nplaced = U16_MAX;  // Disable top/filler placement
-				air_above = false;
-				water_above = false;
-			}
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-	}
-
-	return stone_type;
-}
-
-
-void MapgenFlat::dustTopNodes()
-{
-	if (node_max.Y < water_level)
-		return;
-
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
-
-		if (biome->c_dust == CONTENT_IGNORE)
-			continue;
-
-		u32 vi = vm->m_area.index(x, full_node_max.Y, z);
-		content_t c_full_max = vm->m_data[vi].getContent();
-		s16 y_start;
-
-		if (c_full_max == CONTENT_AIR) {
-			y_start = full_node_max.Y - 1;
-		} else if (c_full_max == CONTENT_IGNORE) {
-			vi = vm->m_area.index(x, node_max.Y + 1, z);
-			content_t c_max = vm->m_data[vi].getContent();
-
-			if (c_max == CONTENT_AIR)
-				y_start = node_max.Y;
-			else
-				continue;
-		} else {
-			continue;
-		}
-
-		vi = vm->m_area.index(x, y_start, z);
-		for (s16 y = y_start; y >= node_min.Y - 1; y--) {
-			if (vm->m_data[vi].getContent() != CONTENT_AIR)
-				break;
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-
-		content_t c = vm->m_data[vi].getContent();
-		if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
-			vm->m_area.add_y(em, vi, 1);
-			vm->m_data[vi] = MapNode(biome->c_dust);
-		}
-	}
-}
-
-
-void MapgenFlat::generateCaves(s16 max_stone_y)
-{
-	if (max_stone_y < node_min.Y)
-		return;
-
-	noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-	noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-
-	v3s16 em = vm->m_area.getExtent();
-	u32 index2d = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
-		bool column_is_open = false;  // Is column open to overground
-		bool is_tunnel = false;  // Is tunnel or tunnel floor
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-		u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride +
-			(x - node_min.X);
-		// Biome of column
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]);
-
-		// Don't excavate the overgenerated stone at node_max.Y + 1,
-		// this creates a 'roof' over the tunnel, preventing light in
-		// tunnels at mapchunk borders when generating mapchunks upwards.
-		// This 'roof' is removed when the mapchunk above is generated.
-		for (s16 y = node_max.Y; y >= node_min.Y - 1; y--,
-				index3d -= ystride,
-				vm->m_area.add_y(em, vi, -1)) {
-
-			content_t c = vm->m_data[vi].getContent();
-			if (c == CONTENT_AIR || c == biome->c_water_top ||
-					c == biome->c_water) {
-				column_is_open = true;
-				continue;
-			}
-			// Ground
-			float d1 = contour(noise_cave1->result[index3d]);
-			float d2 = contour(noise_cave2->result[index3d]);
-
-			if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) {
-				// In tunnel and ground content, excavate
-				vm->m_data[vi] = MapNode(CONTENT_AIR);
-				is_tunnel = true;
-			} else {
-				// Not in tunnel or not ground content
-				if (is_tunnel && column_is_open &&
-						(c == biome->c_filler || c == biome->c_stone))
-					// Tunnel entrance floor
-					vm->m_data[vi] = MapNode(biome->c_top);
-
-				column_is_open = false;
-				is_tunnel = false;
-			}
-		}
-	}
-
-	if (node_max.Y > large_cave_depth)
-		return;
-
-	PseudoRandom ps(blockseed + 21343);
-	u32 bruises_count = ps.range(0, 2);
-	for (u32 i = 0; i < bruises_count; i++) {
-		CaveV5 cave(this, &ps);
-		cave.makeCave(node_min, node_max, max_stone_y);
-	}
-}
diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h
index 53fd66a67..2b98c1f31 100644
--- a/src/mapgen_flat.h
+++ b/src/mapgen_flat.h
@@ -53,43 +53,19 @@ struct MapgenFlatParams : public MapgenSpecificParams {
 	void writeParams(Settings *settings) const;
 };
 
-class MapgenFlat : public Mapgen {
+class MapgenFlat : public MapgenBasic {
 public:
-	EmergeManager *m_emerge;
-	BiomeManager *bmgr;
-
-	int ystride;
-	int zstride_1d;
-
-	v3s16 node_min;
-	v3s16 node_max;
-	v3s16 full_node_min;
-	v3s16 full_node_max;
-
 	u32 spflags;
 	s16 ground_level;
 	s16 large_cave_depth;
-	float cave_width;
 	float lake_threshold;
 	float lake_steepness;
 	float hill_threshold;
 	float hill_steepness;
 	Noise *noise_terrain;
-	Noise *noise_filler_depth;
-	Noise *noise_cave1;
-	Noise *noise_cave2;
 
-	Noise *noise_heat;
-	Noise *noise_humidity;
-	Noise *noise_heat_blend;
-	Noise *noise_humidity_blend;
-
-	content_t c_stone;
-	content_t c_water_source;
 	content_t c_lava_source;
-	content_t c_desert_stone;
 	content_t c_ice;
-	content_t c_sandstone;
 
 	content_t c_cobble;
 	content_t c_stair_cobble;
@@ -104,9 +80,6 @@ public:
 	int getSpawnLevelAtPoint(v2s16 p);
 	void calculateNoise();
 	s16 generateTerrain();
-	MgStoneType generateBiomes();
-	void dustTopNodes();
-	void generateCaves(s16 max_stone_y);
 };
 
 struct MapgenFactoryFlat : public MapgenFactory {
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index 9671a2143..81e162072 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -48,7 +48,7 @@ FlagDesc flagdesc_mapgen_fractal[] = {
 
 
 MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge)
-	: Mapgen(mapgenid, params, emerge)
+	: MapgenBasic(mapgenid, params, emerge)
 {
 	this->m_emerge = emerge;
 	this->bmgr     = emerge->biomemgr;
@@ -264,7 +264,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
 	MgStoneType stone_type = generateBiomes();
 
 	if (flags & MG_CAVES)
-		generateCaves(stone_surface_max_y);
+		generateCaves(stone_surface_max_y, MGFRACTAL_LARGE_CAVE_DEPTH);
 
 	if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
 		DungeonParams dp;
@@ -505,220 +505,3 @@ s16 MapgenFractal::generateTerrain()
 
 	return stone_surface_max_y;
 }
-
-
-MgStoneType MapgenFractal::generateBiomes()
-{
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-	MgStoneType stone_type = STONE;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = NULL;
-		u16 depth_top = 0;
-		u16 base_filler = 0;
-		u16 depth_water_top = 0;
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-
-		// Check node at base of mapchunk above, either a node of a previously
-		// generated mapchunk or if not, a node of overgenerated base terrain.
-		content_t c_above = vm->m_data[vi + em.X].getContent();
-		bool air_above = c_above == CONTENT_AIR;
-		bool water_above = c_above == c_water_source;
-
-		// If there is air or water above enable top/filler placement, otherwise force
-		// nplaced to stone level by setting a number exceeding any possible filler depth.
-		u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
-
-
-		for (s16 y = node_max.Y; y >= node_min.Y; y--) {
-			content_t c = vm->m_data[vi].getContent();
-
-			// Biome is recalculated each time an upper surface is detected while
-			// working down a column. The selected biome then remains in effect for
-			// all nodes below until the next surface and biome recalculation.
-			// Biome is recalculated:
-			// 1. At the surface of stone below air or water.
-			// 2. At the surface of water below air.
-			// 3. When stone or water is detected but biome has not yet been calculated.
-			if ((c == c_stone && (air_above || water_above || !biome)) ||
-					(c == c_water_source && (air_above || !biome))) {
-				biome = biomegen->getBiomeAtIndex(index, y);
-
-				depth_top = biome->depth_top;
-				base_filler = MYMAX(depth_top + biome->depth_filler
-					+ noise_filler_depth->result[index], 0);
-				depth_water_top = biome->depth_water_top;
-
-				// Detect stone type for dungeons during every biome calculation.
-				// This is more efficient than detecting per-node and will not
-				// miss any desert stone or sandstone biomes.
-				if (biome->c_stone == c_desert_stone)
-					stone_type = DESERT_STONE;
-				else if (biome->c_stone == c_sandstone)
-					stone_type = SANDSTONE;
-			}
-
-			if (c == c_stone) {
-				content_t c_below = vm->m_data[vi - em.X].getContent();
-
-				// If the node below isn't solid, make this node stone, so that
-				// any top/filler nodes above are structurally supported.
-				// This is done by aborting the cycle of top/filler placement
-				// immediately by forcing nplaced to stone level.
-				if (c_below == CONTENT_AIR || c_below == c_water_source)
-					nplaced = U16_MAX;
-
-				if (nplaced < depth_top) {
-					vm->m_data[vi] = MapNode(biome->c_top);
-					nplaced++;
-				} else if (nplaced < base_filler) {
-					vm->m_data[vi] = MapNode(biome->c_filler);
-					nplaced++;
-				} else {
-					vm->m_data[vi] = MapNode(biome->c_stone);
-				}
-
-				air_above = false;
-				water_above = false;
-			} else if (c == c_water_source) {
-				vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top)) ?
-						biome->c_water_top : biome->c_water);
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = false;
-				water_above = true;
-			} else if (c == CONTENT_AIR) {
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = true;
-				water_above = false;
-			} else {  // Possible various nodes overgenerated from neighbouring mapchunks
-				nplaced = U16_MAX;  // Disable top/filler placement
-				air_above = false;
-				water_above = false;
-			}
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-	}
-
-	return stone_type;
-}
-
-
-void MapgenFractal::dustTopNodes()
-{
-	if (node_max.Y < water_level)
-		return;
-
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
-
-		if (biome->c_dust == CONTENT_IGNORE)
-			continue;
-
-		u32 vi = vm->m_area.index(x, full_node_max.Y, z);
-		content_t c_full_max = vm->m_data[vi].getContent();
-		s16 y_start;
-
-		if (c_full_max == CONTENT_AIR) {
-			y_start = full_node_max.Y - 1;
-		} else if (c_full_max == CONTENT_IGNORE) {
-			vi = vm->m_area.index(x, node_max.Y + 1, z);
-			content_t c_max = vm->m_data[vi].getContent();
-
-			if (c_max == CONTENT_AIR)
-				y_start = node_max.Y;
-			else
-				continue;
-		} else {
-			continue;
-		}
-
-		vi = vm->m_area.index(x, y_start, z);
-		for (s16 y = y_start; y >= node_min.Y - 1; y--) {
-			if (vm->m_data[vi].getContent() != CONTENT_AIR)
-				break;
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-
-		content_t c = vm->m_data[vi].getContent();
-		if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
-			vm->m_area.add_y(em, vi, 1);
-			vm->m_data[vi] = MapNode(biome->c_dust);
-		}
-	}
-}
-
-
-void MapgenFractal::generateCaves(s16 max_stone_y)
-{
-	if (max_stone_y < node_min.Y)
-		return;
-
-	noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-	noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-
-	v3s16 em = vm->m_area.getExtent();
-	u32 index2d = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
-		bool column_is_open = false;  // Is column open to overground
-		bool is_tunnel = false;  // Is tunnel or tunnel floor
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-		u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride +
-			(x - node_min.X);
-		// Biome of column
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]);
-
-		// Don't excavate the overgenerated stone at node_max.Y + 1,
-		// this creates a 'roof' over the tunnel, preventing light in
-		// tunnels at mapchunk borders when generating mapchunks upwards.
-		// This 'roof' is removed when the mapchunk above is generated.
-		for (s16 y = node_max.Y; y >= node_min.Y - 1; y--,
-				index3d -= ystride,
-				vm->m_area.add_y(em, vi, -1)) {
-
-			content_t c = vm->m_data[vi].getContent();
-			if (c == CONTENT_AIR || c == biome->c_water_top ||
-					c == biome->c_water) {
-				column_is_open = true;
-				continue;
-			}
-			// Ground
-			float d1 = contour(noise_cave1->result[index3d]);
-			float d2 = contour(noise_cave2->result[index3d]);
-
-			if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) {
-				// In tunnel and ground content, excavate
-				vm->m_data[vi] = MapNode(CONTENT_AIR);
-				is_tunnel = true;
-			} else {
-				// Not in tunnel or not ground content
-				if (is_tunnel && column_is_open &&
-						(c == biome->c_filler || c == biome->c_stone))
-					// Tunnel entrance floor
-					vm->m_data[vi] = MapNode(biome->c_top);
-
-				column_is_open = false;
-				is_tunnel = false;
-			}
-		}
-	}
-
-	if (node_max.Y > MGFRACTAL_LARGE_CAVE_DEPTH)
-		return;
-
-	PseudoRandom ps(blockseed + 21343);
-	u32 bruises_count = ps.range(0, 2);
-	for (u32 i = 0; i < bruises_count; i++) {
-		CaveV5 cave(this, &ps);
-		cave.makeCave(node_min, node_max, max_stone_y);
-	}
-}
diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index a0e51b2c6..176885d46 100644
--- a/src/mapgen_fractal.h
+++ b/src/mapgen_fractal.h
@@ -57,23 +57,12 @@ struct MapgenFractalParams : public MapgenSpecificParams {
 	void writeParams(Settings *settings) const;
 };
 
-class MapgenFractal : public Mapgen {
+class MapgenFractal : public MapgenBasic {
 public:
-	EmergeManager *m_emerge;
-	BiomeManager *bmgr;
-
-	int ystride;
-	int zstride_1d;
 	u16 formula;
 	bool julia;
 
-	v3s16 node_min;
-	v3s16 node_max;
-	v3s16 full_node_min;
-	v3s16 full_node_max;
-
 	u32 spflags;
-	float cave_width;
 	u16 fractal;
 	u16 iterations;
 	v3f scale;
@@ -84,16 +73,9 @@ public:
 	float julia_z;
 	float julia_w;
 	Noise *noise_seabed;
-	Noise *noise_filler_depth;
-	Noise *noise_cave1;
-	Noise *noise_cave2;
 
-	content_t c_stone;
-	content_t c_water_source;
 	content_t c_lava_source;
-	content_t c_desert_stone;
 	content_t c_ice;
-	content_t c_sandstone;
 
 	content_t c_cobble;
 	content_t c_stair_cobble;
@@ -109,9 +91,6 @@ public:
 	void calculateNoise();
 	bool getFractalAtPoint(s16 x, s16 y, s16 z);
 	s16 generateTerrain();
-	MgStoneType generateBiomes();
-	void dustTopNodes();
-	void generateCaves(s16 max_stone_y);
 };
 
 struct MapgenFactoryFractal : public MapgenFactory {
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 829a1f432..7698af825 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -46,7 +46,7 @@ FlagDesc flagdesc_mapgen_v5[] = {
 
 
 MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
-	: Mapgen(mapgenid, params, emerge)
+	: MapgenBasic(mapgenid, params, emerge)
 {
 	this->m_emerge = emerge;
 	this->bmgr     = emerge->biomemgr;
@@ -245,7 +245,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 
 	// Generate caves
 	if ((flags & MG_CAVES) && (stone_surface_max_y >= node_min.Y))
-		generateCaves(stone_surface_max_y);
+		generateCaves(stone_surface_max_y, MGV5_LARGE_CAVE_DEPTH);
 
 	// Generate dungeons and desert temples
 	if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
@@ -391,220 +391,3 @@ int MapgenV5::generateBaseTerrain()
 
 	return stone_surface_max_y;
 }
-
-
-MgStoneType MapgenV5::generateBiomes()
-{
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-	MgStoneType stone_type = STONE;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = NULL;
-		u16 depth_top = 0;
-		u16 base_filler = 0;
-		u16 depth_water_top = 0;
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-
-		// Check node at base of mapchunk above, either a node of a previously
-		// generated mapchunk or if not, a node of overgenerated base terrain.
-		content_t c_above = vm->m_data[vi + em.X].getContent();
-		bool air_above = c_above == CONTENT_AIR;
-		bool water_above = c_above == c_water_source;
-
-		// If there is air or water above enable top/filler placement, otherwise force
-		// nplaced to stone level by setting a number exceeding any possible filler depth.
-		u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
-
-		for (s16 y = node_max.Y; y >= node_min.Y; y--) {
-			content_t c = vm->m_data[vi].getContent();
-
-			// Biome is recalculated each time an upper surface is detected while
-			// working down a column. The selected biome then remains in effect for
-			// all nodes below until the next surface and biome recalculation.
-			// Biome is recalculated:
-			// 1. At the surface of stone below air or water.
-			// 2. At the surface of water below air.
-			// 3. When stone or water is detected but biome has not yet been calculated.
-			if ((c == c_stone && (air_above || water_above || !biome)) ||
-					(c == c_water_source && (air_above || !biome))) {
-				biome = biomegen->getBiomeAtIndex(index, y);
-
-				depth_top = biome->depth_top;
-				base_filler = MYMAX(depth_top + biome->depth_filler
-						+ noise_filler_depth->result[index], 0);
-				depth_water_top = biome->depth_water_top;
-
-				// Detect stone type for dungeons during every biome calculation.
-				// This is more efficient than detecting per-node and will not
-				// miss any desert stone or sandstone biomes.
-				if (biome->c_stone == c_desert_stone)
-					stone_type = DESERT_STONE;
-				else if (biome->c_stone == c_sandstone)
-					stone_type = SANDSTONE;
-			}
-
-			if (c == c_stone) {
-				content_t c_below = vm->m_data[vi - em.X].getContent();
-
-				// If the node below isn't solid, make this node stone, so that
-				// any top/filler nodes above are structurally supported.
-				// This is done by aborting the cycle of top/filler placement
-				// immediately by forcing nplaced to stone level.
-				if (c_below == CONTENT_AIR || c_below == c_water_source)
-					nplaced = U16_MAX;
-
-				if (nplaced < depth_top) {
-					vm->m_data[vi] = MapNode(biome->c_top);
-					nplaced++;
-				} else if (nplaced < base_filler) {
-					vm->m_data[vi] = MapNode(biome->c_filler);
-					nplaced++;
-				} else {
-					vm->m_data[vi] = MapNode(biome->c_stone);
-				}
-
-				air_above = false;
-				water_above = false;
-			} else if (c == c_water_source) {
-				vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top)) ?
-						biome->c_water_top : biome->c_water);
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = false;
-				water_above = true;
-			} else if (c == CONTENT_AIR) {
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = true;
-				water_above = false;
-			} else {  // Possible various nodes overgenerated from neighbouring mapchunks
-				nplaced = U16_MAX;  // Disable top/filler placement
-				air_above = false;
-				water_above = false;
-			}
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-	}
-
-	return stone_type;
-}
-
-
-void MapgenV5::dustTopNodes()
-{
-	if (node_max.Y < water_level)
-		return;
-
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
-
-		if (biome->c_dust == CONTENT_IGNORE)
-			continue;
-
-		u32 vi = vm->m_area.index(x, full_node_max.Y, z);
-		content_t c_full_max = vm->m_data[vi].getContent();
-		s16 y_start;
-
-		if (c_full_max == CONTENT_AIR) {
-			y_start = full_node_max.Y - 1;
-		} else if (c_full_max == CONTENT_IGNORE) {
-			vi = vm->m_area.index(x, node_max.Y + 1, z);
-			content_t c_max = vm->m_data[vi].getContent();
-
-			if (c_max == CONTENT_AIR)
-				y_start = node_max.Y;
-			else
-				continue;
-		} else {
-			continue;
-		}
-
-		vi = vm->m_area.index(x, y_start, z);
-		for (s16 y = y_start; y >= node_min.Y - 1; y--) {
-			if (vm->m_data[vi].getContent() != CONTENT_AIR)
-				break;
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-
-		content_t c = vm->m_data[vi].getContent();
-		if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
-			vm->m_area.add_y(em, vi, 1);
-			vm->m_data[vi] = MapNode(biome->c_dust);
-		}
-	}
-}
-
-
-void MapgenV5::generateCaves(int max_stone_y)
-{
-	if (max_stone_y < node_min.Y)
-		return;
-
-	noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-	noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-
-	v3s16 em = vm->m_area.getExtent();
-	u32 index2d = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
-		bool column_is_open = false;  // Is column open to overground
-		bool is_tunnel = false;  // Is tunnel or tunnel floor
-		// Indexes at column top (node_max.Y)
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-		u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride +
-			(x - node_min.X);
-		// Biome of column
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]);
-
-		// Don't excavate the overgenerated stone at node_max.Y + 1,
-		// this creates a 'roof' over the tunnel, preventing light in
-		// tunnels at mapchunk borders when generating mapchunks upwards.
-		// This 'roof' is removed when the mapchunk above is generated.
-		for (s16 y = node_max.Y; y >= node_min.Y - 1; y--,
-				index3d -= ystride,
-				vm->m_area.add_y(em, vi, -1)) {
-
-			content_t c = vm->m_data[vi].getContent();
-			if (c == CONTENT_AIR || c == biome->c_water_top ||
-					c == biome->c_water) {
-				column_is_open = true;
-				continue;
-			}
-			// Ground
-			float d1 = contour(noise_cave1->result[index3d]);
-			float d2 = contour(noise_cave2->result[index3d]);
-
-			if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) {
-				// In tunnel and ground content, excavate
-				vm->m_data[vi] = MapNode(CONTENT_AIR);
-				is_tunnel = true;
-			} else {
-				// Not in tunnel or not ground content
-				if (is_tunnel && column_is_open &&
-						(c == biome->c_filler || c == biome->c_stone))
-					// Tunnel entrance floor
-					vm->m_data[vi] = MapNode(biome->c_top);
-
-				column_is_open = false;
-				is_tunnel = false;
-			}
-		}
-	}
-
-	if (node_max.Y > MGV5_LARGE_CAVE_DEPTH)
-		return;
-
-	PseudoRandom ps(blockseed + 21343);
-	u32 bruises_count = ps.range(0, 2);
-	for (u32 i = 0; i < bruises_count; i++) {
-		CaveV5 cave(this, &ps);
-		cave.makeCave(node_min, node_max, max_stone_y);
-	}
-}
diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index eef3da617..99836b23e 100644
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -48,34 +48,15 @@ struct MapgenV5Params : public MapgenSpecificParams {
 };
 
 
-class MapgenV5 : public Mapgen {
+class MapgenV5 : public MapgenBasic {
 public:
-	EmergeManager *m_emerge;
-	BiomeManager *bmgr;
-
-	int ystride;
-	int zstride_1d;
-
-	v3s16 node_min;
-	v3s16 node_max;
-	v3s16 full_node_min;
-	v3s16 full_node_max;
-
 	u32 spflags;
-	float cave_width;
-	Noise *noise_filler_depth;
 	Noise *noise_factor;
 	Noise *noise_height;
-	Noise *noise_cave1;
-	Noise *noise_cave2;
 	Noise *noise_ground;
 
-	content_t c_stone;
-	content_t c_water_source;
 	content_t c_lava_source;
-	content_t c_desert_stone;
 	content_t c_ice;
-	content_t c_sandstone;
 
 	content_t c_cobble;
 	content_t c_stair_cobble;
@@ -90,9 +71,6 @@ public:
 	int getSpawnLevelAtPoint(v2s16 p);
 	void calculateNoise();
 	int generateBaseTerrain();
-	MgStoneType generateBiomes();
-	void generateCaves(int max_stone_y);
-	void dustTopNodes();
 };
 
 
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index fddb34682..ee609bc95 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -51,7 +51,7 @@ FlagDesc flagdesc_mapgen_v7[] = {
 
 
 MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
-	: Mapgen(mapgenid, params, emerge)
+	: MapgenBasic(mapgenid, params, emerge)
 {
 	this->m_emerge = emerge;
 	this->bmgr     = emerge->biomemgr;
@@ -276,7 +276,7 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 	MgStoneType stone_type = generateBiomes();
 
 	if (flags & MG_CAVES)
-		generateCaves(stone_surface_max_y);
+		generateCaves(stone_surface_max_y, water_level);
 
 	if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
 		DungeonParams dp;
@@ -517,225 +517,13 @@ void MapgenV7::generateRidgeTerrain()
 }
 
 
-MgStoneType MapgenV7::generateBiomes()
-{
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-	MgStoneType stone_type = STONE;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = NULL;
-		u16 depth_top = 0;
-		u16 base_filler = 0;
-		u16 depth_water_top = 0;
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-
-		// Check node at base of mapchunk above, either a node of a previously
-		// generated mapchunk or if not, a node of overgenerated base terrain.
-		content_t c_above = vm->m_data[vi + em.X].getContent();
-		bool air_above = c_above == CONTENT_AIR;
-		bool water_above = c_above == c_water_source;
-
-		// If there is air or water above enable top/filler placement, otherwise force
-		// nplaced to stone level by setting a number exceeding any possible filler depth.
-		u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
-
-		for (s16 y = node_max.Y; y >= node_min.Y; y--) {
-			content_t c = vm->m_data[vi].getContent();
-
-			// Biome is recalculated each time an upper surface is detected while
-			// working down a column. The selected biome then remains in effect for
-			// all nodes below until the next surface and biome recalculation.
-			// Biome is recalculated:
-			// 1. At the surface of stone below air or water.
-			// 2. At the surface of water below air.
-			// 3. When stone or water is detected but biome has not yet been calculated.
-			if ((c == c_stone && (air_above || water_above || !biome)) ||
-					(c == c_water_source && (air_above || !biome))) {
-				biome = biomegen->getBiomeAtIndex(index, y);
-
-				depth_top = biome->depth_top;
-				base_filler = MYMAX(depth_top + biome->depth_filler
-						+ noise_filler_depth->result[index], 0);
-				depth_water_top = biome->depth_water_top;
-
-				// Detect stone type for dungeons during every biome calculation.
-				// This is more efficient than detecting per-node and will not
-				// miss any desert stone or sandstone biomes.
-				if (biome->c_stone == c_desert_stone)
-					stone_type = DESERT_STONE;
-				else if (biome->c_stone == c_sandstone)
-					stone_type = SANDSTONE;
-			}
-
-			if (c == c_stone) {
-				content_t c_below = vm->m_data[vi - em.X].getContent();
-
-				// If the node below isn't solid, make this node stone, so that
-				// any top/filler nodes above are structurally supported.
-				// This is done by aborting the cycle of top/filler placement
-				// immediately by forcing nplaced to stone level.
-				if (c_below == CONTENT_AIR || c_below == c_water_source)
-					nplaced = U16_MAX;
-
-				if (nplaced < depth_top) {
-					vm->m_data[vi] = MapNode(biome->c_top);
-					nplaced++;
-				} else if (nplaced < base_filler) {
-					vm->m_data[vi] = MapNode(biome->c_filler);
-					nplaced++;
-				} else {
-					vm->m_data[vi] = MapNode(biome->c_stone);
-				}
-
-				air_above = false;
-				water_above = false;
-			} else if (c == c_water_source) {
-				vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top)) ?
-						biome->c_water_top : biome->c_water);
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = false;
-				water_above = true;
-			} else if (c == CONTENT_AIR) {
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = true;
-				water_above = false;
-			} else {  // Possible various nodes overgenerated from neighbouring mapchunks
-				nplaced = U16_MAX;  // Disable top/filler placement
-				air_above = false;
-				water_above = false;
-			}
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-	}
-
-	return stone_type;
-}
-
-
-void MapgenV7::dustTopNodes()
-{
-	if (node_max.Y < water_level)
-		return;
-
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
-
-		if (biome->c_dust == CONTENT_IGNORE)
-			continue;
-
-		u32 vi = vm->m_area.index(x, full_node_max.Y, z);
-		content_t c_full_max = vm->m_data[vi].getContent();
-		s16 y_start;
-
-		if (c_full_max == CONTENT_AIR) {
-			y_start = full_node_max.Y - 1;
-		} else if (c_full_max == CONTENT_IGNORE) {
-			vi = vm->m_area.index(x, node_max.Y + 1, z);
-			content_t c_max = vm->m_data[vi].getContent();
-
-			if (c_max == CONTENT_AIR)
-				y_start = node_max.Y;
-			else
-				continue;
-		} else {
-			continue;
-		}
-
-		vi = vm->m_area.index(x, y_start, z);
-		for (s16 y = y_start; y >= node_min.Y - 1; y--) {
-			if (vm->m_data[vi].getContent() != CONTENT_AIR)
-				break;
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-
-		content_t c = vm->m_data[vi].getContent();
-		if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
-			vm->m_area.add_y(em, vi, 1);
-			vm->m_data[vi] = MapNode(biome->c_dust);
-		}
-	}
-}
-
-
-void MapgenV7::generateCaves(s16 max_stone_y)
-{
-	if (max_stone_y < node_min.Y)
-		return;
-
-	noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-	noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-
-	v3s16 em = vm->m_area.getExtent();
-	u32 index2d = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
-		bool column_is_open = false;  // Is column open to overground
-		bool is_tunnel = false;  // Is tunnel or tunnel floor
-		// Indexes at column top (node_max.Y)
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-		u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride +
-			(x - node_min.X);
-		// Biome of column
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]);
-
-		// Don't excavate the overgenerated stone at node_max.Y + 1,
-		// this creates a 'roof' over the tunnel, preventing light in
-		// tunnels at mapchunk borders when generating mapchunks upwards.
-		// This 'roof' is removed when the mapchunk above is generated.
-		for (s16 y = node_max.Y; y >= node_min.Y - 1; y--,
-				index3d -= ystride,
-				vm->m_area.add_y(em, vi, -1)) {
-
-			content_t c = vm->m_data[vi].getContent();
-			if (c == CONTENT_AIR || c == biome->c_water_top ||
-					c == biome->c_water) {
-				column_is_open = true;
-				continue;
-			}
-			// Ground
-			float d1 = contour(noise_cave1->result[index3d]);
-			float d2 = contour(noise_cave2->result[index3d]);
-
-			if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) {
-				// In tunnel and ground content, excavate
-				vm->m_data[vi] = MapNode(CONTENT_AIR);
-				is_tunnel = true;
-			} else {
-				// Not in tunnel or not ground content
-				if (is_tunnel && column_is_open &&
-						(c == biome->c_filler || c == biome->c_stone))
-					// Tunnel entrance floor
-					vm->m_data[vi] = MapNode(biome->c_top);
-
-				column_is_open = false;
-				is_tunnel = false;
-			}
-		}
-	}
-
-	if (node_min.Y >= water_level)
-		return;
-
-	PseudoRandom ps(blockseed + 21343);
-	u32 bruises_count = ps.range(0, 2);
-	for (u32 i = 0; i < bruises_count; i++) {
-		CaveV7 cave(this, &ps);
-		cave.makeCave(node_min, node_max, max_stone_y);
-	}
-}
-
-
-///////////////////////////////////////////////////////////////
-
+////////////////////////////////////////////////////////////////////////////////
+//// Code Boneyard
+////
+//// Much of the stuff here has potential to become useful again at some point
+//// in the future, but we don't want it to get lost or forgotten in version
+//// control.
+////
 
 #if 0
 int MapgenV7::generateMountainTerrain(s16 ymax)
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index a8dd9986d..21beab2b4 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -54,42 +54,24 @@ struct MapgenV7Params : public MapgenSpecificParams {
 	void writeParams(Settings *settings) const;
 };
 
-class MapgenV7 : public Mapgen {
+class MapgenV7 : public MapgenBasic {
 public:
-	EmergeManager *m_emerge;
-	BiomeManager *bmgr;
-
-	int ystride;
 	int zstride_1u1d;
-	int zstride_1d;
-
-	v3s16 node_min;
-	v3s16 node_max;
-	v3s16 full_node_min;
-	v3s16 full_node_max;
 
 	s16 *ridge_heightmap;
 
 	u32 spflags;
-	float cave_width;
 	Noise *noise_terrain_base;
 	Noise *noise_terrain_alt;
 	Noise *noise_terrain_persist;
 	Noise *noise_height_select;
-	Noise *noise_filler_depth;
 	Noise *noise_mount_height;
 	Noise *noise_ridge_uwater;
 	Noise *noise_mountain;
 	Noise *noise_ridge;
-	Noise *noise_cave1;
-	Noise *noise_cave2;
 
-	content_t c_stone;
-	content_t c_water_source;
 	content_t c_lava_source;
-	content_t c_desert_stone;
 	content_t c_ice;
-	content_t c_sandstone;
 
 	content_t c_cobble;
 	content_t c_stair_cobble;
@@ -112,11 +94,6 @@ public:
 
 	int generateTerrain();
 	void generateRidgeTerrain();
-
-	MgStoneType generateBiomes();
-	void dustTopNodes();
-
-	void generateCaves(s16 max_stone_y);
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 44083d9d3..fa790677a 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -65,7 +65,7 @@ static FlagDesc flagdesc_mapgen_valleys[] = {
 
 
 MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge)
-	: Mapgen(mapgenid, params, emerge)
+	: MapgenBasic(mapgenid, params, emerge)
 {
 	this->m_emerge = emerge;
 	this->bmgr     = emerge->biomemgr;
@@ -302,7 +302,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
 
 	// Cave creation.
 	if (flags & MG_CAVES)
-		generateCaves(stone_surface_max_y);
+		generateCaves(stone_surface_max_y, large_cave_depth);
 
 	// Dungeon creation
 	if ((flags & MG_DUNGEONS) && node_max.Y < 50 && (stone_surface_max_y >= node_min.Y)) {
@@ -692,166 +692,7 @@ int MapgenValleys::generateTerrain()
 	return surface_max_y;
 }
 
-
-MgStoneType MapgenValleys::generateBiomes()
-{
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-	MgStoneType stone_type = STONE;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = NULL;
-		u16 depth_top = 0;
-		u16 base_filler = 0;
-		u16 depth_water_top = 0;
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-
-		// Check node at base of mapchunk above, either a node of a previously
-		// generated mapchunk or if not, a node of overgenerated base terrain.
-		content_t c_above = vm->m_data[vi + em.X].getContent();
-		bool air_above = c_above == CONTENT_AIR;
-		bool water_above = (c_above == c_water_source || c_above == c_river_water_source);
-
-		// If there is air or water above enable top/filler placement, otherwise force
-		// nplaced to stone level by setting a number exceeding any possible filler depth.
-		u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
-
-		for (s16 y = node_max.Y; y >= node_min.Y; y--) {
-			content_t c = vm->m_data[vi].getContent();
-
-			// Biome is recalculated each time an upper surface is detected while
-			// working down a column. The selected biome then remains in effect for
-			// all nodes below until the next surface and biome recalculation.
-			// Biome is recalculated:
-			// 1. At the surface of stone below air or water.
-			// 2. At the surface of water below air.
-			// 3. When stone or water is detected but biome has not yet been calculated.
-			if ((c == c_stone && (air_above || water_above || !biome))
-					|| ((c == c_water_source || c == c_river_water_source)
-						&& (air_above || !biome))) {
-				// Both heat and humidity have already been adjusted for altitude.
-				biome = biomegen->getBiomeAtIndex(index, y);
-
-				depth_top = biome->depth_top;
-				base_filler = MYMAX(depth_top
-						+ biome->depth_filler
-						+ noise_filler_depth->result[index], 0.f);
-				depth_water_top = biome->depth_water_top;
-
-				// Detect stone type for dungeons during every biome calculation.
-				// This is more efficient than detecting per-node and will not
-				// miss any desert stone or sandstone biomes.
-				if (biome->c_stone == c_desert_stone)
-					stone_type = DESERT_STONE;
-				else if (biome->c_stone == c_sandstone)
-					stone_type = SANDSTONE;
-			}
-
-			if (c == c_stone) {
-				content_t c_below = vm->m_data[vi - em.X].getContent();
-
-				// If the node below isn't solid, make this node stone, so that
-				// any top/filler nodes above are structurally supported.
-				// This is done by aborting the cycle of top/filler placement
-				// immediately by forcing nplaced to stone level.
-				if (c_below == CONTENT_AIR
-						|| c_below == c_water_source
-						|| c_below == c_river_water_source)
-					nplaced = U16_MAX;
-
-				if (nplaced < depth_top) {
-					vm->m_data[vi] = MapNode(biome->c_top);
-					nplaced++;
-				} else if (nplaced < base_filler) {
-					vm->m_data[vi] = MapNode(biome->c_filler);
-					nplaced++;
-				} else {
-					vm->m_data[vi] = MapNode(biome->c_stone);
-				}
-
-				air_above = false;
-				water_above = false;
-			} else if (c == c_water_source) {
-				vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top))
-						? biome->c_water_top : biome->c_water);
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = false;
-				water_above = true;
-			} else if (c == c_river_water_source) {
-				vm->m_data[vi] = MapNode(biome->c_river_water);
-				nplaced = depth_top;  // Enable filler placement for next surface
-				air_above = false;
-				water_above = true;
-			} else if (c == CONTENT_AIR) {
-				nplaced = 0;  // Enable top/filler placement for next surface
-				air_above = true;
-				water_above = false;
-			} else {  // Possible various nodes overgenerated from neighbouring mapchunks
-				nplaced = U16_MAX;  // Disable top/filler placement
-				air_above = false;
-				water_above = false;
-			}
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-	}
-
-	return stone_type;
-}
-
-
-void MapgenValleys::dustTopNodes()
-{
-	if (node_max.Y < water_level)
-		return;
-
-	v3s16 em = vm->m_area.getExtent();
-	u32 index = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
-
-		if (biome->c_dust == CONTENT_IGNORE)
-			continue;
-
-		u32 vi = vm->m_area.index(x, full_node_max.Y, z);
-		content_t c_full_max = vm->m_data[vi].getContent();
-		s16 y_start;
-
-		if (c_full_max == CONTENT_AIR) {
-			y_start = full_node_max.Y - 1;
-		} else if (c_full_max == CONTENT_IGNORE) {
-			vi = vm->m_area.index(x, node_max.Y + 1, z);
-			content_t c_max = vm->m_data[vi].getContent();
-
-			if (c_max == CONTENT_AIR)
-				y_start = node_max.Y;
-			else
-				continue;
-		} else {
-			continue;
-		}
-
-		vi = vm->m_area.index(x, y_start, z);
-		for (s16 y = y_start; y >= node_min.Y - 1; y--) {
-			if (vm->m_data[vi].getContent() != CONTENT_AIR)
-				break;
-
-			vm->m_area.add_y(em, vi, -1);
-		}
-
-		content_t c = vm->m_data[vi].getContent();
-		if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
-			vm->m_area.add_y(em, vi, 1);
-			vm->m_data[vi] = MapNode(biome->c_dust);
-		}
-	}
-}
-
-
-void MapgenValleys::generateCaves(s16 max_stone_y)
+void MapgenValleys::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 {
 	if (max_stone_y < node_min.Y)
 		return;
diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index 0e268c1cf..2ab253430 100644
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -85,7 +85,7 @@ struct TerrainNoise {
 	float inter_valley_fill;
 };
 
-class MapgenValleys : public Mapgen {
+class MapgenValleys : public MapgenBasic {
 public:
 
 	MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge);
@@ -97,13 +97,9 @@ public:
 	s16 large_cave_depth;
 
 private:
-	EmergeManager *m_emerge;
-	BiomeManager *bmgr;
 	BiomeGenOriginal *m_bgen;
 
-	int ystride;
 	int zstride;
-	int zstride_1d;
 
 	float map_gen_limit;
 
@@ -113,11 +109,6 @@ private:
 	s16 cave_water_max_height;
 	s16 lava_max_height;
 
-	v3s16 node_min;
-	v3s16 node_max;
-	v3s16 full_node_min;
-	v3s16 full_node_max;
-
 	u32 spflags;
 	float altitude_chill;
 	s16 lava_features_lim;
@@ -126,10 +117,6 @@ private:
 	float river_size_factor;
 	float *tcave_cache;
 	s16 water_features_lim;
-	float cave_width;
-	Noise *noise_filler_depth;
-	Noise *noise_cave1;
-	Noise *noise_cave2;
 	Noise *noise_inter_valley_fill;
 	Noise *noise_inter_valley_slope;
 	Noise *noise_rivers;
@@ -139,19 +126,13 @@ private:
 	Noise *noise_valley_profile;
 
 	content_t c_cobble;
-	content_t c_desert_stone;
 	content_t c_dirt;
-	content_t c_ice;
 	content_t c_lava_source;
 	content_t c_mossycobble;
-	content_t c_river_water_source;
 	content_t c_sand;
-	content_t c_sandstone;
 	content_t c_sandstonebrick;
 	content_t c_stair_cobble;
 	content_t c_stair_sandstonebrick;
-	content_t c_stone;
-	content_t c_water_source;
 
 	float terrainLevelAtPoint(s16 x, s16 z);
 
@@ -161,10 +142,7 @@ private:
 	float terrainLevelFromNoise(TerrainNoise *tn);
 	float adjustedTerrainLevelFromNoise(TerrainNoise *tn);
 
-	MgStoneType generateBiomes();
-	void dustTopNodes();
-
-	void generateCaves(s16 max_stone_y);
+	virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
 };
 
 struct MapgenFactoryValleys : public MapgenFactory {

From 9b5c492be57945c2df63e84ce8dbf057f45b2754 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Mon, 2 May 2016 02:45:59 -0400
Subject: [PATCH 020/418] Fix MgStoneType and BiomeType enum names

---
 src/mapgen.cpp                  |  6 +++---
 src/mapgen.h                    |  6 +++---
 src/mapgen_flat.cpp             |  6 +++---
 src/mapgen_fractal.cpp          |  6 +++---
 src/mapgen_v5.cpp               |  6 +++---
 src/mapgen_v7.cpp               |  6 +++---
 src/mapgen_valleys.cpp          |  6 +++---
 src/mg_biome.h                  | 14 +++++++-------
 src/script/lua_api/l_mapgen.cpp | 12 ++++++------
 9 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index f491ed9eb..01593718b 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -384,7 +384,7 @@ MgStoneType MapgenBasic::generateBiomes()
 {
 	v3s16 em = vm->m_area.getExtent();
 	u32 index = 0;
-	MgStoneType stone_type = STONE;
+	MgStoneType stone_type = MGSTONE_STONE;
 
 	for (s16 z = node_min.Z; z <= node_max.Z; z++)
 	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
@@ -429,9 +429,9 @@ MgStoneType MapgenBasic::generateBiomes()
 				// This is more efficient than detecting per-node and will not
 				// miss any desert stone or sandstone biomes.
 				if (biome->c_stone == c_desert_stone)
-					stone_type = DESERT_STONE;
+					stone_type = MGSTONE_DESERT_STONE;
 				else if (biome->c_stone == c_sandstone)
-					stone_type = SANDSTONE;
+					stone_type = MGSTONE_SANDSTONE;
 			}
 
 			if (c == c_stone) {
diff --git a/src/mapgen.h b/src/mapgen.h
index bee8e786a..3ec148296 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -76,9 +76,9 @@ enum GenNotifyType {
 
 // TODO(hmmmm/paramat): make stone type selection dynamic
 enum MgStoneType {
-	STONE,
-	DESERT_STONE,
-	SANDSTONE,
+	MGSTONE_STONE,
+	MGSTONE_DESERT_STONE,
+	MGSTONE_SANDSTONE,
 };
 
 struct GenNotifyEvent {
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 97f1c4b2a..2cbf9ace0 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -257,7 +257,7 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 		dp.np_density = nparams_dungeon_density;
 		dp.np_wetness = nparams_dungeon_wetness;
 		dp.c_water    = c_water_source;
-		if (stone_type == STONE) {
+		if (stone_type == MGSTONE_STONE) {
 			dp.c_cobble = c_cobble;
 			dp.c_moss   = c_mossycobble;
 			dp.c_stair  = c_stair_cobble;
@@ -267,7 +267,7 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(1, 2, 1);
 			dp.roomsize      = v3s16(0, 0, 0);
 			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == DESERT_STONE) {
+		} else if (stone_type == MGSTONE_DESERT_STONE) {
 			dp.c_cobble = c_desert_stone;
 			dp.c_moss   = c_desert_stone;
 			dp.c_stair  = c_desert_stone;
@@ -277,7 +277,7 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(2, 3, 2);
 			dp.roomsize      = v3s16(2, 5, 2);
 			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == SANDSTONE) {
+		} else if (stone_type == MGSTONE_SANDSTONE) {
 			dp.c_cobble = c_sandstonebrick;
 			dp.c_moss   = c_sandstonebrick;
 			dp.c_stair  = c_sandstonebrick;
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index 81e162072..3217d52e2 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -273,7 +273,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
 		dp.np_density = nparams_dungeon_density;
 		dp.np_wetness = nparams_dungeon_wetness;
 		dp.c_water    = c_water_source;
-		if (stone_type == STONE) {
+		if (stone_type == MGSTONE_STONE) {
 			dp.c_cobble = c_cobble;
 			dp.c_moss   = c_mossycobble;
 			dp.c_stair  = c_stair_cobble;
@@ -283,7 +283,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(1, 2, 1);
 			dp.roomsize      = v3s16(0, 0, 0);
 			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == DESERT_STONE) {
+		} else if (stone_type == MGSTONE_DESERT_STONE) {
 			dp.c_cobble = c_desert_stone;
 			dp.c_moss   = c_desert_stone;
 			dp.c_stair  = c_desert_stone;
@@ -293,7 +293,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(2, 3, 2);
 			dp.roomsize      = v3s16(2, 5, 2);
 			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == SANDSTONE) {
+		} else if (stone_type == MGSTONE_SANDSTONE) {
 			dp.c_cobble = c_sandstonebrick;
 			dp.c_moss   = c_sandstonebrick;
 			dp.c_stair  = c_sandstonebrick;
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 7698af825..6c1441bc2 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -255,7 +255,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 		dp.np_density = nparams_dungeon_density;
 		dp.np_wetness = nparams_dungeon_wetness;
 		dp.c_water    = c_water_source;
-		if (stone_type == STONE) {
+		if (stone_type == MGSTONE_STONE) {
 			dp.c_cobble = c_cobble;
 			dp.c_moss   = c_mossycobble;
 			dp.c_stair  = c_stair_cobble;
@@ -265,7 +265,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(1, 2, 1);
 			dp.roomsize      = v3s16(0, 0, 0);
 			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == DESERT_STONE) {
+		} else if (stone_type == MGSTONE_DESERT_STONE) {
 			dp.c_cobble = c_desert_stone;
 			dp.c_moss   = c_desert_stone;
 			dp.c_stair  = c_desert_stone;
@@ -275,7 +275,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(2, 3, 2);
 			dp.roomsize      = v3s16(2, 5, 2);
 			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == SANDSTONE) {
+		} else if (stone_type == MGSTONE_SANDSTONE) {
 			dp.c_cobble = c_sandstonebrick;
 			dp.c_moss   = c_sandstonebrick;
 			dp.c_stair  = c_sandstonebrick;
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index ee609bc95..e6801a24b 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -285,7 +285,7 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 		dp.np_density = nparams_dungeon_density;
 		dp.np_wetness = nparams_dungeon_wetness;
 		dp.c_water    = c_water_source;
-		if (stone_type == STONE) {
+		if (stone_type == MGSTONE_STONE) {
 			dp.c_cobble = c_cobble;
 			dp.c_moss   = c_mossycobble;
 			dp.c_stair  = c_stair_cobble;
@@ -295,7 +295,7 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(1, 2, 1);
 			dp.roomsize      = v3s16(0, 0, 0);
 			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == DESERT_STONE) {
+		} else if (stone_type == MGSTONE_DESERT_STONE) {
 			dp.c_cobble = c_desert_stone;
 			dp.c_moss   = c_desert_stone;
 			dp.c_stair  = c_desert_stone;
@@ -305,7 +305,7 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(2, 3, 2);
 			dp.roomsize      = v3s16(2, 5, 2);
 			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == SANDSTONE) {
+		} else if (stone_type == MGSTONE_SANDSTONE) {
 			dp.c_cobble = c_sandstonebrick;
 			dp.c_moss   = c_sandstonebrick;
 			dp.c_stair  = c_sandstonebrick;
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index fa790677a..d424ca068 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -312,7 +312,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
 		dp.np_density = nparams_dungeon_density;
 		dp.np_wetness = nparams_dungeon_wetness;
 		dp.c_water    = c_water_source;
-		if (stone_type == STONE) {
+		if (stone_type == MGSTONE_STONE) {
 			dp.c_cobble = c_cobble;
 			dp.c_moss   = c_mossycobble;
 			dp.c_stair  = c_stair_cobble;
@@ -322,7 +322,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(1, 2, 1);
 			dp.roomsize      = v3s16(0, 0, 0);
 			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == DESERT_STONE) {
+		} else if (stone_type == MGSTONE_DESERT_STONE) {
 			dp.c_cobble = c_desert_stone;
 			dp.c_moss   = c_desert_stone;
 			dp.c_stair  = c_desert_stone;
@@ -332,7 +332,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
 			dp.holesize      = v3s16(2, 3, 2);
 			dp.roomsize      = v3s16(2, 5, 2);
 			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == SANDSTONE) {
+		} else if (stone_type == MGSTONE_SANDSTONE) {
 			dp.c_cobble = c_sandstonebrick;
 			dp.c_moss   = c_sandstonebrick;
 			dp.c_stair  = c_sandstonebrick;
diff --git a/src/mg_biome.h b/src/mg_biome.h
index e9378fd79..e78e90e5f 100644
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -33,13 +33,13 @@ class BiomeManager;
 
 #define BIOME_NONE ((u8)0)
 
-enum BiomeType
-{
-	BIOME_NORMAL,
-	BIOME_LIQUID,
-	BIOME_NETHER,
-	BIOME_AETHER,
-	BIOME_FLAT
+// TODO(hmmmm): Decide whether this is obsolete or will be used in the future
+enum BiomeType {
+	BIOMETYPE_NORMAL,
+	BIOMETYPE_LIQUID,
+	BIOMETYPE_NETHER,
+	BIOMETYPE_AETHER,
+	BIOMETYPE_FLAT,
 };
 
 class Biome : public ObjDef, public NodeResolver {
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 405b93b86..6baf217af 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -39,11 +39,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct EnumString ModApiMapgen::es_BiomeTerrainType[] =
 {
-	{BIOME_NORMAL, "normal"},
-	{BIOME_LIQUID, "liquid"},
-	{BIOME_NETHER, "nether"},
-	{BIOME_AETHER, "aether"},
-	{BIOME_FLAT,   "flat"},
+	{BIOMETYPE_NORMAL, "normal"},
+	{BIOMETYPE_LIQUID, "liquid"},
+	{BIOMETYPE_NETHER, "nether"},
+	{BIOMETYPE_AETHER, "aether"},
+	{BIOMETYPE_FLAT,   "flat"},
 	{0, NULL},
 };
 
@@ -371,7 +371,7 @@ Biome *read_biome_def(lua_State *L, int index, INodeDefManager *ndef)
 		return NULL;
 
 	BiomeType biometype = (BiomeType)getenumfield(L, index, "type",
-		ModApiMapgen::es_BiomeTerrainType, BIOME_NORMAL);
+		ModApiMapgen::es_BiomeTerrainType, BIOMETYPE_NORMAL);
 	Biome *b = BiomeManager::create(biometype);
 
 	b->name            = getstringfield_default(L, index, "name", "");

From 1bb5eb1da2c2e34c4413c01b45c63f6a67b214a2 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Tue, 10 May 2016 00:01:37 -0400
Subject: [PATCH 021/418] Cavegen: Merge CaveV5 and CaveV7 into CavesRandomWalk

---
 src/cavegen.cpp        | 270 ++---------------------------------------
 src/cavegen.h          |  57 +--------
 src/mapgen.cpp         |   2 +-
 src/mapgen_valleys.cpp |   2 +-
 4 files changed, 20 insertions(+), 311 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index b8abfbca5..59274101e 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -31,7 +31,7 @@ NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0
 ///////////////////////////////////////// Caves V5
 
 
-CaveV5::CaveV5(Mapgen *mg, PseudoRandom *ps)
+CavesRandomWalk::CavesRandomWalk(Mapgen *mg, PseudoRandom *ps)
 {
 	this->mg             = mg;
 	this->vm             = mg->vm;
@@ -43,7 +43,8 @@ CaveV5::CaveV5(Mapgen *mg, PseudoRandom *ps)
 	c_ice                = ndef->getId("mapgen_ice");
 	this->np_caveliquids = &nparams_caveliquids;
 	this->ystride        = mg->csize.X;
- 
+	this->lava_depth     = DEFAULT_LAVA_DEPTH;
+
 	if (c_ice == CONTENT_IGNORE)
 		c_ice = CONTENT_AIR;
 
@@ -59,7 +60,7 @@ CaveV5::CaveV5(Mapgen *mg, PseudoRandom *ps)
 }
 
 
-void CaveV5::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
+void CavesRandomWalk::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 {
 	node_min = nmin;
 	node_max = nmax;
@@ -84,12 +85,12 @@ void CaveV5::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 	// Limit maximum to area
 	route_y_max = rangelim(route_y_max, 0, ar.Y - 1);
 
-	s16 min = 0;
-		if (node_min.Y < water_level && node_max.Y > water_level) {
-			min = water_level - max_tunnel_diameter/3 - of.Y;
-			route_y_max = water_level + max_tunnel_diameter/3 - of.Y;
-		}
-	route_y_min = ps->range(min, min + max_tunnel_diameter);
+	s16 minpos = 0;
+	if (node_min.Y < water_level && node_max.Y > water_level) {
+		minpos = water_level - max_tunnel_diameter / 3 - of.Y;
+		route_y_max = water_level + max_tunnel_diameter / 3 - of.Y;
+	}
+	route_y_min = ps->range(minpos, minpos + max_tunnel_diameter);
 	route_y_min = rangelim(route_y_min, 0, route_y_max);
 
 	s16 route_start_y_min = route_y_min;
@@ -121,7 +122,7 @@ void CaveV5::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 }
 
 
-void CaveV5::makeTunnel(bool dirswitch)
+void CavesRandomWalk::makeTunnel(bool dirswitch)
 {
 	// Randomize size
 	s16 min_d = min_tunnel_diameter;
@@ -207,7 +208,7 @@ void CaveV5::makeTunnel(bool dirswitch)
 }
 
 
-void CaveV5::carveRoute(v3f vec, float f, bool randomize_xz) 
+void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 {
 	MapNode airnode(CONTENT_AIR);
 	MapNode waternode(c_water_source);
@@ -218,7 +219,7 @@ void CaveV5::carveRoute(v3f vec, float f, bool randomize_xz)
 
 	float nval = NoisePerlin3D(np_caveliquids, startp.X,
 		startp.Y, startp.Z, mg->seed);
-	MapNode liquidnode = (nval < 0.40 && node_max.Y < MGV5_LAVA_DEPTH) ?
+	MapNode liquidnode = (nval < 0.40 && node_max.Y < lava_depth) ?
 		lavanode : waternode;
 
 	v3f fp = orp + vec * f;
@@ -567,248 +568,3 @@ void CaveV6::carveRoute(v3f vec, float f, bool randomize_xz, bool tunnel_above_g
 		}
 	}
 }
-
-
-///////////////////////////////////////// Caves V7
-
-
-CaveV7::CaveV7(MapgenV7 *mg, PseudoRandom *ps)
-{
-	this->mg             = mg;
-	this->vm             = mg->vm;
-	this->ndef           = mg->ndef;
-	this->water_level    = mg->water_level;
-	this->ps             = ps;
-	this->c_water_source = mg->c_water_source;
-	this->c_lava_source  = mg->c_lava_source;
-	this->c_ice          = mg->c_ice;
-	this->np_caveliquids = &nparams_caveliquids;
-
-	dswitchint = ps->range(1, 14);
-	flooded    = ps->range(1, 2) == 2;
-
-	part_max_length_rs  = ps->range(2, 4);
-	tunnel_routepoints  = ps->range(5, ps->range(15, 30));
-	min_tunnel_diameter = 5;
-	max_tunnel_diameter = ps->range(7, ps->range(8, 24));
-
-	large_cave_is_flat = (ps->range(0, 1) == 0);
-}
-
-
-void CaveV7::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
-{
-	node_min = nmin;
-	node_max = nmax;
-	max_stone_y = max_stone_height;
-	main_direction = v3f(0, 0, 0);
-
-	// Allowed route area size in nodes
-	ar = node_max - node_min + v3s16(1, 1, 1);
-	// Area starting point in nodes
-	of = node_min;
-
-	// Allow a bit more
-	//(this should be more than the maximum radius of the tunnel)
-	s16 insure = 10;
-	s16 more = MYMAX(MAP_BLOCKSIZE - max_tunnel_diameter / 2 - insure, 1);
-	ar += v3s16(1,0,1) * more * 2;
-	of -= v3s16(1,0,1) * more;
-
-	route_y_min = 0;
-	// Allow half a diameter + 7 over stone surface
-	route_y_max = -of.Y + max_stone_y + max_tunnel_diameter / 2 + 7;
-
-	// Limit maximum to area
-	route_y_max = rangelim(route_y_max, 0, ar.Y - 1);
-
-	s16 min = 0;
-	if (node_min.Y < water_level && node_max.Y > water_level) {
-		min = water_level - max_tunnel_diameter/3 - of.Y;
-		route_y_max = water_level + max_tunnel_diameter/3 - of.Y;
-	}
-	route_y_min = ps->range(min, min + max_tunnel_diameter);
-	route_y_min = rangelim(route_y_min, 0, route_y_max);
-
-	s16 route_start_y_min = route_y_min;
-	s16 route_start_y_max = route_y_max;
-
-	route_start_y_min = rangelim(route_start_y_min, 0, ar.Y - 1);
-	route_start_y_max = rangelim(route_start_y_max, route_start_y_min, ar.Y - 1);
-
-	// Randomize starting position
-	orp = v3f(
-		(float)(ps->next() % ar.X) + 0.5,
-		(float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5,
-		(float)(ps->next() % ar.Z) + 0.5
-	);
-
-	// Add generation notify begin event
-	v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
-	GenNotifyType notifytype = GENNOTIFY_LARGECAVE_BEGIN;
-	mg->gennotify.addEvent(notifytype, abs_pos);
-
-	// Generate some tunnel starting from orp
-	for (u16 j = 0; j < tunnel_routepoints; j++)
-		makeTunnel(j % dswitchint == 0);
-
-	// Add generation notify end event
-	abs_pos = v3s16(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
-	notifytype = GENNOTIFY_LARGECAVE_END;
-	mg->gennotify.addEvent(notifytype, abs_pos);
-}
-
-
-void CaveV7::makeTunnel(bool dirswitch)
-{
-	// Randomize size
-	s16 min_d = min_tunnel_diameter;
-	s16 max_d = max_tunnel_diameter;
-	rs = ps->range(min_d, max_d);
-	s16 rs_part_max_length_rs = rs * part_max_length_rs;
-
-	v3s16 maxlen;
-	maxlen = v3s16(
-		rs_part_max_length_rs,
-		rs_part_max_length_rs / 2,
-		rs_part_max_length_rs
-	);
-
-	v3f vec;
-	// Jump downward sometimes
-	vec = v3f(
-		(float)(ps->next() % maxlen.X) - (float)maxlen.X / 2,
-		(float)(ps->next() % maxlen.Y) - (float)maxlen.Y / 2,
-		(float)(ps->next() % maxlen.Z) - (float)maxlen.Z / 2
-	);
-
-	// Do not make caves that are above ground.
-	// It is only necessary to check the startpoint and endpoint.
-	v3s16 orpi(orp.X, orp.Y, orp.Z);
-	v3s16 veci(vec.X, vec.Y, vec.Z);
-	v3s16 p;
-
-	p = orpi + veci + of + rs / 2;
-	if (p.Z >= node_min.Z && p.Z <= node_max.Z &&
-			p.X >= node_min.X && p.X <= node_max.X) {
-		u32 index = (p.Z - node_min.Z) * mg->ystride + (p.X - node_min.X);
-		s16 h = mg->ridge_heightmap[index];
-		if (h < p.Y)
-			return;
-	} else if (p.Y > water_level) {
-		return; // If it's not in our heightmap, use a simple heuristic
-	}
-
-	p = orpi + of + rs / 2;
-	if (p.Z >= node_min.Z && p.Z <= node_max.Z &&
-			p.X >= node_min.X && p.X <= node_max.X) {
-		u32 index = (p.Z - node_min.Z) * mg->ystride + (p.X - node_min.X);
-		s16 h = mg->ridge_heightmap[index];
-		if (h < p.Y)
-			return;
-	} else if (p.Y > water_level) {
-		return;
-	}
-
-	vec += main_direction;
-
-	v3f rp = orp + vec;
-	if (rp.X < 0)
-		rp.X = 0;
-	else if (rp.X >= ar.X)
-		rp.X = ar.X - 1;
-
-	if (rp.Y < route_y_min)
-		rp.Y = route_y_min;
-	else if (rp.Y >= route_y_max)
-		rp.Y = route_y_max - 1;
-
-	if (rp.Z < 0)
-		rp.Z = 0;
-	else if (rp.Z >= ar.Z)
-		rp.Z = ar.Z - 1;
-
-	vec = rp - orp;
-
-	float veclen = vec.getLength();
-	if (veclen < 0.05)
-		veclen = 1.0;
-
-	// Every second section is rough
-	bool randomize_xz = (ps->range(1, 2) == 1);
-
-	// Carve routes
-	for (float f = 0; f < 1.0; f += 1.0 / veclen)
-		carveRoute(vec, f, randomize_xz);
-
-	orp = rp;
-}
-
-
-void CaveV7::carveRoute(v3f vec, float f, bool randomize_xz)
-{
-	MapNode airnode(CONTENT_AIR);
-	MapNode waternode(c_water_source);
-	MapNode lavanode(c_lava_source);
-
-	v3s16 startp(orp.X, orp.Y, orp.Z);
-	startp += of;
-
-	float nval = NoisePerlin3D(np_caveliquids, startp.X,
-		startp.Y, startp.Z, mg->seed);
-	MapNode liquidnode = (nval < 0.40 && node_max.Y < MGV7_LAVA_DEPTH) ?
-		lavanode : waternode;
-
-	v3f fp = orp + vec * f;
-	fp.X += 0.1 * ps->range(-10, 10);
-	fp.Z += 0.1 * ps->range(-10, 10);
-	v3s16 cp(fp.X, fp.Y, fp.Z);
-
-	s16 d0 = -rs/2;
-	s16 d1 = d0 + rs;
-	if (randomize_xz) {
-		d0 += ps->range(-1, 1);
-		d1 += ps->range(-1, 1);
-	}
-
-	for (s16 z0 = d0; z0 <= d1; z0++) {
-		s16 si = rs / 2 - MYMAX(0, abs(z0) - rs / 7 - 1);
-		for (s16 x0 = -si - ps->range(0,1); x0 <= si - 1 + ps->range(0,1); x0++) {
-			s16 maxabsxz = MYMAX(abs(x0), abs(z0));
-
-			s16 si2 = rs / 2 - MYMAX(0, maxabsxz - rs / 7 - 1);
-
-			for (s16 y0 = -si2; y0 <= si2; y0++) {
-				if (large_cave_is_flat) {
-					// Make large caves not so tall
-					if (rs > 7 && abs(y0) >= rs / 3)
-						continue;
-				}
-
-				v3s16 p(cp.X + x0, cp.Y + y0, cp.Z + z0);
-				p += of;
-
-				if (vm->m_area.contains(p) == false)
-					continue;
-
-				u32 i = vm->m_area.index(p);
-				content_t c = vm->m_data[i].getContent();
-				if (!ndef->get(c).is_ground_content)
-					continue;
-
-				int full_ymin = node_min.Y - MAP_BLOCKSIZE;
-				int full_ymax = node_max.Y + MAP_BLOCKSIZE;
-
-				if (flooded && full_ymin < water_level &&
-						full_ymax > water_level)
-					vm->m_data[i] = (p.Y <= water_level) ?
-						waternode : airnode;
-				else if (flooded && full_ymax < water_level)
-					vm->m_data[i] = (p.Y < startp.Y - 4) ?
-						liquidnode : airnode;
-				else
-					vm->m_data[i] = airnode;
-			}
-		}
-	}
-}
diff --git a/src/cavegen.h b/src/cavegen.h
index a1124711b..c907fe294 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -21,19 +21,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define CAVEGEN_HEADER
 
 #define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
-#define MGV5_LAVA_DEPTH -256
-#define MGV7_LAVA_DEPTH -256
+#define DEFAULT_LAVA_DEPTH (-256)
 
-class MapgenV5;
 class MapgenV6;
-class MapgenV7;
 
-class CaveV5 {
+class CavesRandomWalk {
 public:
 	Mapgen *mg;
 	MMVManip *vm;
 	INodeDefManager *ndef;
 
+	// variables
+	int lava_depth;
 	NoiseParams *np_caveliquids;
 
 	s16 min_tunnel_diameter;
@@ -67,8 +66,7 @@ public:
 	int water_level;
 	int ystride;
 
-	CaveV5() {}
-	CaveV5(Mapgen *mg, PseudoRandom *ps);
+	CavesRandomWalk(Mapgen *mg, PseudoRandom *ps);
 	void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
 	void makeTunnel(bool dirswitch);
 	void carveRoute(v3f vec, float f, bool randomize_xz);
@@ -118,49 +116,4 @@ public:
 	void carveRoute(v3f vec, float f, bool randomize_xz, bool tunnel_above_ground);
 };
 
-class CaveV7 {
-public:
-	MapgenV7 *mg;
-	MMVManip *vm;
-	INodeDefManager *ndef;
-
-	NoiseParams *np_caveliquids;
-
-	s16 min_tunnel_diameter;
-	s16 max_tunnel_diameter;
-	u16 tunnel_routepoints;
-	int dswitchint;
-	int part_max_length_rs;
-
-	bool large_cave_is_flat;
-	bool flooded;
-
-	s16 max_stone_y;
-	v3s16 node_min;
-	v3s16 node_max;
-
-	v3f orp;  // starting point, relative to caved space
-	v3s16 of; // absolute coordinates of caved space
-	v3s16 ar; // allowed route area
-	s16 rs;   // tunnel radius size
-	v3f main_direction;
-
-	s16 route_y_min;
-	s16 route_y_max;
-
-	PseudoRandom *ps;
-
-	content_t c_water_source;
-	content_t c_lava_source;
-	content_t c_ice;
-
-	int water_level;
-
-	CaveV7() {}
-	CaveV7(MapgenV7 *mg, PseudoRandom *ps);
-	void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
-	void makeTunnel(bool dirswitch);
-	void carveRoute(v3f vec, float f, bool randomize_xz);
-};
-
 #endif
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 01593718b..43ac6e51a 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -599,7 +599,7 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 	PseudoRandom ps(blockseed + 21343);
 	u32 bruises_count = ps.range(0, 2);
 	for (u32 i = 0; i < bruises_count; i++) {
-		CaveV5 cave(this, &ps);       ////caves version varies  ---- todo- fix this!
+		CavesRandomWalk cave(this, &ps);
 		cave.makeCave(node_min, node_max, max_stone_y);
 	}
 }
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index d424ca068..77fa1ed06 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -841,7 +841,7 @@ void MapgenValleys::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 	if (node_max.Y <= large_cave_depth && !made_a_big_one) {
 		u32 bruises_count = ps.range(0, 2);
 		for (u32 i = 0; i < bruises_count; i++) {
-			CaveV5 cave(this, &ps);
+			CavesRandomWalk cave(this, &ps);
 			cave.makeCave(node_min, node_max, max_stone_y);
 		}
 	}

From bf25837617541eee0317e1231abca65233edeb8e Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Tue, 10 May 2016 00:10:59 -0400
Subject: [PATCH 022/418] Cavegen: Rename CaveV6 to CavesV6

- Add comment explaining why it exists
- Remove unused 'flooded' variable
- Rename shadowed variable
- Fix some code style
---
 src/cavegen.cpp   | 49 ++++++++++++++++++++++++-----------------------
 src/cavegen.h     | 19 ++++++++++++++----
 src/mapgen_v6.cpp |  2 +-
 3 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index 59274101e..e6e21be40 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -277,10 +277,12 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 }
 
 
-///////////////////////////////////////// Caves V6
+////
+//// CavesV6
+////
 
-
-CaveV6::CaveV6(MapgenV6 *mg, PseudoRandom *ps, PseudoRandom *ps2, bool is_large_cave)
+CavesV6::CavesV6(MapgenV6 *mg, PseudoRandom *ps, PseudoRandom *ps2,
+	bool is_large_cave)
 {
 	this->mg             = mg;
 	this->vm             = mg->vm;
@@ -295,23 +297,22 @@ CaveV6::CaveV6(MapgenV6 *mg, PseudoRandom *ps, PseudoRandom *ps2, bool is_large_
 	min_tunnel_diameter = 2;
 	max_tunnel_diameter = ps->range(2, 6);
 	dswitchint          = ps->range(1, 14);
-	flooded             = true;
 
 	if (large_cave) {
-		part_max_length_rs  = ps->range(2,4);
-		tunnel_routepoints  = ps->range(5, ps->range(15,30));
+		part_max_length_rs  = ps->range(2, 4);
+		tunnel_routepoints  = ps->range(5, ps->range(15, 30));
 		min_tunnel_diameter = 5;
-		max_tunnel_diameter = ps->range(7, ps->range(8,24));
+		max_tunnel_diameter = ps->range(7, ps->range(8, 24));
 	} else {
-		part_max_length_rs = ps->range(2,9);
-		tunnel_routepoints = ps->range(10, ps->range(15,30));
+		part_max_length_rs = ps->range(2, 9);
+		tunnel_routepoints = ps->range(10, ps->range(15, 30));
 	}
 
-	large_cave_is_flat = (ps->range(0,1) == 0);
+	large_cave_is_flat = (ps->range(0, 1) == 0);
 }
 
 
-void CaveV6::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
+void CavesV6::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 {
 	node_min = nmin;
 	node_max = nmax;
@@ -328,8 +329,8 @@ void CaveV6::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 	const s16 max_spread_amount = MAP_BLOCKSIZE;
 	s16 insure = 10;
 	s16 more = MYMAX(max_spread_amount - max_tunnel_diameter / 2 - insure, 1);
-	ar += v3s16(1,0,1) * more * 2;
-	of -= v3s16(1,0,1) * more;
+	ar += v3s16(1, 0, 1) * more * 2;
+	of -= v3s16(1, 0, 1) * more;
 
 	route_y_min = 0;
 	// Allow half a diameter + 7 over stone surface
@@ -339,20 +340,20 @@ void CaveV6::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 	route_y_max = rangelim(route_y_max, 0, ar.Y - 1);
 
 	if (large_cave) {
-		s16 min = 0;
+		s16 minpos = 0;
 		if (node_min.Y < water_level && node_max.Y > water_level) {
-			min = water_level - max_tunnel_diameter/3 - of.Y;
-			route_y_max = water_level + max_tunnel_diameter/3 - of.Y;
+			minpos = water_level - max_tunnel_diameter / 3 - of.Y;
+			route_y_max = water_level + max_tunnel_diameter / 3 - of.Y;
 		}
-		route_y_min = ps->range(min, min + max_tunnel_diameter);
+		route_y_min = ps->range(minpos, minpos + max_tunnel_diameter);
 		route_y_min = rangelim(route_y_min, 0, route_y_max);
 	}
 
 	s16 route_start_y_min = route_y_min;
 	s16 route_start_y_max = route_y_max;
 
-	route_start_y_min = rangelim(route_start_y_min, 0, ar.Y-1);
-	route_start_y_max = rangelim(route_start_y_max, route_start_y_min, ar.Y-1);
+	route_start_y_min = rangelim(route_start_y_min, 0, ar.Y - 1);
+	route_start_y_max = rangelim(route_start_y_max, route_start_y_min, ar.Y - 1);
 
 	// Randomize starting position
 	orp = v3f(
@@ -379,7 +380,7 @@ void CaveV6::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 }
 
 
-void CaveV6::makeTunnel(bool dirswitch)
+void CavesV6::makeTunnel(bool dirswitch)
 {
 	if (dirswitch && !large_cave) {
 		main_direction = v3f(
@@ -496,7 +497,8 @@ void CaveV6::makeTunnel(bool dirswitch)
 }
 
 
-void CaveV6::carveRoute(v3f vec, float f, bool randomize_xz, bool tunnel_above_ground)
+void CavesV6::carveRoute(v3f vec, float f, bool randomize_xz,
+	bool tunnel_above_ground)
 {
 	MapNode airnode(CONTENT_AIR);
 	MapNode waternode(c_water_source);
@@ -547,11 +549,10 @@ void CaveV6::carveRoute(v3f vec, float f, bool randomize_xz, bool tunnel_above_g
 					int full_ymin = node_min.Y - MAP_BLOCKSIZE;
 					int full_ymax = node_max.Y + MAP_BLOCKSIZE;
 
-					if (flooded && full_ymin < water_level &&
-							full_ymax > water_level) {
+					if (full_ymin < water_level && full_ymax > water_level) {
 						vm->m_data[i] = (p.Y <= water_level) ?
 							waternode : airnode;
-					} else if (flooded && full_ymax < water_level) {
+					} else if (full_ymax < water_level) {
 						vm->m_data[i] = (p.Y < startp.Y - 2) ?
 							lavanode : airnode;
 					} else {
diff --git a/src/cavegen.h b/src/cavegen.h
index c907fe294..b50455c1c 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -72,7 +72,20 @@ public:
 	void carveRoute(v3f vec, float f, bool randomize_xz);
 };
 
-class CaveV6 {
+/*
+	CavesV6 is the original version of caves used with Mapgen V6.
+
+	Though it uses the same fundamental algorithm as CavesRandomWalk, it is made
+	separate to preserve the exact sequence of PseudoRandom calls - any change
+	to this ordering results in the output being radically different.
+	Because caves in Mapgen V6 are responsible for a large portion of the basic
+	terrain shape, modifying this will break our contract of reverse
+	compatibility for a 'stable' mapgen such as V6.
+
+	tl;dr,
+	*** DO NOT TOUCH THIS CLASS UNLESS YOU KNOW WHAT YOU ARE DOING ***
+*/
+class CavesV6 {
 public:
 	MapgenV6 *mg;
 	MMVManip *vm;
@@ -86,7 +99,6 @@ public:
 
 	bool large_cave;
 	bool large_cave_is_flat;
-	bool flooded;
 
 	s16 max_stone_y;
 	v3s16 node_min;
@@ -109,8 +121,7 @@ public:
 
 	int water_level;
 
-	CaveV6() {}
-	CaveV6(MapgenV6 *mg, PseudoRandom *ps, PseudoRandom *ps2, bool large_cave);
+	CavesV6(MapgenV6 *mg, PseudoRandom *ps, PseudoRandom *ps2, bool large_cave);
 	void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
 	void makeTunnel(bool dirswitch);
 	void carveRoute(v3f vec, float f, bool randomize_xz, bool tunnel_above_ground);
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index c389b2ed4..d143f12e9 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -1067,7 +1067,7 @@ void MapgenV6::generateCaves(int max_stone_y)
 
 	for (u32 i = 0; i < caves_count + bruises_count; i++) {
 		bool large_cave = (i >= caves_count);
-		CaveV6 cave(this, &ps, &ps2, large_cave);
+		CavesV6 cave(this, &ps, &ps2, large_cave);
 
 		cave.makeCave(node_min, node_max, max_stone_y);
 	}

From a605d690921670008d605d067f1cf8cd1619def7 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Tue, 10 May 2016 13:21:13 -0400
Subject: [PATCH 023/418] Cavegen: Remove CavesV6 dependency on Mapgen

---
 src/cavegen.cpp   | 113 +++++++++++++++++++++++++++-------------------
 src/cavegen.h     |  39 +++++++++++-----
 src/mapgen_v6.cpp |   7 +--
 3 files changed, 97 insertions(+), 62 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index e6e21be40..bc73b7206 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -27,9 +27,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0);
 
-
-///////////////////////////////////////// Caves V5
-
+////
+//// CavesRandomWalk
+////
 
 CavesRandomWalk::CavesRandomWalk(Mapgen *mg, PseudoRandom *ps)
 {
@@ -262,13 +262,10 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 				int full_ymin = node_min.Y - MAP_BLOCKSIZE;
 				int full_ymax = node_max.Y + MAP_BLOCKSIZE;
 
-				if (flooded && full_ymin < water_level &&
-						full_ymax > water_level)
-					vm->m_data[i] = (p.Y <= water_level) ?
-						waternode : airnode;
+				if (flooded && full_ymin < water_level && full_ymax > water_level)
+					vm->m_data[i] = (p.Y <= water_level) ? waternode : airnode;
 				else if (flooded && full_ymax < water_level)
-					vm->m_data[i] = (p.Y < startp.Y - 4) ?
-						liquidnode : airnode;
+					vm->m_data[i] = (p.Y < startp.Y - 4) ? liquidnode : airnode;
 				else
 					vm->m_data[i] = airnode;
 			}
@@ -281,23 +278,51 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 //// CavesV6
 ////
 
-CavesV6::CavesV6(MapgenV6 *mg, PseudoRandom *ps, PseudoRandom *ps2,
-	bool is_large_cave)
+CavesV6::CavesV6(INodeDefManager *ndef, GenerateNotifier *gennotify,
+	int water_level, content_t water_source, content_t lava_source)
 {
-	this->mg             = mg;
-	this->vm             = mg->vm;
-	this->ndef           = mg->ndef;
-	this->water_level    = mg->water_level;
-	this->large_cave     = is_large_cave;
-	this->ps             = ps;
-	this->ps2            = ps2;
-	this->c_water_source = mg->c_water_source;
-	this->c_lava_source  = mg->c_lava_source;
+	assert(ndef);
 
+	this->ndef        = ndef;
+	this->gennotify   = gennotify;
+	this->water_level = water_level;
+
+	c_water_source = water_source;
+	if (c_water_source == CONTENT_IGNORE)
+		c_water_source = ndef->getId("mapgen_water_source");
+	if (c_water_source == CONTENT_IGNORE)
+		c_water_source = CONTENT_AIR;
+
+	c_lava_source = lava_source;
+	if (c_lava_source == CONTENT_IGNORE)
+		c_lava_source = ndef->getId("mapgen_lava_source");
+	if (c_lava_source == CONTENT_IGNORE)
+		c_lava_source = CONTENT_AIR;
+}
+
+
+void CavesV6::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
+	PseudoRandom *ps, PseudoRandom *ps2,
+	bool is_large_cave, int max_stone_height, s16 *heightmap)
+{
+	assert(vm);
+	assert(ps);
+	assert(ps2);
+
+	this->vm         = vm;
+	this->ps         = ps;
+	this->ps2        = ps2;
+	this->node_min   = nmin;
+	this->node_max   = nmax;
+	this->heightmap  = heightmap;
+	this->large_cave = is_large_cave;
+
+	this->ystride = nmax.X - nmin.X + 1;
+
+	// Set initial parameters from randomness
 	min_tunnel_diameter = 2;
 	max_tunnel_diameter = ps->range(2, 6);
 	dswitchint          = ps->range(1, 14);
-
 	if (large_cave) {
 		part_max_length_rs  = ps->range(2, 4);
 		tunnel_routepoints  = ps->range(5, ps->range(15, 30));
@@ -307,16 +332,8 @@ CavesV6::CavesV6(MapgenV6 *mg, PseudoRandom *ps, PseudoRandom *ps2,
 		part_max_length_rs = ps->range(2, 9);
 		tunnel_routepoints = ps->range(10, ps->range(15, 30));
 	}
-
 	large_cave_is_flat = (ps->range(0, 1) == 0);
-}
 
-
-void CavesV6::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
-{
-	node_min = nmin;
-	node_max = nmax;
-	max_stone_y = max_stone_height;
 	main_direction = v3f(0, 0, 0);
 
 	// Allowed route area size in nodes
@@ -334,7 +351,7 @@ void CavesV6::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 
 	route_y_min = 0;
 	// Allow half a diameter + 7 over stone surface
-	route_y_max = -of.Y + max_stone_y + max_tunnel_diameter / 2 + 7;
+	route_y_max = -of.Y + max_stone_height + max_tunnel_diameter / 2 + 7;
 
 	// Limit maximum to area
 	route_y_max = rangelim(route_y_max, 0, ar.Y - 1);
@@ -363,20 +380,24 @@ void CavesV6::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 	);
 
 	// Add generation notify begin event
-	v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
-	GenNotifyType notifytype = large_cave ?
-		GENNOTIFY_LARGECAVE_BEGIN : GENNOTIFY_CAVE_BEGIN;
-	mg->gennotify.addEvent(notifytype, abs_pos);
+	if (gennotify != NULL) {
+		v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
+		GenNotifyType notifytype = large_cave ?
+			GENNOTIFY_LARGECAVE_BEGIN : GENNOTIFY_CAVE_BEGIN;
+		gennotify->addEvent(notifytype, abs_pos);
+	}
 
 	// Generate some tunnel starting from orp
 	for (u16 j = 0; j < tunnel_routepoints; j++)
 		makeTunnel(j % dswitchint == 0);
 
 	// Add generation notify end event
-	abs_pos = v3s16(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
-	notifytype = large_cave ?
-		GENNOTIFY_LARGECAVE_END : GENNOTIFY_CAVE_END;
-	mg->gennotify.addEvent(notifytype, abs_pos);
+	if (gennotify != NULL) {
+		v3s16 abs_pos = v3s16(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
+		GenNotifyType notifytype = large_cave ?
+			GENNOTIFY_LARGECAVE_END : GENNOTIFY_CAVE_END;
+		gennotify->addEvent(notifytype, abs_pos);
+	}
 }
 
 
@@ -438,9 +459,9 @@ void CavesV6::makeTunnel(bool dirswitch)
 	v3s16 p1 = orpi + veci + of + rs / 2;
 	if (p1.Z >= node_min.Z && p1.Z <= node_max.Z &&
 			p1.X >= node_min.X && p1.X <= node_max.X) {
-		u32 index1 = (p1.Z - node_min.Z) * mg->ystride +
+		u32 index1 = (p1.Z - node_min.Z) * ystride +
 			(p1.X - node_min.X);
-		h1 = mg->heightmap[index1];
+		h1 = heightmap[index1];
 	} else {
 		h1 = water_level; // If not in heightmap
 	}
@@ -448,9 +469,9 @@ void CavesV6::makeTunnel(bool dirswitch)
 	v3s16 p2 = orpi + of + rs / 2;
 	if (p2.Z >= node_min.Z && p2.Z <= node_max.Z &&
 			p2.X >= node_min.X && p2.X <= node_max.X) {
-		u32 index2 = (p2.Z - node_min.Z) * mg->ystride +
+		u32 index2 = (p2.Z - node_min.Z) * ystride +
 			(p2.X - node_min.X);
-		h2 = mg->heightmap[index2];
+		h2 = heightmap[index2];
 	} else {
 		h2 = water_level;
 	}
@@ -512,7 +533,7 @@ void CavesV6::carveRoute(v3f vec, float f, bool randomize_xz,
 	fp.Z += 0.1 * ps->range(-10, 10);
 	v3s16 cp(fp.X, fp.Y, fp.Z);
 
-	s16 d0 = -rs/2;
+	s16 d0 = -rs / 2;
 	s16 d1 = d0 + rs;
 	if (randomize_xz) {
 		d0 += ps->range(-1, 1);
@@ -550,11 +571,9 @@ void CavesV6::carveRoute(v3f vec, float f, bool randomize_xz,
 					int full_ymax = node_max.Y + MAP_BLOCKSIZE;
 
 					if (full_ymin < water_level && full_ymax > water_level) {
-						vm->m_data[i] = (p.Y <= water_level) ?
-							waternode : airnode;
+						vm->m_data[i] = (p.Y <= water_level) ? waternode : airnode;
 					} else if (full_ymax < water_level) {
-						vm->m_data[i] = (p.Y < startp.Y - 2) ?
-							lavanode : airnode;
+						vm->m_data[i] = (p.Y < startp.Y - 2) ? lavanode : airnode;
 					} else {
 						vm->m_data[i] = airnode;
 					}
diff --git a/src/cavegen.h b/src/cavegen.h
index b50455c1c..74cd0b416 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -23,13 +23,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
 #define DEFAULT_LAVA_DEPTH (-256)
 
-class MapgenV6;
+class GenerateNotifier;
 
 class CavesRandomWalk {
 public:
 	Mapgen *mg;
 	MMVManip *vm;
 	INodeDefManager *ndef;
+	s16 *heightmap;
 
 	// variables
 	int lava_depth;
@@ -64,7 +65,7 @@ public:
 	content_t c_ice;
 
 	int water_level;
-	int ystride;
+	u16 ystride;
 
 	CavesRandomWalk(Mapgen *mg, PseudoRandom *ps);
 	void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
@@ -87,9 +88,18 @@ public:
 */
 class CavesV6 {
 public:
-	MapgenV6 *mg;
 	MMVManip *vm;
 	INodeDefManager *ndef;
+	GenerateNotifier *gennotify;
+	PseudoRandom *ps;
+	PseudoRandom *ps2;
+
+	s16 *heightmap;
+	content_t c_water_source;
+	content_t c_lava_source;
+	int water_level;
+
+	u16 ystride;
 
 	s16 min_tunnel_diameter;
 	s16 max_tunnel_diameter;
@@ -100,7 +110,6 @@ public:
 	bool large_cave;
 	bool large_cave_is_flat;
 
-	s16 max_stone_y;
 	v3s16 node_min;
 	v3s16 node_max;
 
@@ -113,16 +122,22 @@ public:
 	s16 route_y_min;
 	s16 route_y_max;
 
-	PseudoRandom *ps;
-	PseudoRandom *ps2;
+	// ndef is a mandatory parameter.
+	// If gennotify is NULL, generation events are not logged.
+	CavesV6(INodeDefManager *ndef,
+		GenerateNotifier *gennotify = NULL,
+		int water_level = 1,
+		content_t water_source = CONTENT_IGNORE,
+		content_t lava_source = CONTENT_IGNORE);
 
-	content_t c_water_source;
-	content_t c_lava_source;
+	// vm, ps, and ps2 are mandatory parameters.
+	// If heightmap is NULL, the surface level at all points is assumed to
+	// be water_level.
+	void makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
+		PseudoRandom *ps, PseudoRandom *ps2,
+		bool is_large_cave, int max_stone_height, s16 *heightmap = NULL);
 
-	int water_level;
-
-	CavesV6(MapgenV6 *mg, PseudoRandom *ps, PseudoRandom *ps2, bool large_cave);
-	void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
+private:
 	void makeTunnel(bool dirswitch);
 	void carveRoute(v3f vec, float f, bool randomize_xz, bool tunnel_above_ground);
 };
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index d143f12e9..65acfaf93 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -1066,9 +1066,10 @@ void MapgenV6::generateCaves(int max_stone_y)
 	}
 
 	for (u32 i = 0; i < caves_count + bruises_count; i++) {
-		bool large_cave = (i >= caves_count);
-		CavesV6 cave(this, &ps, &ps2, large_cave);
+		CavesV6 cave(ndef, &gennotify, water_level, c_water_source, c_lava_source);
 
-		cave.makeCave(node_min, node_max, max_stone_y);
+		bool large_cave = (i >= caves_count);
+		cave.makeCave(vm, node_min, node_max, &ps, &ps2,
+			large_cave, max_stone_y, heightmap);
 	}
 }

From 68b1cd8d1bda704dc174c2e39a03276f68984164 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Tue, 10 May 2016 13:35:39 -0400
Subject: [PATCH 024/418] Cavegen: Merge instances of repetitive surface
 level-finding code

---
 src/cavegen.cpp | 97 +++++++++++++++++++++----------------------------
 src/cavegen.h   |  5 +++
 2 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index bc73b7206..59878c890 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -147,31 +147,10 @@ void CavesRandomWalk::makeTunnel(bool dirswitch)
 
 	// Do not make caves that are above ground.
 	// It is only necessary to check the startpoint and endpoint.
-	v3s16 orpi(orp.X, orp.Y, orp.Z);
-	v3s16 veci(vec.X, vec.Y, vec.Z);
-	v3s16 p;
-
-	p = orpi + veci + of + rs / 2;
-	if (p.Z >= node_min.Z && p.Z <= node_max.Z &&
-			p.X >= node_min.X && p.X <= node_max.X) {
-		u32 index = (p.Z - node_min.Z) * ystride + (p.X - node_min.X);
-		s16 h = mg->heightmap[index];
-		if (h < p.Y)
-			return;
-	} else if (p.Y > water_level) {
-		return; // If it's not in our heightmap, use a simple heuristic
-	}
-
-	p = orpi + of + rs / 2;
-	if (p.Z >= node_min.Z && p.Z <= node_max.Z &&
-			p.X >= node_min.X && p.X <= node_max.X) {
-		u32 index = (p.Z - node_min.Z) * ystride + (p.X - node_min.X);
-		s16 h = mg->heightmap[index];
-		if (h < p.Y)
-			return;
-	} else if (p.Y > water_level) {
+	v3s16 p1 = v3s16(orp.X, orp.Y, orp.Z) + of + rs / 2;
+	v3s16 p2 = v3s16(vec.X, vec.Y, vec.Z) + p1;
+	if (isPosAboveSurface(p1) || isPosAboveSurface(p2))
 		return;
-	}
 
 	vec += main_direction;
 
@@ -274,6 +253,22 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 }
 
 
+inline bool CavesRandomWalk::isPosAboveSurface(v3s16 p)
+{
+	if (heightmap != NULL &&
+			p.Z >= node_min.Z && p.Z <= node_max.Z &&
+			p.X >= node_min.X && p.X <= node_max.X) {
+		u32 index = (p.Z - node_min.Z) * ystride + (p.X - node_min.X);
+		if (heightmap[index] < p.Y)
+			return true;
+	} else if (p.Y > water_level) {
+		return true;
+	}
+
+	return false;
+}
+
+
 ////
 //// CavesV6
 ////
@@ -448,39 +443,18 @@ void CavesV6::makeTunnel(bool dirswitch)
 		);
 	}
 
-	// Do not make caves that are entirely above ground, to fix
-	// shadow bugs caused by overgenerated large caves.
+	// Do not make caves that are entirely above ground, to fix shadow bugs
+	// caused by overgenerated large caves.
 	// It is only necessary to check the startpoint and endpoint.
-	v3s16 orpi(orp.X, orp.Y, orp.Z);
-	v3s16 veci(vec.X, vec.Y, vec.Z);
-	s16 h1;
-	s16 h2;
+	v3s16 p1 = v3s16(orp.X, orp.Y, orp.Z) + of + rs / 2;
+	v3s16 p2 = v3s16(vec.X, vec.Y, vec.Z) + p1;
 
-	v3s16 p1 = orpi + veci + of + rs / 2;
-	if (p1.Z >= node_min.Z && p1.Z <= node_max.Z &&
-			p1.X >= node_min.X && p1.X <= node_max.X) {
-		u32 index1 = (p1.Z - node_min.Z) * ystride +
-			(p1.X - node_min.X);
-		h1 = heightmap[index1];
-	} else {
-		h1 = water_level; // If not in heightmap
-	}
-
-	v3s16 p2 = orpi + of + rs / 2;
-	if (p2.Z >= node_min.Z && p2.Z <= node_max.Z &&
-			p2.X >= node_min.X && p2.X <= node_max.X) {
-		u32 index2 = (p2.Z - node_min.Z) * ystride +
-			(p2.X - node_min.X);
-		h2 = heightmap[index2];
-	} else {
-		h2 = water_level;
-	}
-
-	// If startpoint and endpoint are above ground,
-	// disable placing of nodes in carveRoute while
-	// still running all pseudorandom calls to ensure
-	// caves consistent with existing worlds.
-	bool tunnel_above_ground = p1.Y > h1 && p2.Y > h2;
+	// If startpoint and endpoint are above ground, disable placement of nodes
+	// in carveRoute while still running all PseudoRandom calls to ensure caves
+	// are consistent with existing worlds.
+	bool tunnel_above_ground =
+		p1.Y > getSurfaceFromHeightmap(p1) &&
+		p2.Y > getSurfaceFromHeightmap(p2);
 
 	vec += main_direction;
 
@@ -588,3 +562,16 @@ void CavesV6::carveRoute(v3f vec, float f, bool randomize_xz,
 		}
 	}
 }
+
+
+inline s16 CavesV6::getSurfaceFromHeightmap(v3s16 p)
+{
+	if (heightmap != NULL &&
+			p.Z >= node_min.Z && p.Z <= node_max.Z &&
+			p.X >= node_min.X && p.X <= node_max.X) {
+		u32 index = (p.Z - node_min.Z) * ystride + (p.X - node_min.X);
+		return heightmap[index];
+	} else {
+		return water_level;
+	}
+}
diff --git a/src/cavegen.h b/src/cavegen.h
index 74cd0b416..5a41966fe 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -71,6 +71,9 @@ public:
 	void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
 	void makeTunnel(bool dirswitch);
 	void carveRoute(v3f vec, float f, bool randomize_xz);
+
+private:
+	inline bool isPosAboveSurface(v3s16 p);
 };
 
 /*
@@ -140,6 +143,8 @@ public:
 private:
 	void makeTunnel(bool dirswitch);
 	void carveRoute(v3f vec, float f, bool randomize_xz, bool tunnel_above_ground);
+
+	inline s16 getSurfaceFromHeightmap(v3s16 p);
 };
 
 #endif

From db1b4dc8908c83aef5560718af7466d95d86e44f Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Tue, 10 May 2016 22:56:03 -0400
Subject: [PATCH 025/418] Cavegen: Remove CavesRandomWalk dependency on Mapgen

---
 src/cavegen.cpp        | 79 ++++++++++++++++++++++++++++--------------
 src/cavegen.h          | 45 +++++++++++++++++++-----
 src/mapgen.cpp         |  6 ++--
 src/mapgen_valleys.cpp |  6 ++--
 4 files changed, 98 insertions(+), 38 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index 59878c890..25e8473bc 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -31,23 +31,52 @@ NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0
 //// CavesRandomWalk
 ////
 
-CavesRandomWalk::CavesRandomWalk(Mapgen *mg, PseudoRandom *ps)
+CavesRandomWalk::CavesRandomWalk(
+	INodeDefManager *ndef,
+	GenerateNotifier *gennotify,
+	int seed,
+	int water_level,
+	content_t water_source,
+	content_t lava_source)
 {
-	this->mg             = mg;
-	this->vm             = mg->vm;
-	this->ndef           = mg->ndef;
-	this->water_level    = mg->water_level;
-	this->ps             = ps;
-	c_water_source       = ndef->getId("mapgen_water_source");
-	c_lava_source        = ndef->getId("mapgen_lava_source");
-	c_ice                = ndef->getId("mapgen_ice");
+	assert(ndef);
+
+	this->ndef           = ndef;
+	this->gennotify      = gennotify;
+	this->seed           = seed;
+	this->water_level    = water_level;
 	this->np_caveliquids = &nparams_caveliquids;
-	this->ystride        = mg->csize.X;
 	this->lava_depth     = DEFAULT_LAVA_DEPTH;
 
-	if (c_ice == CONTENT_IGNORE)
-		c_ice = CONTENT_AIR;
+	c_water_source = water_source;
+	if (c_water_source == CONTENT_IGNORE)
+		c_water_source = ndef->getId("mapgen_water_source");
+	if (c_water_source == CONTENT_IGNORE)
+		c_water_source = CONTENT_AIR;
 
+	c_lava_source = lava_source;
+	if (c_lava_source == CONTENT_IGNORE)
+		c_lava_source = ndef->getId("mapgen_lava_source");
+	if (c_lava_source == CONTENT_IGNORE)
+		c_lava_source = CONTENT_AIR;
+}
+
+
+void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
+	PseudoRandom *ps, int max_stone_height, s16 *heightmap)
+{
+	assert(vm);
+	assert(ps);
+
+	this->vm        = vm;
+	this->ps        = ps;
+	this->node_min  = nmin;
+	this->node_max  = nmax;
+	this->heightmap = heightmap;
+
+	this->ystride = nmax.X - nmin.X + 1;
+
+	// Set initial parameters from randomness
 	dswitchint = ps->range(1, 14);
 	flooded    = ps->range(1, 2) == 2;
 
@@ -57,13 +86,7 @@ CavesRandomWalk::CavesRandomWalk(Mapgen *mg, PseudoRandom *ps)
 	max_tunnel_diameter = ps->range(7, ps->range(8, 24));
 
 	large_cave_is_flat = (ps->range(0, 1) == 0);
-}
 
-
-void CavesRandomWalk::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
-{
-	node_min = nmin;
-	node_max = nmax;
 	main_direction = v3f(0, 0, 0);
 
 	// Allowed route area size in nodes
@@ -107,18 +130,22 @@ void CavesRandomWalk::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
 	);
 
 	// Add generation notify begin event
-	v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
-	GenNotifyType notifytype = GENNOTIFY_LARGECAVE_BEGIN;
-	mg->gennotify.addEvent(notifytype, abs_pos);
+	if (gennotify) {
+		v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
+		GenNotifyType notifytype = GENNOTIFY_LARGECAVE_BEGIN;
+		gennotify->addEvent(notifytype, abs_pos);
+	}
 
 	// Generate some tunnel starting from orp
 	for (u16 j = 0; j < tunnel_routepoints; j++)
 		makeTunnel(j % dswitchint == 0);
 
 	// Add generation notify end event
-	abs_pos = v3s16(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
-	notifytype = GENNOTIFY_LARGECAVE_END;
-	mg->gennotify.addEvent(notifytype, abs_pos);
+	if (gennotify) {
+		v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
+		GenNotifyType notifytype = GENNOTIFY_LARGECAVE_END;
+		gennotify->addEvent(notifytype, abs_pos);
+	}
 }
 
 
@@ -197,7 +224,7 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 	startp += of;
 
 	float nval = NoisePerlin3D(np_caveliquids, startp.X,
-		startp.Y, startp.Z, mg->seed);
+		startp.Y, startp.Z, seed);
 	MapNode liquidnode = (nval < 0.40 && node_max.Y < lava_depth) ?
 		lavanode : waternode;
 
@@ -388,7 +415,7 @@ void CavesV6::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 
 	// Add generation notify end event
 	if (gennotify != NULL) {
-		v3s16 abs_pos = v3s16(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
+		v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
 		GenNotifyType notifytype = large_cave ?
 			GENNOTIFY_LARGECAVE_END : GENNOTIFY_CAVE_END;
 		gennotify->addEvent(notifytype, abs_pos);
diff --git a/src/cavegen.h b/src/cavegen.h
index 5a41966fe..2db5e9d4f 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -25,17 +25,35 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class GenerateNotifier;
 
+/*
+	CavesRandomWalk is an implementation of a cave-digging algorithm that
+	operates on the principle of a "random walk" to approximate the stochiastic
+	activity of cavern development.
+
+	In summary, this algorithm works by carving a randomly sized tunnel in a
+	random direction a random amount of times, randomly varying in width.
+	All randomness here is uniformly distributed; alternative distributions have
+	not yet been implemented.
+
+	This algorithm is very fast, executing in less than 1ms on average for an
+	80x80x80 chunk of map on a modern processor.
+*/
 class CavesRandomWalk {
 public:
-	Mapgen *mg;
 	MMVManip *vm;
 	INodeDefManager *ndef;
+	GenerateNotifier *gennotify;
 	s16 *heightmap;
 
-	// variables
+	// configurable parameters
+	int seed;
+	int water_level;
 	int lava_depth;
 	NoiseParams *np_caveliquids;
 
+	// intermediate state variables
+	u16 ystride;
+
 	s16 min_tunnel_diameter;
 	s16 max_tunnel_diameter;
 	u16 tunnel_routepoints;
@@ -62,17 +80,26 @@ public:
 
 	content_t c_water_source;
 	content_t c_lava_source;
-	content_t c_ice;
 
-	int water_level;
-	u16 ystride;
+	// ndef is a mandatory parameter.
+	// If gennotify is NULL, generation events are not logged.
+	CavesRandomWalk(INodeDefManager *ndef,
+		GenerateNotifier *gennotify = NULL,
+		int seed = 0,
+		int water_level = 1,
+		content_t water_source = CONTENT_IGNORE,
+		content_t lava_source = CONTENT_IGNORE);
 
-	CavesRandomWalk(Mapgen *mg, PseudoRandom *ps);
-	void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
+	// vm and ps are mandatory parameters.
+	// If heightmap is NULL, the surface level at all points is assumed to
+	// be water_level.
+	void makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
+		PseudoRandom *ps, int max_stone_height, s16 *heightmap);
+
+private:
 	void makeTunnel(bool dirswitch);
 	void carveRoute(v3f vec, float f, bool randomize_xz);
 
-private:
 	inline bool isPosAboveSurface(v3s16 p);
 };
 
@@ -97,11 +124,13 @@ public:
 	PseudoRandom *ps;
 	PseudoRandom *ps2;
 
+	// configurable parameters
 	s16 *heightmap;
 	content_t c_water_source;
 	content_t c_lava_source;
 	int water_level;
 
+	// intermediate state variables
 	u16 ystride;
 
 	s16 min_tunnel_diameter;
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 43ac6e51a..7e74ad642 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -599,8 +599,10 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 	PseudoRandom ps(blockseed + 21343);
 	u32 bruises_count = ps.range(0, 2);
 	for (u32 i = 0; i < bruises_count; i++) {
-		CavesRandomWalk cave(this, &ps);
-		cave.makeCave(node_min, node_max, max_stone_y);
+		CavesRandomWalk cave(ndef, &gennotify, seed, water_level,
+			c_water_source, CONTENT_IGNORE);
+
+		cave.makeCave(vm, node_min, node_max, &ps, max_stone_y, heightmap);
 	}
 }
 
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 77fa1ed06..af7a8b153 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -841,8 +841,10 @@ void MapgenValleys::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 	if (node_max.Y <= large_cave_depth && !made_a_big_one) {
 		u32 bruises_count = ps.range(0, 2);
 		for (u32 i = 0; i < bruises_count; i++) {
-			CavesRandomWalk cave(this, &ps);
-			cave.makeCave(node_min, node_max, max_stone_y);
+			CavesRandomWalk cave(ndef, &gennotify, seed, water_level,
+				c_water_source, c_lava_source);
+
+			cave.makeCave(vm, node_min, node_max, &ps, max_stone_y, heightmap);
 		}
 	}
 }

From 5b05f75a272ede582d7f86d8dbbbf7bc81e81970 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Wed, 11 May 2016 00:00:05 -0400
Subject: [PATCH 026/418] Cavegen: Re-add small caves to CavesRandomWalk

---
 src/cavegen.cpp        | 121 +++++++++++++++++++++++++++++------------
 src/cavegen.h          |   5 +-
 src/mapgen.cpp         |   2 +-
 src/mapgen_valleys.cpp |   2 +-
 4 files changed, 91 insertions(+), 39 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index 25e8473bc..1beac6f27 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -63,16 +63,17 @@ CavesRandomWalk::CavesRandomWalk(
 
 
 void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
-	PseudoRandom *ps, int max_stone_height, s16 *heightmap)
+	PseudoRandom *ps, bool is_large_cave, int max_stone_height, s16 *heightmap)
 {
 	assert(vm);
 	assert(ps);
 
-	this->vm        = vm;
-	this->ps        = ps;
-	this->node_min  = nmin;
-	this->node_max  = nmax;
-	this->heightmap = heightmap;
+	this->vm         = vm;
+	this->ps         = ps;
+	this->node_min   = nmin;
+	this->node_max   = nmax;
+	this->heightmap  = heightmap;
+	this->large_cave = is_large_cave;
 
 	this->ystride = nmax.X - nmin.X + 1;
 
@@ -80,10 +81,17 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	dswitchint = ps->range(1, 14);
 	flooded    = ps->range(1, 2) == 2;
 
-	part_max_length_rs  = ps->range(2, 4);
-	tunnel_routepoints  = ps->range(5, ps->range(15, 30));
-	min_tunnel_diameter = 5;
-	max_tunnel_diameter = ps->range(7, ps->range(8, 24));
+	if (large_cave) {
+		part_max_length_rs = ps->range(2, 4);
+		tunnel_routepoints = ps->range(5, ps->range(15, 30));
+		min_tunnel_diameter = 5;
+		max_tunnel_diameter = ps->range(7, ps->range(8, 24));
+	} else {
+		part_max_length_rs = ps->range(2, 9);
+		tunnel_routepoints = ps->range(10, ps->range(15, 30));
+		min_tunnel_diameter = 2;
+		max_tunnel_diameter = ps->range(2, 6);
+	}
 
 	large_cave_is_flat = (ps->range(0, 1) == 0);
 
@@ -108,13 +116,15 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	// Limit maximum to area
 	route_y_max = rangelim(route_y_max, 0, ar.Y - 1);
 
-	s16 minpos = 0;
-	if (node_min.Y < water_level && node_max.Y > water_level) {
-		minpos = water_level - max_tunnel_diameter / 3 - of.Y;
-		route_y_max = water_level + max_tunnel_diameter / 3 - of.Y;
+	if (large_cave) {
+		s16 minpos = 0;
+		if (node_min.Y < water_level && node_max.Y > water_level) {
+			minpos = water_level - max_tunnel_diameter / 3 - of.Y;
+			route_y_max = water_level + max_tunnel_diameter / 3 - of.Y;
+		}
+		route_y_min = ps->range(minpos, minpos + max_tunnel_diameter);
+		route_y_min = rangelim(route_y_min, 0, route_y_max);
 	}
-	route_y_min = ps->range(minpos, minpos + max_tunnel_diameter);
-	route_y_min = rangelim(route_y_min, 0, route_y_max);
 
 	s16 route_start_y_min = route_y_min;
 	s16 route_start_y_max = route_y_max;
@@ -132,7 +142,8 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	// Add generation notify begin event
 	if (gennotify) {
 		v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
-		GenNotifyType notifytype = GENNOTIFY_LARGECAVE_BEGIN;
+		GenNotifyType notifytype = large_cave ?
+			GENNOTIFY_LARGECAVE_BEGIN : GENNOTIFY_CAVE_BEGIN;
 		gennotify->addEvent(notifytype, abs_pos);
 	}
 
@@ -143,7 +154,8 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	// Add generation notify end event
 	if (gennotify) {
 		v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
-		GenNotifyType notifytype = GENNOTIFY_LARGECAVE_END;
+		GenNotifyType notifytype = large_cave ?
+			GENNOTIFY_LARGECAVE_END : GENNOTIFY_CAVE_END;
 		gennotify->addEvent(notifytype, abs_pos);
 	}
 }
@@ -151,6 +163,15 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 
 void CavesRandomWalk::makeTunnel(bool dirswitch)
 {
+	if (dirswitch && !large_cave) {
+		main_direction = v3f(
+			((float)(ps->next() % 20) - (float)10) / 10,
+			((float)(ps->next() % 20) - (float)10) / 30,
+			((float)(ps->next() % 20) - (float)10) / 10
+		);
+		main_direction *= (float)ps->range(0, 10) / 10;
+	}
+
 	// Randomize size
 	s16 min_d = min_tunnel_diameter;
 	s16 max_d = max_tunnel_diameter;
@@ -158,19 +179,35 @@ void CavesRandomWalk::makeTunnel(bool dirswitch)
 	s16 rs_part_max_length_rs = rs * part_max_length_rs;
 
 	v3s16 maxlen;
-	maxlen = v3s16(
-		rs_part_max_length_rs,
-		rs_part_max_length_rs / 2,
-		rs_part_max_length_rs
-	);
+	if (large_cave) {
+		maxlen = v3s16(
+			rs_part_max_length_rs,
+			rs_part_max_length_rs / 2,
+			rs_part_max_length_rs
+		);
+	} else {
+		maxlen = v3s16(
+			rs_part_max_length_rs,
+			ps->range(1, rs_part_max_length_rs),
+			rs_part_max_length_rs
+		);
+	}
 
 	v3f vec;
 	// Jump downward sometimes
-	vec = v3f(
-		(float)(ps->next() % maxlen.X) - (float)maxlen.X / 2,
-		(float)(ps->next() % maxlen.Y) - (float)maxlen.Y / 2,
-		(float)(ps->next() % maxlen.Z) - (float)maxlen.Z / 2
-	);
+	if (!large_cave && ps->range(0, 12) == 0) {
+		vec = v3f(
+			(float)(ps->next() % (maxlen.X * 1)) - (float)maxlen.X / 2,
+			(float)(ps->next() % (maxlen.Y * 2)) - (float)maxlen.Y,
+			(float)(ps->next() % (maxlen.Z * 1)) - (float)maxlen.Z / 2
+		);
+	} else {
+		vec = v3f(
+			(float)(ps->next() % (maxlen.X * 1)) - (float)maxlen.X / 2,
+			(float)(ps->next() % (maxlen.Y * 1)) - (float)maxlen.Y / 2,
+			(float)(ps->next() % (maxlen.Z * 1)) - (float)maxlen.Z / 2
+		);
+	}
 
 	// Do not make caves that are above ground.
 	// It is only necessary to check the startpoint and endpoint.
@@ -240,6 +277,8 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 		d1 += ps->range(-1, 1);
 	}
 
+	bool flat_cave_floor = !large_cave && ps->range(0, 2) == 2;
+
 	for (s16 z0 = d0; z0 <= d1; z0++) {
 		s16 si = rs / 2 - MYMAX(0, abs(z0) - rs / 7 - 1);
 		for (s16 x0 = -si - ps->range(0,1); x0 <= si - 1 + ps->range(0,1); x0++) {
@@ -248,6 +287,10 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 			s16 si2 = rs / 2 - MYMAX(0, maxabsxz - rs / 7 - 1);
 
 			for (s16 y0 = -si2; y0 <= si2; y0++) {
+				// Make better floors in small caves
+				if (flat_cave_floor && y0 <= -rs / 2 && rs <= 7)
+					continue;
+
 				if (large_cave_is_flat) {
 					// Make large caves not so tall
 					if (rs > 7 && abs(y0) >= rs / 3)
@@ -265,15 +308,23 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 				if (!ndef->get(c).is_ground_content)
 					continue;
 
-				int full_ymin = node_min.Y - MAP_BLOCKSIZE;
-				int full_ymax = node_max.Y + MAP_BLOCKSIZE;
+				if (large_cave) {
+					int full_ymin = node_min.Y - MAP_BLOCKSIZE;
+					int full_ymax = node_max.Y + MAP_BLOCKSIZE;
+
+					if (flooded && full_ymin < water_level && full_ymax > water_level)
+						vm->m_data[i] = (p.Y <= water_level) ? waternode : airnode;
+					else if (flooded && full_ymax < water_level)
+						vm->m_data[i] = (p.Y < startp.Y - 4) ? liquidnode : airnode;
+					else
+						vm->m_data[i] = airnode;
+				} else {
+					if (c == CONTENT_IGNORE)
+						continue;
 
-				if (flooded && full_ymin < water_level && full_ymax > water_level)
-					vm->m_data[i] = (p.Y <= water_level) ? waternode : airnode;
-				else if (flooded && full_ymax < water_level)
-					vm->m_data[i] = (p.Y < startp.Y - 4) ? liquidnode : airnode;
-				else
 					vm->m_data[i] = airnode;
+					vm->m_flags[i] |= VMANIP_FLAG_CAVE;
+				}
 			}
 		}
 	}
diff --git a/src/cavegen.h b/src/cavegen.h
index 2db5e9d4f..e250ad452 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -60,6 +60,7 @@ public:
 	int dswitchint;
 	int part_max_length_rs;
 
+	bool large_cave;
 	bool large_cave_is_flat;
 	bool flooded;
 
@@ -93,8 +94,8 @@ public:
 	// vm and ps are mandatory parameters.
 	// If heightmap is NULL, the surface level at all points is assumed to
 	// be water_level.
-	void makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
-		PseudoRandom *ps, int max_stone_height, s16 *heightmap);
+	void makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax, PseudoRandom *ps,
+			bool is_large_cave, int max_stone_height, s16 *heightmap);
 
 private:
 	void makeTunnel(bool dirswitch);
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 7e74ad642..09671d845 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -602,7 +602,7 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 		CavesRandomWalk cave(ndef, &gennotify, seed, water_level,
 			c_water_source, CONTENT_IGNORE);
 
-		cave.makeCave(vm, node_min, node_max, &ps, max_stone_y, heightmap);
+		cave.makeCave(vm, node_min, node_max, &ps, true, max_stone_y, heightmap);
 	}
 }
 
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index af7a8b153..699554ecd 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -844,7 +844,7 @@ void MapgenValleys::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 			CavesRandomWalk cave(ndef, &gennotify, seed, water_level,
 				c_water_source, c_lava_source);
 
-			cave.makeCave(vm, node_min, node_max, &ps, max_stone_y, heightmap);
+			cave.makeCave(vm, node_min, node_max, &ps, true, max_stone_y, heightmap);
 		}
 	}
 }

From b1eb757e60c155707b8fc1b2497b632246819c7b Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Wed, 11 May 2016 03:47:45 -0400
Subject: [PATCH 027/418] Fix undefined evaluation order when constructing
 random vectors

MSVC and GCC evaluate parameters in right-to-left order, whereas Clang
evaluates in left-to-right order, and of course, an optimization could
leave the order of evaluation completely indeterminate.

This commit fixes all instances of the error by explicitly assigning the
results of expressions that use PseudoRandom::next() or range() to their
respective vector components.

The right-to-left evaluation behavior is preserved since Clang is much less
commonly used to compile Minetest than GCC and MSVC combined, and would
therefore cause the least harm.
---
 src/cavegen.cpp    | 67 +++++++++++++++++++---------------------------
 src/dungeongen.cpp | 29 +++++++++++++-------
 2 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index 1beac6f27..5728c1337 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -133,11 +133,9 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	route_start_y_max = rangelim(route_start_y_max, route_start_y_min, ar.Y - 1);
 
 	// Randomize starting position
-	orp = v3f(
-		(float)(ps->next() % ar.X) + 0.5,
-		(float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5,
-		(float)(ps->next() % ar.Z) + 0.5
-	);
+	orp.Z = (float)(ps->next() % ar.Z) + 0.5;
+	orp.Y = (float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5;
+	orp.X = (float)(ps->next() % ar.X) + 0.5;
 
 	// Add generation notify begin event
 	if (gennotify) {
@@ -164,11 +162,10 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 void CavesRandomWalk::makeTunnel(bool dirswitch)
 {
 	if (dirswitch && !large_cave) {
-		main_direction = v3f(
-			((float)(ps->next() % 20) - (float)10) / 10,
-			((float)(ps->next() % 20) - (float)10) / 30,
-			((float)(ps->next() % 20) - (float)10) / 10
-		);
+		main_direction.Z = ((float)(ps->next() % 20) - (float)10) / 10;
+		main_direction.Y = ((float)(ps->next() % 20) - (float)10) / 30;
+		main_direction.X = ((float)(ps->next() % 20) - (float)10) / 10;
+
 		main_direction *= (float)ps->range(0, 10) / 10;
 	}
 
@@ -196,17 +193,13 @@ void CavesRandomWalk::makeTunnel(bool dirswitch)
 	v3f vec;
 	// Jump downward sometimes
 	if (!large_cave && ps->range(0, 12) == 0) {
-		vec = v3f(
-			(float)(ps->next() % (maxlen.X * 1)) - (float)maxlen.X / 2,
-			(float)(ps->next() % (maxlen.Y * 2)) - (float)maxlen.Y,
-			(float)(ps->next() % (maxlen.Z * 1)) - (float)maxlen.Z / 2
-		);
+		vec.Z = (float)(ps->next() % (maxlen.Z * 1)) - (float)maxlen.Z / 2;
+		vec.Y = (float)(ps->next() % (maxlen.Y * 2)) - (float)maxlen.Y;
+		vec.X = (float)(ps->next() % (maxlen.X * 1)) - (float)maxlen.X / 2;
 	} else {
-		vec = v3f(
-			(float)(ps->next() % (maxlen.X * 1)) - (float)maxlen.X / 2,
-			(float)(ps->next() % (maxlen.Y * 1)) - (float)maxlen.Y / 2,
-			(float)(ps->next() % (maxlen.Z * 1)) - (float)maxlen.Z / 2
-		);
+		vec.Z = (float)(ps->next() % (maxlen.Z * 1)) - (float)maxlen.Z / 2;
+		vec.Y = (float)(ps->next() % (maxlen.Y * 1)) - (float)maxlen.Y / 2;
+		vec.X = (float)(ps->next() % (maxlen.X * 1)) - (float)maxlen.X / 2;
 	}
 
 	// Do not make caves that are above ground.
@@ -446,11 +439,9 @@ void CavesV6::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	route_start_y_max = rangelim(route_start_y_max, route_start_y_min, ar.Y - 1);
 
 	// Randomize starting position
-	orp = v3f(
-		(float)(ps->next() % ar.X) + 0.5,
-		(float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5,
-		(float)(ps->next() % ar.Z) + 0.5
-	);
+	orp.Z = (float)(ps->next() % ar.Z) + 0.5;
+	orp.Y = (float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5;
+	orp.X = (float)(ps->next() % ar.X) + 0.5;
 
 	// Add generation notify begin event
 	if (gennotify != NULL) {
@@ -477,11 +468,10 @@ void CavesV6::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 void CavesV6::makeTunnel(bool dirswitch)
 {
 	if (dirswitch && !large_cave) {
-		main_direction = v3f(
-			((float)(ps->next() % 20) - (float)10) / 10,
-			((float)(ps->next() % 20) - (float)10) / 30,
-			((float)(ps->next() % 20) - (float)10) / 10
-		);
+		main_direction.Z = ((float)(ps->next() % 20) - (float)10) / 10;
+		main_direction.Y = ((float)(ps->next() % 20) - (float)10) / 30;
+		main_direction.X = ((float)(ps->next() % 20) - (float)10) / 10;
+
 		main_direction *= (float)ps->range(0, 10) / 10;
 	}
 
@@ -506,19 +496,16 @@ void CavesV6::makeTunnel(bool dirswitch)
 		);
 	}
 
-	v3f vec(
-		(float)(ps->next() % maxlen.X) - (float)maxlen.X / 2,
-		(float)(ps->next() % maxlen.Y) - (float)maxlen.Y / 2,
-		(float)(ps->next() % maxlen.Z) - (float)maxlen.Z / 2
-	);
+	v3f vec;
+	vec.Z = (float)(ps->next() % maxlen.Z) - (float)maxlen.Z / 2;
+	vec.Y = (float)(ps->next() % maxlen.Y) - (float)maxlen.Y / 2;
+	vec.X = (float)(ps->next() % maxlen.X) - (float)maxlen.X / 2;
 
 	// Jump downward sometimes
 	if (!large_cave && ps->range(0, 12) == 0) {
-		vec = v3f(
-			(float)(ps->next() % maxlen.X) - (float)maxlen.X / 2,
-			(float)(ps->next() % (maxlen.Y * 2)) - (float)maxlen.Y,
-			(float)(ps->next() % maxlen.Z) - (float)maxlen.Z / 2
-		);
+		vec.Z = (float)(ps->next() % maxlen.Z) - (float)maxlen.Z / 2;
+		vec.Y = (float)(ps->next() % (maxlen.Y * 2)) - (float)maxlen.Y;
+		vec.X = (float)(ps->next() % maxlen.X) - (float)maxlen.X / 2;
 	}
 
 	// Do not make caves that are entirely above ground, to fix shadow bugs
diff --git a/src/dungeongen.cpp b/src/dungeongen.cpp
index 5bfc320c9..f7f9b8b50 100644
--- a/src/dungeongen.cpp
+++ b/src/dungeongen.cpp
@@ -135,17 +135,23 @@ void DungeonGen::makeDungeon(v3s16 start_padding)
 	bool fits = false;
 	for (u32 i = 0; i < 100 && !fits; i++) {
 		bool is_large_room = ((random.next() & 3) == 1);
-		roomsize = is_large_room ?
-			v3s16(random.range(8, 16), random.range(8, 16), random.range(8, 16)) :
-			v3s16(random.range(4, 8), random.range(4, 6), random.range(4, 8));
+		if (is_large_room) {
+			roomsize.Z = random.range(8, 16);
+			roomsize.Y = random.range(8, 16);
+			roomsize.X = random.range(8, 16);
+		} else {
+			roomsize.Z = random.range(4, 8);
+			roomsize.Y = random.range(4, 6);
+			roomsize.X = random.range(4, 8);
+		}
 		roomsize += dp.roomsize;
 
 		// start_padding is used to disallow starting the generation of
 		// a dungeon in a neighboring generation chunk
-		roomplace = vm->m_area.MinEdge + start_padding + v3s16(
-			random.range(0, areasize.X - roomsize.X - start_padding.X),
-			random.range(0, areasize.Y - roomsize.Y - start_padding.Y),
-			random.range(0, areasize.Z - roomsize.Z - start_padding.Z));
+		roomplace = vm->m_area.MinEdge + start_padding;
+		roomplace.Z += random.range(0, areasize.Z - roomsize.Z - start_padding.Z);
+		roomplace.Y += random.range(0, areasize.Y - roomsize.Y - start_padding.Y);
+		roomplace.X += random.range(0, areasize.X - roomsize.X - start_padding.X);
 
 		/*
 			Check that we're not putting the room to an unknown place,
@@ -227,7 +233,9 @@ void DungeonGen::makeDungeon(v3s16 start_padding)
 		makeCorridor(doorplace, doordir, corridor_end, corridor_end_dir);
 
 		// Find a place for a random sized room
-		roomsize = v3s16(random.range(4, 8), random.range(4, 6), random.range(4, 8));
+		roomsize.Z = random.range(4, 8);
+		roomsize.Y = random.range(4, 6);
+		roomsize.X = random.range(4, 8);
 		roomsize += dp.roomsize;
 
 		m_pos = corridor_end;
@@ -587,7 +595,10 @@ v3s16 rand_ortho_dir(PseudoRandom &random, bool diagonal_dirs)
 
 		do {
 			trycount++;
-			dir = v3s16(random.next() % 3 - 1, 0, random.next() % 3 - 1);
+
+			dir.Z = random.next() % 3 - 1;
+			dir.Y = 0;
+			dir.X = random.next() % 3 - 1;
 		} while ((dir.X == 0 && dir.Z == 0) && trycount < 10);
 
 		return dir;

From 6151f7bc4b32c2576035bd3381bd81ae287c57eb Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sat, 14 May 2016 22:46:50 -0400
Subject: [PATCH 028/418] Cavegen: Minor misc. fixes

- Convert instances of numeric literal doubles to floats
- Move dswitchint to a local variable now that being a member is unnecessary
- Improve const correctness
- Indentation fixes
---
 src/cavegen.cpp | 50 ++++++++++++++++++++++++-------------------------
 src/cavegen.h   |  4 +---
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index 5728c1337..5f0af9699 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -78,8 +78,8 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	this->ystride = nmax.X - nmin.X + 1;
 
 	// Set initial parameters from randomness
-	dswitchint = ps->range(1, 14);
-	flooded    = ps->range(1, 2) == 2;
+	int dswitchint = ps->range(1, 14);
+	flooded = ps->range(1, 2) == 2;
 
 	if (large_cave) {
 		part_max_length_rs = ps->range(2, 4);
@@ -104,10 +104,10 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 
 	// Allow a bit more
 	//(this should be more than the maximum radius of the tunnel)
-	s16 insure = 10;
+	const s16 insure = 10;
 	s16 more = MYMAX(MAP_BLOCKSIZE - max_tunnel_diameter / 2 - insure, 1);
-	ar += v3s16(1,0,1) * more * 2;
-	of -= v3s16(1,0,1) * more;
+	ar += v3s16(1, 0, 1) * more * 2;
+	of -= v3s16(1, 0, 1) * more;
 
 	route_y_min = 0;
 	// Allow half a diameter + 7 over stone surface
@@ -133,9 +133,9 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	route_start_y_max = rangelim(route_start_y_max, route_start_y_min, ar.Y - 1);
 
 	// Randomize starting position
-	orp.Z = (float)(ps->next() % ar.Z) + 0.5;
-	orp.Y = (float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5;
-	orp.X = (float)(ps->next() % ar.X) + 0.5;
+	orp.Z = (float)(ps->next() % ar.Z) + 0.5f;
+	orp.Y = (float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5f;
+	orp.X = (float)(ps->next() % ar.X) + 0.5f;
 
 	// Add generation notify begin event
 	if (gennotify) {
@@ -230,14 +230,14 @@ void CavesRandomWalk::makeTunnel(bool dirswitch)
 	vec = rp - orp;
 
 	float veclen = vec.getLength();
-	if (veclen < 0.05)
-		veclen = 1.0;
+	if (veclen < 0.05f)
+		veclen = 1.0f;
 
 	// Every second section is rough
 	bool randomize_xz = (ps->range(1, 2) == 1);
 
 	// Carve routes
-	for (float f = 0; f < 1.0; f += 1.0 / veclen)
+	for (float f = 0.f; f < 1.0f; f += 1.0f / veclen)
 		carveRoute(vec, f, randomize_xz);
 
 	orp = rp;
@@ -255,15 +255,15 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 
 	float nval = NoisePerlin3D(np_caveliquids, startp.X,
 		startp.Y, startp.Z, seed);
-	MapNode liquidnode = (nval < 0.40 && node_max.Y < lava_depth) ?
+	MapNode liquidnode = (nval < 0.40f && node_max.Y < lava_depth) ?
 		lavanode : waternode;
 
 	v3f fp = orp + vec * f;
-	fp.X += 0.1 * ps->range(-10, 10);
-	fp.Z += 0.1 * ps->range(-10, 10);
+	fp.X += 0.1f * ps->range(-10, 10);
+	fp.Z += 0.1f * ps->range(-10, 10);
 	v3s16 cp(fp.X, fp.Y, fp.Z);
 
-	s16 d0 = -rs/2;
+	s16 d0 = -rs / 2;
 	s16 d1 = d0 + rs;
 	if (randomize_xz) {
 		d0 += ps->range(-1, 1);
@@ -388,7 +388,7 @@ void CavesV6::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	// Set initial parameters from randomness
 	min_tunnel_diameter = 2;
 	max_tunnel_diameter = ps->range(2, 6);
-	dswitchint          = ps->range(1, 14);
+	int dswitchint      = ps->range(1, 14);
 	if (large_cave) {
 		part_max_length_rs  = ps->range(2, 4);
 		tunnel_routepoints  = ps->range(5, ps->range(15, 30));
@@ -410,7 +410,7 @@ void CavesV6::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	// Allow a bit more
 	//(this should be more than the maximum radius of the tunnel)
 	const s16 max_spread_amount = MAP_BLOCKSIZE;
-	s16 insure = 10;
+	const s16 insure = 10;
 	s16 more = MYMAX(max_spread_amount - max_tunnel_diameter / 2 - insure, 1);
 	ar += v3s16(1, 0, 1) * more * 2;
 	of -= v3s16(1, 0, 1) * more;
@@ -439,9 +439,9 @@ void CavesV6::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 	route_start_y_max = rangelim(route_start_y_max, route_start_y_min, ar.Y - 1);
 
 	// Randomize starting position
-	orp.Z = (float)(ps->next() % ar.Z) + 0.5;
-	orp.Y = (float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5;
-	orp.X = (float)(ps->next() % ar.X) + 0.5;
+	orp.Z = (float)(ps->next() % ar.Z) + 0.5f;
+	orp.Y = (float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5f;
+	orp.X = (float)(ps->next() % ar.X) + 0.5f;
 
 	// Add generation notify begin event
 	if (gennotify != NULL) {
@@ -543,14 +543,14 @@ void CavesV6::makeTunnel(bool dirswitch)
 
 	float veclen = vec.getLength();
 	// As odd as it sounds, veclen is *exactly* 0.0 sometimes, causing a FPE
-	if (veclen < 0.05)
-		veclen = 1.0;
+	if (veclen < 0.05f)
+		veclen = 1.0f;
 
 	// Every second section is rough
 	bool randomize_xz = (ps2->range(1, 2) == 1);
 
 	// Carve routes
-	for (float f = 0; f < 1.0; f += 1.0 / veclen)
+	for (float f = 0.f; f < 1.0f; f += 1.0f / veclen)
 		carveRoute(vec, f, randomize_xz, tunnel_above_ground);
 
 	orp = rp;
@@ -568,8 +568,8 @@ void CavesV6::carveRoute(v3f vec, float f, bool randomize_xz,
 	startp += of;
 
 	v3f fp = orp + vec * f;
-	fp.X += 0.1 * ps->range(-10, 10);
-	fp.Z += 0.1 * ps->range(-10, 10);
+	fp.X += 0.1f * ps->range(-10, 10);
+	fp.Z += 0.1f * ps->range(-10, 10);
 	v3s16 cp(fp.X, fp.Y, fp.Z);
 
 	s16 d0 = -rs / 2;
diff --git a/src/cavegen.h b/src/cavegen.h
index e250ad452..68e0c8bc5 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -57,7 +57,6 @@ public:
 	s16 min_tunnel_diameter;
 	s16 max_tunnel_diameter;
 	u16 tunnel_routepoints;
-	int dswitchint;
 	int part_max_length_rs;
 
 	bool large_cave;
@@ -95,7 +94,7 @@ public:
 	// If heightmap is NULL, the surface level at all points is assumed to
 	// be water_level.
 	void makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax, PseudoRandom *ps,
-			bool is_large_cave, int max_stone_height, s16 *heightmap);
+		bool is_large_cave, int max_stone_height, s16 *heightmap);
 
 private:
 	void makeTunnel(bool dirswitch);
@@ -137,7 +136,6 @@ public:
 	s16 min_tunnel_diameter;
 	s16 max_tunnel_diameter;
 	u16 tunnel_routepoints;
-	int dswitchint;
 	int part_max_length_rs;
 
 	bool large_cave;

From 548d99bb456931192609e8c6fa1eb4c80679af42 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Thu, 19 May 2016 03:40:22 -0400
Subject: [PATCH 029/418] Cavegen: Move V5-style caves to
 CavesNoiseIntersection

---
 src/cavegen.cpp        | 96 ++++++++++++++++++++++++++++++++++++++++++
 src/cavegen.h          | 37 ++++++++++++++++
 src/mapgen.cpp         | 52 ++---------------------
 src/mapgen.h           |  5 +--
 src/mapgen_flat.cpp    | 10 +----
 src/mapgen_fractal.cpp | 10 +----
 src/mapgen_v5.cpp      | 10 ++---
 src/mapgen_v7.cpp      | 10 ++---
 src/mapgen_valleys.h   |  3 ++
 9 files changed, 151 insertions(+), 82 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index 5f0af9699..51309ad60 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -23,10 +23,106 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen_v5.h"
 #include "mapgen_v6.h"
 #include "mapgen_v7.h"
+#include "mg_biome.h"
 #include "cavegen.h"
 
 NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0);
 
+
+////
+//// CavesNoiseIntersection
+////
+
+CavesNoiseIntersection::CavesNoiseIntersection(
+	INodeDefManager *nodedef, BiomeManager *biomemgr, v3s16 chunksize,
+	NoiseParams *np_cave1, NoiseParams *np_cave2, int seed, float cave_width)
+{
+	assert(nodedef);
+	assert(biomemgr);
+
+	m_ndef = nodedef;
+	m_bmgr = biomemgr;
+
+	m_csize = chunksize;
+	m_cave_width = cave_width;
+
+	m_ystride    = m_csize.X;
+	m_zstride_1d = m_csize.X * (m_csize.Y + 1);
+
+	// Noises are created using 1-down overgeneration
+	// A Nx-by-1-by-Nz-sized plane is at the bottom of the desired for
+	// re-carving the solid overtop placed for blocking sunlight
+	noise_cave1 = new Noise(np_cave1, seed, m_csize.X, m_csize.Y + 1, m_csize.Z);
+	noise_cave2 = new Noise(np_cave2, seed, m_csize.X, m_csize.Y + 1, m_csize.Z);
+}
+
+
+CavesNoiseIntersection::~CavesNoiseIntersection()
+{
+	delete noise_cave1;
+	delete noise_cave2;
+}
+
+
+void CavesNoiseIntersection::generateCaves(MMVManip *vm,
+	v3s16 nmin, v3s16 nmax, u8 *biomemap)
+{
+	assert(vm);
+	assert(biomemap);
+
+	noise_cave1->perlinMap3D(nmin.X, nmin.Y - 1, nmin.Z);
+	noise_cave2->perlinMap3D(nmin.X, nmin.Y - 1, nmin.Z);
+
+	v3s16 em = vm->m_area.getExtent();
+	u32 index2d = 0;
+
+	for (s16 z = nmin.Z; z <= nmax.Z; z++)
+	for (s16 x = nmin.X; x <= nmax.X; x++, index2d++) {
+		bool column_is_open = false;  // Is column open to overground
+		bool is_tunnel = false;  // Is tunnel or tunnel floor
+		u32 vi = vm->m_area.index(x, nmax.Y, z);
+		u32 index3d = (z - nmin.Z) * m_zstride_1d + m_csize.Y * m_ystride +
+			(x - nmin.X);
+		// Biome of column
+		Biome *biome = (Biome *)m_bmgr->getRaw(biomemap[index2d]);
+
+		// Don't excavate the overgenerated stone at nmax.Y + 1,
+		// this creates a 'roof' over the tunnel, preventing light in
+		// tunnels at mapchunk borders when generating mapchunks upwards.
+		// This 'roof' is removed when the mapchunk above is generated.
+		for (s16 y = nmax.Y; y >= nmin.Y - 1; y--,
+				index3d -= m_ystride,
+				vm->m_area.add_y(em, vi, -1)) {
+
+			content_t c = vm->m_data[vi].getContent();
+			if (c == CONTENT_AIR || c == biome->c_water_top ||
+					c == biome->c_water) {
+				column_is_open = true;
+				continue;
+			}
+			// Ground
+			float d1 = contour(noise_cave1->result[index3d]);
+			float d2 = contour(noise_cave2->result[index3d]);
+
+			if (d1 * d2 > m_cave_width && m_ndef->get(c).is_ground_content) {
+				// In tunnel and ground content, excavate
+				vm->m_data[vi] = MapNode(CONTENT_AIR);
+				is_tunnel = true;
+			} else {
+				// Not in tunnel or not ground content
+				if (is_tunnel && column_is_open &&
+						(c == biome->c_filler || c == biome->c_stone))
+					// Tunnel entrance floor
+					vm->m_data[vi] = MapNode(biome->c_top);
+
+				column_is_open = false;
+				is_tunnel = false;
+			}
+		}
+	}
+}
+
+
 ////
 //// CavesRandomWalk
 ////
diff --git a/src/cavegen.h b/src/cavegen.h
index 68e0c8bc5..da0894635 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -25,6 +25,43 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class GenerateNotifier;
 
+/*
+	CavesNoiseIntersection is a cave digging algorithm that carves smooth,
+	web-like, continuous tunnels at points where the density of the intersection
+	between two separate 3d noises is above a certain value.  This value,
+	cave_width, can be modified to set the effective width of these tunnels.
+
+	This algorithm is relatively heavyweight, taking ~80ms to generate an
+	80x80x80 chunk of map on a modern processor.  Use sparingly!
+
+	TODO(hmmmm): Remove dependency on biomes
+	TODO(hmmmm): Find alternative to overgeneration as solution for sunlight issue
+*/
+class CavesNoiseIntersection {
+public:
+	CavesNoiseIntersection(INodeDefManager *nodedef, BiomeManager *biomemgr,
+		v3s16 chunksize, NoiseParams *np_cave1, NoiseParams *np_cave2,
+		int seed, float cave_width);
+	~CavesNoiseIntersection();
+
+	void generateCaves(MMVManip *vm, v3s16 nmin, v3s16 nmax, u8 *biomemap);
+
+private:
+	INodeDefManager *m_ndef;
+	BiomeManager *m_bmgr;
+
+	// configurable parameters
+	v3s16 m_csize;
+	float m_cave_width;
+
+	// intermediate state variables
+	u16 m_ystride;
+	u16 m_zstride_1d;
+
+	Noise *noise_cave1;
+	Noise *noise_cave2;
+};
+
 /*
 	CavesRandomWalk is an implementation of a cave-digging algorithm that
 	operates on the principle of a "random walk" to approximate the stochiastic
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 09671d845..7e959533d 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -542,56 +542,10 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 	if (max_stone_y < node_min.Y)
 		return;
 
-	noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-	noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
+	CavesNoiseIntersection caves_noise(ndef, bmgr, csize,
+		&np_cave1, &np_cave2, seed, cave_width);
 
-	v3s16 em = vm->m_area.getExtent();
-	u32 index2d = 0;
-
-	for (s16 z = node_min.Z; z <= node_max.Z; z++)
-	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
-		bool column_is_open = false;  // Is column open to overground
-		bool is_tunnel = false;  // Is tunnel or tunnel floor
-		u32 vi = vm->m_area.index(x, node_max.Y, z);
-		u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride +
-			(x - node_min.X);
-		// Biome of column
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]);
-
-		// Don't excavate the overgenerated stone at node_max.Y + 1,
-		// this creates a 'roof' over the tunnel, preventing light in
-		// tunnels at mapchunk borders when generating mapchunks upwards.
-		// This 'roof' is removed when the mapchunk above is generated.
-		for (s16 y = node_max.Y; y >= node_min.Y - 1; y--,
-				index3d -= ystride,
-				vm->m_area.add_y(em, vi, -1)) {
-
-			content_t c = vm->m_data[vi].getContent();
-			if (c == CONTENT_AIR || c == biome->c_water_top ||
-					c == biome->c_water) {
-				column_is_open = true;
-				continue;
-			}
-			// Ground
-			float d1 = contour(noise_cave1->result[index3d]);
-			float d2 = contour(noise_cave2->result[index3d]);
-
-			if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) {
-				// In tunnel and ground content, excavate
-				vm->m_data[vi] = MapNode(CONTENT_AIR);
-				is_tunnel = true;
-			} else {
-				// Not in tunnel or not ground content
-				if (is_tunnel && column_is_open &&
-						(c == biome->c_filler || c == biome->c_stone))
-					// Tunnel entrance floor
-					vm->m_data[vi] = MapNode(biome->c_top);
-
-				column_is_open = false;
-				is_tunnel = false;
-			}
-		}
-	}
+	caves_noise.generateCaves(vm, node_min, node_max, biomemap);
 
 	if (node_max.Y > large_cave_depth)
 		return;
diff --git a/src/mapgen.h b/src/mapgen.h
index 3ec148296..8db01f5c1 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -220,8 +220,6 @@ public:
 	BiomeManager *bmgr;
 
 	Noise *noise_filler_depth;
-	Noise *noise_cave1;
-	Noise *noise_cave2;
 
 	v3s16 node_min;
 	v3s16 node_max;
@@ -235,7 +233,8 @@ public:
 	content_t c_sandstone;
 
 	int ystride;
-	int zstride_1d;
+	NoiseParams np_cave1;
+	NoiseParams np_cave2;
 	float cave_width;
 
 	MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge);
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 2cbf9ace0..a541a54f3 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -58,8 +58,6 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge
 	//// amount of elements to skip for the next index
 	//// for noise/height/biome maps (not vmanip)
 	this->ystride = csize.X;
-	// 1-down overgeneration
-	this->zstride_1d = csize.X * (csize.Y + 1);
 
 	this->heightmap = new s16[csize.X * csize.Z];
 
@@ -78,10 +76,8 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge
 	noise_terrain      = new Noise(&sp->np_terrain,      seed, csize.X, csize.Z);
 	noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z);
 
-	//// 3D noise
-	// 1-down overgeneraion
-	noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 1, csize.Z);
-	noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 1, csize.Z);
+	MapgenBasic::np_cave1 = sp->np_cave1;
+	MapgenBasic::np_cave2 = sp->np_cave2;
 
 	//// Initialize biome generator
 	biomegen = emerge->biomemgr->createBiomeGen(
@@ -119,8 +115,6 @@ MapgenFlat::~MapgenFlat()
 {
 	delete noise_terrain;
 	delete noise_filler_depth;
-	delete noise_cave1;
-	delete noise_cave2;
 
 	delete biomegen;
 
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index 3217d52e2..dca10d253 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -56,8 +56,6 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
 	//// amount of elements to skip for the next index
 	//// for noise/height/biome maps (not vmanip)
 	this->ystride = csize.X;
-	// 1-down overgeneration
-	this->zstride_1d = csize.X * (csize.Y + 1);
 
 	this->heightmap = new s16[csize.X * csize.Z];
 
@@ -79,10 +77,8 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
 	noise_seabed       = new Noise(&sp->np_seabed, seed, csize.X, csize.Z);
 	noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z);
 
-	//// 3D terrain noise
-	// 1-down overgeneraion
-	noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 1, csize.Z);
-	noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 1, csize.Z);
+	MapgenBasic::np_cave1 = sp->np_cave1;
+	MapgenBasic::np_cave2 = sp->np_cave2;
 
 	//// Initialize biome generator
 	biomegen = emerge->biomemgr->createBiomeGen(
@@ -123,8 +119,6 @@ MapgenFractal::~MapgenFractal()
 {
 	delete noise_seabed;
 	delete noise_filler_depth;
-	delete noise_cave1;
-	delete noise_cave2;
 
 	delete biomegen;
 
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 6c1441bc2..0c063dc6f 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -54,8 +54,6 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	// amount of elements to skip for the next index
 	// for noise/height/biome maps (not vmanip)
 	this->ystride = csize.X;
-	// 1-down overgeneration
-	this->zstride_1d = csize.X * (csize.Y + 1);
 
 	this->heightmap = new s16[csize.X * csize.Z];
 
@@ -72,9 +70,9 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	// 3D terrain noise
 	// 1-up 1-down overgeneration
 	noise_ground = new Noise(&sp->np_ground, seed, csize.X, csize.Y + 2, csize.Z);
-	// 1-down overgeneraion
-	noise_cave1  = new Noise(&sp->np_cave1,  seed, csize.X, csize.Y + 1, csize.Z);
-	noise_cave2  = new Noise(&sp->np_cave2,  seed, csize.X, csize.Y + 1, csize.Z);
+
+	MapgenBasic::np_cave1 = sp->np_cave1;
+	MapgenBasic::np_cave2 = sp->np_cave2;
 
 	//// Initialize biome generator
 	biomegen = emerge->biomemgr->createBiomeGen(
@@ -113,8 +111,6 @@ MapgenV5::~MapgenV5()
 	delete noise_filler_depth;
 	delete noise_factor;
 	delete noise_height;
-	delete noise_cave1;
-	delete noise_cave2;
 	delete noise_ground;
 
 	delete biomegen;
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index e6801a24b..e297a1d3e 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -61,8 +61,6 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	this->ystride = csize.X;
 	// 1-up 1-down overgeneration
 	this->zstride_1u1d = csize.X * (csize.Y + 2);
-	// 1-down overgeneration
-	this->zstride_1d = csize.X * (csize.Y + 1);
 
 	this->heightmap       = new s16[csize.X * csize.Z];
 	this->ridge_heightmap = new s16[csize.X * csize.Z];
@@ -85,9 +83,9 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	// 1-up 1-down overgeneration
 	noise_mountain = new Noise(&sp->np_mountain, seed, csize.X, csize.Y + 2, csize.Z);
 	noise_ridge    = new Noise(&sp->np_ridge,    seed, csize.X, csize.Y + 2, csize.Z);
-	// 1-down overgeneraion
-	noise_cave1    = new Noise(&sp->np_cave1,    seed, csize.X, csize.Y + 1, csize.Z);
-	noise_cave2    = new Noise(&sp->np_cave2,    seed, csize.X, csize.Y + 1, csize.Z);
+
+	MapgenBasic::np_cave1 = sp->np_cave1;
+	MapgenBasic::np_cave2 = sp->np_cave2;
 
 	// TODO(hmmmm): should we have a way to disable biomemanager biomes?
 	//// Initialize biome generator
@@ -133,8 +131,6 @@ MapgenV7::~MapgenV7()
 	delete noise_ridge_uwater;
 	delete noise_mountain;
 	delete noise_ridge;
-	delete noise_cave1;
-	delete noise_cave2;
 
 	delete biomegen;
 
diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index 2ab253430..4f87be6b6 100644
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -100,6 +100,7 @@ private:
 	BiomeGenOriginal *m_bgen;
 
 	int zstride;
+	int zstride_1d;
 
 	float map_gen_limit;
 
@@ -120,6 +121,8 @@ private:
 	Noise *noise_inter_valley_fill;
 	Noise *noise_inter_valley_slope;
 	Noise *noise_rivers;
+	Noise *noise_cave1;
+	Noise *noise_cave2;
 	Noise *noise_massive_caves;
 	Noise *noise_terrain_height;
 	Noise *noise_valley_depth;

From c5968049bbf73ceff08a2b1d35bb34192fa3f315 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Thu, 19 May 2016 14:05:51 -0400
Subject: [PATCH 030/418] Mapgen V7: Remove now-unused ridge heightmap

---
 src/mapgen_v7.cpp | 10 ++--------
 src/mapgen_v7.h   |  2 --
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index e297a1d3e..ee2c5f45f 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -62,8 +62,7 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	// 1-up 1-down overgeneration
 	this->zstride_1u1d = csize.X * (csize.Y + 2);
 
-	this->heightmap       = new s16[csize.X * csize.Z];
-	this->ridge_heightmap = new s16[csize.X * csize.Z];
+	this->heightmap = new s16[csize.X * csize.Z];
 
 	MapgenV7Params *sp = (MapgenV7Params *)params->sparams;
 
@@ -134,7 +133,6 @@ MapgenV7::~MapgenV7()
 
 	delete biomegen;
 
-	delete[] ridge_heightmap;
 	delete[] heightmap;
 }
 
@@ -440,8 +438,7 @@ int MapgenV7::generateTerrain()
 	for (s16 z = node_min.Z; z <= node_max.Z; z++)
 	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
 		s16 surface_y = baseTerrainLevelFromMap(index2d);
-		heightmap[index2d]       = surface_y;  // Create base terrain heightmap
-		ridge_heightmap[index2d] = surface_y;
+		heightmap[index2d] = surface_y;  // Create base terrain heightmap
 
 		if (surface_y > stone_surface_max_y)
 			stone_surface_max_y = surface_y;
@@ -504,9 +501,6 @@ void MapgenV7::generateRidgeTerrain()
 			if (nridge + width_mod * height_mod < 0.6)
 				continue;
 
-			if (y < ridge_heightmap[j])
-				ridge_heightmap[j] = y - 1;
-
 			vm->m_data[vi] = (y > water_level) ? n_air : n_water;
 		}
 	}
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 21beab2b4..eb89d5978 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -58,8 +58,6 @@ class MapgenV7 : public MapgenBasic {
 public:
 	int zstride_1u1d;
 
-	s16 *ridge_heightmap;
-
 	u32 spflags;
 	Noise *noise_terrain_base;
 	Noise *noise_terrain_alt;

From 0df5c01a8ce927c33ae9b67f459365505b980c33 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Fri, 20 May 2016 03:37:31 -0400
Subject: [PATCH 031/418] Mapgen: Remove calculateNoise from most mapgens

This commit moves noise calculation to the functions where the noise is
actually required, increasing the separation of concerns and level of
interdependency for each mapgen method.  Valleys Mapgen is left unmodified.
---
 src/mapgen.cpp         |  2 ++
 src/mapgen_flat.cpp    | 30 ++++-------------------
 src/mapgen_flat.h      |  1 -
 src/mapgen_fractal.cpp | 22 ++---------------
 src/mapgen_fractal.h   |  1 -
 src/mapgen_v5.cpp      | 27 ++++-----------------
 src/mapgen_v5.h        |  1 -
 src/mapgen_v7.cpp      | 54 ++++++++++++++----------------------------
 src/mapgen_v7.h        |  3 ---
 src/mapgen_valleys.cpp |  1 -
 10 files changed, 31 insertions(+), 111 deletions(-)

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 7e959533d..009a81f0c 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -386,6 +386,8 @@ MgStoneType MapgenBasic::generateBiomes()
 	u32 index = 0;
 	MgStoneType stone_type = MGSTONE_STONE;
 
+	noise_filler_depth->perlinMap2D(node_min.X, node_min.Z);
+
 	for (s16 z = node_min.Z; z <= node_max.Z; z++)
 	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
 		Biome *biome = NULL;
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index a541a54f3..ded859f65 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -227,9 +227,6 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 
 	blockseed = getBlockSeed2(full_node_min, seed);
 
-	// Make some noise
-	calculateNoise();
-
 	// Generate base terrain, mountains, and ridges with initial heightmaps
 	s16 stone_surface_max_y = generateTerrain();
 
@@ -312,24 +309,6 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 }
 
 
-void MapgenFlat::calculateNoise()
-{
-	//TimeTaker t("calculateNoise", NULL, PRECISION_MICRO);
-	s16 x = node_min.X;
-	s16 z = node_min.Z;
-
-	if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS))
-		noise_terrain->perlinMap2D(x, z);
-
-	// Cave noises are calculated in generateCaves()
-	// only if solid terrain is present in mapchunk
-
-	noise_filler_depth->perlinMap2D(x, z);
-
-	//printf("calculateNoise: %dus\n", t.stop());
-}
-
-
 s16 MapgenFlat::generateTerrain()
 {
 	MapNode n_air(CONTENT_AIR);
@@ -340,13 +319,14 @@ s16 MapgenFlat::generateTerrain()
 	s16 stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT;
 	u32 ni2d = 0;
 
+	bool use_noise = (spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS);
+	if (use_noise)
+		noise_terrain->perlinMap2D(node_min.X, node_min.Z);
+
 	for (s16 z = node_min.Z; z <= node_max.Z; z++)
 	for (s16 x = node_min.X; x <= node_max.X; x++, ni2d++) {
 		s16 stone_level = ground_level;
-		float n_terrain = 0.0f;
-
-		if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS))
-			n_terrain = noise_terrain->result[ni2d];
+		float n_terrain = use_noise ? noise_terrain->result[ni2d] : 0.0f;
 
 		if ((spflags & MGFLAT_LAKES) && n_terrain < lake_threshold) {
 			s16 depress = (lake_threshold - n_terrain) * lake_steepness;
diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h
index 2b98c1f31..39da6e025 100644
--- a/src/mapgen_flat.h
+++ b/src/mapgen_flat.h
@@ -78,7 +78,6 @@ public:
 
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
-	void calculateNoise();
 	s16 generateTerrain();
 };
 
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index dca10d253..f54de6275 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -243,9 +243,6 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
 
 	blockseed = getBlockSeed2(full_node_min, seed);
 
-	// Make some noise
-	calculateNoise();
-
 	// Generate base terrain, mountains, and ridges with initial heightmaps
 	s16 stone_surface_max_y = generateTerrain();
 
@@ -328,23 +325,6 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
 }
 
 
-void MapgenFractal::calculateNoise()
-{
-	//TimeTaker t("calculateNoise", NULL, PRECISION_MICRO);
-	s16 x = node_min.X;
-	s16 z = node_min.Z;
-
-	noise_seabed->perlinMap2D(x, z);
-
-	// Cave noises are calculated in generateCaves()
-	// only if solid terrain is present in mapchunk
-
-	noise_filler_depth->perlinMap2D(x, z);
-
-	//printf("calculateNoise: %dus\n", t.stop());
-}
-
-
 bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z)
 {
 	float cx, cy, cz, cw, ox, oy, oz, ow;
@@ -474,6 +454,8 @@ s16 MapgenFractal::generateTerrain()
 	s16 stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT;
 	u32 index2d = 0;
 
+	noise_seabed->perlinMap2D(node_min.X, node_min.Z);
+
 	for (s16 z = node_min.Z; z <= node_max.Z; z++) {
 		for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) {
 			u32 vi = vm->m_area.index(node_min.X, y, z);
diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index 176885d46..e30550405 100644
--- a/src/mapgen_fractal.h
+++ b/src/mapgen_fractal.h
@@ -88,7 +88,6 @@ public:
 
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
-	void calculateNoise();
 	bool getFractalAtPoint(s16 x, s16 y, s16 z);
 	s16 generateTerrain();
 };
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 0c063dc6f..85df34353 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -225,9 +225,6 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 	// Create a block-specific seed
 	blockseed = getBlockSeed2(full_node_min, seed);
 
-	// Make some noise
-	calculateNoise();
-
 	// Generate base terrain
 	s16 stone_surface_max_y = generateBaseTerrain();
 
@@ -312,26 +309,6 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 }
 
 
-void MapgenV5::calculateNoise()
-{
-	//TimeTaker t("calculateNoise", NULL, PRECISION_MICRO);
-	s16 x = node_min.X;
-	s16 y = node_min.Y - 1;
-	s16 z = node_min.Z;
-
-	noise_factor->perlinMap2D(x, z);
-	noise_height->perlinMap2D(x, z);
-	noise_ground->perlinMap3D(x, y, z);
-
-	// Cave noises are calculated in generateCaves()
-	// only if solid terrain is present in mapchunk
-
-	noise_filler_depth->perlinMap2D(x, z);
-
-	//printf("calculateNoise: %dus\n", t.stop());
-}
-
-
 //bool is_cave(u32 index) {
 //	double d1 = contour(noise_cave1->result[index]);
 //	double d2 = contour(noise_cave2->result[index]);
@@ -355,6 +332,10 @@ int MapgenV5::generateBaseTerrain()
 	u32 index2d = 0;
 	int stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT;
 
+	noise_factor->perlinMap2D(node_min.X, node_min.Z);
+	noise_height->perlinMap2D(node_min.X, node_min.Z);
+	noise_ground->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
+
 	for (s16 z=node_min.Z; z<=node_max.Z; z++) {
 		for (s16 y=node_min.Y - 1; y<=node_max.Y + 1; y++) {
 			u32 vi = vm->m_area.index(node_min.X, y, z);
diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index 99836b23e..dd5ca0a31 100644
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -69,7 +69,6 @@ public:
 
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
-	void calculateNoise();
 	int generateBaseTerrain();
 };
 
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index ee2c5f45f..5c5f13b88 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -252,9 +252,6 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 
 	blockseed = getBlockSeed2(full_node_min, seed);
 
-	// Make some noise
-	calculateNoise();
-
 	// Generate terrain and ridges with initial heightmaps
 	s16 stone_surface_max_y = generateTerrain();
 
@@ -340,37 +337,6 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 }
 
 
-void MapgenV7::calculateNoise()
-{
-	//TimeTaker t("calculateNoise", NULL, PRECISION_MICRO);
-	s16 x = node_min.X;
-	s16 y = node_min.Y - 1;
-	s16 z = node_min.Z;
-
-	noise_terrain_persist->perlinMap2D(x, z);
-	float *persistmap = noise_terrain_persist->result;
-
-	noise_terrain_base->perlinMap2D(x, z, persistmap);
-	noise_terrain_alt->perlinMap2D(x, z, persistmap);
-	noise_height_select->perlinMap2D(x, z);
-
-	if (spflags & MGV7_MOUNTAINS) {
-		noise_mountain->perlinMap3D(x, y, z);
-		noise_mount_height->perlinMap2D(x, z);
-	}
-
-	if ((spflags & MGV7_RIDGES) && node_max.Y >= water_level) {
-		noise_ridge->perlinMap3D(x, y, z);
-		noise_ridge_uwater->perlinMap2D(x, z);
-	}
-
-	// Cave noises are calculated in generateCaves()
-	// only if solid terrain is present in mapchunk
-
-	//printf("calculateNoise: %dus\n", t.stop());
-}
-
-
 float MapgenV7::baseTerrainLevelAtPoint(s16 x, s16 z)
 {
 	float hselect = NoisePerlin2D(&noise_height_select->np, x, z, seed);
@@ -430,10 +396,23 @@ int MapgenV7::generateTerrain()
 	MapNode n_stone(c_stone);
 	MapNode n_water(c_water_source);
 
+	//// Calculate noise for terrain generation
+	noise_terrain_persist->perlinMap2D(node_min.X, node_min.Z);
+	float *persistmap = noise_terrain_persist->result;
+
+	noise_terrain_base->perlinMap2D(node_min.X, node_min.Z, persistmap);
+	noise_terrain_alt->perlinMap2D(node_min.X, node_min.Z, persistmap);
+	noise_height_select->perlinMap2D(node_min.X, node_min.Z);
+
+	if (spflags & MGV7_MOUNTAINS) {
+		noise_mountain->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
+		noise_mount_height->perlinMap2D(node_min.X, node_min.Z);
+	}
+
+	//// Place nodes
 	v3s16 em = vm->m_area.getExtent();
 	s16 stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT;
 	u32 index2d = 0;
-	bool mountain_flag = spflags & MGV7_MOUNTAINS;
 
 	for (s16 z = node_min.Z; z <= node_max.Z; z++)
 	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
@@ -450,7 +429,7 @@ int MapgenV7::generateTerrain()
 			if (vm->m_data[vi].getContent() == CONTENT_IGNORE) {
 				if (y <= surface_y) {
 					vm->m_data[vi] = n_stone;  // Base terrain
-				} else if (mountain_flag &&
+				} else if ((spflags & MGV7_MOUNTAINS) &&
 						getMountainTerrainFromMap(index3d, index2d, y)) {
 					vm->m_data[vi] = n_stone;  // Mountain terrain
 					if (y > stone_surface_max_y)
@@ -475,6 +454,9 @@ void MapgenV7::generateRidgeTerrain()
 	if (node_max.Y < water_level - 16)
 		return;
 
+	noise_ridge->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
+	noise_ridge_uwater->perlinMap2D(node_min.X, node_min.Z);
+
 	MapNode n_water(c_water_source);
 	MapNode n_air(CONTENT_AIR);
 	u32 index = 0;
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index eb89d5978..723f1217f 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -87,9 +87,6 @@ public:
 	float baseTerrainLevelFromMap(int index);
 	bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
 	bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
-
-	void calculateNoise();
-
 	int generateTerrain();
 	void generateRidgeTerrain();
 };
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 699554ecd..3a4f984f9 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -388,7 +388,6 @@ void MapgenValleys::calculateNoise()
 
 	//TimeTaker tcn("actualNoise");
 
-	noise_filler_depth->perlinMap2D(x, z);
 	noise_inter_valley_slope->perlinMap2D(x, z);
 	noise_rivers->perlinMap2D(x, z);
 	noise_terrain_height->perlinMap2D(x, z);

From 081090176666e849d01f9a02b15279bdf72570bc Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sun, 22 May 2016 02:17:19 -0400
Subject: [PATCH 032/418] Mapgen: Deduplicate common constructor code

---
 src/mapgen.cpp         | 55 ++++++++++++++++++++++++++++++++++++++++--
 src/mapgen.h           | 22 +++++++++++------
 src/mapgen_flat.cpp    | 30 ++---------------------
 src/mapgen_flat.h      | 19 ++++++---------
 src/mapgen_fractal.cpp | 30 ++---------------------
 src/mapgen_fractal.h   | 21 +++++++---------
 src/mapgen_v5.cpp      | 30 ++---------------------
 src/mapgen_v5.h        | 25 +++++++++----------
 src/mapgen_v7.cpp      | 33 ++-----------------------
 src/mapgen_v7.h        | 37 ++++++++++++----------------
 src/mapgen_valleys.cpp | 42 ++++++--------------------------
 src/mapgen_valleys.h   |  5 ----
 12 files changed, 128 insertions(+), 221 deletions(-)

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 009a81f0c..a2d207bff 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -377,9 +377,60 @@ void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
 MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	: Mapgen(mapgenid, params, emerge)
 {
+	this->m_emerge = emerge;
+	this->m_bmgr   = emerge->biomemgr;
 
+	//// Here, 'stride' refers to the number of elements needed to skip to index
+	//// an adjacent element for that coordinate in noise/height/biome maps
+	//// (*not* vmanip content map!)
+
+	// Note there is no X stride explicitly defined.  Items adjacent in the X
+	// coordinate are assumed to be adjacent in memory as well (i.e. stride of 1).
+
+	// Number of elements to skip to get to the next Y coordinate
+	this->ystride = csize.X;
+
+	// Number of elements to skip to get to the next Z coordinate
+	this->zstride = csize.X * csize.Y;
+
+	// Z-stride value for maps oversized for 1-down overgeneration
+	this->zstride_1d = csize.X * (csize.Y + 1);
+
+	// Z-stride value for maps oversized for 1-up 1-down overgeneration
+	this->zstride_1u1d = csize.X * (csize.Y + 2);
+
+	//// Allocate heightmap
+	this->heightmap = new s16[csize.X * csize.Z];
+
+	//// Initialize biome generator
+	// TODO(hmmmm): should we have a way to disable biomemanager biomes?
+	biomegen = m_bmgr->createBiomeGen(BIOMEGEN_ORIGINAL, params->bparams, csize);
+	biomemap = biomegen->biomemap;
+
+	//// Look up some commonly used content
+	c_stone              = ndef->getId("mapgen_stone");
+	c_water_source       = ndef->getId("mapgen_water_source");
+	c_desert_stone       = ndef->getId("mapgen_desert_stone");
+	c_sandstone          = ndef->getId("mapgen_sandstone");
+	c_river_water_source = ndef->getId("mapgen_river_water_source");
+
+	//// Fall back to more basic content if not defined
+	if (c_desert_stone == CONTENT_IGNORE)
+		c_desert_stone = c_stone;
+	if (c_sandstone == CONTENT_IGNORE)
+		c_sandstone = c_stone;
+	if (c_river_water_source == CONTENT_IGNORE)
+		c_river_water_source = c_water_source;
 }
 
+
+MapgenBasic::~MapgenBasic()
+{
+	delete biomegen;
+	delete []heightmap;
+}
+
+
 MgStoneType MapgenBasic::generateBiomes()
 {
 	v3s16 em = vm->m_area.getExtent();
@@ -499,7 +550,7 @@ void MapgenBasic::dustTopNodes()
 
 	for (s16 z = node_min.Z; z <= node_max.Z; z++)
 	for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
+		Biome *biome = (Biome *)m_bmgr->getRaw(biomemap[index]);
 
 		if (biome->c_dust == CONTENT_IGNORE)
 			continue;
@@ -544,7 +595,7 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 	if (max_stone_y < node_min.Y)
 		return;
 
-	CavesNoiseIntersection caves_noise(ndef, bmgr, csize,
+	CavesNoiseIntersection caves_noise(ndef, m_bmgr, csize,
 		&np_cave1, &np_cave2, seed, cave_width);
 
 	caves_noise.generateCaves(vm, node_min, node_max, biomemap);
diff --git a/src/mapgen.h b/src/mapgen.h
index 8db01f5c1..0b552e508 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -216,8 +216,16 @@ private:
 */
 class MapgenBasic : public Mapgen {
 public:
+	MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	virtual ~MapgenBasic();
+
+	virtual MgStoneType generateBiomes();
+	virtual void dustTopNodes();
+	virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
+
+protected:
 	EmergeManager *m_emerge;
-	BiomeManager *bmgr;
+	BiomeManager *m_bmgr;
 
 	Noise *noise_filler_depth;
 
@@ -233,15 +241,15 @@ public:
 	content_t c_sandstone;
 
 	int ystride;
+	int zstride;
+	int zstride_1d;
+	int zstride_1u1d;
+
+	u32 spflags;
+
 	NoiseParams np_cave1;
 	NoiseParams np_cave2;
 	float cave_width;
-
-	MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-
-	virtual MgStoneType generateBiomes();
-	virtual void dustTopNodes();
-	virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
 };
 
 struct MapgenFactory {
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index ded859f65..cc43684c4 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -52,15 +52,6 @@ FlagDesc flagdesc_mapgen_flat[] = {
 MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	this->m_emerge = emerge;
-	this->bmgr     = emerge->biomemgr;
-
-	//// amount of elements to skip for the next index
-	//// for noise/height/biome maps (not vmanip)
-	this->ystride = csize.X;
-
-	this->heightmap = new s16[csize.X * csize.Z];
-
 	MapgenFlatParams *sp = (MapgenFlatParams *)params->sparams;
 
 	this->spflags          = sp->spflags;
@@ -79,27 +70,14 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge
 	MapgenBasic::np_cave1 = sp->np_cave1;
 	MapgenBasic::np_cave2 = sp->np_cave2;
 
-	//// Initialize biome generator
-	biomegen = emerge->biomemgr->createBiomeGen(
-		BIOMEGEN_ORIGINAL, params->bparams, csize);
-	biomemap = biomegen->biomemap;
-
-	//// Resolve nodes to be used
-	c_stone                = ndef->getId("mapgen_stone");
-	c_water_source         = ndef->getId("mapgen_water_source");
-	c_lava_source          = ndef->getId("mapgen_lava_source");
-	c_desert_stone         = ndef->getId("mapgen_desert_stone");
-	c_ice                  = ndef->getId("mapgen_ice");
-	c_sandstone            = ndef->getId("mapgen_sandstone");
-
+	// Content used for dungeon generation
 	c_cobble               = ndef->getId("mapgen_cobble");
 	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
 	c_mossycobble          = ndef->getId("mapgen_mossycobble");
 	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
 	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
 
-	if (c_ice == CONTENT_IGNORE)
-		c_ice = CONTENT_AIR;
+	// Fall back to more basic content if not defined
 	if (c_mossycobble == CONTENT_IGNORE)
 		c_mossycobble = c_cobble;
 	if (c_stair_cobble == CONTENT_IGNORE)
@@ -115,10 +93,6 @@ MapgenFlat::~MapgenFlat()
 {
 	delete noise_terrain;
 	delete noise_filler_depth;
-
-	delete biomegen;
-
-	delete[] heightmap;
 }
 
 
diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h
index 39da6e025..ffec4b924 100644
--- a/src/mapgen_flat.h
+++ b/src/mapgen_flat.h
@@ -55,7 +55,14 @@ struct MapgenFlatParams : public MapgenSpecificParams {
 
 class MapgenFlat : public MapgenBasic {
 public:
-	u32 spflags;
+	MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	~MapgenFlat();
+
+	virtual void makeChunk(BlockMakeData *data);
+	int getSpawnLevelAtPoint(v2s16 p);
+	s16 generateTerrain();
+
+private:
 	s16 ground_level;
 	s16 large_cave_depth;
 	float lake_threshold;
@@ -64,21 +71,11 @@ public:
 	float hill_steepness;
 	Noise *noise_terrain;
 
-	content_t c_lava_source;
-	content_t c_ice;
-
 	content_t c_cobble;
 	content_t c_stair_cobble;
 	content_t c_mossycobble;
 	content_t c_sandstonebrick;
 	content_t c_stair_sandstonebrick;
-
-	MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-	~MapgenFlat();
-
-	virtual void makeChunk(BlockMakeData *data);
-	int getSpawnLevelAtPoint(v2s16 p);
-	s16 generateTerrain();
 };
 
 struct MapgenFactoryFlat : public MapgenFactory {
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index f54de6275..50e10d128 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -50,15 +50,6 @@ FlagDesc flagdesc_mapgen_fractal[] = {
 MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	this->m_emerge = emerge;
-	this->bmgr     = emerge->biomemgr;
-
-	//// amount of elements to skip for the next index
-	//// for noise/height/biome maps (not vmanip)
-	this->ystride = csize.X;
-
-	this->heightmap = new s16[csize.X * csize.Z];
-
 	MapgenFractalParams *sp = (MapgenFractalParams *)params->sparams;
 
 	this->spflags    = sp->spflags;
@@ -80,30 +71,17 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
 	MapgenBasic::np_cave1 = sp->np_cave1;
 	MapgenBasic::np_cave2 = sp->np_cave2;
 
-	//// Initialize biome generator
-	biomegen = emerge->biomemgr->createBiomeGen(
-		BIOMEGEN_ORIGINAL, params->bparams, csize);
-	biomemap = biomegen->biomemap;
-
 	this->formula = fractal / 2 + fractal % 2;
 	this->julia   = fractal % 2 == 0;
 
-	//// Resolve nodes to be used
-	c_stone                = ndef->getId("mapgen_stone");
-	c_water_source         = ndef->getId("mapgen_water_source");
-	c_lava_source          = ndef->getId("mapgen_lava_source");
-	c_desert_stone         = ndef->getId("mapgen_desert_stone");
-	c_ice                  = ndef->getId("mapgen_ice");
-	c_sandstone            = ndef->getId("mapgen_sandstone");
-
+	// Content used for dungeon generation
 	c_cobble               = ndef->getId("mapgen_cobble");
 	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
 	c_mossycobble          = ndef->getId("mapgen_mossycobble");
 	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
 	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
 
-	if (c_ice == CONTENT_IGNORE)
-		c_ice = CONTENT_AIR;
+	// Fall back to more basic content if not defined
 	if (c_mossycobble == CONTENT_IGNORE)
 		c_mossycobble = c_cobble;
 	if (c_stair_cobble == CONTENT_IGNORE)
@@ -119,10 +97,6 @@ MapgenFractal::~MapgenFractal()
 {
 	delete noise_seabed;
 	delete noise_filler_depth;
-
-	delete biomegen;
-
-	delete[] heightmap;
 }
 
 
diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index e30550405..de0ccaa2f 100644
--- a/src/mapgen_fractal.h
+++ b/src/mapgen_fractal.h
@@ -59,10 +59,18 @@ struct MapgenFractalParams : public MapgenSpecificParams {
 
 class MapgenFractal : public MapgenBasic {
 public:
+	MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	~MapgenFractal();
+
+	virtual void makeChunk(BlockMakeData *data);
+	int getSpawnLevelAtPoint(v2s16 p);
+	bool getFractalAtPoint(s16 x, s16 y, s16 z);
+	s16 generateTerrain();
+
+private:
 	u16 formula;
 	bool julia;
 
-	u32 spflags;
 	u16 fractal;
 	u16 iterations;
 	v3f scale;
@@ -74,22 +82,11 @@ public:
 	float julia_w;
 	Noise *noise_seabed;
 
-	content_t c_lava_source;
-	content_t c_ice;
-
 	content_t c_cobble;
 	content_t c_stair_cobble;
 	content_t c_mossycobble;
 	content_t c_sandstonebrick;
 	content_t c_stair_sandstonebrick;
-
-	MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-	~MapgenFractal();
-
-	virtual void makeChunk(BlockMakeData *data);
-	int getSpawnLevelAtPoint(v2s16 p);
-	bool getFractalAtPoint(s16 x, s16 y, s16 z);
-	s16 generateTerrain();
 };
 
 struct MapgenFactoryFractal : public MapgenFactory {
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 85df34353..167a38282 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -48,15 +48,6 @@ FlagDesc flagdesc_mapgen_v5[] = {
 MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	this->m_emerge = emerge;
-	this->bmgr     = emerge->biomemgr;
-
-	// amount of elements to skip for the next index
-	// for noise/height/biome maps (not vmanip)
-	this->ystride = csize.X;
-
-	this->heightmap = new s16[csize.X * csize.Z];
-
 	MapgenV5Params *sp = (MapgenV5Params *)params->sparams;
 
 	this->spflags    = sp->spflags;
@@ -74,27 +65,14 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	MapgenBasic::np_cave1 = sp->np_cave1;
 	MapgenBasic::np_cave2 = sp->np_cave2;
 
-	//// Initialize biome generator
-	biomegen = emerge->biomemgr->createBiomeGen(
-		BIOMEGEN_ORIGINAL, params->bparams, csize);
-	biomemap = biomegen->biomemap;
-
-	//// Resolve nodes to be used
-	c_stone                = ndef->getId("mapgen_stone");
-	c_water_source         = ndef->getId("mapgen_water_source");
-	c_lava_source          = ndef->getId("mapgen_lava_source");
-	c_desert_stone         = ndef->getId("mapgen_desert_stone");
-	c_ice                  = ndef->getId("mapgen_ice");
-	c_sandstone            = ndef->getId("mapgen_sandstone");
-
+	// Content used for dungeon generation
 	c_cobble               = ndef->getId("mapgen_cobble");
 	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
 	c_mossycobble          = ndef->getId("mapgen_mossycobble");
 	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
 	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
 
-	if (c_ice == CONTENT_IGNORE)
-		c_ice = CONTENT_AIR;
+	// Fall back to more basic content if not defined
 	if (c_mossycobble == CONTENT_IGNORE)
 		c_mossycobble = c_cobble;
 	if (c_stair_cobble == CONTENT_IGNORE)
@@ -112,10 +90,6 @@ MapgenV5::~MapgenV5()
 	delete noise_factor;
 	delete noise_height;
 	delete noise_ground;
-
-	delete biomegen;
-
-	delete[] heightmap;
 }
 
 
diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index dd5ca0a31..e7e5b2327 100644
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -50,26 +50,23 @@ struct MapgenV5Params : public MapgenSpecificParams {
 
 class MapgenV5 : public MapgenBasic {
 public:
-	u32 spflags;
-	Noise *noise_factor;
-	Noise *noise_height;
-	Noise *noise_ground;
-
-	content_t c_lava_source;
-	content_t c_ice;
-
-	content_t c_cobble;
-	content_t c_stair_cobble;
-	content_t c_mossycobble;
-	content_t c_sandstonebrick;
-	content_t c_stair_sandstonebrick;
-
 	MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	~MapgenV5();
 
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
 	int generateBaseTerrain();
+
+private:
+	Noise *noise_factor;
+	Noise *noise_height;
+	Noise *noise_ground;
+
+	content_t c_cobble;
+	content_t c_stair_cobble;
+	content_t c_mossycobble;
+	content_t c_sandstonebrick;
+	content_t c_stair_sandstonebrick;
 };
 
 
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 5c5f13b88..29c81e8a7 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -53,17 +53,6 @@ FlagDesc flagdesc_mapgen_v7[] = {
 MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	this->m_emerge = emerge;
-	this->bmgr     = emerge->biomemgr;
-
-	//// amount of elements to skip for the next index
-	//// for noise/height/biome maps (not vmanip)
-	this->ystride = csize.X;
-	// 1-up 1-down overgeneration
-	this->zstride_1u1d = csize.X * (csize.Y + 2);
-
-	this->heightmap = new s16[csize.X * csize.Z];
-
 	MapgenV7Params *sp = (MapgenV7Params *)params->sparams;
 
 	this->spflags    = sp->spflags;
@@ -86,28 +75,14 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	MapgenBasic::np_cave1 = sp->np_cave1;
 	MapgenBasic::np_cave2 = sp->np_cave2;
 
-	// TODO(hmmmm): should we have a way to disable biomemanager biomes?
-	//// Initialize biome generator
-	biomegen = emerge->biomemgr->createBiomeGen(
-		BIOMEGEN_ORIGINAL, params->bparams, csize);
-	biomemap = biomegen->biomemap;
-
-	//// Resolve nodes to be used
-	c_stone                = ndef->getId("mapgen_stone");
-	c_water_source         = ndef->getId("mapgen_water_source");
-	c_lava_source          = ndef->getId("mapgen_lava_source");
-	c_desert_stone         = ndef->getId("mapgen_desert_stone");
-	c_ice                  = ndef->getId("mapgen_ice");
-	c_sandstone            = ndef->getId("mapgen_sandstone");
-
+	// Content used for dungeon generation
 	c_cobble               = ndef->getId("mapgen_cobble");
 	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
 	c_mossycobble          = ndef->getId("mapgen_mossycobble");
 	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
 	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
 
-	if (c_ice == CONTENT_IGNORE)
-		c_ice = CONTENT_AIR;
+	// Fall back to more basic content if not defined
 	if (c_mossycobble == CONTENT_IGNORE)
 		c_mossycobble = c_cobble;
 	if (c_stair_cobble == CONTENT_IGNORE)
@@ -130,10 +105,6 @@ MapgenV7::~MapgenV7()
 	delete noise_ridge_uwater;
 	delete noise_mountain;
 	delete noise_ridge;
-
-	delete biomegen;
-
-	delete[] heightmap;
 }
 
 
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 723f1217f..aee171b48 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -56,27 +56,6 @@ struct MapgenV7Params : public MapgenSpecificParams {
 
 class MapgenV7 : public MapgenBasic {
 public:
-	int zstride_1u1d;
-
-	u32 spflags;
-	Noise *noise_terrain_base;
-	Noise *noise_terrain_alt;
-	Noise *noise_terrain_persist;
-	Noise *noise_height_select;
-	Noise *noise_mount_height;
-	Noise *noise_ridge_uwater;
-	Noise *noise_mountain;
-	Noise *noise_ridge;
-
-	content_t c_lava_source;
-	content_t c_ice;
-
-	content_t c_cobble;
-	content_t c_stair_cobble;
-	content_t c_mossycobble;
-	content_t c_sandstonebrick;
-	content_t c_stair_sandstonebrick;
-
 	MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	~MapgenV7();
 
@@ -89,6 +68,22 @@ public:
 	bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
 	int generateTerrain();
 	void generateRidgeTerrain();
+
+private:
+	Noise *noise_terrain_base;
+	Noise *noise_terrain_alt;
+	Noise *noise_terrain_persist;
+	Noise *noise_height_select;
+	Noise *noise_mount_height;
+	Noise *noise_ridge_uwater;
+	Noise *noise_mountain;
+	Noise *noise_ridge;
+
+	content_t c_cobble;
+	content_t c_stair_cobble;
+	content_t c_mossycobble;
+	content_t c_sandstonebrick;
+	content_t c_stair_sandstonebrick;
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 3a4f984f9..c0094eb3b 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -67,17 +67,8 @@ static FlagDesc flagdesc_mapgen_valleys[] = {
 MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	this->m_emerge = emerge;
-	this->bmgr     = emerge->biomemgr;
-
-	//// amount of elements to skip for the next index
-	//// for noise/height/biome maps (not vmanip)
-	this->ystride = csize.X;
-	this->zstride = csize.X * (csize.Y + 2);
-	// 1-down overgeneration
-	this->zstride_1d = csize.X * (csize.Y + 1);
-
-	this->heightmap = new s16[csize.X * csize.Z];
+	// NOTE: MapgenValleys has a hard dependency on BiomeGenOriginal
+	this->m_bgen = (BiomeGenOriginal *)biomegen;
 
 	this->map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT,
 			g_settings->getU16("map_generation_limit"));
@@ -111,13 +102,6 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
 	noise_cave2             = new Noise(&sp->np_cave2,             seed, csize.X, csize.Y + 1, csize.Z);
 	noise_massive_caves     = new Noise(&sp->np_massive_caves,     seed, csize.X, csize.Y + 1, csize.Z);
 
-	//// Initialize biome generator
-	// NOTE: valleys mapgen can only use BiomeGenOriginal
-	biomegen = emerge->biomemgr->createBiomeGen(
-		BIOMEGEN_ORIGINAL, params->bparams, csize);
-	biomemap = biomegen->biomemap;
-	m_bgen = (BiomeGenOriginal *)biomegen;
-
 	this->humid_rivers       = (spflags & MGVALLEYS_HUMID_RIVERS);
 	this->use_altitude_chill = (spflags & MGVALLEYS_ALT_CHILL);
 	this->humidity_adjust    = bp->np_humidity.offset - 50.f;
@@ -128,25 +112,18 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
 
 	tcave_cache = new float[csize.Y + 2];
 
-	//// Resolve nodes to be used
+	// Resolve content to be used
 	c_cobble               = ndef->getId("mapgen_cobble");
-	c_desert_stone         = ndef->getId("mapgen_desert_stone");
-	c_dirt                 = ndef->getId("mapgen_dirt");
 	c_lava_source          = ndef->getId("mapgen_lava_source");
 	c_mossycobble          = ndef->getId("mapgen_mossycobble");
-	c_river_water_source   = ndef->getId("mapgen_river_water_source");
 	c_sand                 = ndef->getId("mapgen_sand");
 	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
-	c_sandstone            = ndef->getId("mapgen_sandstone");
 	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
 	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
-	c_stone                = ndef->getId("mapgen_stone");
-	c_water_source         = ndef->getId("mapgen_water_source");
 
+	// Fall back to more basic content if not defined
 	if (c_mossycobble == CONTENT_IGNORE)
 		c_mossycobble = c_cobble;
-	if (c_river_water_source == CONTENT_IGNORE)
-		c_river_water_source = c_water_source;
 	if (c_sand == CONTENT_IGNORE)
 		c_sand = c_stone;
 	if (c_sandstonebrick == CONTENT_IGNORE)
@@ -171,9 +148,6 @@ MapgenValleys::~MapgenValleys()
 	delete noise_valley_depth;
 	delete noise_valley_profile;
 
-	delete biomegen;
-
-	delete[] heightmap;
 	delete[] tcave_cache;
 }
 
@@ -289,13 +263,13 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
 	// Generate biome noises.  Note this must be executed strictly before
 	// generateTerrain, because generateTerrain depends on intermediate
 	// biome-related noises.
-	biomegen->calcBiomeNoise(node_min);
+	m_bgen->calcBiomeNoise(node_min);
 
 	// Generate base terrain with initial heightmaps
 	s16 stone_surface_max_y = generateTerrain();
 
 	// Build biomemap
-	biomegen->getBiomes(heightmap);
+	m_bgen->getBiomes(heightmap);
 
 	// Place biome-specific nodes
 	MgStoneType stone_type = generateBiomes();
@@ -606,7 +580,7 @@ int MapgenValleys::generateTerrain()
 			}
 		}
 
-		u32 index_3d = (z - node_min.Z) * zstride + (x - node_min.X);
+		u32 index_3d = (z - node_min.Z) * zstride_1u1d + (x - node_min.X);
 		u32 index_data = vm->m_area.index(x, node_min.Y - 1, z);
 
 		// Mapgens concern themselves with stone and water.
@@ -755,7 +729,7 @@ void MapgenValleys::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 	u32 index_2d = 0;
 	for (s16 z = node_min.Z; z <= node_max.Z; z++)
 	for (s16 x = node_min.X; x <= node_max.X; x++, index_2d++) {
-		Biome *biome = (Biome *)bmgr->getRaw(biomemap[index_2d]);
+		Biome *biome = (Biome *)m_bmgr->getRaw(biomemap[index_2d]);
 		bool tunnel_air_above = false;
 		bool underground = false;
 		u32 index_data = vm->m_area.index(x, node_max.Y, z);
diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index 4f87be6b6..bab3a756e 100644
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -99,9 +99,6 @@ public:
 private:
 	BiomeGenOriginal *m_bgen;
 
-	int zstride;
-	int zstride_1d;
-
 	float map_gen_limit;
 
 	bool humid_rivers;
@@ -110,7 +107,6 @@ private:
 	s16 cave_water_max_height;
 	s16 lava_max_height;
 
-	u32 spflags;
 	float altitude_chill;
 	s16 lava_features_lim;
 	s16 massive_cave_depth;
@@ -129,7 +125,6 @@ private:
 	Noise *noise_valley_profile;
 
 	content_t c_cobble;
-	content_t c_dirt;
 	content_t c_lava_source;
 	content_t c_mossycobble;
 	content_t c_sand;

From fd0efb21c3d40a963a813d73a09bb80df625b247 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sun, 22 May 2016 16:27:31 -0400
Subject: [PATCH 033/418] Mapgen: Combine dungeon generation code

---
 src/mapgen.cpp         | 73 +++++++++++++++++++++++++++++++++++++++++-
 src/mapgen.h           | 11 ++++++-
 src/mapgen_flat.cpp    | 61 ++---------------------------------
 src/mapgen_flat.h      |  6 ----
 src/mapgen_fractal.cpp | 61 ++---------------------------------
 src/mapgen_fractal.h   |  6 ----
 src/mapgen_v5.cpp      | 61 ++---------------------------------
 src/mapgen_v5.h        |  6 ----
 src/mapgen_v7.cpp      | 61 ++---------------------------------
 src/mapgen_v7.h        |  6 ----
 src/mapgen_valleys.cpp | 61 +++--------------------------------
 src/mapgen_valleys.h   |  5 ---
 12 files changed, 94 insertions(+), 324 deletions(-)

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index a2d207bff..56fe34e16 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -40,6 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "log.h"
 #include "cavegen.h"
+#include "dungeongen.h"
 
 FlagDesc flagdesc_mapgen[] = {
 	{"trees",       MG_TREES},
@@ -414,13 +415,30 @@ MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emer
 	c_sandstone          = ndef->getId("mapgen_sandstone");
 	c_river_water_source = ndef->getId("mapgen_river_water_source");
 
-	//// Fall back to more basic content if not defined
+	// Fall back to more basic content if not defined
 	if (c_desert_stone == CONTENT_IGNORE)
 		c_desert_stone = c_stone;
 	if (c_sandstone == CONTENT_IGNORE)
 		c_sandstone = c_stone;
 	if (c_river_water_source == CONTENT_IGNORE)
 		c_river_water_source = c_water_source;
+
+	//// Content used for dungeon generation
+	c_cobble               = ndef->getId("mapgen_cobble");
+	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
+	c_mossycobble          = ndef->getId("mapgen_mossycobble");
+	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
+	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
+
+	// Fall back to more basic content if not defined
+	if (c_mossycobble == CONTENT_IGNORE)
+		c_mossycobble = c_cobble;
+	if (c_stair_cobble == CONTENT_IGNORE)
+		c_stair_cobble = c_cobble;
+	if (c_sandstonebrick == CONTENT_IGNORE)
+		c_sandstonebrick = c_sandstone;
+	if (c_stair_sandstonebrick == CONTENT_IGNORE)
+		c_stair_sandstonebrick = c_sandstone;
 }
 
 
@@ -614,6 +632,59 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 }
 
 
+void MapgenBasic::generateDungeons(s16 max_stone_y, MgStoneType stone_type)
+{
+	if (max_stone_y < node_min.Y)
+		return;
+
+	DungeonParams dp;
+
+	dp.np_rarity  = nparams_dungeon_rarity;
+	dp.np_density = nparams_dungeon_density;
+	dp.np_wetness = nparams_dungeon_wetness;
+	dp.c_water    = c_water_source;
+	switch (stone_type) {
+	default:
+	case MGSTONE_STONE:
+		dp.c_cobble = c_cobble;
+		dp.c_moss   = c_mossycobble;
+		dp.c_stair  = c_stair_cobble;
+
+		dp.diagonal_dirs = false;
+		dp.mossratio     = 3.0;
+		dp.holesize      = v3s16(1, 2, 1);
+		dp.roomsize      = v3s16(0, 0, 0);
+		dp.notifytype    = GENNOTIFY_DUNGEON;
+		break;
+	case MGSTONE_DESERT_STONE:
+		dp.c_cobble = c_desert_stone;
+		dp.c_moss   = c_desert_stone;
+		dp.c_stair  = c_desert_stone;
+
+		dp.diagonal_dirs = true;
+		dp.mossratio     = 0.0;
+		dp.holesize      = v3s16(2, 3, 2);
+		dp.roomsize      = v3s16(2, 5, 2);
+		dp.notifytype    = GENNOTIFY_TEMPLE;
+		break;
+	case MGSTONE_SANDSTONE:
+		dp.c_cobble = c_sandstonebrick;
+		dp.c_moss   = c_sandstonebrick;
+		dp.c_stair  = c_sandstonebrick;
+
+		dp.diagonal_dirs = false;
+		dp.mossratio     = 0.0;
+		dp.holesize      = v3s16(2, 2, 2);
+		dp.roomsize      = v3s16(2, 0, 2);
+		dp.notifytype    = GENNOTIFY_DUNGEON;
+		break;
+	}
+
+	DungeonGen dgen(this, &dp);
+	dgen.generate(blockseed, full_node_min, full_node_max);
+}
+
+
 ////
 //// GenerateNotifier
 ////
diff --git a/src/mapgen.h b/src/mapgen.h
index 0b552e508..10595fafc 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -219,9 +219,10 @@ public:
 	MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	virtual ~MapgenBasic();
 
+	virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
+	virtual void generateDungeons(s16 max_stone_y, MgStoneType stone_type);
 	virtual MgStoneType generateBiomes();
 	virtual void dustTopNodes();
-	virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
 
 protected:
 	EmergeManager *m_emerge;
@@ -234,12 +235,20 @@ protected:
 	v3s16 full_node_min;
 	v3s16 full_node_max;
 
+	// Content required for generateBiomes
 	content_t c_stone;
 	content_t c_water_source;
 	content_t c_river_water_source;
 	content_t c_desert_stone;
 	content_t c_sandstone;
 
+	// Content required for generateDungeons
+	content_t c_cobble;
+	content_t c_stair_cobble;
+	content_t c_mossycobble;
+	content_t c_sandstonebrick;
+	content_t c_stair_sandstonebrick;
+
 	int ystride;
 	int zstride;
 	int zstride_1d;
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index cc43684c4..724f06825 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -69,23 +69,6 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge
 
 	MapgenBasic::np_cave1 = sp->np_cave1;
 	MapgenBasic::np_cave2 = sp->np_cave2;
-
-	// Content used for dungeon generation
-	c_cobble               = ndef->getId("mapgen_cobble");
-	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
-	c_mossycobble          = ndef->getId("mapgen_mossycobble");
-	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
-	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
-
-	// Fall back to more basic content if not defined
-	if (c_mossycobble == CONTENT_IGNORE)
-		c_mossycobble = c_cobble;
-	if (c_stair_cobble == CONTENT_IGNORE)
-		c_stair_cobble = c_cobble;
-	if (c_sandstonebrick == CONTENT_IGNORE)
-		c_sandstonebrick = c_sandstone;
-	if (c_stair_sandstonebrick == CONTENT_IGNORE)
-		c_stair_sandstonebrick = c_sandstone;
 }
 
 
@@ -215,48 +198,8 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 	if (flags & MG_CAVES)
 		generateCaves(stone_surface_max_y, large_cave_depth);
 
-	if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
-		DungeonParams dp;
-
-		dp.np_rarity  = nparams_dungeon_rarity;
-		dp.np_density = nparams_dungeon_density;
-		dp.np_wetness = nparams_dungeon_wetness;
-		dp.c_water    = c_water_source;
-		if (stone_type == MGSTONE_STONE) {
-			dp.c_cobble = c_cobble;
-			dp.c_moss   = c_mossycobble;
-			dp.c_stair  = c_stair_cobble;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 3.0;
-			dp.holesize      = v3s16(1, 2, 1);
-			dp.roomsize      = v3s16(0, 0, 0);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == MGSTONE_DESERT_STONE) {
-			dp.c_cobble = c_desert_stone;
-			dp.c_moss   = c_desert_stone;
-			dp.c_stair  = c_desert_stone;
-
-			dp.diagonal_dirs = true;
-			dp.mossratio     = 0.0;
-			dp.holesize      = v3s16(2, 3, 2);
-			dp.roomsize      = v3s16(2, 5, 2);
-			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == MGSTONE_SANDSTONE) {
-			dp.c_cobble = c_sandstonebrick;
-			dp.c_moss   = c_sandstonebrick;
-			dp.c_stair  = c_sandstonebrick;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 0.0;
-			dp.holesize      = v3s16(2, 2, 2);
-			dp.roomsize      = v3s16(2, 0, 2);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		}
-
-		DungeonGen dgen(this, &dp);
-		dgen.generate(blockseed, full_node_min, full_node_max);
-	}
+	if (flags & MG_DUNGEONS)
+		generateDungeons(stone_surface_max_y, stone_type);
 
 	// Generate the registered decorations
 	if (flags & MG_DECORATIONS)
diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h
index ffec4b924..afe67b04e 100644
--- a/src/mapgen_flat.h
+++ b/src/mapgen_flat.h
@@ -70,12 +70,6 @@ private:
 	float hill_threshold;
 	float hill_steepness;
 	Noise *noise_terrain;
-
-	content_t c_cobble;
-	content_t c_stair_cobble;
-	content_t c_mossycobble;
-	content_t c_sandstonebrick;
-	content_t c_stair_sandstonebrick;
 };
 
 struct MapgenFactoryFlat : public MapgenFactory {
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index 50e10d128..b613bf358 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -73,23 +73,6 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
 
 	this->formula = fractal / 2 + fractal % 2;
 	this->julia   = fractal % 2 == 0;
-
-	// Content used for dungeon generation
-	c_cobble               = ndef->getId("mapgen_cobble");
-	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
-	c_mossycobble          = ndef->getId("mapgen_mossycobble");
-	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
-	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
-
-	// Fall back to more basic content if not defined
-	if (c_mossycobble == CONTENT_IGNORE)
-		c_mossycobble = c_cobble;
-	if (c_stair_cobble == CONTENT_IGNORE)
-		c_stair_cobble = c_cobble;
-	if (c_sandstonebrick == CONTENT_IGNORE)
-		c_sandstonebrick = c_sandstone;
-	if (c_stair_sandstonebrick == CONTENT_IGNORE)
-		c_stair_sandstonebrick = c_sandstone;
 }
 
 
@@ -231,48 +214,8 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
 	if (flags & MG_CAVES)
 		generateCaves(stone_surface_max_y, MGFRACTAL_LARGE_CAVE_DEPTH);
 
-	if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
-		DungeonParams dp;
-
-		dp.np_rarity  = nparams_dungeon_rarity;
-		dp.np_density = nparams_dungeon_density;
-		dp.np_wetness = nparams_dungeon_wetness;
-		dp.c_water    = c_water_source;
-		if (stone_type == MGSTONE_STONE) {
-			dp.c_cobble = c_cobble;
-			dp.c_moss   = c_mossycobble;
-			dp.c_stair  = c_stair_cobble;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 3.0;
-			dp.holesize      = v3s16(1, 2, 1);
-			dp.roomsize      = v3s16(0, 0, 0);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == MGSTONE_DESERT_STONE) {
-			dp.c_cobble = c_desert_stone;
-			dp.c_moss   = c_desert_stone;
-			dp.c_stair  = c_desert_stone;
-
-			dp.diagonal_dirs = true;
-			dp.mossratio     = 0.0;
-			dp.holesize      = v3s16(2, 3, 2);
-			dp.roomsize      = v3s16(2, 5, 2);
-			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == MGSTONE_SANDSTONE) {
-			dp.c_cobble = c_sandstonebrick;
-			dp.c_moss   = c_sandstonebrick;
-			dp.c_stair  = c_sandstonebrick;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 0.0;
-			dp.holesize      = v3s16(2, 2, 2);
-			dp.roomsize      = v3s16(2, 0, 2);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		}
-
-		DungeonGen dgen(this, &dp);
-		dgen.generate(blockseed, full_node_min, full_node_max);
-	}
+	if (flags & MG_DUNGEONS)
+		generateDungeons(stone_surface_max_y, stone_type);
 
 	// Generate the registered decorations
 	if (flags & MG_DECORATIONS)
diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index de0ccaa2f..065142b84 100644
--- a/src/mapgen_fractal.h
+++ b/src/mapgen_fractal.h
@@ -81,12 +81,6 @@ private:
 	float julia_z;
 	float julia_w;
 	Noise *noise_seabed;
-
-	content_t c_cobble;
-	content_t c_stair_cobble;
-	content_t c_mossycobble;
-	content_t c_sandstonebrick;
-	content_t c_stair_sandstonebrick;
 };
 
 struct MapgenFactoryFractal : public MapgenFactory {
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 167a38282..3e10ec2a5 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -64,23 +64,6 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 
 	MapgenBasic::np_cave1 = sp->np_cave1;
 	MapgenBasic::np_cave2 = sp->np_cave2;
-
-	// Content used for dungeon generation
-	c_cobble               = ndef->getId("mapgen_cobble");
-	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
-	c_mossycobble          = ndef->getId("mapgen_mossycobble");
-	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
-	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
-
-	// Fall back to more basic content if not defined
-	if (c_mossycobble == CONTENT_IGNORE)
-		c_mossycobble = c_cobble;
-	if (c_stair_cobble == CONTENT_IGNORE)
-		c_stair_cobble = c_cobble;
-	if (c_sandstonebrick == CONTENT_IGNORE)
-		c_sandstonebrick = c_sandstone;
-	if (c_stair_sandstonebrick == CONTENT_IGNORE)
-		c_stair_sandstonebrick = c_sandstone;
 }
 
 
@@ -215,48 +198,8 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 		generateCaves(stone_surface_max_y, MGV5_LARGE_CAVE_DEPTH);
 
 	// Generate dungeons and desert temples
-	if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
-		DungeonParams dp;
-
-		dp.np_rarity  = nparams_dungeon_rarity;
-		dp.np_density = nparams_dungeon_density;
-		dp.np_wetness = nparams_dungeon_wetness;
-		dp.c_water    = c_water_source;
-		if (stone_type == MGSTONE_STONE) {
-			dp.c_cobble = c_cobble;
-			dp.c_moss   = c_mossycobble;
-			dp.c_stair  = c_stair_cobble;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 3.0;
-			dp.holesize      = v3s16(1, 2, 1);
-			dp.roomsize      = v3s16(0, 0, 0);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == MGSTONE_DESERT_STONE) {
-			dp.c_cobble = c_desert_stone;
-			dp.c_moss   = c_desert_stone;
-			dp.c_stair  = c_desert_stone;
-
-			dp.diagonal_dirs = true;
-			dp.mossratio     = 0.0;
-			dp.holesize      = v3s16(2, 3, 2);
-			dp.roomsize      = v3s16(2, 5, 2);
-			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == MGSTONE_SANDSTONE) {
-			dp.c_cobble = c_sandstonebrick;
-			dp.c_moss   = c_sandstonebrick;
-			dp.c_stair  = c_sandstonebrick;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 0.0;
-			dp.holesize      = v3s16(2, 2, 2);
-			dp.roomsize      = v3s16(2, 0, 2);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		}
-
-		DungeonGen dgen(this, &dp);
-		dgen.generate(blockseed, full_node_min, full_node_max);
-	}
+	if (flags & MG_DUNGEONS)
+		generateDungeons(stone_surface_max_y, stone_type);
 
 	// Generate the registered decorations
 	if (flags & MG_DECORATIONS)
diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index e7e5b2327..4e1772a64 100644
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -61,12 +61,6 @@ private:
 	Noise *noise_factor;
 	Noise *noise_height;
 	Noise *noise_ground;
-
-	content_t c_cobble;
-	content_t c_stair_cobble;
-	content_t c_mossycobble;
-	content_t c_sandstonebrick;
-	content_t c_stair_sandstonebrick;
 };
 
 
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 29c81e8a7..9ff2fbe66 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -74,23 +74,6 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 
 	MapgenBasic::np_cave1 = sp->np_cave1;
 	MapgenBasic::np_cave2 = sp->np_cave2;
-
-	// Content used for dungeon generation
-	c_cobble               = ndef->getId("mapgen_cobble");
-	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
-	c_mossycobble          = ndef->getId("mapgen_mossycobble");
-	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
-	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
-
-	// Fall back to more basic content if not defined
-	if (c_mossycobble == CONTENT_IGNORE)
-		c_mossycobble = c_cobble;
-	if (c_stair_cobble == CONTENT_IGNORE)
-		c_stair_cobble = c_cobble;
-	if (c_sandstonebrick == CONTENT_IGNORE)
-		c_sandstonebrick = c_sandstone;
-	if (c_stair_sandstonebrick == CONTENT_IGNORE)
-		c_stair_sandstonebrick = c_sandstone;
 }
 
 
@@ -240,48 +223,8 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 	if (flags & MG_CAVES)
 		generateCaves(stone_surface_max_y, water_level);
 
-	if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
-		DungeonParams dp;
-
-		dp.np_rarity  = nparams_dungeon_rarity;
-		dp.np_density = nparams_dungeon_density;
-		dp.np_wetness = nparams_dungeon_wetness;
-		dp.c_water    = c_water_source;
-		if (stone_type == MGSTONE_STONE) {
-			dp.c_cobble = c_cobble;
-			dp.c_moss   = c_mossycobble;
-			dp.c_stair  = c_stair_cobble;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 3.0;
-			dp.holesize      = v3s16(1, 2, 1);
-			dp.roomsize      = v3s16(0, 0, 0);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == MGSTONE_DESERT_STONE) {
-			dp.c_cobble = c_desert_stone;
-			dp.c_moss   = c_desert_stone;
-			dp.c_stair  = c_desert_stone;
-
-			dp.diagonal_dirs = true;
-			dp.mossratio     = 0.0;
-			dp.holesize      = v3s16(2, 3, 2);
-			dp.roomsize      = v3s16(2, 5, 2);
-			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == MGSTONE_SANDSTONE) {
-			dp.c_cobble = c_sandstonebrick;
-			dp.c_moss   = c_sandstonebrick;
-			dp.c_stair  = c_sandstonebrick;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 0.0;
-			dp.holesize      = v3s16(2, 2, 2);
-			dp.roomsize      = v3s16(2, 0, 2);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		}
-
-		DungeonGen dgen(this, &dp);
-		dgen.generate(blockseed, full_node_min, full_node_max);
-	}
+	if (flags & MG_DUNGEONS)
+		generateDungeons(stone_surface_max_y, stone_type);
 
 	// Generate the registered decorations
 	if (flags & MG_DECORATIONS)
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index aee171b48..9ed89a511 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -78,12 +78,6 @@ private:
 	Noise *noise_ridge_uwater;
 	Noise *noise_mountain;
 	Noise *noise_ridge;
-
-	content_t c_cobble;
-	content_t c_stair_cobble;
-	content_t c_mossycobble;
-	content_t c_sandstonebrick;
-	content_t c_stair_sandstonebrick;
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index c0094eb3b..2cd733d36 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -113,25 +113,12 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
 	tcave_cache = new float[csize.Y + 2];
 
 	// Resolve content to be used
-	c_cobble               = ndef->getId("mapgen_cobble");
-	c_lava_source          = ndef->getId("mapgen_lava_source");
-	c_mossycobble          = ndef->getId("mapgen_mossycobble");
-	c_sand                 = ndef->getId("mapgen_sand");
-	c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
-	c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
-	c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
+	c_lava_source = ndef->getId("mapgen_lava_source");
+	c_sand        = ndef->getId("mapgen_sand");
 
 	// Fall back to more basic content if not defined
-	if (c_mossycobble == CONTENT_IGNORE)
-		c_mossycobble = c_cobble;
 	if (c_sand == CONTENT_IGNORE)
 		c_sand = c_stone;
-	if (c_sandstonebrick == CONTENT_IGNORE)
-		c_sandstonebrick = c_sandstone;
-	if (c_stair_cobble == CONTENT_IGNORE)
-		c_stair_cobble = c_cobble;
-	if (c_stair_sandstonebrick == CONTENT_IGNORE)
-		c_stair_sandstonebrick = c_sandstone;
 }
 
 
@@ -279,48 +266,8 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
 		generateCaves(stone_surface_max_y, large_cave_depth);
 
 	// Dungeon creation
-	if ((flags & MG_DUNGEONS) && node_max.Y < 50 && (stone_surface_max_y >= node_min.Y)) {
-		DungeonParams dp;
-
-		dp.np_rarity  = nparams_dungeon_rarity;
-		dp.np_density = nparams_dungeon_density;
-		dp.np_wetness = nparams_dungeon_wetness;
-		dp.c_water    = c_water_source;
-		if (stone_type == MGSTONE_STONE) {
-			dp.c_cobble = c_cobble;
-			dp.c_moss   = c_mossycobble;
-			dp.c_stair  = c_stair_cobble;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 3.f;
-			dp.holesize      = v3s16(1, 2, 1);
-			dp.roomsize      = v3s16(0, 0, 0);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		} else if (stone_type == MGSTONE_DESERT_STONE) {
-			dp.c_cobble = c_desert_stone;
-			dp.c_moss   = c_desert_stone;
-			dp.c_stair  = c_desert_stone;
-
-			dp.diagonal_dirs = true;
-			dp.mossratio     = 0.f;
-			dp.holesize      = v3s16(2, 3, 2);
-			dp.roomsize      = v3s16(2, 5, 2);
-			dp.notifytype    = GENNOTIFY_TEMPLE;
-		} else if (stone_type == MGSTONE_SANDSTONE) {
-			dp.c_cobble = c_sandstonebrick;
-			dp.c_moss   = c_sandstonebrick;
-			dp.c_stair  = c_sandstonebrick;
-
-			dp.diagonal_dirs = false;
-			dp.mossratio     = 0.f;
-			dp.holesize      = v3s16(2, 2, 2);
-			dp.roomsize      = v3s16(2, 0, 2);
-			dp.notifytype    = GENNOTIFY_DUNGEON;
-		}
-
-		DungeonGen dgen(this, &dp);
-		dgen.generate(blockseed, full_node_min, full_node_max);
-	}
+	if ((flags & MG_DUNGEONS) && node_max.Y < 50)
+		generateDungeons(stone_surface_max_y, stone_type);
 
 	// Generate the registered decorations
 	if (flags & MG_DECORATIONS)
diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index bab3a756e..a7369ea92 100644
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -124,13 +124,8 @@ private:
 	Noise *noise_valley_depth;
 	Noise *noise_valley_profile;
 
-	content_t c_cobble;
 	content_t c_lava_source;
-	content_t c_mossycobble;
 	content_t c_sand;
-	content_t c_sandstonebrick;
-	content_t c_stair_cobble;
-	content_t c_stair_sandstonebrick;
 
 	float terrainLevelAtPoint(s16 x, s16 z);
 

From c8fd232678698b8be469b3792e7acc9418231a38 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sun, 22 May 2016 16:50:43 -0400
Subject: [PATCH 034/418] Dungeongen: Remove dependency on Mapgen

---
 src/dungeongen.cpp | 37 +++++++++++++++++++++++--------------
 src/dungeongen.h   | 19 +++++++++++++------
 src/mapgen.cpp     |  7 +++++--
 src/mapgen_v6.cpp  |  6 ++++--
 4 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/src/dungeongen.cpp b/src/dungeongen.cpp
index f7f9b8b50..6be7e9086 100644
--- a/src/dungeongen.cpp
+++ b/src/dungeongen.cpp
@@ -38,22 +38,27 @@ NoiseParams nparams_dungeon_density(0.0, 1.0, v3f(2.5, 2.5, 2.5), 0, 2, 1.4, 2.0
 ///////////////////////////////////////////////////////////////////////////////
 
 
-DungeonGen::DungeonGen(Mapgen *mapgen, DungeonParams *dparams)
+DungeonGen::DungeonGen(INodeDefManager *ndef,
+	GenerateNotifier *gennotify, DungeonParams *dparams)
 {
-	this->mg = mapgen;
-	this->vm = mapgen->vm;
+	assert(ndef);
+
+	this->ndef      = ndef;
+	this->gennotify = gennotify;
 
 #ifdef DGEN_USE_TORCHES
-	c_torch  = mg->ndef->getId("default:torch");
+	c_torch  = ndef->getId("default:torch");
 #endif
 
 	if (dparams) {
 		memcpy(&dp, dparams, sizeof(dp));
 	} else {
-		dp.c_water  = mg->ndef->getId("mapgen_water_source");
-		dp.c_cobble = mg->ndef->getId("mapgen_cobble");
-		dp.c_moss   = mg->ndef->getId("mapgen_mossycobble");
-		dp.c_stair  = mg->ndef->getId("mapgen_stair_cobble");
+		dp.seed = 0;
+
+		dp.c_water  = ndef->getId("mapgen_water_source");
+		dp.c_cobble = ndef->getId("mapgen_cobble");
+		dp.c_moss   = ndef->getId("mapgen_mossycobble");
+		dp.c_stair  = ndef->getId("mapgen_stair_cobble");
 
 		dp.diagonal_dirs = false;
 		dp.mossratio     = 3.0;
@@ -67,18 +72,21 @@ DungeonGen::DungeonGen(Mapgen *mapgen, DungeonParams *dparams)
 	}
 
 	// For mapgens using river water
-	dp.c_river_water = mg->ndef->getId("mapgen_river_water_source");
+	dp.c_river_water = ndef->getId("mapgen_river_water_source");
 	if (dp.c_river_water == CONTENT_IGNORE)
-		dp.c_river_water = mg->ndef->getId("mapgen_water_source");
+		dp.c_river_water = ndef->getId("mapgen_water_source");
 }
 
 
-void DungeonGen::generate(u32 bseed, v3s16 nmin, v3s16 nmax)
+void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
 {
+	assert(vm);
+
 	//TimeTaker t("gen dungeons");
-	if (NoisePerlin3D(&dp.np_rarity, nmin.X, nmin.Y, nmin.Z, mg->seed) < 0.2)
+	if (NoisePerlin3D(&dp.np_rarity, nmin.X, nmin.Y, nmin.Z, dp.seed) < 0.2)
 		return;
 
+	this->vm = vm;
 	this->blockseed = bseed;
 	random.seed(bseed + 2);
 
@@ -109,7 +117,7 @@ void DungeonGen::generate(u32 bseed, v3s16 nmin, v3s16 nmax)
 			u32 i = vm->m_area.index(nmin.X, y, z);
 			for (s16 x = nmin.X; x <= nmax.X; x++) {
 				if (vm->m_data[i].getContent() == dp.c_cobble) {
-					float wetness = NoisePerlin3D(&dp.np_wetness, x, y, z, mg->seed);
+					float wetness = NoisePerlin3D(&dp.np_wetness, x, y, z, dp.seed);
 					float density = NoisePerlin3D(&dp.np_density, x, y, z, blockseed);
 					if (density < wetness / dp.mossratio)
 						vm->m_data[i].setContent(dp.c_moss);
@@ -187,7 +195,8 @@ void DungeonGen::makeDungeon(v3s16 start_padding)
 		makeRoom(roomsize, roomplace);
 
 		v3s16 room_center = roomplace + v3s16(roomsize.X / 2, 1, roomsize.Z / 2);
-		mg->gennotify.addEvent(dp.notifytype, room_center);
+		if (gennotify)
+			gennotify->addEvent(dp.notifytype, room_center);
 
 #ifdef DGEN_USE_TORCHES
 		// Place torch at room center (for testing)
diff --git a/src/dungeongen.h b/src/dungeongen.h
index d209dd4bf..f0a5e5ba8 100644
--- a/src/dungeongen.h
+++ b/src/dungeongen.h
@@ -39,6 +39,8 @@ int dir_to_facedir(v3s16 d);
 
 
 struct DungeonParams {
+	int seed;
+
 	content_t c_water;
 	content_t c_river_water;
 	content_t c_cobble;
@@ -59,7 +61,9 @@ struct DungeonParams {
 class DungeonGen {
 public:
 	MMVManip *vm;
-	Mapgen *mg;
+	INodeDefManager *ndef;
+	GenerateNotifier *gennotify;
+
 	u32 blockseed;
 	PseudoRandom random;
 	v3s16 csize;
@@ -67,17 +71,20 @@ public:
 	content_t c_torch;
 	DungeonParams dp;
 
-	//RoomWalker
+	// RoomWalker
 	v3s16 m_pos;
 	v3s16 m_dir;
 
-	DungeonGen(Mapgen *mg, DungeonParams *dparams);
-	void generate(u32 bseed, v3s16 full_node_min, v3s16 full_node_max);
+	DungeonGen(INodeDefManager *ndef,
+		GenerateNotifier *gennotify, DungeonParams *dparams);
+
+	void generate(MMVManip *vm, u32 bseed,
+		v3s16 full_node_min, v3s16 full_node_max);
 
 	void makeDungeon(v3s16 start_padding);
 	void makeRoom(v3s16 roomsize, v3s16 roomplace);
 	void makeCorridor(v3s16 doorplace, v3s16 doordir,
-					  v3s16 &result_place, v3s16 &result_dir);
+		v3s16 &result_place, v3s16 &result_dir);
 	void makeDoor(v3s16 doorplace, v3s16 doordir);
 	void makeFill(v3s16 place, v3s16 size, u8 avoid_flags, MapNode n, u8 or_flags);
 	void makeHole(v3s16 place);
@@ -86,7 +93,7 @@ public:
 	bool findPlaceForRoomDoor(v3s16 roomsize, v3s16 &result_doorplace,
 			v3s16 &result_doordir, v3s16 &result_roomplace);
 
-	void randomizeDir()
+	inline void randomizeDir()
 	{
 		m_dir = rand_ortho_dir(random, dp.diagonal_dirs);
 	}
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 56fe34e16..041356e3d 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -639,10 +639,13 @@ void MapgenBasic::generateDungeons(s16 max_stone_y, MgStoneType stone_type)
 
 	DungeonParams dp;
 
+	dp.seed = seed;
+
 	dp.np_rarity  = nparams_dungeon_rarity;
 	dp.np_density = nparams_dungeon_density;
 	dp.np_wetness = nparams_dungeon_wetness;
 	dp.c_water    = c_water_source;
+
 	switch (stone_type) {
 	default:
 	case MGSTONE_STONE:
@@ -680,8 +683,8 @@ void MapgenBasic::generateDungeons(s16 max_stone_y, MgStoneType stone_type)
 		break;
 	}
 
-	DungeonGen dgen(this, &dp);
-	dgen.generate(blockseed, full_node_min, full_node_max);
+	DungeonGen dgen(ndef, &gennotify, &dp);
+	dgen.generate(vm, blockseed, full_node_min, full_node_max);
 }
 
 
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index 65acfaf93..103120b6a 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -559,6 +559,8 @@ void MapgenV6::makeChunk(BlockMakeData *data)
 	if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
 		DungeonParams dp;
 
+		dp.seed = seed;
+
 		dp.np_rarity  = nparams_dungeon_rarity;
 		dp.np_density = nparams_dungeon_density;
 		dp.np_wetness = nparams_dungeon_wetness;
@@ -585,8 +587,8 @@ void MapgenV6::makeChunk(BlockMakeData *data)
 			dp.notifytype    = GENNOTIFY_DUNGEON;
 		}
 
-		DungeonGen dgen(this, &dp);
-		dgen.generate(blockseed, full_node_min, full_node_max);
+		DungeonGen dgen(ndef, &gennotify, &dp);
+		dgen.generate(vm, blockseed, full_node_min, full_node_max);
 	}
 
 	// Add top and bottom side of water to transforming_liquid queue

From c4e083f7e142d8e25e906bb19f9b1f03bb7b430d Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Thu, 26 May 2016 23:23:05 -0400
Subject: [PATCH 035/418] Disallow external linkage for default Cavegen
 NoiseParams

---
 src/cavegen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index 51309ad60..1c25ce711 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mg_biome.h"
 #include "cavegen.h"
 
-NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0);
+static NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0);
 
 
 ////

From 62d15ac7c1fcd7214a9e45d46bbc560f998edb95 Mon Sep 17 00:00:00 2001
From: red-001 <red-001@openmailbox.org>
Date: Sat, 28 May 2016 04:37:28 +0100
Subject: [PATCH 036/418] Add base64 encoding and decoding to the lua api.
 (#3919)

---
 doc/lua_api.txt               |  4 ++++
 doc/menu_lua_api.txt          |  4 ++++
 src/script/lua_api/l_util.cpp | 35 +++++++++++++++++++++++++++++++++++
 src/script/lua_api/l_util.h   |  6 ++++++
 4 files changed, 49 insertions(+)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 593e0c438..01763fd73 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2438,6 +2438,10 @@ These functions return the leftover itemstack.
     * See documentation on `minetest.compress()` for supported compression methods.
     * currently supported.
     * `...` indicates method-specific arguments. Currently, no methods use this.
+* `minetest.encode_base64(string)`: returns string encoded in base64
+    * Encodes a string in base64.
+* `minetest.decode_base64(string)`: returns string
+    * Decodes a string encoded in base64.
 * `minetest.is_protected(pos, name)`: returns boolean
     * Returns true, if player `name` shouldn't be abled to dig at `pos` or do other
       actions, defineable by mods, due to some mod-defined ownership-like concept.
diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt
index ac8713a32..479880266 100644
--- a/doc/menu_lua_api.txt
+++ b/doc/menu_lua_api.txt
@@ -210,6 +210,10 @@ string:trim()
 ^ eg. string.trim("\n \t\tfoo bar\t ") == "foo bar"
 core.is_yes(arg) (possible in async calls)
 ^ returns whether arg can be interpreted as yes
+minetest.encode_base64(string) (possible in async calls)
+^ Encodes a string in base64.
+minetest.decode_base64(string) (possible in async calls)
+^ Decodes a string encoded in base64.
 
 Version compat:
 core.get_min_supp_proto()
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index c3e6c8964..e90b7fbcf 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "settings.h"
 #include "util/auth.h"
+#include "util/base64.h"
 #include <algorithm>
 
 // log([level,] text)
@@ -320,6 +321,34 @@ int ModApiUtil::l_decompress(lua_State *L)
 	return 1;
 }
 
+// encode_base64(string)
+int ModApiUtil::l_encode_base64(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	size_t size;
+	const char *data = luaL_checklstring(L, 1, &size);
+
+	std::string out = base64_encode((const unsigned char *)(data), size);
+
+	lua_pushlstring(L, out.data(), out.size());
+	return 1;
+}
+
+// decode_base64(string)
+int ModApiUtil::l_decode_base64(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	size_t size;
+	const char *data = luaL_checklstring(L, 1, &size);
+
+	std::string out = base64_decode(std::string(data, size));
+
+	lua_pushlstring(L, out.data(), out.size());
+	return 1;
+}
+
 // mkdir(path)
 int ModApiUtil::l_mkdir(lua_State *L)
 {
@@ -433,6 +462,9 @@ void ModApiUtil::Initialize(lua_State *L, int top)
 	API_FCT(get_dir_list);
 
 	API_FCT(request_insecure_environment);
+
+	API_FCT(encode_base64);
+	API_FCT(decode_base64);
 }
 
 void ModApiUtil::InitializeAsync(AsyncEngine& engine)
@@ -459,5 +491,8 @@ void ModApiUtil::InitializeAsync(AsyncEngine& engine)
 
 	ASYNC_API_FCT(mkdir);
 	ASYNC_API_FCT(get_dir_list);
+
+	ASYNC_API_FCT(encode_base64);
+	ASYNC_API_FCT(decode_base64);
 }
 
diff --git a/src/script/lua_api/l_util.h b/src/script/lua_api/l_util.h
index 6fac7e7eb..779dbe281 100644
--- a/src/script/lua_api/l_util.h
+++ b/src/script/lua_api/l_util.h
@@ -95,6 +95,12 @@ private:
 	// request_insecure_environment()
 	static int l_request_insecure_environment(lua_State *L);
 
+	// encode_base64(string)
+	static int l_encode_base64(lua_State *L);
+
+	// decode_base64(string)
+	static int l_decode_base64(lua_State *L);
+
 public:
 	static void Initialize(lua_State *L, int top);
 

From d499ec483837fa7210176ef39beba2d5a3a5a61d Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar+github@foo-projects.org>
Date: Fri, 27 May 2016 21:08:23 -0700
Subject: [PATCH 037/418] Particles: Add option to remove particles on
 collision

Adds the particle option `collision_removal = bool`

Some particles are hard to use right now since they either go through
solid blocks (without collision detection), and with collision
detection enabled they (e.g. raindrops) would just stop dead on the
floor and sit there until they expire, or worse, scrape along a wall
or ceiling.

We can solve the problem by adding a boolean flag that tells the
particle to be removed if it ever collides with something. This will
make it easier to add rain that doesn't fall through your roof or stick
on the top of it. Or clouds and smoke that don't go through trees.

Particles that collide with this flag are marked expired
unconditionally, causing them to be treated like normal expired
particles and cleaned up normally.

Documentation is adjusted accordingly.

An added bonus of this patch is that particles can potentially collide
many times with nodes, and this reduces the amount of collisions to 1
(max), which may end up reducing particle load on the client.
---
 doc/lua_api.txt                     |  6 +++++
 src/client.h                        |  2 ++
 src/network/clientpackethandler.cpp |  7 ++++++
 src/network/networkprotocol.h       |  2 ++
 src/particles.cpp                   | 39 ++++++++++++++++++-----------
 src/particles.h                     |  5 ++++
 src/script/lua_api/l_particles.cpp  | 24 ++++++++++++------
 src/server.cpp                      | 19 +++++++++-----
 src/server.h                        | 12 ++++++---
 9 files changed, 84 insertions(+), 32 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 01763fd73..03f2dad32 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3885,6 +3885,9 @@ Definition tables
         size = 1,
         collisiondetection = false,
     --  ^ collisiondetection: if true collides with physical objects
+        collision_removal = false,
+    --  ^ collision_removal: if true then particle is removed when it collides,
+    --  ^ requires collisiondetection = true to have any effect
         vertical = false,
     --  ^ vertical: if true faces player using y axis only
         texture = "image.png",
@@ -3914,6 +3917,9 @@ Definition tables
     --  ^ minsize/maxsize, minexptime/maxexptime (expirationtime)
         collisiondetection = false,
     --  ^ collisiondetection: if true uses collision detection
+        collision_removal = false,
+    --  ^ collision_removal: if true then particle is removed when it collides,
+    --  ^ requires collisiondetection = true to have any effect
         vertical = false,
     --  ^ vertical: if true faces player using y axis only
         texture = "image.png",
diff --git a/src/client.h b/src/client.h
index cdadb9d3e..a7eb22ad9 100644
--- a/src/client.h
+++ b/src/client.h
@@ -182,6 +182,7 @@ struct ClientEvent
 			f32 expirationtime;
 			f32 size;
 			bool collisiondetection;
+			bool collision_removal;
 			bool vertical;
 			std::string *texture;
 		} spawn_particle;
@@ -199,6 +200,7 @@ struct ClientEvent
 			f32 minsize;
 			f32 maxsize;
 			bool collisiondetection;
+			bool collision_removal;
 			bool vertical;
 			std::string *texture;
 			u32 id;
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 0498f4048..48c573da5 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -898,8 +898,10 @@ void Client::handleCommand_SpawnParticle(NetworkPacket* pkt)
 	bool collisiondetection = readU8(is);
 	std::string texture     = deSerializeLongString(is);
 	bool vertical           = false;
+	bool collision_removal  = false;
 	try {
 		vertical = readU8(is);
+		collision_removal = readU8(is);
 	} catch (...) {}
 
 	ClientEvent event;
@@ -910,6 +912,7 @@ void Client::handleCommand_SpawnParticle(NetworkPacket* pkt)
 	event.spawn_particle.expirationtime     = expirationtime;
 	event.spawn_particle.size               = size;
 	event.spawn_particle.collisiondetection = collisiondetection;
+	event.spawn_particle.collision_removal  = collision_removal;
 	event.spawn_particle.vertical           = vertical;
 	event.spawn_particle.texture            = new std::string(texture);
 
@@ -942,8 +945,11 @@ void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt)
 	*pkt >> id;
 
 	bool vertical = false;
+	bool collision_removal = false;
 	try {
 		*pkt >> vertical;
+		*pkt >> collision_removal;
+
 	} catch (...) {}
 
 	ClientEvent event;
@@ -961,6 +967,7 @@ void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt)
 	event.add_particlespawner.minsize            = minsize;
 	event.add_particlespawner.maxsize            = maxsize;
 	event.add_particlespawner.collisiondetection = collisiondetection;
+	event.add_particlespawner.collision_removal  = collision_removal;
 	event.add_particlespawner.vertical           = vertical;
 	event.add_particlespawner.texture            = new std::string(texture);
 	event.add_particlespawner.id                 = id;
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index 177b97680..3a9483efb 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -474,6 +474,7 @@ enum ToClientCommand
 		u8 bool vertical
 		u32 len
 		u8[len] texture
+		u8 collision_removal
 	*/
 
 	TOCLIENT_ADD_PARTICLESPAWNER = 0x47,
@@ -495,6 +496,7 @@ enum ToClientCommand
 		u32 len
 		u8[len] texture
 		u32 id
+		u8 collision_removal
 	*/
 
 	TOCLIENT_DELETE_PARTICLESPAWNER_LEGACY = 0x48,
diff --git a/src/particles.cpp b/src/particles.cpp
index 525258a25..ccca691d1 100644
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -54,6 +54,7 @@ Particle::Particle(
 	float expirationtime,
 	float size,
 	bool collisiondetection,
+	bool collision_removal,
 	bool vertical,
 	video::ITexture *texture,
 	v2f texpos,
@@ -85,6 +86,7 @@ Particle::Particle(
 	m_player = player;
 	m_size = size;
 	m_collisiondetection = collisiondetection;
+	m_collision_removal = collision_removal;
 	m_vertical = vertical;
 
 	// Irrlicht stuff
@@ -126,20 +128,21 @@ void Particle::render()
 void Particle::step(float dtime)
 {
 	m_time += dtime;
-	if (m_collisiondetection)
-	{
+	if (m_collisiondetection) {
 		aabb3f box = m_collisionbox;
-		v3f p_pos = m_pos*BS;
-		v3f p_velocity = m_velocity*BS;
-		collisionMoveSimple(m_env, m_gamedef,
-			BS*0.5, box,
-			0, dtime,
-			&p_pos, &p_velocity, m_acceleration * BS);
-		m_pos = p_pos/BS;
-		m_velocity = p_velocity/BS;
-	}
-	else
-	{
+		v3f p_pos = m_pos * BS;
+		v3f p_velocity = m_velocity * BS;
+		collisionMoveResult r = collisionMoveSimple(m_env,
+			m_gamedef, BS * 0.5, box, 0, dtime, &p_pos,
+			&p_velocity, m_acceleration * BS);
+		if (m_collision_removal && r.collides) {
+			// force expiration of the particle
+			m_expiration = -1.0;
+		} else {
+			m_pos = p_pos / BS;
+			m_velocity = p_velocity / BS;
+		}
+	} else {
 		m_velocity += m_acceleration * dtime;
 		m_pos += m_velocity * dtime;
 	}
@@ -210,8 +213,8 @@ ParticleSpawner::ParticleSpawner(IGameDef* gamedef, scene::ISceneManager *smgr,
 	u16 amount, float time,
 	v3f minpos, v3f maxpos, v3f minvel, v3f maxvel, v3f minacc, v3f maxacc,
 	float minexptime, float maxexptime, float minsize, float maxsize,
-	bool collisiondetection, bool vertical, video::ITexture *texture, u32 id,
-	ParticleManager *p_manager) :
+	bool collisiondetection, bool collision_removal, bool vertical,
+	video::ITexture *texture, u32 id, ParticleManager *p_manager) :
 	m_particlemanager(p_manager)
 {
 	m_gamedef = gamedef;
@@ -230,6 +233,7 @@ ParticleSpawner::ParticleSpawner(IGameDef* gamedef, scene::ISceneManager *smgr,
 	m_minsize = minsize;
 	m_maxsize = maxsize;
 	m_collisiondetection = collisiondetection;
+	m_collision_removal = collision_removal;
 	m_vertical = vertical;
 	m_texture = texture;
 	m_time = 0;
@@ -277,6 +281,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 					exptime,
 					size,
 					m_collisiondetection,
+					m_collision_removal,
 					m_vertical,
 					m_texture,
 					v2f(0.0, 0.0),
@@ -317,6 +322,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 					exptime,
 					size,
 					m_collisiondetection,
+					m_collision_removal,
 					m_vertical,
 					m_texture,
 					v2f(0.0, 0.0),
@@ -446,6 +452,7 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 					event->add_particlespawner.minsize,
 					event->add_particlespawner.maxsize,
 					event->add_particlespawner.collisiondetection,
+					event->add_particlespawner.collision_removal,
 					event->add_particlespawner.vertical,
 					texture,
 					event->add_particlespawner.id,
@@ -480,6 +487,7 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 					event->spawn_particle.expirationtime,
 					event->spawn_particle.size,
 					event->spawn_particle.collisiondetection,
+					event->spawn_particle.collision_removal,
 					event->spawn_particle.vertical,
 					texture,
 					v2f(0.0, 0.0),
@@ -555,6 +563,7 @@ void ParticleManager::addNodeParticle(IGameDef* gamedef, scene::ISceneManager* s
 		visual_size,
 		true,
 		false,
+		false,
 		texture,
 		texpos,
 		texsize);
diff --git a/src/particles.h b/src/particles.h
index dda84385c..bc3ca53b7 100644
--- a/src/particles.h
+++ b/src/particles.h
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct ClientEvent;
 class ParticleManager;
+class ClientEnvironment;
 
 class Particle : public scene::ISceneNode
 {
@@ -45,6 +46,7 @@ class Particle : public scene::ISceneNode
 		float expirationtime,
 		float size,
 		bool collisiondetection,
+		bool collision_removal,
 		bool vertical,
 		video::ITexture *texture,
 		v2f texpos,
@@ -97,6 +99,7 @@ private:
 	float m_size;
 	u8 m_light;
 	bool m_collisiondetection;
+	bool m_collision_removal;
 	bool m_vertical;
 	v3s16 m_camera_offset;
 };
@@ -115,6 +118,7 @@ class ParticleSpawner
 		float minexptime, float maxexptime,
 		float minsize, float maxsize,
 		bool collisiondetection,
+		bool collision_removal,
 		bool vertical,
 		video::ITexture *texture,
 		u32 id,
@@ -148,6 +152,7 @@ class ParticleSpawner
 	video::ITexture *m_texture;
 	std::vector<float> m_spawntimes;
 	bool m_collisiondetection;
+	bool m_collision_removal;
 	bool m_vertical;
 
 };
diff --git a/src/script/lua_api/l_particles.cpp b/src/script/lua_api/l_particles.cpp
index f6c1725de..263e35407 100644
--- a/src/script/lua_api/l_particles.cpp
+++ b/src/script/lua_api/l_particles.cpp
@@ -21,13 +21,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_internal.h"
 #include "common/c_converter.h"
 #include "server.h"
+#include "particles.h"
 
 // add_particle({pos=, velocity=, acceleration=, expirationtime=,
-// 		size=, collisiondetection=, vertical=, texture=, player=})
+// 		size=, collisiondetection=, collision_removal=, vertical=,
+//		texture=, player=})
 // pos/velocity/acceleration = {x=num, y=num, z=num}
 // expirationtime = num (seconds)
 // size = num
 // collisiondetection = bool
+// collision_removal = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
 int ModApiParticles::l_add_particle(lua_State *L)
@@ -41,8 +44,8 @@ int ModApiParticles::l_add_particle(lua_State *L)
 	float expirationtime, size;
 	expirationtime = size = 1;
 
-	bool collisiondetection, vertical;
-	collisiondetection = vertical = false;
+	bool collisiondetection, vertical, collision_removal;
+	collisiondetection = vertical = collision_removal = false;
 
 	std::string texture = "";
 	std::string playername = "";
@@ -94,12 +97,14 @@ int ModApiParticles::l_add_particle(lua_State *L)
 		size = getfloatfield_default(L, 1, "size", 1);
 		collisiondetection = getboolfield_default(L, 1,
 			"collisiondetection", collisiondetection);
+		collision_removal = getboolfield_default(L, 1,
+			"collision_removal", collision_removal);
 		vertical = getboolfield_default(L, 1, "vertical", vertical);
 		texture = getstringfield_default(L, 1, "texture", "");
 		playername = getstringfield_default(L, 1, "playername", "");
 	}
-	getServer(L)->spawnParticle(playername, pos, vel, acc,
-			expirationtime, size, collisiondetection, vertical, texture);
+	getServer(L)->spawnParticle(playername, pos, vel, acc, expirationtime, size,
+			collisiondetection, collision_removal, vertical, texture);
 	return 1;
 }
 
@@ -110,6 +115,7 @@ int ModApiParticles::l_add_particle(lua_State *L)
 //				minexptime=, maxexptime=,
 //				minsize=, maxsize=,
 //				collisiondetection=,
+//				collision_removal=,
 //				vertical=,
 //				texture=,
 //				player=})
@@ -117,6 +123,7 @@ int ModApiParticles::l_add_particle(lua_State *L)
 // minexptime/maxexptime = num (seconds)
 // minsize/maxsize = num
 // collisiondetection = bool
+// collision_removal = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
 int ModApiParticles::l_add_particlespawner(lua_State *L)
@@ -129,8 +136,8 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 	    minpos= maxpos= minvel= maxvel= minacc= maxacc= v3f(0, 0, 0);
 	float time, minexptime, maxexptime, minsize, maxsize;
 	      time= minexptime= maxexptime= minsize= maxsize= 1;
-	bool collisiondetection, vertical;
-	     collisiondetection= vertical= false;
+	bool collisiondetection, vertical, collision_removal;
+	     collisiondetection = vertical = collision_removal = false;
 	std::string texture = "";
 	std::string playername = "";
 
@@ -189,6 +196,8 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 		maxsize = getfloatfield_default(L, 1, "maxsize", maxsize);
 		collisiondetection = getboolfield_default(L, 1,
 			"collisiondetection", collisiondetection);
+		collision_removal = getboolfield_default(L, 1,
+			"collision_removal", collision_removal);
 		vertical = getboolfield_default(L, 1, "vertical", vertical);
 		texture = getstringfield_default(L, 1, "texture", "");
 		playername = getstringfield_default(L, 1, "playername", "");
@@ -201,6 +210,7 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 			minexptime, maxexptime,
 			minsize, maxsize,
 			collisiondetection,
+			collision_removal,
 			vertical,
 			texture, playername);
 	lua_pushnumber(L, id);
diff --git a/src/server.cpp b/src/server.cpp
index a3b686c25..ada45dc68 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1673,7 +1673,8 @@ void Server::SendShowFormspecMessage(u16 peer_id, const std::string &formspec,
 // Spawns a particle on peer with peer_id
 void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f acceleration,
 				float expirationtime, float size, bool collisiondetection,
-				bool vertical, std::string texture)
+				bool collision_removal,
+				bool vertical, const std::string &texture)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -1683,6 +1684,7 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
 			<< size << collisiondetection;
 	pkt.putLongString(texture);
 	pkt << vertical;
+	pkt << collision_removal;
 
 	if (peer_id != PEER_ID_INEXISTENT) {
 		Send(&pkt);
@@ -1695,7 +1697,8 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
 // Adds a ParticleSpawner on peer with peer_id
 void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3f minpos, v3f maxpos,
 	v3f minvel, v3f maxvel, v3f minacc, v3f maxacc, float minexptime, float maxexptime,
-	float minsize, float maxsize, bool collisiondetection, bool vertical, std::string texture, u32 id)
+	float minsize, float maxsize, bool collisiondetection, bool collision_removal,
+	bool vertical, const std::string &texture, u32 id)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -1708,6 +1711,7 @@ void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3
 	pkt.putLongString(texture);
 
 	pkt << id << vertical;
+	pkt << collision_removal;
 
 	if (peer_id != PEER_ID_INEXISTENT) {
 		Send(&pkt);
@@ -3160,7 +3164,8 @@ void Server::notifyPlayers(const std::wstring &msg)
 void Server::spawnParticle(const std::string &playername, v3f pos,
 	v3f velocity, v3f acceleration,
 	float expirationtime, float size, bool
-	collisiondetection, bool vertical, const std::string &texture)
+	collisiondetection, bool collision_removal,
+	bool vertical, const std::string &texture)
 {
 	// m_env will be NULL if the server is initializing
 	if (!m_env)
@@ -3175,13 +3180,15 @@ void Server::spawnParticle(const std::string &playername, v3f pos,
 	}
 
 	SendSpawnParticle(peer_id, pos, velocity, acceleration,
-			expirationtime, size, collisiondetection, vertical, texture);
+			expirationtime, size, collisiondetection,
+			collision_removal, vertical, texture);
 }
 
 u32 Server::addParticleSpawner(u16 amount, float spawntime,
 	v3f minpos, v3f maxpos, v3f minvel, v3f maxvel, v3f minacc, v3f maxacc,
 	float minexptime, float maxexptime, float minsize, float maxsize,
-	bool collisiondetection, bool vertical, const std::string &texture,
+	bool collisiondetection, bool collision_removal,
+	bool vertical, const std::string &texture,
 	const std::string &playername)
 {
 	// m_env will be NULL if the server is initializing
@@ -3200,7 +3207,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 	SendAddParticleSpawner(peer_id, amount, spawntime,
 		minpos, maxpos, minvel, maxvel, minacc, maxacc,
 		minexptime, maxexptime, minsize, maxsize,
-		collisiondetection, vertical, texture, id);
+		collisiondetection, collision_removal, vertical, texture, id);
 
 	return id;
 }
diff --git a/src/server.h b/src/server.h
index daf51dee1..7ee15a463 100644
--- a/src/server.h
+++ b/src/server.h
@@ -275,7 +275,8 @@ public:
 	void spawnParticle(const std::string &playername,
 		v3f pos, v3f velocity, v3f acceleration,
 		float expirationtime, float size,
-		bool collisiondetection, bool vertical, const std::string &texture);
+		bool collisiondetection, bool collision_removal,
+		bool vertical, const std::string &texture);
 
 	u32 addParticleSpawner(u16 amount, float spawntime,
 		v3f minpos, v3f maxpos,
@@ -283,7 +284,8 @@ public:
 		v3f minacc, v3f maxacc,
 		float minexptime, float maxexptime,
 		float minsize, float maxsize,
-		bool collisiondetection, bool vertical, const std::string &texture,
+		bool collisiondetection, bool collision_removal,
+		bool vertical, const std::string &texture,
 		const std::string &playername);
 
 	void deleteParticleSpawner(const std::string &playername, u32 id);
@@ -456,7 +458,8 @@ private:
 		v3f minacc, v3f maxacc,
 		float minexptime, float maxexptime,
 		float minsize, float maxsize,
-		bool collisiondetection, bool vertical, std::string texture, u32 id);
+		bool collisiondetection, bool collision_removal,
+		bool vertical, const std::string &texture, u32 id);
 
 	void SendDeleteParticleSpawner(u16 peer_id, u32 id);
 
@@ -464,7 +467,8 @@ private:
 	void SendSpawnParticle(u16 peer_id,
 		v3f pos, v3f velocity, v3f acceleration,
 		float expirationtime, float size,
-		bool collisiondetection, bool vertical, std::string texture);
+		bool collisiondetection, bool collision_removal,
+		bool vertical, const std::string &texture);
 
 	u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
 	void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);

From a9bc7dc405df04d5a3cb5fe5de43190200dc692d Mon Sep 17 00:00:00 2001
From: Zeno- <kde.psych@gmail.com>
Date: Mon, 30 May 2016 22:37:40 +1000
Subject: [PATCH 038/418] Remove unused code in s_security.cpp (#4172)

Note that the macro CHECK_FILE_ERR implements the code removed
---
 src/script/cpp_api/s_security.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 730235c7b..e117a4811 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -249,8 +249,8 @@ bool ScriptApiSecurity::isSecure(lua_State *L)
 
 #define CHECK_FILE_ERR(ret, fp) \
 	if (ret) { \
-		if (fp) std::fclose(fp); \
 		lua_pushfstring(L, "%s: %s", path, strerror(errno)); \
+		if (fp) std::fclose(fp); \
 		return false; \
 	}
 
@@ -291,20 +291,12 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
 	// Read the file
 	int ret = std::fseek(fp, 0, SEEK_END);
 	CHECK_FILE_ERR(ret, fp);
-	if (ret) {
-		std::fclose(fp);
-		lua_pushfstring(L, "%s: %s", path, strerror(errno));
-		return false;
-	}
+
 	size_t size = std::ftell(fp) - start;
 	char *code = new char[size];
 	ret = std::fseek(fp, start, SEEK_SET);
 	CHECK_FILE_ERR(ret, fp);
-	if (ret) {
-		std::fclose(fp);
-		lua_pushfstring(L, "%s: %s", path, strerror(errno));
-		return false;
-	}
+
 	size_t num_read = std::fread(code, 1, size, fp);
 	if (path) {
 		std::fclose(fp);

From 4134d8ad13c371820a485a9752b1197a8d7007f3 Mon Sep 17 00:00:00 2001
From: Sokomine <wegwerf@anarres.homenet.org>
Date: Mon, 30 May 2016 14:40:32 +0200
Subject: [PATCH 039/418] protection_bypass priv can now be revoked in
 singleplayer (#4169)

---
 builtin/game/privileges.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua
index bd5ead624..5838b9374 100644
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@@ -32,7 +32,10 @@ core.register_privilege("settime", "Can use /time")
 core.register_privilege("privs", "Can modify privileges")
 core.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges")
 core.register_privilege("server", "Can do server maintenance stuff")
-core.register_privilege("protection_bypass", "Can bypass node protection in the world")
+core.register_privilege("protection_bypass", {
+	description = "Can bypass node protection in the world",
+	give_to_singleplayer = false,
+})
 core.register_privilege("shout", "Can speak in chat")
 core.register_privilege("ban", "Can ban and unban players")
 core.register_privilege("kick", "Can kick players")

From 27db92925261ed6646d0a1c0512711ab3aeb5fb8 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 30 May 2016 23:27:48 +1000
Subject: [PATCH 040/418] Add minetest.check_password_entry callback

Gives a convenient way to check a player's password.

This entirely bypasses the SRP protocol, so should be used
with great care.

This function is not intended to be used
in-game, but solely by external protocols, where no
authentication of the minetest engine is provided, and
also only for protocols, in which the user already gives the
server the plaintext password.

Examples for good use are the classical http form, or irc,
an example for a bad use is a password change dialog inside
formspec.

Users should be aware that they lose the advantages of the SRP
protocol if they enter their passwords for servers outside the
normal entry box, like in in-game formspec menus,
or through irc /msg s,

This patch also fixes an auth.h mistake which has mixed up the
order of params inside the decode_srp_verifier_and_salt function.

Zeno-: Added errorstream message for invalid format when I committed
---
 doc/lua_api.txt               |  9 +++++++++
 src/script/lua_api/l_util.cpp | 30 ++++++++++++++++++++++++++++++
 src/script/lua_api/l_util.h   |  3 +++
 src/util/auth.h               |  2 +-
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 03f2dad32..82a0acbee 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1951,12 +1951,21 @@ Call these functions only at load time!
 * `minetest.notify_authentication_modified(name)`
     * Should be called by the authentication handler if privileges changes.
     * To report everybody, set `name=nil`.
+* `minetest.check_password_entry(name, entry, password)`
+    * Returns true if the "db entry" for a player with name matches given
+    * password, false otherwise.
+    * The "db entry" is the usually player-individual value that is derived
+    * from the player's chosen password and stored on the server in order to allow
+    * authentication whenever the player desires to log in.
+    * Only use this function for making it possible to log in via the password from
+    * via protocols like IRC, other uses for inside the game are frowned upon.
 * `minetest.get_password_hash(name, raw_password)`
     * Convert a name-password pair to a password hash that Minetest can use.
     * The returned value alone is not a good basis for password checks based
     * on comparing the password hash in the database with the password hash
     * from the function, with an externally provided password, as the hash
     * in the db might use the new SRP verifier format.
+    * For this purpose, use minetest.check_password_entry instead.
 * `minetest.string_to_privs(str)`: returns `{priv1=true,...}`
 * `minetest.privs_to_string(privs)`: returns `"priv1,priv2,..."`
     * Convert between two privilege representations
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index e90b7fbcf..d090fc91c 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -246,6 +246,35 @@ int ModApiUtil::l_get_hit_params(lua_State *L)
 	return 1;
 }
 
+// check_password_entry(name, entry, password)
+int ModApiUtil::l_check_password_entry(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	std::string name = luaL_checkstring(L, 1);
+	std::string entry = luaL_checkstring(L, 2);
+	std::string password = luaL_checkstring(L, 3);
+
+	if (base64_is_valid(entry)) {
+		std::string hash = translate_password(name, password);
+		lua_pushboolean(L, hash == entry);
+		return 1;
+	}
+
+	std::string salt;
+	std::string verifier;
+
+	if (!decode_srp_verifier_and_salt(entry, &verifier, &salt)) {
+		// invalid format
+		warningstream << "Invalid password format for " << name << std::endl;
+		lua_pushboolean(L, false);
+		return 1;
+	}
+	std::string gen_verifier = generate_srp_verifier(name, password, salt);
+
+	lua_pushboolean(L, gen_verifier == verifier);
+	return 1;
+}
+
 // get_password_hash(name, raw_password)
 int ModApiUtil::l_get_password_hash(lua_State *L)
 {
@@ -449,6 +478,7 @@ void ModApiUtil::Initialize(lua_State *L, int top)
 	API_FCT(get_dig_params);
 	API_FCT(get_hit_params);
 
+	API_FCT(check_password_entry);
 	API_FCT(get_password_hash);
 
 	API_FCT(is_yes);
diff --git a/src/script/lua_api/l_util.h b/src/script/lua_api/l_util.h
index 779dbe281..3012d55aa 100644
--- a/src/script/lua_api/l_util.h
+++ b/src/script/lua_api/l_util.h
@@ -71,6 +71,9 @@ private:
 	// get_hit_params(groups, tool_capabilities[, time_from_last_punch])
 	static int l_get_hit_params(lua_State *L);
 
+	// check_password_entry(name, entry, password)
+	static int l_check_password_entry(lua_State *L);
+
 	// get_password_hash(name, raw_password)
 	static int l_get_password_hash(lua_State *L);
 
diff --git a/src/util/auth.h b/src/util/auth.h
index 1fd6ab453..7cdc7d74d 100644
--- a/src/util/auth.h
+++ b/src/util/auth.h
@@ -45,6 +45,6 @@ std::string encode_srp_verifier(const std::string &verifier,
 /// Reads the DB-formatted SRP verifier and gets the verifier
 /// and salt components.
 bool decode_srp_verifier_and_salt(const std::string &encoded,
-	std::string *salt, std::string *bytes_v);
+	std::string *verifier, std::string *salt);
 
 #endif

From 3842c3de656c8eebe46c63b67ecc50f1afdee981 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Wed, 11 May 2016 04:34:34 +0200
Subject: [PATCH 041/418] Translated using Weblate (German)

Currently translated at 100.0% (887 of 887 strings)
---
 po/de/minetest.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/de/minetest.po b/po/de/minetest.po
index b9db120e5..25d49957c 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-05-06 02:25+0000\n"
+"PO-Revision-Date: 2016-05-11 04:34+0000\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/minetest/minetest/de/>\n"
@@ -2944,7 +2944,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity"
-msgstr "Flüssigkeitswiederstand"
+msgstr "Flüssigkeitswiderstand"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity smoothing"

From 526c978f9691f2d7d389ed50d511bf9a788baffd Mon Sep 17 00:00:00 2001
From: Vasily Pavlov <halmet94@gmail.com>
Date: Wed, 11 May 2016 22:36:17 +0200
Subject: [PATCH 042/418] Translated using Weblate (Russian)

Currently translated at 57.1% (507 of 887 strings)
---
 po/ru/minetest.po | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index d28193911..425a1ee0c 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-04-18 23:08+0000\n"
-"Last-Translator: Stas Kies <stask85@gmail.com>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/minetest/"
-"minetest/ru/>\n"
+"PO-Revision-Date: 2016-05-11 22:36+0000\n"
+"Last-Translator: Vasily Pavlov <halmet94@gmail.com>\n"
+"Language-Team: Russian "
+"<https://hosted.weblate.org/projects/minetest/minetest/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3767,9 +3767,8 @@ msgid "Serverlist URL"
 msgstr "Список публичных серверов"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Serverlist file"
-msgstr "Список публичных серверов"
+msgstr "Файл списка серверов"
 
 #: src/settings_translation_file.cpp
 #, fuzzy

From dc33ecad6d0f8651e0e3cd0716f7e3c49138f3ed Mon Sep 17 00:00:00 2001
From: Sergey <mae_mbllo@mail.ru>
Date: Wed, 11 May 2016 22:34:38 +0200
Subject: [PATCH 043/418] Translated using Weblate (Russian)

Currently translated at 57.0% (506 of 887 strings)

This is a merger of three commits.
---
 po/ru/minetest.po | 111 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 88 insertions(+), 23 deletions(-)

diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index 425a1ee0c..fdb2539db 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-05-11 22:36+0000\n"
-"Last-Translator: Vasily Pavlov <halmet94@gmail.com>\n"
+"PO-Revision-Date: 2016-05-13 13:42+0000\n"
+"Last-Translator: Sergey <mae_mbllo@mail.ru>\n"
 "Language-Team: Russian "
 "<https://hosted.weblate.org/projects/minetest/minetest/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.6-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.7-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -98,6 +98,7 @@ msgid "Enable all"
 msgstr "Включить всё"
 
 #: builtin/mainmenu/dlg_config_world.lua
+#, fuzzy
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
@@ -425,6 +426,7 @@ msgid "Creative mode"
 msgstr "Режим творчества"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+#, fuzzy
 msgid "Damage enabled"
 msgstr "Разрешить увечья"
 
@@ -1620,16 +1622,23 @@ msgid "Colored fog"
 msgstr "Цветной туман"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
+"Список доверенных модов, через запятую, которым разрешён доступ к "
+"небезопасным функциям, даже в безопасном режиме (с помощью "
+"request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"Список доверенных модов, через запятую, которым разрешён доступ к HTTP API,  "
+"что позволяет им отправлять и принимать данные в/из сети Интернет."
 
 #: src/settings_translation_file.cpp
 msgid "Command key"
@@ -1800,7 +1809,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
+msgstr "Задержка показа подсказок, указанная в миллисекундах."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1923,8 +1932,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Enables animation of inventory items."
-msgstr ""
+msgstr "Включить анимацию предметов в инвентаре."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1979,18 +1989,22 @@ msgid "Fall bobbing"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fallback font"
 msgstr "Fallback шрифт"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fallback font shadow"
-msgstr ""
+msgstr "Fallback тень шрифта"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fallback font shadow alpha"
-msgstr ""
+msgstr "Fallback прозрачность тени шрифта"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fallback font size"
 msgstr "Fallback размер шрифта"
 
@@ -2016,7 +2030,7 @@ msgid ""
 "Fast movement (via use key).\n"
 "This requires the \"fast\" privilege on the server."
 msgstr ""
-"Быстрое перемещение (с использование клавиши).\n"
+"Быстрое перемещение (с использованием клавиши).\n"
 "Это требует привилегию \"fast\" на сервере."
 
 #: src/settings_translation_file.cpp
@@ -2056,8 +2070,9 @@ msgid "Filtering"
 msgstr "Фильтрация"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fixed map seed"
-msgstr "Конкретное семя мира"
+msgstr "Фиксированное зерно мира"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
@@ -2101,13 +2116,12 @@ msgid "Font size"
 msgstr "Размер шрифта"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Format of screenshots."
-msgstr "Путь для сохранения скриншотов."
+msgstr "Формат скриншотов."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
-msgstr "Вперед"
+msgstr "Клавиша  вперёд"
 
 #: src/settings_translation_file.cpp
 msgid "Freetype fonts"
@@ -2166,6 +2180,7 @@ msgid "Generate normalmaps"
 msgstr "Генерировать карты нормалей"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -2176,6 +2191,16 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Параметры глобального генератора карты.\n"
+"В генераторе карт v6 флаг 'decorations' управляет всем оформлением за "
+"исключением деревьев\n"
+" и junglegras(травы джунглей?), в остальных генераторах этот флаг управляет "
+"всем оформлением.\n"
+"Стандартные флаги, установленные в engine(инструменте?) следующие: caves, "
+"light, decorations\n"
+"Строка флагов изменяет стандартные настройки engine(инструмента?).\n"
+"Флаги, не указанные в строке флагов, по умолчанию не изменяются.\n"
+"Флаги, начинающиеся с 'no' используются для их явного отключения."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
@@ -2201,18 +2226,26 @@ msgid ""
 "-    log: mimic and log backtrace of deprecated call (default for debug).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
+"Обработка для устаревших вызовов lua api:\n"
+"-    legacy: (иногда успешно) имитирует прежнее поведение  (по умолчанию для "
+"релиза).\n"
+"-    log: имитирует и журналирует backtrace(трассировку?след?) устаревших "
+"вызовов (по умолчанию для отладки).\n"
+"-    error: прерывание при использовании устаревших вызовов (рекомендовано "
+"для разработчиков модов)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Height component of the initial window size."
-msgstr ""
+msgstr "Высота содержимого (относительно?) исходного размера окна"
 
 #: src/settings_translation_file.cpp
 msgid "Height on which clouds are appearing."
-msgstr ""
+msgstr "Высота, на которой появляются облака."
 
 #: src/settings_translation_file.cpp
 msgid "High-precision FPU"
-msgstr ""
+msgstr "Высокоточный FPU"
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
@@ -2220,33 +2253,43 @@ msgstr "Домашняя страница сервера, отображаема
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers"
-msgstr ""
+msgstr "Глубина рек"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "How large area of blocks are subject to the active block stuff, stated in "
 "mapblocks (16 nodes).\n"
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
+"Размер площади из блоков, составляющей активный блок, расположенный в "
+"mapblocks (16 nodes).↵\n"
+"В активных блоках объекты загружаются и ABMs запускается."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
+msgstr "Количество блоков, передаваемых одновременно для всего сервера."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
+msgstr "Количество блоков, передаваемых одновременно для каждого клиента."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
 "Higher value is smoother, but will use more RAM."
 msgstr ""
+"Время ожидания сервера до выгрузки неиспользуемых mapblocks.\n"
+"Высокие значения более плавные, но используют больше RAM."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "How wide to make rivers"
-msgstr ""
+msgstr "Установка ширины рек"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2262,39 +2305,57 @@ msgid "IPv6 support."
 msgstr "IPv6 поддержка."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If FPS would go higher than this, limit it by sleeping\n"
 "to not waste CPU power for no benefit."
 msgstr ""
+"Если FPS превысит это значение, ограничить его простоем,\n"
+"чтобы не тратить мощность процессора впустую."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If disabled \"use\" key is used to fly fast if both fly and fast mode are "
 "enabled."
 msgstr ""
+"Если выключено, кнопка \"use\"(\"использовать\"?) используется для быстрого "
+"полёта, если одновременно включены быстрый режим и режим полёта."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If enabled together with fly mode, player is able to fly through solid "
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
+"Если включено одновременно с режимом полёта, игрок может летать через "
+"твердые nodes(узлы?вершины?). Это требует привилегий \"noclip\" на сервере."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
 "and descending."
 msgstr ""
+"Если включено, клавиша \"use\"(\"использовать\"?) вместо \"sneak\"(\""
+"подкрасться\"?) будет использоваться для climbing down and descending."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
 msgstr ""
+"Если включено, действия записываются для отката.\n"
+"Этот параметр считывается только при запуске сервера."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "If enabled, disable cheat prevention in multiplayer."
 msgstr ""
+"Если включено, отключается prevention(предупреждение?предотвращение?) "
+"читерства в мультиплеере."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3700,19 +3761,23 @@ msgstr "Каталог со скриншотами"
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Screenshot format"
-msgstr "Каталог со скриншотами"
+msgstr "Формат скриншота"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Screenshot quality"
-msgstr "Cкриншот"
+msgstr "Качество скриншота"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Screenshot quality. Only used for JPEG format.\n"
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"Качество скриншота. Используется только для изображений в формате JPEG.\n"
+"1 означает плохое качество; 100 означает хорошее качество.\n"
+"Используйте 0 для настроек по умолчанию."
 
 #: src/settings_translation_file.cpp
 #, fuzzy

From 30cd77a30ba5d8086947fe4abbc958d3cb8a9415 Mon Sep 17 00:00:00 2001
From: Fixer <artem.brz@gmail.com>
Date: Thu, 12 May 2016 01:10:28 +0200
Subject: [PATCH 044/418] Translated using Weblate (Ukrainian)

Currently translated at 39.3% (349 of 887 strings)
---
 po/uk/minetest.po | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/po/uk/minetest.po b/po/uk/minetest.po
index 4a2101d76..1ae1094a3 100644
--- a/po/uk/minetest.po
+++ b/po/uk/minetest.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-05-10 00:06+0000\n"
+"PO-Revision-Date: 2016-05-12 01:10+0000\n"
 "Last-Translator: Fixer <artem.brz@gmail.com>\n"
 "Language-Team: Ukrainian "
 "<https://hosted.weblate.org/projects/minetest/minetest/uk/>\n"
@@ -87,14 +87,12 @@ msgid "Depends:"
 msgstr "Залежить від:"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Disable MP"
-msgstr "Вимкнути МП"
+msgstr "Вимкнути модпак"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Enable MP"
-msgstr "Увімкнути МП"
+msgstr "Увімкнути модпак"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -113,13 +111,12 @@ msgid "Hide Game"
 msgstr "Приховати гру"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Hide mp content"
-msgstr "Приховати мп контент"
+msgstr "Сховати вміст модпаку"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr "Модифікація:"
+msgstr "Мод:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
@@ -466,7 +463,7 @@ msgstr "Творчість"
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Enable Damage"
-msgstr "Увімкнути поранення"
+msgstr "Поранення"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Name/Password"
@@ -538,9 +535,8 @@ msgid "Bilinear Filter"
 msgstr "Білінійна фільтрація"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
-msgstr "Бамп-маппінг"
+msgstr "Бамп маппінг"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
@@ -548,11 +544,11 @@ msgstr "Змінити клавіші"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Connected Glass"
-msgstr "З'єднане скло"
+msgstr "З'єднувати скло"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Fancy Leaves"
-msgstr "Гарні листя"
+msgstr "Гарне листя"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
@@ -568,7 +564,7 @@ msgstr "Ні"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
-msgstr "Без фільтрування"
+msgstr "Без фільтрації"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
@@ -896,7 +892,7 @@ msgstr "Далі"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "\"Use\" = climb down"
-msgstr "\"Використовувати\" = підніматися в гору"
+msgstr "\"Використовувати\" = підніматися вгору"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Backward"
@@ -1564,7 +1560,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
-msgstr ""
+msgstr "Клієнт і сервер"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
@@ -3261,7 +3257,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Network"
-msgstr ""
+msgstr "Мережа"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3534,7 +3530,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Security"
-msgstr ""
+msgstr "Безпека"
 
 #: src/settings_translation_file.cpp
 msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
@@ -3665,7 +3661,7 @@ msgstr "Крастися"
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
-msgstr ""
+msgstr "Звук"
 
 #: src/settings_translation_file.cpp
 msgid ""

From 5e9663d3d4cdfe2fea540a0c7dc5b4f06c666440 Mon Sep 17 00:00:00 2001
From: Emon Omen <emon@openmailbox.org>
Date: Sat, 14 May 2016 13:34:53 +0200
Subject: [PATCH 045/418] Translated using Weblate (Italian)

Currently translated at 100.0% (887 of 887 strings)
---
 po/it/minetest.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/it/minetest.po b/po/it/minetest.po
index 83ff7c1ab..bd6a22e32 100644
--- a/po/it/minetest.po
+++ b/po/it/minetest.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Minetest 0.4.9\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-05-08 17:01+0000\n"
+"PO-Revision-Date: 2016-05-14 13:34+0000\n"
 "Last-Translator: Emon Omen <emon@openmailbox.org>\n"
 "Language-Team: Italian "
 "<https://hosted.weblate.org/projects/minetest/minetest/it/>\n"
@@ -2831,7 +2831,7 @@ msgstr "Tasto \"Usare\" per arrampicarsi/scendere"
 
 #: src/settings_translation_file.cpp
 msgid "Language"
-msgstr "Linua"
+msgstr "Lingua"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"

From 6792447dfa6ae4f13c0166c2c85016fbb557a8ee Mon Sep 17 00:00:00 2001
From: Andrey K <contact@libnaru.so>
Date: Fri, 20 May 2016 15:18:33 +0000
Subject: [PATCH 046/418] Translated using Weblate (Russian)

Currently translated at 57.2% (508 of 887 strings)
---
 po/ru/minetest.po | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index fdb2539db..8c48a2c2e 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-05-13 13:42+0000\n"
-"Last-Translator: Sergey <mae_mbllo@mail.ru>\n"
+"PO-Revision-Date: 2016-05-20 15:18+0000\n"
+"Last-Translator: Andrey K. <contact@libnaru.so>\n"
 "Language-Team: Russian "
 "<https://hosted.weblate.org/projects/minetest/minetest/ru/>\n"
 "Language: ru\n"
@@ -104,7 +104,8 @@ msgid ""
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
 "Ошибка при попытке включения мода \"$1\" поскольку он содержит недопустимые "
-"символы. Допускается использование символов от Aa-Zz и от 0-9."
+"символы. Допускается использование строчных букв латинского алфавита, цифр, "
+"и знака подчёркивания."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"

From 0e44af9f7056a78a8e561f708751acceacd149c1 Mon Sep 17 00:00:00 2001
From: yuval hreman <huckvrni@gmail.com>
Date: Thu, 26 May 2016 21:02:00 +0000
Subject: [PATCH 047/418] Translated using Weblate (Hebrew)

Currently translated at 7.8% (70 of 887 strings)
---
 po/he/minetest.po | 56 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/po/he/minetest.po b/po/he/minetest.po
index f4229208c..f3e1e6500 100644
--- a/po/he/minetest.po
+++ b/po/he/minetest.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2015-10-26 16:22+0200\n"
-"Last-Translator: ChaosWormz <chaoswormz@openmailbox.org>\n"
-"Language-Team: Hebrew <https://hosted.weblate.org/projects/minetest/minetest/"
-"he/>\n"
+"PO-Revision-Date: 2016-05-26 21:01+0000\n"
+"Last-Translator: yuval hreman <huckvrni@gmail.com>\n"
+"Language-Team: Hebrew "
+"<https://hosted.weblate.org/projects/minetest/minetest/he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.5-dev\n"
+"X-Generator: Weblate 2.7-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr ""
+msgstr "אירעה שגיאה בקוד לואה (Lua), כנראה באחד המודים:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -41,7 +41,7 @@ msgstr "התחבר מחדש"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr ""
+msgstr "השרת מבקש שתתחבר מחדש:"
 
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
@@ -49,27 +49,27 @@ msgstr "טוען..."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr ""
+msgstr "שגיאה בגרסאות הפרוטוקול. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr ""
+msgstr "השרת יפעיל את פרוטוקול גרסה $1. בכוח "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr ""
+msgstr "השרת תומך בפרוטוקולים בין גרסה $1 וגרסה $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
+msgstr "נסה לצאת והכנס מחדש לרשימת השרתים ובדוק את חיבור האינטרנט שלך."
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr ""
+msgstr "אנו תומכים רק בגירסה 1$ של הפרוטוקול."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr ""
+msgstr "אנו תומכים בגרסאות בין 1$ ל-2$ של הפרוטוקול."
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -93,13 +93,15 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr "אפשר בכל"
+msgstr "אפשר הכל"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
+"טעינת המוד \"1$\" נכשלה מכיוון שהוא מכיל תווים לא חוקיים. רק התווים [a-z0-9_]"
+" מותרים."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -128,7 +130,7 @@ msgstr "מופעל"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr ""
+msgstr "עולם בשם \"1$\" כבר קיים"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -136,11 +138,11 @@ msgstr "ליצור"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr ""
+msgstr "הורד מפעיל משחק, למשל \"minetest_game\", מהאתר: minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr ""
+msgstr "הורד אחד מ-\"minetest.net\""
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -148,11 +150,11 @@ msgstr "משחק"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
-msgstr ""
+msgstr "מנוע מפות"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No worldname given or no game selected"
-msgstr ""
+msgstr "לא נבחר שם לעולם או שאף מפעיל משחק לא נבחר"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Seed"
@@ -160,7 +162,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The minimal development test is meant for developers."
-msgstr ""
+msgstr "אזהרה: מצב המפתחים נועד למפתחים!."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -168,7 +170,7 @@ msgstr "שם העולם"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no subgames installed."
-msgstr ""
+msgstr "אין לך אף מפעיל משחק מותקן."
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
@@ -397,9 +399,8 @@ msgid "Uninstall selected modpack"
 msgstr ""
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "כתובת / פורט :"
+msgstr "כתובת / פורט"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -426,9 +427,8 @@ msgid "Favorite"
 msgstr ""
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "שם/סיסמה :"
+msgstr "שם/סיסמה"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -505,9 +505,8 @@ msgid "8x"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Advanced Settings"
-msgstr "הגדרות"
+msgstr "הגדרות מתקדמות"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
@@ -587,9 +586,8 @@ msgid "Parallax Occlusion"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "אפשר בכל"
+msgstr "חלקיקים"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"

From 1d40385d4aacf0cbea4b19ff06940e8c9bebaf47 Mon Sep 17 00:00:00 2001
From: TriBlade9 <triblade9@mail.com>
Date: Fri, 16 Jan 2015 14:54:26 +0800
Subject: [PATCH 048/418] Colored chat working as expected for both freetype
 and non-freetype builds. @nerzhul improvements * Add unit tests * Fix coding
 style * move guiChatConsole.hpp to client/

---
 builtin/game/chatcommands.lua       |   2 +-
 builtin/game/misc.lua               |  17 +
 src/chat.cpp                        |  29 +-
 src/chat.h                          |   6 +-
 src/client/CMakeLists.txt           |   1 +
 src/{ => client}/guiChatConsole.cpp |  31 +-
 src/{ => client}/guiChatConsole.h   |   0
 src/game.cpp                        |  14 +-
 src/util/CMakeLists.txt             |  10 +
 src/util/coloredstring.cpp          |  68 +++
 src/util/coloredstring.h            |  44 ++
 src/util/statictext.cpp             | 654 ++++++++++++++++++++++++++++
 src/util/statictext.h               | 150 +++++++
 13 files changed, 998 insertions(+), 28 deletions(-)
 rename src/{ => client}/guiChatConsole.cpp (96%)
 rename src/{ => client}/guiChatConsole.h (100%)
 create mode 100644 src/util/coloredstring.cpp
 create mode 100644 src/util/coloredstring.h
 create mode 100644 src/util/statictext.cpp
 create mode 100644 src/util/statictext.h

diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua
index 3350140ee..2627559a5 100644
--- a/builtin/game/chatcommands.lua
+++ b/builtin/game/chatcommands.lua
@@ -102,7 +102,7 @@ core.register_chatcommand("help", {
 	description = "Get help for commands or list privileges",
 	func = function(name, param)
 		local function format_help_line(cmd, def)
-			local msg = "/"..cmd
+			local msg = core.colorize("00ffff", "/"..cmd)
 			if def.params and def.params ~= "" then
 				msg = msg .. " " .. def.params
 			end
diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index de41cfc91..8d5c80216 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -197,3 +197,20 @@ function core.http_add_fetch(httpenv)
 
 	return httpenv
 end
+
+function core.get_color_escape_sequence(color)
+	--if string.len(color) == 3 then
+	--	local r = string.sub(color, 1, 1)
+	--	local g = string.sub(color, 2, 2)
+	--	local b = string.sub(color, 3, 3)
+	--	color = r ..  r .. g .. g .. b .. b
+	--end
+
+	--assert(#color == 6, "Color must be six characters in length.")
+	--return "\v" .. color
+	return "\v(color;" .. color .. ")"
+end
+
+function core.colorize(color, message)
+	return core.get_color_escape_sequence(color) .. message .. core.get_color_escape_sequence("ffffff")
+end
diff --git a/src/chat.cpp b/src/chat.cpp
index cebe31225..958389df5 100644
--- a/src/chat.cpp
+++ b/src/chat.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "chat.h"
 #include "debug.h"
+#include "config.h"
 #include "util/strfnd.h"
 #include <cctype>
 #include <sstream>
@@ -251,8 +252,7 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
 	u32 hanging_indentation = 0;
 
 	// Format the sender name and produce fragments
-	if (!line.name.empty())
-	{
+	if (!line.name.empty()) {
 		temp_frag.text = L"<";
 		temp_frag.column = 0;
 		//temp_frag.bold = 0;
@@ -267,28 +267,28 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
 		next_frags.push_back(temp_frag);
 	}
 
+	std::wstring name_sanitized = removeEscapes(line.name);
+
 	// Choose an indentation level
-	if (line.name.empty())
-	{
+	if (line.name.empty()) {
 		// Server messages
 		hanging_indentation = 0;
 	}
-	else if (line.name.size() + 3 <= cols/2)
-	{
+	else if (name_sanitized.size() + 3 <= cols/2) {
 		// Names shorter than about half the console width
 		hanging_indentation = line.name.size() + 3;
 	}
-	else
-	{
+	else {
 		// Very long names
 		hanging_indentation = 2;
 	}
+	ColoredString line_text(line.text);
 
 	next_line.first = true;
 	bool text_processing = false;
 
 	// Produce fragments and layout them into lines
-	while (!next_frags.empty() || in_pos < line.text.size())
+	while (!next_frags.empty() || in_pos < line_text.size())
 	{
 		// Layout fragments into lines
 		while (!next_frags.empty())
@@ -326,9 +326,9 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
 		}
 
 		// Produce fragment
-		if (in_pos < line.text.size())
+		if (in_pos < line_text.size())
 		{
-			u32 remaining_in_input = line.text.size() - in_pos;
+			u32 remaining_in_input = line_text.size() - in_pos;
 			u32 remaining_in_output = cols - out_column;
 
 			// Determine a fragment length <= the minimum of
@@ -338,14 +338,14 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
 			while (frag_length < remaining_in_input &&
 					frag_length < remaining_in_output)
 			{
-				if (isspace(line.text[in_pos + frag_length]))
+				if (isspace(line_text[in_pos + frag_length]))
 					space_pos = frag_length;
 				++frag_length;
 			}
 			if (space_pos != 0 && frag_length < remaining_in_input)
 				frag_length = space_pos + 1;
 
-			temp_frag.text = line.text.substr(in_pos, frag_length);
+			temp_frag.text = line_text.substr(in_pos, frag_length);
 			temp_frag.column = 0;
 			//temp_frag.bold = 0;
 			next_frags.push_back(temp_frag);
@@ -686,9 +686,6 @@ ChatBackend::~ChatBackend()
 
 void ChatBackend::addMessage(std::wstring name, std::wstring text)
 {
-	name = unescape_enriched(name);
-	text = unescape_enriched(text);
-
 	// Note: A message may consist of multiple lines, for example the MOTD.
 	WStrfnd fnd(text);
 	while (!fnd.at_end())
diff --git a/src/chat.h b/src/chat.h
index db4146d35..661cafc82 100644
--- a/src/chat.h
+++ b/src/chat.h
@@ -20,11 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CHAT_HEADER
 #define CHAT_HEADER
 
-#include "irrlichttypes.h"
 #include <string>
 #include <vector>
 #include <list>
 
+#include "irrlichttypes.h"
+#include "util/coloredstring.h"
+
 // Chat console related classes
 
 struct ChatLine
@@ -34,7 +36,7 @@ struct ChatLine
 	// name of sending player, or empty if sent by server
 	std::wstring name;
 	// message text
-	std::wstring text;
+	ColoredString text;
 
 	ChatLine(std::wstring a_name, std::wstring a_text):
 		age(0.0),
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index a1ec37fe3..bcf114760 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(client_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/clientlauncher.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiChatConsole.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/tile.cpp
 	PARENT_SCOPE
 )
diff --git a/src/guiChatConsole.cpp b/src/client/guiChatConsole.cpp
similarity index 96%
rename from src/guiChatConsole.cpp
rename to src/client/guiChatConsole.cpp
index 17a1689c7..d8837556a 100644
--- a/src/guiChatConsole.cpp
+++ b/src/client/guiChatConsole.cpp
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 
 #if USE_FREETYPE
-#include "xCGUITTFont.h"
+	#include "xCGUITTFont.h"
 #endif
 
 inline u32 clamp_u8(s32 value)
@@ -340,13 +340,28 @@ void GUIChatConsole::drawText()
 			s32 x = (fragment.column + 1) * m_fontsize.X;
 			core::rect<s32> destrect(
 				x, y, x + m_fontsize.X * fragment.text.size(), y + m_fontsize.Y);
-			m_font->draw(
-				fragment.text.c_str(),
-				destrect,
-				video::SColor(255, 255, 255, 255),
-				false,
-				false,
-				&AbsoluteClippingRect);
+
+
+			#if USE_FREETYPE
+			// Draw colored text if FreeType is enabled
+				irr::gui::CGUITTFont *tmp = static_cast<irr::gui::CGUITTFont*>(m_font);
+				tmp->draw(
+					fragment.text.c_str(),
+					destrect,
+					fragment.text.getColors(),
+					false,
+					false,
+					&AbsoluteClippingRect);
+			#else
+			// Otherwise use standard text
+				m_font->draw(
+					fragment.text.c_str(),
+					destrect,
+					video::SColor(255, 255, 255, 255),
+					false,
+					false,
+					&AbsoluteClippingRect);
+			#endif
 		}
 	}
 }
diff --git a/src/guiChatConsole.h b/src/client/guiChatConsole.h
similarity index 100%
rename from src/guiChatConsole.h
rename to src/client/guiChatConsole.h
diff --git a/src/game.cpp b/src/game.cpp
index c5211a042..71a04aef5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "filesys.h"
 #include "gettext.h"
-#include "guiChatConsole.h"
+#include "client/guiChatConsole.h"
 #include "guiFormSpecMenu.h"
 #include "guiKeyChangeMenu.h"
 #include "guiPasswordChange.h"
@@ -59,6 +59,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "minimap.h"
 #include "mapblock_mesh.h"
 
+#if USE_FREETYPE
+	#include "util/statictext.h"
+#endif
+
 #include "sound.h"
 
 #if USE_SOUND
@@ -2239,12 +2243,20 @@ bool Game::initGui()
 			false, false, guiroot);
 	guitext_status->setVisible(false);
 
+#if USE_FREETYPE
+	// Colored chat support when using FreeType
+	guitext_chat = new gui::StaticText(L"", false, guienv, guiroot, -1, core::rect<s32>(0, 0, 0, 0), false);
+	guitext_chat->setWordWrap(true);
+	guitext_chat->drop();
+#else
+	// Standard chat when FreeType is disabled
 	// Chat text
 	guitext_chat = guienv->addStaticText(
 			L"",
 			core::rect<s32>(0, 0, 0, 0),
 			//false, false); // Disable word wrap as of now
 			false, true, guiroot);
+#endif
 	// Remove stale "recent" chat messages from previous connections
 	chat_backend->clearRecentChat();
 
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 0e7cbad07..e028a0435 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,7 +1,16 @@
+if(USE_FREETYPE)
+	set(UTIL_FREETYPEDEP_SRCS
+		${CMAKE_CURRENT_SOURCE_DIR}/statictext.cpp
+	)
+else()
+	set(UTIL_FREETYPEDEP_SRCS )
+endif(USE_FREETYPE)
+
 set(UTIL_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/areastore.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/auth.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/coloredstring.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp
@@ -11,5 +20,6 @@ set(UTIL_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/srp.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp
+	${UTIL_FREETYPEDEP_SRCS}
 	PARENT_SCOPE)
 
diff --git a/src/util/coloredstring.cpp b/src/util/coloredstring.cpp
new file mode 100644
index 000000000..7db586550
--- /dev/null
+++ b/src/util/coloredstring.cpp
@@ -0,0 +1,68 @@
+/*
+Copyright (C) 2013 xyz, Ilya Zhuravlev <whatever@xyz.is>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "coloredstring.h"
+#include "util/string.h"
+
+ColoredString::ColoredString()
+{}
+
+ColoredString::ColoredString(const std::wstring &string, const std::vector<SColor> &colors):
+	m_string(string),
+	m_colors(colors)
+{}
+
+ColoredString::ColoredString(const std::wstring &s) {
+	m_string = colorizeText(s, m_colors, SColor(255, 255, 255, 255));
+}
+
+void ColoredString::operator=(const wchar_t *str) {
+	m_string = colorizeText(str, m_colors, SColor(255, 255, 255, 255));
+}
+
+size_t ColoredString::size() const {
+	return m_string.size();
+}
+
+ColoredString ColoredString::substr(size_t pos, size_t len) const {
+	if (pos == m_string.length())
+		return ColoredString();
+	if (len == std::string::npos || pos + len > m_string.length()) {
+		return ColoredString(
+		           m_string.substr(pos, std::string::npos),
+		           std::vector<SColor>(m_colors.begin() + pos, m_colors.end())
+		       );
+	} else {
+		return ColoredString(
+		           m_string.substr(pos, len),
+		           std::vector<SColor>(m_colors.begin() + pos, m_colors.begin() + pos + len)
+		       );
+	}
+}
+
+const wchar_t *ColoredString::c_str() const {
+	return m_string.c_str();
+}
+
+const std::vector<SColor> &ColoredString::getColors() const {
+	return m_colors;
+}
+
+const std::wstring &ColoredString::getString() const {
+	return m_string;
+}
diff --git a/src/util/coloredstring.h b/src/util/coloredstring.h
new file mode 100644
index 000000000..a6d98db30
--- /dev/null
+++ b/src/util/coloredstring.h
@@ -0,0 +1,44 @@
+/*
+Copyright (C) 2013 xyz, Ilya Zhuravlev <whatever@xyz.is>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef COLOREDSTRING_HEADER
+#define COLOREDSTRING_HEADER
+
+#include <string>
+#include <vector>
+#include <SColor.h>
+
+using namespace irr::video;
+
+class ColoredString {
+public:
+	ColoredString();
+	ColoredString(const std::wstring &s);
+	ColoredString(const std::wstring &string, const std::vector<SColor> &colors);
+	void operator=(const wchar_t *str);
+	size_t size() const;
+	ColoredString substr(size_t pos = 0, size_t len = std::string::npos) const;
+	const wchar_t *c_str() const;
+	const std::vector<SColor> &getColors() const;
+	const std::wstring &getString() const;
+private:
+	std::wstring m_string;
+	std::vector<SColor> m_colors;
+};
+
+#endif
diff --git a/src/util/statictext.cpp b/src/util/statictext.cpp
new file mode 100644
index 000000000..b534b560e
--- /dev/null
+++ b/src/util/statictext.cpp
@@ -0,0 +1,654 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "statictext.h"
+#ifdef _IRR_COMPILE_WITH_GUI_
+
+//Only compile this if freetype is enabled.
+
+#include <vector>
+#include <string>
+#include <iostream>
+#include <IGUISkin.h>
+#include <IGUIEnvironment.h>
+#include <IGUIFont.h>
+#include <IVideoDriver.h>
+#include <rect.h>
+#include <SColor.h>
+
+#include "cguittfont/xCGUITTFont.h"
+#include "util/string.h"
+
+namespace irr
+{
+namespace gui
+{
+//! constructor
+StaticText::StaticText(const wchar_t* text, bool border,
+			IGUIEnvironment* environment, IGUIElement* parent,
+			s32 id, const core::rect<s32>& rectangle,
+			bool background)
+: IGUIStaticText(environment, parent, id, rectangle),
+	HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_UPPERLEFT),
+	Border(border), OverrideColorEnabled(false), OverrideBGColorEnabled(false), WordWrap(false), Background(background),
+	RestrainTextInside(true), RightToLeft(false),
+	OverrideColor(video::SColor(101,255,255,255)), BGColor(video::SColor(101,210,210,210)),
+	OverrideFont(0), LastBreakFont(0)
+{
+	#ifdef _DEBUG
+	setDebugName("StaticText");
+	#endif
+
+	Text = text;
+	if (environment && environment->getSkin())
+	{
+		BGColor = environment->getSkin()->getColor(gui::EGDC_3D_FACE);
+	}
+}
+
+
+//! destructor
+StaticText::~StaticText()
+{
+	if (OverrideFont)
+		OverrideFont->drop();
+}
+
+
+//! draws the element and its children
+void StaticText::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin* skin = Environment->getSkin();
+	if (!skin)
+		return;
+	video::IVideoDriver* driver = Environment->getVideoDriver();
+
+	core::rect<s32> frameRect(AbsoluteRect);
+
+	// draw background
+
+	if (Background)
+	{
+		if ( !OverrideBGColorEnabled )	// skin-colors can change
+			BGColor = skin->getColor(gui::EGDC_3D_FACE);
+
+		driver->draw2DRectangle(BGColor, frameRect, &AbsoluteClippingRect);
+	}
+
+	// draw the border
+
+	if (Border)
+	{
+		skin->draw3DSunkenPane(this, 0, true, false, frameRect, &AbsoluteClippingRect);
+		frameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X);
+	}
+
+	// draw the text
+	if (Text.size())
+	{
+		IGUIFont* font = getActiveFont();
+
+		if (font)
+		{
+			if (!WordWrap)
+			{
+				// TODO: add colors here
+				if (VAlign == EGUIA_LOWERRIGHT)
+				{
+					frameRect.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y -
+						font->getDimension(L"A").Height - font->getKerningHeight();
+				}
+				if (HAlign == EGUIA_LOWERRIGHT)
+				{
+					frameRect.UpperLeftCorner.X = frameRect.LowerRightCorner.X -
+						font->getDimension(Text.c_str()).Width;
+				}
+
+				font->draw(Text.c_str(), frameRect,
+					OverrideColorEnabled ? OverrideColor : skin->getColor(isEnabled() ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT),
+					HAlign == EGUIA_CENTER, VAlign == EGUIA_CENTER, (RestrainTextInside ? &AbsoluteClippingRect : NULL));
+			}
+			else
+			{
+				if (font != LastBreakFont)
+					breakText();
+
+				core::rect<s32> r = frameRect;
+				s32 height = font->getDimension(L"A").Height + font->getKerningHeight();
+				s32 totalHeight = height * BrokenText.size();
+				if (VAlign == EGUIA_CENTER)
+				{
+					r.UpperLeftCorner.Y = r.getCenter().Y - (totalHeight / 2);
+				}
+				else if (VAlign == EGUIA_LOWERRIGHT)
+				{
+					r.UpperLeftCorner.Y = r.LowerRightCorner.Y - totalHeight;
+				}
+
+				irr::video::SColor previous_color(255, 255, 255, 255);
+				for (u32 i=0; i<BrokenText.size(); ++i)
+				{
+					if (HAlign == EGUIA_LOWERRIGHT)
+					{
+						r.UpperLeftCorner.X = frameRect.LowerRightCorner.X -
+							font->getDimension(BrokenText[i].c_str()).Width;
+					}
+
+					std::vector<irr::video::SColor> colors;
+					std::wstring str;
+
+					str = colorizeText(BrokenText[i].c_str(), colors, previous_color);
+					if (!colors.empty())
+						previous_color = colors[colors.size() - 1];
+
+					irr::gui::CGUITTFont *tmp = static_cast<irr::gui::CGUITTFont*>(font);
+					tmp->draw(str.c_str(), r,
+						colors,
+						HAlign == EGUIA_CENTER, false, (RestrainTextInside ? &AbsoluteClippingRect : NULL));
+
+					r.LowerRightCorner.Y += height;
+					r.UpperLeftCorner.Y += height;
+				}
+			}
+		}
+	}
+
+	IGUIElement::draw();
+}
+
+
+//! Sets another skin independent font.
+void StaticText::setOverrideFont(IGUIFont* font)
+{
+	if (OverrideFont == font)
+		return;
+
+	if (OverrideFont)
+		OverrideFont->drop();
+
+	OverrideFont = font;
+
+	if (OverrideFont)
+		OverrideFont->grab();
+
+	breakText();
+}
+
+//! Gets the override font (if any)
+IGUIFont * StaticText::getOverrideFont() const
+{
+	return OverrideFont;
+}
+
+//! Get the font which is used right now for drawing
+IGUIFont* StaticText::getActiveFont() const
+{
+	if ( OverrideFont )
+		return OverrideFont;
+	IGUISkin* skin = Environment->getSkin();
+	if (skin)
+		return skin->getFont();
+	return 0;
+}
+
+//! Sets another color for the text.
+void StaticText::setOverrideColor(video::SColor color)
+{
+	OverrideColor = color;
+	OverrideColorEnabled = true;
+}
+
+
+//! Sets another color for the text.
+void StaticText::setBackgroundColor(video::SColor color)
+{
+	BGColor = color;
+	OverrideBGColorEnabled = true;
+	Background = true;
+}
+
+
+//! Sets whether to draw the background
+void StaticText::setDrawBackground(bool draw)
+{
+	Background = draw;
+}
+
+
+//! Gets the background color
+video::SColor StaticText::getBackgroundColor() const
+{
+	return BGColor;
+}
+
+
+//! Checks if background drawing is enabled
+bool StaticText::isDrawBackgroundEnabled() const
+{
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return Background;
+}
+
+
+//! Sets whether to draw the border
+void StaticText::setDrawBorder(bool draw)
+{
+	Border = draw;
+}
+
+
+//! Checks if border drawing is enabled
+bool StaticText::isDrawBorderEnabled() const
+{
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return Border;
+}
+
+
+void StaticText::setTextRestrainedInside(bool restrainTextInside)
+{
+	RestrainTextInside = restrainTextInside;
+}
+
+
+bool StaticText::isTextRestrainedInside() const
+{
+	return RestrainTextInside;
+}
+
+
+void StaticText::setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical)
+{
+	HAlign = horizontal;
+	VAlign = vertical;
+}
+
+
+#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR <= 7
+const video::SColor& StaticText::getOverrideColor() const
+#else
+video::SColor StaticText::getOverrideColor() const
+#endif
+{
+	return OverrideColor;
+}
+
+
+//! Sets if the static text should use the overide color or the
+//! color in the gui skin.
+void StaticText::enableOverrideColor(bool enable)
+{
+	OverrideColorEnabled = enable;
+}
+
+
+bool StaticText::isOverrideColorEnabled() const
+{
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return OverrideColorEnabled;
+}
+
+
+//! Enables or disables word wrap for using the static text as
+//! multiline text control.
+void StaticText::setWordWrap(bool enable)
+{
+	WordWrap = enable;
+	breakText();
+}
+
+
+bool StaticText::isWordWrapEnabled() const
+{
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return WordWrap;
+}
+
+
+void StaticText::setRightToLeft(bool rtl)
+{
+	if (RightToLeft != rtl)
+	{
+		RightToLeft = rtl;
+		breakText();
+	}
+}
+
+
+bool StaticText::isRightToLeft() const
+{
+	return RightToLeft;
+}
+
+
+//! Breaks the single text line.
+void StaticText::breakText()
+{
+	if (!WordWrap)
+		return;
+
+	BrokenText.clear();
+
+	IGUISkin* skin = Environment->getSkin();
+	IGUIFont* font = getActiveFont();
+	if (!font)
+		return;
+
+	LastBreakFont = font;
+
+	core::stringw line;
+	core::stringw word;
+	core::stringw whitespace;
+	s32 size = Text.size();
+	s32 length = 0;
+	s32 elWidth = RelativeRect.getWidth();
+	if (Border)
+		elWidth -= 2*skin->getSize(EGDS_TEXT_DISTANCE_X);
+	wchar_t c;
+
+	std::vector<irr::video::SColor> colors;
+
+	// We have to deal with right-to-left and left-to-right differently
+	// However, most parts of the following code is the same, it's just
+	// some order and boundaries which change.
+	if (!RightToLeft)
+	{
+		// regular (left-to-right)
+		for (s32 i=0; i<size; ++i)
+		{
+			c = Text[i];
+			bool lineBreak = false;
+
+			if (c == L'\r') // Mac or Windows breaks
+			{
+				lineBreak = true;
+				if (Text[i+1] == L'\n') // Windows breaks
+				{
+					Text.erase(i+1);
+					--size;
+				}
+				c = '\0';
+			}
+			else if (c == L'\n') // Unix breaks
+			{
+				lineBreak = true;
+				c = '\0';
+			}
+
+			bool isWhitespace = (c == L' ' || c == 0);
+			if ( !isWhitespace )
+			{
+				// part of a word
+				word += c;
+			}
+
+			if ( isWhitespace || i == (size-1))
+			{
+				if (word.size())
+				{
+					// here comes the next whitespace, look if
+					// we must break the last word to the next line.
+					const s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
+					const std::wstring sanitized = removeEscapes(word.c_str());
+					const s32 wordlgth = font->getDimension(sanitized.c_str()).Width;
+
+					if (wordlgth > elWidth)
+					{
+						// This word is too long to fit in the available space, look for
+						// the Unicode Soft HYphen (SHY / 00AD) character for a place to
+						// break the word at
+						int where = word.findFirst( wchar_t(0x00AD) );
+						if (where != -1)
+						{
+							core::stringw first  = word.subString(0, where);
+							core::stringw second = word.subString(where, word.size() - where);
+							BrokenText.push_back(line + first + L"-");
+							const s32 secondLength = font->getDimension(second.c_str()).Width;
+
+							length = secondLength;
+							line = second;
+						}
+						else
+						{
+							// No soft hyphen found, so there's nothing more we can do
+							// break to next line
+							if (length)
+								BrokenText.push_back(line);
+							length = wordlgth;
+							line = word;
+						}
+					}
+					else if (length && (length + wordlgth + whitelgth > elWidth))
+					{
+						// break to next line
+						BrokenText.push_back(line);
+						length = wordlgth;
+						line = word;
+					}
+					else
+					{
+						// add word to line
+						line += whitespace;
+						line += word;
+						length += whitelgth + wordlgth;
+					}
+
+					word = L"";
+					whitespace = L"";
+				}
+
+				if ( isWhitespace )
+				{
+					whitespace += c;
+				}
+
+				// compute line break
+				if (lineBreak)
+				{
+					line += whitespace;
+					line += word;
+					BrokenText.push_back(line);
+					line = L"";
+					word = L"";
+					whitespace = L"";
+					length = 0;
+				}
+			}
+		}
+
+		line += whitespace;
+		line += word;
+		BrokenText.push_back(line);
+	}
+	else
+	{
+		// right-to-left
+		for (s32 i=size; i>=0; --i)
+		{
+			c = Text[i];
+			bool lineBreak = false;
+
+			if (c == L'\r') // Mac or Windows breaks
+			{
+				lineBreak = true;
+				if ((i>0) && Text[i-1] == L'\n') // Windows breaks
+				{
+					Text.erase(i-1);
+					--size;
+				}
+				c = '\0';
+			}
+			else if (c == L'\n') // Unix breaks
+			{
+				lineBreak = true;
+				c = '\0';
+			}
+
+			if (c==L' ' || c==0 || i==0)
+			{
+				if (word.size())
+				{
+					// here comes the next whitespace, look if
+					// we must break the last word to the next line.
+					const s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
+					const s32 wordlgth = font->getDimension(word.c_str()).Width;
+
+					if (length && (length + wordlgth + whitelgth > elWidth))
+					{
+						// break to next line
+						BrokenText.push_back(line);
+						length = wordlgth;
+						line = word;
+					}
+					else
+					{
+						// add word to line
+						line = whitespace + line;
+						line = word + line;
+						length += whitelgth + wordlgth;
+					}
+
+					word = L"";
+					whitespace = L"";
+				}
+
+				if (c != 0)
+					whitespace = core::stringw(&c, 1) + whitespace;
+
+				// compute line break
+				if (lineBreak)
+				{
+					line = whitespace + line;
+					line = word + line;
+					BrokenText.push_back(line);
+					line = L"";
+					word = L"";
+					whitespace = L"";
+					length = 0;
+				}
+			}
+			else
+			{
+				// yippee this is a word..
+				word = core::stringw(&c, 1) + word;
+			}
+		}
+
+		line = whitespace + line;
+		line = word + line;
+		BrokenText.push_back(line);
+	}
+}
+
+
+//! Sets the new caption of this element.
+void StaticText::setText(const wchar_t* text)
+{
+	IGUIElement::setText(text);
+	breakText();
+}
+
+
+void StaticText::updateAbsolutePosition()
+{
+	IGUIElement::updateAbsolutePosition();
+	breakText();
+}
+
+
+//! Returns the height of the text in pixels when it is drawn.
+s32 StaticText::getTextHeight() const
+{
+	IGUIFont* font = getActiveFont();
+	if (!font)
+		return 0;
+
+	s32 height = font->getDimension(L"A").Height + font->getKerningHeight();
+
+	if (WordWrap)
+		height *= BrokenText.size();
+
+	return height;
+}
+
+
+s32 StaticText::getTextWidth() const
+{
+	IGUIFont * font = getActiveFont();
+	if(!font)
+		return 0;
+
+	if(WordWrap)
+	{
+		s32 widest = 0;
+
+		for(u32 line = 0; line < BrokenText.size(); ++line)
+		{
+			s32 width = font->getDimension(BrokenText[line].c_str()).Width;
+
+			if(width > widest)
+				widest = width;
+		}
+
+		return widest;
+	}
+	else
+	{
+		return font->getDimension(Text.c_str()).Width;
+	}
+}
+
+
+//! Writes attributes of the element.
+//! Implement this to expose the attributes of your element for
+//! scripting languages, editors, debuggers or xml serialization purposes.
+void StaticText::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
+{
+	IGUIStaticText::serializeAttributes(out,options);
+
+	out->addBool	("Border",              Border);
+	out->addBool	("OverrideColorEnabled",OverrideColorEnabled);
+	out->addBool	("OverrideBGColorEnabled",OverrideBGColorEnabled);
+	out->addBool	("WordWrap",		WordWrap);
+	out->addBool	("Background",          Background);
+	out->addBool	("RightToLeft",         RightToLeft);
+	out->addBool	("RestrainTextInside",  RestrainTextInside);
+	out->addColor	("OverrideColor",       OverrideColor);
+	out->addColor	("BGColor",       	BGColor);
+	out->addEnum	("HTextAlign",          HAlign, GUIAlignmentNames);
+	out->addEnum	("VTextAlign",          VAlign, GUIAlignmentNames);
+
+	// out->addFont ("OverrideFont",	OverrideFont);
+}
+
+
+//! Reads attributes of the element
+void StaticText::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
+{
+	IGUIStaticText::deserializeAttributes(in,options);
+
+	Border = in->getAttributeAsBool("Border");
+	enableOverrideColor(in->getAttributeAsBool("OverrideColorEnabled"));
+	OverrideBGColorEnabled = in->getAttributeAsBool("OverrideBGColorEnabled");
+	setWordWrap(in->getAttributeAsBool("WordWrap"));
+	Background = in->getAttributeAsBool("Background");
+	RightToLeft = in->getAttributeAsBool("RightToLeft");
+	RestrainTextInside = in->getAttributeAsBool("RestrainTextInside");
+	OverrideColor = in->getAttributeAsColor("OverrideColor");
+	BGColor = in->getAttributeAsColor("BGColor");
+
+	setTextAlignment( (EGUI_ALIGNMENT) in->getAttributeAsEnumeration("HTextAlign", GUIAlignmentNames),
+                      (EGUI_ALIGNMENT) in->getAttributeAsEnumeration("VTextAlign", GUIAlignmentNames));
+
+	// OverrideFont = in->getAttributeAsFont("OverrideFont");
+}
+
+} // end namespace gui
+} // end namespace irr
+
+
+#endif // _IRR_COMPILE_WITH_GUI_
diff --git a/src/util/statictext.h b/src/util/statictext.h
new file mode 100644
index 000000000..8d2f879e7
--- /dev/null
+++ b/src/util/statictext.h
@@ -0,0 +1,150 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_GUI_STATIC_TEXT_H_INCLUDED__
+#define __C_GUI_STATIC_TEXT_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+#ifdef _IRR_COMPILE_WITH_GUI_
+
+#include "IGUIStaticText.h"
+#include "irrArray.h"
+
+#include <vector>
+
+namespace irr
+{
+namespace gui
+{
+	class StaticText : public IGUIStaticText
+	{
+	public:
+
+		//! constructor
+		StaticText(const wchar_t* text, bool border, IGUIEnvironment* environment,
+			IGUIElement* parent, s32 id, const core::rect<s32>& rectangle,
+			bool background = false);
+
+		//! destructor
+		virtual ~StaticText();
+
+		//! draws the element and its children
+		virtual void draw();
+
+		//! Sets another skin independent font.
+		virtual void setOverrideFont(IGUIFont* font=0);
+
+		//! Gets the override font (if any)
+		virtual IGUIFont* getOverrideFont() const;
+
+		//! Get the font which is used right now for drawing
+		virtual IGUIFont* getActiveFont() const;
+
+		//! Sets another color for the text.
+		virtual void setOverrideColor(video::SColor color);
+
+		//! Sets another color for the background.
+		virtual void setBackgroundColor(video::SColor color);
+
+		//! Sets whether to draw the background
+		virtual void setDrawBackground(bool draw);
+
+		//! Gets the background color
+		virtual video::SColor getBackgroundColor() const;
+
+		//! Checks if background drawing is enabled
+		virtual bool isDrawBackgroundEnabled() const;
+
+		//! Sets whether to draw the border
+		virtual void setDrawBorder(bool draw);
+
+		//! Checks if border drawing is enabled
+		virtual bool isDrawBorderEnabled() const;
+
+		//! Sets alignment mode for text
+		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical);
+
+		//! Gets the override color
+		#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR <= 7
+		virtual const video::SColor& getOverrideColor() const;
+		#else
+		virtual video::SColor getOverrideColor() const;
+		#endif
+
+		//! Sets if the static text should use the overide color or the
+		//! color in the gui skin.
+		virtual void enableOverrideColor(bool enable);
+
+		//! Checks if an override color is enabled
+		virtual bool isOverrideColorEnabled() const;
+
+		//! Set whether the text in this label should be clipped if it goes outside bounds
+		virtual void setTextRestrainedInside(bool restrainedInside);
+
+		//! Checks if the text in this label should be clipped if it goes outside bounds
+		virtual bool isTextRestrainedInside() const;
+
+		//! Enables or disables word wrap for using the static text as
+		//! multiline text control.
+		virtual void setWordWrap(bool enable);
+
+		//! Checks if word wrap is enabled
+		virtual bool isWordWrapEnabled() const;
+
+		//! Sets the new caption of this element.
+		virtual void setText(const wchar_t* text);
+
+		//! Returns the height of the text in pixels when it is drawn.
+		virtual s32 getTextHeight() const;
+
+		//! Returns the width of the current text, in the current font
+		virtual s32 getTextWidth() const;
+
+		//! Updates the absolute position, splits text if word wrap is enabled
+		virtual void updateAbsolutePosition();
+
+		//! Set whether the string should be interpreted as right-to-left (RTL) text
+		/** \note This component does not implement the Unicode bidi standard, the
+		text of the component should be already RTL if you call this. The
+		main difference when RTL is enabled is that the linebreaks for multiline
+		elements are performed starting from the end.
+		*/
+		virtual void setRightToLeft(bool rtl);
+
+		//! Checks if the text should be interpreted as right-to-left text
+		virtual bool isRightToLeft() const;
+
+		//! Writes attributes of the element.
+		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
+
+		//! Reads attributes of the element
+		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
+
+	private:
+
+		//! Breaks the single text line.
+		void breakText();
+
+		EGUI_ALIGNMENT HAlign, VAlign;
+		bool Border;
+		bool OverrideColorEnabled;
+		bool OverrideBGColorEnabled;
+		bool WordWrap;
+		bool Background;
+		bool RestrainTextInside;
+		bool RightToLeft;
+
+		video::SColor OverrideColor, BGColor;
+		gui::IGUIFont* OverrideFont;
+		gui::IGUIFont* LastBreakFont; // stored because: if skin changes, line break must be recalculated.
+
+		core::array< core::stringw > BrokenText;
+	};
+
+} // end namespace gui
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_GUI_
+
+#endif // C_GUI_STATIC_TEXT_H_INCLUDED

From 14ef2b445adcec770defe1abf83af9d22ccf39d8 Mon Sep 17 00:00:00 2001
From: Ekdohibs <nathanael.courant@laposte.net>
Date: Tue, 31 May 2016 17:30:11 +0200
Subject: [PATCH 049/418] Add colored text (not only colored chat).

Add documentation, move files to a proper place and avoid memory leaks.
Make it work with most kind of texts, and allow backgrounds too.
---
 builtin/game/chatcommands.lua                 |   2 +-
 builtin/game/misc.lua                         |  41 +++--
 builtin/settingtypes.txt                      |   5 +
 doc/lua_api.txt                               |  18 ++
 src/CMakeLists.txt                            |   2 +
 src/cguittfont/CGUITTFont.cpp                 |  30 +++-
 src/cguittfont/CGUITTFont.h                   |   7 +
 src/chat.cpp                                  |  37 ++--
 src/chat.h                                    |  17 +-
 src/client/CMakeLists.txt                     |   1 -
 src/defaultsettings.cpp                       |   2 +
 src/game.cpp                                  |  53 +++---
 src/{client => }/guiChatConsole.cpp           |   4 +-
 src/{client => }/guiChatConsole.h             |   0
 src/guiEngine.cpp                             |  23 +--
 src/guiEngine.h                               |   3 +
 src/guiFormSpecMenu.cpp                       |  59 ++-----
 src/guiFormSpecMenu.h                         |  13 +-
 src/irrlicht_changes/CMakeLists.txt           |   7 +
 .../static_text.cpp}                          | 139 +++++++++------
 .../static_text.h}                            | 122 ++++++++++++-
 src/terminal_chat_console.cpp                 |  10 +-
 src/util/CMakeLists.txt                       |  11 +-
 src/util/coloredstring.cpp                    |  68 -------
 src/util/coloredstring.h                      |  44 -----
 src/util/enriched_string.cpp                  | 166 ++++++++++++++++++
 src/util/enriched_string.h                    |  91 ++++++++++
 src/util/string.h                             |  32 ++++
 28 files changed, 689 insertions(+), 318 deletions(-)
 rename src/{client => }/guiChatConsole.cpp (99%)
 rename src/{client => }/guiChatConsole.h (100%)
 create mode 100644 src/irrlicht_changes/CMakeLists.txt
 rename src/{util/statictext.cpp => irrlicht_changes/static_text.cpp} (83%)
 rename src/{util/statictext.h => irrlicht_changes/static_text.h} (54%)
 delete mode 100644 src/util/coloredstring.cpp
 delete mode 100644 src/util/coloredstring.h
 create mode 100644 src/util/enriched_string.cpp
 create mode 100644 src/util/enriched_string.h

diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua
index 2627559a5..22755386b 100644
--- a/builtin/game/chatcommands.lua
+++ b/builtin/game/chatcommands.lua
@@ -102,7 +102,7 @@ core.register_chatcommand("help", {
 	description = "Get help for commands or list privileges",
 	func = function(name, param)
 		local function format_help_line(cmd, def)
-			local msg = core.colorize("00ffff", "/"..cmd)
+			local msg = core.colorize("#00ffff", "/"..cmd)
 			if def.params and def.params ~= "" then
 				msg = msg .. " " .. def.params
 			end
diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 8d5c80216..918315656 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -198,19 +198,34 @@ function core.http_add_fetch(httpenv)
 	return httpenv
 end
 
-function core.get_color_escape_sequence(color)
-	--if string.len(color) == 3 then
-	--	local r = string.sub(color, 1, 1)
-	--	local g = string.sub(color, 2, 2)
-	--	local b = string.sub(color, 3, 3)
-	--	color = r ..  r .. g .. g .. b .. b
-	--end
+if minetest.setting_getbool("disable_escape_sequences") then
+
+	function core.get_color_escape_sequence(color)
+		return ""
+	end
+
+	function core.get_background_escape_sequence(color)
+		return ""
+	end
+
+	function core.colorize(color, message)
+		return message
+	end
+
+else
+
+	local ESCAPE_CHAR = string.char(0x1b)
+	function core.get_color_escape_sequence(color)
+		return ESCAPE_CHAR .. "(c@" .. color .. ")"
+	end
+
+	function core.get_background_escape_sequence(color)
+		return ESCAPE_CHAR .. "(b@" .. color .. ")"
+	end
+
+	function core.colorize(color, message)
+		return core.get_color_escape_sequence(color) .. message .. core.get_color_escape_sequence("#ffffff")
+	end
 
-	--assert(#color == 6, "Color must be six characters in length.")
-	--return "\v" .. color
-	return "\v(color;" .. color .. ")"
 end
 
-function core.colorize(color, message)
-	return core.get_color_escape_sequence(color) .. message .. core.get_color_escape_sequence("ffffff")
-end
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 93fb8e952..538a04f33 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -615,6 +615,11 @@ server_announce (Announce server) bool false
 #    If you want to announce your ipv6 address, use  serverlist_url = v6.servers.minetest.net.
 serverlist_url (Serverlist URL) string servers.minetest.net
 
+#    Disable escape sequences, e.g. chat coloring.
+#    Use this if you want to run a server with pre-0.4.14 clients and you want to disable
+#    the escape sequences generated by mods.
+disable_escape_sequences (Disable escape sequences) bool false
+
 [*Network]
 
 #    Network port to listen (UDP).
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 82a0acbee..aa0d7e45d 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1701,6 +1701,24 @@ numerical form, the raw integer value of an ARGB8 quad:
 or string form, a ColorString (defined above):
     `colorspec = "green"`
 
+Escape sequences
+----------------
+Most text can contain escape sequences, that can for example color the text.
+There are a few exceptions: tab headers, dropdowns and vertical labels can't.
+The following functions provide escape sequences:
+* `core.get_color_escape_sequence(color)`:
+    * `color` is a ColorString
+    * The escape sequence sets the text color to `color`
+* `core.colorize(color, message)`:
+    * Equivalent to:
+      `core.get_color_escape_sequence(color) ..
+       message ..
+       core.get_color_escape_sequence("#ffffff")`
+* `color.get_background_escape_sequence(color)`
+    * `color` is a ColorString
+    * The escape sequence sets the background of the whole text element to
+      `color`. Only defined for item descriptions and tooltips.
+
 Spatial Vectors
 ---------------
 * `vector.new(a[, b, c])`: returns a vector:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea1564eeb..f02812415 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -376,6 +376,7 @@ add_subdirectory(network)
 add_subdirectory(script)
 add_subdirectory(unittest)
 add_subdirectory(util)
+add_subdirectory(irrlicht_changes)
 
 set(common_SRCS
 	ban.cpp
@@ -493,6 +494,7 @@ set(client_SRCS
 	${common_SRCS}
 	${sound_SRCS}
 	${client_network_SRCS}
+	${client_irrlicht_changes_SRCS}
 	camera.cpp
 	client.cpp
 	clientmap.cpp
diff --git a/src/cguittfont/CGUITTFont.cpp b/src/cguittfont/CGUITTFont.cpp
index 2342eb748..c2d37c6c0 100644
--- a/src/cguittfont/CGUITTFont.cpp
+++ b/src/cguittfont/CGUITTFont.cpp
@@ -1,6 +1,7 @@
 /*
    CGUITTFont FreeType class for Irrlicht
    Copyright (c) 2009-2010 John Norman
+   Copyright (c) 2016 Nathanaël Courant
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -545,6 +546,13 @@ void CGUITTFont::setFontHinting(const bool enable, const bool enable_auto_hintin
 
 void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position, video::SColor color, bool hcenter, bool vcenter, const core::rect<s32>* clip)
 {
+	draw(EnrichedString(std::wstring(text.c_str()), color), position, color, hcenter, vcenter, clip);
+}
+
+void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& position, video::SColor color, bool hcenter, bool vcenter, const core::rect<s32>* clip)
+{
+	std::vector<video::SColor> colors = text.getColors();
+
 	if (!Driver)
 		return;
 
@@ -572,7 +580,7 @@ void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position
 	}
 
 	// Convert to a unicode string.
-	core::ustring utext(text);
+	core::ustring utext = text.getString();
 
 	// Set up our render map.
 	core::map<u32, CGUITTGlyphPage*> Render_Map;
@@ -581,6 +589,7 @@ void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position
 	u32 n;
 	uchar32_t previousChar = 0;
 	core::ustring::const_iterator iter(utext);
+	std::vector<video::SColor> applied_colors;
 	while (!iter.atEnd())
 	{
 		uchar32_t currentChar = *iter;
@@ -590,7 +599,7 @@ void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position
 		if (currentChar == L'\r') // Mac or Windows breaks
 		{
 			lineBreak = true;
-			if (*(iter + 1) == (uchar32_t)'\n')	// Windows line breaks.
+			if (*(iter + 1) == (uchar32_t)'\n') 	// Windows line breaks.
 				currentChar = *(++iter);
 		}
 		else if (currentChar == (uchar32_t)'\n') // Unix breaks
@@ -627,6 +636,9 @@ void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position
 			page->render_positions.push_back(core::position2di(offset.X + offx, offset.Y + offy));
 			page->render_source_rects.push_back(glyph.source_rect);
 			Render_Map.set(glyph.glyph_page, page);
+			u32 current_color = iter.getPos();
+			if (current_color < colors.size())
+				applied_colors.push_back(colors[current_color]);
 		}
 		offset.X += getWidthFromCharacter(currentChar);
 
@@ -645,8 +657,6 @@ void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position
 
 		CGUITTGlyphPage* page = n->getValue();
 
-		if (!use_transparency) color.color |= 0xff000000;
-
 		if (shadow_offset) {
 			for (size_t i = 0; i < page->render_positions.size(); ++i)
 				page->render_positions[i] += core::vector2di(shadow_offset, shadow_offset);
@@ -654,7 +664,17 @@ void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position
 			for (size_t i = 0; i < page->render_positions.size(); ++i)
 				page->render_positions[i] -= core::vector2di(shadow_offset, shadow_offset);
 		}
-		Driver->draw2DImageBatch(page->texture, page->render_positions, page->render_source_rects, clip, color, true);
+		for (size_t i = 0; i < page->render_positions.size(); ++i) {
+			irr::video::SColor col;
+			if (!applied_colors.empty()) {
+				col = applied_colors[i < applied_colors.size() ? i : 0];
+			} else {
+				col = irr::video::SColor(255, 255, 255, 255);
+			}
+			if (!use_transparency)
+				col.color |= 0xff000000;
+			Driver->draw2DImage(page->texture, page->render_positions[i], page->render_source_rects[i], clip, col, true);
+		}
 	}
 }
 
diff --git a/src/cguittfont/CGUITTFont.h b/src/cguittfont/CGUITTFont.h
index e24d8f18b..0aa540c5c 100644
--- a/src/cguittfont/CGUITTFont.h
+++ b/src/cguittfont/CGUITTFont.h
@@ -1,6 +1,7 @@
 /*
    CGUITTFont FreeType class for Irrlicht
    Copyright (c) 2009-2010 John Norman
+   Copyright (c) 2016 Nathanaël Courant
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -33,6 +34,8 @@
 
 #include <irrlicht.h>
 #include <ft2build.h>
+#include <vector>
+#include "util/enriched_string.h"
 #include FT_FREETYPE_H
 
 namespace irr
@@ -258,6 +261,10 @@ namespace gui
 			virtual void draw(const core::stringw& text, const core::rect<s32>& position,
 				video::SColor color, bool hcenter=false, bool vcenter=false,
 				const core::rect<s32>* clip=0);
+			
+			virtual void draw(const EnrichedString& text, const core::rect<s32>& position,
+				video::SColor color, bool hcenter=false, bool vcenter=false,
+				const core::rect<s32>* clip=0);
 
 			//! Returns the dimension of a character produced by this font.
 			virtual core::dimension2d<u32> getCharDimension(const wchar_t ch) const;
diff --git a/src/chat.cpp b/src/chat.cpp
index 958389df5..46555b3dc 100644
--- a/src/chat.cpp
+++ b/src/chat.cpp
@@ -267,28 +267,26 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
 		next_frags.push_back(temp_frag);
 	}
 
-	std::wstring name_sanitized = removeEscapes(line.name);
+	std::wstring name_sanitized = line.name.c_str();
 
 	// Choose an indentation level
 	if (line.name.empty()) {
 		// Server messages
 		hanging_indentation = 0;
-	}
-	else if (name_sanitized.size() + 3 <= cols/2) {
+	} else if (name_sanitized.size() + 3 <= cols/2) {
 		// Names shorter than about half the console width
 		hanging_indentation = line.name.size() + 3;
-	}
-	else {
+	} else {
 		// Very long names
 		hanging_indentation = 2;
 	}
-	ColoredString line_text(line.text);
+	//EnrichedString line_text(line.text);
 
 	next_line.first = true;
 	bool text_processing = false;
 
 	// Produce fragments and layout them into lines
-	while (!next_frags.empty() || in_pos < line_text.size())
+	while (!next_frags.empty() || in_pos < line.text.size())
 	{
 		// Layout fragments into lines
 		while (!next_frags.empty())
@@ -326,9 +324,9 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
 		}
 
 		// Produce fragment
-		if (in_pos < line_text.size())
+		if (in_pos < line.text.size())
 		{
-			u32 remaining_in_input = line_text.size() - in_pos;
+			u32 remaining_in_input = line.text.size() - in_pos;
 			u32 remaining_in_output = cols - out_column;
 
 			// Determine a fragment length <= the minimum of
@@ -338,14 +336,14 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
 			while (frag_length < remaining_in_input &&
 					frag_length < remaining_in_output)
 			{
-				if (isspace(line_text[in_pos + frag_length]))
+				if (isspace(line.text.getString()[in_pos + frag_length]))
 					space_pos = frag_length;
 				++frag_length;
 			}
 			if (space_pos != 0 && frag_length < remaining_in_input)
 				frag_length = space_pos + 1;
 
-			temp_frag.text = line_text.substr(in_pos, frag_length);
+			temp_frag.text = line.text.substr(in_pos, frag_length);
 			temp_frag.column = 0;
 			//temp_frag.bold = 0;
 			next_frags.push_back(temp_frag);
@@ -729,19 +727,22 @@ ChatBuffer& ChatBackend::getRecentBuffer()
 	return m_recent_buffer;
 }
 
-std::wstring ChatBackend::getRecentChat()
+EnrichedString ChatBackend::getRecentChat()
 {
-	std::wostringstream stream;
+	EnrichedString result;
 	for (u32 i = 0; i < m_recent_buffer.getLineCount(); ++i)
 	{
 		const ChatLine& line = m_recent_buffer.getLine(i);
 		if (i != 0)
-			stream << L"\n";
-		if (!line.name.empty())
-			stream << L"<" << line.name << L"> ";
-		stream << line.text;
+			result += L"\n";
+		if (!line.name.empty()) {
+			result += L"<";
+			result += line.name;
+			result += L"> ";
+		}
+		result += line.text;
 	}
-	return stream.str();
+	return result;
 }
 
 ChatPrompt& ChatBackend::getPrompt()
diff --git a/src/chat.h b/src/chat.h
index 661cafc82..11061fd39 100644
--- a/src/chat.h
+++ b/src/chat.h
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <list>
 
 #include "irrlichttypes.h"
-#include "util/coloredstring.h"
+#include "util/enriched_string.h"
 
 // Chat console related classes
 
@@ -34,9 +34,9 @@ struct ChatLine
 	// age in seconds
 	f32 age;
 	// name of sending player, or empty if sent by server
-	std::wstring name;
+	EnrichedString name;
 	// message text
-	ColoredString text;
+	EnrichedString text;
 
 	ChatLine(std::wstring a_name, std::wstring a_text):
 		age(0.0),
@@ -44,12 +44,19 @@ struct ChatLine
 		text(a_text)
 	{
 	}
+
+	ChatLine(EnrichedString a_name, EnrichedString a_text):
+		age(0.0),
+		name(a_name),
+		text(a_text)
+	{
+	}
 };
 
 struct ChatFormattedFragment
 {
 	// text string
-	std::wstring text;
+	EnrichedString text;
 	// starting column
 	u32 column;
 	// formatting
@@ -262,7 +269,7 @@ public:
 	// Get the recent messages buffer
 	ChatBuffer& getRecentBuffer();
 	// Concatenate all recent messages
-	std::wstring getRecentChat();
+	EnrichedString getRecentChat();
 	// Get the console prompt
 	ChatPrompt& getPrompt();
 
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index bcf114760..a1ec37fe3 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(client_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/clientlauncher.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/guiChatConsole.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/tile.cpp
 	PARENT_SCOPE
 )
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index e8b652c17..632ec0df9 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -202,6 +202,8 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("server_name", "");
 	settings->setDefault("server_description", "");
 
+	settings->setDefault("disable_escape_sequences", "false");
+
 #if USE_FREETYPE
 	settings->setDefault("freetype", "true");
 	settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf"));
diff --git a/src/game.cpp b/src/game.cpp
index 71a04aef5..def202fe5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "filesys.h"
 #include "gettext.h"
-#include "client/guiChatConsole.h"
+#include "guiChatConsole.h"
 #include "guiFormSpecMenu.h"
 #include "guiKeyChangeMenu.h"
 #include "guiPasswordChange.h"
@@ -55,14 +55,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tool.h"
 #include "util/directiontables.h"
 #include "util/pointedthing.h"
+#include "irrlicht_changes/static_text.h"
 #include "version.h"
 #include "minimap.h"
 #include "mapblock_mesh.h"
 
-#if USE_FREETYPE
-	#include "util/statictext.h"
-#endif
-
 #include "sound.h"
 
 #if USE_SOUND
@@ -541,7 +538,7 @@ void update_profiler_gui(gui::IGUIStaticText *guitext_profiler, FontEngine *fe,
 		std::ostringstream os(std::ios_base::binary);
 		g_profiler->printPage(os, show_profiler, show_profiler_max);
 		std::wstring text = utf8_to_wide(os.str());
-		guitext_profiler->setText(text.c_str());
+		setStaticText(guitext_profiler, text.c_str());
 		guitext_profiler->setVisible(true);
 
 		s32 w = fe->getTextWidth(text.c_str());
@@ -1244,7 +1241,11 @@ static void updateChat(Client &client, f32 dtime, bool show_debug,
 
 	// Get new messages from error log buffer
 	while (!chat_log_error_buf.empty()) {
-		chat_backend.addMessage(L"", utf8_to_wide(chat_log_error_buf.get()));
+		std::wstring error_message = utf8_to_wide(chat_log_error_buf.get());
+		if (!g_settings->getBool("disable_escape_sequences")) {
+			error_message = L"\x1b(c@red)" + error_message + L"\x1b(c@white)";
+		}
+		chat_backend.addMessage(L"", error_message);
 	}
 
 	// Get new messages from client
@@ -1259,10 +1260,10 @@ static void updateChat(Client &client, f32 dtime, bool show_debug,
 
 	// Display all messages in a static text element
 	unsigned int recent_chat_count = chat_backend.getRecentBuffer().getLineCount();
-	std::wstring recent_chat       = chat_backend.getRecentChat();
+	EnrichedString recent_chat     = chat_backend.getRecentChat();
 	unsigned int line_height       = g_fontengine->getLineHeight();
 
-	guitext_chat->setText(recent_chat.c_str());
+	setStaticText(guitext_chat, recent_chat);
 
 	// Update gui element size and position
 	s32 chat_y = 5 + line_height;
@@ -1271,7 +1272,7 @@ static void updateChat(Client &client, f32 dtime, bool show_debug,
 		chat_y += line_height;
 
 	// first pass to calculate height of text to be set
-	s32 width = std::min(g_fontengine->getTextWidth(recent_chat) + 10,
+	s32 width = std::min(g_fontengine->getTextWidth(recent_chat.c_str()) + 10,
 			     porting::getWindowSize().X - 20);
 	core::rect<s32> rect(10, chat_y, width, chat_y + porting::getWindowSize().Y);
 	guitext_chat->setRelativePosition(rect);
@@ -2218,45 +2219,39 @@ bool Game::createClient(const std::string &playername,
 bool Game::initGui()
 {
 	// First line of debug text
-	guitext = guienv->addStaticText(
+	guitext = addStaticText(guienv,
 			utf8_to_wide(PROJECT_NAME_C).c_str(),
 			core::rect<s32>(0, 0, 0, 0),
 			false, false, guiroot);
 
 	// Second line of debug text
-	guitext2 = guienv->addStaticText(
+	guitext2 = addStaticText(guienv,
 			L"",
 			core::rect<s32>(0, 0, 0, 0),
 			false, false, guiroot);
 
 	// At the middle of the screen
 	// Object infos are shown in this
-	guitext_info = guienv->addStaticText(
+	guitext_info = addStaticText(guienv,
 			L"",
 			core::rect<s32>(0, 0, 400, g_fontengine->getTextHeight() * 5 + 5) + v2s32(100, 200),
 			false, true, guiroot);
 
 	// Status text (displays info when showing and hiding GUI stuff, etc.)
-	guitext_status = guienv->addStaticText(
+	guitext_status = addStaticText(guienv,
 			L"<Status>",
 			core::rect<s32>(0, 0, 0, 0),
 			false, false, guiroot);
 	guitext_status->setVisible(false);
 
-#if USE_FREETYPE
-	// Colored chat support when using FreeType
-	guitext_chat = new gui::StaticText(L"", false, guienv, guiroot, -1, core::rect<s32>(0, 0, 0, 0), false);
-	guitext_chat->setWordWrap(true);
-	guitext_chat->drop();
-#else
-	// Standard chat when FreeType is disabled
 	// Chat text
-	guitext_chat = guienv->addStaticText(
+	guitext_chat = addStaticText(
+			guienv,
 			L"",
 			core::rect<s32>(0, 0, 0, 0),
 			//false, false); // Disable word wrap as of now
 			false, true, guiroot);
-#endif
+
 	// Remove stale "recent" chat messages from previous connections
 	chat_backend->clearRecentChat();
 
@@ -2270,7 +2265,7 @@ bool Game::initGui()
 	}
 
 	// Profiler text (size is updated when text is updated)
-	guitext_profiler = guienv->addStaticText(
+	guitext_profiler = addStaticText(guienv,
 			L"<Profiler>",
 			core::rect<s32>(0, 0, 0, 0),
 			false, false, guiroot);
@@ -4308,12 +4303,12 @@ void Game::updateGui(float *statustext_time, const RunStats &stats,
 		   << ", v_range = " << draw_control->wanted_range
 		   << std::setprecision(3)
 		   << ", RTT = " << client->getRTT();
-		guitext->setText(utf8_to_wide(os.str()).c_str());
+		setStaticText(guitext, utf8_to_wide(os.str()).c_str());
 		guitext->setVisible(true);
 	} else if (flags.show_hud || flags.show_chat) {
 		std::ostringstream os(std::ios_base::binary);
 		os << PROJECT_NAME_C " " << g_version_hash;
-		guitext->setText(utf8_to_wide(os.str()).c_str());
+		setStaticText(guitext, utf8_to_wide(os.str()).c_str());
 		guitext->setVisible(true);
 	} else {
 		guitext->setVisible(false);
@@ -4350,7 +4345,7 @@ void Game::updateGui(float *statustext_time, const RunStats &stats,
 			}
 		}
 
-		guitext2->setText(utf8_to_wide(os.str()).c_str());
+		setStaticText(guitext2, utf8_to_wide(os.str()).c_str());
 		guitext2->setVisible(true);
 
 		core::rect<s32> rect(
@@ -4362,7 +4357,7 @@ void Game::updateGui(float *statustext_time, const RunStats &stats,
 		guitext2->setVisible(false);
 	}
 
-	guitext_info->setText(infotext.c_str());
+	setStaticText(guitext_info, infotext.c_str());
 	guitext_info->setVisible(flags.show_hud && g_menumgr.menuCount() == 0);
 
 	float statustext_time_max = 1.5;
@@ -4376,7 +4371,7 @@ void Game::updateGui(float *statustext_time, const RunStats &stats,
 		}
 	}
 
-	guitext_status->setText(statustext.c_str());
+	setStaticText(guitext_status, statustext.c_str());
 	guitext_status->setVisible(!statustext.empty());
 
 	if (!statustext.empty()) {
diff --git a/src/client/guiChatConsole.cpp b/src/guiChatConsole.cpp
similarity index 99%
rename from src/client/guiChatConsole.cpp
rename to src/guiChatConsole.cpp
index d8837556a..bb58d1305 100644
--- a/src/client/guiChatConsole.cpp
+++ b/src/guiChatConsole.cpp
@@ -346,9 +346,9 @@ void GUIChatConsole::drawText()
 			// Draw colored text if FreeType is enabled
 				irr::gui::CGUITTFont *tmp = static_cast<irr::gui::CGUITTFont*>(m_font);
 				tmp->draw(
-					fragment.text.c_str(),
+					fragment.text,
 					destrect,
-					fragment.text.getColors(),
+					video::SColor(255, 255, 255, 255),
 					false,
 					false,
 					&AbsoluteClippingRect);
diff --git a/src/client/guiChatConsole.h b/src/guiChatConsole.h
similarity index 100%
rename from src/client/guiChatConsole.h
rename to src/guiChatConsole.h
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index ba286a91c..96de7a4f7 100644
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -37,6 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "fontengine.h"
 #include "guiscalingfilter.h"
+#include "irrlicht_changes/static_text.h"
 
 #ifdef __ANDROID__
 #include "client/tile.h"
@@ -172,15 +173,16 @@ GUIEngine::GUIEngine(	irr::IrrlichtDevice* dev,
 		m_sound_manager = &dummySoundManager;
 
 	//create topleft header
-	std::wstring t = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
+	m_toplefttext = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
 			g_version_hash);
 
-	core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(t), g_fontengine->getTextHeight());
+	core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()),
+		g_fontengine->getTextHeight());
 	rect += v2s32(4, 0);
 
 	m_irr_toplefttext =
-		m_device->getGUIEnvironment()->addStaticText(t.c_str(),
-		rect,false,true,0,-1);
+		addStaticText(m_device->getGUIEnvironment(), m_toplefttext,
+			rect, false, true, 0, -1);
 
 	//create formspecsource
 	m_formspecgui = new FormspecFormSource("");
@@ -578,7 +580,7 @@ void GUIEngine::setTopleftText(std::string append)
 		toset += utf8_to_wide(append);
 	}
 
-	m_irr_toplefttext->setText(toset.c_str());
+	m_toplefttext = toset;
 
 	updateTopLeftTextSize();
 }
@@ -586,15 +588,14 @@ void GUIEngine::setTopleftText(std::string append)
 /******************************************************************************/
 void GUIEngine::updateTopLeftTextSize()
 {
-	std::wstring text = m_irr_toplefttext->getText();
-
-	core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(text), g_fontengine->getTextHeight());
-		rect += v2s32(4, 0);
+	core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()),
+		g_fontengine->getTextHeight());
+	rect += v2s32(4, 0);
 
 	m_irr_toplefttext->remove();
 	m_irr_toplefttext =
-		m_device->getGUIEnvironment()->addStaticText(text.c_str(),
-		rect,false,true,0,-1);
+		addStaticText(m_device->getGUIEnvironment(), m_toplefttext,
+			rect, false, true, 0, -1);
 }
 
 /******************************************************************************/
diff --git a/src/guiEngine.h b/src/guiEngine.h
index d527f7222..fa98a21e4 100644
--- a/src/guiEngine.h
+++ b/src/guiEngine.h
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiFormSpecMenu.h"
 #include "sound.h"
 #include "client/tile.h"
+#include "util/enriched_string.h"
 
 /******************************************************************************/
 /* Typedefs and macros                                                        */
@@ -275,6 +276,8 @@ private:
 
 	/** pointer to gui element shown at topleft corner */
 	irr::gui::IGUIStaticText*	m_irr_toplefttext;
+	/** and text that is in it */
+	EnrichedString m_toplefttext;
 
 	/** initialize cloud subsystem */
 	void cloudInit();
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 99b1153c1..cf01dc38c 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -50,6 +50,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/hex.h"
 #include "util/numeric.h"
 #include "util/string.h" // for parseColorString()
+#include "irrlicht_changes/static_text.h"
 #include "guiscalingfilter.h"
 
 #if USE_FREETYPE && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9
@@ -249,37 +250,6 @@ std::vector<std::string>* GUIFormSpecMenu::getDropDownValues(const std::string &
 	return NULL;
 }
 
-static std::vector<std::string> split(const std::string &s, char delim)
-{
-	std::vector<std::string> tokens;
-
-	std::string current = "";
-	bool last_was_escape = false;
-	for (unsigned int i = 0; i < s.size(); i++) {
-		char si = s.c_str()[i];
-		if (last_was_escape) {
-			current += '\\';
-			current += si;
-			last_was_escape = false;
-		} else {
-			if (si == delim) {
-				tokens.push_back(current);
-				current = "";
-				last_was_escape = false;
-			} else if (si == '\\') {
-				last_was_escape = true;
-			} else {
-				current += si;
-				last_was_escape = false;
-			}
-		}
-	}
-	//push last element
-	tokens.push_back(current);
-
-	return tokens;
-}
-
 void GUIFormSpecMenu::parseSize(parserData* data,std::string element)
 {
 	std::vector<std::string> parts = split(element,',');
@@ -966,7 +936,7 @@ void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element)
 			int font_height = g_fontengine->getTextHeight();
 			rect.UpperLeftCorner.Y -= font_height;
 			rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + font_height;
-			Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, 0);
+			addStaticText(Environment, spec.flabel.c_str(), rect, false, true, this, 0);
 		}
 
 		e->setPasswordBox(true,L'*');
@@ -1021,7 +991,7 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data,
 	if (name == "")
 	{
 		// spec field id to 0, this stops submit searching for a value that isn't there
-		Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, spec.fid);
+		addStaticText(Environment, spec.flabel.c_str(), rect, false, true, this, spec.fid);
 	}
 	else
 	{
@@ -1056,7 +1026,7 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data,
 			int font_height = g_fontengine->getTextHeight();
 			rect.UpperLeftCorner.Y -= font_height;
 			rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + font_height;
-			Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, 0);
+			addStaticText(Environment, spec.flabel.c_str(), rect, false, true, this, 0);
 		}
 	}
 
@@ -1117,7 +1087,7 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,
 	if (name == "")
 	{
 		// spec field id to 0, this stops submit searching for a value that isn't there
-		Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, spec.fid);
+		addStaticText(Environment, spec.flabel.c_str(), rect, false, true, this, spec.fid);
 	}
 	else
 	{
@@ -1161,7 +1131,7 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,
 			int font_height = g_fontengine->getTextHeight();
 			rect.UpperLeftCorner.Y -= font_height;
 			rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + font_height;
-			Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, 0);
+			addStaticText(Environment, spec.flabel.c_str(), rect, false, true, this, 0);
 		}
 	}
 	m_fields.push_back(spec);
@@ -1230,7 +1200,7 @@ void GUIFormSpecMenu::parseLabel(parserData* data,std::string element)
 				258+m_fields.size()
 			);
 			gui::IGUIStaticText *e =
-				Environment->addStaticText(spec.flabel.c_str(),
+				addStaticText(Environment, spec.flabel.c_str(),
 					rect, false, false, this, spec.fid);
 			e->setTextAlignment(gui::EGUIA_UPPERLEFT,
 						gui::EGUIA_CENTER);
@@ -1284,7 +1254,7 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element)
 			258+m_fields.size()
 		);
 		gui::IGUIStaticText *t =
-				Environment->addStaticText(spec.flabel.c_str(), rect, false, false, this, spec.fid);
+				addStaticText(Environment, spec.flabel.c_str(), rect, false, false, this, spec.fid);
 		t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
 		m_fields.push_back(spec);
 		return;
@@ -1910,7 +1880,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 	{
 		assert(m_tooltip_element == NULL);
 		// Note: parent != this so that the tooltip isn't clipped by the menu rectangle
-		m_tooltip_element = Environment->addStaticText(L"",core::rect<s32>(0,0,110,18));
+		m_tooltip_element = addStaticText(Environment, L"",core::rect<s32>(0,0,110,18));
 		m_tooltip_element->enableOverrideColor(true);
 		m_tooltip_element->setBackgroundColor(m_default_tooltip_bgcolor);
 		m_tooltip_element->setDrawBackground(true);
@@ -2255,7 +2225,6 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase,
 			std::wstring tooltip_text = L"";
 			if (hovering && !m_selected_item) {
 				tooltip_text = utf8_to_wide(item.getDefinition(m_gamedef->idef()).description);
-				tooltip_text = unescape_enriched(tooltip_text);
 			}
 			if (tooltip_text != L"") {
 				std::vector<std::wstring> tt_rows = str_split(tooltip_text, L'\n');
@@ -2263,7 +2232,7 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase,
 				m_tooltip_element->setOverrideColor(m_default_tooltip_color);
 				m_tooltip_element->setVisible(true);
 				this->bringToFront(m_tooltip_element);
-				m_tooltip_element->setText(tooltip_text.c_str());
+				setStaticText(m_tooltip_element, tooltip_text.c_str());
 				s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height;
 #if IRRLICHT_VERSION_MAJOR <= 1 && IRRLICHT_VERSION_MINOR <= 8 && IRRLICHT_VERSION_REVISION < 2
 				s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5;
@@ -2535,8 +2504,10 @@ void GUIFormSpecMenu::drawMenu()
 					iter != m_fields.end(); ++iter) {
 				if (iter->fid == id && m_tooltips[iter->fname].tooltip != L"") {
 					if (m_old_tooltip != m_tooltips[iter->fname].tooltip) {
+						m_tooltip_element->setBackgroundColor(m_tooltips[iter->fname].bgcolor);
+						m_tooltip_element->setOverrideColor(m_tooltips[iter->fname].color);
 						m_old_tooltip = m_tooltips[iter->fname].tooltip;
-						m_tooltip_element->setText(m_tooltips[iter->fname].tooltip.c_str());
+						setStaticText(m_tooltip_element, m_tooltips[iter->fname].tooltip.c_str());
 						std::vector<std::wstring> tt_rows = str_split(m_tooltips[iter->fname].tooltip, L'\n');
 						s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height;
 						s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5;
@@ -2558,8 +2529,6 @@ void GUIFormSpecMenu::drawMenu()
 						core::position2d<s32>(tooltip_x, tooltip_y),
 						core::dimension2d<s32>(tooltip_width, tooltip_height)));
 					}
-					m_tooltip_element->setBackgroundColor(m_tooltips[iter->fname].bgcolor);
-					m_tooltip_element->setOverrideColor(m_tooltips[iter->fname].color);
 					m_tooltip_element->setVisible(true);
 					this->bringToFront(m_tooltip_element);
 					break;
@@ -2568,6 +2537,8 @@ void GUIFormSpecMenu::drawMenu()
 		}
 	}
 
+	m_tooltip_element->draw();
+
 	/*
 		Draw dragged item stack
 	*/
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index ef230c81c..4122b1f56 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiTable.h"
 #include "network/networkprotocol.h"
 #include "util/string.h"
+#include "util/enriched_string.h"
 
 class IGameDef;
 class InventoryManager;
@@ -202,7 +203,8 @@ class GUIFormSpecMenu : public GUIModalMenu
 			fname(name),
 			fid(id)
 		{
-			flabel = unescape_enriched(label);
+			//flabel = unescape_enriched(label);
+			flabel = label;
 			fdefault = unescape_enriched(default_text);
 			send = false;
 			ftype = f_Unknown;
@@ -239,7 +241,8 @@ class GUIFormSpecMenu : public GUIModalMenu
 			bgcolor(a_bgcolor),
 			color(a_color)
 		{
-			tooltip = unescape_enriched(utf8_to_wide(a_tooltip));
+			//tooltip = unescape_enriched(utf8_to_wide(a_tooltip));
+			tooltip = utf8_to_wide(a_tooltip);
 		}
 		std::wstring tooltip;
 		irr::video::SColor bgcolor;
@@ -256,7 +259,8 @@ class GUIFormSpecMenu : public GUIModalMenu
 			rect(a_rect),
 			parent_button(NULL)
 		{
-			text = unescape_enriched(a_text);
+			//text = unescape_enriched(a_text);
+			text = a_text;
 		}
 		StaticTextSpec(const std::wstring &a_text,
 				const core::rect<s32> &a_rect,
@@ -264,7 +268,8 @@ class GUIFormSpecMenu : public GUIModalMenu
 			rect(a_rect),
 			parent_button(a_parent_button)
 		{
-			text = unescape_enriched(a_text);
+			//text = unescape_enriched(a_text);
+			text = a_text;
 		}
 		std::wstring text;
 		core::rect<s32> rect;
diff --git a/src/irrlicht_changes/CMakeLists.txt b/src/irrlicht_changes/CMakeLists.txt
new file mode 100644
index 000000000..3a265c99d
--- /dev/null
+++ b/src/irrlicht_changes/CMakeLists.txt
@@ -0,0 +1,7 @@
+if (BUILD_CLIENT)
+	set(client_irrlicht_changes_SRCS
+		${CMAKE_CURRENT_SOURCE_DIR}/static_text.cpp
+		PARENT_SCOPE
+	)
+endif()
+
diff --git a/src/util/statictext.cpp b/src/irrlicht_changes/static_text.cpp
similarity index 83%
rename from src/util/statictext.cpp
rename to src/irrlicht_changes/static_text.cpp
index b534b560e..703287eb3 100644
--- a/src/util/statictext.cpp
+++ b/src/irrlicht_changes/static_text.cpp
@@ -1,12 +1,12 @@
 // Copyright (C) 2002-2012 Nikolaus Gebhardt
+// Copyright (C) 2016 Nathanaël Courant:
+//   Modified the functions to use EnrichedText instead of string.
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "statictext.h"
+#include "static_text.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
 
-//Only compile this if freetype is enabled.
-
 #include <vector>
 #include <string>
 #include <iostream>
@@ -17,15 +17,21 @@
 #include <rect.h>
 #include <SColor.h>
 
-#include "cguittfont/xCGUITTFont.h"
+#if USE_FREETYPE
+	#include "cguittfont/xCGUITTFont.h"
+#endif
+
 #include "util/string.h"
 
 namespace irr
 {
+
+#if USE_FREETYPE
+
 namespace gui
 {
 //! constructor
-StaticText::StaticText(const wchar_t* text, bool border,
+StaticText::StaticText(const EnrichedString &text, bool border,
 			IGUIEnvironment* environment, IGUIElement* parent,
 			s32 id, const core::rect<s32>& rectangle,
 			bool background)
@@ -40,7 +46,8 @@ StaticText::StaticText(const wchar_t* text, bool border,
 	setDebugName("StaticText");
 	#endif
 
-	Text = text;
+	Text = text.c_str();
+	cText = text;
 	if (environment && environment->getSkin())
 	{
 		BGColor = environment->getSkin()->getColor(gui::EGDC_3D_FACE);
@@ -55,7 +62,6 @@ StaticText::~StaticText()
 		OverrideFont->drop();
 }
 
-
 //! draws the element and its children
 void StaticText::draw()
 {
@@ -88,7 +94,7 @@ void StaticText::draw()
 	}
 
 	// draw the text
-	if (Text.size())
+	if (cText.size())
 	{
 		IGUIFont* font = getActiveFont();
 
@@ -105,10 +111,11 @@ void StaticText::draw()
 				if (HAlign == EGUIA_LOWERRIGHT)
 				{
 					frameRect.UpperLeftCorner.X = frameRect.LowerRightCorner.X -
-						font->getDimension(Text.c_str()).Width;
+						font->getDimension(cText.c_str()).Width;
 				}
 
-				font->draw(Text.c_str(), frameRect,
+				irr::gui::CGUITTFont *tmp = static_cast<irr::gui::CGUITTFont*>(font);
+				tmp->draw(cText, frameRect,
 					OverrideColorEnabled ? OverrideColor : skin->getColor(isEnabled() ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT),
 					HAlign == EGUIA_CENTER, VAlign == EGUIA_CENTER, (RestrainTextInside ? &AbsoluteClippingRect : NULL));
 			}
@@ -138,16 +145,17 @@ void StaticText::draw()
 							font->getDimension(BrokenText[i].c_str()).Width;
 					}
 
-					std::vector<irr::video::SColor> colors;
-					std::wstring str;
+					//std::vector<irr::video::SColor> colors;
+					//std::wstring str;
+					EnrichedString str = BrokenText[i];
 
-					str = colorizeText(BrokenText[i].c_str(), colors, previous_color);
-					if (!colors.empty())
-						previous_color = colors[colors.size() - 1];
+					//str = colorizeText(BrokenText[i].c_str(), colors, previous_color);
+					//if (!colors.empty())
+					//	previous_color = colors[colors.size() - 1];
 
 					irr::gui::CGUITTFont *tmp = static_cast<irr::gui::CGUITTFont*>(font);
-					tmp->draw(str.c_str(), r,
-						colors,
+					tmp->draw(str, r,
+						previous_color, // FIXME
 						HAlign == EGUIA_CENTER, false, (RestrainTextInside ? &AbsoluteClippingRect : NULL));
 
 					r.LowerRightCorner.Y += height;
@@ -340,17 +348,17 @@ void StaticText::breakText()
 
 	LastBreakFont = font;
 
-	core::stringw line;
-	core::stringw word;
-	core::stringw whitespace;
-	s32 size = Text.size();
+	EnrichedString line;
+	EnrichedString word;
+	EnrichedString whitespace;
+	s32 size = cText.size();
 	s32 length = 0;
 	s32 elWidth = RelativeRect.getWidth();
 	if (Border)
 		elWidth -= 2*skin->getSize(EGDS_TEXT_DISTANCE_X);
 	wchar_t c;
 
-	std::vector<irr::video::SColor> colors;
+	//std::vector<irr::video::SColor> colors;
 
 	// We have to deal with right-to-left and left-to-right differently
 	// However, most parts of the following code is the same, it's just
@@ -360,17 +368,17 @@ void StaticText::breakText()
 		// regular (left-to-right)
 		for (s32 i=0; i<size; ++i)
 		{
-			c = Text[i];
+			c = cText.getString()[i];
 			bool lineBreak = false;
 
 			if (c == L'\r') // Mac or Windows breaks
 			{
 				lineBreak = true;
-				if (Text[i+1] == L'\n') // Windows breaks
-				{
-					Text.erase(i+1);
-					--size;
-				}
+				//if (Text[i+1] == L'\n') // Windows breaks
+				//{
+				//	Text.erase(i+1);
+				//	--size;
+				//}
 				c = '\0';
 			}
 			else if (c == L'\n') // Unix breaks
@@ -383,7 +391,8 @@ void StaticText::breakText()
 			if ( !isWhitespace )
 			{
 				// part of a word
-				word += c;
+				//word += c;
+				word.addChar(cText, i);
 			}
 
 			if ( isWhitespace || i == (size-1))
@@ -393,20 +402,21 @@ void StaticText::breakText()
 					// here comes the next whitespace, look if
 					// we must break the last word to the next line.
 					const s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
-					const std::wstring sanitized = removeEscapes(word.c_str());
-					const s32 wordlgth = font->getDimension(sanitized.c_str()).Width;
+					//const std::wstring sanitized = removeEscapes(word.c_str());
+					const s32 wordlgth = font->getDimension(word.c_str()).Width;
 
 					if (wordlgth > elWidth)
 					{
 						// This word is too long to fit in the available space, look for
 						// the Unicode Soft HYphen (SHY / 00AD) character for a place to
 						// break the word at
-						int where = word.findFirst( wchar_t(0x00AD) );
+						int where = core::stringw(word.c_str()).findFirst( wchar_t(0x00AD) );
 						if (where != -1)
 						{
-							core::stringw first  = word.subString(0, where);
-							core::stringw second = word.subString(where, word.size() - where);
-							BrokenText.push_back(line + first + L"-");
+							EnrichedString first = word.substr(0, where);
+							EnrichedString second = word.substr(where, word.size() - where);
+							first.addCharNoColor(L'-');
+							BrokenText.push_back(line + first);
 							const s32 secondLength = font->getDimension(second.c_str()).Width;
 
 							length = secondLength;
@@ -437,13 +447,13 @@ void StaticText::breakText()
 						length += whitelgth + wordlgth;
 					}
 
-					word = L"";
-					whitespace = L"";
+					word.clear();
+					whitespace.clear();
 				}
 
-				if ( isWhitespace )
+				if ( isWhitespace && c != 0)
 				{
-					whitespace += c;
+					whitespace.addChar(cText, i);
 				}
 
 				// compute line break
@@ -452,9 +462,9 @@ void StaticText::breakText()
 					line += whitespace;
 					line += word;
 					BrokenText.push_back(line);
-					line = L"";
-					word = L"";
-					whitespace = L"";
+					line.clear();
+					word.clear();
+					whitespace.clear();
 					length = 0;
 				}
 			}
@@ -469,17 +479,17 @@ void StaticText::breakText()
 		// right-to-left
 		for (s32 i=size; i>=0; --i)
 		{
-			c = Text[i];
+			c = cText.getString()[i];
 			bool lineBreak = false;
 
 			if (c == L'\r') // Mac or Windows breaks
 			{
 				lineBreak = true;
-				if ((i>0) && Text[i-1] == L'\n') // Windows breaks
-				{
-					Text.erase(i-1);
-					--size;
-				}
+				//if ((i>0) && Text[i-1] == L'\n') // Windows breaks
+				//{
+				//	Text.erase(i-1);
+				//	--size;
+				//}
 				c = '\0';
 			}
 			else if (c == L'\n') // Unix breaks
@@ -512,12 +522,13 @@ void StaticText::breakText()
 						length += whitelgth + wordlgth;
 					}
 
-					word = L"";
-					whitespace = L"";
+					word.clear();
+					whitespace.clear();
 				}
 
 				if (c != 0)
-					whitespace = core::stringw(&c, 1) + whitespace;
+				//	whitespace = core::stringw(&c, 1) + whitespace;
+				whitespace = cText.substr(i, 1) + whitespace;
 
 				// compute line break
 				if (lineBreak)
@@ -525,16 +536,17 @@ void StaticText::breakText()
 					line = whitespace + line;
 					line = word + line;
 					BrokenText.push_back(line);
-					line = L"";
-					word = L"";
-					whitespace = L"";
+					line.clear();
+					word.clear();
+					whitespace.clear();
 					length = 0;
 				}
 			}
 			else
 			{
 				// yippee this is a word..
-				word = core::stringw(&c, 1) + word;
+				//word = core::stringw(&c, 1) + word;
+				word = cText.substr(i, 1) + word;
 			}
 		}
 
@@ -548,7 +560,17 @@ void StaticText::breakText()
 //! Sets the new caption of this element.
 void StaticText::setText(const wchar_t* text)
 {
-	IGUIElement::setText(text);
+	setText(EnrichedString(text));
+}
+
+//! Sets the new caption of this element.
+void StaticText::setText(const EnrichedString &text)
+{
+	IGUIElement::setText(text.c_str());
+	cText = text;
+	if (text.hasBackground()) {
+		setBackgroundColor(text.getBackground());
+	}
 	breakText();
 }
 
@@ -598,7 +620,7 @@ s32 StaticText::getTextWidth() const
 	}
 	else
 	{
-		return font->getDimension(Text.c_str()).Width;
+		return font->getDimension(cText.c_str()).Width;
 	}
 }
 
@@ -648,6 +670,9 @@ void StaticText::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWr
 }
 
 } // end namespace gui
+
+#endif // USE_FREETYPE
+
 } // end namespace irr
 
 
diff --git a/src/util/statictext.h b/src/irrlicht_changes/static_text.h
similarity index 54%
rename from src/util/statictext.h
rename to src/irrlicht_changes/static_text.h
index 8d2f879e7..408a12784 100644
--- a/src/util/statictext.h
+++ b/src/irrlicht_changes/static_text.h
@@ -1,4 +1,6 @@
 // Copyright (C) 2002-2012 Nikolaus Gebhardt
+// Copyright (C) 2016 Nathanaël Courant
+//   Modified this class to work with EnrichedStrings too
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,18 +13,30 @@
 #include "IGUIStaticText.h"
 #include "irrArray.h"
 
+#include "log.h"
+
 #include <vector>
 
+#include "util/enriched_string.h"
+#include "config.h"
+#include <IGUIEnvironment.h>
+
+#if USE_FREETYPE
+
 namespace irr
 {
+
 namespace gui
 {
+
+	const EGUI_ELEMENT_TYPE EGUIET_ENRICHED_STATIC_TEXT = (EGUI_ELEMENT_TYPE)(0x1000);
+
 	class StaticText : public IGUIStaticText
 	{
 	public:
 
 		//! constructor
-		StaticText(const wchar_t* text, bool border, IGUIEnvironment* environment,
+		StaticText(const EnrichedString &text, bool border, IGUIEnvironment* environment,
 			IGUIElement* parent, s32 id, const core::rect<s32>& rectangle,
 			bool background = false);
 
@@ -121,6 +135,16 @@ namespace gui
 		//! Reads attributes of the element
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
 
+		virtual bool hasType(EGUI_ELEMENT_TYPE t) const {
+			return (t == EGUIET_ENRICHED_STATIC_TEXT) || (t == EGUIET_STATIC_TEXT);
+		};
+
+		virtual bool hasType(EGUI_ELEMENT_TYPE t) {
+			return (t == EGUIET_ENRICHED_STATIC_TEXT) || (t == EGUIET_STATIC_TEXT);
+		};
+
+		void setText(const EnrichedString &text);
+
 	private:
 
 		//! Breaks the single text line.
@@ -139,12 +163,106 @@ namespace gui
 		gui::IGUIFont* OverrideFont;
 		gui::IGUIFont* LastBreakFont; // stored because: if skin changes, line break must be recalculated.
 
-		core::array< core::stringw > BrokenText;
+		EnrichedString cText;
+		core::array< EnrichedString > BrokenText;
 	};
 
+
 } // end namespace gui
+
 } // end namespace irr
 
+inline irr::gui::IGUIStaticText *addStaticText(
+		irr::gui::IGUIEnvironment *guienv,
+		const EnrichedString &text,
+		const core::rect< s32 > &rectangle,
+		bool border = false,
+		bool wordWrap = true,
+		irr::gui::IGUIElement *parent = NULL,
+		s32 id = -1,
+		bool fillBackground = false)
+{
+	if (parent == NULL) {
+		// parent is NULL, so we must find one, or we need not to drop
+		// result, but then there will be a memory leak.
+		//
+		// What Irrlicht does is to use guienv as a parent, but the problem
+		// is that guienv is here only an IGUIEnvironment, while it is a
+		// CGUIEnvironment in Irrlicht, which inherits from both IGUIElement
+		// and IGUIEnvironment.
+		//
+		// A solution would be to dynamic_cast guienv to a
+		// IGUIElement*, but Irrlicht is shipped without rtti support
+		// in some distributions, causing the dymanic_cast to segfault.
+		//
+		// Thus, to find the parent, we create a dummy StaticText and ask
+		// for its parent, and then remove it.
+		irr::gui::IGUIStaticText *dummy_text =
+			guienv->addStaticText(L"", rectangle, border, wordWrap,
+			parent, id, fillBackground);
+		parent = dummy_text->getParent();
+		dummy_text->remove();
+	}
+	irr::gui::IGUIStaticText *result = new irr::gui::StaticText(
+		text, border, guienv, parent,
+		id, rectangle, fillBackground);
+
+	result->setWordWrap(wordWrap);
+	result->drop();
+	return result;
+}
+
+inline void setStaticText(irr::gui::IGUIStaticText *static_text, const EnrichedString &text)
+{
+	// dynamic_cast not possible due to some distributions shipped
+	// without rtti support in irrlicht
+	if (static_text->hasType(irr::gui::EGUIET_ENRICHED_STATIC_TEXT)) {
+		irr::gui::StaticText* stext = static_cast<irr::gui::StaticText*>(static_text);
+		stext->setText(text);
+	} else {
+		static_text->setText(text.c_str());
+	}
+}
+
+#else // USE_FREETYPE
+
+inline irr::gui::IGUIStaticText *addStaticText(
+		irr::gui::IGUIEnvironment *guienv,
+		const EnrichedString &text,
+		const core::rect< s32 > &rectangle,
+		bool border = false,
+		bool wordWrap = true,
+		irr::gui::IGUIElement *parent = NULL,
+		s32 id = -1,
+		bool fillBackground = false)
+{
+	return guienv->addStaticText(text.c_str(), rectangle, border, wordWrap, parent, id, fillBackground);
+}
+
+inline void setStaticText(irr::gui::IGUIStaticText *static_text, const EnrichedString &text)
+{
+	static_text->setText(text.c_str());
+}
+
+#endif
+
+inline irr::gui::IGUIStaticText *addStaticText(
+		irr::gui::IGUIEnvironment *guienv,
+		const wchar_t *text,
+		const core::rect< s32 > &rectangle,
+		bool border = false,
+		bool wordWrap = true,
+		irr::gui::IGUIElement *parent = NULL,
+		s32 id = -1,
+		bool fillBackground = false) {
+	return addStaticText(guienv, EnrichedString(text), rectangle, border, wordWrap, parent, id, fillBackground);
+}
+
+inline void setStaticText(irr::gui::IGUIStaticText *static_text, const wchar_t *text)
+{
+	setStaticText(static_text, EnrichedString(text));
+}
+
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif // C_GUI_STATIC_TEXT_H_INCLUDED
diff --git a/src/terminal_chat_console.cpp b/src/terminal_chat_console.cpp
index c86a960fa..a8c4ebaef 100644
--- a/src/terminal_chat_console.cpp
+++ b/src/terminal_chat_console.cpp
@@ -345,9 +345,11 @@ void TerminalChatConsole::step(int ch)
 		if (p.first > m_log_level)
 			continue;
 
-		m_chat_backend.addMessage(
-			utf8_to_wide(Logger::getLevelLabel(p.first)),
-			utf8_to_wide(p.second));
+		std::wstring error_message = utf8_to_wide(Logger::getLevelLabel(p.first));
+		if (!g_settings->getBool("disable_escape_sequences")) {
+			error_message = L"\x1b(c@red)" + error_message + L"\x1b(c@white)";
+		}
+		m_chat_backend.addMessage(error_message, utf8_to_wide(p.second));
 	}
 
 	// handle input
@@ -438,7 +440,7 @@ void TerminalChatConsole::draw_text()
 			continue;
 		for (u32 i = 0; i < line.fragments.size(); ++i) {
 			const ChatFormattedFragment& fragment = line.fragments[i];
-			addstr(wide_to_utf8(fragment.text).c_str());
+			addstr(wide_to_utf8(fragment.text.getString()).c_str());
 		}
 	}
 }
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index e028a0435..f571ab22c 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,17 +1,9 @@
-if(USE_FREETYPE)
-	set(UTIL_FREETYPEDEP_SRCS
-		${CMAKE_CURRENT_SOURCE_DIR}/statictext.cpp
-	)
-else()
-	set(UTIL_FREETYPEDEP_SRCS )
-endif(USE_FREETYPE)
-
 set(UTIL_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/areastore.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/auth.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/coloredstring.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/enriched_string.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/serialize.cpp
@@ -20,6 +12,5 @@ set(UTIL_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/srp.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp
-	${UTIL_FREETYPEDEP_SRCS}
 	PARENT_SCOPE)
 
diff --git a/src/util/coloredstring.cpp b/src/util/coloredstring.cpp
deleted file mode 100644
index 7db586550..000000000
--- a/src/util/coloredstring.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-Copyright (C) 2013 xyz, Ilya Zhuravlev <whatever@xyz.is>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "coloredstring.h"
-#include "util/string.h"
-
-ColoredString::ColoredString()
-{}
-
-ColoredString::ColoredString(const std::wstring &string, const std::vector<SColor> &colors):
-	m_string(string),
-	m_colors(colors)
-{}
-
-ColoredString::ColoredString(const std::wstring &s) {
-	m_string = colorizeText(s, m_colors, SColor(255, 255, 255, 255));
-}
-
-void ColoredString::operator=(const wchar_t *str) {
-	m_string = colorizeText(str, m_colors, SColor(255, 255, 255, 255));
-}
-
-size_t ColoredString::size() const {
-	return m_string.size();
-}
-
-ColoredString ColoredString::substr(size_t pos, size_t len) const {
-	if (pos == m_string.length())
-		return ColoredString();
-	if (len == std::string::npos || pos + len > m_string.length()) {
-		return ColoredString(
-		           m_string.substr(pos, std::string::npos),
-		           std::vector<SColor>(m_colors.begin() + pos, m_colors.end())
-		       );
-	} else {
-		return ColoredString(
-		           m_string.substr(pos, len),
-		           std::vector<SColor>(m_colors.begin() + pos, m_colors.begin() + pos + len)
-		       );
-	}
-}
-
-const wchar_t *ColoredString::c_str() const {
-	return m_string.c_str();
-}
-
-const std::vector<SColor> &ColoredString::getColors() const {
-	return m_colors;
-}
-
-const std::wstring &ColoredString::getString() const {
-	return m_string;
-}
diff --git a/src/util/coloredstring.h b/src/util/coloredstring.h
deleted file mode 100644
index a6d98db30..000000000
--- a/src/util/coloredstring.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright (C) 2013 xyz, Ilya Zhuravlev <whatever@xyz.is>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef COLOREDSTRING_HEADER
-#define COLOREDSTRING_HEADER
-
-#include <string>
-#include <vector>
-#include <SColor.h>
-
-using namespace irr::video;
-
-class ColoredString {
-public:
-	ColoredString();
-	ColoredString(const std::wstring &s);
-	ColoredString(const std::wstring &string, const std::vector<SColor> &colors);
-	void operator=(const wchar_t *str);
-	size_t size() const;
-	ColoredString substr(size_t pos = 0, size_t len = std::string::npos) const;
-	const wchar_t *c_str() const;
-	const std::vector<SColor> &getColors() const;
-	const std::wstring &getString() const;
-private:
-	std::wstring m_string;
-	std::vector<SColor> m_colors;
-};
-
-#endif
diff --git a/src/util/enriched_string.cpp b/src/util/enriched_string.cpp
new file mode 100644
index 000000000..a7fc3a828
--- /dev/null
+++ b/src/util/enriched_string.cpp
@@ -0,0 +1,166 @@
+/*
+Copyright (C) 2013 xyz, Ilya Zhuravlev <whatever@xyz.is>
+Copyright (C) 2016 Nore, Nathanaël Courant <nore@mesecons.net>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "enriched_string.h"
+#include "util/string.h"
+#include "log.h"
+using namespace irr::video;
+
+EnrichedString::EnrichedString()
+{
+	clear();
+}
+
+EnrichedString::EnrichedString(const std::wstring &string,
+		const std::vector<SColor> &colors):
+	m_string(string),
+	m_colors(colors),
+	m_has_background(false)
+{}
+
+EnrichedString::EnrichedString(const std::wstring &s, const SColor &color)
+{
+	clear();
+	addAtEnd(s, color);
+}
+
+EnrichedString::EnrichedString(const wchar_t *str, const SColor &color)
+{
+	clear();
+	addAtEnd(std::wstring(str), color);
+}
+
+void EnrichedString::operator=(const wchar_t *str)
+{
+	clear();
+	addAtEnd(std::wstring(str), SColor(255, 255, 255, 255));
+}
+
+void EnrichedString::addAtEnd(const std::wstring &s, const SColor &initial_color)
+{
+	SColor color(initial_color);
+	size_t i = 0;
+	while (i < s.length()) {
+		if (s[i] != L'\x1b') {
+			m_string += s[i];
+			m_colors.push_back(color);
+			++i;
+			continue;
+		}
+		++i;
+		size_t start_index = i;
+		size_t length;
+		if (i == s.length()) {
+			break;
+		}
+		if (s[i] == L'(') {
+			++i;
+			++start_index;
+			while (i < s.length() && s[i] != L')') {
+				if (s[i] == L'\\') {
+					++i;
+				}
+				++i;
+			}
+			length = i - start_index;
+			++i;
+		} else {
+			++i;
+			length = 1;
+		}
+		std::wstring escape_sequence(s, start_index, length);
+		std::vector<std::wstring> parts = split(escape_sequence, L'@');
+		if (parts[0] == L"c") {
+			if (parts.size() < 2) {
+				continue;
+			}
+			parseColorString(wide_to_utf8(parts[1]), color, true);
+		} else if (parts[0] == L"b") {
+			if (parts.size() < 2) {
+				continue;
+			}
+			parseColorString(wide_to_utf8(parts[1]), m_background, true);
+			m_has_background = true;
+		}
+		continue;
+	}
+}
+
+void EnrichedString::addChar(const EnrichedString &source, size_t i)
+{
+	m_string += source.m_string[i];
+	m_colors.push_back(source.m_colors[i]);
+}
+
+void EnrichedString::addCharNoColor(wchar_t c)
+{
+	m_string += c;
+	if (m_colors.empty()) {
+		m_colors.push_back(SColor(255, 255, 255, 255));
+	} else {
+		m_colors.push_back(m_colors[m_colors.size() - 1]);
+	}
+}
+
+EnrichedString EnrichedString::operator+(const EnrichedString &other) const
+{
+	std::vector<SColor> result;
+	result.insert(result.end(), m_colors.begin(), m_colors.end());
+	result.insert(result.end(), other.m_colors.begin(), other.m_colors.end());
+	return EnrichedString(m_string + other.m_string, result);
+}
+
+void EnrichedString::operator+=(const EnrichedString &other)
+{
+	m_string += other.m_string;
+	m_colors.insert(m_colors.end(), other.m_colors.begin(), other.m_colors.end());
+}
+
+EnrichedString EnrichedString::substr(size_t pos, size_t len) const
+{
+	if (pos == m_string.length()) {
+		return EnrichedString();
+	}
+	if (len == std::string::npos || pos + len > m_string.length()) {
+		return EnrichedString(
+		           m_string.substr(pos, std::string::npos),
+		           std::vector<SColor>(m_colors.begin() + pos, m_colors.end())
+		       );
+	} else {
+		return EnrichedString(
+		           m_string.substr(pos, len),
+		           std::vector<SColor>(m_colors.begin() + pos, m_colors.begin() + pos + len)
+		       );
+	}
+}
+
+const wchar_t *EnrichedString::c_str() const
+{
+	return m_string.c_str();
+}
+
+const std::vector<SColor> &EnrichedString::getColors() const
+{
+	return m_colors;
+}
+
+const std::wstring &EnrichedString::getString() const
+{
+	return m_string;
+}
diff --git a/src/util/enriched_string.h b/src/util/enriched_string.h
new file mode 100644
index 000000000..1aca8948a
--- /dev/null
+++ b/src/util/enriched_string.h
@@ -0,0 +1,91 @@
+/*
+Copyright (C) 2013 xyz, Ilya Zhuravlev <whatever@xyz.is>
+Copyright (C) 2016 Nore, Nathanaël Courant <nore@mesecons.net>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef ENRICHEDSTRING_HEADER
+#define ENRICHEDSTRING_HEADER
+
+#include <string>
+#include <vector>
+#include <SColor.h>
+
+class EnrichedString {
+public:
+	EnrichedString();
+	EnrichedString(const std::wstring &s,
+		const irr::video::SColor &color = irr::video::SColor(255, 255, 255, 255));
+	EnrichedString(const wchar_t *str,
+		const irr::video::SColor &color = irr::video::SColor(255, 255, 255, 255));
+	EnrichedString(const std::wstring &string,
+		const std::vector<irr::video::SColor> &colors);
+	void operator=(const wchar_t *str);
+	void addAtEnd(const std::wstring &s, const irr::video::SColor &color);
+
+	// Adds the character source[i] at the end.
+	// An EnrichedString should always be able to be copied
+	// to the end of an existing EnrichedString that way.
+	void addChar(const EnrichedString &source, size_t i);
+
+	// Adds a single character at the end, without specifying its
+	// color. The color used will be the one from the last character.
+	void addCharNoColor(wchar_t c);
+
+	EnrichedString substr(size_t pos = 0, size_t len = std::string::npos) const;
+	EnrichedString operator+(const EnrichedString &other) const;
+	void operator+=(const EnrichedString &other);
+	const wchar_t *c_str() const;
+	const std::vector<irr::video::SColor> &getColors() const;
+	const std::wstring &getString() const;
+	inline bool operator==(const EnrichedString &other) const
+	{
+		return (m_string == other.m_string && m_colors == other.m_colors);
+	}
+	inline bool operator!=(const EnrichedString &other) const
+	{
+		return !(*this == other);
+	}
+	inline void clear()
+	{
+		m_string.clear();
+		m_colors.clear();
+		m_has_background = false;
+	}
+	inline bool empty() const
+	{
+		return m_string.empty();
+	}
+	inline size_t size() const
+	{
+		return m_string.size();
+	}
+	inline bool hasBackground() const
+	{
+		return m_has_background;
+	}
+	inline irr::video::SColor getBackground() const
+	{
+		return m_background;
+	}
+private:
+	std::wstring m_string;
+	std::vector<irr::video::SColor> m_colors;
+	bool m_has_background;
+	irr::video::SColor m_background;
+};
+
+#endif
diff --git a/src/util/string.h b/src/util/string.h
index 40ef3e4d3..c77c5a6f9 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -519,6 +519,38 @@ std::basic_string<T> unescape_enriched(const std::basic_string<T> &s)
 	return output;
 }
 
+template <typename T>
+std::vector<std::basic_string<T> > split(const std::basic_string<T> &s, T delim)
+{
+	std::vector<std::basic_string<T> > tokens;
+
+	std::basic_string<T> current;
+	bool last_was_escape = false;
+	for (size_t i = 0; i < s.length(); i++) {
+		T si = s[i];
+		if (last_was_escape) {
+			current += '\\';
+			current += si;
+			last_was_escape = false;
+		} else {
+			if (si == delim) {
+				tokens.push_back(current);
+				current = std::basic_string<T>();
+				last_was_escape = false;
+			} else if (si == '\\') {
+				last_was_escape = true;
+			} else {
+				current += si;
+				last_was_escape = false;
+			}
+		}
+	}
+	//push last element
+	tokens.push_back(current);
+
+	return tokens;
+}
+
 /**
  * Checks that all characters in \p to_check are a decimal digits.
  *

From 569998011e0a9cb6179f1e79fb15b7a3ce80977f Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Mon, 30 May 2016 13:15:14 +0100
Subject: [PATCH 050/418] Mgv7: Always carve river channels in mountain terrain

Previously, rivers were sometimes blocked by vertical walls
of mountain terrain due to river carving being disabled
when base terrain height was below water_level - 16
Remove now unused base terrain heightmap created in
generateTerrain()
---
 src/mapgen_v7.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 9ff2fbe66..7327facae 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -206,13 +206,15 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 
 	blockseed = getBlockSeed2(full_node_min, seed);
 
-	// Generate terrain and ridges with initial heightmaps
+	// Generate base and mountain terrain
+	// An initial heightmap is no longer created here for use in generateRidgeTerrain()
 	s16 stone_surface_max_y = generateTerrain();
 
+	// Generate rivers
 	if (spflags & MGV7_RIDGES)
 		generateRidgeTerrain();
 
-	// Update heightmap to include mountain terrain
+	// Create heightmap
 	updateHeightmap(node_min, node_max);
 
 	// Init biome generator, place biome-specific nodes, and build biomemap
@@ -331,7 +333,6 @@ int MapgenV7::generateTerrain()
 	for (s16 z = node_min.Z; z <= node_max.Z; z++)
 	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
 		s16 surface_y = baseTerrainLevelFromMap(index2d);
-		heightmap[index2d] = surface_y;  // Create base terrain heightmap
 
 		if (surface_y > stone_surface_max_y)
 			stone_surface_max_y = surface_y;
@@ -382,9 +383,6 @@ void MapgenV7::generateRidgeTerrain()
 		for (s16 x = node_min.X; x <= node_max.X; x++, index++, vi++) {
 			int j = (z - node_min.Z) * csize.X + (x - node_min.X);
 
-			if (heightmap[j] < water_level - 16)  // Use base terrain heightmap
-				continue;
-
 			float uwatern = noise_ridge_uwater->result[j] * 2;
 			if (fabs(uwatern) > width)
 				continue;

From 7ea4a03c835d68a6fb58aa55aa6a6315ec80b79f Mon Sep 17 00:00:00 2001
From: Robert Kiraly <oldcoder@yahoo.com>
Date: Fri, 3 Jun 2016 00:50:21 -0700
Subject: [PATCH 051/418] Sapier's fix for the RESEND RELIABLE problem (#4170)

---
 src/network/connection.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/network/connection.cpp b/src/network/connection.cpp
index 02c0aa165..b711cae11 100644
--- a/src/network/connection.cpp
+++ b/src/network/connection.cpp
@@ -71,6 +71,9 @@ static inline float CALC_DTIME(unsigned int lasttime, unsigned int curtime) {
 
 #define PING_TIMEOUT 5.0
 
+/* maximum number of retries for reliable packets */
+#define MAX_RELIABLE_RETRY 5
+
 static u16 readPeerId(u8 *packetdata)
 {
 	return readU16(&packetdata[4]);
@@ -1399,6 +1402,7 @@ void ConnectionSendThread::runTimeouts(float dtime)
 		}
 
 		float resend_timeout = dynamic_cast<UDPPeer*>(&peer)->getResendTimeout();
+		bool retry_count_exceeded = false;
 		for(u16 i=0; i<CHANNEL_COUNT; i++)
 		{
 			std::list<BufferedPacket> timed_outs;
@@ -1438,6 +1442,13 @@ void ConnectionSendThread::runTimeouts(float dtime)
 				channel->UpdateBytesLost(k->data.getSize());
 				k->resend_count++;
 
+				if (k-> resend_count > MAX_RELIABLE_RETRY) {
+					retry_count_exceeded = true;
+					timeouted_peers.push_back(peer->id);
+					/* no need to check additional packets if a single one did timeout*/
+					break;
+				}
+
 				LOG(derr_con<<m_connection->getDesc()
 						<<"RE-SENDING timed-out RELIABLE to "
 						<< k->address.serializeString()
@@ -1452,9 +1463,18 @@ void ConnectionSendThread::runTimeouts(float dtime)
 				// do not handle rtt here as we can't decide if this packet was
 				// lost or really takes more time to transmit
 			}
+
+			if (retry_count_exceeded) {
+				break; /* no need to check other channels if we already did timeout */
+			}
+
 			channel->UpdateTimers(dtime,dynamic_cast<UDPPeer*>(&peer)->getLegacyPeer());
 		}
 
+		/* skip to next peer if we did timeout */
+		if (retry_count_exceeded)
+			continue;
+
 		/* send ping if necessary */
 		if (dynamic_cast<UDPPeer*>(&peer)->Ping(dtime,data)) {
 			LOG(dout_con<<m_connection->getDesc()

From 1e86c89f3614cf298916149a8f13d44ea671da64 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 25 May 2016 09:22:20 +0200
Subject: [PATCH 052/418] Input related generalisations

* Move key types into own file
* Use Generalized input methods in game.cpp
---
 src/client/keys.h |  79 +++++++++++++
 src/game.cpp      | 289 ++++++++++++++++++++++------------------------
 src/game.h        |   1 +
 3 files changed, 221 insertions(+), 148 deletions(-)
 create mode 100644 src/client/keys.h

diff --git a/src/client/keys.h b/src/client/keys.h
new file mode 100644
index 000000000..08b1c4123
--- /dev/null
+++ b/src/client/keys.h
@@ -0,0 +1,79 @@
+/*
+Minetest
+Copyright (C) 2016 est31, <MTest31@outlook.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef KEYS_HEADER
+#define KEYS_HEADER
+
+#include<list>
+
+class KeyType {
+public:
+	enum T {
+		// Player movement
+		FORWARD,
+		BACKWARD,
+		LEFT,
+		RIGHT,
+		JUMP,
+		SPECIAL1,
+		SNEAK,
+		AUTORUN,
+
+		ESC,
+
+		// Other
+		DROP,
+		INVENTORY,
+		CHAT,
+		CMD,
+		CONSOLE,
+		MINIMAP,
+		FREEMOVE,
+		FASTMOVE,
+		NOCLIP,
+		CINEMATIC,
+		SCREENSHOT,
+		TOGGLE_HUD,
+		TOGGLE_CHAT,
+		TOGGLE_FORCE_FOG_OFF,
+		TOGGLE_UPDATE_CAMERA,
+		TOGGLE_DEBUG,
+		TOGGLE_PROFILER,
+		CAMERA_MODE,
+		INCREASE_VIEWING_RANGE,
+		DECREASE_VIEWING_RANGE,
+		RANGESELECT,
+
+		QUICKTUNE_NEXT,
+		QUICKTUNE_PREV,
+		QUICKTUNE_INC,
+		QUICKTUNE_DEC,
+
+		DEBUG_STACKS,
+
+		// Fake keycode for array size and internal checks
+		INTERNAL_ENUM_COUNT
+
+	};
+};
+
+typedef KeyType::T GameKeyType;
+
+
+#endif
diff --git a/src/game.cpp b/src/game.cpp
index def202fe5..ac1c0fe6b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "camera.h"
 #include "client.h"
 #include "client/tile.h"     // For TextureSource
+#include "client/keys.h"
 #include "clientmap.h"
 #include "clouds.h"
 #include "config.h"
@@ -1306,114 +1307,76 @@ struct KeyCache {
 	{
 		handler = NULL;
 		populate();
+		populate_nonchanging();
 	}
 
-	enum {
-		// Player movement
-		KEYMAP_ID_FORWARD,
-		KEYMAP_ID_BACKWARD,
-		KEYMAP_ID_LEFT,
-		KEYMAP_ID_RIGHT,
-		KEYMAP_ID_JUMP,
-		KEYMAP_ID_SPECIAL1,
-		KEYMAP_ID_SNEAK,
-		KEYMAP_ID_AUTORUN,
-
-		// Other
-		KEYMAP_ID_DROP,
-		KEYMAP_ID_INVENTORY,
-		KEYMAP_ID_CHAT,
-		KEYMAP_ID_CMD,
-		KEYMAP_ID_CONSOLE,
-		KEYMAP_ID_MINIMAP,
-		KEYMAP_ID_FREEMOVE,
-		KEYMAP_ID_FASTMOVE,
-		KEYMAP_ID_NOCLIP,
-		KEYMAP_ID_CINEMATIC,
-		KEYMAP_ID_SCREENSHOT,
-		KEYMAP_ID_TOGGLE_HUD,
-		KEYMAP_ID_TOGGLE_CHAT,
-		KEYMAP_ID_TOGGLE_FORCE_FOG_OFF,
-		KEYMAP_ID_TOGGLE_UPDATE_CAMERA,
-		KEYMAP_ID_TOGGLE_DEBUG,
-		KEYMAP_ID_TOGGLE_PROFILER,
-		KEYMAP_ID_CAMERA_MODE,
-		KEYMAP_ID_INCREASE_VIEWING_RANGE,
-		KEYMAP_ID_DECREASE_VIEWING_RANGE,
-		KEYMAP_ID_RANGESELECT,
-
-		KEYMAP_ID_QUICKTUNE_NEXT,
-		KEYMAP_ID_QUICKTUNE_PREV,
-		KEYMAP_ID_QUICKTUNE_INC,
-		KEYMAP_ID_QUICKTUNE_DEC,
-
-		KEYMAP_ID_DEBUG_STACKS,
-
-		// Fake keycode for array size and internal checks
-		KEYMAP_INTERNAL_ENUM_COUNT
-
-
-	};
-
 	void populate();
 
-	KeyPress key[KEYMAP_INTERNAL_ENUM_COUNT];
+	// Keys that are not settings dependent
+	void populate_nonchanging();
+
+	KeyPress key[KeyType::INTERNAL_ENUM_COUNT];
 	InputHandler *handler;
 };
 
+void KeyCache::populate_nonchanging()
+{
+	key[KeyType::ESC] = EscapeKey;
+}
+
 void KeyCache::populate()
 {
-	key[KEYMAP_ID_FORWARD]      = getKeySetting("keymap_forward");
-	key[KEYMAP_ID_BACKWARD]     = getKeySetting("keymap_backward");
-	key[KEYMAP_ID_LEFT]         = getKeySetting("keymap_left");
-	key[KEYMAP_ID_RIGHT]        = getKeySetting("keymap_right");
-	key[KEYMAP_ID_JUMP]         = getKeySetting("keymap_jump");
-	key[KEYMAP_ID_SPECIAL1]     = getKeySetting("keymap_special1");
-	key[KEYMAP_ID_SNEAK]        = getKeySetting("keymap_sneak");
+	key[KeyType::FORWARD]      = getKeySetting("keymap_forward");
+	key[KeyType::BACKWARD]     = getKeySetting("keymap_backward");
+	key[KeyType::LEFT]         = getKeySetting("keymap_left");
+	key[KeyType::RIGHT]        = getKeySetting("keymap_right");
+	key[KeyType::JUMP]         = getKeySetting("keymap_jump");
+	key[KeyType::SPECIAL1]     = getKeySetting("keymap_special1");
+	key[KeyType::SNEAK]        = getKeySetting("keymap_sneak");
 
-	key[KEYMAP_ID_AUTORUN]      = getKeySetting("keymap_autorun");
+	key[KeyType::AUTORUN]      = getKeySetting("keymap_autorun");
 
-	key[KEYMAP_ID_DROP]         = getKeySetting("keymap_drop");
-	key[KEYMAP_ID_INVENTORY]    = getKeySetting("keymap_inventory");
-	key[KEYMAP_ID_CHAT]         = getKeySetting("keymap_chat");
-	key[KEYMAP_ID_CMD]          = getKeySetting("keymap_cmd");
-	key[KEYMAP_ID_CONSOLE]      = getKeySetting("keymap_console");
-	key[KEYMAP_ID_MINIMAP]      = getKeySetting("keymap_minimap");
-	key[KEYMAP_ID_FREEMOVE]     = getKeySetting("keymap_freemove");
-	key[KEYMAP_ID_FASTMOVE]     = getKeySetting("keymap_fastmove");
-	key[KEYMAP_ID_NOCLIP]       = getKeySetting("keymap_noclip");
-	key[KEYMAP_ID_CINEMATIC]    = getKeySetting("keymap_cinematic");
-	key[KEYMAP_ID_SCREENSHOT]   = getKeySetting("keymap_screenshot");
-	key[KEYMAP_ID_TOGGLE_HUD]   = getKeySetting("keymap_toggle_hud");
-	key[KEYMAP_ID_TOGGLE_CHAT]  = getKeySetting("keymap_toggle_chat");
-	key[KEYMAP_ID_TOGGLE_FORCE_FOG_OFF]
+	key[KeyType::DROP]         = getKeySetting("keymap_drop");
+	key[KeyType::INVENTORY]    = getKeySetting("keymap_inventory");
+	key[KeyType::CHAT]         = getKeySetting("keymap_chat");
+	key[KeyType::CMD]          = getKeySetting("keymap_cmd");
+	key[KeyType::CONSOLE]      = getKeySetting("keymap_console");
+	key[KeyType::MINIMAP]      = getKeySetting("keymap_minimap");
+	key[KeyType::FREEMOVE]     = getKeySetting("keymap_freemove");
+	key[KeyType::FASTMOVE]     = getKeySetting("keymap_fastmove");
+	key[KeyType::NOCLIP]       = getKeySetting("keymap_noclip");
+	key[KeyType::CINEMATIC]    = getKeySetting("keymap_cinematic");
+	key[KeyType::SCREENSHOT]   = getKeySetting("keymap_screenshot");
+	key[KeyType::TOGGLE_HUD]   = getKeySetting("keymap_toggle_hud");
+	key[KeyType::TOGGLE_CHAT]  = getKeySetting("keymap_toggle_chat");
+	key[KeyType::TOGGLE_FORCE_FOG_OFF]
 			= getKeySetting("keymap_toggle_force_fog_off");
-	key[KEYMAP_ID_TOGGLE_UPDATE_CAMERA]
+	key[KeyType::TOGGLE_UPDATE_CAMERA]
 			= getKeySetting("keymap_toggle_update_camera");
-	key[KEYMAP_ID_TOGGLE_DEBUG]
+	key[KeyType::TOGGLE_DEBUG]
 			= getKeySetting("keymap_toggle_debug");
-	key[KEYMAP_ID_TOGGLE_PROFILER]
+	key[KeyType::TOGGLE_PROFILER]
 			= getKeySetting("keymap_toggle_profiler");
-	key[KEYMAP_ID_CAMERA_MODE]
+	key[KeyType::CAMERA_MODE]
 			= getKeySetting("keymap_camera_mode");
-	key[KEYMAP_ID_INCREASE_VIEWING_RANGE]
+	key[KeyType::INCREASE_VIEWING_RANGE]
 			= getKeySetting("keymap_increase_viewing_range_min");
-	key[KEYMAP_ID_DECREASE_VIEWING_RANGE]
+	key[KeyType::DECREASE_VIEWING_RANGE]
 			= getKeySetting("keymap_decrease_viewing_range_min");
-	key[KEYMAP_ID_RANGESELECT]
+	key[KeyType::RANGESELECT]
 			= getKeySetting("keymap_rangeselect");
 
-	key[KEYMAP_ID_QUICKTUNE_NEXT] = getKeySetting("keymap_quicktune_next");
-	key[KEYMAP_ID_QUICKTUNE_PREV] = getKeySetting("keymap_quicktune_prev");
-	key[KEYMAP_ID_QUICKTUNE_INC]  = getKeySetting("keymap_quicktune_inc");
-	key[KEYMAP_ID_QUICKTUNE_DEC]  = getKeySetting("keymap_quicktune_dec");
+	key[KeyType::QUICKTUNE_NEXT] = getKeySetting("keymap_quicktune_next");
+	key[KeyType::QUICKTUNE_PREV] = getKeySetting("keymap_quicktune_prev");
+	key[KeyType::QUICKTUNE_INC]  = getKeySetting("keymap_quicktune_inc");
+	key[KeyType::QUICKTUNE_DEC]  = getKeySetting("keymap_quicktune_dec");
 
-	key[KEYMAP_ID_DEBUG_STACKS]   = getKeySetting("keymap_print_debug_stacks");
+	key[KeyType::DEBUG_STACKS]   = getKeySetting("keymap_print_debug_stacks");
 
 	if (handler) {
 		// First clear all keys, then re-add the ones we listen for
 		handler->dontListenForKeys();
-		for (size_t i = 0; i < KEYMAP_INTERNAL_ENUM_COUNT; i++) {
+		for (size_t i = 0; i < KeyType::INTERNAL_ENUM_COUNT; i++) {
 			handler->listenForKey(key[i]);
 		}
 		handler->listenForKey(EscapeKey);
@@ -1575,9 +1538,10 @@ protected:
 			f32 dtime);
 	void updateStats(RunStats *stats, const FpsControl &draw_times, f32 dtime);
 
+	// Input related
 	void processUserInput(VolatileRunFlags *flags, GameRunData *runData,
 			f32 dtime);
-	void processKeyboardInput(VolatileRunFlags *flags,
+	void processKeyInput(VolatileRunFlags *flags,
 			float *statustext_time,
 			float *jump_timer,
 			bool *reset_jump_timer,
@@ -1647,6 +1611,36 @@ protected:
 	static void settingChangedCallback(const std::string &setting_name, void *data);
 	void readSettings();
 
+	bool getLeftClicked()
+	{
+		return input->getLeftClicked();
+	}
+	bool getRightClicked()
+	{
+		return input->getRightClicked();
+	}
+	bool isLeftPressed()
+	{
+		return input->getLeftState();
+	}
+	bool isRightPressed()
+	{
+		return input->getRightState();
+	}
+	bool getLeftReleased()
+	{
+		return input->getLeftReleased();
+	}
+
+	bool isKeyDown(GameKeyType k)
+	{
+		return input->isKeyDown(keycache.key[k]);
+	}
+	bool wasKeyDown(GameKeyType k)
+	{
+		return input->wasKeyDown(keycache.key[k]);
+	}
+
 #ifdef __ANDROID__
 	void handleAndroidChatInput();
 #endif
@@ -2379,7 +2373,7 @@ bool Game::connectToServer(const std::string &playername,
 				break;
 			}
 
-			if (input->wasKeyDown(EscapeKey) || input->wasKeyDown(CancelKey)) {
+			if (wasKeyDown(KeyType::ESC) || input->wasKeyDown(CancelKey)) {
 				*aborted = true;
 				infostream << "Connect aborted [Escape]" << std::endl;
 				break;
@@ -2440,7 +2434,7 @@ bool Game::getServerContent(bool *aborted)
 			return false;
 		}
 
-		if (input->wasKeyDown(EscapeKey) || input->wasKeyDown(CancelKey)) {
+		if (wasKeyDown(KeyType::ESC) || input->wasKeyDown(CancelKey)) {
 			*aborted = true;
 			infostream << "Connect aborted [Escape]" << std::endl;
 			return false;
@@ -2702,7 +2696,7 @@ void Game::processUserInput(VolatileRunFlags *flags,
 	if (m_cache_doubletap_jump && runData->jump_timer <= 0.2)
 		runData->jump_timer += dtime;
 
-	processKeyboardInput(
+	processKeyInput(
 			flags,
 			&runData->statustext_time,
 			&runData->jump_timer,
@@ -2714,7 +2708,7 @@ void Game::processUserInput(VolatileRunFlags *flags,
 }
 
 
-void Game::processKeyboardInput(VolatileRunFlags *flags,
+void Game::processKeyInput(VolatileRunFlags *flags,
 		float *statustext_time,
 		float *jump_timer,
 		bool *reset_jump_timer,
@@ -2724,66 +2718,66 @@ void Game::processKeyboardInput(VolatileRunFlags *flags,
 
 	//TimeTaker tt("process kybd input", NULL, PRECISION_NANO);
 
-	if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DROP])) {
+	if (wasKeyDown(KeyType::DROP)) {
 		dropSelectedItem();
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_AUTORUN])) {
+	} else if (wasKeyDown(KeyType::AUTORUN)) {
 		toggleAutorun(statustext_time);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_INVENTORY])) {
+	} else if (wasKeyDown(KeyType::INVENTORY)) {
 		openInventory();
-	} else if (input->wasKeyDown(EscapeKey) || input->wasKeyDown(CancelKey)) {
+	} else if (wasKeyDown(KeyType::ESC) || input->wasKeyDown(CancelKey)) {
 		if (!gui_chat_console->isOpenInhibited()) {
 			show_pause_menu(&current_formspec, client, gamedef,
 					texture_src, device, simple_singleplayer_mode);
 		}
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_CHAT])) {
+	} else if (wasKeyDown(KeyType::CHAT)) {
 		openConsole(0.2, L"");
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_CMD])) {
+	} else if (wasKeyDown(KeyType::CMD)) {
 		openConsole(0.2, L"/");
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_CONSOLE])) {
+	} else if (wasKeyDown(KeyType::CONSOLE)) {
 		openConsole(1);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_FREEMOVE])) {
+	} else if (wasKeyDown(KeyType::FREEMOVE)) {
 		toggleFreeMove(statustext_time);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_JUMP])) {
+	} else if (wasKeyDown(KeyType::JUMP)) {
 		toggleFreeMoveAlt(statustext_time, jump_timer);
 		*reset_jump_timer = true;
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_FASTMOVE])) {
+	} else if (wasKeyDown(KeyType::FASTMOVE)) {
 		toggleFast(statustext_time);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_NOCLIP])) {
+	} else if (wasKeyDown(KeyType::NOCLIP)) {
 		toggleNoClip(statustext_time);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_CINEMATIC])) {
+	} else if (wasKeyDown(KeyType::CINEMATIC)) {
 		toggleCinematic(statustext_time);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_SCREENSHOT])) {
+	} else if (wasKeyDown(KeyType::SCREENSHOT)) {
 		client->makeScreenshot(device);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_TOGGLE_HUD])) {
+	} else if (wasKeyDown(KeyType::TOGGLE_HUD)) {
 		toggleHud(statustext_time, &flags->show_hud);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_MINIMAP])) {
+	} else if (wasKeyDown(KeyType::MINIMAP)) {
 		toggleMinimap(statustext_time, &flags->show_minimap, flags->show_hud,
-			input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_SNEAK]));
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_TOGGLE_CHAT])) {
+			isKeyDown(KeyType::SNEAK));
+	} else if (wasKeyDown(KeyType::TOGGLE_CHAT)) {
 		toggleChat(statustext_time, &flags->show_chat);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_TOGGLE_FORCE_FOG_OFF])) {
+	} else if (wasKeyDown(KeyType::TOGGLE_FORCE_FOG_OFF)) {
 		toggleFog(statustext_time, &flags->force_fog_off);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_TOGGLE_UPDATE_CAMERA])) {
+	} else if (wasKeyDown(KeyType::TOGGLE_UPDATE_CAMERA)) {
 		toggleUpdateCamera(statustext_time, &flags->disable_camera_update);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_TOGGLE_DEBUG])) {
+	} else if (wasKeyDown(KeyType::TOGGLE_DEBUG)) {
 		toggleDebug(statustext_time, &flags->show_debug, &flags->show_profiler_graph);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_TOGGLE_PROFILER])) {
+	} else if (wasKeyDown(KeyType::TOGGLE_PROFILER)) {
 		toggleProfiler(statustext_time, profiler_current_page, profiler_max_page);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_INCREASE_VIEWING_RANGE])) {
+	} else if (wasKeyDown(KeyType::INCREASE_VIEWING_RANGE)) {
 		increaseViewRange(statustext_time);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DECREASE_VIEWING_RANGE])) {
+	} else if (wasKeyDown(KeyType::DECREASE_VIEWING_RANGE)) {
 		decreaseViewRange(statustext_time);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_RANGESELECT])) {
+	} else if (wasKeyDown(KeyType::RANGESELECT)) {
 		toggleFullViewRange(statustext_time);
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_NEXT])) {
+	} else if (wasKeyDown(KeyType::QUICKTUNE_NEXT)) {
 		quicktune->next();
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_PREV])) {
+	} else if (wasKeyDown(KeyType::QUICKTUNE_PREV)) {
 		quicktune->prev();
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_INC])) {
+	} else if (wasKeyDown(KeyType::QUICKTUNE_INC)) {
 		quicktune->inc();
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_DEC])) {
+	} else if (wasKeyDown(KeyType::QUICKTUNE_DEC)) {
 		quicktune->dec();
-	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DEBUG_STACKS])) {
+	} else if (wasKeyDown(KeyType::DEBUG_STACKS)) {
 		// Print debug stacks
 		dstream << "-----------------------------------------"
 		        << std::endl;
@@ -2793,7 +2787,7 @@ void Game::processKeyboardInput(VolatileRunFlags *flags,
 		debug_stacks_print();
 	}
 
-	if (!input->isKeyDown(getKeySetting("keymap_jump")) && *reset_jump_timer) {
+	if (!isKeyDown(KeyType::JUMP) && *reset_jump_timer) {
 		*reset_jump_timer = false;
 		*jump_timer = 0.0;
 	}
@@ -2807,7 +2801,6 @@ void Game::processKeyboardInput(VolatileRunFlags *flags,
 	}
 }
 
-
 void Game::processItemSelection(u16 *new_playeritem)
 {
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
@@ -3228,13 +3221,13 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
 	//TimeTaker tt("update player control", NULL, PRECISION_NANO);
 
 	PlayerControl control(
-		input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_FORWARD]),
-		input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_BACKWARD]),
-		input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_LEFT]),
-		input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_RIGHT]),
-		input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_JUMP]),
-		input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_SPECIAL1]),
-		input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_SNEAK]),
+		input->isKeyDown(keycache.key[KeyType::FORWARD]),
+		input->isKeyDown(keycache.key[KeyType::BACKWARD]),
+		input->isKeyDown(keycache.key[KeyType::LEFT]),
+		input->isKeyDown(keycache.key[KeyType::RIGHT]),
+		input->isKeyDown(keycache.key[KeyType::JUMP]),
+		input->isKeyDown(keycache.key[KeyType::SPECIAL1]),
+		input->isKeyDown(keycache.key[KeyType::SNEAK]),
 		input->getLeftState(),
 		input->getRightState(),
 		cam.camera_pitch,
@@ -3242,13 +3235,13 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
 	);
 
 	u32 keypress_bits =
-			( (u32)(input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_FORWARD])  & 0x1) << 0) |
-			( (u32)(input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_BACKWARD]) & 0x1) << 1) |
-			( (u32)(input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_LEFT])     & 0x1) << 2) |
-			( (u32)(input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_RIGHT])    & 0x1) << 3) |
-			( (u32)(input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_JUMP])     & 0x1) << 4) |
-			( (u32)(input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_SPECIAL1]) & 0x1) << 5) |
-			( (u32)(input->isKeyDown(keycache.key[KeyCache::KEYMAP_ID_SNEAK])    & 0x1) << 6) |
+			( (u32)(input->isKeyDown(keycache.key[KeyType::FORWARD])  & 0x1) << 0) |
+			( (u32)(input->isKeyDown(keycache.key[KeyType::BACKWARD]) & 0x1) << 1) |
+			( (u32)(input->isKeyDown(keycache.key[KeyType::LEFT])     & 0x1) << 2) |
+			( (u32)(input->isKeyDown(keycache.key[KeyType::RIGHT])    & 0x1) << 3) |
+			( (u32)(input->isKeyDown(keycache.key[KeyType::JUMP])     & 0x1) << 4) |
+			( (u32)(input->isKeyDown(keycache.key[KeyType::SPECIAL1]) & 0x1) << 5) |
+			( (u32)(input->isKeyDown(keycache.key[KeyType::SNEAK])    & 0x1) << 6) |
 			( (u32)(input->getLeftState()                                        & 0x1) << 7) |
 			( (u32)(input->getRightState()                                       & 0x1) << 8
 		);
@@ -3522,7 +3515,7 @@ void Game::updateCamera(VolatileRunFlags *flags, u32 busy_time,
 
 	v3s16 old_camera_offset = camera->getOffset();
 
-	if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_CAMERA_MODE])) {
+	if (wasKeyDown(KeyType::CAMERA_MODE)) {
 		GenericCAO *playercao = player->getCAO();
 
 		// If playercao not loaded, don't change camera
@@ -3665,7 +3658,7 @@ void Game::processPlayerInteraction(GameRunData *runData,
 		- pointing away from node
 	*/
 	if (runData->digging) {
-		if (input->getLeftReleased()) {
+		if (getLeftReleased()) {
 			infostream << "Left button released"
 			           << " (stopped digging)" << std::endl;
 			runData->digging = false;
@@ -3691,7 +3684,7 @@ void Game::processPlayerInteraction(GameRunData *runData,
 		}
 	}
 
-	if (!runData->digging && runData->ldown_for_dig && !input->getLeftState()) {
+	if (!runData->digging && runData->ldown_for_dig && !isLeftPressed()) {
 		runData->ldown_for_dig = false;
 	}
 
@@ -3699,13 +3692,13 @@ void Game::processPlayerInteraction(GameRunData *runData,
 
 	soundmaker->m_player_leftpunch_sound.name = "";
 
-	if (input->getRightState())
+	if (isRightPressed())
 		runData->repeat_rightclick_timer += dtime;
 	else
 		runData->repeat_rightclick_timer = 0;
 
-	if (playeritem_def.usable && input->getLeftState()) {
-		if (input->getLeftClicked())
+	if (playeritem_def.usable && isLeftPressed()) {
+		if (getLeftClicked())
 			client->interact(4, pointed);
 	} else if (pointed.type == POINTEDTHING_NODE) {
 		ToolCapabilities playeritem_toolcap =
@@ -3715,16 +3708,16 @@ void Game::processPlayerInteraction(GameRunData *runData,
 	} else if (pointed.type == POINTEDTHING_OBJECT) {
 		handlePointingAtObject(runData, pointed, playeritem,
 				player_position, show_debug);
-	} else if (input->getLeftState()) {
+	} else if (isLeftPressed()) {
 		// When button is held down in air, show continuous animation
 		runData->left_punch = true;
-	} else if (input->getRightClicked()) {
+	} else if (getRightClicked()) {
 		handlePointingAtNothing(runData, playeritem);
 	}
 
 	runData->pointed_old = pointed;
 
-	if (runData->left_punch || input->getLeftClicked())
+	if (runData->left_punch || getLeftClicked())
 		camera->setDigging(0); // left click animation
 
 	input->resetLeftClicked();
@@ -3769,19 +3762,19 @@ void Game::handlePointingAtNode(GameRunData *runData,
 		}
 	}
 
-	if (runData->nodig_delay_timer <= 0.0 && input->getLeftState()
+	if (runData->nodig_delay_timer <= 0.0 && isLeftPressed()
 			&& client->checkPrivilege("interact")) {
 		handleDigging(runData, pointed, nodepos, playeritem_toolcap, dtime);
 	}
 
-	if ((input->getRightClicked() ||
+	if ((getRightClicked() ||
 			runData->repeat_rightclick_timer >= m_repeat_right_click_time) &&
 			client->checkPrivilege("interact")) {
 		runData->repeat_rightclick_timer = 0;
 		infostream << "Ground right-clicked" << std::endl;
 
 		if (meta && meta->getString("formspec") != "" && !random_input
-				&& !input->isKeyDown(getKeySetting("keymap_sneak"))) {
+				&& !isKeyDown(KeyType::SNEAK)) {
 			infostream << "Launching custom inventory view" << std::endl;
 
 			InventoryLocation inventoryloc;
@@ -3846,7 +3839,7 @@ void Game::handlePointingAtObject(GameRunData *runData,
 			runData->selected_object->debugInfoText()));
 	}
 
-	if (input->getLeftState()) {
+	if (isLeftPressed()) {
 		bool do_punch = false;
 		bool do_punch_damage = false;
 
@@ -3856,7 +3849,7 @@ void Game::handlePointingAtObject(GameRunData *runData,
 			runData->object_hit_delay_timer = object_hit_delay;
 		}
 
-		if (input->getLeftClicked())
+		if (getLeftClicked())
 			do_punch = true;
 
 		if (do_punch) {
@@ -3876,7 +3869,7 @@ void Game::handlePointingAtObject(GameRunData *runData,
 			if (!disable_send)
 				client->interact(0, pointed);
 		}
-	} else if (input->getRightClicked()) {
+	} else if (getRightClicked()) {
 		infostream << "Right-clicked object" << std::endl;
 		client->interact(3, pointed);  // place
 	}
diff --git a/src/game.h b/src/game.h
index 5465ecdc6..d8c2f78fc 100644
--- a/src/game.h
+++ b/src/game.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes_extrabloated.h"
 #include <string>
+#include "client/keys.h"
 #include "keycode.h"
 #include <list>
 

From 2060fd9cbe587d7e8ffe0cecdd67925f13a56c05 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 27 May 2016 08:35:07 +0200
Subject: [PATCH 053/418] Initial Gamepad support

Adds initial ingame gamepad support to minetest.

Full Formspec support is not implemented yet and
can be added by a later change.
---
 builtin/settingtypes.txt           |  11 ++
 src/client/CMakeLists.txt          |   1 +
 src/client/clientlauncher.cpp      |  20 +++-
 src/client/inputhandler.h          |  13 +++
 src/client/joystick_controller.cpp | 179 +++++++++++++++++++++++++++++
 src/client/joystick_controller.h   | 163 ++++++++++++++++++++++++++
 src/client/keys.h                  |   6 +
 src/content_cao.cpp                |   4 +-
 src/defaultsettings.cpp            |   3 +
 src/game.cpp                       | 167 +++++++++++++++++----------
 src/game.h                         |   3 +
 src/guiEngine.cpp                  |   2 +
 src/guiEngine.h                    |   3 +-
 src/guiFormSpecMenu.cpp            |  42 +++++--
 src/guiFormSpecMenu.h              |  13 ++-
 src/localplayer.cpp                |  17 ++-
 src/player.h                       |  10 +-
 17 files changed, 577 insertions(+), 80 deletions(-)
 create mode 100644 src/client/joystick_controller.cpp
 create mode 100644 src/client/joystick_controller.h

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 538a04f33..b53e35a85 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -104,6 +104,17 @@ random_input (Random input) bool false
 #    Continuous forward movement (only used for testing).
 continuous_forward (Continuous forward) bool false
 
+#    Enable Joysticks
+enable_joysticks (Enable Joysticks) bool true
+
+#    The time in seconds it takes between repeated events
+#    when holding down a joystick button combination.
+repeat_joystick_button_time (Joystick button repetition invterval) float 0.17
+
+#    The sensitivity of the joystick axes for moving the
+#    ingame view frustum around.
+joystick_frustum_sensitivity (Joystick frustum sensitivity) float 170
+
 #    Key for moving the player forward.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 keymap_forward (Forward key) key KEY_KEY_W
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index a1ec37fe3..5faa186a7 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(client_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/clientlauncher.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/tile.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/joystick_controller.cpp
 	PARENT_SCOPE
 )
 
diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index 404a16310..ee8662ed6 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiEngine.h"
 #include "player.h"
 #include "fontengine.h"
+#include "joystick_controller.h"
 #include "clientlauncher.h"
 
 /* mainmenumanager.h
@@ -499,7 +500,8 @@ void ClientLauncher::main_menu(MainMenuData *menudata)
 #endif
 
 	/* show main menu */
-	GUIEngine mymenu(device, guiroot, &g_menumgr, smgr, menudata, *kill);
+	GUIEngine mymenu(device, &input->joystick, guiroot,
+		&g_menumgr, smgr, menudata, *kill);
 
 	smgr->clear();	/* leave scene manager in a clean state */
 }
@@ -558,6 +560,22 @@ bool ClientLauncher::create_engine_device()
 	device = createDeviceEx(params);
 
 	if (device) {
+		if (g_settings->getBool("enable_joysticks")) {
+			irr::core::array<irr::SJoystickInfo> infos;
+			std::vector<irr::SJoystickInfo> joystick_infos;
+			// Make sure this is called maximum once per
+			// irrlicht device, otherwise it will give you
+			// multiple events for the same joystick.
+			if (device->activateJoysticks(infos)) {
+				infostream << "Joystick support enabled" << std::endl;
+				joystick_infos.reserve(infos.size());
+				for (u32 i = 0; i < infos.size(); i++) {
+					joystick_infos.push_back(infos[i]);
+				}
+			} else {
+				errorstream << "Could not activate joystick support." << std::endl;
+			}
+		}
 		porting::initIrrlicht(device);
 	}
 
diff --git a/src/client/inputhandler.h b/src/client/inputhandler.h
index 73e507fdc..824b0da2e 100644
--- a/src/client/inputhandler.h
+++ b/src/client/inputhandler.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define INPUT_HANDLER_H
 
 #include "irrlichttypes_extrabloated.h"
+#include "joystick_controller.h"
 
 class MyEventReceiver : public IEventReceiver
 {
@@ -62,6 +63,14 @@ public:
 			return true;
 		}
 #endif
+
+		if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT) {
+			/* TODO add a check like:
+			if (event.JoystickEvent != joystick_we_listen_for)
+				return false;
+			*/
+			return joystick->handleEvent(event.JoystickEvent);
+		}
 		// handle mouse events
 		if (event.EventType == irr::EET_MOUSE_INPUT_EVENT) {
 			if (noMenuActive() == false) {
@@ -172,6 +181,8 @@ public:
 
 	s32 mouse_wheel;
 
+	JoystickController *joystick;
+
 #ifdef HAVE_TOUCHSCREENGUI
 	TouchScreenGUI* m_touchscreengui;
 #endif
@@ -202,6 +213,7 @@ public:
 		m_receiver(receiver),
 		m_mousepos(0,0)
 	{
+		m_receiver->joystick = &joystick;
 	}
 	virtual bool isKeyDown(const KeyPress &keyCode)
 	{
@@ -288,6 +300,7 @@ public:
 
 	void clear()
 	{
+		joystick.clear();
 		m_receiver->clearInput();
 	}
 private:
diff --git a/src/client/joystick_controller.cpp b/src/client/joystick_controller.cpp
new file mode 100644
index 000000000..ef8d18ab0
--- /dev/null
+++ b/src/client/joystick_controller.cpp
@@ -0,0 +1,179 @@
+/*
+Minetest
+Copyright (C) 2016 est31, <MTest31@outlook.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "joystick_controller.h"
+#include "irrlichttypes_extrabloated.h"
+#include "keys.h"
+#include "settings.h"
+#include "gettime.h"
+
+bool JoystickButtonCmb::isTriggered(const irr::SEvent::SJoystickEvent &ev) const
+{
+	u32 buttons = ev.ButtonStates;
+
+	buttons &= filter_mask;
+	return buttons == compare_mask;
+}
+
+bool JoystickAxisCmb::isTriggered(const irr::SEvent::SJoystickEvent &ev) const
+{
+	s16 ax_val = ev.Axis[axis_to_compare];
+
+	return (ax_val * direction < 0) && (thresh * direction > ax_val * direction);
+}
+
+// spares many characters
+#define JLO_B_PB(A, B, C)    jlo.button_keys.push_back(JoystickButtonCmb(A, B, C))
+#define JLO_A_PB(A, B, C, D) jlo.axis_keys.push_back(JoystickAxisCmb(A, B, C, D))
+
+static JoystickLayout create_default_layout()
+{
+	JoystickLayout jlo;
+
+	jlo.axes_dead_border = 1024;
+
+	const JoystickAxisLayout axes[JA_COUNT] = {
+		{0, 1}, // JA_SIDEWARD_MOVE
+		{1, 1}, // JA_FORWARD_MOVE
+		{3, 1}, // JA_FRUSTUM_HORIZONTAL
+		{4, 1}, // JA_FRUSTUM_VERTICAL
+	};
+	memcpy(jlo.axes, axes, sizeof(jlo.axes));
+
+	u32 sb = 1 << 7; // START button mask
+	u32 fb = 1 << 3; // FOUR button mask
+	u32 bm = sb | fb; // Mask for Both Modifiers
+
+	// The back button means "ESC".
+	JLO_B_PB(KeyType::ESC,        1 << 6,      1 << 6);
+
+	// The start button counts as modifier as well as use key.
+	// JLO_B_PB(KeyType::USE,        sb,          sb));
+
+	// Accessible without start modifier button pressed
+	// regardless whether four is pressed or not
+	JLO_B_PB(KeyType::SNEAK,      sb | 1 << 2, 1 << 2);
+
+	// Accessible without four modifier button pressed
+	// regardless whether start is pressed or not
+	JLO_B_PB(KeyType::MOUSE_L,    fb | 1 << 4, 1 << 4);
+	JLO_B_PB(KeyType::MOUSE_R,    fb | 1 << 5, 1 << 5);
+
+	// Accessible without any modifier pressed
+	JLO_B_PB(KeyType::JUMP,       bm | 1 << 0, 1 << 0);
+	JLO_B_PB(KeyType::SPECIAL1,   bm | 1 << 1, 1 << 1);
+
+	// Accessible with start button not pressed, but four pressed
+	// TODO find usage for button 0
+	JLO_B_PB(KeyType::DROP,       bm | 1 << 1, fb | 1 << 1);
+	JLO_B_PB(KeyType::SCROLL_UP,  bm | 1 << 4, fb | 1 << 4);
+	JLO_B_PB(KeyType::SCROLL_DOWN,bm | 1 << 5, fb | 1 << 5);
+
+	// Accessible with start button and four pressed
+	// TODO find usage for buttons 0, 1 and 4, 5
+
+	// Now about the buttons simulated by the axes
+
+	// Movement buttons, important for vessels
+	JLO_A_PB(KeyType::FORWARD,  1,  1, 1024);
+	JLO_A_PB(KeyType::BACKWARD, 1, -1, 1024);
+	JLO_A_PB(KeyType::LEFT,     0,  1, 1024);
+	JLO_A_PB(KeyType::RIGHT,    0, -1, 1024);
+
+	// Scroll buttons
+	JLO_A_PB(KeyType::SCROLL_UP,   2, -1, 1024);
+	JLO_A_PB(KeyType::SCROLL_DOWN, 5, -1, 1024);
+
+	return jlo;
+}
+
+static const JoystickLayout default_layout = create_default_layout();
+
+JoystickController::JoystickController()
+{
+	m_layout = &default_layout;
+	doubling_dtime = g_settings->getFloat("repeat_joystick_button_time");
+
+	for (size_t i = 0; i < KeyType::INTERNAL_ENUM_COUNT; i++) {
+		m_past_pressed_time[i] = 0;
+	}
+	clear();
+}
+
+bool JoystickController::handleEvent(const irr::SEvent::SJoystickEvent &ev)
+{
+	m_internal_time = getTimeMs() / 1000.f;
+
+	std::bitset<KeyType::INTERNAL_ENUM_COUNT> keys_pressed;
+
+	// First generate a list of keys pressed
+
+	for (size_t i = 0; i < m_layout->button_keys.size(); i++) {
+		if (m_layout->button_keys[i].isTriggered(ev)) {
+			keys_pressed.set(m_layout->button_keys[i].key);
+		}
+	}
+
+	for (size_t i = 0; i < m_layout->axis_keys.size(); i++) {
+		if (m_layout->axis_keys[i].isTriggered(ev)) {
+			keys_pressed.set(m_layout->axis_keys[i].key);
+		}
+	}
+
+	// Then update the values
+
+	for (size_t i = 0; i < KeyType::INTERNAL_ENUM_COUNT; i++) {
+		if (keys_pressed[i]) {
+			if (!m_past_pressed_keys[i] &&
+					m_past_pressed_time[i] < m_internal_time - doubling_dtime) {
+				m_past_pressed_keys[i] = true;
+				m_past_pressed_time[i] = m_internal_time;
+			}
+		} else if (m_pressed_keys[i]) {
+			m_past_released_keys[i] = true;
+		}
+
+		m_pressed_keys[i] = keys_pressed[i];
+	}
+
+	for (size_t i = 0; i < JA_COUNT; i++) {
+		const JoystickAxisLayout &ax_la = m_layout->axes[i];
+		m_axes_vals[i] = ax_la.invert * ev.Axis[ax_la.axis_id];
+	}
+
+
+	return true;
+}
+
+void JoystickController::clear()
+{
+	m_pressed_keys.reset();
+	m_past_pressed_keys.reset();
+	m_past_released_keys.reset();
+	memset(m_axes_vals, 0, sizeof(m_axes_vals));
+}
+
+s16 JoystickController::getAxisWithoutDead(JoystickAxis axis)
+{
+	s16 v = m_axes_vals[axis];
+	if (((v > 0) && (v < m_layout->axes_dead_border)) ||
+			((v < 0) && (v > -m_layout->axes_dead_border)))
+		return 0;
+	return v;
+}
diff --git a/src/client/joystick_controller.h b/src/client/joystick_controller.h
new file mode 100644
index 000000000..ed0ee4068
--- /dev/null
+++ b/src/client/joystick_controller.h
@@ -0,0 +1,163 @@
+/*
+Minetest
+Copyright (C) 2016 est31, <MTest31@outlook.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef JOYSTICK_HEADER
+#define JOYSTICK_HEADER
+
+#include "irrlichttypes_extrabloated.h"
+#include "keys.h"
+#include <bitset>
+#include <vector>
+
+enum JoystickAxis {
+	JA_SIDEWARD_MOVE,
+	JA_FORWARD_MOVE,
+
+	JA_FRUSTUM_HORIZONTAL,
+	JA_FRUSTUM_VERTICAL,
+
+	// To know the count of enum values
+	JA_COUNT,
+};
+
+struct JoystickAxisLayout {
+	u16 axis_id;
+	// -1 if to invert, 1 if to keep it.
+	int invert;
+};
+
+
+struct JoystickCombination {
+
+	virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const=0;
+
+	GameKeyType key;
+};
+
+struct JoystickButtonCmb : public JoystickCombination {
+
+	JoystickButtonCmb() {}
+	JoystickButtonCmb(GameKeyType key, u32 filter_mask, u32 compare_mask) :
+		filter_mask(filter_mask),
+		compare_mask(compare_mask)
+	{
+		this->key = key;
+	}
+
+	virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const;
+
+	u32 filter_mask;
+	u32 compare_mask;
+};
+
+struct JoystickAxisCmb : public JoystickCombination {
+
+	JoystickAxisCmb() {}
+	JoystickAxisCmb(GameKeyType key, u16 axis_to_compare, int direction, s16 thresh) :
+		axis_to_compare(axis_to_compare),
+		direction(direction),
+		thresh(thresh)
+	{
+		this->key = key;
+	}
+
+	virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const;
+
+	u16 axis_to_compare;
+
+	// if -1, thresh must be smaller than the axis value in order to trigger
+	// if  1, thresh must be bigger  than the axis value in order to trigger
+	int direction;
+	s16 thresh;
+};
+
+struct JoystickLayout {
+	std::vector<JoystickButtonCmb> button_keys;
+	std::vector<JoystickAxisCmb> axis_keys;
+	JoystickAxisLayout axes[JA_COUNT];
+	s16 axes_dead_border;
+};
+
+class JoystickController {
+
+public:
+	JoystickController();
+	bool handleEvent(const irr::SEvent::SJoystickEvent &ev);
+	void clear();
+
+	bool wasKeyDown(GameKeyType b)
+	{
+		bool r = m_past_pressed_keys[b];
+		m_past_pressed_keys[b] = false;
+		return r;
+	}
+	bool getWasKeyDown(GameKeyType b)
+	{
+		return m_past_pressed_keys[b];
+	}
+	void clearWasKeyDown(GameKeyType b)
+	{
+		m_past_pressed_keys[b] = false;
+	}
+
+	bool wasKeyReleased(GameKeyType b)
+	{
+		bool r = m_past_released_keys[b];
+		m_past_released_keys[b] = false;
+		return r;
+	}
+	bool getWasKeyReleased(GameKeyType b)
+	{
+		return m_past_pressed_keys[b];
+	}
+	void clearWasKeyReleased(GameKeyType b)
+	{
+		m_past_pressed_keys[b] = false;
+	}
+
+	bool isKeyDown(GameKeyType b)
+	{
+		return m_pressed_keys[b];
+	}
+
+	s16 getAxis(JoystickAxis axis)
+	{
+		return m_axes_vals[axis];
+	}
+
+	s16 getAxisWithoutDead(JoystickAxis axis);
+
+	f32 doubling_dtime;
+
+private:
+	const JoystickLayout *m_layout;
+
+	s16 m_axes_vals[JA_COUNT];
+
+	std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_pressed_keys;
+
+	f32 m_internal_time;
+
+	f32 m_past_pressed_time[KeyType::INTERNAL_ENUM_COUNT];
+
+	std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_pressed_keys;
+	std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_released_keys;
+};
+
+#endif
diff --git a/src/client/keys.h b/src/client/keys.h
index 08b1c4123..0921bc166 100644
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -67,6 +67,12 @@ public:
 
 		DEBUG_STACKS,
 
+		// joystick specific keys
+		MOUSE_L,
+		MOUSE_R,
+		SCROLL_UP,
+		SCROLL_DOWN,
+
 		// Fake keycode for array size and internal checks
 		INTERNAL_ENUM_COUNT
 
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 35ab1c508..eeb85c8a6 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1056,7 +1056,9 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
 			PlayerControl controls = player->getPlayerControl();
 
 			bool walking = false;
-			if(controls.up || controls.down || controls.left || controls.right)
+			if (controls.up || controls.down || controls.left || controls.right ||
+					controls.forw_move_joystick_axis != 0.f ||
+					controls.sidew_move_joystick_axis != 0.f)
 				walking = true;
 
 			f32 new_speed = player->local_animation_speed;
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 632ec0df9..43a7a7c00 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -116,6 +116,9 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("free_move", "false");
 	settings->setDefault("noclip", "false");
 	settings->setDefault("continuous_forward", "false");
+	settings->setDefault("enable_joysticks", "true");
+	settings->setDefault("repeat_joystick_button_time", "0.17");
+	settings->setDefault("joystick_frustum_sensitivity", "170");
 	settings->setDefault("cinematic", "false");
 	settings->setDefault("camera_smoothing", "0");
 	settings->setDefault("cinematic_camera_smoothing", "0.7");
diff --git a/src/game.cpp b/src/game.cpp
index ac1c0fe6b..ba77d299a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client.h"
 #include "client/tile.h"     // For TextureSource
 #include "client/keys.h"
+#include "client/joystick_controller.h"
 #include "clientmap.h"
 #include "clouds.h"
 #include "config.h"
@@ -1108,12 +1109,14 @@ bool nodePlacementPrediction(Client &client,
 static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec,
 		InventoryManager *invmgr, IGameDef *gamedef,
 		IWritableTextureSource *tsrc, IrrlichtDevice *device,
+		JoystickController *joystick,
 		IFormSource *fs_src, TextDest *txt_dest, Client *client)
 {
 
 	if (*cur_formspec == 0) {
-		*cur_formspec = new GUIFormSpecMenu(device, guiroot, -1, &g_menumgr,
-						    invmgr, gamedef, tsrc, fs_src, txt_dest, client);
+		*cur_formspec = new GUIFormSpecMenu(device, joystick,
+			guiroot, -1, &g_menumgr, invmgr, gamedef, tsrc,
+			fs_src, txt_dest, client);
 		(*cur_formspec)->doPause = false;
 
 		/*
@@ -1138,7 +1141,8 @@ static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec,
 
 static void show_deathscreen(GUIFormSpecMenu **cur_formspec,
 		InventoryManager *invmgr, IGameDef *gamedef,
-		IWritableTextureSource *tsrc, IrrlichtDevice *device, Client *client)
+		IWritableTextureSource *tsrc, IrrlichtDevice *device,
+		JoystickController *joystick, Client *client)
 {
 	std::string formspec =
 		std::string(FORMSPEC_VERSION_STRING) +
@@ -1154,14 +1158,15 @@ static void show_deathscreen(GUIFormSpecMenu **cur_formspec,
 	FormspecFormSource *fs_src = new FormspecFormSource(formspec);
 	LocalFormspecHandler *txt_dst = new LocalFormspecHandler("MT_DEATH_SCREEN", client);
 
-	create_formspec_menu(cur_formspec, invmgr, gamedef, tsrc, device,  fs_src, txt_dst, NULL);
+	create_formspec_menu(cur_formspec, invmgr, gamedef, tsrc, device,
+		joystick, fs_src, txt_dst, NULL);
 }
 
 /******************************************************************************/
 static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
 		InventoryManager *invmgr, IGameDef *gamedef,
 		IWritableTextureSource *tsrc, IrrlichtDevice *device,
-		bool singleplayermode)
+		JoystickController *joystick, bool singleplayermode)
 {
 #ifdef __ANDROID__
 	std::string control_text = strgettext("Default Controls:\n"
@@ -1226,7 +1231,8 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
 	FormspecFormSource *fs_src = new FormspecFormSource(os.str());
 	LocalFormspecHandler *txt_dst = new LocalFormspecHandler("MT_PAUSE_MENU");
 
-	create_formspec_menu(cur_formspec, invmgr, gamedef, tsrc, device,  fs_src, txt_dst, NULL);
+	create_formspec_menu(cur_formspec, invmgr, gamedef, tsrc, device,
+		joystick, fs_src, txt_dst, NULL);
 	std::string con("btn_continue");
 	(*cur_formspec)->setFocus(con);
 	(*cur_formspec)->doPause = true;
@@ -1574,9 +1580,10 @@ protected:
 	void decreaseViewRange(float *statustext_time);
 	void toggleFullViewRange(float *statustext_time);
 
-	void updateCameraDirection(CameraOrientation *cam, VolatileRunFlags *flags);
+	void updateCameraDirection(CameraOrientation *cam, VolatileRunFlags *flags,
+		float dtime);
 	void updateCameraOrientation(CameraOrientation *cam,
-			const VolatileRunFlags &flags);
+		const VolatileRunFlags &flags, float dtime);
 	void updatePlayerControl(const CameraOrientation &cam);
 	void step(f32 *dtime);
 	void processClientEvents(CameraOrientation *cam, float *damage_flash);
@@ -1611,34 +1618,39 @@ protected:
 	static void settingChangedCallback(const std::string &setting_name, void *data);
 	void readSettings();
 
-	bool getLeftClicked()
+	inline bool getLeftClicked()
 	{
-		return input->getLeftClicked();
+		return input->getLeftClicked() ||
+			input->joystick.getWasKeyDown(KeyType::MOUSE_L);
 	}
-	bool getRightClicked()
+	inline bool getRightClicked()
 	{
-		return input->getRightClicked();
+		return input->getRightClicked() ||
+			input->joystick.getWasKeyDown(KeyType::MOUSE_R);
 	}
-	bool isLeftPressed()
+	inline bool isLeftPressed()
 	{
-		return input->getLeftState();
+		return input->getLeftState() ||
+			input->joystick.isKeyDown(KeyType::MOUSE_L);
 	}
-	bool isRightPressed()
+	inline bool isRightPressed()
 	{
-		return input->getRightState();
+		return input->getRightState() ||
+			input->joystick.isKeyDown(KeyType::MOUSE_R);
 	}
-	bool getLeftReleased()
+	inline bool getLeftReleased()
 	{
-		return input->getLeftReleased();
+		return input->getLeftReleased() ||
+			input->joystick.wasKeyReleased(KeyType::MOUSE_L);
 	}
 
-	bool isKeyDown(GameKeyType k)
+	inline bool isKeyDown(GameKeyType k)
 	{
-		return input->isKeyDown(keycache.key[k]);
+		return input->isKeyDown(keycache.key[k]) || input->joystick.isKeyDown(k);
 	}
-	bool wasKeyDown(GameKeyType k)
+	inline bool wasKeyDown(GameKeyType k)
 	{
-		return input->wasKeyDown(keycache.key[k]);
+		return input->wasKeyDown(keycache.key[k]) || input->joystick.wasKeyDown(k);
 	}
 
 #ifdef __ANDROID__
@@ -1724,9 +1736,11 @@ private:
 	 */
 	bool m_cache_doubletap_jump;
 	bool m_cache_enable_clouds;
+	bool m_cache_enable_joysticks;
 	bool m_cache_enable_particles;
 	bool m_cache_enable_fog;
 	f32  m_cache_mouse_sensitivity;
+	f32  m_cache_joystick_frustum_sensitivity;
 	f32  m_repeat_right_click_time;
 
 #ifdef __ANDROID__
@@ -1762,12 +1776,16 @@ Game::Game() :
 		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("enable_clouds",
 		&settingChangedCallback, this);
+	g_settings->registerChangedCallback("doubletap_joysticks",
+		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("enable_particles",
 		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("enable_fog",
 		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("mouse_sensitivity",
 		&settingChangedCallback, this);
+	g_settings->registerChangedCallback("joystick_frustum_sensitivity",
+		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("repeat_rightclick_time",
 		&settingChangedCallback, this);
 
@@ -1930,7 +1948,7 @@ void Game::run()
 		updateProfilers(runData, stats, draw_times, dtime);
 		processUserInput(&flags, &runData, dtime);
 		// Update camera before player movement to avoid camera lag of one frame
-		updateCameraDirection(&cam_view_target, &flags);
+		updateCameraDirection(&cam_view_target, &flags, dtime);
 		float cam_smoothing = 0;
 		if (g_settings->getBool("cinematic"))
 			cam_smoothing = 1 - g_settings->getFloat("cinematic_camera_smoothing");
@@ -2727,7 +2745,8 @@ void Game::processKeyInput(VolatileRunFlags *flags,
 	} else if (wasKeyDown(KeyType::ESC) || input->wasKeyDown(CancelKey)) {
 		if (!gui_chat_console->isOpenInhibited()) {
 			show_pause_menu(&current_formspec, client, gamedef,
-					texture_src, device, simple_singleplayer_mode);
+				texture_src, device, &input->joystick,
+				simple_singleplayer_mode);
 		}
 	} else if (wasKeyDown(KeyType::CHAT)) {
 		openConsole(0.2, L"");
@@ -2813,12 +2832,21 @@ void Game::processItemSelection(u16 *new_playeritem)
 	u16 max_item = MYMIN(PLAYER_INVENTORY_SIZE - 1,
 		                 player->hud_hotbar_itemcount - 1);
 
-	if (wheel < 0)
-		*new_playeritem = *new_playeritem < max_item ? *new_playeritem + 1 : 0;
-	else if (wheel > 0)
-		*new_playeritem = *new_playeritem > 0 ? *new_playeritem - 1 : max_item;
-	// else wheel == 0
+	s32 dir = wheel;
 
+	if (input->joystick.wasKeyDown(KeyType::SCROLL_DOWN)) {
+		dir = -1;
+	}
+
+	if (input->joystick.wasKeyDown(KeyType::SCROLL_UP)) {
+		dir = 1;
+	}
+
+	if (dir < 0)
+		*new_playeritem = *new_playeritem < max_item ? *new_playeritem + 1 : 0;
+	else if (dir > 0)
+		*new_playeritem = *new_playeritem > 0 ? *new_playeritem - 1 : max_item;
+	// else dir == 0
 
 	/* Item selection using keyboard
 	 */
@@ -2868,7 +2896,7 @@ void Game::openInventory()
 	TextDest *txt_dst = new TextDestPlayerInventory(client);
 
 	create_formspec_menu(&current_formspec, client, gamedef, texture_src,
-			device, fs_src, txt_dst, client);
+			device, &input->joystick, fs_src, txt_dst, client);
 
 	InventoryLocation inventoryloc;
 	inventoryloc.setCurrentPlayer();
@@ -3154,7 +3182,7 @@ void Game::toggleFullViewRange(float *statustext_time)
 
 
 void Game::updateCameraDirection(CameraOrientation *cam,
-		VolatileRunFlags *flags)
+		VolatileRunFlags *flags, float dtime)
 {
 	if ((device->isWindowActive() && noMenuActive()) || random_input) {
 
@@ -3169,7 +3197,7 @@ void Game::updateCameraDirection(CameraOrientation *cam,
 		if (flags->first_loop_after_window_activation)
 			flags->first_loop_after_window_activation = false;
 		else
-			updateCameraOrientation(cam, *flags);
+			updateCameraOrientation(cam, *flags, dtime);
 
 		input->setMousePos((driver->getScreenSize().Width / 2),
 				(driver->getScreenSize().Height / 2));
@@ -3187,9 +3215,8 @@ void Game::updateCameraDirection(CameraOrientation *cam,
 	}
 }
 
-
 void Game::updateCameraOrientation(CameraOrientation *cam,
-		const VolatileRunFlags &flags)
+		const VolatileRunFlags &flags, float dtime)
 {
 #ifdef HAVE_TOUCHSCREENGUI
 	if (g_touchscreengui) {
@@ -3197,6 +3224,7 @@ void Game::updateCameraOrientation(CameraOrientation *cam,
 		cam->camera_pitch = g_touchscreengui->getPitch();
 	} else {
 #endif
+
 		s32 dx = input->getMousePos().X - (driver->getScreenSize().Width / 2);
 		s32 dy = input->getMousePos().Y - (driver->getScreenSize().Height / 2);
 
@@ -3212,6 +3240,14 @@ void Game::updateCameraOrientation(CameraOrientation *cam,
 	}
 #endif
 
+	if (m_cache_enable_joysticks) {
+		f32 c = m_cache_joystick_frustum_sensitivity * (1.f / 32767.f) * dtime;
+		cam->camera_yaw -= input->joystick.getAxisWithoutDead(JA_FRUSTUM_HORIZONTAL) *
+			c;
+		cam->camera_pitch += input->joystick.getAxisWithoutDead(JA_FRUSTUM_VERTICAL) *
+			c;
+	}
+
 	cam->camera_pitch = rangelim(cam->camera_pitch, -89.5, 89.5);
 }
 
@@ -3220,30 +3256,36 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
 {
 	//TimeTaker tt("update player control", NULL, PRECISION_NANO);
 
+	// DO NOT use the isKeyDown method for the forward, backward, left, right
+	// buttons, as the code that uses the controls needs to be able to
+	// distinguish between the two in order to know when to use joysticks.
+
 	PlayerControl control(
 		input->isKeyDown(keycache.key[KeyType::FORWARD]),
 		input->isKeyDown(keycache.key[KeyType::BACKWARD]),
 		input->isKeyDown(keycache.key[KeyType::LEFT]),
 		input->isKeyDown(keycache.key[KeyType::RIGHT]),
-		input->isKeyDown(keycache.key[KeyType::JUMP]),
-		input->isKeyDown(keycache.key[KeyType::SPECIAL1]),
-		input->isKeyDown(keycache.key[KeyType::SNEAK]),
-		input->getLeftState(),
-		input->getRightState(),
+		isKeyDown(KeyType::JUMP),
+		isKeyDown(KeyType::SPECIAL1),
+		isKeyDown(KeyType::SNEAK),
+		isLeftPressed(),
+		isRightPressed(),
 		cam.camera_pitch,
-		cam.camera_yaw
+		cam.camera_yaw,
+		input->joystick.getAxisWithoutDead(JA_SIDEWARD_MOVE),
+		input->joystick.getAxisWithoutDead(JA_FORWARD_MOVE)
 	);
 
 	u32 keypress_bits =
-			( (u32)(input->isKeyDown(keycache.key[KeyType::FORWARD])  & 0x1) << 0) |
-			( (u32)(input->isKeyDown(keycache.key[KeyType::BACKWARD]) & 0x1) << 1) |
-			( (u32)(input->isKeyDown(keycache.key[KeyType::LEFT])     & 0x1) << 2) |
-			( (u32)(input->isKeyDown(keycache.key[KeyType::RIGHT])    & 0x1) << 3) |
-			( (u32)(input->isKeyDown(keycache.key[KeyType::JUMP])     & 0x1) << 4) |
-			( (u32)(input->isKeyDown(keycache.key[KeyType::SPECIAL1]) & 0x1) << 5) |
-			( (u32)(input->isKeyDown(keycache.key[KeyType::SNEAK])    & 0x1) << 6) |
-			( (u32)(input->getLeftState()                                        & 0x1) << 7) |
-			( (u32)(input->getRightState()                                       & 0x1) << 8
+			( (u32)(isKeyDown(KeyType::FORWARD)                       & 0x1) << 0) |
+			( (u32)(isKeyDown(KeyType::BACKWARD)                      & 0x1) << 1) |
+			( (u32)(isKeyDown(KeyType::LEFT)                          & 0x1) << 2) |
+			( (u32)(isKeyDown(KeyType::RIGHT)                         & 0x1) << 3) |
+			( (u32)(isKeyDown(KeyType::JUMP)                          & 0x1) << 4) |
+			( (u32)(isKeyDown(KeyType::SPECIAL1)                      & 0x1) << 5) |
+			( (u32)(isKeyDown(KeyType::SNEAK)                         & 0x1) << 6) |
+			( (u32)(isLeftPressed()                                   & 0x1) << 7) |
+			( (u32)(isRightPressed()                                  & 0x1) << 8
 		);
 
 #ifdef ANDROID
@@ -3312,7 +3354,7 @@ void Game::processClientEvents(CameraOrientation *cam, float *damage_flash)
 			cam->camera_pitch = event.player_force_move.pitch;
 		} else if (event.type == CE_DEATHSCREEN) {
 			show_deathscreen(&current_formspec, client, gamedef, texture_src,
-					 device, client);
+				device, &input->joystick, client);
 
 			chat_backend->addMessage(L"", L"You died.");
 
@@ -3328,7 +3370,8 @@ void Game::processClientEvents(CameraOrientation *cam, float *damage_flash)
 				new TextDestPlayerInventory(client, *(event.show_formspec.formname));
 
 			create_formspec_menu(&current_formspec, client, gamedef,
-					     texture_src, device, fs_src, txt_dst, client);
+				texture_src, device, &input->joystick,
+				fs_src, txt_dst, client);
 
 			delete(event.show_formspec.formspec);
 			delete(event.show_formspec.formname);
@@ -3723,8 +3766,14 @@ void Game::processPlayerInteraction(GameRunData *runData,
 	input->resetLeftClicked();
 	input->resetRightClicked();
 
+	input->joystick.clearWasKeyDown(KeyType::MOUSE_L);
+	input->joystick.clearWasKeyDown(KeyType::MOUSE_R);
+
 	input->resetLeftReleased();
 	input->resetRightReleased();
+
+	input->joystick.clearWasKeyReleased(KeyType::MOUSE_L);
+	input->joystick.clearWasKeyReleased(KeyType::MOUSE_R);
 }
 
 
@@ -3785,7 +3834,7 @@ void Game::handlePointingAtNode(GameRunData *runData,
 			TextDest *txt_dst = new TextDestNodeMetadata(nodepos, client);
 
 			create_formspec_menu(&current_formspec, client, gamedef,
-					     texture_src, device, fs_src, txt_dst, client);
+				texture_src, device, &input->joystick, fs_src, txt_dst, client);
 
 			current_formspec->setFormSpec(meta->getString("formspec"), inventoryloc);
 		} else {
@@ -4468,12 +4517,14 @@ void Game::settingChangedCallback(const std::string &setting_name, void *data)
 
 void Game::readSettings()
 {
-	m_cache_doubletap_jump            = g_settings->getBool("doubletap_jump");
-	m_cache_enable_clouds             = g_settings->getBool("enable_clouds");
-	m_cache_enable_particles          = g_settings->getBool("enable_particles");
-	m_cache_enable_fog                = g_settings->getBool("enable_fog");
-	m_cache_mouse_sensitivity         = g_settings->getFloat("mouse_sensitivity");
-	m_repeat_right_click_time         = g_settings->getFloat("repeat_rightclick_time");
+	m_cache_doubletap_jump               = g_settings->getBool("doubletap_jump");
+	m_cache_enable_clouds                = g_settings->getBool("enable_clouds");
+	m_cache_enable_joysticks             = g_settings->getBool("enable_joysticks");
+	m_cache_enable_particles             = g_settings->getBool("enable_particles");
+	m_cache_enable_fog                   = g_settings->getBool("enable_fog");
+	m_cache_mouse_sensitivity            = g_settings->getFloat("mouse_sensitivity");
+	m_cache_joystick_frustum_sensitivity = g_settings->getFloat("joystick_frustum_sensitivity");
+	m_repeat_right_click_time            = g_settings->getFloat("repeat_rightclick_time");
 
 	m_cache_mouse_sensitivity = rangelim(m_cache_mouse_sensitivity, 0.001, 100.0);
 }
diff --git a/src/game.h b/src/game.h
index d8c2f78fc..df32e3397 100644
--- a/src/game.h
+++ b/src/game.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include <string>
 #include "client/keys.h"
+#include "client/joystick_controller.h"
 #include "keycode.h"
 #include <list>
 
@@ -135,6 +136,8 @@ public:
 	virtual void step(float dtime) {}
 
 	virtual void clear() {}
+
+	JoystickController joystick;
 };
 
 class ChatBackend;  /* to avoid having to include chat.h */
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index 96de7a4f7..b9d796ccb 100644
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -131,6 +131,7 @@ void MenuMusicFetcher::fetchSounds(const std::string &name,
 /** GUIEngine                                                                 */
 /******************************************************************************/
 GUIEngine::GUIEngine(	irr::IrrlichtDevice* dev,
+						JoystickController *joystick,
 						gui::IGUIElement* parent,
 						IMenuManager *menumgr,
 						scene::ISceneManager* smgr,
@@ -189,6 +190,7 @@ GUIEngine::GUIEngine(	irr::IrrlichtDevice* dev,
 
 	/* Create menu */
 	m_menu = new GUIFormSpecMenu(m_device,
+			joystick,
 			m_parent,
 			-1,
 			m_menumanager,
diff --git a/src/guiEngine.h b/src/guiEngine.h
index fa98a21e4..a59436953 100644
--- a/src/guiEngine.h
+++ b/src/guiEngine.h
@@ -149,7 +149,8 @@ public:
 	 * @param smgr scene manager to add scene elements to
 	 * @param data struct to transfer data to main game handling
 	 */
-	GUIEngine(	irr::IrrlichtDevice* dev,
+	GUIEngine(irr::IrrlichtDevice* dev,
+			JoystickController *joystick,
 			gui::IGUIElement* parent,
 			IMenuManager *menumgr,
 			scene::ISceneManager* smgr,
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index cf01dc38c..a9cbb6254 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -79,6 +79,7 @@ static unsigned int font_line_height(gui::IGUIFont *font)
 }
 
 GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
+		JoystickController *joystick,
 		gui::IGUIElement* parent, s32 id, IMenuManager *menumgr,
 		InventoryManager *invmgr, IGameDef *gamedef,
 		ISimpleTextureSource *tsrc, IFormSource* fsrc, TextDest* tdst,
@@ -102,6 +103,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
 	m_text_dst(tdst),
 	m_formspec_version(0),
 	m_focused_element(""),
+	m_joystick(joystick),
 	m_font(NULL),
 	m_remap_dbl_click(remap_dbl_click)
 #ifdef __ANDROID__
@@ -2459,7 +2461,7 @@ void GUIFormSpecMenu::drawMenu()
 		Draw static text elements
 	*/
 	for (u32 i = 0; i < m_static_texts.size(); i++) {
-		const StaticTextSpec &spec = m_static_texts[i];	
+		const StaticTextSpec &spec = m_static_texts[i];
 		core::rect<s32> rect = spec.rect;
 		if (spec.parent_button && spec.parent_button->isPressed()) {
 #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
@@ -3024,6 +3026,25 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
 	}
 	#endif
 
+	if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT) {
+		/* TODO add a check like:
+		if (event.JoystickEvent != joystick_we_listen_for)
+			return false;
+		*/
+		bool handled = m_joystick->handleEvent(event.JoystickEvent);
+		if (handled) {
+			if (m_joystick->wasKeyDown(KeyType::ESC)) {
+				tryClose();
+			} else if (m_joystick->wasKeyDown(KeyType::JUMP)) {
+				if (m_allowclose) {
+					acceptInput(quit_mode_accept);
+					quitMenu();
+				}
+			}
+		}
+		return handled;
+	}
+
 	return false;
 }
 
@@ -3085,19 +3106,24 @@ bool GUIFormSpecMenu::DoubleClickDetection(const SEvent event)
 	return false;
 }
 
+void GUIFormSpecMenu::tryClose()
+{
+	if (m_allowclose) {
+		doPause = false;
+		acceptInput(quit_mode_cancel);
+		quitMenu();
+	} else {
+		m_text_dst->gotText(L"MenuQuit");
+	}
+}
+
 bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 {
 	if (event.EventType==EET_KEY_INPUT_EVENT) {
 		KeyPress kp(event.KeyInput);
 		if (event.KeyInput.PressedDown && ( (kp == EscapeKey) ||
 				(kp == getKeySetting("keymap_inventory")) || (kp == CancelKey))) {
-			if (m_allowclose) {
-				doPause = false;
-				acceptInput(quit_mode_cancel);
-				quitMenu();
-			} else {
-				m_text_dst->gotText(L"MenuQuit");
-			}
+			tryClose();
 			return true;
 		} else if (m_client != NULL && event.KeyInput.PressedDown &&
 				(kp == getKeySetting("keymap_screenshot"))) {
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 4122b1f56..2fb55070d 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "modalMenu.h"
 #include "guiTable.h"
 #include "network/networkprotocol.h"
+#include "client/joystick_controller.h"
 #include "util/string.h"
 #include "util/enriched_string.h"
 
@@ -278,6 +279,7 @@ class GUIFormSpecMenu : public GUIModalMenu
 
 public:
 	GUIFormSpecMenu(irr::IrrlichtDevice* dev,
+			JoystickController *joystick,
 			gui::IGUIElement* parent, s32 id,
 			IMenuManager *menumgr,
 			InventoryManager *invmgr,
@@ -433,10 +435,11 @@ protected:
 	video::SColor m_default_tooltip_color;
 
 private:
-	IFormSource      *m_form_src;
-	TextDest         *m_text_dst;
-	unsigned int      m_formspec_version;
-	std::string       m_focused_element;
+	IFormSource        *m_form_src;
+	TextDest           *m_text_dst;
+	unsigned int        m_formspec_version;
+	std::string         m_focused_element;
+	JoystickController *m_joystick;
 
 	typedef struct {
 		bool explicit_size;
@@ -494,6 +497,8 @@ private:
 	bool parseSizeDirect(parserData* data, std::string element);
 	void parseScrollBar(parserData* data, std::string element);
 
+	void tryClose();
+
 	/**
 	 * check if event is part of a double click
 	 * @param event event to evaluate
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 507f31980..732ca8acf 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -528,18 +528,23 @@ void LocalPlayer::applyControl(float dtime)
 			speedH += move_direction;
 		}
 	}
-	if(control.down)
-	{
+	if (control.down) {
 		speedH -= move_direction;
 	}
-	if(control.left)
-	{
+	if (!control.up && !control.down) {
+		speedH -= move_direction *
+			(control.forw_move_joystick_axis / 32767.f);
+	}
+	if (control.left) {
 		speedH += move_direction.crossProduct(v3f(0,1,0));
 	}
-	if(control.right)
-	{
+	if (control.right) {
 		speedH += move_direction.crossProduct(v3f(0,-1,0));
 	}
+	if (!control.left && !control.right) {
+		speedH -= move_direction.crossProduct(v3f(0,1,0)) *
+			(control.sidew_move_joystick_axis / 32767.f);
+	}
 	if(control.jump)
 	{
 		if (free_move) {
diff --git a/src/player.h b/src/player.h
index b317cda4f..6687ca86e 100644
--- a/src/player.h
+++ b/src/player.h
@@ -46,6 +46,8 @@ struct PlayerControl
 		RMB = false;
 		pitch = 0;
 		yaw = 0;
+		sidew_move_joystick_axis = .0f;
+		forw_move_joystick_axis = .0f;
 	}
 	PlayerControl(
 		bool a_up,
@@ -58,7 +60,9 @@ struct PlayerControl
 		bool a_LMB,
 		bool a_RMB,
 		float a_pitch,
-		float a_yaw
+		float a_yaw,
+		float a_sidew_move_joystick_axis,
+		float a_forw_move_joystick_axis
 	)
 	{
 		up = a_up;
@@ -72,6 +76,8 @@ struct PlayerControl
 		RMB = a_RMB;
 		pitch = a_pitch;
 		yaw = a_yaw;
+		sidew_move_joystick_axis = a_sidew_move_joystick_axis;
+		forw_move_joystick_axis = a_forw_move_joystick_axis;
 	}
 	bool up;
 	bool down;
@@ -84,6 +90,8 @@ struct PlayerControl
 	bool RMB;
 	float pitch;
 	float yaw;
+	float sidew_move_joystick_axis;
+	float forw_move_joystick_axis;
 };
 
 class Map;

From dfbdb5bcd7bc48efb21d585d5c22454a9d5f0f1e Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sat, 4 Jun 2016 01:35:37 -0400
Subject: [PATCH 054/418] Change internal type for seeds to s32

This fixes value truncation (and therefore incompatibility) on platforms
with an LP32 data model, such as VAX or MS-DOS.
---
 src/cavegen.cpp                |  4 ++--
 src/cavegen.h                  |  6 +++---
 src/dungeongen.h               |  2 +-
 src/mapgen.cpp                 | 20 +++++++++++++++++---
 src/mapgen.h                   |  6 +++---
 src/mg_biome.h                 |  2 +-
 src/noise.cpp                  | 26 +++++++++++++-------------
 src/noise.h                    | 32 ++++++++++++++++----------------
 src/script/lua_api/l_env.cpp   |  2 +-
 src/script/lua_api/l_noise.cpp |  2 +-
 src/script/lua_api/l_noise.h   |  4 ++--
 src/treegen.cpp                |  8 ++++----
 src/treegen.h                  |  8 ++++----
 13 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index 1c25ce711..dc7355fe0 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -35,7 +35,7 @@ static NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0
 
 CavesNoiseIntersection::CavesNoiseIntersection(
 	INodeDefManager *nodedef, BiomeManager *biomemgr, v3s16 chunksize,
-	NoiseParams *np_cave1, NoiseParams *np_cave2, int seed, float cave_width)
+	NoiseParams *np_cave1, NoiseParams *np_cave2, s32 seed, float cave_width)
 {
 	assert(nodedef);
 	assert(biomemgr);
@@ -130,7 +130,7 @@ void CavesNoiseIntersection::generateCaves(MMVManip *vm,
 CavesRandomWalk::CavesRandomWalk(
 	INodeDefManager *ndef,
 	GenerateNotifier *gennotify,
-	int seed,
+	s32 seed,
 	int water_level,
 	content_t water_source,
 	content_t lava_source)
diff --git a/src/cavegen.h b/src/cavegen.h
index da0894635..2bf503d47 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -41,7 +41,7 @@ class CavesNoiseIntersection {
 public:
 	CavesNoiseIntersection(INodeDefManager *nodedef, BiomeManager *biomemgr,
 		v3s16 chunksize, NoiseParams *np_cave1, NoiseParams *np_cave2,
-		int seed, float cave_width);
+		s32 seed, float cave_width);
 	~CavesNoiseIntersection();
 
 	void generateCaves(MMVManip *vm, v3s16 nmin, v3s16 nmax, u8 *biomemap);
@@ -83,7 +83,7 @@ public:
 	s16 *heightmap;
 
 	// configurable parameters
-	int seed;
+	s32 seed;
 	int water_level;
 	int lava_depth;
 	NoiseParams *np_caveliquids;
@@ -122,7 +122,7 @@ public:
 	// If gennotify is NULL, generation events are not logged.
 	CavesRandomWalk(INodeDefManager *ndef,
 		GenerateNotifier *gennotify = NULL,
-		int seed = 0,
+		s32 seed = 0,
 		int water_level = 1,
 		content_t water_source = CONTENT_IGNORE,
 		content_t lava_source = CONTENT_IGNORE);
diff --git a/src/dungeongen.h b/src/dungeongen.h
index f0a5e5ba8..898627483 100644
--- a/src/dungeongen.h
+++ b/src/dungeongen.h
@@ -39,7 +39,7 @@ int dir_to_facedir(v3s16 d);
 
 
 struct DungeonParams {
-	int seed;
+	s32 seed;
 
 	content_t c_water;
 	content_t c_river_water;
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 041356e3d..32f7e29eb 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -89,11 +89,25 @@ Mapgen::Mapgen(int mapgenid, MapgenParams *params, EmergeManager *emerge) :
 {
 	generating  = false;
 	id          = mapgenid;
-	seed        = (int)params->seed;
 	water_level = params->water_level;
 	flags       = params->flags;
 	csize       = v3s16(1, 1, 1) * (params->chunksize * MAP_BLOCKSIZE);
 
+	/*
+		We are losing half our entropy by doing this, but it is necessary to
+		preserve reverse compatibility.  If the top half of our current 64 bit
+		seeds ever starts getting used, existing worlds will break due to a
+		different hash outcome and no way to differentiate between versions.
+
+		A solution could be to add a new bit to designate that the top half of
+		the seed value should be used, essentially a 1-bit version code, but
+		this would require increasing the total size of a seed to 9 bytes (yuck)
+
+		It's probably okay if this never gets fixed.  4.2 billion possibilities
+		ought to be enough for anyone.
+	*/
+	seed = (s32)params->seed;
+
 	vm        = NULL;
 	ndef      = emerge->ndef;
 	biomegen  = NULL;
@@ -107,7 +121,7 @@ Mapgen::~Mapgen()
 }
 
 
-u32 Mapgen::getBlockSeed(v3s16 p, int seed)
+u32 Mapgen::getBlockSeed(v3s16 p, s32 seed)
 {
 	return (u32)seed   +
 		p.Z * 38134234 +
@@ -116,7 +130,7 @@ u32 Mapgen::getBlockSeed(v3s16 p, int seed)
 }
 
 
-u32 Mapgen::getBlockSeed2(v3s16 p, int seed)
+u32 Mapgen::getBlockSeed2(v3s16 p, s32 seed)
 {
 	u32 n = 1619 * p.X + 31337 * p.Y + 52591 * p.Z + 1013 * seed;
 	n = (n >> 13) ^ n;
diff --git a/src/mapgen.h b/src/mapgen.h
index 10595fafc..0342fd46e 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -150,7 +150,7 @@ struct MapgenParams {
 */
 class Mapgen {
 public:
-	int seed;
+	s32 seed;
 	int water_level;
 	u32 flags;
 	bool generating;
@@ -171,8 +171,8 @@ public:
 	Mapgen(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	virtual ~Mapgen();
 
-	static u32 getBlockSeed(v3s16 p, int seed);
-	static u32 getBlockSeed2(v3s16 p, int seed);
+	static u32 getBlockSeed(v3s16 p, s32 seed);
+	static u32 getBlockSeed2(v3s16 p, s32 seed);
 	s16 findGroundLevelFull(v2s16 p2d);
 	s16 findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax);
 	s16 findLiquidSurface(v2s16 p2d, s16 ymin, s16 ymax);
diff --git a/src/mg_biome.h b/src/mg_biome.h
index e78e90e5f..389b7664f 100644
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -80,7 +80,7 @@ struct BiomeParams {
 	virtual void writeParams(Settings *settings) const = 0;
 	virtual ~BiomeParams() {}
 
-	int seed;
+	s32 seed;
 };
 
 class BiomeGen {
diff --git a/src/noise.cpp b/src/noise.cpp
index 2ddc3926f..c57c98ccb 100644
--- a/src/noise.cpp
+++ b/src/noise.cpp
@@ -156,7 +156,7 @@ s32 PcgRandom::randNormalDist(s32 min, s32 max, int num_trials)
 
 ///////////////////////////////////////////////////////////////////////////////
 
-float noise2d(int x, int y, int seed)
+float noise2d(int x, int y, s32 seed)
 {
 	unsigned int n = (NOISE_MAGIC_X * x + NOISE_MAGIC_Y * y
 			+ NOISE_MAGIC_SEED * seed) & 0x7fffffff;
@@ -166,7 +166,7 @@ float noise2d(int x, int y, int seed)
 }
 
 
-float noise3d(int x, int y, int z, int seed)
+float noise3d(int x, int y, int z, s32 seed)
 {
 	unsigned int n = (NOISE_MAGIC_X * x + NOISE_MAGIC_Y * y + NOISE_MAGIC_Z * z
 			+ NOISE_MAGIC_SEED * seed) & 0x7fffffff;
@@ -235,7 +235,7 @@ float triLinearInterpolationNoEase(
 	return linearInterpolation(u, v, z);
 }
 
-float noise2d_gradient(float x, float y, int seed, bool eased)
+float noise2d_gradient(float x, float y, s32 seed, bool eased)
 {
 	// Calculate the integer coordinates
 	int x0 = myfloor(x);
@@ -256,7 +256,7 @@ float noise2d_gradient(float x, float y, int seed, bool eased)
 }
 
 
-float noise3d_gradient(float x, float y, float z, int seed, bool eased)
+float noise3d_gradient(float x, float y, float z, s32 seed, bool eased)
 {
 	// Calculate the integer coordinates
 	int x0 = myfloor(x);
@@ -290,7 +290,7 @@ float noise3d_gradient(float x, float y, float z, int seed, bool eased)
 }
 
 
-float noise2d_perlin(float x, float y, int seed,
+float noise2d_perlin(float x, float y, s32 seed,
 	int octaves, float persistence, bool eased)
 {
 	float a = 0;
@@ -306,7 +306,7 @@ float noise2d_perlin(float x, float y, int seed,
 }
 
 
-float noise2d_perlin_abs(float x, float y, int seed,
+float noise2d_perlin_abs(float x, float y, s32 seed,
 	int octaves, float persistence, bool eased)
 {
 	float a = 0;
@@ -321,7 +321,7 @@ float noise2d_perlin_abs(float x, float y, int seed,
 }
 
 
-float noise3d_perlin(float x, float y, float z, int seed,
+float noise3d_perlin(float x, float y, float z, s32 seed,
 	int octaves, float persistence, bool eased)
 {
 	float a = 0;
@@ -336,7 +336,7 @@ float noise3d_perlin(float x, float y, float z, int seed,
 }
 
 
-float noise3d_perlin_abs(float x, float y, float z, int seed,
+float noise3d_perlin_abs(float x, float y, float z, s32 seed,
 	int octaves, float persistence, bool eased)
 {
 	float a = 0;
@@ -363,7 +363,7 @@ float contour(float v)
 ///////////////////////// [ New noise ] ////////////////////////////
 
 
-float NoisePerlin2D(NoiseParams *np, float x, float y, int seed)
+float NoisePerlin2D(NoiseParams *np, float x, float y, s32 seed)
 {
 	float a = 0;
 	float f = 1.0;
@@ -389,7 +389,7 @@ float NoisePerlin2D(NoiseParams *np, float x, float y, int seed)
 }
 
 
-float NoisePerlin3D(NoiseParams *np, float x, float y, float z, int seed)
+float NoisePerlin3D(NoiseParams *np, float x, float y, float z, s32 seed)
 {
 	float a = 0;
 	float f = 1.0;
@@ -416,7 +416,7 @@ float NoisePerlin3D(NoiseParams *np, float x, float y, float z, int seed)
 }
 
 
-Noise::Noise(NoiseParams *np_, int seed, u32 sx, u32 sy, u32 sz)
+Noise::Noise(NoiseParams *np_, s32 seed, u32 sx, u32 sy, u32 sz)
 {
 	memcpy(&np, np_, sizeof(np));
 	this->seed = seed;
@@ -543,7 +543,7 @@ void Noise::resizeNoiseBuf(bool is3d)
 void Noise::gradientMap2D(
 		float x, float y,
 		float step_x, float step_y,
-		int seed)
+		s32 seed)
 {
 	float v00, v01, v10, v11, u, v, orig_u;
 	u32 index, i, j, noisex, noisey;
@@ -607,7 +607,7 @@ void Noise::gradientMap2D(
 void Noise::gradientMap3D(
 		float x, float y, float z,
 		float step_x, float step_y, float step_z,
-		int seed)
+		s32 seed)
 {
 	float v000, v010, v100, v110;
 	float v001, v011, v101, v111;
diff --git a/src/noise.h b/src/noise.h
index 0e4252dd4..41b93ae01 100644
--- a/src/noise.h
+++ b/src/noise.h
@@ -148,7 +148,7 @@ struct NoiseParams {
 class Noise {
 public:
 	NoiseParams np;
-	int seed;
+	s32 seed;
 	u32 sx;
 	u32 sy;
 	u32 sz;
@@ -157,7 +157,7 @@ public:
 	float *persist_buf;
 	float *result;
 
-	Noise(NoiseParams *np, int seed, u32 sx, u32 sy, u32 sz=1);
+	Noise(NoiseParams *np, s32 seed, u32 sx, u32 sy, u32 sz=1);
 	~Noise();
 
 	void setSize(u32 sx, u32 sy, u32 sz=1);
@@ -167,11 +167,11 @@ public:
 	void gradientMap2D(
 		float x, float y,
 		float step_x, float step_y,
-		int seed);
+		s32 seed);
 	void gradientMap3D(
 		float x, float y, float z,
 		float step_x, float step_y, float step_z,
-		int seed);
+		s32 seed);
 
 	float *perlinMap2D(float x, float y, float *persistence_map=NULL);
 	float *perlinMap3D(float x, float y, float z, float *persistence_map=NULL);
@@ -202,11 +202,11 @@ private:
 
 };
 
-float NoisePerlin2D(NoiseParams *np, float x, float y, int seed);
-float NoisePerlin3D(NoiseParams *np, float x, float y, float z, int seed);
+float NoisePerlin2D(NoiseParams *np, float x, float y, s32 seed);
+float NoisePerlin3D(NoiseParams *np, float x, float y, float z, s32 seed);
 
 inline float NoisePerlin2D_PO(NoiseParams *np, float x, float xoff,
-	float y, float yoff, int seed)
+	float y, float yoff, s32 seed)
 {
 	return NoisePerlin2D(np,
 		x + xoff * np->spread.X,
@@ -215,7 +215,7 @@ inline float NoisePerlin2D_PO(NoiseParams *np, float x, float xoff,
 }
 
 inline float NoisePerlin3D_PO(NoiseParams *np, float x, float xoff,
-	float y, float yoff, float z, float zoff, int seed)
+	float y, float yoff, float z, float zoff, s32 seed)
 {
 	return NoisePerlin3D(np,
 		x + xoff * np->spread.X,
@@ -225,22 +225,22 @@ inline float NoisePerlin3D_PO(NoiseParams *np, float x, float xoff,
 }
 
 // Return value: -1 ... 1
-float noise2d(int x, int y, int seed);
-float noise3d(int x, int y, int z, int seed);
+float noise2d(int x, int y, s32 seed);
+float noise3d(int x, int y, int z, s32 seed);
 
-float noise2d_gradient(float x, float y, int seed, bool eased=true);
-float noise3d_gradient(float x, float y, float z, int seed, bool eased=false);
+float noise2d_gradient(float x, float y, s32 seed, bool eased=true);
+float noise3d_gradient(float x, float y, float z, s32 seed, bool eased=false);
 
-float noise2d_perlin(float x, float y, int seed,
+float noise2d_perlin(float x, float y, s32 seed,
 		int octaves, float persistence, bool eased=true);
 
-float noise2d_perlin_abs(float x, float y, int seed,
+float noise2d_perlin_abs(float x, float y, s32 seed,
 		int octaves, float persistence, bool eased=true);
 
-float noise3d_perlin(float x, float y, float z, int seed,
+float noise3d_perlin(float x, float y, float z, s32 seed,
 		int octaves, float persistence, bool eased=false);
 
-float noise3d_perlin_abs(float x, float y, float z, int seed,
+float noise3d_perlin_abs(float x, float y, float z, s32 seed,
 		int octaves, float persistence, bool eased=false);
 
 inline float easeCurve(float t)
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index 8284c3fcb..ebdea09e4 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -758,7 +758,7 @@ int ModApiEnvMod::l_get_perlin_map(lua_State *L)
 		return 0;
 	v3s16 size = read_v3s16(L, 2);
 
-	int seed = (int)(env->getServerMap().getSeed());
+	s32 seed = (s32)(env->getServerMap().getSeed());
 	LuaPerlinNoiseMap *n = new LuaPerlinNoiseMap(&np, seed, size);
 	*(void **)(lua_newuserdata(L, sizeof(void *))) = n;
 	luaL_getmetatable(L, "PerlinNoiseMap");
diff --git a/src/script/lua_api/l_noise.cpp b/src/script/lua_api/l_noise.cpp
index 04dc6048f..e0039371f 100644
--- a/src/script/lua_api/l_noise.cpp
+++ b/src/script/lua_api/l_noise.cpp
@@ -146,7 +146,7 @@ const luaL_reg LuaPerlinNoise::methods[] = {
   LuaPerlinNoiseMap
 */
 
-LuaPerlinNoiseMap::LuaPerlinNoiseMap(NoiseParams *params, int seed, v3s16 size)
+LuaPerlinNoiseMap::LuaPerlinNoiseMap(NoiseParams *params, s32 seed, v3s16 size)
 {
 	m_is3d = size.Z > 1;
 	np = *params;
diff --git a/src/script/lua_api/l_noise.h b/src/script/lua_api/l_noise.h
index 492eb7550..40bfd1315 100644
--- a/src/script/lua_api/l_noise.h
+++ b/src/script/lua_api/l_noise.h
@@ -79,7 +79,7 @@ class LuaPerlinNoiseMap : public ModApiBase {
 	static int l_getMapSlice(lua_State *L);
 
 public:
-	LuaPerlinNoiseMap(NoiseParams *np, int seed, v3s16 size);
+	LuaPerlinNoiseMap(NoiseParams *np, s32 seed, v3s16 size);
 
 	~LuaPerlinNoiseMap();
 
@@ -111,7 +111,7 @@ private:
 	static int l_next(lua_State *L);
 
 public:
-	LuaPseudoRandom(int seed) :
+	LuaPseudoRandom(s32 seed) :
 		m_pseudo(seed) {}
 
 	// LuaPseudoRandom(seed)
diff --git a/src/treegen.cpp b/src/treegen.cpp
index 208f34552..36d387c57 100644
--- a/src/treegen.cpp
+++ b/src/treegen.cpp
@@ -31,7 +31,7 @@ namespace treegen
 {
 
 void make_tree(MMVManip &vmanip, v3s16 p0,
-		bool is_apple_tree, INodeDefManager *ndef, int seed)
+		bool is_apple_tree, INodeDefManager *ndef, s32 seed)
 {
 	/*
 		NOTE: Tree-placing code is currently duplicated in the engine
@@ -149,7 +149,7 @@ treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
 		INodeDefManager *ndef, TreeDef tree_definition)
 {
 	MapNode dirtnode(ndef->getId("mapgen_dirt"));
-	int seed;
+	s32 seed;
 	if (tree_definition.explicit_seed)
 		seed = tree_definition.seed + 14002;
 	else
@@ -649,7 +649,7 @@ v3f transposeMatrix(irr::core::matrix4 M, v3f v)
 }
 
 
-void make_jungletree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, int seed)
+void make_jungletree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
 {
 	/*
 		NOTE: Tree-placing code is currently duplicated in the engine
@@ -748,7 +748,7 @@ void make_jungletree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, int seed
 }
 
 
-void make_pine_tree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, int seed)
+void make_pine_tree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
 {
 	/*
 		NOTE: Tree-placing code is currently duplicated in the engine
diff --git a/src/treegen.h b/src/treegen.h
index 4b0089d1e..4e6f95e67 100644
--- a/src/treegen.h
+++ b/src/treegen.h
@@ -54,19 +54,19 @@ namespace treegen {
 		bool thin_branches;
 		MapNode fruitnode;
 		int fruit_chance;
-		int seed;
+		s32 seed;
 		bool explicit_seed;
 	};
 
 	// Add default tree
 	void make_tree(MMVManip &vmanip, v3s16 p0,
-		bool is_apple_tree, INodeDefManager *ndef, int seed);
+		bool is_apple_tree, INodeDefManager *ndef, s32 seed);
 	// Add jungle tree
 	void make_jungletree(MMVManip &vmanip, v3s16 p0,
-		INodeDefManager *ndef, int seed);
+		INodeDefManager *ndef, s32 seed);
 	// Add pine tree
 	void make_pine_tree(MMVManip &vmanip, v3s16 p0,
-		INodeDefManager *ndef, int seed);
+		INodeDefManager *ndef, s32 seed);
 
 	// Add L-Systems tree (used by engine)
 	treegen::error make_ltree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef,

From 8ed467d438634ffe45806a6a6a325bb00774d651 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sat, 4 Jun 2016 02:16:06 -0400
Subject: [PATCH 055/418] PcgRandom: Fix/improve documentation

---
 doc/lua_api.txt |  4 +++-
 src/noise.cpp   | 31 ++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index aa0d7e45d..f348f5103 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2865,7 +2865,9 @@ It can be created via `PcgRandom(seed)` or `PcgRandom(seed, sequence)`.
 * `next()`: return next integer random number [`-2147483648`...`2147483647`]
 * `next(min, max)`: return next integer random number [`min`...`max`]
 * `rand_normal_dist(min, max, num_trials=6)`: return normally distributed random number [`min`...`max`]
-    * This is only a rough approximation of a normal distribution with mean=(max-min)/2 and variance=1
+    * This is only a rough approximation of a normal distribution with:
+    *   mean = (max - min) / 2, and
+    *   variance = (((max - min + 1) ^ 2) - 1) / (12 * num_trials)
     * Increasing num_trials improves accuracy of the approximation
 
 ### `SecureRandom`
diff --git a/src/noise.cpp b/src/noise.cpp
index c57c98ccb..b918c9936 100644
--- a/src/noise.cpp
+++ b/src/noise.cpp
@@ -93,22 +93,31 @@ u32 PcgRandom::range(u32 bound)
 	// If the bound is 0, we cover the whole RNG's range
 	if (bound == 0)
 		return next();
-	/*
-	If the bound is not a multiple of the RNG's range, it may cause bias,
-	e.g. a RNG has a range from 0 to 3 and we take want a number 0 to 2.
-	Using rand() % 3, the number 0 would be twice as likely to appear.
-	With a very large RNG range, the effect becomes less prevalent but
-	still present.  This can be solved by modifying the range of the RNG
-	to become a multiple of bound by dropping values above the a threshold.
-	In our example, threshold == 4 - 3 = 1 % 3 == 1, so reject 0, thus
-	making the range 3 with no bias.
 
-	This loop looks dangerous, but will always terminate due to the
-	RNG's property of uniformity.
+	/*
+		This is an optimization of the expression:
+		  0x100000000ull % bound
+		since 64-bit modulo operations typically much slower than 32.
 	*/
 	u32 threshold = -bound % bound;
 	u32 r;
 
+	/*
+		If the bound is not a multiple of the RNG's range, it may cause bias,
+		e.g. a RNG has a range from 0 to 3 and we take want a number 0 to 2.
+		Using rand() % 3, the number 0 would be twice as likely to appear.
+		With a very large RNG range, the effect becomes less prevalent but
+		still present.
+
+		This can be solved by modifying the range of the RNG to become a
+		multiple of bound by dropping values above the a threshold.
+
+		In our example, threshold == 4 % 3 == 1, so reject values < 1
+		(that is, 0), thus making the range == 3 with no bias.
+
+		This loop may look dangerous, but will always terminate due to the
+		RNG's property of uniformity.
+	*/
 	while ((r = next()) < threshold)
 		;
 

From 109c7e334920f859068aeda31463f644e6b69895 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sat, 4 Jun 2016 03:00:45 -0400
Subject: [PATCH 056/418] Biomes:  Define and use biome_t for biome IDs

---
 src/mapgen.h     |  4 +++-
 src/mg_biome.cpp |  4 ++--
 src/mg_biome.h   | 13 ++++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/mapgen.h b/src/mapgen.h
index 0342fd46e..f673007b5 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -36,6 +36,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MG_LIGHT       0x10
 #define MG_DECORATIONS 0x20
 
+typedef u8 biome_t;  // copy from mg_biome.h to avoid an unnecessary include
+
 class Settings;
 class MMVManip;
 class INodeDefManager;
@@ -161,7 +163,7 @@ public:
 
 	u32 blockseed;
 	s16 *heightmap;
-	u8 *biomemap;
+	biome_t *biomemap;
 	v3s16 csize;
 
 	BiomeGen *biomegen;
diff --git a/src/mg_biome.cpp b/src/mg_biome.cpp
index dac0f7acc..df728af33 100644
--- a/src/mg_biome.cpp
+++ b/src/mg_biome.cpp
@@ -128,7 +128,7 @@ BiomeGenOriginal::BiomeGenOriginal(BiomeManager *biomemgr,
 
 	heatmap  = noise_heat->result;
 	humidmap = noise_humidity->result;
-	biomemap = new u8[m_csize.X * m_csize.Z];
+	biomemap = new biome_t[m_csize.X * m_csize.Z];
 }
 
 BiomeGenOriginal::~BiomeGenOriginal()
@@ -171,7 +171,7 @@ void BiomeGenOriginal::calcBiomeNoise(v3s16 pmin)
 }
 
 
-u8 *BiomeGenOriginal::getBiomes(s16 *heightmap)
+biome_t *BiomeGenOriginal::getBiomes(s16 *heightmap)
 {
 	for (s32 i = 0; i != m_csize.X * m_csize.Z; i++) {
 		Biome *biome = calcBiomeFromNoise(
diff --git a/src/mg_biome.h b/src/mg_biome.h
index 389b7664f..568d0b1ac 100644
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -31,7 +31,9 @@ class BiomeManager;
 //// Biome
 ////
 
-#define BIOME_NONE ((u8)0)
+typedef u8 biome_t;
+
+#define BIOME_NONE ((biome_t)0)
 
 // TODO(hmmmm): Decide whether this is obsolete or will be used in the future
 enum BiomeType {
@@ -101,7 +103,7 @@ public:
 	// Gets all biomes in current chunk using each corresponding element of
 	// heightmap as the y position, then stores the results by biome index in
 	// biomemap (also returned)
-	virtual u8 *getBiomes(s16 *heightmap) = 0;
+	virtual biome_t *getBiomes(s16 *heightmap) = 0;
 
 	// Gets a single biome at the specified position, which must be contained
 	// in the region formed by m_pmin and (m_pmin + m_csize - 1).
@@ -111,7 +113,7 @@ public:
 	virtual Biome *getBiomeAtIndex(size_t index, s16 y) const = 0;
 
 	// Result of calcBiomes bulk computation.
-	u8 *biomemap;
+	biome_t *biomemap;
 
 protected:
 	BiomeManager *m_bmgr;
@@ -157,7 +159,7 @@ public:
 	Biome *calcBiomeAtPoint(v3s16 pos) const;
 	void calcBiomeNoise(v3s16 pmin);
 
-	u8 *getBiomes(s16 *heightmap);
+	biome_t *getBiomes(s16 *heightmap);
 	Biome *getBiomeAtPoint(v3s16 pos) const;
 	Biome *getBiomeAtIndex(size_t index, s16 y) const;
 
@@ -218,9 +220,6 @@ public:
 
 	virtual void clear();
 
-	// Looks for pos in the biome cache, and if non-existent, looks up by noise
-	u8 getBiomeAtPoint(v3s16 pos);
-
 private:
 	IGameDef *m_gamedef;
 

From 7841f1c5098d73b7538623cf898ca1e32ac6773d Mon Sep 17 00:00:00 2001
From: MillersMan <MillersMan@users.noreply.github.com>
Date: Sun, 5 Jun 2016 01:30:36 +0200
Subject: [PATCH 057/418] Mapgen: Performance improvement and fixes for
 updateLiquid (#4065)

- Adds only ~100 nodes per chunk to trans_liquid with similar processing time
- Adds liquid nodes themselves instead of potential solid nodes below them
- CONTENT_IGNORE nodes are interpreted as if they continue their neighborhood
- This allows liquid columns to span multiple chunks without being interrupted
- NOTE: Expects an one-node border in generation chunk without liquid changes
---
 src/mapgen.cpp | 83 ++++++++++++++++++++++++++++++++++++++++++--------
 src/mapgen.h   |  4 +++
 2 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 32f7e29eb..b5c48a471 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -213,27 +213,86 @@ void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax)
 	//printf("updateHeightmap: %dus\n", t.stop());
 }
 
+inline bool Mapgen::isLiquidHorizontallyFlowable(u32 vi, v3s16 em)
+{
+	u32 vi_neg_x = vi;
+	vm->m_area.add_x(em, vi_neg_x, -1);
+	if (vm->m_data[vi_neg_x].getContent() != CONTENT_IGNORE) {
+		const ContentFeatures &c_nx = ndef->get(vm->m_data[vi_neg_x]);
+		if (c_nx.floodable && !c_nx.isLiquid())
+			return true;
+	}
+	u32 vi_pos_x = vi;
+	vm->m_area.add_x(em, vi_pos_x, +1);
+	if (vm->m_data[vi_pos_x].getContent() != CONTENT_IGNORE) {
+		const ContentFeatures &c_px = ndef->get(vm->m_data[vi_pos_x]);
+		if (c_px.floodable && !c_px.isLiquid())
+			return true;
+	}
+	u32 vi_neg_z = vi;
+	vm->m_area.add_z(em, vi_neg_z, -1);
+	if (vm->m_data[vi_neg_z].getContent() != CONTENT_IGNORE) {
+		const ContentFeatures &c_nz = ndef->get(vm->m_data[vi_neg_z]);
+		if (c_nz.floodable && !c_nz.isLiquid())
+			return true;
+	}
+	u32 vi_pos_z = vi;
+	vm->m_area.add_z(em, vi_pos_z, +1);
+	if (vm->m_data[vi_pos_z].getContent() != CONTENT_IGNORE) {
+		const ContentFeatures &c_pz = ndef->get(vm->m_data[vi_pos_z]);
+		if (c_pz.floodable && !c_pz.isLiquid())
+			return true;
+	}
+	return false;
+}
 
 void Mapgen::updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nmax)
 {
-	bool isliquid, wasliquid;
+	bool isignored, isliquid, wasignored, wasliquid, waschecked, waspushed;
 	v3s16 em  = vm->m_area.getExtent();
 
-	for (s16 z = nmin.Z; z <= nmax.Z; z++) {
-		for (s16 x = nmin.X; x <= nmax.X; x++) {
-			wasliquid = true;
+	for (s16 z = nmin.Z + 1; z <= nmax.Z - 1; z++)
+	for (s16 x = nmin.X + 1; x <= nmax.X - 1; x++) {
+		wasignored = true;
+		wasliquid = false;
+		waschecked = false;
+		waspushed = false;
 
-			u32 i = vm->m_area.index(x, nmax.Y, z);
-			for (s16 y = nmax.Y; y >= nmin.Y; y--) {
-				isliquid = ndef->get(vm->m_data[i]).isLiquid();
+		u32 vi = vm->m_area.index(x, nmax.Y, z);
+		for (s16 y = nmax.Y; y >= nmin.Y; y--) {
+			isignored = vm->m_data[vi].getContent() == CONTENT_IGNORE;
+			isliquid = ndef->get(vm->m_data[vi]).isLiquid();
 
-				// there was a change between liquid and nonliquid, add to queue.
-				if (isliquid != wasliquid)
+			if (isignored || wasignored || isliquid == wasliquid) {
+				// Neither topmost node of liquid column nor topmost node below column
+				waschecked = false;
+				waspushed = false;
+			} else if (isliquid) {
+				// This is the topmost node in the column
+				bool ispushed = false;
+				if (isLiquidHorizontallyFlowable(vi, em)) {
 					trans_liquid->push_back(v3s16(x, y, z));
-
-				wasliquid = isliquid;
-				vm->m_area.add_y(em, i, -1);
+					ispushed = true;
+				}
+				// Remember waschecked and waspushed to avoid repeated
+				// checks/pushes in case the column consists of only this node
+				waschecked = true;
+				waspushed = ispushed;
+			} else {
+				// This is the topmost node below a liquid column
+				u32 vi_above = vi;
+				vm->m_area.add_y(em, vi_above, 1);
+				if (!waspushed && (ndef->get(vm->m_data[vi]).floodable ||
+						(!waschecked && isLiquidHorizontallyFlowable(vi_above, em)))) {
+					// Push back the lowest node in the column which is one
+					// node above this one
+					trans_liquid->push_back(v3s16(x, y + 1, z));
+				}
 			}
+
+			wasliquid = isliquid;
+			wasignored = isignored;
+			vm->m_area.add_y(em, vi, -1);
 		}
 	}
 }
diff --git a/src/mapgen.h b/src/mapgen.h
index f673007b5..90ac84bd8 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -199,6 +199,10 @@ public:
 	virtual int getSpawnLevelAtPoint(v2s16 p) { return 0; }
 
 private:
+	// isLiquidHorizontallyFlowable() is a helper function for updateLiquid()
+	// that checks whether there are floodable nodes without liquid beneath
+	// the node at index vi.
+	inline bool isLiquidHorizontallyFlowable(u32 vi, v3s16 em);
 	DISABLE_CLASS_COPY(Mapgen);
 };
 

From d24f3841740b471eff384c8bd6e8bbfdfd03a3e2 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Fri, 3 Jun 2016 12:58:50 +0100
Subject: [PATCH 058/418] Biome API: Add per-biome riverbed material and depth

Mgvalleys: Remove riverbed sand placement from base terrain generation
Riverbed material placement moved to MapgenBasic::generateBiomes()
Document fields and add note that the biome API is still unstable
---
 doc/lua_api.txt                 |  6 ++++++
 src/mapgen.cpp                  | 24 ++++++++++++++++++------
 src/mapgen_valleys.cpp          | 13 ++-----------
 src/mg_biome.cpp                |  3 +++
 src/mg_biome.h                  |  2 ++
 src/script/lua_api/l_mapgen.cpp |  2 ++
 6 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index f348f5103..30f4d87df 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3723,6 +3723,9 @@ Definition tables
 
 ### Biome definition (`register_biome`)
 
+**Note**
+The biome API is still in an experimental phase and subject to change.
+
     {
         name = "tundra",
         node_dust = "default:snow",
@@ -3742,6 +3745,9 @@ Definition tables
     --  ^ Node that replaces all seawater nodes not in the defined surface layer.
         node_river_water = "default:ice",
     --  ^ Node that replaces river water in mapgens that use default:river_water.
+        node_riverbed = "default:gravel",
+        depth_riverbed = 2,
+    --  ^ Node placed under river water and thickness of this layer.
         y_min = 1,
         y_max = 31000,
     --  ^ Lower and upper limits for biome.
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index b5c48a471..66892a574 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -536,13 +536,15 @@ MgStoneType MapgenBasic::generateBiomes()
 		u16 depth_top = 0;
 		u16 base_filler = 0;
 		u16 depth_water_top = 0;
+		u16 depth_riverbed = 0;
 		u32 vi = vm->m_area.index(x, node_max.Y, z);
 
 		// Check node at base of mapchunk above, either a node of a previously
 		// generated mapchunk or if not, a node of overgenerated base terrain.
 		content_t c_above = vm->m_data[vi + em.X].getContent();
 		bool air_above = c_above == CONTENT_AIR;
-		bool water_above = (c_above == c_water_source || c_above == c_river_water_source);
+		bool river_water_above = c_above == c_river_water_source;
+		bool water_above = c_above == c_water_source || river_water_above;
 
 		// If there is air or water above enable top/filler placement, otherwise force
 		// nplaced to stone level by setting a number exceeding any possible filler depth.
@@ -564,10 +566,11 @@ MgStoneType MapgenBasic::generateBiomes()
 				biome = biomegen->getBiomeAtIndex(index, y);
 
 				depth_top = biome->depth_top;
-				base_filler = MYMAX(depth_top
-						+ biome->depth_filler
-						+ noise_filler_depth->result[index], 0.f);
+				base_filler = MYMAX(depth_top +
+					biome->depth_filler +
+					noise_filler_depth->result[index], 0.f);
 				depth_water_top = biome->depth_water_top;
+				depth_riverbed = biome->depth_riverbed;
 
 				// Detect stone type for dungeons during every biome calculation.
 				// This is more efficient than detecting per-node and will not
@@ -590,7 +593,15 @@ MgStoneType MapgenBasic::generateBiomes()
 						|| c_below == c_river_water_source)
 					nplaced = U16_MAX;
 
-				if (nplaced < depth_top) {
+				if (river_water_above) {
+					if (nplaced < depth_riverbed) {
+						vm->m_data[vi] = MapNode(biome->c_riverbed);
+						nplaced++;
+					} else {
+						nplaced = U16_MAX;  // Disable top/filler placement
+						river_water_above = false;
+					}
+				} else if (nplaced < depth_top) {
 					vm->m_data[vi] = MapNode(biome->c_top);
 					nplaced++;
 				} else if (nplaced < base_filler) {
@@ -610,9 +621,10 @@ MgStoneType MapgenBasic::generateBiomes()
 				water_above = true;
 			} else if (c == c_river_water_source) {
 				vm->m_data[vi] = MapNode(biome->c_river_water);
-				nplaced = depth_top;  // Enable filler placement for next surface
+				nplaced = 0;  // Enable riverbed placement for next surface
 				air_above = false;
 				water_above = true;
+				river_water_above = true;
 			} else if (c == CONTENT_AIR) {
 				nplaced = 0;  // Enable top/filler placement for next surface
 				air_above = true;
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 2cd733d36..6581b792f 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -114,11 +114,6 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
 
 	// Resolve content to be used
 	c_lava_source = ndef->getId("mapgen_lava_source");
-	c_sand        = ndef->getId("mapgen_sand");
-
-	// Fall back to more basic content if not defined
-	if (c_sand == CONTENT_IGNORE)
-		c_sand = c_stone;
 }
 
 
@@ -493,7 +488,6 @@ int MapgenValleys::generateTerrain()
 
 	MapNode n_air(CONTENT_AIR);
 	MapNode n_river_water(c_river_water_source);
-	MapNode n_sand(c_sand);
 	MapNode n_stone(c_stone);
 	MapNode n_water(c_water_source);
 
@@ -537,10 +531,7 @@ int MapgenValleys::generateTerrain()
 				float surface_delta = (float)y - surface_y;
 				bool river = y + 1 < river_y;
 
-				if (fabs(surface_delta) <= 0.5f && y > water_level && river) {
-					// river bottom
-					vm->m_data[index_data] = n_sand;
-				} else if (slope * fill > surface_delta) {
+				if (slope * fill > surface_delta) {
 					// ground
 					vm->m_data[index_data] = n_stone;
 					if (y > heightmap[index_2d])
@@ -553,7 +544,7 @@ int MapgenValleys::generateTerrain()
 				} else if (river) {
 					// river
 					vm->m_data[index_data] = n_river_water;
-				} else {
+				} else {  // air
 					vm->m_data[index_data] = n_air;
 				}
 			}
diff --git a/src/mg_biome.cpp b/src/mg_biome.cpp
index df728af33..78034bf6c 100644
--- a/src/mg_biome.cpp
+++ b/src/mg_biome.cpp
@@ -46,6 +46,7 @@ BiomeManager::BiomeManager(IGameDef *gamedef) :
 	b->depth_top       = 0;
 	b->depth_filler    = -MAX_MAP_GENERATION_LIMIT;
 	b->depth_water_top = 0;
+	b->depth_riverbed  = 0;
 	b->y_min           = -MAX_MAP_GENERATION_LIMIT;
 	b->y_max           = MAX_MAP_GENERATION_LIMIT;
 	b->heat_point      = 0.0;
@@ -57,6 +58,7 @@ BiomeManager::BiomeManager(IGameDef *gamedef) :
 	b->m_nodenames.push_back("mapgen_water_source");
 	b->m_nodenames.push_back("mapgen_water_source");
 	b->m_nodenames.push_back("mapgen_river_water_source");
+	b->m_nodenames.push_back("mapgen_stone");
 	b->m_nodenames.push_back("ignore");
 	m_ndef->pendNodeResolve(b);
 
@@ -237,5 +239,6 @@ void Biome::resolveNodeNames()
 	getIdFromNrBacklog(&c_water_top,   "mapgen_water_source",       CONTENT_AIR);
 	getIdFromNrBacklog(&c_water,       "mapgen_water_source",       CONTENT_AIR);
 	getIdFromNrBacklog(&c_river_water, "mapgen_river_water_source", CONTENT_AIR);
+	getIdFromNrBacklog(&c_riverbed,    "mapgen_stone",              CONTENT_AIR);
 	getIdFromNrBacklog(&c_dust,        "ignore",                    CONTENT_IGNORE);
 }
diff --git a/src/mg_biome.h b/src/mg_biome.h
index 568d0b1ac..eb0a18a2f 100644
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -54,11 +54,13 @@ public:
 	content_t c_water_top;
 	content_t c_water;
 	content_t c_river_water;
+	content_t c_riverbed;
 	content_t c_dust;
 
 	s16 depth_top;
 	s16 depth_filler;
 	s16 depth_water_top;
+	s16 depth_riverbed;
 
 	s16 y_min;
 	s16 y_max;
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 6baf217af..dc188f8a4 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -378,6 +378,7 @@ Biome *read_biome_def(lua_State *L, int index, INodeDefManager *ndef)
 	b->depth_top       = getintfield_default(L,    index, "depth_top",       0);
 	b->depth_filler    = getintfield_default(L,    index, "depth_filler",    -31000);
 	b->depth_water_top = getintfield_default(L,    index, "depth_water_top", 0);
+	b->depth_riverbed  = getintfield_default(L,    index, "depth_riverbed",  0);
 	b->y_min           = getintfield_default(L,    index, "y_min",           -31000);
 	b->y_max           = getintfield_default(L,    index, "y_max",           31000);
 	b->heat_point      = getfloatfield_default(L,  index, "heat_point",      0.f);
@@ -391,6 +392,7 @@ Biome *read_biome_def(lua_State *L, int index, INodeDefManager *ndef)
 	nn.push_back(getstringfield_default(L, index, "node_water_top",   ""));
 	nn.push_back(getstringfield_default(L, index, "node_water",       ""));
 	nn.push_back(getstringfield_default(L, index, "node_river_water", ""));
+	nn.push_back(getstringfield_default(L, index, "node_riverbed",    ""));
 	nn.push_back(getstringfield_default(L, index, "node_dust",        ""));
 	ndef->pendNodeResolve(b);
 

From d4457ef42061435a1ccf6f5e056f37bac9b30c02 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sat, 4 Jun 2016 20:24:07 -0400
Subject: [PATCH 059/418] Mapgen: Optimize biomemap creation by combining with
 generateBiomes

---
 src/mapgen.cpp         | 20 +++++++++++++++++---
 src/mapgen_flat.cpp    |  1 -
 src/mapgen_fractal.cpp |  1 -
 src/mapgen_v5.cpp      |  1 -
 src/mapgen_v7.cpp      |  1 -
 src/mapgen_valleys.cpp |  5 +----
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 66892a574..576fb219a 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -524,6 +524,10 @@ MapgenBasic::~MapgenBasic()
 
 MgStoneType MapgenBasic::generateBiomes()
 {
+	// can't generate biomes without a biome generator!
+	assert(biomegen);
+	assert(biomemap);
+
 	v3s16 em = vm->m_area.getExtent();
 	u32 index = 0;
 	MgStoneType stone_type = MGSTONE_STONE;
@@ -546,6 +550,8 @@ MgStoneType MapgenBasic::generateBiomes()
 		bool river_water_above = c_above == c_river_water_source;
 		bool water_above = c_above == c_water_source || river_water_above;
 
+		biomemap[index] = BIOME_NONE;
+
 		// If there is air or water above enable top/filler placement, otherwise force
 		// nplaced to stone level by setting a number exceeding any possible filler depth.
 		u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
@@ -560,11 +566,19 @@ MgStoneType MapgenBasic::generateBiomes()
 			// 1. At the surface of stone below air or water.
 			// 2. At the surface of water below air.
 			// 3. When stone or water is detected but biome has not yet been calculated.
-			if ((c == c_stone && (air_above || water_above || !biome))
-					|| ((c == c_water_source || c == c_river_water_source)
-						&& (air_above || !biome))) {
+			bool is_stone_surface = (c == c_stone) &&
+				(air_above || water_above || !biome);
+
+			bool is_water_surface =
+				(c == c_water_source || c == c_river_water_source) &&
+				(air_above || !biome);
+
+			if (is_stone_surface || is_water_surface) {
 				biome = biomegen->getBiomeAtIndex(index, y);
 
+				if (biomemap[index] == BIOME_NONE && is_stone_surface)
+					biomemap[index] = biome->index;
+
 				depth_top = biome->depth_top;
 				base_filler = MYMAX(depth_top +
 					biome->depth_filler +
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 724f06825..7cc6aad5c 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -192,7 +192,6 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 
 	// Init biome generator, place biome-specific nodes, and build biomemap
 	biomegen->calcBiomeNoise(node_min);
-	biomegen->getBiomes(heightmap);
 	MgStoneType stone_type = generateBiomes();
 
 	if (flags & MG_CAVES)
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index b613bf358..c47a7bfdc 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -208,7 +208,6 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
 
 	// Init biome generator, place biome-specific nodes, and build biomemap
 	biomegen->calcBiomeNoise(node_min);
-	biomegen->getBiomes(heightmap);
 	MgStoneType stone_type = generateBiomes();
 
 	if (flags & MG_CAVES)
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 3e10ec2a5..74d5e1ee3 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -190,7 +190,6 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 
 	// Init biome generator, place biome-specific nodes, and build biomemap
 	biomegen->calcBiomeNoise(node_min);
-	biomegen->getBiomes(heightmap);
 	MgStoneType stone_type = generateBiomes();
 
 	// Generate caves
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 7327facae..35dcdcd94 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -219,7 +219,6 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 
 	// Init biome generator, place biome-specific nodes, and build biomemap
 	biomegen->calcBiomeNoise(node_min);
-	biomegen->getBiomes(heightmap);
 	MgStoneType stone_type = generateBiomes();
 
 	if (flags & MG_CAVES)
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 6581b792f..bbf20719d 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -250,10 +250,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
 	// Generate base terrain with initial heightmaps
 	s16 stone_surface_max_y = generateTerrain();
 
-	// Build biomemap
-	m_bgen->getBiomes(heightmap);
-
-	// Place biome-specific nodes
+	// Place biome-specific nodes and build biomemap
 	MgStoneType stone_type = generateBiomes();
 
 	// Cave creation.

From c7297e552be9c265eba77e58dbd8f69be23b4131 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Tue, 7 Jun 2016 03:23:23 +0100
Subject: [PATCH 060/418] Lua_api.txt: Split long lines. Capitalise 'Biome
 API'. Minor edits

---
 doc/lua_api.txt | 129 ++++++++++++++++++++++++++++--------------------
 1 file changed, 76 insertions(+), 53 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 30f4d87df..ea47d0044 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -65,15 +65,19 @@ e.g.
 The game directory can contain the file minetest.conf, which will be used
 to set default settings when running the particular game.
 It can also contain a settingtypes.txt in the same format as the one in builtin.
-This settingtypes.txt will be parsed by the menu and the settings will be displayed in the "Games" category in the settings tab.
+This settingtypes.txt will be parsed by the menu and the settings will be displayed
+in the "Games" category in the settings tab.
 
 ### Menu images
 
-Games can provide custom main menu images. They are put inside a `menu` directory inside the game directory.
+Games can provide custom main menu images. They are put inside a `menu` directory
+inside the game directory.
 
-The images are named `$identifier.png`, where `$identifier` is one of `overlay,background,footer,header`.
-If you want to specify multiple images for one identifier, add additional images named like `$identifier.$n.png`, with an ascending number $n starting with 1,
-and a random image will be chosen from the provided ones.
+The images are named `$identifier.png`, where `$identifier` is
+one of `overlay,background,footer,header`.
+If you want to specify multiple images for one identifier, add additional images named
+like `$identifier.$n.png`, with an ascending number $n starting with 1, and a random
+image will be chosen from the provided ones.
 
 
 Mod load path
@@ -243,7 +247,8 @@ Example:
     default_dirt.png^default_grass_side.png
 
 `default_grass_side.png` is overlayed over `default_dirt.png`.
-The texture with the lower resolution will be automatically upscaled to the higher resolution texture.
+The texture with the lower resolution will be automatically upscaled to
+the higher resolution texture.
 
 ### Texture grouping
 Textures can be grouped together by enclosing them in `(` and `)`.
@@ -468,8 +473,8 @@ the global `minetest.registered_*` tables.
     * added to `minetest.registered_schematic` with the key of `schematic.name`
     * if `schematic.name` is nil, the key is the returned ID
     * if the schematic is loaded from a file, schematic.name is set to the filename
-    * if the function is called when loading the mod, and schematic.name is a relative path,
-    * then the current mod path will be prepended to the schematic filename
+    * if the function is called when loading the mod, and schematic.name is a relative
+      path, then the current mod path will be prepended to the schematic filename
 
 * `minetest.clear_registered_biomes()`
     * clears all biomes currently registered
@@ -1416,13 +1421,13 @@ examples.
 #### `listring[<inventory location>;<list name>]`
 * Allows to create a ring of inventory lists
 * Shift-clicking on items in one element of the ring
-* will send them to the next inventory list inside the ring
+  will send them to the next inventory list inside the ring
 * The first occurrence of an element inside the ring will
-* determine the inventory where items will be sent to
+  determine the inventory where items will be sent to
 
 #### `listring[]`
 * Shorthand for doing `listring[<inventory location>;<list name>]`
-* for the last two inventory lists added by list[...]
+  for the last two inventory lists added by list[...]
 
 #### `listcolors[<slot_bg_normal>;<slot_bg_hover>]`
 * Sets background color of slots as `ColorString`
@@ -1475,7 +1480,7 @@ examples.
 * Textual password style field; will be sent to server when a button is clicked
 * `x` and `y` position the field relative to the top left of the menu
 * `w` and `h` are the size of the field
-* fields are a set height, but will be vertically centred on `h`
+* Fields are a set height, but will be vertically centred on `h`
 * Position and size units are inventory slots
 * `name` is the name of the field as returned in fields to `on_receive_fields`
 * `label`, if not blank, will be text printed on the top left above the field
@@ -1484,7 +1489,7 @@ examples.
 * Textual field; will be sent to server when a button is clicked
 * `x` and `y` position the field relative to the top left of the menu
 * `w` and `h` are the size of the field
-* fields are a set height, but will be vertically centred on `h`
+* Fields are a set height, but will be vertically centred on `h`
 * Position and size units are inventory slots
 * `name` is the name of the field as returned in fields to `on_receive_fields`
 * `label`, if not blank, will be text printed on the top left above the field
@@ -1494,13 +1499,13 @@ examples.
     * **Note**: no extra text or more than a single variable is supported ATM.
 
 #### `field[<name>;<label>;<default>]`
-* as above, but without position/size units
-* special field for creating simple forms, such as sign text input
-* must be used without a `size[]` element
-* a "Proceed" button will be added automatically
+* As above, but without position/size units
+* Special field for creating simple forms, such as sign text input
+* Must be used without a `size[]` element
+* A "Proceed" button will be added automatically
 
 #### `textarea[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]`
-* same as fields above, but with multi-line input
+* Same as fields above, but with multi-line input
 
 #### `label[<X>,<Y>;<label>]`
 * `x` and `y` work as per field
@@ -1561,12 +1566,12 @@ examples.
 * `name` fieldname sent to server on doubleclick value is current selected element
 * `listelements` can be prepended by #RRGGBB (only) in hexadecimal format
      * if you want a listelement to start with "#" write "##"
-* index to be selected within textlist
+* Index to be selected within textlist
 * `true`/`false`: draw transparent background
-* see also `minetest.explode_textlist_event` (main menu: `engine.explode_textlist_event`)
+* See also `minetest.explode_textlist_event` (main menu: `engine.explode_textlist_event`)
 
 #### `tabheader[<X>,<Y>;<name>;<caption 1>,<caption 2>,...,<caption n>;<current_tab>;<transparent>;<draw_border>]`
-* show a tab**header** at specific position (ignores formsize)
+* Show a tab**header** at specific position (ignores formsize)
 * `x` and `y` position the itemlist relative to the top left of the menu
 * `name` fieldname data is transferred to Lua
 * `caption 1`...: name shown on top of tab
@@ -1575,24 +1580,24 @@ examples.
 * `draw_border` (optional): draw border
 
 #### `box[<X>,<Y>;<W>,<H>;<color>]`
-* simple colored semitransparent box
+* Simple colored semitransparent box
 * `x` and `y` position the box relative to the top left of the menu
 * `w` and `h` are the size of box
 * `color` is color specified as a `ColorString`
 
 #### `dropdown[<X>,<Y>;<W>;<name>;<item 1>,<item 2>, ...,<item n>;<selected idx>]`
-* show a dropdown field
+* Show a dropdown field
 * **Important note**: There are two different operation modes:
      1. handle directly on change (only changed dropdown is submitted)
      2. read the value on pressing a button (all dropdown values are available)
 * `x` and `y` position of dropdown
-* width of dropdown
-* fieldname data is transferred to Lua
-* items to be shown in dropdown
-* index of currently selected dropdown item
+* Width of dropdown
+* Fieldname data is transferred to Lua
+* Items to be shown in dropdown
+* Index of currently selected dropdown item
 
 #### `checkbox[<X>,<Y>;<name>;<label>;<selected>;<tooltip>]`
-* show a checkbox
+* Show a checkbox
 * `x` and `y`: position of checkbox
 * `name` fieldname data is transferred to Lua
 * `label` to be shown left of checkbox
@@ -1600,29 +1605,29 @@ examples.
 * `tooltip` (optional)
 
 #### `scrollbar[<X>,<Y>;<W>,<H>;<orientation>;<name>;<value>]`
-* show a scrollbar
-* there are two ways to use it:
+* Show a scrollbar
+* There are two ways to use it:
      1. handle the changed event (only changed scrollbar is available)
      2. read the value on pressing a button (all scrollbars are available)
 * `x` and `y`: position of trackbar
 * `w` and `h`: width and height
 * `orientation`:  `vertical`/`horizontal`
-* fieldname data is transferred to Lua
-* value this trackbar is set to (`0`-`1000`)
-* see also `minetest.explode_scrollbar_event` (main menu: `engine.explode_scrollbar_event`)
+* Fieldname data is transferred to Lua
+* Value this trackbar is set to (`0`-`1000`)
+* See also `minetest.explode_scrollbar_event` (main menu: `engine.explode_scrollbar_event`)
 
 #### `table[<X>,<Y>;<W>,<H>;<name>;<cell 1>,<cell 2>,...,<cell n>;<selected idx>]`
-* show scrollable table using options defined by the previous `tableoptions[]`
-* displays cells as defined by the previous `tablecolumns[]`
+* Show scrollable table using options defined by the previous `tableoptions[]`
+* Displays cells as defined by the previous `tablecolumns[]`
 * `x` and `y`: position the itemlist relative to the top left of the menu
 * `w` and `h` are the size of the itemlist
 * `name`: fieldname sent to server on row select or doubleclick
 * `cell 1`...`cell n`: cell contents given in row-major order
 * `selected idx`: index of row to be selected within table (first row = `1`)
-* see also `minetest.explode_table_event` (main menu: `engine.explode_table_event`)
+* See also `minetest.explode_table_event` (main menu: `engine.explode_table_event`)
 
 #### `tableoptions[<opt 1>;<opt 2>;...]`
-* sets options for `table[]`
+* Sets options for `table[]`
 * `color=#RRGGBB`
      * default text color (`ColorString`), defaults to `#FFFFFF`
 * `background=#RRGGBB`
@@ -1638,14 +1643,14 @@ examples.
      * only useful when there is a column of type "tree"
 
 #### `tablecolumns[<type 1>,<opt 1a>,<opt 1b>,...;<type 2>,<opt 2a>,<opt 2b>;...]`
-* sets columns for `table[]`
-* types: `text`, `image`, `color`, `indent`, `tree`
+* Sets columns for `table[]`
+* Types: `text`, `image`, `color`, `indent`, `tree`
     * `text`:   show cell contents as text
     * `image`:  cell contents are an image index, use column options to define images
     * `color`:   cell contents are a ColorString and define color of following cell
     * `indent`: cell contents are a number and define indentation of following cell
     * `tree`:   same as indent, but user can open and close subtrees (treeview-like)
-* column options:
+* Column options:
     * `align=<value>`
         * for `text` and `image`: content alignment within cells.
           Available values: `left` (default), `center`, `right`, `inline`
@@ -1948,7 +1953,8 @@ Call these functions only at load time!
 * `minetest.register_chatcommand(cmd, chatcommand definition)`
 * `minetest.register_privilege(name, definition)`
     * `definition`: `"description text"`
-    * `definition`: `{ description = "description text", give_to_singleplayer = boolean, -- default: true }`
+    * `definition`: `{ description = "description text", give_to_singleplayer = boolean}`
+      the default of `give_to_singleplayer` is true 
     * To allow players with basic_privs to grant, see basic_privs minetest.conf setting.
 * `minetest.register_authentication_handler(handler)`
     * See `minetest.builtin_auth_handler` in `builtin.lua` for reference
@@ -2669,7 +2675,8 @@ This is basically a reference to a C++ `ServerActiveObject`
 
 ##### Player-only (no-op for other objects)
 * `get_player_name()`: returns `""` if is not a player
-* `get_player_velocity()`: returns `nil` if is not a player otherwise a table {x, y, z} representing the player's instantaneous velocity in nodes/s
+* `get_player_velocity()`: returns `nil` if is not a player, otherwise a
+  table {x, y, z} representing the player's instantaneous velocity in nodes/s
 * `get_look_dir()`: get camera direction as a unit vector
 * `get_look_pitch()`: pitch in radians
 * `get_look_yaw()`: yaw in radians (wraps around pretty randomly as of now)
@@ -2783,25 +2790,40 @@ An `InvRef` is a reference to an inventory.
 A fast access data structure to store areas, and find areas near a given position or area.
 Every area has a `data` string attribute to store additional information.
 You can create an empty `AreaStore` by calling `AreaStore()`, or `AreaStore(type_name)`.
-If you chose the parameter-less constructor, a fast implementation will be automatically chosen for you.
+If you chose the parameter-less constructor, a fast implementation will be automatically
+chosen for you.
 
 #### Methods
-* `get_area(id, include_borders, include_data)`: returns the area with the id `id`. (optional) Boolean values `include_borders` and `include_data` control what's copied.
-* `get_areas_for_pos(pos, include_borders, include_data)`: returns all areas that contain the position `pos`. (optional) Boolean values `include_borders` and `include_data` control what's copied.
-* `get_areas_in_area(edge1, edge2, accept_overlap, include_borders, include_data)`: returns all areas that contain all nodes inside the area specified by `edge1` and `edge2` (inclusive). If `accept_overlap` is true, also areas are returned that have nodes in common with the specified area. (optional) Boolean values `include_borders` and `include_data` control what's copied.
-* `insert_area(edge1, edge2, data, [id])`: inserts an area into the store. Returns the new area's ID, or nil if the insertion failed. The (inclusive) positions `edge1` and `edge2` describe the area. `data` is a string stored with the area.  If passed, `id` will be used as the internal area ID, it must be a unique number between 0 and 2^32-2. If you use the `id` parameter you must always use it, or insertions are likely to fail due to conflicts.
-* `reserve(count)`: reserves resources for at most `count` many contained areas. Only needed for efficiency, and only some implementations profit.
+* `get_area(id, include_borders, include_data)`: returns the area with the id `id`.
+  (optional) Boolean values `include_borders` and `include_data` control what's copied.
+* `get_areas_for_pos(pos, include_borders, include_data)`: returns all areas that contain
+  the position `pos`. (optional) Boolean values `include_borders` and `include_data` control
+  what's copied.
+* `get_areas_in_area(edge1, edge2, accept_overlap, include_borders, include_data)`:
+  returns all areas that contain all nodes inside the area specified by `edge1` and `edge2` (inclusive).
+  If `accept_overlap` is true, also areas are returned that have nodes in common with the specified area.
+  (optional) Boolean values `include_borders` and `include_data` control what's copied.
+* `insert_area(edge1, edge2, data, [id])`: inserts an area into the store. Returns the new area's ID,
+  or nil if the insertion failed. The (inclusive) positions `edge1` and `edge2` describe the area.
+  `data` is a string stored with the area.  If passed, `id` will be used as the internal area ID,
+  it must be a unique number between 0 and 2^32-2. If you use the `id` parameter you must always use it,
+  or insertions are likely to fail due to conflicts.
+* `reserve(count)`: reserves resources for at most `count` many contained areas.
+  Only needed for efficiency, and only some implementations profit.
 * `remove_area(id)`: removes the area with the given id from the store, returns success.
-* `set_cache_params(params)`: sets params for the included prefiltering cache. Calling invalidates the cache, so that its elements have to be newly generated.
+* `set_cache_params(params)`: sets params for the included prefiltering cache.
+  Calling invalidates the cache, so that its elements have to be newly generated.
     * `params`:
       {
         enabled = boolean, -- whether to enable, default true
-        block_radius = number, -- the radius (in nodes) of the areas the cache generates prefiltered lists for, minimum 16, default 64
+        block_radius = number, -- the radius (in nodes) of the areas the cache generates
+                                  prefiltered lists for, minimum 16, default 64
         limit = number, -- the cache's size, minimum 20, default 1000
       }
 * `to_string()`: Experimental. Returns area store serialized as a (binary) string.
 * `to_file(filename)`: Experimental. Like `to_string()`, but writes the data to a file.
-* `from_string(str)`: Experimental. Deserializes string and loads it into the AreaStore.  Returns success and, optionally, an error message.
+* `from_string(str)`: Experimental. Deserializes string and loads it into the AreaStore.
+  Returns success and, optionally, an error message.
 * `from_file(filename)`: Experimental. Like `from_string()`, but reads the data from a file.
 
 ### `ItemStack`
@@ -3517,7 +3539,8 @@ Definition tables
         liquid_alternative_flowing = "", -- Flowing version of source liquid
         liquid_alternative_source = "", -- Source version of flowing liquid
         liquid_viscosity = 0, -- Higher viscosity = slower flow (max. 7)
-        liquid_renewable = true, -- Can new liquid source be created by placing two or more sources nearby?
+        liquid_renewable = true, --[[
+        ^ If true, a new liquid source can be created by placing two or more sources nearby ]]
         leveled = 0, --[[
         ^ Block contains level in param2. Value is default level, used for snow.
         ^ Don't forget to use "leveled" type nodebox. ]]
@@ -3724,7 +3747,7 @@ Definition tables
 ### Biome definition (`register_biome`)
 
 **Note**
-The biome API is still in an experimental phase and subject to change.
+The Biome API is still in an experimental phase and subject to change.
 
     {
         name = "tundra",

From 3ef71edd818b15ed2ba2f184b8a2dc4ee6198042 Mon Sep 17 00:00:00 2001
From: Paramat <paramat@users.noreply.github.com>
Date: Wed, 8 Jun 2016 07:43:27 +0100
Subject: [PATCH 061/418] Sky: Fix sunrisebg texture motion (#4199)

Top of texture no longer shows above horizon during night and day
---
 src/sky.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sky.cpp b/src/sky.cpp
index 682ff05e3..4ee750c55 100644
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -239,7 +239,7 @@ void Sky::render()
 			float a = easeCurve(MYMAX(0, MYMIN(1, a_)));
 			//std::cerr<<"a_="<<a_<<" a="<<a<<std::endl;
 			video::SColor c(255,255,255,255);
-			float y = -(1.0 - a) * 0.2;
+			float y = -(1.0 - a) * 0.22;
 			vertices[0] = video::S3DVertex(-1,-0.05+y,-1, 0,0,1, c, t, t);
 			vertices[1] = video::S3DVertex( 1,-0.05+y,-1, 0,0,1, c, o, t);
 			vertices[2] = video::S3DVertex( 1, 0.2+y,-1, 0,0,1, c, o, o);

From b24d21d1ae25c377e14223ee20d9de9158fe916c Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 25 May 2016 00:56:49 +0100
Subject: [PATCH 062/418] Sky: Darker, bluer sky and improved horizon haze at
 night

Add new colours 'skycolour_bright_night', 'bgcolour_bright_night'
and enable these between sunset end and sunrise start
Night sky has same hue as day sky but is darker and more saturated
Night horizon haze (bgcolour) is slightly less saturated and
slightly brighter than night sky, to be consistent with daytime
horizon haze
---
 src/sky.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/sky.cpp b/src/sky.cpp
index 4ee750c55..7757120bf 100644
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -510,11 +510,15 @@ void Sky::update(float time_of_day, float time_brightness,
 	//video::SColorf bgcolor_bright_dawn_f(0.666*1.2,0.549*1.0,0.220*1.2,1.0);
 	video::SColorf bgcolor_bright_dawn_f
 			(155./255*1.2,193./255,240./255, 1.0);
+	video::SColorf bgcolor_bright_night_f
+			(64./255, 144./255, 255./255, 1.0);
 
 	video::SColorf skycolor_bright_normal_f =
 			video::SColor(255, 140, 186, 250);
 	video::SColorf skycolor_bright_dawn_f =
 			video::SColor(255, 180, 186, 250);
+	video::SColorf skycolor_bright_night_f =
+			video::SColor(255, 0, 107, 255);
 	
 	video::SColorf cloudcolor_bright_normal_f =
 			video::SColor(255, 240,240,255);
@@ -550,10 +554,18 @@ void Sky::update(float time_of_day, float time_brightness,
 			m_cloudcolor_bright_f = m_cloudcolor_bright_f.getInterpolated(
 					cloudcolor_bright_dawn_f, color_change_fraction);
 		} else {
-			m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
-					bgcolor_bright_normal_f, color_change_fraction);
-			m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
-					skycolor_bright_normal_f, color_change_fraction);
+			if (time_brightness < 0.07) {  // Night sky
+				m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
+						bgcolor_bright_night_f, color_change_fraction);
+				m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
+						skycolor_bright_night_f, color_change_fraction);
+			} else {  // Daytime sky
+				m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
+						bgcolor_bright_normal_f, color_change_fraction);
+				m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
+						skycolor_bright_normal_f, color_change_fraction);
+			}
+
 			m_cloudcolor_bright_f = m_cloudcolor_bright_f.getInterpolated(
 					cloudcolor_bright_normal_f, color_change_fraction);
 		}

From dac40af6eeeb7205d507046fd4d9ae06ae182095 Mon Sep 17 00:00:00 2001
From: Diego Martinez <kaeza@users.sf.net>
Date: Mon, 4 Jan 2016 22:49:11 -0300
Subject: [PATCH 063/418] Server: Add reason for leave to `on_leaveplayer`
 callbacks

---
 doc/lua_api.txt                 | 3 ++-
 src/script/cpp_api/s_player.cpp | 6 ++++--
 src/script/cpp_api/s_player.h   | 2 +-
 src/server.cpp                  | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index ea47d0044..d89b0bf7b 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1912,8 +1912,9 @@ Call these functions only at load time!
      * If it returns a string, the player is disconnected with that string as reason
 * `minetest.register_on_joinplayer(func(ObjectRef))`
     * Called when a player joins the game
-* `minetest.register_on_leaveplayer(func(ObjectRef))`
+* `minetest.register_on_leaveplayer(func(ObjectRef, timed_out))`
     * Called when a player leaves the game
+    * `timed_out`: True for timeout, false for other reasons.
 * `minetest.register_on_cheat(func(ObjectRef, cheat))`
     * Called when a player cheats
     * `cheat`: `{type=<cheat_type>}`, where `<cheat_type>` is one of:
diff --git a/src/script/cpp_api/s_player.cpp b/src/script/cpp_api/s_player.cpp
index 807430678..a8c07476c 100644
--- a/src/script/cpp_api/s_player.cpp
+++ b/src/script/cpp_api/s_player.cpp
@@ -135,7 +135,8 @@ void ScriptApiPlayer::on_joinplayer(ServerActiveObject *player)
 	runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
 }
 
-void ScriptApiPlayer::on_leaveplayer(ServerActiveObject *player)
+void ScriptApiPlayer::on_leaveplayer(ServerActiveObject *player,
+		bool timeout)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -144,7 +145,8 @@ void ScriptApiPlayer::on_leaveplayer(ServerActiveObject *player)
 	lua_getfield(L, -1, "registered_on_leaveplayers");
 	// Call callbacks
 	objectrefGetOrCreate(L, player);
-	runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
+	lua_pushboolean(L, timeout);
+	runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);
 }
 
 void ScriptApiPlayer::on_cheat(ServerActiveObject *player,
diff --git a/src/script/cpp_api/s_player.h b/src/script/cpp_api/s_player.h
index 2e4dc2222..86ee1b024 100644
--- a/src/script/cpp_api/s_player.h
+++ b/src/script/cpp_api/s_player.h
@@ -38,7 +38,7 @@ public:
 	bool on_prejoinplayer(const std::string &name, const std::string &ip,
 		std::string *reason);
 	void on_joinplayer(ServerActiveObject *player);
-	void on_leaveplayer(ServerActiveObject *player);
+	void on_leaveplayer(ServerActiveObject *player, bool timeout);
 	void on_cheat(ServerActiveObject *player, const std::string &cheat_type);
 	bool on_punchplayer(ServerActiveObject *player,
 		ServerActiveObject *hitter, float time_from_last_punch,
diff --git a/src/server.cpp b/src/server.cpp
index ada45dc68..f7f698d50 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2683,7 +2683,7 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 				PlayerSAO *playersao = player->getPlayerSAO();
 				assert(playersao);
 
-				m_script->on_leaveplayer(playersao);
+				m_script->on_leaveplayer(playersao, reason == CDR_TIMEOUT);
 
 				playersao->disconnected();
 			}

From 817fea6330b9fceb4070b3ee83283140929b3ddc Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Sat, 11 Jun 2016 05:41:12 +0200
Subject: [PATCH 064/418] Fix android build

Thanks to @Wayward1 for reporting the bug.

Fixes #4212.
---
 build/android/jni/Android.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index e8534eaac..afd8c76b2 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -224,6 +224,7 @@ LOCAL_SRC_FILES := \
 		jni/src/util/auth.cpp                     \
 		jni/src/util/base64.cpp                   \
 		jni/src/util/directiontables.cpp          \
+		jni/src/util/enriched_string.cpp          \
 		jni/src/util/numeric.cpp                  \
 		jni/src/util/pointedthing.cpp             \
 		jni/src/util/serialize.cpp                \
@@ -256,7 +257,9 @@ LOCAL_SRC_FILES := \
 		jni/src/settings.cpp                      \
 		jni/src/wieldmesh.cpp                     \
 		jni/src/client/clientlauncher.cpp         \
-		jni/src/client/tile.cpp
+		jni/src/client/tile.cpp                   \
+		jni/src/client/joystick_controller.cpp    \
+		jni/src/irrlicht_changes/static_text.cpp
 
 # intentionally kept out (we already build openssl itself): jni/src/util/sha256.c
 

From 33b874fea3948dfcbcc2d6761c28b325ca4aa367 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sat, 11 Jun 2016 00:10:25 -0400
Subject: [PATCH 065/418] Settings: Clean up settings changed callback code

---
 src/settings.cpp | 45 ++++++++++++++++++++++-----------------------
 src/settings.h   | 31 ++++++++++++++++++++++---------
 2 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/settings.cpp b/src/settings.cpp
index 56afa6133..91ea9c58b 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -985,39 +985,38 @@ void Settings::clearDefaultsNoLock()
 }
 
 
-void Settings::registerChangedCallback(std::string name,
-	setting_changed_callback cbf, void *userdata)
+void Settings::registerChangedCallback(const std::string &name,
+	SettingsChangedCallback cbf, void *userdata)
 {
-	MutexAutoLock lock(m_callbackMutex);
+	MutexAutoLock lock(m_callback_mutex);
 	m_callbacks[name].push_back(std::make_pair(cbf, userdata));
 }
 
-void Settings::deregisterChangedCallback(std::string name, setting_changed_callback cbf, void *userdata)
+void Settings::deregisterChangedCallback(const std::string &name,
+	SettingsChangedCallback cbf, void *userdata)
 {
-	MutexAutoLock lock(m_callbackMutex);
-	std::map<std::string, std::vector<std::pair<setting_changed_callback, void*> > >::iterator iterToVector = m_callbacks.find(name);
-	if (iterToVector != m_callbacks.end())
-	{
-		std::vector<std::pair<setting_changed_callback, void*> > &vector = iterToVector->second;
+	MutexAutoLock lock(m_callback_mutex);
+	SettingsCallbackMap::iterator it_cbks = m_callbacks.find(name);
 
-		std::vector<std::pair<setting_changed_callback, void*> >::iterator position =
-			std::find(vector.begin(), vector.end(), std::make_pair(cbf, userdata));
+	if (it_cbks != m_callbacks.end()) {
+		SettingsCallbackList &cbks = it_cbks->second;
 
-		if (position != vector.end())
-			vector.erase(position);
+		SettingsCallbackList::iterator position =
+			std::find(cbks.begin(), cbks.end(), std::make_pair(cbf, userdata));
+
+		if (position != cbks.end())
+			cbks.erase(position);
 	}
 }
 
-void Settings::doCallbacks(const std::string name)
+void Settings::doCallbacks(const std::string &name) const
 {
-	MutexAutoLock lock(m_callbackMutex);
-	std::map<std::string, std::vector<std::pair<setting_changed_callback, void*> > >::iterator iterToVector = m_callbacks.find(name);
-	if (iterToVector != m_callbacks.end())
-	{
-		std::vector<std::pair<setting_changed_callback, void*> >::iterator iter;
-		for (iter = iterToVector->second.begin(); iter != iterToVector->second.end(); ++iter)
-		{
-			(iter->first)(name, iter->second);
-		}
+	MutexAutoLock lock(m_callback_mutex);
+
+	SettingsCallbackMap::const_iterator it_cbks = m_callbacks.find(name);
+	if (it_cbks != m_callbacks.end()) {
+		SettingsCallbackList::const_iterator it;
+		for (it = it_cbks->second.begin(); it != it_cbks->second.end(); ++it)
+			(it->first)(name, it->second);
 	}
 }
diff --git a/src/settings.h b/src/settings.h
index 80d41fd79..0af861a58 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -35,8 +35,17 @@ struct NoiseParams;
 extern Settings *g_settings;
 extern std::string g_settings_path;
 
-/** function type to register a changed callback */
-typedef void (*setting_changed_callback)(const std::string &name, void *data);
+// Type for a settings changed callback function
+typedef void (*SettingsChangedCallback)(const std::string &name, void *data);
+
+typedef std::vector<
+	std::pair<
+		SettingsChangedCallback,
+		void *
+	>
+> SettingsCallbackList;
+
+typedef std::map<std::string, SettingsCallbackList> SettingsCallbackMap;
 
 enum ValueType {
 	VALUETYPE_STRING,
@@ -209,24 +218,28 @@ public:
 	void clearDefaults();
 	void updateValue(const Settings &other, const std::string &name);
 	void update(const Settings &other);
-	void registerChangedCallback(std::string name, setting_changed_callback cbf, void *userdata = NULL);
-	void deregisterChangedCallback(std::string name, setting_changed_callback cbf, void *userdata = NULL);
+
+	void registerChangedCallback(const std::string &name,
+		SettingsChangedCallback cbf, void *userdata = NULL);
+	void deregisterChangedCallback(const std::string &name,
+		SettingsChangedCallback cbf, void *userdata = NULL);
 
 private:
-
 	void updateNoLock(const Settings &other);
 	void clearNoLock();
 	void clearDefaultsNoLock();
 
-	void doCallbacks(std::string name);
+	void doCallbacks(const std::string &name) const;
 
 	std::map<std::string, SettingsEntry> m_settings;
 	std::map<std::string, SettingsEntry> m_defaults;
 
-	std::map<std::string, std::vector<std::pair<setting_changed_callback,void*> > > m_callbacks;
+	SettingsCallbackMap m_callbacks;
 
-	mutable Mutex m_callbackMutex;
-	mutable Mutex m_mutex; // All methods that access m_settings/m_defaults directly should lock this.
+	mutable Mutex m_callback_mutex;
+
+	// All methods that access m_settings/m_defaults directly should lock this.
+	mutable Mutex m_mutex;
 
 };
 

From 27aff22a9b68044d3ea51db731597834336effa3 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sat, 11 Jun 2016 03:23:53 -0400
Subject: [PATCH 066/418] Random misc. warning fixes and cleanups

 - Fix unused c_sand member warning in Valleys Mapgen
 - Fix some code style
 - Make some std::string params const ref
---
 src/mapgen_valleys.h |  1 -
 src/util/string.cpp  | 19 +++++++++++--------
 src/util/string.h    |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index a7369ea92..faaffa905 100644
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -125,7 +125,6 @@ private:
 	Noise *noise_valley_profile;
 
 	content_t c_lava_source;
-	content_t c_sand;
 
 	float terrainLevelAtPoint(s16 x, s16 z);
 
diff --git a/src/util/string.cpp b/src/util/string.cpp
index 2c4143c76..94064ef93 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -314,7 +314,7 @@ std::string wide_to_narrow(const std::wstring &wcs)
 
 #endif
 
-std::string urlencode(std::string str)
+std::string urlencode(const std::string &str)
 {
 	// Encodes non-unreserved URI characters by a percent sign
 	// followed by two hex digits. See RFC 3986, section 2.3.
@@ -322,17 +322,18 @@ std::string urlencode(std::string str)
 	std::ostringstream oss(std::ios::binary);
 	for (u32 i = 0; i < str.size(); i++) {
 		unsigned char c = str[i];
-		if (isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~')
+		if (isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~') {
 			oss << c;
-		else
+		} else {
 			oss << "%"
 				<< url_hex_chars[(c & 0xf0) >> 4]
 				<< url_hex_chars[c & 0x0f];
+		}
 	}
 	return oss.str();
 }
 
-std::string urldecode(std::string str)
+std::string urldecode(const std::string &str)
 {
 	// Inverse of urlencode
 	std::ostringstream oss(std::ios::binary);
@@ -343,18 +344,20 @@ std::string urldecode(std::string str)
 				hex_digit_decode(str[i+2], lowvalue)) {
 			oss << (char) ((highvalue << 4) | lowvalue);
 			i += 2;
-		}
-		else
+		} else {
 			oss << str[i];
+		}
 	}
 	return oss.str();
 }
 
 u32 readFlagString(std::string str, const FlagDesc *flagdesc, u32 *flagmask)
 {
-	u32 result = 0, mask = 0;
+	u32 result = 0;
+	u32 mask = 0;
 	char *s = &str[0];
-	char *flagstr, *strpos = NULL;
+	char *flagstr;
+	char *strpos = NULL;
 
 	while ((flagstr = strtok_r(s, ",", &strpos))) {
 		s = NULL;
diff --git a/src/util/string.h b/src/util/string.h
index c77c5a6f9..8f4ef4711 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -77,8 +77,8 @@ wchar_t *narrow_to_wide_c(const char *str);
 std::wstring narrow_to_wide(const std::string &mbs);
 std::string wide_to_narrow(const std::wstring &wcs);
 
-std::string urlencode(std::string str);
-std::string urldecode(std::string str);
+std::string urlencode(const std::string &str);
+std::string urldecode(const std::string &str);
 u32 readFlagString(std::string str, const FlagDesc *flagdesc, u32 *flagmask);
 std::string writeFlagString(u32 flags, const FlagDesc *flagdesc, u32 flagmask);
 size_t mystrlcpy(char *dst, const char *src, size_t size);

From 559dd9946988cd35a7c26bcafe7d0f8c42dc547a Mon Sep 17 00:00:00 2001
From: Ekdohibs <nathanael.courant@laposte.net>
Date: Mon, 21 Mar 2016 12:58:52 +0100
Subject: [PATCH 067/418] Make node timers more efficient

---
 src/content_nodemeta.cpp           |  2 +-
 src/environment.cpp                | 32 +++++++------
 src/map.cpp                        |  9 ++--
 src/map.h                          |  2 +-
 src/mapblock.h                     |  4 +-
 src/nodetimer.cpp                  | 72 ++++++++++++++--------------
 src/nodetimer.h                    | 77 +++++++++++++++++++++++-------
 src/script/lua_api/l_nodetimer.cpp |  4 +-
 8 files changed, 125 insertions(+), 77 deletions(-)

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 7f4264d8e..79a32b6bf 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -186,7 +186,7 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
 		meta->set(p, data);
 
 		if(need_timer)
-			timers->set(p, NodeTimer(1., 0.));
+			timers->set(NodeTimer(1., 0., p));
 	}
 }
 
diff --git a/src/environment.cpp b/src/environment.cpp
index 413bc7ff1..eea264699 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1030,17 +1030,17 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
 	m_lbm_mgr.applyLBMs(this, block, stamp);
 
 	// Run node timers
-	std::map<v3s16, NodeTimer> elapsed_timers =
+	std::vector<NodeTimer> elapsed_timers =
 		block->m_node_timers.step((float)dtime_s);
-	if(!elapsed_timers.empty()){
+	if (!elapsed_timers.empty()) {
 		MapNode n;
-		for(std::map<v3s16, NodeTimer>::iterator
+		for (std::vector<NodeTimer>::iterator
 				i = elapsed_timers.begin();
 				i != elapsed_timers.end(); ++i){
-			n = block->getNodeNoEx(i->first);
-			v3s16 p = i->first + block->getPosRelative();
-			if(m_script->node_on_timer(p,n,i->second.elapsed))
-				block->setNodeTimer(i->first,NodeTimer(i->second.timeout,0));
+			n = block->getNodeNoEx(i->position);
+			v3s16 p = i->position + block->getPosRelative();
+			if (m_script->node_on_timer(p, n, i->elapsed))
+				block->setNodeTimer(NodeTimer(i->timeout, 0, i->position));
 		}
 	}
 
@@ -1434,17 +1434,19 @@ void ServerEnvironment::step(float dtime)
 					MOD_REASON_BLOCK_EXPIRED);
 
 			// Run node timers
-			std::map<v3s16, NodeTimer> elapsed_timers =
+			std::vector<NodeTimer> elapsed_timers =
 				block->m_node_timers.step((float)dtime);
-			if(!elapsed_timers.empty()){
+			if (!elapsed_timers.empty()) {
 				MapNode n;
-				for(std::map<v3s16, NodeTimer>::iterator
+				for (std::vector<NodeTimer>::iterator
 						i = elapsed_timers.begin();
-						i != elapsed_timers.end(); ++i){
-					n = block->getNodeNoEx(i->first);
-					p = i->first + block->getPosRelative();
-					if(m_script->node_on_timer(p,n,i->second.elapsed))
-						block->setNodeTimer(i->first,NodeTimer(i->second.timeout,0));
+						i != elapsed_timers.end(); ++i) {
+					n = block->getNodeNoEx(i->position);
+					p = i->position + block->getPosRelative();
+					if (m_script->node_on_timer(p, n, i->elapsed)) {
+						block->setNodeTimer(NodeTimer(
+							i->timeout, 0, i->position));
+					}
 				}
 			}
 		}
diff --git a/src/map.cpp b/src/map.cpp
index 03daf4fa8..a1f2086ce 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2087,11 +2087,13 @@ NodeTimer Map::getNodeTimer(v3s16 p)
 		return NodeTimer();
 	}
 	NodeTimer t = block->m_node_timers.get(p_rel);
-	return t;
+	NodeTimer nt(t.timeout, t.elapsed, p);
+	return nt;
 }
 
-void Map::setNodeTimer(v3s16 p, NodeTimer t)
+void Map::setNodeTimer(const NodeTimer &t)
 {
+	v3s16 p = t.position;
 	v3s16 blockpos = getNodeBlockPos(p);
 	v3s16 p_rel = p - blockpos*MAP_BLOCKSIZE;
 	MapBlock *block = getBlockNoCreateNoEx(blockpos);
@@ -2105,7 +2107,8 @@ void Map::setNodeTimer(v3s16 p, NodeTimer t)
 				<<std::endl;
 		return;
 	}
-	block->m_node_timers.set(p_rel, t);
+	NodeTimer nt(t.timeout, t.elapsed, p_rel);
+	block->m_node_timers.set(nt);
 }
 
 void Map::removeNodeTimer(v3s16 p)
diff --git a/src/map.h b/src/map.h
index 78614d228..23da56471 100644
--- a/src/map.h
+++ b/src/map.h
@@ -327,7 +327,7 @@ public:
 	*/
 
 	NodeTimer getNodeTimer(v3s16 p);
-	void setNodeTimer(v3s16 p, NodeTimer t);
+	void setNodeTimer(const NodeTimer &t);
 	void removeNodeTimer(v3s16 p);
 
 	/*
diff --git a/src/mapblock.h b/src/mapblock.h
index 73c17ee60..5adfcf3fb 100644
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -488,9 +488,9 @@ public:
 		m_node_timers.remove(p);
 	}
 
-	inline void setNodeTimer(v3s16 p, NodeTimer t)
+	inline void setNodeTimer(const NodeTimer &t)
 	{
-		m_node_timers.set(p,t);
+		m_node_timers.set(t);
 	}
 
 	inline void clearNodeTimers()
diff --git a/src/nodetimer.cpp b/src/nodetimer.cpp
index 350940546..003d08782 100644
--- a/src/nodetimer.cpp
+++ b/src/nodetimer.cpp
@@ -47,36 +47,38 @@ void NodeTimerList::serialize(std::ostream &os, u8 map_format_version) const
 {
 	if (map_format_version == 24) {
 		// Version 0 is a placeholder for "nothing to see here; go away."
-		if (m_data.empty()) {
+		if (m_timers.empty()) {
 			writeU8(os, 0); // version
 			return;
 		}
 		writeU8(os, 1); // version
-		writeU16(os, m_data.size());
+		writeU16(os, m_timers.size());
 	}
 
 	if (map_format_version >= 25) {
 		writeU8(os, 2 + 4 + 4); // length of the data for a single timer
-		writeU16(os, m_data.size());
+		writeU16(os, m_timers.size());
 	}
 
-	for (std::map<v3s16, NodeTimer>::const_iterator
-			i = m_data.begin();
-			i != m_data.end(); ++i) {
-		v3s16 p = i->first;
+	for (std::multimap<double, NodeTimer>::const_iterator
+			i = m_timers.begin();
+			i != m_timers.end(); ++i) {
 		NodeTimer t = i->second;
+		NodeTimer nt = NodeTimer(t.timeout,
+			t.timeout - (f32)(i->first - m_time), t.position);
+		v3s16 p = t.position;
 
 		u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X;
 		writeU16(os, p16);
-		t.serialize(os);
+		nt.serialize(os);
 	}
 }
 
 void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 {
-	m_data.clear();
+	clear();
 
-	if(map_format_version == 24){
+	if (map_format_version == 24) {
 		u8 timer_version = readU8(is);
 		if(timer_version == 0)
 			return;
@@ -84,7 +86,7 @@ void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 			throw SerializationError("unsupported NodeTimerList version");
 	}
 
-	if(map_format_version >= 25){
+	if (map_format_version >= 25) {
 		u8 timer_data_len = readU8(is);
 		if(timer_data_len != 2+4+4)
 			throw SerializationError("unsupported NodeTimer data length");
@@ -92,8 +94,7 @@ void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 
 	u16 count = readU16(is);
 
-	for(u16 i=0; i<count; i++)
-	{
+	for (u16 i = 0; i < count; i++) {
 		u16 p16 = readU16(is);
 
 		v3s16 p;
@@ -103,11 +104,10 @@ void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 		p16 &= MAP_BLOCKSIZE - 1;
 		p.X = p16;
 
-		NodeTimer t;
+		NodeTimer t(p);
 		t.deSerialize(is);
 
-		if(t.timeout <= 0)
-		{
+		if (t.timeout <= 0) {
 			warningstream<<"NodeTimerList::deSerialize(): "
 					<<"invalid data at position"
 					<<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
@@ -115,8 +115,7 @@ void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 			continue;
 		}
 
-		if(m_data.find(p) != m_data.end())
-		{
+		if (m_iterators.find(p) != m_iterators.end()) {
 			warningstream<<"NodeTimerList::deSerialize(): "
 					<<"already set data at position"
 					<<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
@@ -124,31 +123,30 @@ void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 			continue;
 		}
 
-		m_data.insert(std::make_pair(p, t));
+		insert(t);
 	}
 }
 
-std::map<v3s16, NodeTimer> NodeTimerList::step(float dtime)
+std::vector<NodeTimer> NodeTimerList::step(float dtime)
 {
-	std::map<v3s16, NodeTimer> elapsed_timers;
-	// Increment timers
-	for(std::map<v3s16, NodeTimer>::iterator
-			i = m_data.begin();
-			i != m_data.end(); ++i){
-		v3s16 p = i->first;
+	std::vector<NodeTimer> elapsed_timers;
+	m_time += dtime;
+	if (m_next_trigger_time == -1. || m_time < m_next_trigger_time) {
+		return elapsed_timers;
+	}
+	std::multimap<double, NodeTimer>::iterator i = m_timers.begin();
+	// Process timers
+	for (; i != m_timers.end() && i->first <= m_time; ++i) {
 		NodeTimer t = i->second;
-		t.elapsed += dtime;
-		if(t.elapsed >= t.timeout)
-			elapsed_timers.insert(std::make_pair(p, t));
-		else
-			i->second = t;
+		t.elapsed = t.timeout + (f32)(m_time - i->first);
+		elapsed_timers.push_back(t);
+		m_iterators.erase(t.position);
 	}
 	// Delete elapsed timers
-	for(std::map<v3s16, NodeTimer>::const_iterator
-			i = elapsed_timers.begin();
-			i != elapsed_timers.end(); ++i){
-		v3s16 p = i->first;
-		m_data.erase(p);
-	}
+	m_timers.erase(m_timers.begin(), i);
+	if (m_timers.empty())
+		m_next_trigger_time = -1.;
+	else
+		m_next_trigger_time = m_timers.begin()->first;
 	return elapsed_timers;
 }
diff --git a/src/nodetimer.h b/src/nodetimer.h
index 9fb56edec..0fd43b2a8 100644
--- a/src/nodetimer.h
+++ b/src/nodetimer.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irr_v3d.h"
 #include <iostream>
 #include <map>
+#include <vector>
 
 /*
 	NodeTimer provides per-node timed callback functionality.
@@ -36,8 +37,10 @@ class NodeTimer
 {
 public:
 	NodeTimer(): timeout(0.), elapsed(0.) {}
-	NodeTimer(f32 timeout_, f32 elapsed_):
-		timeout(timeout_), elapsed(elapsed_) {}
+	NodeTimer(const v3s16 &position_):
+		timeout(0.), elapsed(0.), position(position_) {}
+	NodeTimer(f32 timeout_, f32 elapsed_, v3s16 position_):
+		timeout(timeout_), elapsed(elapsed_), position(position_) {}
 	~NodeTimer() {}
 	
 	void serialize(std::ostream &os) const;
@@ -45,6 +48,7 @@ public:
 	
 	f32 timeout;
 	f32 elapsed;
+	v3s16 position;
 };
 
 /*
@@ -54,37 +58,78 @@ public:
 class NodeTimerList
 {
 public:
-	NodeTimerList() {}
+	NodeTimerList(): m_next_trigger_time(-1.), m_time(0.) {}
 	~NodeTimerList() {}
 	
 	void serialize(std::ostream &os, u8 map_format_version) const;
 	void deSerialize(std::istream &is, u8 map_format_version);
 	
 	// Get timer
-	NodeTimer get(v3s16 p){
-		std::map<v3s16, NodeTimer>::iterator n = m_data.find(p);
-		if(n == m_data.end())
+	NodeTimer get(const v3s16 &p) {
+		std::map<v3s16, std::multimap<double, NodeTimer>::iterator>::iterator n =
+			m_iterators.find(p);
+		if (n == m_iterators.end())
 			return NodeTimer();
-		return n->second;
+		NodeTimer t = n->second->second;
+		t.elapsed = t.timeout - (n->second->first - m_time);
+		return t;
 	}
 	// Deletes timer
-	void remove(v3s16 p){
-		m_data.erase(p);
+	void remove(v3s16 p) {
+		std::map<v3s16, std::multimap<double, NodeTimer>::iterator>::iterator n =
+			m_iterators.find(p);
+		if(n != m_iterators.end()) {
+			double removed_time = n->second->first;
+			m_timers.erase(n->second);
+			m_iterators.erase(n);
+			// Yes, this is float equality, but it is not a problem
+			// since we only test equality of floats as an ordered type
+			// and thus we never lose precision
+			if (removed_time == m_next_trigger_time) {
+				if (m_timers.empty())
+					m_next_trigger_time = -1.;
+				else
+					m_next_trigger_time = m_timers.begin()->first;
+			}
+		}
+	}
+	// Undefined behaviour if there already is a timer
+	void insert(NodeTimer timer) {
+		v3s16 p = timer.position;
+		double trigger_time = m_time + (double)(timer.timeout - timer.elapsed);
+		std::multimap<double, NodeTimer>::iterator it =
+			m_timers.insert(std::pair<double, NodeTimer>(
+				trigger_time, timer
+			));
+		m_iterators.insert(
+			std::pair<v3s16, std::multimap<double, NodeTimer>::iterator>(p, it));
+		if (m_next_trigger_time == -1. || trigger_time < m_next_trigger_time)
+			m_next_trigger_time = trigger_time;
 	}
 	// Deletes old timer and sets a new one
-	void set(v3s16 p, NodeTimer t){
-		m_data[p] = t;
+	inline void set(const NodeTimer &timer) {
+		remove(timer.position);
+		insert(timer);
 	}
 	// Deletes all timers
-	void clear(){
-		m_data.clear();
+	void clear() {
+		m_timers.clear();
+		m_iterators.clear();
+		m_next_trigger_time = -1.;
 	}
 
-	// A step in time. Returns map of elapsed timers.
-	std::map<v3s16, NodeTimer> step(float dtime);
+	inline double getNextTriggerTime() {
+		return m_next_trigger_time;
+	}
+
+	// Move forward in time, returns elapsed timers
+	std::vector<NodeTimer> step(float dtime);
 
 private:
-	std::map<v3s16, NodeTimer> m_data;
+	std::multimap<double, NodeTimer> m_timers;
+	std::map<v3s16, std::multimap<double, NodeTimer>::iterator> m_iterators;
+	double m_next_trigger_time;
+	double m_time;
 };
 
 #endif
diff --git a/src/script/lua_api/l_nodetimer.cpp b/src/script/lua_api/l_nodetimer.cpp
index 601113516..3242d6ea5 100644
--- a/src/script/lua_api/l_nodetimer.cpp
+++ b/src/script/lua_api/l_nodetimer.cpp
@@ -45,7 +45,7 @@ int NodeTimerRef::l_set(lua_State *L)
 	if(env == NULL) return 0;
 	f32 t = luaL_checknumber(L,2);
 	f32 e = luaL_checknumber(L,3);
-	env->getMap().setNodeTimer(o->m_p,NodeTimer(t,e));
+	env->getMap().setNodeTimer(NodeTimer(t, e, o->m_p));
 	return 0;
 }
 
@@ -56,7 +56,7 @@ int NodeTimerRef::l_start(lua_State *L)
 	ServerEnvironment *env = o->m_env;
 	if(env == NULL) return 0;
 	f32 t = luaL_checknumber(L,2);
-	env->getMap().setNodeTimer(o->m_p,NodeTimer(t,0));
+	env->getMap().setNodeTimer(NodeTimer(t, 0, o->m_p));
 	return 0;
 }
 

From a39d53628283ecbb6d7fa617eadeabe9bc5ef127 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Thu, 9 Jun 2016 03:15:41 +0100
Subject: [PATCH 068/418] Sky.cpp: Improve code style. Define sky colours as
 SColor

---
 src/sky.cpp | 525 ++++++++++++++++++++++++++--------------------------
 1 file changed, 267 insertions(+), 258 deletions(-)

diff --git a/src/sky.cpp b/src/sky.cpp
index 7757120bf..64f8cb5e7 100644
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -4,37 +4,37 @@
 #include "ICameraSceneNode.h"
 #include "S3DVertex.h"
 #include "client/tile.h"
-#include "noise.h"            // easeCurve
+#include "noise.h"  // easeCurve
 #include "profiler.h"
 #include "util/numeric.h"
 #include <cmath>
 #include "settings.h"
-#include "camera.h"           // CameraModes
+#include "camera.h"  // CameraModes
+
 
-//! constructor
 Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
 		ITextureSource *tsrc):
 		scene::ISceneNode(parent, mgr, id),
 		m_visible(true),
-		m_fallback_bg_color(255,255,255,255),
+		m_fallback_bg_color(255, 255, 255, 255),
 		m_first_update(true),
 		m_brightness(0.5),
 		m_cloud_brightness(0.5),
-		m_bgcolor_bright_f(1,1,1,1),
-		m_skycolor_bright_f(1,1,1,1),
-		m_cloudcolor_bright_f(1,1,1,1)
+		m_bgcolor_bright_f(1, 1, 1, 1),
+		m_skycolor_bright_f(1, 1, 1, 1),
+		m_cloudcolor_bright_f(1, 1, 1, 1)
 {
 	setAutomaticCulling(scene::EAC_OFF);
-	m_box.MaxEdge.set(0,0,0);
-	m_box.MinEdge.set(0,0,0);
+	m_box.MaxEdge.set(0, 0, 0);
+	m_box.MinEdge.set(0, 0, 0);
 
-	// create material
+	// Create material
 
 	video::SMaterial mat;
 	mat.Lighting = false;
 	mat.ZBuffer = video::ECFN_NEVER;
 	mat.ZWriteEnable = false;
-	mat.AntiAliasing=0;
+	mat.AntiAliasing = 0;
 	mat.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
 	mat.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
 	mat.BackfaceCulling = false;
@@ -59,14 +59,15 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
 	m_moon_tonemap = tsrc->isKnownSourceImage("moon_tonemap.png") ?
 		tsrc->getTexture("moon_tonemap.png") : NULL;
 
-	if (m_sun_texture){
+	if (m_sun_texture) {
 		m_materials[3] = mat;
 		m_materials[3].setTexture(0, m_sun_texture);
 		m_materials[3].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 		if (m_sun_tonemap)
 			m_materials[3].Lighting = true;
 	}
-	if (m_moon_texture){
+
+	if (m_moon_texture) {
 		m_materials[4] = mat;
 		m_materials[4].setTexture(0, m_moon_texture);
 		m_materials[4].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
@@ -74,11 +75,11 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
 			m_materials[4].Lighting = true;
 	}
 
-	for(u32 i=0; i<SKY_STAR_COUNT; i++){
+	for (u32 i = 0; i < SKY_STAR_COUNT; i++) {
 		m_stars[i] = v3f(
-			myrand_range(-10000,10000),
-			myrand_range(-10000,10000),
-			myrand_range(-10000,10000)
+			myrand_range(-10000, 10000),
+			myrand_range(-10000, 10000),
+			myrand_range(-10000, 10000)
 		);
 		m_stars[i].normalize();
 	}
@@ -86,6 +87,7 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
 	m_directional_colored_fog = g_settings->getBool("directional_colored_fog");
 }
 
+
 void Sky::OnRegisterSceneNode()
 {
 	if (IsVisible)
@@ -94,10 +96,10 @@ void Sky::OnRegisterSceneNode()
 	scene::ISceneNode::OnRegisterSceneNode();
 }
 
-//! renders the node.
+
 void Sky::render()
 {
-	if(!m_visible)
+	if (!m_visible)
 		return;
 
 	video::IVideoDriver* driver = SceneManager->getVideoDriver();
@@ -108,7 +110,7 @@ void Sky::render()
 	
 	ScopeProfiler sp(g_profiler, "Sky::render()", SPT_AVG);
 
-	// draw perspective skybox
+	// Draw perspective skybox
 
 	core::matrix4 translate(AbsoluteTransformation);
 	translate.setTranslation(camera->getAbsolutePosition());
@@ -120,16 +122,15 @@ void Sky::render()
 
 	driver->setTransform(video::ETS_WORLD, translate * scale);
 
-	if(m_sunlight_seen)
-	{
+	if (m_sunlight_seen) {
 		float sunsize = 0.07;
 		video::SColorf suncolor_f(1, 1, 0, 1);
 		suncolor_f.r = 1;
-		suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.7+m_time_brightness*(0.5)));
-		suncolor_f.b = MYMAX(0.0, m_brightness*0.95);
+		suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.7 + m_time_brightness * 0.5));
+		suncolor_f.b = MYMAX(0.0, m_brightness * 0.95);
 		video::SColorf suncolor2_f(1, 1, 1, 1);
 		suncolor_f.r = 1;
-		suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.85+m_time_brightness*(0.5)));
+		suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.85 + m_time_brightness * 0.5));
 		suncolor_f.b = MYMAX(0.0, m_brightness);
 
 		float moonsize = 0.04;
@@ -139,12 +140,12 @@ void Sky::render()
 		float nightlength = 0.415;
 		float wn = nightlength / 2;
 		float wicked_time_of_day = 0;
-		if(m_time_of_day > wn && m_time_of_day < 1.0 - wn)
-			wicked_time_of_day = (m_time_of_day - wn)/(1.0-wn*2)*0.5 + 0.25;
-		else if(m_time_of_day < 0.5)
+		if (m_time_of_day > wn && m_time_of_day < 1.0 - wn)
+			wicked_time_of_day = (m_time_of_day - wn) / (1.0 - wn * 2) * 0.5 + 0.25;
+		else if (m_time_of_day < 0.5)
 			wicked_time_of_day = m_time_of_day / wn * 0.25;
 		else
-			wicked_time_of_day = 1.0 - ((1.0-m_time_of_day) / wn * 0.25);
+			wicked_time_of_day = 1.0 - ((1.0 - m_time_of_day) / wn * 0.25);
 		/*std::cerr<<"time_of_day="<<m_time_of_day<<" -> "
 				<<"wicked_time_of_day="<<wicked_time_of_day<<std::endl;*/
 
@@ -154,77 +155,78 @@ void Sky::render()
 		video::SColor mooncolor2 = mooncolor2_f.toSColor();
 
 		// Calculate offset normalized to the X dimension of a 512x1 px tonemap
-		float offset=(1.0-fabs(sin((m_time_of_day - 0.5)*irr::core::PI)))*511;
+		float offset = (1.0 - fabs(sin((m_time_of_day - 0.5) * irr::core::PI))) * 511;
 
-		if (m_sun_tonemap){
+		if (m_sun_tonemap) {
 			u8 * texels = (u8 *)m_sun_tonemap->lock();
 			video::SColor* texel = (video::SColor *)(texels + (u32)offset * 4);
-			video::SColor texel_color (255,texel->getRed(),texel->getGreen(), texel->getBlue());
+			video::SColor texel_color (255, texel->getRed(),
+				texel->getGreen(), texel->getBlue());
 			m_sun_tonemap->unlock();
 			m_materials[3].EmissiveColor = texel_color;
 		}
-		if (m_moon_tonemap){
+
+		if (m_moon_tonemap) {
 			u8 * texels = (u8 *)m_moon_tonemap->lock();
 			video::SColor* texel = (video::SColor *)(texels + (u32)offset * 4);
-			video::SColor texel_color (255,texel->getRed(),texel->getGreen(), texel->getBlue());
+			video::SColor texel_color (255, texel->getRed(),
+				texel->getGreen(), texel->getBlue());
 			m_moon_tonemap->unlock();
 			m_materials[4].EmissiveColor = texel_color;
 		}
 
 		const f32 t = 1.0f;
 		const f32 o = 0.0f;
-		static const u16 indices[4] = {0,1,2,3};
+		static const u16 indices[4] = {0, 1, 2, 3};
 		video::S3DVertex vertices[4];
 		
 		driver->setMaterial(m_materials[1]);
 		
-		//video::SColor cloudyfogcolor(255,255,255,255);
 		video::SColor cloudyfogcolor = m_bgcolor;
-		//video::SColor cloudyfogcolor = m_bgcolor.getInterpolated(m_skycolor, 0.5);
 		
-		// Draw far cloudy fog thing
-		for(u32 j=0; j<4; j++)
-		{
+		// Draw far cloudy fog thing blended with skycolor
+		for (u32 j = 0; j < 4; j++) {
 			video::SColor c = cloudyfogcolor.getInterpolated(m_skycolor, 0.45);
-			vertices[0] = video::S3DVertex(-1, 0.08,-1, 0,0,1, c, t, t);
-			vertices[1] = video::S3DVertex( 1, 0.08,-1, 0,0,1, c, o, t);
-			vertices[2] = video::S3DVertex( 1, 0.12,-1, 0,0,1, c, o, o);
-			vertices[3] = video::S3DVertex(-1, 0.12,-1, 0,0,1, c, t, o);
-			for(u32 i=0; i<4; i++){
-				if(j==0)
+			vertices[0] = video::S3DVertex(-1, 0.08, -1, 0, 0, 1, c, t, t);
+			vertices[1] = video::S3DVertex( 1, 0.08, -1, 0, 0, 1, c, o, t);
+			vertices[2] = video::S3DVertex( 1, 0.12, -1, 0, 0, 1, c, o, o);
+			vertices[3] = video::S3DVertex(-1, 0.12, -1, 0, 0, 1, c, t, o);
+			for (u32 i = 0; i < 4; i++) {
+				if (j == 0)
 					// Don't switch
 					{}
-				else if(j==1)
+				else if (j == 1)
 					// Switch from -Z (south) to +X (east)
 					vertices[i].Pos.rotateXZBy(90);
-				else if(j==2)
+				else if (j == 2)
 					// Switch from -Z (south) to -X (west)
 					vertices[i].Pos.rotateXZBy(-90);
 				else
-					// Switch from -Z (south) to -Z (north)
+					// Switch from -Z (south) to +Z (north)
 					vertices[i].Pos.rotateXZBy(-180);
 			}
 			driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
 		}
-		for(u32 j=0; j<4; j++)
-		{
+
+		// Draw far cloudy fog thing
+		for (u32 j = 0; j < 4; j++) {
 			video::SColor c = cloudyfogcolor;
-			vertices[0] = video::S3DVertex(-1,-1.0,-1, 0,0,1, c, t, t);
-			vertices[1] = video::S3DVertex( 1,-1.0,-1, 0,0,1, c, o, t);
-			vertices[2] = video::S3DVertex( 1, 0.08,-1, 0,0,1, c, o, o);
-			vertices[3] = video::S3DVertex(-1, 0.08,-1, 0,0,1, c, t, o);
-			for(u32 i=0; i<4; i++){
-				if(j==0)
+			vertices[0] = video::S3DVertex(-1, -1.0, -1, 0, 0, 1, c, t, t);
+			vertices[1] = video::S3DVertex( 1, -1.0, -1, 0, 0, 1, c, o, t);
+			vertices[2] = video::S3DVertex( 1, 0.08, -1, 0, 0, 1, c, o, o);
+			vertices[3] = video::S3DVertex(-1, 0.08, -1, 0, 0, 1, c, t, o);
+			for (u32 i = 0; i < 4; i++) {
+				if (j == 0)
 					// Don't switch
 					{}
-				else if(j==1)
+				else if (j == 1)
 					// Switch from -Z (south) to +X (east)
 					vertices[i].Pos.rotateXZBy(90);
-				else if(j==2)
+				else if (j == 2)
 					// Switch from -Z (south) to -X (west)
 					vertices[i].Pos.rotateXZBy(-90);
 				else
-					// Switch from -Z (south) to -Z (north)
+					// Switch from -Z (south) to +Z (north)
 					vertices[i].Pos.rotateXZBy(-180);
 			}
 			driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
@@ -232,20 +234,21 @@ void Sky::render()
 
 		driver->setMaterial(m_materials[2]);
 
+		// Draw sunrise/sunset horizon glow texture (textures/base/pack/sunrisebg.png)
 		{
 			float mid1 = 0.25;
-			float mid = (wicked_time_of_day < 0.5 ? mid1 : (1.0 - mid1));
+			float mid = wicked_time_of_day < 0.5 ? mid1 : (1.0 - mid1);
 			float a_ = 1.0 - fabs(wicked_time_of_day - mid) * 35.0;
 			float a = easeCurve(MYMAX(0, MYMIN(1, a_)));
 			//std::cerr<<"a_="<<a_<<" a="<<a<<std::endl;
-			video::SColor c(255,255,255,255);
+			video::SColor c(255, 255, 255, 255);
 			float y = -(1.0 - a) * 0.22;
-			vertices[0] = video::S3DVertex(-1,-0.05+y,-1, 0,0,1, c, t, t);
-			vertices[1] = video::S3DVertex( 1,-0.05+y,-1, 0,0,1, c, o, t);
-			vertices[2] = video::S3DVertex( 1, 0.2+y,-1, 0,0,1, c, o, o);
-			vertices[3] = video::S3DVertex(-1, 0.2+y,-1, 0,0,1, c, t, o);
-			for(u32 i=0; i<4; i++){
-				if(wicked_time_of_day < 0.5)
+			vertices[0] = video::S3DVertex(-1, -0.05 + y, -1, 0, 0, 1, c, t, t);
+			vertices[1] = video::S3DVertex( 1, -0.05 + y, -1, 0, 0, 1, c, o, t);
+			vertices[2] = video::S3DVertex( 1,   0.2 + y, -1, 0, 0, 1, c, o, o);
+			vertices[3] = video::S3DVertex(-1,   0.2 + y, -1, 0, 0, 1, c, t, o);
+			for (u32 i = 0; i < 4; i++) {
+				if (wicked_time_of_day < 0.5)
 					// Switch from -Z (south) to +X (east)
 					vertices[i].Pos.rotateXZBy(90);
 				else
@@ -256,17 +259,17 @@ void Sky::render()
 		}
 
 		// Draw sun
-		if(wicked_time_of_day > 0.15 && wicked_time_of_day < 0.85){
-			if (!m_sun_texture){
+		if (wicked_time_of_day > 0.15 && wicked_time_of_day < 0.85) {
+			if (!m_sun_texture) {
 				driver->setMaterial(m_materials[1]);
 				float d = sunsize * 1.7;
 				video::SColor c = suncolor;
-				c.setAlpha(0.05*255);
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-				vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-				vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-				vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-				for(u32 i=0; i<4; i++){
+				c.setAlpha(0.05 * 255);
+				vertices[0] = video::S3DVertex(-d, -d, -1, 0, 0, 1, c, t, t);
+				vertices[1] = video::S3DVertex( d, -d, -1, 0, 0, 1, c, o, t);
+				vertices[2] = video::S3DVertex( d,  d, -1, 0, 0, 1, c, o, o);
+				vertices[3] = video::S3DVertex(-d,  d, -1, 0, 0, 1, c, t, o);
+				for (u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to +X (east)
 					vertices[i].Pos.rotateXZBy(90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -275,12 +278,12 @@ void Sky::render()
 
 				d = sunsize * 1.2;
 				c = suncolor;
-				c.setAlpha(0.15*255);
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-				vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-				vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-				vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-				for(u32 i=0; i<4; i++){
+				c.setAlpha(0.15 * 255);
+				vertices[0] = video::S3DVertex(-d, -d, -1, 0, 0, 1, c, t, t);
+				vertices[1] = video::S3DVertex( d, -d, -1, 0, 0, 1, c, o, t);
+				vertices[2] = video::S3DVertex( d,  d, -1, 0, 0, 1, c, o, o);
+				vertices[3] = video::S3DVertex(-d,  d, -1, 0, 0, 1, c, t, o);
+				for (u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to +X (east)
 					vertices[i].Pos.rotateXZBy(90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -288,11 +291,11 @@ void Sky::render()
 				driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
 
 				d = sunsize;
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, suncolor, t, t);
-				vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, suncolor, o, t);
-				vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, suncolor, o, o);
-				vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, suncolor, t, o);
-				for(u32 i=0; i<4; i++){
+				vertices[0] = video::S3DVertex(-d, -d, -1, 0, 0, 1, suncolor, t, t);
+				vertices[1] = video::S3DVertex( d, -d, -1, 0, 0, 1, suncolor, o, t);
+				vertices[2] = video::S3DVertex( d,  d, -1, 0, 0, 1, suncolor, o, o);
+				vertices[3] = video::S3DVertex(-d,  d, -1, 0, 0, 1, suncolor, t, o);
+				for (u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to +X (east)
 					vertices[i].Pos.rotateXZBy(90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -300,11 +303,11 @@ void Sky::render()
 				driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
 
 				d = sunsize * 0.7;
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, suncolor2, t, t);
-				vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, suncolor2, o, t);
-				vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, suncolor2, o, o);
-				vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, suncolor2, t, o);
-				for(u32 i=0; i<4; i++){
+				vertices[0] = video::S3DVertex(-d, -d, -1, 0, 0, 1, suncolor2, t, t);
+				vertices[1] = video::S3DVertex( d, -d, -1, 0, 0, 1, suncolor2, o, t);
+				vertices[2] = video::S3DVertex( d,  d, -1, 0, 0, 1, suncolor2, o, o);
+				vertices[3] = video::S3DVertex(-d,  d, -1, 0, 0, 1, suncolor2, t, o);
+				for (u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to +X (east)
 					vertices[i].Pos.rotateXZBy(90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -315,14 +318,14 @@ void Sky::render()
 				float d = sunsize * 1.7;
 				video::SColor c;
 				if (m_sun_tonemap)
-					c = video::SColor (0,0,0,0);
+					c = video::SColor (0, 0, 0, 0);
 				else
-					c = video::SColor (255,255,255,255);
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-				vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-				vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-				vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-				for(u32 i=0; i<4; i++){
+					c = video::SColor (255, 255, 255, 255);
+				vertices[0] = video::S3DVertex(-d, -d, -1, 0, 0, 1, c, t, t);
+				vertices[1] = video::S3DVertex( d, -d, -1, 0, 0, 1, c, o, t);
+				vertices[2] = video::S3DVertex( d,  d, -1, 0, 0, 1, c, o, o);
+				vertices[3] = video::S3DVertex(-d,  d, -1, 0, 0, 1, c, t, o);
+				for(u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to +X (east)
 					vertices[i].Pos.rotateXZBy(90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -332,18 +335,17 @@ void Sky::render()
 		}
 
 		// Draw moon
-		if(wicked_time_of_day < 0.3 || wicked_time_of_day > 0.7)
-		{
-			if (!m_moon_texture){
+		if (wicked_time_of_day < 0.3 || wicked_time_of_day > 0.7) {
+			if (!m_moon_texture) {
 				driver->setMaterial(m_materials[1]);
 				float d = moonsize * 1.9;
 				video::SColor c = mooncolor;
-				c.setAlpha(0.05*255);
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-				vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-				vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-				vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-				for(u32 i=0; i<4; i++){
+				c.setAlpha(0.05 * 255);
+				vertices[0] = video::S3DVertex(-d, -d, -1, 0, 0, 1, c, t, t);
+				vertices[1] = video::S3DVertex( d, -d, -1, 0, 0, 1, c, o, t);
+				vertices[2] = video::S3DVertex( d,  d, -1, 0, 0, 1, c, o, o);
+				vertices[3] = video::S3DVertex(-d,  d, -1, 0, 0, 1, c, t, o);
+				for (u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to -X (west)
 					vertices[i].Pos.rotateXZBy(-90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -352,12 +354,12 @@ void Sky::render()
 			
 				d = moonsize * 1.3;
 				c = mooncolor;
-				c.setAlpha(0.15*255);
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-				vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-				vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-				vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-				for(u32 i=0; i<4; i++){
+				c.setAlpha(0.15 * 255);
+				vertices[0] = video::S3DVertex(-d, -d, -1, 0, 0, 1, c, t, t);
+				vertices[1] = video::S3DVertex( d, -d, -1, 0, 0, 1, c, o, t);
+				vertices[2] = video::S3DVertex( d,  d, -1, 0, 0, 1, c, o, o);
+				vertices[3] = video::S3DVertex(-d,  d, -1, 0, 0, 1, c, t, o);
+				for (u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to -X (west)
 					vertices[i].Pos.rotateXZBy(-90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -365,11 +367,11 @@ void Sky::render()
 				driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
 
 				d = moonsize;
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, mooncolor, t, t);
-				vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, mooncolor, o, t);
-				vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, mooncolor, o, o);
-				vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, mooncolor, t, o);
-				for(u32 i=0; i<4; i++){
+				vertices[0] = video::S3DVertex(-d, -d, -1, 0, 0, 1, mooncolor, t, t);
+				vertices[1] = video::S3DVertex( d, -d, -1, 0, 0, 1, mooncolor, o, t);
+				vertices[2] = video::S3DVertex( d,  d, -1, 0, 0, 1, mooncolor, o, o);
+				vertices[3] = video::S3DVertex(-d,  d, -1, 0, 0, 1, mooncolor, t, o);
+				for (u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to -X (west)
 					vertices[i].Pos.rotateXZBy(-90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -377,11 +379,11 @@ void Sky::render()
 				driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
 
 				float d2 = moonsize * 0.6;
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, mooncolor2, t, t);
-				vertices[1] = video::S3DVertex( d2,-d,-1, 0,0,1, mooncolor2, o, t);
-				vertices[2] = video::S3DVertex( d2, d2,-1, 0,0,1, mooncolor2, o, o);
-				vertices[3] = video::S3DVertex(-d, d2,-1, 0,0,1, mooncolor2, t, o);
-				for(u32 i=0; i<4; i++){
+				vertices[0] = video::S3DVertex(-d, -d,  -1, 0, 0, 1, mooncolor2, t, t);
+				vertices[1] = video::S3DVertex( d2,-d,  -1, 0, 0, 1, mooncolor2, o, t);
+				vertices[2] = video::S3DVertex( d2, d2, -1, 0, 0, 1, mooncolor2, o, o);
+				vertices[3] = video::S3DVertex(-d,  d2, -1, 0, 0, 1, mooncolor2, t, o);
+				for (u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to -X (west)
 					vertices[i].Pos.rotateXZBy(-90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -392,14 +394,14 @@ void Sky::render()
 				float d = moonsize * 1.9;
 				video::SColor c;
 				if (m_moon_tonemap)
-					c = video::SColor (0,0,0,0);
+					c = video::SColor (0, 0, 0, 0);
 				else
-					c = video::SColor (255,255,255,255);
-				vertices[0] = video::S3DVertex(-d,-d,-1, 0,0,1, c, t, t);
-				vertices[1] = video::S3DVertex( d,-d,-1, 0,0,1, c, o, t);
-				vertices[2] = video::S3DVertex( d, d,-1, 0,0,1, c, o, o);
-				vertices[3] = video::S3DVertex(-d, d,-1, 0,0,1, c, t, o);
-				for(u32 i=0; i<4; i++){
+					c = video::SColor (255, 255, 255, 255);
+				vertices[0] = video::S3DVertex(-d, -d, -1, 0, 0, 1, c, t, t);
+				vertices[1] = video::S3DVertex( d, -d, -1, 0, 0, 1, c, o, t);
+				vertices[2] = video::S3DVertex( d,  d, -1, 0, 0, 1, c, o, o);
+				vertices[3] = video::S3DVertex(-d,  d, -1, 0, 0, 1, c, t, o);
+				for (u32 i = 0; i < 4; i++) {
 					// Switch from -Z (south) to -X (west)
 					vertices[i].Pos.rotateXZBy(-90);
 					vertices[i].Pos.rotateXYBy(wicked_time_of_day * 360 - 90);
@@ -408,64 +410,63 @@ void Sky::render()
 			}
 		}
 
-		// Stars
+		// Draw stars
 		driver->setMaterial(m_materials[1]);
-		do{
+		do {
 			float starbrightness = MYMAX(0, MYMIN(1,
-					(0.285 - fabs(wicked_time_of_day < 0.5 ?
-					wicked_time_of_day : (1.0 - wicked_time_of_day))) * 10));
+				(0.285 - fabs(wicked_time_of_day < 0.5 ?
+				wicked_time_of_day : (1.0 - wicked_time_of_day))) * 10));
 			float f = starbrightness;
 			float d = 0.007;
-			video::SColor starcolor(255, f*90,f*90,f*90);
-			if(starcolor.getBlue() < m_skycolor.getBlue())
+			video::SColor starcolor(255, f * 90, f * 90, f * 90);
+			if (starcolor.getBlue() < m_skycolor.getBlue())
 				break;
-			u16 indices[SKY_STAR_COUNT*4];
-			video::S3DVertex vertices[SKY_STAR_COUNT*4];
-			for(u32 i=0; i<SKY_STAR_COUNT; i++){
-				indices[i*4+0] = i*4+0;
-				indices[i*4+1] = i*4+1;
-				indices[i*4+2] = i*4+2;
-				indices[i*4+3] = i*4+3;
+			u16 indices[SKY_STAR_COUNT * 4];
+			video::S3DVertex vertices[SKY_STAR_COUNT * 4];
+			for (u32 i = 0; i < SKY_STAR_COUNT; i++) {
+				indices[i * 4 + 0] = i * 4 + 0;
+				indices[i * 4 + 1] = i * 4 + 1;
+				indices[i * 4 + 2] = i * 4 + 2;
+				indices[i * 4 + 3] = i * 4 + 3;
 				v3f p = m_stars[i];
 				core::CMatrix4<f32> a;
-				a.buildRotateFromTo(v3f(0,1,0), v3f(d,1+d/2,0));
+				a.buildRotateFromTo(v3f(0, 1, 0), v3f(d, 1 + d / 2, 0));
 				v3f p1 = p;
 				a.rotateVect(p1);
-				a.buildRotateFromTo(v3f(0,1,0), v3f(d,1,d));
+				a.buildRotateFromTo(v3f(0, 1, 0), v3f(d, 1, d));
 				v3f p2 = p;
 				a.rotateVect(p2);
-				a.buildRotateFromTo(v3f(0,1,0), v3f(0,1-d/2,d));
+				a.buildRotateFromTo(v3f(0, 1, 0), v3f(0, 1 - d / 2, d));
 				v3f p3 = p;
 				a.rotateVect(p3);
 				p.rotateXYBy(wicked_time_of_day * 360 - 90);
 				p1.rotateXYBy(wicked_time_of_day * 360 - 90);
 				p2.rotateXYBy(wicked_time_of_day * 360 - 90);
 				p3.rotateXYBy(wicked_time_of_day * 360 - 90);
-				vertices[i*4+0].Pos = p;
-				vertices[i*4+0].Color = starcolor;
-				vertices[i*4+1].Pos = p1;
-				vertices[i*4+1].Color = starcolor;
-				vertices[i*4+2].Pos = p2;
-				vertices[i*4+2].Color = starcolor;
-				vertices[i*4+3].Pos = p3;
-				vertices[i*4+3].Color = starcolor;
+				vertices[i * 4 + 0].Pos = p;
+				vertices[i * 4 + 0].Color = starcolor;
+				vertices[i * 4 + 1].Pos = p1;
+				vertices[i * 4 + 1].Color = starcolor;
+				vertices[i * 4 + 2].Pos = p2;
+				vertices[i * 4 + 2].Color = starcolor;
+				vertices[i * 4 + 3].Pos = p3;
+				vertices[i * 4 + 3].Color = starcolor;
 			}
-			driver->drawVertexPrimitiveList(vertices, SKY_STAR_COUNT*4,
-					indices, SKY_STAR_COUNT, video::EVT_STANDARD,
-					scene::EPT_QUADS, video::EIT_16BIT);
-		}while(0);
+			driver->drawVertexPrimitiveList(vertices, SKY_STAR_COUNT * 4,
+				indices, SKY_STAR_COUNT, video::EVT_STANDARD,
+				scene::EPT_QUADS, video::EIT_16BIT);
+		} while(0);
 		
-		for(u32 j=0; j<2; j++)
-		{
-			//video::SColor c = m_skycolor;
+		// Draw far cloudy fog thing below east and west horizons
+		for (u32 j = 0; j < 2; j++) {
 			video::SColor c = cloudyfogcolor;
-			vertices[0] = video::S3DVertex(-1,-1.0,-1, 0,0,1, c, t, t);
-			vertices[1] = video::S3DVertex( 1,-1.0,-1, 0,0,1, c, o, t);
-			vertices[2] = video::S3DVertex( 1,-0.02,-1, 0,0,1, c, o, o);
-			vertices[3] = video::S3DVertex(-1,-0.02,-1, 0,0,1, c, t, o);
-			for(u32 i=0; i<4; i++){
-				//if(wicked_time_of_day < 0.5)
-				if(j==0)
+			vertices[0] = video::S3DVertex(-1, -1.0,  -1, 0, 0, 1, c, t, t);
+			vertices[1] = video::S3DVertex( 1, -1.0,  -1, 0, 0, 1, c, o, t);
+			vertices[2] = video::S3DVertex( 1, -0.02, -1, 0, 0, 1, c, o, o);
+			vertices[3] = video::S3DVertex(-1, -0.02, -1, 0, 0, 1, c, t, o);
+			for (u32 i = 0; i < 4; i++) {
+				//if (wicked_time_of_day < 0.5)
+				if (j == 0)
 					// Switch from -Z (south) to +X (east)
 					vertices[i].Pos.rotateXZBy(90);
 				else
@@ -477,20 +478,21 @@ void Sky::render()
 	}
 }
 
+
 void Sky::update(float time_of_day, float time_brightness,
 		float direct_brightness, bool sunlight_seen,
 		CameraMode cam_mode, float yaw, float pitch)
 {
 	// Stabilize initial brightness and color values by flooding updates
-	if(m_first_update){
+	if (m_first_update) {
 		/*dstream<<"First update with time_of_day="<<time_of_day
 				<<" time_brightness="<<time_brightness
 				<<" direct_brightness="<<direct_brightness
 				<<" sunlight_seen="<<sunlight_seen<<std::endl;*/
 		m_first_update = false;
-		for(u32 i=0; i<100; i++){
+		for (u32 i = 0; i < 100; i++) {
 			update(time_of_day, time_brightness, direct_brightness,
-					sunlight_seen, cam_mode, yaw, pitch);
+				sunlight_seen, cam_mode, yaw, pitch);
 		}
 		return;
 	}
@@ -501,43 +503,42 @@ void Sky::update(float time_of_day, float time_brightness,
 	
 	bool is_dawn = (time_brightness >= 0.20 && time_brightness < 0.35);
 
-	//video::SColorf bgcolor_bright_normal_f(170./255,200./255,230./255, 1.0);
-	video::SColorf bgcolor_bright_normal_f(155./255,193./255,240./255, 1.0);
-	video::SColorf bgcolor_bright_indoor_f(100./255,100./255,100./255, 1.0);
-	//video::SColorf bgcolor_bright_dawn_f(0.666,200./255*0.7,230./255*0.5,1.0);
-	//video::SColorf bgcolor_bright_dawn_f(0.666,0.549,0.220,1.0);
-	//video::SColorf bgcolor_bright_dawn_f(0.666*1.2,0.549*1.0,0.220*1.0, 1.0);
-	//video::SColorf bgcolor_bright_dawn_f(0.666*1.2,0.549*1.0,0.220*1.2,1.0);
-	video::SColorf bgcolor_bright_dawn_f
-			(155./255*1.2,193./255,240./255, 1.0);
-	video::SColorf bgcolor_bright_night_f
-			(64./255, 144./255, 255./255, 1.0);
+	/*
+	Development colours
 
-	video::SColorf skycolor_bright_normal_f =
-			video::SColor(255, 140, 186, 250);
-	video::SColorf skycolor_bright_dawn_f =
-			video::SColor(255, 180, 186, 250);
-	video::SColorf skycolor_bright_night_f =
-			video::SColor(255, 0, 107, 255);
+	video::SColorf bgcolor_bright_normal_f(170. / 255, 200. / 255, 230. / 255, 1.0);
+	video::SColorf bgcolor_bright_dawn_f(0.666, 200. / 255 * 0.7, 230. / 255 * 0.5, 1.0);
+	video::SColorf bgcolor_bright_dawn_f(0.666, 0.549, 0.220, 1.0);
+	video::SColorf bgcolor_bright_dawn_f(0.666 * 1.2, 0.549 * 1.0, 0.220 * 1.0, 1.0);
+	video::SColorf bgcolor_bright_dawn_f(0.666 * 1.2, 0.549 * 1.0, 0.220 * 1.2, 1.0);
+
+	video::SColorf cloudcolor_bright_dawn_f(1.0, 0.591, 0.4);
+	video::SColorf cloudcolor_bright_dawn_f(1.0, 0.65, 0.44);
+	video::SColorf cloudcolor_bright_dawn_f(1.0, 0.7, 0.5);
+	*/
+
+	video::SColorf bgcolor_bright_normal_f = video::SColor(255, 155, 193, 240);
+	video::SColorf bgcolor_bright_indoor_f = video::SColor(255, 100, 100, 100);
+	video::SColorf bgcolor_bright_dawn_f = video::SColor(255, 186, 193, 240);
+	video::SColorf bgcolor_bright_night_f = video::SColor(255, 64, 144, 255);
+
+	video::SColorf skycolor_bright_normal_f = video::SColor(255, 140, 186, 250);
+	video::SColorf skycolor_bright_dawn_f = video::SColor(255, 180, 186, 250);
+	video::SColorf skycolor_bright_night_f = video::SColor(255, 0, 107, 255);
 	
-	video::SColorf cloudcolor_bright_normal_f =
-			video::SColor(255, 240,240,255);
-	//video::SColorf cloudcolor_bright_dawn_f(1.0, 0.591, 0.4);
-	//video::SColorf cloudcolor_bright_dawn_f(1.0, 0.65, 0.44);
-	//video::SColorf cloudcolor_bright_dawn_f(1.0, 0.7, 0.5);
-	video::SColorf cloudcolor_bright_dawn_f(1.0, 0.875, 0.75);
+	video::SColorf cloudcolor_bright_normal_f = video::SColor(255, 240, 240, 255);
+	video::SColorf cloudcolor_bright_dawn_f = video::SColor(255, 255, 223, 191);
 
 	float cloud_color_change_fraction = 0.95;
-	if(sunlight_seen){
-		if(fabs(time_brightness - m_brightness) < 0.2){
+	if (sunlight_seen) {
+		if (fabs(time_brightness - m_brightness) < 0.2) {
 			m_brightness = m_brightness * 0.95 + time_brightness * 0.05;
 		} else {
 			m_brightness = m_brightness * 0.80 + time_brightness * 0.20;
 			cloud_color_change_fraction = 0.0;
 		}
-	}
-	else{
-		if(direct_brightness < m_brightness)
+	} else {
+		if (direct_brightness < m_brightness)
 			m_brightness = m_brightness * 0.95 + direct_brightness * 0.05;
 		else
 			m_brightness = m_brightness * 0.98 + direct_brightness * 0.02;
@@ -545,37 +546,37 @@ void Sky::update(float time_of_day, float time_brightness,
 	
 	m_clouds_visible = true;
 	float color_change_fraction = 0.98;
-	if(sunlight_seen){
-		if(is_dawn){
+	if (sunlight_seen) {
+		if (is_dawn) {  // Dawn
 			m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
-					bgcolor_bright_dawn_f, color_change_fraction);
+				bgcolor_bright_dawn_f, color_change_fraction);
 			m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
-					skycolor_bright_dawn_f, color_change_fraction);
+				skycolor_bright_dawn_f, color_change_fraction);
 			m_cloudcolor_bright_f = m_cloudcolor_bright_f.getInterpolated(
-					cloudcolor_bright_dawn_f, color_change_fraction);
+				cloudcolor_bright_dawn_f, color_change_fraction);
 		} else {
-			if (time_brightness < 0.07) {  // Night sky
+			if (time_brightness < 0.07) {  // Night
 				m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
-						bgcolor_bright_night_f, color_change_fraction);
+					bgcolor_bright_night_f, color_change_fraction);
 				m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
-						skycolor_bright_night_f, color_change_fraction);
-			} else {  // Daytime sky
+					skycolor_bright_night_f, color_change_fraction);
+			} else {  // Day
 				m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
-						bgcolor_bright_normal_f, color_change_fraction);
+					bgcolor_bright_normal_f, color_change_fraction);
 				m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
-						skycolor_bright_normal_f, color_change_fraction);
+					skycolor_bright_normal_f, color_change_fraction);
 			}
 
 			m_cloudcolor_bright_f = m_cloudcolor_bright_f.getInterpolated(
-					cloudcolor_bright_normal_f, color_change_fraction);
+				cloudcolor_bright_normal_f, color_change_fraction);
 		}
 	} else {
 		m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
-				bgcolor_bright_indoor_f, color_change_fraction);
+			bgcolor_bright_indoor_f, color_change_fraction);
 		m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
-				bgcolor_bright_indoor_f, color_change_fraction);
+			bgcolor_bright_indoor_f, color_change_fraction);
 		m_cloudcolor_bright_f = m_cloudcolor_bright_f.getInterpolated(
-				cloudcolor_bright_normal_f, color_change_fraction);
+			cloudcolor_bright_normal_f, color_change_fraction);
 		m_clouds_visible = false;
 	}
 
@@ -584,63 +585,71 @@ void Sky::update(float time_of_day, float time_brightness,
 		255,
 		bgcolor_bright.getRed() * m_brightness,
 		bgcolor_bright.getGreen() * m_brightness,
-		bgcolor_bright.getBlue() * m_brightness);
+		bgcolor_bright.getBlue() * m_brightness
+	);
 
 	video::SColor skycolor_bright = m_skycolor_bright_f.toSColor();
 	m_skycolor = video::SColor(
 		255,
 		skycolor_bright.getRed() * m_brightness,
 		skycolor_bright.getGreen() * m_brightness,
-		skycolor_bright.getBlue() * m_brightness);
+		skycolor_bright.getBlue() * m_brightness
+	);
 
 	// Horizon coloring based on sun and moon direction during sunset and sunrise
 	video::SColor pointcolor = video::SColor(255, 255, 255, m_bgcolor.getAlpha());
 	if (m_directional_colored_fog) {
-		if (m_horizon_blend() != 0)
-		{
-			// calculate hemisphere value from yaw, (inverted in third person front view)
+		if (m_horizon_blend() != 0) {
+			// Calculate hemisphere value from yaw, (inverted in third person front view)
 			s8 dir_factor = 1;
 			if (cam_mode > CAMERA_MODE_THIRD)
 				dir_factor = -1;
-			f32 pointcolor_blend = wrapDegrees_0_360( yaw*dir_factor + 90);
+			f32 pointcolor_blend = wrapDegrees_0_360(yaw * dir_factor + 90);
 			if (pointcolor_blend > 180)
 				pointcolor_blend = 360 - pointcolor_blend;
 			pointcolor_blend /= 180;
-			// bound view angle to determine where transition starts and ends
-			pointcolor_blend = rangelim(1 - pointcolor_blend * 1.375, 0, 1 / 1.375) * 1.375;
-			// combine the colors when looking up or down, otherwise turning looks weird
-			pointcolor_blend += (0.5 - pointcolor_blend) * (1 - MYMIN((90 - std::abs(pitch)) / 90 * 1.5, 1));
-			// invert direction to match where the sun and moon are rising
+			// Bound view angle to determine where transition starts and ends
+			pointcolor_blend = rangelim(1 - pointcolor_blend * 1.375, 0, 1 / 1.375) *
+				1.375;
+			// Combine the colors when looking up or down, otherwise turning looks weird
+			pointcolor_blend += (0.5 - pointcolor_blend) *
+				(1 - MYMIN((90 - std::fabs(pitch)) / 90 * 1.5, 1));
+			// Invert direction to match where the sun and moon are rising
 			if (m_time_of_day > 0.5)
 				pointcolor_blend = 1 - pointcolor_blend;
-			// horizon colors of sun and moon
+			// Horizon colors of sun and moon
 			f32 pointcolor_light = rangelim(m_time_brightness * 3, 0.2, 1);
 
 			video::SColorf pointcolor_sun_f(1, 1, 1, 1);
-			if (m_sun_tonemap)
-			{
-				pointcolor_sun_f.r = pointcolor_light * (float)m_materials[3].EmissiveColor.getRed() / 255;
-				pointcolor_sun_f.b = pointcolor_light * (float)m_materials[3].EmissiveColor.getBlue() / 255;
-				pointcolor_sun_f.g = pointcolor_light * (float)m_materials[3].EmissiveColor.getGreen() / 255;
-			}
-			else
-			{
+			if (m_sun_tonemap) {
+				pointcolor_sun_f.r = pointcolor_light *
+					(float)m_materials[3].EmissiveColor.getRed() / 255;
+				pointcolor_sun_f.b = pointcolor_light *
+					(float)m_materials[3].EmissiveColor.getBlue() / 255;
+				pointcolor_sun_f.g = pointcolor_light *
+					(float)m_materials[3].EmissiveColor.getGreen() / 255;
+			} else {
 				pointcolor_sun_f.r = pointcolor_light * 1;
-				pointcolor_sun_f.b = pointcolor_light * (0.25 + (rangelim(m_time_brightness, 0.25, 0.75) - 0.25) * 2 * 0.75);
-				pointcolor_sun_f.g = pointcolor_light * (pointcolor_sun_f.b * 0.375 + (rangelim(m_time_brightness, 0.05, 0.15) - 0.05) * 10 * 0.625);
+				pointcolor_sun_f.b = pointcolor_light *
+					(0.25 + (rangelim(m_time_brightness, 0.25, 0.75) - 0.25) * 2 * 0.75);
+				pointcolor_sun_f.g = pointcolor_light * (pointcolor_sun_f.b * 0.375 +
+					(rangelim(m_time_brightness, 0.05, 0.15) - 0.05) * 10 * 0.625);
 			}
 
-			video::SColorf pointcolor_moon_f(0.5 * pointcolor_light, 0.6 * pointcolor_light, 0.8 * pointcolor_light, 1);
-			if (m_moon_tonemap)
-			{
-				pointcolor_moon_f.r = pointcolor_light * (float)m_materials[4].EmissiveColor.getRed() / 255;
-				pointcolor_moon_f.b = pointcolor_light * (float)m_materials[4].EmissiveColor.getBlue() / 255;
-				pointcolor_moon_f.g = pointcolor_light * (float)m_materials[4].EmissiveColor.getGreen() / 255;
+			video::SColorf pointcolor_moon_f(0.5 * pointcolor_light,
+				0.6 * pointcolor_light, 0.8 * pointcolor_light, 1);
+			if (m_moon_tonemap) {
+				pointcolor_moon_f.r = pointcolor_light *
+					(float)m_materials[4].EmissiveColor.getRed() / 255;
+				pointcolor_moon_f.b = pointcolor_light *
+					(float)m_materials[4].EmissiveColor.getBlue() / 255;
+				pointcolor_moon_f.g = pointcolor_light *
+					(float)m_materials[4].EmissiveColor.getGreen() / 255;
 			}
 
 			video::SColor pointcolor_sun = pointcolor_sun_f.toSColor();
 			video::SColor pointcolor_moon = pointcolor_moon_f.toSColor();
-			// calculate the blend color
+			// Calculate the blend color
 			pointcolor = m_mix_scolor(pointcolor_moon, pointcolor_sun, pointcolor_blend);
 		}
 		m_bgcolor = m_mix_scolor(m_bgcolor, pointcolor, m_horizon_blend() * 0.5);
@@ -648,29 +657,29 @@ void Sky::update(float time_of_day, float time_brightness,
 	}
 
 	float cloud_direct_brightness = 0;
-	if(sunlight_seen) {
+	if (sunlight_seen) {
 		if (!m_directional_colored_fog) {
 			cloud_direct_brightness = time_brightness;
-			if(time_brightness >= 0.2 && time_brightness < 0.7)
+			if (time_brightness >= 0.2 && time_brightness < 0.7)
 				cloud_direct_brightness *= 1.3;
-		}
-		else {
-			cloud_direct_brightness = MYMIN(m_horizon_blend() * 0.15 + m_time_brightness, 1);
+		} else {
+			cloud_direct_brightness = MYMIN(m_horizon_blend() * 0.15 +
+				m_time_brightness, 1);
 		}
 	} else {
 		cloud_direct_brightness = direct_brightness;
 	}
+
 	m_cloud_brightness = m_cloud_brightness * cloud_color_change_fraction +
-			cloud_direct_brightness * (1.0 - cloud_color_change_fraction);
+		cloud_direct_brightness * (1.0 - cloud_color_change_fraction);
 	m_cloudcolor_f = video::SColorf(
-			m_cloudcolor_bright_f.r * m_cloud_brightness,
-			m_cloudcolor_bright_f.g * m_cloud_brightness,
-			m_cloudcolor_bright_f.b * m_cloud_brightness,
-			1.0);
+		m_cloudcolor_bright_f.r * m_cloud_brightness,
+		m_cloudcolor_bright_f.g * m_cloud_brightness,
+		m_cloudcolor_bright_f.b * m_cloud_brightness,
+		1.0
+	);
 	if (m_directional_colored_fog) {
-		m_cloudcolor_f = m_mix_scolorf(m_cloudcolor_f, video::SColorf(pointcolor), m_horizon_blend() * 0.25);
+		m_cloudcolor_f = m_mix_scolorf(m_cloudcolor_f,
+			video::SColorf(pointcolor), m_horizon_blend() * 0.25);
 	}
-
 }
-
-

From 1b8dbf072ad042542b6bfb29eaed81b8a21ac38c Mon Sep 17 00:00:00 2001
From: Yutao Yuan <yyt16384@gmail.com>
Date: Tue, 14 Jun 2016 06:29:15 +0800
Subject: [PATCH 069/418] Move unknown node message when applying texture
 overrides to infostream (#4218)

Texture packs have no way to know what nodes are available, so this shouldn't be a error message.
---
 src/nodedef.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 1691289c2..764203efc 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -1107,7 +1107,7 @@ void CNodeDefManager::applyTextureOverrides(const std::string &override_filepath
 
 		content_t id;
 		if (!getId(splitted[0], id)) {
-			errorstream << override_filepath
+			infostream << override_filepath
 				<< ":" << line_c << " Could not apply texture override \""
 				<< line << "\": Unknown node \""
 				<< splitted[0] << "\"" << std::endl;

From 39a9e9874ee739aea91acf36c6f81fc38bce7363 Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar@foo-projects.org>
Date: Mon, 30 May 2016 15:07:09 -0700
Subject: [PATCH 070/418] Builtin/game/item: Add `place_param2` nodedef field

This allows a nodedef to specify a fixed value for param2 to be
used for all normal placements.

There are several uses for this:

- nodes that require param2 to be set to a non-zero value for
  internal mod use. E.g. leafdecay could use this to detect that
  leaves are played by players.
- force wallmounted or facedir value at placement at placement

This overrides any player look direction or other on-the-fly
param2 setting during placement.
---
 builtin/game/item.lua | 4 +++-
 doc/lua_api.txt       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 36c2c1a68..26ff8225c 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -250,7 +250,9 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2)
 	local newnode = {name = def.name, param1 = 0, param2 = param2}
 
 	-- Calculate direction for wall mounted stuff like torches and signs
-	if def.paramtype2 == 'wallmounted' and not param2 then
+	if def.place_param2 ~= nil then
+		newnode.param2 = def.place_param2
+	elseif def.paramtype2 == 'wallmounted' and not param2 then
 		local dir = {
 			x = under.x - above.x,
 			y = under.y - above.y,
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index d89b0bf7b..ed8f8504e 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3528,6 +3528,7 @@ Definition tables
         ^ paramtype = "light" allows light to propagate from or through the node with light value
         ^ falling by 1 per node. This line is essential for a light source node to spread its light. ]]
         paramtype2 = "none", -- See "Nodes"
+        place_param2 = nil, -- Force value for param2 when player places node
         is_ground_content = true, -- If false, the cave generator will not carve through this
         sunlight_propagates = false, -- If true, sunlight will go infinitely through this
         walkable = true, -- If true, objects collide with node

From 04fb10914c0d03ee77dafe610f336f23c58949ab Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 12 Jun 2016 03:11:26 +0100
Subject: [PATCH 071/418] Dungeons: Generalise use, add capabilities, various
 modifications

- Generalise node names to c_wall and c_alt_wall
- Remove 'mossratio' and instead disable alt_wall loop if
  c_alt_wall == CONTENT_IGNORE
- Use one generalised 3D noise for alternative wall nodes and in
  mgv6 create moss distribution similar to the previous

- Rename rarity noise to density noise and enable the option of multiple
  dungeons per chunk determined by the value. Recreate previous distribution
- Add parameters for min and max rooms per dungeon
- Add dungeon y limits

- Integrate river water properly

Generalisation is needed now that we have sandstone and desert stone
dungeons by default and can choose any node for alternative structure.
The current code is based around cobble dungeons with mossycobble
alternative nodes, the 2 noises controlling the alternative nodes
are based on wetness.

Enabling multiple dungeons per chunk with definable number of rooms
allows the option of very dense and complex underground structures
that could interconnect to create megastructures.
Y limits are added to be consistent with other mapgen elements, and
enable locaton of dungeon or megastructure realms as part of our
'stacked realms' philosophy.
---
 src/dungeongen.cpp | 100 +++++++++++++++++++++++----------------------
 src/dungeongen.h   |  17 ++++----
 src/mapgen.cpp     |  36 ++++++++--------
 src/mapgen_v6.cpp  |  26 ++++++------
 4 files changed, 93 insertions(+), 86 deletions(-)

diff --git a/src/dungeongen.cpp b/src/dungeongen.cpp
index 6be7e9086..78573da04 100644
--- a/src/dungeongen.cpp
+++ b/src/dungeongen.cpp
@@ -30,9 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 //#define DGEN_USE_TORCHES
 
-NoiseParams nparams_dungeon_rarity(0.0, 1.0, v3f(500.0, 500.0, 500.0), 0, 2, 0.8, 2.0);
-NoiseParams nparams_dungeon_wetness(0.0, 1.0, v3f(40.0, 40.0, 40.0), 32474, 4, 1.1, 2.0);
-NoiseParams nparams_dungeon_density(0.0, 1.0, v3f(2.5, 2.5, 2.5), 0, 2, 1.4, 2.0);
+NoiseParams nparams_dungeon_density(0.9, 0.5, v3f(500.0, 500.0, 500.0), 0, 2, 0.8, 2.0);
+NoiseParams nparams_dungeon_alt_wall(-0.4, 1.0, v3f(40.0, 40.0, 40.0), 32474, 6, 1.1, 2.0);
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -55,26 +54,27 @@ DungeonGen::DungeonGen(INodeDefManager *ndef,
 	} else {
 		dp.seed = 0;
 
-		dp.c_water  = ndef->getId("mapgen_water_source");
-		dp.c_cobble = ndef->getId("mapgen_cobble");
-		dp.c_moss   = ndef->getId("mapgen_mossycobble");
-		dp.c_stair  = ndef->getId("mapgen_stair_cobble");
+		dp.c_water       = ndef->getId("mapgen_water_source");
+		dp.c_river_water = ndef->getId("mapgen_river_water_source");
+		dp.c_wall        = ndef->getId("mapgen_cobble");
+		dp.c_alt_wall    = ndef->getId("mapgen_mossycobble");
+		dp.c_stair       = ndef->getId("mapgen_stair_cobble");
+
+		if (dp.c_river_water == CONTENT_IGNORE)
+			dp.c_river_water = ndef->getId("mapgen_water_source");
 
 		dp.diagonal_dirs = false;
-		dp.mossratio     = 3.0;
 		dp.holesize      = v3s16(1, 2, 1);
 		dp.roomsize      = v3s16(0, 0, 0);
+		dp.rooms_min     = 2;
+		dp.rooms_max     = 16;
+		dp.y_min         = -MAX_MAP_GENERATION_LIMIT;
+		dp.y_max         = MAX_MAP_GENERATION_LIMIT;
 		dp.notifytype    = GENNOTIFY_DUNGEON;
 
-		dp.np_rarity  = nparams_dungeon_rarity;
-		dp.np_wetness = nparams_dungeon_wetness;
-		dp.np_density = nparams_dungeon_density;
+		dp.np_density  = nparams_dungeon_density;
+		dp.np_alt_wall = nparams_dungeon_alt_wall;
 	}
-
-	// For mapgens using river water
-	dp.c_river_water = ndef->getId("mapgen_river_water_source");
-	if (dp.c_river_water == CONTENT_IGNORE)
-		dp.c_river_water = ndef->getId("mapgen_water_source");
 }
 
 
@@ -83,7 +83,11 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
 	assert(vm);
 
 	//TimeTaker t("gen dungeons");
-	if (NoisePerlin3D(&dp.np_rarity, nmin.X, nmin.Y, nmin.Z, dp.seed) < 0.2)
+	if (nmin.Y < dp.y_min || nmax.Y > dp.y_max)
+		return;
+
+	float nval_density = NoisePerlin3D(&dp.np_density, nmin.X, nmin.Y, nmin.Z, dp.seed);
+	if (nval_density < 1.0f)
 		return;
 
 	this->vm = vm;
@@ -107,23 +111,23 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
 		}
 	}
 
-	// Add it
-	makeDungeon(v3s16(1, 1, 1) * MAP_BLOCKSIZE);
+	// Add them
+	for (u32 i = 0; i < floor(nval_density); i++)
+		makeDungeon(v3s16(1, 1, 1) * MAP_BLOCKSIZE);
 
-	// Convert some cobble to mossy cobble
-	if (dp.mossratio != 0.0) {
-		for (s16 z = nmin.Z; z <= nmax.Z; z++)
-		for (s16 y = nmin.Y; y <= nmax.Y; y++) {
-			u32 i = vm->m_area.index(nmin.X, y, z);
-			for (s16 x = nmin.X; x <= nmax.X; x++) {
-				if (vm->m_data[i].getContent() == dp.c_cobble) {
-					float wetness = NoisePerlin3D(&dp.np_wetness, x, y, z, dp.seed);
-					float density = NoisePerlin3D(&dp.np_density, x, y, z, blockseed);
-					if (density < wetness / dp.mossratio)
-						vm->m_data[i].setContent(dp.c_moss);
-				}
-				i++;
+	// Optionally convert some structure to alternative structure
+	if (dp.c_alt_wall == CONTENT_IGNORE)
+		return;
+
+	for (s16 z = nmin.Z; z <= nmax.Z; z++)
+	for (s16 y = nmin.Y; y <= nmax.Y; y++) {
+		u32 i = vm->m_area.index(nmin.X, y, z);
+		for (s16 x = nmin.X; x <= nmax.X; x++) {
+			if (vm->m_data[i].getContent() == dp.c_wall) {
+				if (NoisePerlin3D(&dp.np_alt_wall, x, y, z, blockseed) > 0.0f)
+					vm->m_data[i].setContent(dp.c_alt_wall);
 			}
+			i++;
 		}
 	}
 
@@ -189,7 +193,7 @@ void DungeonGen::makeDungeon(v3s16 start_padding)
 	*/
 	v3s16 last_room_center = roomplace + v3s16(roomsize.X / 2, 1, roomsize.Z / 2);
 
-	u32 room_count = random.range(2, 16);
+	u32 room_count = random.range(dp.rooms_min, dp.rooms_max);
 	for (u32 i = 0; i < room_count; i++) {
 		// Make a room to the determined place
 		makeRoom(roomsize, roomplace);
@@ -265,7 +269,7 @@ void DungeonGen::makeDungeon(v3s16 start_padding)
 
 void DungeonGen::makeRoom(v3s16 roomsize, v3s16 roomplace)
 {
-	MapNode n_cobble(dp.c_cobble);
+	MapNode n_wall(dp.c_wall);
 	MapNode n_air(CONTENT_AIR);
 
 	// Make +-X walls
@@ -278,7 +282,7 @@ void DungeonGen::makeRoom(v3s16 roomsize, v3s16 roomplace)
 			u32 vi = vm->m_area.index(p);
 			if (vm->m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
 				continue;
-			vm->m_data[vi] = n_cobble;
+			vm->m_data[vi] = n_wall;
 		}
 		{
 			v3s16 p = roomplace + v3s16(roomsize.X - 1, y, z);
@@ -287,7 +291,7 @@ void DungeonGen::makeRoom(v3s16 roomsize, v3s16 roomplace)
 			u32 vi = vm->m_area.index(p);
 			if (vm->m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
 				continue;
-			vm->m_data[vi] = n_cobble;
+			vm->m_data[vi] = n_wall;
 		}
 	}
 
@@ -301,7 +305,7 @@ void DungeonGen::makeRoom(v3s16 roomsize, v3s16 roomplace)
 			u32 vi = vm->m_area.index(p);
 			if (vm->m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
 				continue;
-			vm->m_data[vi] = n_cobble;
+			vm->m_data[vi] = n_wall;
 		}
 		{
 			v3s16 p = roomplace + v3s16(x, y, roomsize.Z - 1);
@@ -310,7 +314,7 @@ void DungeonGen::makeRoom(v3s16 roomsize, v3s16 roomplace)
 			u32 vi = vm->m_area.index(p);
 			if (vm->m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
 				continue;
-			vm->m_data[vi] = n_cobble;
+			vm->m_data[vi] = n_wall;
 		}
 	}
 
@@ -324,7 +328,7 @@ void DungeonGen::makeRoom(v3s16 roomsize, v3s16 roomplace)
 			u32 vi = vm->m_area.index(p);
 			if (vm->m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
 				continue;
-			vm->m_data[vi] = n_cobble;
+			vm->m_data[vi] = n_wall;
 		}
 		{
 			v3s16 p = roomplace + v3s16(x,roomsize. Y - 1, z);
@@ -333,7 +337,7 @@ void DungeonGen::makeRoom(v3s16 roomsize, v3s16 roomplace)
 			u32 vi = vm->m_area.index(p);
 			if (vm->m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
 				continue;
-			vm->m_data[vi] = n_cobble;
+			vm->m_data[vi] = n_wall;
 		}
 	}
 
@@ -417,7 +421,7 @@ void DungeonGen::makeCorridor(v3s16 doorplace, v3s16 doordir,
 				makeFill(p + v3s16(-1, -1, -1),
 					dp.holesize + v3s16(2, 3, 2),
 					VMANIP_FLAG_DUNGEON_UNTOUCHABLE,
-					MapNode(dp.c_cobble),
+					MapNode(dp.c_wall),
 					0);
 				makeHole(p);
 				makeHole(p - dir);
@@ -435,18 +439,18 @@ void DungeonGen::makeCorridor(v3s16 doorplace, v3s16 doordir,
 					int facedir = dir_to_facedir(dir * make_stairs);
 
 					u32 vi = vm->m_area.index(p.X - dir.X, p.Y - 1, p.Z - dir.Z);
-					if (vm->m_data[vi].getContent() == dp.c_cobble)
+					if (vm->m_data[vi].getContent() == dp.c_wall)
 						vm->m_data[vi] = MapNode(dp.c_stair, 0, facedir);
 
 					vi = vm->m_area.index(p.X, p.Y, p.Z);
-					if (vm->m_data[vi].getContent() == dp.c_cobble)
+					if (vm->m_data[vi].getContent() == dp.c_wall)
 						vm->m_data[vi] = MapNode(dp.c_stair, 0, facedir);
 				}
 			} else {
 				makeFill(p + v3s16(-1, -1, -1),
 					dp.holesize + v3s16(2, 2, 2),
 					VMANIP_FLAG_DUNGEON_UNTOUCHABLE,
-					MapNode(dp.c_cobble),
+					MapNode(dp.c_wall),
 					0);
 				makeHole(p);
 			}
@@ -488,8 +492,8 @@ bool DungeonGen::findPlaceForDoor(v3s16 &result_place, v3s16 &result_dir)
 			randomizeDir();
 			continue;
 		}
-		if (vm->getNodeNoExNoEmerge(p).getContent() == dp.c_cobble &&
-				vm->getNodeNoExNoEmerge(p1).getContent() == dp.c_cobble) {
+		if (vm->getNodeNoExNoEmerge(p).getContent() == dp.c_wall &&
+				vm->getNodeNoExNoEmerge(p1).getContent() == dp.c_wall) {
 			// Found wall, this is a good place!
 			result_place = p;
 			result_dir = m_dir;
@@ -502,7 +506,7 @@ bool DungeonGen::findPlaceForDoor(v3s16 &result_place, v3s16 &result_dir)
 		*/
 		// Jump one up if the actual space is there
 		if (vm->getNodeNoExNoEmerge(p +
-				v3s16(0, 0, 0)).getContent() == dp.c_cobble &&
+				v3s16(0, 0, 0)).getContent() == dp.c_wall &&
 				vm->getNodeNoExNoEmerge(p +
 				v3s16(0, 1, 0)).getContent() == CONTENT_AIR &&
 				vm->getNodeNoExNoEmerge(p +
@@ -510,7 +514,7 @@ bool DungeonGen::findPlaceForDoor(v3s16 &result_place, v3s16 &result_dir)
 			p += v3s16(0,1,0);
 		// Jump one down if the actual space is there
 		if (vm->getNodeNoExNoEmerge(p +
-				v3s16(0, 1, 0)).getContent() == dp.c_cobble &&
+				v3s16(0, 1, 0)).getContent() == dp.c_wall &&
 				vm->getNodeNoExNoEmerge(p +
 				v3s16(0, 0, 0)).getContent() == CONTENT_AIR &&
 				vm->getNodeNoExNoEmerge(p +
diff --git a/src/dungeongen.h b/src/dungeongen.h
index 898627483..30786b9f3 100644
--- a/src/dungeongen.h
+++ b/src/dungeongen.h
@@ -43,19 +43,21 @@ struct DungeonParams {
 
 	content_t c_water;
 	content_t c_river_water;
-	content_t c_cobble;
-	content_t c_moss;
+	content_t c_wall;
+	content_t c_alt_wall;
 	content_t c_stair;
 
-	GenNotifyType notifytype;
 	bool diagonal_dirs;
-	float mossratio;
 	v3s16 holesize;
 	v3s16 roomsize;
+	u16 rooms_min;
+	u16 rooms_max;
+	s16 y_min;
+	s16 y_max;
+	GenNotifyType notifytype;
 
-	NoiseParams np_rarity;
-	NoiseParams np_wetness;
 	NoiseParams np_density;
+	NoiseParams np_alt_wall;
 };
 
 class DungeonGen {
@@ -99,8 +101,7 @@ public:
 	}
 };
 
-extern NoiseParams nparams_dungeon_rarity;
-extern NoiseParams nparams_dungeon_wetness;
 extern NoiseParams nparams_dungeon_density;
+extern NoiseParams nparams_dungeon_alt_wall;
 
 #endif
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 576fb219a..1e0e3aa44 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -738,44 +738,44 @@ void MapgenBasic::generateDungeons(s16 max_stone_y, MgStoneType stone_type)
 
 	DungeonParams dp;
 
-	dp.seed = seed;
-
-	dp.np_rarity  = nparams_dungeon_rarity;
-	dp.np_density = nparams_dungeon_density;
-	dp.np_wetness = nparams_dungeon_wetness;
-	dp.c_water    = c_water_source;
+	dp.seed          = seed;
+	dp.c_water       = c_water_source;
+	dp.c_river_water = c_river_water_source;
+	dp.rooms_min     = 2;
+	dp.rooms_max     = 16;
+	dp.y_min         = -MAX_MAP_GENERATION_LIMIT;
+	dp.y_max         = MAX_MAP_GENERATION_LIMIT;
+	dp.np_density    = nparams_dungeon_density;
+	dp.np_alt_wall   = nparams_dungeon_alt_wall;
 
 	switch (stone_type) {
 	default:
 	case MGSTONE_STONE:
-		dp.c_cobble = c_cobble;
-		dp.c_moss   = c_mossycobble;
-		dp.c_stair  = c_stair_cobble;
+		dp.c_wall     = c_cobble;
+		dp.c_alt_wall = c_mossycobble;
+		dp.c_stair    = c_stair_cobble;
 
 		dp.diagonal_dirs = false;
-		dp.mossratio     = 3.0;
 		dp.holesize      = v3s16(1, 2, 1);
 		dp.roomsize      = v3s16(0, 0, 0);
 		dp.notifytype    = GENNOTIFY_DUNGEON;
 		break;
 	case MGSTONE_DESERT_STONE:
-		dp.c_cobble = c_desert_stone;
-		dp.c_moss   = c_desert_stone;
-		dp.c_stair  = c_desert_stone;
+		dp.c_wall     = c_desert_stone;
+		dp.c_alt_wall = CONTENT_IGNORE;
+		dp.c_stair    = c_desert_stone;
 
 		dp.diagonal_dirs = true;
-		dp.mossratio     = 0.0;
 		dp.holesize      = v3s16(2, 3, 2);
 		dp.roomsize      = v3s16(2, 5, 2);
 		dp.notifytype    = GENNOTIFY_TEMPLE;
 		break;
 	case MGSTONE_SANDSTONE:
-		dp.c_cobble = c_sandstonebrick;
-		dp.c_moss   = c_sandstonebrick;
-		dp.c_stair  = c_sandstonebrick;
+		dp.c_wall     = c_sandstonebrick;
+		dp.c_alt_wall = CONTENT_IGNORE;
+		dp.c_stair    = c_sandstonebrick;
 
 		dp.diagonal_dirs = false;
-		dp.mossratio     = 0.0;
 		dp.holesize      = v3s16(2, 2, 2);
 		dp.roomsize      = v3s16(2, 0, 2);
 		dp.notifytype    = GENNOTIFY_DUNGEON;
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index 103120b6a..caa64827e 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -560,28 +560,30 @@ void MapgenV6::makeChunk(BlockMakeData *data)
 		DungeonParams dp;
 
 		dp.seed = seed;
+		dp.c_water       = c_water_source;
+		dp.c_river_water = c_water_source;
+		dp.rooms_min     = 2;
+		dp.rooms_max     = 16;
+		dp.y_min         = -MAX_MAP_GENERATION_LIMIT;
+		dp.y_max         = MAX_MAP_GENERATION_LIMIT;
+		dp.np_density    = NoiseParams(0.9, 0.5, v3f(500.0, 500.0, 500.0), 0, 2, 0.8, 2.0);
+		dp.np_alt_wall   = NoiseParams(-0.4, 1.0, v3f(40.0, 40.0, 40.0), 32474, 6, 1.1, 2.0);
 
-		dp.np_rarity  = nparams_dungeon_rarity;
-		dp.np_density = nparams_dungeon_density;
-		dp.np_wetness = nparams_dungeon_wetness;
-		dp.c_water    = c_water_source;
 		if (getBiome(0, v2s16(node_min.X, node_min.Z)) == BT_DESERT) {
-			dp.c_cobble = c_desert_stone;
-			dp.c_moss   = c_desert_stone;
-			dp.c_stair  = c_desert_stone;
+			dp.c_wall     = c_desert_stone;
+			dp.c_alt_wall = CONTENT_IGNORE;
+			dp.c_stair    = c_desert_stone;
 
 			dp.diagonal_dirs = true;
-			dp.mossratio     = 0.0;
 			dp.holesize      = v3s16(2, 3, 2);
 			dp.roomsize      = v3s16(2, 5, 2);
 			dp.notifytype    = GENNOTIFY_TEMPLE;
 		} else {
-			dp.c_cobble = c_cobble;
-			dp.c_moss   = c_mossycobble;
-			dp.c_stair  = c_stair_cobble;
+			dp.c_wall     = c_cobble;
+			dp.c_alt_wall = c_mossycobble;
+			dp.c_stair    = c_stair_cobble;
 
 			dp.diagonal_dirs = false;
-			dp.mossratio     = 3.0;
 			dp.holesize      = v3s16(1, 2, 1);
 			dp.roomsize      = v3s16(0, 0, 0);
 			dp.notifytype    = GENNOTIFY_DUNGEON;

From fa0bbbf96df17f0d7911274ea85e5c049c20d07b Mon Sep 17 00:00:00 2001
From: raymoo <uguu@installgentoo.com>
Date: Fri, 17 Jun 2016 12:57:27 -0700
Subject: [PATCH 072/418] Player: New get_look, set_look API

Deprecate get_look / set_look pitch / yaw
---
 doc/lua_api.txt                 | 18 +++++--
 src/player.h                    | 16 +++++-
 src/script/lua_api/l_object.cpp | 86 ++++++++++++++++++++++++++++++---
 src/script/lua_api/l_object.h   | 16 ++++++
 4 files changed, 124 insertions(+), 12 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index ed8f8504e..6d359379e 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2679,10 +2679,20 @@ This is basically a reference to a C++ `ServerActiveObject`
 * `get_player_velocity()`: returns `nil` if is not a player, otherwise a
   table {x, y, z} representing the player's instantaneous velocity in nodes/s
 * `get_look_dir()`: get camera direction as a unit vector
-* `get_look_pitch()`: pitch in radians
-* `get_look_yaw()`: yaw in radians (wraps around pretty randomly as of now)
-* `set_look_pitch(radians)`: sets look pitch
-* `set_look_yaw(radians)`: sets look yaw
+* `get_look_vertical()`: pitch in radians
+     * Angle ranges between -pi/2 and pi/2, which are straight up and down respectively.
+* `get_look_horizontal()`: yaw in radians
+     * Angle is counter-clockwise from the +z direction.
+* `set_look_vertical(radians)`: sets look pitch
+     * radians - Angle from looking forward, where positive is downwards.
+* `set_look_horizontal(radians)`: sets look yaw
+     * radians - Angle from the +z direction, where positive is counter-clockwise.
+* `get_look_pitch()`: pitch in radians - Deprecated as broken. Use get_look_vertical.
+     * Angle ranges between -pi/2 and pi/2, which are straight down and up respectively.
+* `get_look_yaw()`: yaw in radians - Deprecated as broken. Use get_look_horizontal.
+     * Angle is counter-clockwise from the +x direction.
+* `set_look_pitch(radians)`: sets look pitch - Deprecated. Use set_look_vertical.
+* `set_look_yaw(radians)`: sets look yaw - Deprecated. Use set_look_horizontal.
 * `get_breath()`: returns players breath
 * `set_breath(value)`: sets players breath
      * values:
diff --git a/src/player.h b/src/player.h
index 6687ca86e..e6fcf388a 100644
--- a/src/player.h
+++ b/src/player.h
@@ -188,16 +188,28 @@ public:
 		m_breath = breath;
 	}
 
-	f32 getRadPitch()
+	// Deprecated
+	f32 getRadPitchDep()
 	{
 		return -1.0 * m_pitch * core::DEGTORAD;
 	}
 
-	f32 getRadYaw()
+	// Deprecated
+	f32 getRadYawDep()
 	{
 		return (m_yaw + 90.) * core::DEGTORAD;
 	}
 
+	f32 getRadPitch()
+	{
+		return m_pitch * core::DEGTORAD;
+	}
+
+	f32 getRadYaw()
+	{
+		return m_yaw * core::DEGTORAD;
+	}
+
 	const char *getName() const
 	{
 		return m_name;
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 6d6614e7d..befae4253 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -1016,15 +1016,49 @@ int ObjectRef::l_get_look_dir(lua_State *L)
 	Player *player = getplayer(ref);
 	if (player == NULL) return 0;
 	// Do it
-	float pitch = player->getRadPitch();
-	float yaw = player->getRadYaw();
+	float pitch = player->getRadPitchDep();
+	float yaw = player->getRadYawDep();
 	v3f v(cos(pitch)*cos(yaw), sin(pitch), cos(pitch)*sin(yaw));
 	push_v3f(L, v);
 	return 1;
 }
 
+// DEPRECATED
 // get_look_pitch(self)
 int ObjectRef::l_get_look_pitch(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	log_deprecated(L,
+		"Deprecated call to get_look_pitch, use get_look_vertical instead");
+
+	ObjectRef *ref = checkobject(L, 1);
+	Player *player = getplayer(ref);
+	if (player == NULL) return 0;
+	// Do it
+	lua_pushnumber(L, player->getRadPitchDep());
+	return 1;
+}
+
+// DEPRECATED
+// get_look_yaw(self)
+int ObjectRef::l_get_look_yaw(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	log_deprecated(L,
+		"Deprecated call to get_look_yaw, use get_look_horizontal instead");
+
+	ObjectRef *ref = checkobject(L, 1);
+	Player *player = getplayer(ref);
+	if (player == NULL) return 0;
+	// Do it
+	lua_pushnumber(L, player->getRadYawDep());
+	return 1;
+}
+
+// get_look_pitch2(self)
+int ObjectRef::l_get_look_vertical(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
@@ -1035,8 +1069,8 @@ int ObjectRef::l_get_look_pitch(lua_State *L)
 	return 1;
 }
 
-// get_look_yaw(self)
-int ObjectRef::l_get_look_yaw(lua_State *L)
+// get_look_yaw2(self)
+int ObjectRef::l_get_look_horizontal(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
@@ -1047,8 +1081,8 @@ int ObjectRef::l_get_look_yaw(lua_State *L)
 	return 1;
 }
 
-// set_look_pitch(self, radians)
-int ObjectRef::l_set_look_pitch(lua_State *L)
+// set_look_vertical(self, radians)
+int ObjectRef::l_set_look_vertical(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
@@ -1060,10 +1094,46 @@ int ObjectRef::l_set_look_pitch(lua_State *L)
 	return 1;
 }
 
+// set_look_horizontal(self, radians)
+int ObjectRef::l_set_look_horizontal(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	ObjectRef *ref = checkobject(L, 1);
+	PlayerSAO* co = getplayersao(ref);
+	if (co == NULL) return 0;
+	float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
+	// Do it
+	co->setYaw(yaw);
+	return 1;
+}
+
+// DEPRECATED
+// set_look_pitch(self, radians)
+int ObjectRef::l_set_look_pitch(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	log_deprecated(L,
+		"Deprecated call to set_look_pitch, use set_look_vertical instead.");
+
+	ObjectRef *ref = checkobject(L, 1);
+	PlayerSAO* co = getplayersao(ref);
+	if (co == NULL) return 0;
+	float pitch = luaL_checknumber(L, 2) * core::RADTODEG;
+	// Do it
+	co->setPitch(pitch);
+	return 1;
+}
+
+// DEPRECATED
 // set_look_yaw(self, radians)
 int ObjectRef::l_set_look_yaw(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
+
+	log_deprecated(L,
+		"Deprecated call to set_look_yaw, use set_look_horizontal instead.");
+
 	ObjectRef *ref = checkobject(L, 1);
 	PlayerSAO* co = getplayersao(ref);
 	if (co == NULL) return 0;
@@ -1754,6 +1824,10 @@ const luaL_reg ObjectRef::methods[] = {
 	luamethod(ObjectRef, get_look_dir),
 	luamethod(ObjectRef, get_look_pitch),
 	luamethod(ObjectRef, get_look_yaw),
+	luamethod(ObjectRef, get_look_vertical),
+	luamethod(ObjectRef, get_look_horizontal),
+	luamethod(ObjectRef, set_look_horizontal),
+	luamethod(ObjectRef, set_look_vertical),
 	luamethod(ObjectRef, set_look_yaw),
 	luamethod(ObjectRef, set_look_pitch),
 	luamethod(ObjectRef, get_breath),
diff --git a/src/script/lua_api/l_object.h b/src/script/lua_api/l_object.h
index a4457cc05..a37d29535 100644
--- a/src/script/lua_api/l_object.h
+++ b/src/script/lua_api/l_object.h
@@ -189,15 +189,31 @@ private:
 	// get_look_dir(self)
 	static int l_get_look_dir(lua_State *L);
 
+	// DEPRECATED
 	// get_look_pitch(self)
 	static int l_get_look_pitch(lua_State *L);
 
+	// DEPRECATED
 	// get_look_yaw(self)
 	static int l_get_look_yaw(lua_State *L);
 
+	// get_look_pitch2(self)
+	static int l_get_look_vertical(lua_State *L);
+
+	// get_look_yaw2(self)
+	static int l_get_look_horizontal(lua_State *L);
+
+	// set_look_vertical(self, radians)
+	static int l_set_look_vertical(lua_State *L);
+
+	// set_look_horizontal(self, radians)
+	static int l_set_look_horizontal(lua_State *L);
+
+	// DEPRECATED
 	// set_look_pitch(self, radians)
 	static int l_set_look_pitch(lua_State *L);
 
+	// DEPRECATED
 	// set_look_yaw(self, radians)
 	static int l_set_look_yaw(lua_State *L);
 

From 9997e2030c86b938d1889ee71522bc26d01226e6 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Tue, 21 Jun 2016 03:48:24 +0100
Subject: [PATCH 073/418] Mgflat/fractal/v7/valleys: Denser 3D noise tunnels

Reduce spread from 96 to primes 61 and 67 (either side of 64)
Prime spreads help to keep 3D noise periodic features unaligned
'cave width' 0.2 to preserve tunnel width
Reduce octaves to 3 to improve network structure
---
 builtin/settingtypes.txt | 24 ++++++++++++------------
 minetest.conf.example    | 24 ++++++++++++------------
 src/mapgen_flat.cpp      |  6 +++---
 src/mapgen_fractal.cpp   |  6 +++---
 src/mapgen_v7.cpp        |  6 +++---
 src/mapgen_valleys.cpp   |  6 +++---
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index b53e35a85..c751f34f2 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -954,7 +954,7 @@ mgv6_np_apple_trees (Mapgen v6 apple trees noise parameters) noise_params 0, 1,
 mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,nomountains,noridges
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
-mgv7_cave_width (Mapgen v7 cave width) float 0.3
+mgv7_cave_width (Mapgen v7 cave width) float 0.2
 
 mgv7_np_terrain_base (Mapgen v7 terrain base noise parameters) noise_params 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0
 mgv7_np_terrain_alt (Mapgen v7 terrain altitude noise parameters) noise_params 4, 25, (600, 600, 600), 5934, 5, 0.6, 2.0
@@ -965,8 +965,8 @@ mgv7_np_mount_height (Mapgen v7 mount height noise parameters) noise_params 256,
 mgv7_np_ridge_uwater (Mapgen v7 ridge water noise parameters) noise_params 0, 1, (1000, 1000, 1000), 85039, 5, 0.6, 2.0
 mgv7_np_mountain (Mapgen v7 mountain noise parameters) noise_params -0.6, 1, (250, 350, 250), 5333, 5, 0.63, 2.0
 mgv7_np_ridge (Mapgen v7 ridge noise parameters) noise_params 0, 1, (100, 100, 100), 6467, 4, 0.75, 2.0
-mgv7_np_cave1 (Mapgen v7 cave1 noise parameters) noise_params 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0
-mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0
+mgv7_np_cave1 (Mapgen v7 cave1 noise parameters) noise_params 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0
+mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0
 
 [***Mapgen flat]
 
@@ -983,7 +983,7 @@ mgflat_ground_level (Mapgen flat ground level) int 8
 mgflat_large_cave_depth (Mapgen flat large cave depth) int -33
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
-mgflat_cave_width (Mapgen flat cave width) float 0.3
+mgflat_cave_width (Mapgen flat cave width) float 0.2
 
 #    Terrain noise threshold for lakes.
 #    Controls proportion of world area covered by lakes.
@@ -1007,13 +1007,13 @@ mgflat_hill_steepness (Mapgen flat hill steepness) float 64.0
 mgflat_np_terrain (Mapgen flat terrain noise parameters) noise_params 0, 1, (600, 600, 600), 7244, 5, 0.6, 2.0
 
 mgflat_np_filler_depth (Mapgen flat filler depth noise parameters) noise_params 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0
-mgflat_np_cave1 (Mapgen flat cave1 noise parameters) noise_params 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0
-mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0
+mgflat_np_cave1 (Mapgen flat cave1 noise parameters) noise_params 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0
+mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0
 
 [***Mapgen fractal]
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
-mgfractal_cave_width (Mapgen fractal cave width) float 0.3
+mgfractal_cave_width (Mapgen fractal cave width) float 0.2
 
 #    Choice of 18 fractals from 9 formulas.
 #    1 = 4D "Roundy" mandelbrot set.
@@ -1074,8 +1074,8 @@ mgfractal_julia_w (Mapgen fractal julia w) float 0.33
 
 mgfractal_np_seabed (Mapgen fractal seabed noise parameters) noise_params -14, 9, (600, 600, 600), 41900, 5, 0.6, 2.0
 mgfractal_np_filler_depth (Mapgen fractal filler depth noise parameters) noise_params 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0
-mgfractal_np_cave1 (Mapgen fractal cave1 noise parameters) noise_params 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0
-mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0
+mgfractal_np_cave1 (Mapgen fractal cave1 noise parameters) noise_params 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0
+mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0
 
 # Mapgen Valleys parameters
 [***Mapgen Valleys]
@@ -1115,16 +1115,16 @@ mgvalleys_river_size (River Size) int 5
 mgvalleys_water_features (Water Features) int 0
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
-mgvalleys_cave_width (Cave width) float 0.3
+mgvalleys_cave_width (Cave width) float 0.2
 
 # Noise parameters
 [****Noises]
 
 # Caves and tunnels form at the intersection of the two noises
-mgvalleys_np_cave1 (Cave noise #1) noise_params 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0
+mgvalleys_np_cave1 (Cave noise #1) noise_params 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0
 
 # Caves and tunnels form at the intersection of the two noises
-mgvalleys_np_cave2 (Cave noise #2) noise_params 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0
+mgvalleys_np_cave2 (Cave noise #2) noise_params 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0
 
 # The depth of dirt or other filler
 mgvalleys_np_filler_depth (Filler Depth) noise_params 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0
diff --git a/minetest.conf.example b/minetest.conf.example
index a5ca16e51..35675dfe3 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1176,7 +1176,7 @@
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    type: float
-# mgv7_cave_width = 0.3
+# mgv7_cave_width = 0.2
 
 #    type: noise_params
 # mgv7_np_terrain_base = 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0
@@ -1206,10 +1206,10 @@
 # mgv7_np_ridge = 0, 1, (100, 100, 100), 6467, 4, 0.75, 2.0
 
 #    type: noise_params
-# mgv7_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0
+# mgv7_np_cave1 = 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0
 
 #    type: noise_params
-# mgv7_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0
+# mgv7_np_cave2 = 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0
 
 #### Mapgen flat
 
@@ -1230,7 +1230,7 @@
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    type: float
-# mgflat_cave_width = 0.3
+# mgflat_cave_width = 0.2
 
 #    Terrain noise threshold for lakes.
 #    Controls proportion of world area covered by lakes.
@@ -1262,16 +1262,16 @@
 # mgflat_np_filler_depth = 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0
 
 #    type: noise_params
-# mgflat_np_cave1 = 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0
+# mgflat_np_cave1 = 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0
 
 #    type: noise_params
-# mgflat_np_cave2 = 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0
+# mgflat_np_cave2 = 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0
 
 #### Mapgen fractal
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    type: float
-# mgfractal_cave_width = 0.3
+# mgfractal_cave_width = 0.2
 
 #    Choice of 18 fractals from 9 formulas.
 #    1 = 4D "Roundy" mandelbrot set.
@@ -1346,10 +1346,10 @@
 # mgfractal_np_filler_depth = 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0
 
 #    type: noise_params
-# mgfractal_np_cave1 = 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0
+# mgfractal_np_cave1 = 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0
 
 #    type: noise_params
-# mgfractal_np_cave2 = 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0
+# mgfractal_np_cave2 = 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0
 
 #### Mapgen Valleys
 
@@ -1396,17 +1396,17 @@
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    type: float
-# mgvalleys_cave_width = 0.3
+# mgvalleys_cave_width = 0.2
 
 ##### Noises
 
 #    Caves and tunnels form at the intersection of the two noises
 #    type: noise_params
-# mgvalleys_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0
+# mgvalleys_np_cave1 = 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0
 
 #    Caves and tunnels form at the intersection of the two noises
 #    type: noise_params
-# mgvalleys_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0
+# mgvalleys_np_cave2 = 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0
 
 #    The depth of dirt or other filler
 #    type: noise_params
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 7cc6aad5c..956af999a 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -84,7 +84,7 @@ MapgenFlatParams::MapgenFlatParams()
 	spflags          = 0;
 	ground_level     = 8;
 	large_cave_depth = -33;
-	cave_width       = 0.3;
+	cave_width       = 0.2;
 	lake_threshold   = -0.45;
 	lake_steepness   = 48.0;
 	hill_threshold   = 0.45;
@@ -92,8 +92,8 @@ MapgenFlatParams::MapgenFlatParams()
 
 	np_terrain      = NoiseParams(0, 1,   v3f(600, 600, 600), 7244,  5, 0.6, 2.0);
 	np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261,   3, 0.7, 2.0);
-	np_cave1        = NoiseParams(0, 12,  v3f(96,  96,  96),  52534, 4, 0.5, 2.0);
-	np_cave2        = NoiseParams(0, 12,  v3f(96,  96,  96),  10325, 4, 0.5, 2.0);
+	np_cave1        = NoiseParams(0, 12,  v3f(61,  61,  61),  52534, 3, 0.5, 2.0);
+	np_cave2        = NoiseParams(0, 12,  v3f(67,  67,  67),  10325, 3, 0.5, 2.0);
 }
 
 
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index c47a7bfdc..9e4c210dc 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -86,7 +86,7 @@ MapgenFractal::~MapgenFractal()
 MapgenFractalParams::MapgenFractalParams()
 {
 	spflags    = 0;
-	cave_width = 0.3;
+	cave_width = 0.2;
 	fractal    = 1;
 	iterations = 11;
 	scale      = v3f(4096.0, 1024.0, 4096.0);
@@ -99,8 +99,8 @@ MapgenFractalParams::MapgenFractalParams()
 
 	np_seabed       = NoiseParams(-14, 9,   v3f(600, 600, 600), 41900, 5, 0.6, 2.0);
 	np_filler_depth = NoiseParams(0,   1.2, v3f(150, 150, 150), 261,   3, 0.7, 2.0);
-	np_cave1        = NoiseParams(0,   12,  v3f(96,  96,  96),  52534, 4, 0.5, 2.0);
-	np_cave2        = NoiseParams(0,   12,  v3f(96,  96,  96),  10325, 4, 0.5, 2.0);
+	np_cave1        = NoiseParams(0,   12,  v3f(61,  61,  61),  52534, 3, 0.5, 2.0);
+	np_cave2        = NoiseParams(0,   12,  v3f(67,  67,  67),  10325, 3, 0.5, 2.0);
 }
 
 
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 35dcdcd94..c24b3e8d1 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -94,7 +94,7 @@ MapgenV7::~MapgenV7()
 MapgenV7Params::MapgenV7Params()
 {
 	spflags    = MGV7_MOUNTAINS | MGV7_RIDGES;
-	cave_width = 0.3;
+	cave_width = 0.2;
 
 	np_terrain_base    = NoiseParams(4,    70,  v3f(600,  600,  600),  82341, 5, 0.6,  2.0);
 	np_terrain_alt     = NoiseParams(4,    25,  v3f(600,  600,  600),  5934,  5, 0.6,  2.0);
@@ -105,8 +105,8 @@ MapgenV7Params::MapgenV7Params()
 	np_ridge_uwater    = NoiseParams(0,    1,   v3f(1000, 1000, 1000), 85039, 5, 0.6,  2.0);
 	np_mountain        = NoiseParams(-0.6, 1,   v3f(250,  350,  250),  5333,  5, 0.63, 2.0);
 	np_ridge           = NoiseParams(0,    1,   v3f(100,  100,  100),  6467,  4, 0.75, 2.0);
-	np_cave1           = NoiseParams(0,    12,  v3f(96,   96,   96),   52534, 4, 0.5,  2.0);
-	np_cave2           = NoiseParams(0,    12,  v3f(96,   96,   96),   10325, 4, 0.5,  2.0);
+	np_cave1           = NoiseParams(0,    12,  v3f(61,   61,   61),   52534, 3, 0.5,  2.0);
+	np_cave2           = NoiseParams(0,    12,  v3f(67,   67,   67),   10325, 3, 0.5,  2.0);
 }
 
 
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index bbf20719d..02a8fbfe0 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -144,10 +144,10 @@ MapgenValleysParams::MapgenValleysParams()
 	river_depth        = 4;  // How deep to carve river channels.
 	river_size         = 5;  // How wide to make rivers.
 	water_features     = 0;  // How often water will occur in caves.
-	cave_width         = 0.3;
+	cave_width         = 0.2;
 
-	np_cave1              = NoiseParams(0,     12,   v3f(96,   96,   96),   52534, 4, 0.5,   2.0);
-	np_cave2              = NoiseParams(0,     12,   v3f(96,   96,   96),   10325, 4, 0.5,   2.0);
+	np_cave1              = NoiseParams(0,     12,   v3f(61,   61,   61),   52534, 3, 0.5,   2.0);
+	np_cave2              = NoiseParams(0,     12,   v3f(67,   67,   67),   10325, 3, 0.5,   2.0);
 	np_filler_depth       = NoiseParams(0.f,   1.2f, v3f(256,  256,  256),  1605,  3, 0.5f,  2.f);
 	np_inter_valley_fill  = NoiseParams(0.f,   1.f,  v3f(256,  512,  256),  1993,  6, 0.8f,  2.f);
 	np_inter_valley_slope = NoiseParams(0.5f,  0.5f, v3f(128,  128,  128),  746,   1, 1.f,   2.f);

From ab7a5c4ff138c39a2491592731d677c9f392caa0 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 24 Jun 2016 20:43:29 +0200
Subject: [PATCH 074/418] Also shut down when SIGTERM was received

Fixes #4251
---
 src/porting.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/porting.cpp b/src/porting.cpp
index 98b85b7d0..7ded58b3f 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -75,11 +75,16 @@ bool * signal_handler_killstatus(void)
 #if !defined(_WIN32) // POSIX
 	#include <signal.h>
 
-void sigint_handler(int sig)
+void signal_handler(int sig)
 {
 	if (!g_killed) {
-		dstream << "INFO: sigint_handler(): "
-			<< "Ctrl-C pressed, shutting down." << std::endl;
+		if (sig == SIGINT) {
+			dstream << "INFO: signal_handler(): "
+				<< "Ctrl-C pressed, shutting down." << std::endl;
+		} else if (sig == SIGTERM) {
+			dstream << "INFO: signal_handler(): "
+				<< "got SIGTERM, shutting down." << std::endl;
+		}
 
 		// Comment out for less clutter when testing scripts
 		/*dstream << "INFO: sigint_handler(): "
@@ -88,13 +93,14 @@ void sigint_handler(int sig)
 
 		g_killed = true;
 	} else {
-		(void)signal(SIGINT, SIG_DFL);
+		(void)signal(sig, SIG_DFL);
 	}
 }
 
 void signal_handler_init(void)
 {
-	(void)signal(SIGINT, sigint_handler);
+	(void)signal(SIGINT, signal_handler);
+	(void)signal(SIGTERM, signal_handler);
 }
 
 #else // _WIN32

From 80cebdc23c29ed778958ba3a35662cbc5f5e2f09 Mon Sep 17 00:00:00 2001
From: HybridDog <ovvv@web.de>
Date: Tue, 28 Jun 2016 06:34:22 +0200
Subject: [PATCH 075/418] Only allow strings to be passed to
 minetest.global_exists (#4253)

Sometimes you accidentally forget the quotes when using global_exists, this makes minetest abort if you did so.

M  builtin/common/strict.lua
---
 builtin/common/strict.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builtin/common/strict.lua b/builtin/common/strict.lua
index 05ceadf7a..23ba3d727 100644
--- a/builtin/common/strict.lua
+++ b/builtin/common/strict.lua
@@ -5,6 +5,9 @@ local WARN_INIT = false
 
 
 function core.global_exists(name)
+	if type(name) ~= "string" then
+		error("core.global_exists: " .. tostring(name) .. " is not a string")
+	end
 	return rawget(_G, name) ~= nil
 end
 

From b6eef1c0c2e76e56f148bf296a42fb3a4bae4a55 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Sun, 19 Jun 2016 08:48:12 +0100
Subject: [PATCH 076/418] openbsd's port fix for non Linux systems w/o libRT

X11 headers are not always in expected locations, add them to include list.

Modifications by est31: indentation fixes, commit message improved
---
 src/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f02812415..bffc1f7eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -336,7 +336,10 @@ else()
 	if(APPLE)
 		set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
 	else()
-		set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
+		check_library_exists(rt clock_gettime "" HAVE_LIBRT)
+		if (HAVE_LIBRT)
+			set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
+		endif(HAVE_LIBRT)
 	endif(APPLE)
 
 	# This way Xxf86vm is found on OpenBSD too
@@ -555,6 +558,7 @@ include_directories(
 	${LUA_INCLUDE_DIR}
 	${GMP_INCLUDE_DIR}
 	${JSON_INCLUDE_DIR}
+	${X11_INCLUDE_DIR}
 	${PROJECT_SOURCE_DIR}/script
 )
 

From 70e2c1c7d413d20757f571e3f1e02b05c95418f1 Mon Sep 17 00:00:00 2001
From: Pavel Puchkin <i@neoascetic.me>
Date: Sun, 3 Jul 2016 13:30:09 +0200
Subject: [PATCH 077/418] Remove old docs. We have VCS history anyways. (#4266)

---
 doc/old/ancient_main_comment.txt | 345 -------------------------------
 doc/old/changelog.txt            | 147 -------------
 2 files changed, 492 deletions(-)
 delete mode 100644 doc/old/ancient_main_comment.txt
 delete mode 100644 doc/old/changelog.txt

diff --git a/doc/old/ancient_main_comment.txt b/doc/old/ancient_main_comment.txt
deleted file mode 100644
index d7b0e307f..000000000
--- a/doc/old/ancient_main_comment.txt
+++ /dev/null
@@ -1,345 +0,0 @@
-------------------------------------------------------------------
-The ancient comment from the beginning of main.cpp is stored here.
-------------------------------------------------------------------
-
-/*
-=============================== NOTES ==============================
-NOTE: Things starting with TODO are sometimes only suggestions.
-
-NOTE: iostream.imbue(std::locale("C")) is very slow
-NOTE: Global locale is now set at initialization
-
-NOTE: If VBO (EHM_STATIC) is used, remember to explicitly free the
-      hardware buffer (it is not freed automatically)
-
-NOTE: A random to-do list saved here as documentation:
-A list of "active blocks" in which stuff happens. (+=done)
-	+ Add a never-resetted game timer to the server
-	+ Add a timestamp value to blocks
-	+ The simple rule: All blocks near some player are "active"
-	- Do stuff in real time in active blocks
-		+ Handle objects
-		- Grow grass, delete leaves without a tree
-		- Spawn some mobs based on some rules
-		- Transform cobble to mossy cobble near water
-		- Run a custom script
-		- ...And all kinds of other dynamic stuff
-	+ Keep track of when a block becomes active and becomes inactive
-	+ When a block goes inactive:
-		+ Store objects statically to block
-		+ Store timer value as the timestamp
-	+ When a block goes active:
-		+ Create active objects out of static objects
-		- Simulate the results of what would have happened if it would have
-		  been active for all the time
-		  	- Grow a lot of grass and so on
-	+ Initially it is fine to send information about every active object
-	  to every player. Eventually it should be modified to only send info
-	  about the nearest ones.
-	  	+ This was left to be done by the old system and it sends only the
-		  nearest ones.
-
-NOTE: Seeds in 1260:6c77e7dbfd29:
-5721858502589302589:
-	Spawns you on a small sand island with a surface dungeon
-2983455799928051958:
-	Enormous jungle + a surface dungeon at ~(250,0,0)
-
-Old, wild and random suggestions that probably won't be done:
--------------------------------------------------------------
-
-SUGG: If player is on ground, mainly fetch ground-level blocks
-
-SUGG: Expose Connection's seqnums and ACKs to server and client.
-      - This enables saving many packets and making a faster connection
-	  - This also enables server to check if client has received the
-	    most recent block sent, for example.
-SUGG: Add a sane bandwidth throttling system to Connection
-
-SUGG: More fine-grained control of client's dumping of blocks from
-      memory
-	  - ...What does this mean in the first place?
-
-SUGG: A map editing mode (similar to dedicated server mode)
-
-SUGG: Transfer more blocks in a single packet
-SUGG: A blockdata combiner class, to which blocks are added and at
-      destruction it sends all the stuff in as few packets as possible.
-SUGG: Make a PACKET_COMBINED which contains many subpackets. Utilize
-      it by sending more stuff in a single packet.
-	  - Add a packet queue to RemoteClient, from which packets will be
-	    combined with object data packets
-		- This is not exactly trivial: the object data packets are
-		  sometimes very big by themselves
-	  - This might not give much network performance gain though.
-
-SUGG: Precalculate lighting translation table at runtime (at startup)
-      - This is not doable because it is currently hand-made and not
-	    based on some mathematical function.
-		- Note: This has been changing lately
-
-SUGG: A version number to blocks, which increments when the block is
-      modified (node add/remove, water update, lighting update)
-	  - This can then be used to make sure the most recent version of
-	    a block has been sent to client, for example
-
-SUGG: Make the amount of blocks sending to client and the total
-	  amount of blocks dynamically limited. Transferring blocks is the
-	  main network eater of this system, so it is the one that has
-	  to be throttled so that RTTs stay low.
-
-SUGG: Meshes of blocks could be split into 6 meshes facing into
-      different directions and then only those drawn that need to be
-
-SUGG: Background music based on cellular automata?
-      http://www.earslap.com/projectslab/otomata
-
-SUGG: Simple light color information to air
-
-SUGG: Server-side objects could be moved based on nodes to enable very
-      lightweight operation and simple AI
-	- Not practical; client would still need to show smooth movement.
-
-SUGG: Make a system for pregenerating quick information for mapblocks, so
-	  that the client can show them as cubes before they are actually sent
-	  or even generated.
-
-SUGG: Erosion simulation at map generation time
-    - This might be plausible if larger areas of map were pregenerated
-	  without lighting (which is slow)
-	- Simulate water flows, which would carve out dirt fast and
-	  then turn stone into gravel and sand and relocate it.
-	- How about relocating minerals, too? Coal and gold in
-	  downstream sand and gravel would be kind of cool
-	  - This would need a better way of handling minerals, mainly
-		to have mineral content as a separate field. the first
-		parameter field is free for this.
-	- Simulate rock falling from cliffs when water has removed
-	  enough solid rock from the bottom
-
-SUGG: For non-mapgen FarMesh: Add a per-sector database to store surface
-      stuff as simple flags/values
-      - Light?
-	  - A building?
-	  And at some point make the server send this data to the client too,
-	  instead of referring to the noise functions
-	  - Ground height
-	  - Surface ground type
-	  - Trees?
-
-Gaming ideas:
--------------
-
-- Aim for something like controlling a single dwarf in Dwarf Fortress
-- The player could go faster by a crafting a boat, or riding an animal
-- Random NPC traders. what else?
-
-Game content:
--------------
-
-- When furnace is destroyed, move items to player's inventory
-- Add lots of stuff
-- Glass blocks
-- Growing grass, decaying leaves
-	- This can be done in the active blocks I guess.
-	- Lots of stuff can be done in the active blocks.
-	- Uh, is there an active block list somewhere? I think not. Add it.
-- Breaking weak structures
-	- This can probably be accomplished in the same way as grass
-- Player health points
-	- When player dies, throw items on map (needs better item-on-map
-	  implementation)
-- Cobble to get mossy if near water
-- More slots in furnace source list, so that multiple ingredients
-  are possible.
-- Keys to chests?
-
-- The Treasure Guard; a big monster with a hammer
-	- The hammer does great damage, shakes the ground and removes a block
-	- You can drop on top of it, and have some time to attack there
-	  before he shakes you off
-
-- Maybe the difficulty could come from monsters getting tougher in
-  far-away places, and the player starting to need something from
-  there when time goes by.
-  - The player would have some of that stuff at the beginning, and
-    would need new supplies of it when it runs out
-
-- A bomb
-- A spread-items-on-map routine for the bomb, and for dying players
-
-- Fighting:
-  - Proper sword swing simulation
-  - Player should get damage from colliding to a wall at high speed
-
-Documentation:
---------------
-
-Build system / running:
------------------------
-
-Networking and serialization:
------------------------------
-
-SUGG: Fix address to be ipv6 compatible
-
-User Interface:
----------------
-
-Graphics:
----------
-
-SUGG: Combine MapBlock's face caches to so big pieces that VBO
-      can be used
-      - That is >500 vertices
-	  - This is not easy; all the MapBlocks close to the player would
-	    still need to be drawn separately and combining the blocks
-		would have to happen in a background thread
-
-SUGG: Make fetching sector's blocks more efficient when rendering
-      sectors that have very large amounts of blocks (on client)
-	  - Is this necessary at all?
-
-SUGG: Draw cubes in inventory directly with 3D drawing commands, so that
-      animating them is easier.
-
-SUGG: Option for enabling proper alpha channel for textures
-
-TODO: Flowing water animation
-
-TODO: A setting for enabling bilinear filtering for textures
-
-TODO: Better control of draw_control.wanted_max_blocks
-
-TODO: Further investigate the use of GPU lighting in addition to the
-      current one
-
-TODO: Artificial (night) light could be more yellow colored than sunlight.
-      - This is technically doable.
-	  - Also the actual colors of the textures could be made less colorful
-	    in the dark but it's a bit more difficult.
-
-SUGG: Somehow make the night less colorful
-
-TODO: Occlusion culling
-      - At the same time, move some of the renderMap() block choosing code
-        to the same place as where the new culling happens.
-      - Shoot some rays per frame and when ready, make a new list of
-	    blocks for usage of renderMap and give it a new pointer to it.
-
-Configuration:
---------------
-
-Client:
--------
-
-TODO: Untie client network operations from framerate
-      - Needs some input queues or something
-	  - This won't give much performance boost because calculating block
-	    meshes takes so long
-
-SUGG: Make morning and evening transition more smooth and maybe shorter
-
-TODO: Don't update all meshes always on single node changes, but
-      check which ones should be updated
-	  - implement Map::updateNodeMeshes() and the usage of it
-	  - It will give almost always a 4x boost in mesh update performance.
-
-- A weapon engine
-
-- Tool/weapon visualization
-
-FIXME: When disconnected to the menu, memory is not freed properly
-
-TODO: Investigate how much the mesh generator thread gets used when
-      transferring map data
-
-Server:
--------
-
-SUGG: Make an option to the server to disable building and digging near
-      the starting position
-
-FIXME: Server sometimes goes into some infinite PeerNotFoundException loop
-
-* Fix the problem with the server constantly saving one or a few
-  blocks? List the first saved block, maybe it explains.
-  - It is probably caused by oscillating water
-  - TODO: Investigate if this still happens (this is a very old one)
-* Make a small history check to transformLiquids to detect and log
-  continuous oscillations, in such detail that they can be fixed.
-
-FIXME: The new optimized map sending doesn't sometimes send enough blocks
-       from big caves and such
-FIXME: Block send distance configuration does not take effect for some reason
-
-Environment:
-------------
-
-TODO: Add proper hooks to when adding and removing active blocks
-
-TODO: Finish the ActiveBlockModifier stuff and use it for something
-
-Objects:
---------
-
-TODO: Get rid of MapBlockObjects and use only ActiveObjects
-	- Skipping the MapBlockObject data is nasty - there is no "total
-	  length" stored; have to make a SkipMBOs function which contains
-	  enough of the current code to skip them properly.
-
-SUGG: MovingObject::move and Player::move are basically the same.
-      combine them.
-	- NOTE: This is a bit tricky because player has the sneaking ability
-	- NOTE: Player::move is more up-to-date.
-	- NOTE: There is a simple move implementation now in collision.{h,cpp}
-	- NOTE: MovingObject will be deleted (MapBlockObject)
-
-TODO: Add a long step function to objects that is called with the time
-      difference when block activates
-
-Map:
-----
-
-TODO: Flowing water to actually contain flow direction information
-      - There is a space for this - it just has to be implemented.
-
-TODO: Consider smoothening cave floors after generating them
-
-TODO: Fix make_tree, make_* to use seed-position-consistent pseudorandom
-	  - delta also
-
-Misc. stuff:
-------------
-TODO: Make sure server handles removing grass when a block is placed (etc)
-      - The client should not do it by itself
-	  - NOTE: I think nobody does it currently...
-TODO: Block cube placement around player's head
-TODO: Protocol version field
-TODO: Think about using same bits for material for fences and doors, for
-	  example
-
-SUGG: Restart irrlicht completely when coming back to main menu from game.
-	- This gets rid of everything that is stored in irrlicht's caches.
-	- This might be needed for texture pack selection in menu
-
-TODO: Merge bahamada's audio stuff (clean patch available)
-
-Making it more portable:
-------------------------
- 
-Stuff to do before release:
----------------------------
-
-Fixes to the current release:
------------------------------
-
-Stuff to do after release:
----------------------------
-
-Doing currently:
-----------------
-
-======================================================================
-
-*/
diff --git a/doc/old/changelog.txt b/doc/old/changelog.txt
deleted file mode 100644
index 1750d71d1..000000000
--- a/doc/old/changelog.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-Minetest changelog
-----------------------
-This should contain all the major changes.
-For minor stuff, refer to the commit log of the repository.
-
-0.3.1: (released on 2011-11-09)
-- Fix frustum culling (previous versions have rendered too much stuff that is not actually visible (about 180 degrees, while should have been more like 100.))
-- Add occlusion culling (improves performance a lot)
-- Add “3d clouds” on/off checkbox in main menu
-- Add “opaque water” on/off checkbox
-- Fix some random minor stuff
-- Turn mipmapping off (This makes far-away textures a bit noisier but better looking)
-- Add Command-line signal handler for Windows (contributed by SpeedProg)
-- Fix network layer segmentation fault introduced in 0.3.dev-20111021
-- Fix water-glass and water-lava and lava-glass surfaces
-
-0.3.0: (released on 2011-11-01)
-- Some small fixes
-0.3.dev-20111021:
-- Modify dungeon masters to only try to shoot players
-- Fix object duplication bug at block load/unload bug
-- Improve network layer
-0.3.dev-20111016:
-- Locked chest (contributed)
-- Server user limit setting (max_users)
-- Wielded tool is shown in HUD (contributed)
-- View bobbing (contributed)
-- Saplings that drop from leaf blocks and when placed on ground will grow to trees (contributed)
-- Optimized map saving (does not re-save everything all the time)
-- New mob system and new mob: dungeon master
-- Death/respawn screen
-
-0.2.20110922_3:
-- Fix the build for MSVC2010; also released for windows using MSVC2010.
-
-0.2.20110922_1:
-- Make client report a newer version number to the server than 2011-07-31 does and make server disallow old clients
-
-0.2.20110922:
-- Map is saved in an SQLite database file (by Queatz)
-- Ladders (MarkTraceur)
-- Lava
-- Apple trees (sfan5)
-- Slightly better looking inventory with transparency
-- /me chat command (Oblomov)
-- Using chosen map seed possible through fixed_map_seed configuration option (kahrl)
-- Fix the long-existed PeerNotFound loop bug
-- Some translations and localization-related fixes
-- Lots of small fixes
-
-2011-07-31_3:
-- Fixes a bug that made the server to deny non-empty passwords from players connecting the first time
-
-2011-07-31_2:
-- Fixes a bug that caused the server to always read an empty password from the client when a client connected.
-
-2011-07-31:
-- A number of small fixes, build system stuff and such (refer to version control log)
-- Map generator no longer crashes at generation limit
-- Fixed mapgen producing lots of cut-down trees
-- Some minor tweaks in map generator (some contributed)
-- Volumetric clouds (contributed)
-- Icon added (graphic contributed)
-- Key configuration menu (contributed)
-- Decorative blocks and items: bookshelf, sandstone, cactus, clay, brick, papyrus, rail, paper, book (contributed)
-- Jungles!
-- Hotbar is a bit smaller
-- Health is now enabled by default; You can now eat cooked rats to heal yourself.
-- Finally added sword textures, altough sword is still of no use
-- Creative mode now preserves normal mode inventory
-
-2011-07-04:
-- Many small fixes
-- Code reorganizing to aid further development
-- Renewed map generator
-
-2011-06-02:
-- Password crash on windows fixed
-- Optimized server CPU usage a lot
-- Furnaces now work also while players are not near to them
-
-2011-05-29:
-- Optimized smooth lighting
-- A number of small fixes
-- Added clouds and simple skyboxes
-- The glass block added
-- Added key configuration to config file
-- Player privileges on server
-- Slightly updated map format
-- Player passwords
-- All textures first searched from texture_path
-- Map directory ("map") has been renamed to "world" (just rename it to load an old world)
-- Mouse inversion (invert_mouse)
-- Grass doesn't grow immediately anymore
-- Fence added
-
-2011-04-24:
-- Smooth lighting with simple ambient occlusion
-- Updated main menu
-
-2011-04-23_0_test:
-- Small bug fixes
-- Item drop multiplication fixed
-- HP added
-- Added A simple monster which spawns to dark places at map generation time
-- Some code refactoring and cleaning (possibly new bugs)
-
-2011-04-11:
-- Fixed crafting a bit
-
-2011-04-10_0:
-- Asynchronous map generation
-- New object system
-
-2011-04-06:
-- Mesh update of node addition/removal is now done asynchronously on client, removing frametime spike
-- Node addition/removal is sent directly only to clients that are closer than 100 nodes to the modification. For the others, the modified blocks are set unsent. (and are re-sent when applicable)
-
-2011-04-05:
-- Made furnace usable
-- Added cobblestone
-- Added wood, stone and steel tools: pickaxes, shovels and axes
-- Incremented to version 0.0.2
-
-2011-04-04:
-- Cleaned client to be completely synchronous, except for the mesh calculation, which is now done with queues in a separate thread.
-- Added node metadata support
-- Added chests
-
-2011-02-17:
-- Added better handling of textures. Now many file extensions are searched. Also too large textures are not put on the texture atlas, and the construction of the texture atlas is stopped when it is full.
-
-2011-02-16:
-- Better handling of Ctrl-C on POSIX systems
-
-2011-02-15:
-- Fixed a problem of not saving and loading the "lighting expired" value of MapBlocks properly. This caused high server CPU usage.
-- Ctrl-C handling on POSIX systems
-- Added simple command support to server
-- Added settings enable_texture_atlas and texture_path
-
-2011-02-14:
-- Created changelog.txt
-- Added sneaking/crouching
-- Modified the looks of the hotbar and cleaned code
-- Added code to allow generating 3D cube images for inventory
-

From 92705306bfb4994107a43514f29997cea15d48dc Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Tue, 14 Jun 2016 00:10:55 -0400
Subject: [PATCH 078/418] Mapgen: Refactor mapgen creation and management

- Move mapgen creation logic out of EmergeManager and into Mapgen
- Internally represent mapgen type as an enum value, instead of a string
- Remove the need for a MapgenFactory per mapgen
---
 src/emerge.cpp                    |  68 +++---------------
 src/emerge.h                      |   3 -
 src/mapgen.cpp                    | 112 +++++++++++++++++++++++++++++-
 src/mapgen.h                      |  33 ++++++---
 src/mapgen_flat.h                 |  14 +---
 src/mapgen_fractal.h              |  14 +---
 src/mapgen_singlenode.h           |  17 ++---
 src/mapgen_v5.h                   |  15 +---
 src/mapgen_v6.h                   |  16 +----
 src/mapgen_v7.h                   |  14 +---
 src/mapgen_valleys.h              |  14 +---
 src/script/lua_api/l_mainmenu.cpp |   4 +-
 12 files changed, 160 insertions(+), 164 deletions(-)

diff --git a/src/emerge.cpp b/src/emerge.cpp
index a2a10a177..48de6cb1a 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -34,13 +34,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "map.h"
 #include "mapblock.h"
-#include "mapgen_flat.h"
-#include "mapgen_fractal.h"
-#include "mapgen_v5.h"
-#include "mapgen_v6.h"
-#include "mapgen_v7.h"
-#include "mapgen_valleys.h"
-#include "mapgen_singlenode.h"
 #include "mg_biome.h"
 #include "mg_ore.h"
 #include "mg_decoration.h"
@@ -53,13 +46,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "voxel.h"
 
-
-struct MapgenDesc {
-	const char *name;
-	MapgenFactory *factory;
-	bool is_user_visible;
-};
-
 class EmergeThread : public Thread {
 public:
 	bool enable_mapgen_debug_info;
@@ -99,20 +85,6 @@ private:
 	friend class EmergeManager;
 };
 
-////
-//// Built-in mapgens
-////
-
-MapgenDesc g_reg_mapgens[] = {
-	{"v5",         new MapgenFactoryV5,         true},
-	{"v6",         new MapgenFactoryV6,         true},
-	{"v7",         new MapgenFactoryV7,         true},
-	{"flat",       new MapgenFactoryFlat,       true},
-	{"fractal",    new MapgenFactoryFractal,    true},
-	{"valleys",    new MapgenFactoryValleys,    true},
-	{"singlenode", new MapgenFactorySinglenode, false},
-};
-
 ////
 //// EmergeManager
 ////
@@ -195,24 +167,24 @@ void EmergeManager::initMapgens()
 	if (m_mapgens.size())
 		return;
 
-	MapgenFactory *mgfactory = getMapgenFactory(params.mg_name);
-	if (!mgfactory) {
+	MapgenType mgtype = Mapgen::getMapgenType(params.mg_name);
+	if (mgtype == MAPGEN_INVALID) {
+		const char *default_mapgen_name = Mapgen::getMapgenName(MAPGEN_DEFAULT);
 		errorstream << "EmergeManager: mapgen " << params.mg_name <<
-			" not registered; falling back to " << DEFAULT_MAPGEN << std::endl;
+			" not registered; falling back to " <<
+			default_mapgen_name << std::endl;
 
-		params.mg_name = DEFAULT_MAPGEN;
-
-		mgfactory = getMapgenFactory(params.mg_name);
-		FATAL_ERROR_IF(mgfactory == NULL, "Couldn't use any mapgen!");
+		params.mg_name = default_mapgen_name;
+		mgtype = MAPGEN_DEFAULT;
 	}
 
 	if (!params.sparams) {
-		params.sparams = mgfactory->createMapgenParams();
+		params.sparams = Mapgen::createMapgenParams(mgtype);
 		params.sparams->readParams(g_settings);
 	}
 
 	for (u32 i = 0; i != m_threads.size(); i++) {
-		Mapgen *mg = mgfactory->createMapgen(i, &params, this);
+		Mapgen *mg = Mapgen::createMapgen(mgtype, i, &params, this);
 		m_mapgens.push_back(mg);
 	}
 }
@@ -369,28 +341,6 @@ bool EmergeManager::isBlockUnderground(v3s16 blockpos)
 	return blockpos.Y * (MAP_BLOCKSIZE + 1) <= params.water_level;
 }
 
-
-void EmergeManager::getMapgenNames(
-	std::vector<const char *> *mgnames, bool include_hidden)
-{
-	for (u32 i = 0; i != ARRLEN(g_reg_mapgens); i++) {
-		if (include_hidden || g_reg_mapgens[i].is_user_visible)
-			mgnames->push_back(g_reg_mapgens[i].name);
-	}
-}
-
-
-MapgenFactory *EmergeManager::getMapgenFactory(const std::string &mgname)
-{
-	for (u32 i = 0; i != ARRLEN(g_reg_mapgens); i++) {
-		if (mgname == g_reg_mapgens[i].name)
-			return g_reg_mapgens[i].factory;
-	}
-
-	return NULL;
-}
-
-
 bool EmergeManager::pushBlockEmergeData(
 	v3s16 pos,
 	u16 peer_requested,
diff --git a/src/emerge.h b/src/emerge.h
index 825ac1c0f..303a35529 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -140,9 +140,6 @@ public:
 	int getGroundLevelAtPoint(v2s16 p);
 	bool isBlockUnderground(v3s16 blockpos);
 
-	static MapgenFactory *getMapgenFactory(const std::string &mgname);
-	static void getMapgenNames(
-		std::vector<const char *> *mgnames, bool include_hidden);
 	static v3s16 getContainingChunk(v3s16 blockpos, s16 chunksize);
 
 private:
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 1e0e3aa44..e45233b33 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -39,6 +39,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "filesys.h"
 #include "log.h"
+#include "mapgen_flat.h"
+#include "mapgen_fractal.h"
+#include "mapgen_v5.h"
+#include "mapgen_v6.h"
+#include "mapgen_v7.h"
+#include "mapgen_valleys.h"
+#include "mapgen_singlenode.h"
 #include "cavegen.h"
 #include "dungeongen.h"
 
@@ -63,6 +70,28 @@ FlagDesc flagdesc_gennotify[] = {
 	{NULL,               0}
 };
 
+struct MapgenDesc {
+	const char *name;
+	bool is_user_visible;
+};
+
+////
+//// Built-in mapgens
+////
+
+static MapgenDesc g_reg_mapgens[] = {
+	{"v5",         true},
+	{"v6",         true},
+	{"v7",         true},
+	{"flat",       true},
+	{"fractal",    true},
+	{"valleys",    true},
+	{"singlenode", false},
+};
+
+STATIC_ASSERT(
+	ARRLEN(g_reg_mapgens) == MAPGEN_INVALID,
+	registered_mapgens_is_wrong_size);
 
 ////
 //// Mapgen
@@ -121,6 +150,83 @@ Mapgen::~Mapgen()
 }
 
 
+MapgenType Mapgen::getMapgenType(const std::string &mgname)
+{
+	for (size_t i = 0; i != ARRLEN(g_reg_mapgens); i++) {
+		if (mgname == g_reg_mapgens[i].name)
+			return (MapgenType)i;
+	}
+
+	return MAPGEN_INVALID;
+}
+
+
+const char *Mapgen::getMapgenName(MapgenType mgtype)
+{
+	size_t index = (size_t)mgtype;
+	if (index == MAPGEN_INVALID || index >= ARRLEN(g_reg_mapgens))
+		return "invalid";
+
+	return g_reg_mapgens[index].name;
+}
+
+
+Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid,
+	MapgenParams *params, EmergeManager *emerge)
+{
+	switch (mgtype) {
+	case MAPGEN_FLAT:
+		return new MapgenFlat(mgid, params, emerge);
+	case MAPGEN_FRACTAL:
+		return new MapgenFractal(mgid, params, emerge);
+	case MAPGEN_SINGLENODE:
+		return new MapgenSinglenode(mgid, params, emerge);
+	case MAPGEN_V5:
+		return new MapgenV5(mgid, params, emerge);
+	case MAPGEN_V6:
+		return new MapgenV6(mgid, params, emerge);
+	case MAPGEN_V7:
+		return new MapgenV7(mgid, params, emerge);
+	case MAPGEN_VALLEYS:
+		return new MapgenValleys(mgid, params, emerge);
+	default:
+		return NULL;
+	}
+}
+
+
+MapgenSpecificParams *Mapgen::createMapgenParams(MapgenType mgtype)
+{
+	switch (mgtype) {
+	case MAPGEN_FLAT:
+		return new MapgenFlatParams;
+	case MAPGEN_FRACTAL:
+		return new MapgenFractalParams;
+	case MAPGEN_SINGLENODE:
+		return new MapgenSinglenodeParams;
+	case MAPGEN_V5:
+		return new MapgenV5Params;
+	case MAPGEN_V6:
+		return new MapgenV6Params;
+	case MAPGEN_V7:
+		return new MapgenV7Params;
+	case MAPGEN_VALLEYS:
+		return new MapgenValleysParams;
+	default:
+		return NULL;
+	}
+}
+
+
+void Mapgen::getMapgenNames(std::vector<const char *> *mgnames, bool include_hidden)
+{
+	for (u32 i = 0; i != ARRLEN(g_reg_mapgens); i++) {
+		if (include_hidden || g_reg_mapgens[i].is_user_visible)
+			mgnames->push_back(g_reg_mapgens[i].name);
+	}
+}
+
+
 u32 Mapgen::getBlockSeed(v3s16 p, s32 seed)
 {
 	return (u32)seed   +
@@ -891,9 +997,9 @@ void MapgenParams::load(const Settings &settings)
 	}
 
 	delete sparams;
-	MapgenFactory *mgfactory = EmergeManager::getMapgenFactory(mg_name);
-	if (mgfactory) {
-		sparams = mgfactory->createMapgenParams();
+	MapgenType mgtype = Mapgen::getMapgenType(mg_name);
+	if (mgtype != MAPGEN_INVALID) {
+		sparams = Mapgen::createMapgenParams(mgtype);
 		sparams->readParams(&settings);
 	}
 }
diff --git a/src/mapgen.h b/src/mapgen.h
index 90ac84bd8..618a2f6b8 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -26,7 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/string.h"
 #include "util/container.h"
 
-#define DEFAULT_MAPGEN "v6"
+#define MAPGEN_DEFAULT MAPGEN_V6
+#define MAPGEN_DEFAULT_NAME "v6"
 
 /////////////////// Mapgen flags
 #define MG_TREES       0x01
@@ -107,6 +108,17 @@ private:
 	std::list<GenNotifyEvent> m_notify_events;
 };
 
+enum MapgenType {
+	MAPGEN_V5,
+	MAPGEN_V6,
+	MAPGEN_V7,
+	MAPGEN_FLAT,
+	MAPGEN_FRACTAL,
+	MAPGEN_VALLEYS,
+	MAPGEN_SINGLENODE,
+	MAPGEN_INVALID,
+};
+
 struct MapgenSpecificParams {
 	virtual void readParams(const Settings *settings) = 0;
 	virtual void writeParams(Settings *settings) const = 0;
@@ -124,7 +136,7 @@ struct MapgenParams {
 	MapgenSpecificParams *sparams;
 
 	MapgenParams() :
-		mg_name(DEFAULT_MAPGEN),
+		mg_name(MAPGEN_DEFAULT_NAME),
 		chunksize(5),
 		seed(0),
 		water_level(1),
@@ -173,6 +185,8 @@ public:
 	Mapgen(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	virtual ~Mapgen();
 
+	virtual MapgenType getType() const { return MAPGEN_INVALID; }
+
 	static u32 getBlockSeed(v3s16 p, s32 seed);
 	static u32 getBlockSeed2(v3s16 p, s32 seed);
 	s16 findGroundLevelFull(v2s16 p2d);
@@ -198,6 +212,14 @@ public:
 	// signify this and to cause Server::findSpawnPos() to try another (X, Z).
 	virtual int getSpawnLevelAtPoint(v2s16 p) { return 0; }
 
+	// Mapgen management functions
+	static MapgenType getMapgenType(const std::string &mgname);
+	static const char *getMapgenName(MapgenType mgtype);
+	static Mapgen *createMapgen(MapgenType mgtype, int mgid,
+		MapgenParams *params, EmergeManager *emerge);
+	static MapgenSpecificParams *createMapgenParams(MapgenType mgtype);
+	static void getMapgenNames(std::vector<const char *> *mgnames, bool include_hidden);
+
 private:
 	// isLiquidHorizontallyFlowable() is a helper function for updateLiquid()
 	// that checks whether there are floodable nodes without liquid beneath
@@ -267,11 +289,4 @@ protected:
 	float cave_width;
 };
 
-struct MapgenFactory {
-	virtual Mapgen *createMapgen(int mgid, MapgenParams *params,
-		EmergeManager *emerge) = 0;
-	virtual MapgenSpecificParams *createMapgenParams() = 0;
-	virtual ~MapgenFactory() {}
-};
-
 #endif
diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h
index afe67b04e..39b6dc302 100644
--- a/src/mapgen_flat.h
+++ b/src/mapgen_flat.h
@@ -58,6 +58,8 @@ public:
 	MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	~MapgenFlat();
 
+	virtual MapgenType getType() const { return MAPGEN_FLAT; }
+
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
 	s16 generateTerrain();
@@ -72,16 +74,4 @@ private:
 	Noise *noise_terrain;
 };
 
-struct MapgenFactoryFlat : public MapgenFactory {
-	Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-	{
-		return new MapgenFlat(mgid, params, emerge);
-	};
-
-	MapgenSpecificParams *createMapgenParams()
-	{
-		return new MapgenFlatParams();
-	};
-};
-
 #endif
diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index 065142b84..cbd5567c4 100644
--- a/src/mapgen_fractal.h
+++ b/src/mapgen_fractal.h
@@ -62,6 +62,8 @@ public:
 	MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	~MapgenFractal();
 
+	virtual MapgenType getType() const { return MAPGEN_FRACTAL; }
+
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
 	bool getFractalAtPoint(s16 x, s16 y, s16 z);
@@ -83,16 +85,4 @@ private:
 	Noise *noise_seabed;
 };
 
-struct MapgenFactoryFractal : public MapgenFactory {
-	Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-	{
-		return new MapgenFractal(mgid, params, emerge);
-	};
-
-	MapgenSpecificParams *createMapgenParams()
-	{
-		return new MapgenFractalParams();
-	};
-};
-
 #endif
diff --git a/src/mapgen_singlenode.h b/src/mapgen_singlenode.h
index 2c6496c00..58672a0ed 100644
--- a/src/mapgen_singlenode.h
+++ b/src/mapgen_singlenode.h
@@ -23,10 +23,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h"
 
 struct MapgenSinglenodeParams : public MapgenSpecificParams {
-	
 	MapgenSinglenodeParams() {}
 	~MapgenSinglenodeParams() {}
-	
+
 	void readParams(const Settings *settings) {}
 	void writeParams(Settings *settings) const {}
 };
@@ -39,19 +38,11 @@ public:
 
 	MapgenSinglenode(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	~MapgenSinglenode();
-	
+
+	virtual MapgenType getType() const { return MAPGEN_SINGLENODE; }
+
 	void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
 };
 
-struct MapgenFactorySinglenode : public MapgenFactory {
-	Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
-		return new MapgenSinglenode(mgid, params, emerge);
-	};
-	
-	MapgenSpecificParams *createMapgenParams() {
-		return new MapgenSinglenodeParams();
-	};
-};
-
 #endif
diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index 4e1772a64..5f6b10383 100644
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -53,6 +53,8 @@ public:
 	MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	~MapgenV5();
 
+	virtual MapgenType getType() const { return MAPGEN_V5; }
+
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
 	int generateBaseTerrain();
@@ -63,17 +65,4 @@ private:
 	Noise *noise_ground;
 };
 
-
-struct MapgenFactoryV5 : public MapgenFactory {
-	Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-	{
-		return new MapgenV5(mgid, params, emerge);
-	};
-
-	MapgenSpecificParams *createMapgenParams()
-	{
-		return new MapgenV5Params();
-	};
-};
-
 #endif
diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index a55fc6d53..20b0bf92e 100644
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -127,6 +127,8 @@ public:
 	MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	~MapgenV6();
 
+	virtual MapgenType getType() const { return MAPGEN_V6; }
+
 	void makeChunk(BlockMakeData *data);
 	int getGroundLevelAtPoint(v2s16 p);
 	int getSpawnLevelAtPoint(v2s16 p);
@@ -162,18 +164,4 @@ public:
 	virtual void generateCaves(int max_stone_y);
 };
 
-
-struct MapgenFactoryV6 : public MapgenFactory {
-	Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-	{
-		return new MapgenV6(mgid, params, emerge);
-	};
-
-	MapgenSpecificParams *createMapgenParams()
-	{
-		return new MapgenV6Params();
-	};
-};
-
-
 #endif
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 9ed89a511..c75f18a93 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -59,6 +59,8 @@ public:
 	MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	~MapgenV7();
 
+	virtual MapgenType getType() const { return MAPGEN_V7; }
+
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
 
@@ -80,16 +82,4 @@ private:
 	Noise *noise_ridge;
 };
 
-struct MapgenFactoryV7 : public MapgenFactory {
-	Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-	{
-		return new MapgenV7(mgid, params, emerge);
-	};
-
-	MapgenSpecificParams *createMapgenParams()
-	{
-		return new MapgenV7Params();
-	};
-};
-
 #endif
diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index faaffa905..00f6aff07 100644
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -91,6 +91,8 @@ public:
 	MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge);
 	~MapgenValleys();
 
+	virtual MapgenType getType() const { return MAPGEN_VALLEYS; }
+
 	virtual void makeChunk(BlockMakeData *data);
 	int getSpawnLevelAtPoint(v2s16 p);
 
@@ -137,16 +139,4 @@ private:
 	virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
 };
 
-struct MapgenFactoryValleys : public MapgenFactory {
-	Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-	{
-		return new MapgenValleys(mgid, params, emerge);
-	};
-
-	MapgenSpecificParams *createMapgenParams()
-	{
-		return new MapgenValleysParams();
-	};
-};
-
 #endif
diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
index 7b29db159..8b078eafd 100644
--- a/src/script/lua_api/l_mainmenu.cpp
+++ b/src/script/lua_api/l_mainmenu.cpp
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "convert_json.h"
 #include "serverlist.h"
-#include "emerge.h"
+#include "mapgen.h"
 #include "sound.h"
 #include "settings.h"
 #include "log.h"
@@ -707,7 +707,7 @@ int ModApiMainMenu::l_set_topleft_text(lua_State *L)
 int ModApiMainMenu::l_get_mapgen_names(lua_State *L)
 {
 	std::vector<const char *> names;
-	EmergeManager::getMapgenNames(&names, lua_toboolean(L, 1));
+	Mapgen::getMapgenNames(&names, lua_toboolean(L, 1));
 
 	lua_newtable(L);
 	for (size_t i = 0; i != names.size(); i++) {

From 3c63c3044d5e4ca36c2649c530f31622581d90fd Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Fri, 24 Jun 2016 18:15:56 -0400
Subject: [PATCH 079/418] Add MapSettingsManager and new mapgen setting script
 API functions

This commit refactors the majority of the Mapgen settings system.
- MapgenParams is now owned by MapSettingsManager, itself a part of ServerMap,
  instead of the EmergeManager.
- New Script API functions added:
    core.get_mapgen_setting
    core.get_mapgen_setting_noiseparams,
    core.set_mapgen_setting, and
    core.set_mapgen_setting_noiseparams.
- minetest.get/set_mapgen_params are deprecated by the above new functions.
- It is now possible to view and modify any arbitrary mapgen setting from a mod,
  rather than the base MapgenParams structure.
- MapgenSpecificParams has been removed.
---
 build/android/jni/Android.mk               |   2 +
 doc/lua_api.txt                            |  19 ++
 src/CMakeLists.txt                         |   1 +
 src/emerge.cpp                             |  40 +---
 src/emerge.h                               |  15 +-
 src/map.cpp                                | 100 +++-----
 src/map.h                                  |  10 +-
 src/map_settings_manager.cpp               | 194 ++++++++++++++++
 src/map_settings_manager.h                 |  79 +++++++
 src/mapgen.cpp                             |  68 +++---
 src/mapgen.h                               |  20 +-
 src/mapgen_flat.cpp                        |  28 ++-
 src/mapgen_flat.h                          |   4 +-
 src/mapgen_fractal.cpp                     |  34 ++-
 src/mapgen_fractal.h                       |   4 +-
 src/mapgen_singlenode.h                    |   2 +-
 src/mapgen_v5.cpp                          |  20 +-
 src/mapgen_v5.h                            |   4 +-
 src/mapgen_v6.cpp                          |  33 ++-
 src/mapgen_v6.h                            |   4 +-
 src/mapgen_v7.cpp                          |  30 ++-
 src/mapgen_v7.h                            |   4 +-
 src/mapgen_valleys.cpp                     |  41 ++--
 src/mapgen_valleys.h                       |   4 +-
 src/script/lua_api/l_mapgen.cpp            | 156 ++++++++++---
 src/script/lua_api/l_mapgen.h              |  12 +
 src/script/lua_api/l_vmanip.cpp            |   2 +-
 src/server.cpp                             |  15 +-
 src/subgame.cpp                            |   4 +-
 src/unittest/CMakeLists.txt                |   1 +
 src/unittest/test_map_settings_manager.cpp | 255 +++++++++++++++++++++
 31 files changed, 890 insertions(+), 315 deletions(-)
 create mode 100644 src/map_settings_manager.cpp
 create mode 100644 src/map_settings_manager.h
 create mode 100644 src/unittest/test_map_settings_manager.cpp

diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index afd8c76b2..a42ab76b8 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -169,6 +169,7 @@ LOCAL_SRC_FILES := \
 		jni/src/log.cpp                           \
 		jni/src/main.cpp                          \
 		jni/src/map.cpp                           \
+		jni/src/map_settings_manager.cpp          \
 		jni/src/mapblock.cpp                      \
 		jni/src/mapblock_mesh.cpp                 \
 		jni/src/mapgen.cpp                        \
@@ -238,6 +239,7 @@ LOCAL_SRC_FILES := \
 		jni/src/unittest/test_connection.cpp      \
 		jni/src/unittest/test_filepath.cpp        \
 		jni/src/unittest/test_inventory.cpp       \
+		jni/src/unittest/test_map_settings_manager.cpp \
 		jni/src/unittest/test_mapnode.cpp         \
 		jni/src/unittest/test_nodedef.cpp         \
 		jni/src/unittest/test_noderesolver.cpp    \
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 6d359379e..297566068 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2089,7 +2089,9 @@ and `minetest.auth_reload` call the authetification handler.
       given biome_name string.
 * `minetest.get_mapgen_params()` Returns mapgen parameters, a table containing
   `mgname`, `seed`, `chunksize`, `water_level`, and `flags`.
+  * Deprecated: use minetest.get_mapgen_setting(name) instead
 * `minetest.set_mapgen_params(MapgenParams)`
+    * Deprecated: use minetest.set_mapgen_setting(name, value, override) instead
     * Set map generation parameters
     * Function cannot be called after the registration period; only initialization
       and `on_mapgen_init`
@@ -2099,6 +2101,23 @@ and `minetest.auth_reload` call the authetification handler.
         * `flags` contains a comma-delimited string of flags to set,
           or if the prefix `"no"` is attached, clears instead.
         * `flags` is in the same format and has the same options as `mg_flags` in `minetest.conf`
+* `minetest.get_mapgen_setting(name)`
+    * Gets the *active* mapgen setting (or nil if none exists) in string format with the following
+      order of precedence:
+        1) Settings loaded from map_meta.txt or overrides set during mod execution
+        2) Settings set by mods without a metafile override
+        3) Settings explicitly set in the user config file, minetest.conf
+        4) Settings set as the user config default
+* `minetest.get_mapgen_setting_noiseparams(name)`
+    * Same as above, but returns the value as a NoiseParams table if the setting `name` exists
+      and is a valid NoiseParams
+* `minetest.set_mapgen_setting(name, value, [override_meta=false])`
+   * Sets a mapgen param to `value`, and will take effect if the corresponding mapgen setting
+     is not already present in map_meta.txt.  If the optional boolean override_meta is set to true,
+     this setting will become the active setting regardless of the map metafile contents.
+   * Note: to set the seed, use "seed", not "fixed_map_seed"
+* `minetest.set_mapgen_setting_noiseparams(name, value, [override_meta=false])`
+   * Same as above, except value is a NoiseParams table
 * `minetest.set_noiseparams(name, noiseparams, set_default)`
     * Sets the noiseparams setting of `name` to the noiseparams table specified in `noiseparams`.
     * `set_default` is an optional boolean (default: `true`) that specifies whether the setting
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bffc1f7eb..bcd7a5984 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -414,6 +414,7 @@ set(common_SRCS
 	light.cpp
 	log.cpp
 	map.cpp
+	map_settings_manager.cpp
 	mapblock.cpp
 	mapgen.cpp
 	mapgen_flat.cpp
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 48de6cb1a..daf42f5e2 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -156,37 +156,19 @@ EmergeManager::~EmergeManager()
 }
 
 
-void EmergeManager::loadMapgenParams()
-{
-	params.load(*g_settings);
-}
-
-
-void EmergeManager::initMapgens()
+bool EmergeManager::initMapgens(MapgenParams *params)
 {
 	if (m_mapgens.size())
-		return;
+		return false;
 
-	MapgenType mgtype = Mapgen::getMapgenType(params.mg_name);
-	if (mgtype == MAPGEN_INVALID) {
-		const char *default_mapgen_name = Mapgen::getMapgenName(MAPGEN_DEFAULT);
-		errorstream << "EmergeManager: mapgen " << params.mg_name <<
-			" not registered; falling back to " <<
-			default_mapgen_name << std::endl;
-
-		params.mg_name = default_mapgen_name;
-		mgtype = MAPGEN_DEFAULT;
-	}
-
-	if (!params.sparams) {
-		params.sparams = Mapgen::createMapgenParams(mgtype);
-		params.sparams->readParams(g_settings);
-	}
+	this->mgparams = params;
 
 	for (u32 i = 0; i != m_threads.size(); i++) {
-		Mapgen *mg = Mapgen::createMapgen(mgtype, i, &params, this);
+		Mapgen *mg = Mapgen::createMapgen(params->mgtype, i, params, this);
 		m_mapgens.push_back(mg);
 	}
+
+	return true;
 }
 
 
@@ -288,12 +270,14 @@ bool EmergeManager::enqueueBlockEmergeEx(
 // Mapgen-related helper functions
 //
 
+
+// TODO(hmmmm): Move this to ServerMap
 v3s16 EmergeManager::getContainingChunk(v3s16 blockpos)
 {
-	return getContainingChunk(blockpos, params.chunksize);
+	return getContainingChunk(blockpos, mgparams->chunksize);
 }
 
-
+// TODO(hmmmm): Move this to ServerMap
 v3s16 EmergeManager::getContainingChunk(v3s16 blockpos, s16 chunksize)
 {
 	s16 coff = -chunksize / 2;
@@ -327,7 +311,7 @@ int EmergeManager::getGroundLevelAtPoint(v2s16 p)
 	return m_mapgens[0]->getGroundLevelAtPoint(p);
 }
 
-
+// TODO(hmmmm): Move this to ServerMap
 bool EmergeManager::isBlockUnderground(v3s16 blockpos)
 {
 #if 0
@@ -338,7 +322,7 @@ bool EmergeManager::isBlockUnderground(v3s16 blockpos)
 #endif
 
 	// Use a simple heuristic; the above method is wildly inaccurate anyway.
-	return blockpos.Y * (MAP_BLOCKSIZE + 1) <= params.water_level;
+	return blockpos.Y * (MAP_BLOCKSIZE + 1) <= mgparams->water_level;
 }
 
 bool EmergeManager::pushBlockEmergeData(
diff --git a/src/emerge.h b/src/emerge.h
index 303a35529..cf0677145 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -97,8 +97,16 @@ public:
 	u32 gen_notify_on;
 	std::set<u32> gen_notify_on_deco_ids;
 
-	// Map generation parameters
-	MapgenParams params;
+	// Parameters passed to mapgens owned by ServerMap
+	// TODO(hmmmm): Remove this after mapgen helper methods using them
+	// are moved to ServerMap
+	MapgenParams *mgparams;
+
+	// Hackish workaround:
+	// For now, EmergeManager must hold onto a ptr to the Map's setting manager
+	// since the Map can only be accessed through the Environment, and the
+	// Environment is not created until after script initialization.
+	MapSettingsManager *map_settings_mgr;
 
 	// Managers of various map generation-related components
 	BiomeManager *biomemgr;
@@ -110,8 +118,7 @@ public:
 	EmergeManager(IGameDef *gamedef);
 	~EmergeManager();
 
-	void loadMapgenParams();
-	void initMapgens();
+	bool initMapgens(MapgenParams *mgparams);
 
 	void startThreads();
 	void stopThreads();
diff --git a/src/map.cpp b/src/map.cpp
index a1f2086ce..38f0fa37c 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2130,11 +2130,15 @@ void Map::removeNodeTimer(v3s16 p)
 */
 ServerMap::ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emerge):
 	Map(dout_server, gamedef),
+	settings_mgr(g_settings, savedir + DIR_DELIM + "map_meta.txt"),
 	m_emerge(emerge),
 	m_map_metadata_changed(true)
 {
 	verbosestream<<FUNCTION_NAME<<std::endl;
 
+	// Tell the EmergeManager about our MapSettingsManager
+	emerge->map_settings_mgr = &settings_mgr;
+
 	/*
 		Try to load map; if not found, create a new one.
 	*/
@@ -2170,26 +2174,15 @@ ServerMap::ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emer
 			}
 			else
 			{
-				try{
-					// Load map metadata (seed, chunksize)
-					loadMapMeta();
-				}
-				catch(SettingNotFoundException &e){
-					infostream<<"ServerMap:  Some metadata not found."
-							  <<" Using default settings."<<std::endl;
-				}
-				catch(FileNotGoodException &e){
-					warningstream<<"Could not load map metadata"
-							//<<" Disabling chunk-based generator."
-							<<std::endl;
-					//m_chunksize = 0;
-				}
 
-				infostream<<"ServerMap: Successfully loaded map "
-						<<"metadata from "<<savedir
-						<<", assuming valid save directory."
-						<<" seed="<< m_emerge->params.seed <<"."
-						<<std::endl;
+				if (settings_mgr.loadMapMeta()) {
+					infostream << "ServerMap: Metadata loaded from "
+						<< savedir << std::endl;
+				} else {
+					infostream << "ServerMap: Metadata could not be loaded "
+						"from " << savedir << ", assuming valid save "
+						"directory." << std::endl;
+				}
 
 				m_map_saving_enabled = true;
 				// Map loaded, not creating new one
@@ -2259,19 +2252,26 @@ ServerMap::~ServerMap()
 #endif
 }
 
+MapgenParams *ServerMap::getMapgenParams()
+{
+	// getMapgenParams() should only ever be called after Server is initialized
+	assert(settings_mgr.mapgen_params != NULL);
+	return settings_mgr.mapgen_params;
+}
+
 u64 ServerMap::getSeed()
 {
-	return m_emerge->params.seed;
+	return getMapgenParams()->seed;
 }
 
 s16 ServerMap::getWaterLevel()
 {
-	return m_emerge->params.water_level;
+	return getMapgenParams()->water_level;
 }
 
 bool ServerMap::initBlockMake(v3s16 blockpos, BlockMakeData *data)
 {
-	s16 csize = m_emerge->params.chunksize;
+	s16 csize = getMapgenParams()->chunksize;
 	v3s16 bpmin = EmergeManager::getContainingChunk(blockpos, csize);
 	v3s16 bpmax = bpmin + v3s16(1, 1, 1) * (csize - 1);
 
@@ -2287,7 +2287,7 @@ bool ServerMap::initBlockMake(v3s16 blockpos, BlockMakeData *data)
 		blockpos_over_limit(full_bpmax))
 		return false;
 
-	data->seed = m_emerge->params.seed;
+	data->seed = getSeed();
 	data->blockpos_min = bpmin;
 	data->blockpos_max = bpmax;
 	data->blockpos_requested = blockpos;
@@ -2905,8 +2905,9 @@ void ServerMap::save(ModifiedState save_level)
 		infostream<<"ServerMap: Saving whole map, this can take time."
 				<<std::endl;
 
-	if(m_map_metadata_changed || save_level == MOD_STATE_CLEAN) {
-		saveMapMeta();
+	if (m_map_metadata_changed || save_level == MOD_STATE_CLEAN) {
+		if (settings_mgr.saveMapMeta())
+			m_map_metadata_changed = false;
 	}
 
 	// Profile modified reasons
@@ -3005,55 +3006,6 @@ void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
 	}
 }
 
-void ServerMap::saveMapMeta()
-{
-	DSTACK(FUNCTION_NAME);
-
-	createDirs(m_savedir);
-
-	std::string fullpath = m_savedir + DIR_DELIM + "map_meta.txt";
-	std::ostringstream oss(std::ios_base::binary);
-	Settings conf;
-
-	m_emerge->params.save(conf);
-	conf.writeLines(oss);
-
-	oss << "[end_of_params]\n";
-
-	if(!fs::safeWriteToFile(fullpath, oss.str())) {
-		errorstream << "ServerMap::saveMapMeta(): "
-				<< "could not write " << fullpath << std::endl;
-		throw FileNotGoodException("Cannot save chunk metadata");
-	}
-
-	m_map_metadata_changed = false;
-}
-
-void ServerMap::loadMapMeta()
-{
-	DSTACK(FUNCTION_NAME);
-
-	Settings conf;
-	std::string fullpath = m_savedir + DIR_DELIM + "map_meta.txt";
-
-	std::ifstream is(fullpath.c_str(), std::ios_base::binary);
-	if (!is.good()) {
-		errorstream << "ServerMap::loadMapMeta(): "
-			"could not open " << fullpath << std::endl;
-		throw FileNotGoodException("Cannot open map metadata");
-	}
-
-	if (!conf.parseConfigLines(is, "[end_of_params]")) {
-		throw SerializationError("ServerMap::loadMapMeta(): "
-				"[end_of_params] not found!");
-	}
-
-	m_emerge->params.load(conf);
-
-	verbosestream << "ServerMap::loadMapMeta(): seed="
-		<< m_emerge->params.seed << std::endl;
-}
-
 void ServerMap::saveSectorMeta(ServerMapSector *sector)
 {
 	DSTACK(FUNCTION_NAME);
diff --git a/src/map.h b/src/map.h
index 23da56471..13775fde1 100644
--- a/src/map.h
+++ b/src/map.h
@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "modifiedstate.h"
 #include "util/container.h"
 #include "nodetimer.h"
+#include "map_settings_manager.h"
 
 class Settings;
 class Database;
@@ -46,8 +47,6 @@ class IRollbackManager;
 class EmergeManager;
 class ServerEnvironment;
 struct BlockMakeData;
-struct MapgenParams;
-
 
 /*
 	MapEditEvent
@@ -463,9 +462,8 @@ public:
 	void save(ModifiedState save_level);
 	void listAllLoadableBlocks(std::vector<v3s16> &dst);
 	void listAllLoadedBlocks(std::vector<v3s16> &dst);
-	// Saves map seed and possibly other stuff
-	void saveMapMeta();
-	void loadMapMeta();
+
+	MapgenParams *getMapgenParams();
 
 	/*void saveChunkMeta();
 	void loadChunkMeta();*/
@@ -506,6 +504,8 @@ public:
 	u64 getSeed();
 	s16 getWaterLevel();
 
+	MapSettingsManager settings_mgr;
+
 private:
 	// Emerge manager
 	EmergeManager *m_emerge;
diff --git a/src/map_settings_manager.cpp b/src/map_settings_manager.cpp
new file mode 100644
index 000000000..53d17125c
--- /dev/null
+++ b/src/map_settings_manager.cpp
@@ -0,0 +1,194 @@
+/*
+Minetest
+Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "debug.h"
+#include "filesys.h"
+#include "log.h"
+#include "mapgen.h"
+#include "settings.h"
+
+#include "map_settings_manager.h"
+
+MapSettingsManager::MapSettingsManager(
+	Settings *user_settings, const std::string &map_meta_path)
+{
+	m_map_meta_path = map_meta_path;
+	m_user_settings = user_settings;
+	m_map_settings  = new Settings;
+	mapgen_params   = NULL;
+
+	assert(m_user_settings != NULL);
+}
+
+
+MapSettingsManager::~MapSettingsManager()
+{
+	delete m_map_settings;
+	delete mapgen_params;
+}
+
+
+bool MapSettingsManager::getMapSetting(
+	const std::string &name, std::string *value_out)
+{
+	if (m_map_settings->getNoEx(name, *value_out))
+		return true;
+
+	// Compatibility kludge
+	if (m_user_settings == g_settings && name == "seed")
+		return m_user_settings->getNoEx("fixed_map_seed", *value_out);
+
+	return m_user_settings->getNoEx(name, *value_out);
+}
+
+
+bool MapSettingsManager::getMapSettingNoiseParams(
+	const std::string &name, NoiseParams *value_out)
+{
+	return m_map_settings->getNoiseParams(name, *value_out) ||
+		m_user_settings->getNoiseParams(name, *value_out);
+}
+
+
+bool MapSettingsManager::setMapSetting(
+	const std::string &name, const std::string &value, bool override_meta)
+{
+	if (mapgen_params)
+		return false;
+
+	if (override_meta)
+		m_map_settings->set(name, value);
+	else
+		m_map_settings->setDefault(name, value);
+
+	return true;
+}
+
+
+bool MapSettingsManager::setMapSettingNoiseParams(
+	const std::string &name, const NoiseParams *value, bool override_meta)
+{
+	if (mapgen_params)
+		return false;
+
+	m_map_settings->setNoiseParams(name, *value, !override_meta);
+	return true;
+}
+
+
+bool MapSettingsManager::loadMapMeta()
+{
+	std::ifstream is(m_map_meta_path.c_str(), std::ios_base::binary);
+
+	if (!is.good()) {
+		errorstream << "loadMapMeta: could not open "
+			<< m_map_meta_path << std::endl;
+		return false;
+	}
+
+	if (!m_map_settings->parseConfigLines(is, "[end_of_params]")) {
+		errorstream << "loadMapMeta: [end_of_params] not found!" << std::endl;
+		return false;
+	}
+
+	return true;
+}
+
+
+bool MapSettingsManager::saveMapMeta()
+{
+	// If mapgen params haven't been created yet; abort
+	if (!mapgen_params)
+		return false;
+
+	if (!fs::CreateAllDirs(fs::RemoveLastPathComponent(m_map_meta_path))) {
+		errorstream << "saveMapMeta: could not create dirs to "
+			<< m_map_meta_path;
+		return false;
+	}
+
+	std::ostringstream oss(std::ios_base::binary);
+	Settings conf;
+
+	mapgen_params->MapgenParams::writeParams(&conf);
+	mapgen_params->writeParams(&conf);
+	conf.writeLines(oss);
+
+	// NOTE: If there are ever types of map settings other than
+	// those relating to map generation, save them here
+
+	oss << "[end_of_params]\n";
+
+	if (!fs::safeWriteToFile(m_map_meta_path, oss.str())) {
+		errorstream << "saveMapMeta: could not write "
+			<< m_map_meta_path << std::endl;
+		return false;
+	}
+
+	return true;
+}
+
+
+MapgenParams *MapSettingsManager::makeMapgenParams()
+{
+	if (mapgen_params)
+		return mapgen_params;
+
+	assert(m_user_settings != NULL);
+	assert(m_map_settings != NULL);
+
+	// At this point, we have (in order of precedence):
+	// 1). m_mapgen_settings->m_settings containing map_meta.txt settings or
+	//     explicit overrides from scripts
+	// 2). m_mapgen_settings->m_defaults containing script-set mgparams without
+	//     overrides
+	// 3). g_settings->m_settings containing all user-specified config file
+	//     settings
+	// 4). g_settings->m_defaults containing any low-priority settings from
+	//     scripts, e.g. mods using Lua as an enhanced config file)
+
+	// Now, get the mapgen type so we can create the appropriate MapgenParams
+	std::string mg_name;
+	MapgenType mgtype = getMapSetting("mg_name", &mg_name) ?
+		Mapgen::getMapgenType(mg_name) : MAPGEN_DEFAULT;
+	if (mgtype == MAPGEN_INVALID) {
+		errorstream << "EmergeManager: mapgen '" << mg_name <<
+			"' not valid; falling back to " <<
+			Mapgen::getMapgenName(MAPGEN_DEFAULT) << std::endl;
+		mgtype = MAPGEN_DEFAULT;
+	}
+
+	// Create our MapgenParams
+	MapgenParams *params = Mapgen::createMapgenParams(mgtype);
+	if (params == NULL)
+		return NULL;
+
+	params->mgtype = mgtype;
+
+	// Load the rest of the mapgen params from our active settings
+	params->MapgenParams::readParams(m_user_settings);
+	params->MapgenParams::readParams(m_map_settings);
+	params->readParams(m_user_settings);
+	params->readParams(m_map_settings);
+
+	// Hold onto our params
+	mapgen_params = params;
+
+	return params;
+}
diff --git a/src/map_settings_manager.h b/src/map_settings_manager.h
new file mode 100644
index 000000000..9f766f1f0
--- /dev/null
+++ b/src/map_settings_manager.h
@@ -0,0 +1,79 @@
+/*
+Minetest
+Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef MAP_SETTINGS_MANAGER_HEADER
+#define MAP_SETTINGS_MANAGER_HEADER
+
+#include <string>
+
+class Settings;
+struct NoiseParams;
+struct MapgenParams;
+
+/*
+	MapSettingsManager is a centralized object for management (creating,
+	loading, storing, saving, etc.) of config settings related to the Map.
+
+	It has two phases: the initial r/w "gather and modify settings" state, and
+	the final r/o "read and save settings" state.
+
+	The typical use case is, in order, as follows:
+	- Create a MapSettingsManager object
+	- Try to load map metadata into it from the metadata file
+	- Manually view and modify the current configuration as desired through a
+	  Settings-like interface
+	- When all modifications are finished, create a 'Parameters' object
+	  containing the finalized, active parameters.  This could be passed along
+	  to whichever Map-related objects that may require it.
+	- Save these active settings to the metadata file when requested
+*/
+class MapSettingsManager {
+public:
+	// Finalized map generation parameters
+	MapgenParams *mapgen_params;
+
+	MapSettingsManager(Settings *user_settings,
+		const std::string &map_meta_path);
+	~MapSettingsManager();
+
+	bool getMapSetting(const std::string &name, std::string *value_out);
+
+	bool getMapSettingNoiseParams(
+		const std::string &name, NoiseParams *value_out);
+
+	// Note: Map config becomes read-only after makeMapgenParams() gets called
+	// (i.e. mapgen_params is non-NULL).  Attempts to set map config after
+	// params have been finalized will result in failure.
+	bool setMapSetting(const std::string &name,
+		const std::string &value, bool override_meta = false);
+
+	bool setMapSettingNoiseParams(const std::string &name,
+		const NoiseParams *value, bool override_meta = false);
+
+	bool loadMapMeta();
+	bool saveMapMeta();
+	MapgenParams *makeMapgenParams();
+
+private:
+	std::string m_map_meta_path;
+	Settings *m_map_settings;
+	Settings *m_user_settings;
+};
+
+#endif
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index e45233b33..b6fda91ac 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -176,26 +176,26 @@ Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid,
 {
 	switch (mgtype) {
 	case MAPGEN_FLAT:
-		return new MapgenFlat(mgid, params, emerge);
+		return new MapgenFlat(mgid, (MapgenFlatParams *)params, emerge);
 	case MAPGEN_FRACTAL:
-		return new MapgenFractal(mgid, params, emerge);
+		return new MapgenFractal(mgid, (MapgenFractalParams *)params, emerge);
 	case MAPGEN_SINGLENODE:
-		return new MapgenSinglenode(mgid, params, emerge);
+		return new MapgenSinglenode(mgid, (MapgenSinglenodeParams *)params, emerge);
 	case MAPGEN_V5:
-		return new MapgenV5(mgid, params, emerge);
+		return new MapgenV5(mgid, (MapgenV5Params *)params, emerge);
 	case MAPGEN_V6:
-		return new MapgenV6(mgid, params, emerge);
+		return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
 	case MAPGEN_V7:
-		return new MapgenV7(mgid, params, emerge);
+		return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
 	case MAPGEN_VALLEYS:
-		return new MapgenValleys(mgid, params, emerge);
+		return new MapgenValleys(mgid, (MapgenValleysParams *)params, emerge);
 	default:
 		return NULL;
 	}
 }
 
 
-MapgenSpecificParams *Mapgen::createMapgenParams(MapgenType mgtype)
+MapgenParams *Mapgen::createMapgenParams(MapgenType mgtype)
 {
 	switch (mgtype) {
 	case MAPGEN_FLAT:
@@ -970,52 +970,46 @@ void GenerateNotifier::getEvents(
 MapgenParams::~MapgenParams()
 {
 	delete bparams;
-	delete sparams;
 }
 
 
-void MapgenParams::load(const Settings &settings)
+void MapgenParams::readParams(const Settings *settings)
 {
 	std::string seed_str;
-	const char *seed_name = (&settings == g_settings) ? "fixed_map_seed" : "seed";
+	const char *seed_name = (settings == g_settings) ? "fixed_map_seed" : "seed";
 
-	if (settings.getNoEx(seed_name, seed_str) && !seed_str.empty())
-		seed = read_seed(seed_str.c_str());
-	else
-		myrand_bytes(&seed, sizeof(seed));
+	if (settings->getNoEx(seed_name, seed_str)) {
+		if (!seed_str.empty())
+			seed = read_seed(seed_str.c_str());
+		else
+			myrand_bytes(&seed, sizeof(seed));
+	}
 
-	settings.getNoEx("mg_name", mg_name);
-	settings.getS16NoEx("water_level", water_level);
-	settings.getS16NoEx("chunksize", chunksize);
-	settings.getFlagStrNoEx("mg_flags", flags, flagdesc_mapgen);
+	std::string mg_name;
+	if (settings->getNoEx("mg_name", mg_name))
+		this->mgtype = Mapgen::getMapgenType(mg_name);
+
+	settings->getS16NoEx("water_level", water_level);
+	settings->getS16NoEx("chunksize", chunksize);
+	settings->getFlagStrNoEx("mg_flags", flags, flagdesc_mapgen);
 
 	delete bparams;
 	bparams = BiomeManager::createBiomeParams(BIOMEGEN_ORIGINAL);
 	if (bparams) {
-		bparams->readParams(&settings);
+		bparams->readParams(settings);
 		bparams->seed = seed;
 	}
-
-	delete sparams;
-	MapgenType mgtype = Mapgen::getMapgenType(mg_name);
-	if (mgtype != MAPGEN_INVALID) {
-		sparams = Mapgen::createMapgenParams(mgtype);
-		sparams->readParams(&settings);
-	}
 }
 
 
-void MapgenParams::save(Settings &settings) const
+void MapgenParams::writeParams(Settings *settings) const
 {
-	settings.set("mg_name", mg_name);
-	settings.setU64("seed", seed);
-	settings.setS16("water_level", water_level);
-	settings.setS16("chunksize", chunksize);
-	settings.setFlagStr("mg_flags", flags, flagdesc_mapgen, U32_MAX);
+	settings->set("mg_name", Mapgen::getMapgenName(mgtype));
+	settings->setU64("seed", seed);
+	settings->setS16("water_level", water_level);
+	settings->setS16("chunksize", chunksize);
+	settings->setFlagStr("mg_flags", flags, flagdesc_mapgen, U32_MAX);
 
 	if (bparams)
-		bparams->writeParams(&settings);
-
-	if (sparams)
-		sparams->writeParams(&settings);
+		bparams->writeParams(settings);
 }
diff --git a/src/mapgen.h b/src/mapgen.h
index 618a2f6b8..5fcf2a365 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -119,37 +119,29 @@ enum MapgenType {
 	MAPGEN_INVALID,
 };
 
-struct MapgenSpecificParams {
-	virtual void readParams(const Settings *settings) = 0;
-	virtual void writeParams(Settings *settings) const = 0;
-	virtual ~MapgenSpecificParams() {}
-};
-
 struct MapgenParams {
-	std::string mg_name;
+	MapgenType mgtype;
 	s16 chunksize;
 	u64 seed;
 	s16 water_level;
 	u32 flags;
 
 	BiomeParams *bparams;
-	MapgenSpecificParams *sparams;
 
 	MapgenParams() :
-		mg_name(MAPGEN_DEFAULT_NAME),
+		mgtype(MAPGEN_DEFAULT),
 		chunksize(5),
 		seed(0),
 		water_level(1),
 		flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS),
-		bparams(NULL),
-		sparams(NULL)
+		bparams(NULL)
 	{
 	}
 
 	virtual ~MapgenParams();
 
-	void load(const Settings &settings);
-	void save(Settings &settings) const;
+	virtual void readParams(const Settings *settings);
+	virtual void writeParams(Settings *settings) const;
 };
 
 
@@ -217,7 +209,7 @@ public:
 	static const char *getMapgenName(MapgenType mgtype);
 	static Mapgen *createMapgen(MapgenType mgtype, int mgid,
 		MapgenParams *params, EmergeManager *emerge);
-	static MapgenSpecificParams *createMapgenParams(MapgenType mgtype);
+	static MapgenParams *createMapgenParams(MapgenType mgtype);
 	static void getMapgenNames(std::vector<const char *> *mgnames, bool include_hidden);
 
 private:
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 956af999a..2c1715e61 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -49,26 +49,24 @@ FlagDesc flagdesc_mapgen_flat[] = {
 ///////////////////////////////////////////////////////////////////////////////////////
 
 
-MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+MapgenFlat::MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	MapgenFlatParams *sp = (MapgenFlatParams *)params->sparams;
-
-	this->spflags          = sp->spflags;
-	this->ground_level     = sp->ground_level;
-	this->large_cave_depth = sp->large_cave_depth;
-	this->cave_width       = sp->cave_width;
-	this->lake_threshold   = sp->lake_threshold;
-	this->lake_steepness   = sp->lake_steepness;
-	this->hill_threshold   = sp->hill_threshold;
-	this->hill_steepness   = sp->hill_steepness;
+	this->spflags          = params->spflags;
+	this->ground_level     = params->ground_level;
+	this->large_cave_depth = params->large_cave_depth;
+	this->cave_width       = params->cave_width;
+	this->lake_threshold   = params->lake_threshold;
+	this->lake_steepness   = params->lake_steepness;
+	this->hill_threshold   = params->hill_threshold;
+	this->hill_steepness   = params->hill_steepness;
 
 	//// 2D noise
-	noise_terrain      = new Noise(&sp->np_terrain,      seed, csize.X, csize.Z);
-	noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z);
+	noise_terrain      = new Noise(&params->np_terrain,      seed, csize.X, csize.Z);
+	noise_filler_depth = new Noise(&params->np_filler_depth, seed, csize.X, csize.Z);
 
-	MapgenBasic::np_cave1 = sp->np_cave1;
-	MapgenBasic::np_cave2 = sp->np_cave2;
+	MapgenBasic::np_cave1 = params->np_cave1;
+	MapgenBasic::np_cave2 = params->np_cave2;
 }
 
 
diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h
index 39b6dc302..8b3de2bcf 100644
--- a/src/mapgen_flat.h
+++ b/src/mapgen_flat.h
@@ -32,7 +32,7 @@ class BiomeManager;
 extern FlagDesc flagdesc_mapgen_flat[];
 
 
-struct MapgenFlatParams : public MapgenSpecificParams {
+struct MapgenFlatParams : public MapgenParams {
 	u32 spflags;
 	s16 ground_level;
 	s16 large_cave_depth;
@@ -55,7 +55,7 @@ struct MapgenFlatParams : public MapgenSpecificParams {
 
 class MapgenFlat : public MapgenBasic {
 public:
-	MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge);
 	~MapgenFlat();
 
 	virtual MapgenType getType() const { return MAPGEN_FLAT; }
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index 9e4c210dc..0951a0afa 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -47,29 +47,27 @@ FlagDesc flagdesc_mapgen_fractal[] = {
 ///////////////////////////////////////////////////////////////////////////////////////
 
 
-MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+MapgenFractal::MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	MapgenFractalParams *sp = (MapgenFractalParams *)params->sparams;
-
-	this->spflags    = sp->spflags;
-	this->cave_width = sp->cave_width;
-	this->fractal    = sp->fractal;
-	this->iterations = sp->iterations;
-	this->scale      = sp->scale;
-	this->offset     = sp->offset;
-	this->slice_w    = sp->slice_w;
-	this->julia_x    = sp->julia_x;
-	this->julia_y    = sp->julia_y;
-	this->julia_z    = sp->julia_z;
-	this->julia_w    = sp->julia_w;
+	this->spflags    = params->spflags;
+	this->cave_width = params->cave_width;
+	this->fractal    = params->fractal;
+	this->iterations = params->iterations;
+	this->scale      = params->scale;
+	this->offset     = params->offset;
+	this->slice_w    = params->slice_w;
+	this->julia_x    = params->julia_x;
+	this->julia_y    = params->julia_y;
+	this->julia_z    = params->julia_z;
+	this->julia_w    = params->julia_w;
 
 	//// 2D terrain noise
-	noise_seabed       = new Noise(&sp->np_seabed, seed, csize.X, csize.Z);
-	noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z);
+	noise_seabed       = new Noise(&params->np_seabed, seed, csize.X, csize.Z);
+	noise_filler_depth = new Noise(&params->np_filler_depth, seed, csize.X, csize.Z);
 
-	MapgenBasic::np_cave1 = sp->np_cave1;
-	MapgenBasic::np_cave2 = sp->np_cave2;
+	MapgenBasic::np_cave1 = params->np_cave1;
+	MapgenBasic::np_cave2 = params->np_cave2;
 
 	this->formula = fractal / 2 + fractal % 2;
 	this->julia   = fractal % 2 == 0;
diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index cbd5567c4..3331848bc 100644
--- a/src/mapgen_fractal.h
+++ b/src/mapgen_fractal.h
@@ -33,7 +33,7 @@ class BiomeManager;
 extern FlagDesc flagdesc_mapgen_fractal[];
 
 
-struct MapgenFractalParams : public MapgenSpecificParams {
+struct MapgenFractalParams : public MapgenParams {
 	u32 spflags;
 	float cave_width;
 	u16 fractal;
@@ -59,7 +59,7 @@ struct MapgenFractalParams : public MapgenSpecificParams {
 
 class MapgenFractal : public MapgenBasic {
 public:
-	MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge);
 	~MapgenFractal();
 
 	virtual MapgenType getType() const { return MAPGEN_FRACTAL; }
diff --git a/src/mapgen_singlenode.h b/src/mapgen_singlenode.h
index 58672a0ed..07520134d 100644
--- a/src/mapgen_singlenode.h
+++ b/src/mapgen_singlenode.h
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mapgen.h"
 
-struct MapgenSinglenodeParams : public MapgenSpecificParams {
+struct MapgenSinglenodeParams : public MapgenParams {
 	MapgenSinglenodeParams() {}
 	~MapgenSinglenodeParams() {}
 
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 74d5e1ee3..9f189e253 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -45,25 +45,23 @@ FlagDesc flagdesc_mapgen_v5[] = {
 };
 
 
-MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+MapgenV5::MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	MapgenV5Params *sp = (MapgenV5Params *)params->sparams;
-
-	this->spflags    = sp->spflags;
-	this->cave_width = sp->cave_width;
+	this->spflags    = params->spflags;
+	this->cave_width = params->cave_width;
 
 	// Terrain noise
-	noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z);
-	noise_factor       = new Noise(&sp->np_factor,       seed, csize.X, csize.Z);
-	noise_height       = new Noise(&sp->np_height,       seed, csize.X, csize.Z);
+	noise_filler_depth = new Noise(&params->np_filler_depth, seed, csize.X, csize.Z);
+	noise_factor       = new Noise(&params->np_factor,       seed, csize.X, csize.Z);
+	noise_height       = new Noise(&params->np_height,       seed, csize.X, csize.Z);
 
 	// 3D terrain noise
 	// 1-up 1-down overgeneration
-	noise_ground = new Noise(&sp->np_ground, seed, csize.X, csize.Y + 2, csize.Z);
+	noise_ground = new Noise(&params->np_ground, seed, csize.X, csize.Y + 2, csize.Z);
 
-	MapgenBasic::np_cave1 = sp->np_cave1;
-	MapgenBasic::np_cave2 = sp->np_cave2;
+	MapgenBasic::np_cave1 = params->np_cave1;
+	MapgenBasic::np_cave2 = params->np_cave2;
 }
 
 
diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index 5f6b10383..ddb090a9c 100644
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -30,7 +30,7 @@ class BiomeManager;
 extern FlagDesc flagdesc_mapgen_v5[];
 
 
-struct MapgenV5Params : public MapgenSpecificParams {
+struct MapgenV5Params : public MapgenParams {
 	u32 spflags;
 	float cave_width;
 	NoiseParams np_filler_depth;
@@ -50,7 +50,7 @@ struct MapgenV5Params : public MapgenSpecificParams {
 
 class MapgenV5 : public MapgenBasic {
 public:
-	MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge);
 	~MapgenV5();
 
 	virtual MapgenType getType() const { return MAPGEN_V5; }
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index caa64827e..e4444963f 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -53,7 +53,7 @@ FlagDesc flagdesc_mapgen_v6[] = {
 /////////////////////////////////////////////////////////////////////////////
 
 
-MapgenV6::MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge)
 	: Mapgen(mapgenid, params, emerge)
 {
 	this->m_emerge = emerge;
@@ -61,26 +61,25 @@ MapgenV6::MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 
 	this->heightmap = new s16[csize.X * csize.Z];
 
-	MapgenV6Params *sp = (MapgenV6Params *)params->sparams;
-	this->spflags     = sp->spflags;
-	this->freq_desert = sp->freq_desert;
-	this->freq_beach  = sp->freq_beach;
+	this->spflags     = params->spflags;
+	this->freq_desert = params->freq_desert;
+	this->freq_beach  = params->freq_beach;
 
-	np_cave        = &sp->np_cave;
-	np_humidity    = &sp->np_humidity;
-	np_trees       = &sp->np_trees;
-	np_apple_trees = &sp->np_apple_trees;
+	np_cave        = &params->np_cave;
+	np_humidity    = &params->np_humidity;
+	np_trees       = &params->np_trees;
+	np_apple_trees = &params->np_apple_trees;
 
 	//// Create noise objects
-	noise_terrain_base   = new Noise(&sp->np_terrain_base,   seed, csize.X, csize.Y);
-	noise_terrain_higher = new Noise(&sp->np_terrain_higher, seed, csize.X, csize.Y);
-	noise_steepness      = new Noise(&sp->np_steepness,      seed, csize.X, csize.Y);
-	noise_height_select  = new Noise(&sp->np_height_select,  seed, csize.X, csize.Y);
-	noise_mud            = new Noise(&sp->np_mud,            seed, csize.X, csize.Y);
-	noise_beach          = new Noise(&sp->np_beach,          seed, csize.X, csize.Y);
-	noise_biome          = new Noise(&sp->np_biome,          seed,
+	noise_terrain_base   = new Noise(&params->np_terrain_base,   seed, csize.X, csize.Y);
+	noise_terrain_higher = new Noise(&params->np_terrain_higher, seed, csize.X, csize.Y);
+	noise_steepness      = new Noise(&params->np_steepness,      seed, csize.X, csize.Y);
+	noise_height_select  = new Noise(&params->np_height_select,  seed, csize.X, csize.Y);
+	noise_mud            = new Noise(&params->np_mud,            seed, csize.X, csize.Y);
+	noise_beach          = new Noise(&params->np_beach,          seed, csize.X, csize.Y);
+	noise_biome          = new Noise(&params->np_biome,          seed,
 			csize.X + 2 * MAP_BLOCKSIZE, csize.Y + 2 * MAP_BLOCKSIZE);
-	noise_humidity       = new Noise(&sp->np_humidity,       seed,
+	noise_humidity       = new Noise(&params->np_humidity,       seed,
 			csize.X + 2 * MAP_BLOCKSIZE, csize.Y + 2 * MAP_BLOCKSIZE);
 
 	//// Resolve nodes to be used
diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index 20b0bf92e..f018ffaca 100644
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -53,7 +53,7 @@ enum BiomeV6Type
 };
 
 
-struct MapgenV6Params : public MapgenSpecificParams {
+struct MapgenV6Params : public MapgenParams {
 	u32 spflags;
 	float freq_desert;
 	float freq_beach;
@@ -124,7 +124,7 @@ public:
 	content_t c_mossycobble;
 	content_t c_stair_cobble;
 
-	MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge);
 	~MapgenV6();
 
 	virtual MapgenType getType() const { return MAPGEN_V6; }
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index c24b3e8d1..d14fdb97a 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -50,30 +50,28 @@ FlagDesc flagdesc_mapgen_v7[] = {
 ///////////////////////////////////////////////////////////////////////////////
 
 
-MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+MapgenV7::MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	MapgenV7Params *sp = (MapgenV7Params *)params->sparams;
-
-	this->spflags    = sp->spflags;
-	this->cave_width = sp->cave_width;
+	this->spflags    = params->spflags;
+	this->cave_width = params->cave_width;
 
 	//// Terrain noise
-	noise_terrain_base    = new Noise(&sp->np_terrain_base,    seed, csize.X, csize.Z);
-	noise_terrain_alt     = new Noise(&sp->np_terrain_alt,     seed, csize.X, csize.Z);
-	noise_terrain_persist = new Noise(&sp->np_terrain_persist, seed, csize.X, csize.Z);
-	noise_height_select   = new Noise(&sp->np_height_select,   seed, csize.X, csize.Z);
-	noise_filler_depth    = new Noise(&sp->np_filler_depth,    seed, csize.X, csize.Z);
-	noise_mount_height    = new Noise(&sp->np_mount_height,    seed, csize.X, csize.Z);
-	noise_ridge_uwater    = new Noise(&sp->np_ridge_uwater,    seed, csize.X, csize.Z);
+	noise_terrain_base    = new Noise(&params->np_terrain_base,    seed, csize.X, csize.Z);
+	noise_terrain_alt     = new Noise(&params->np_terrain_alt,     seed, csize.X, csize.Z);
+	noise_terrain_persist = new Noise(&params->np_terrain_persist, seed, csize.X, csize.Z);
+	noise_height_select   = new Noise(&params->np_height_select,   seed, csize.X, csize.Z);
+	noise_filler_depth    = new Noise(&params->np_filler_depth,    seed, csize.X, csize.Z);
+	noise_mount_height    = new Noise(&params->np_mount_height,    seed, csize.X, csize.Z);
+	noise_ridge_uwater    = new Noise(&params->np_ridge_uwater,    seed, csize.X, csize.Z);
 
 	//// 3d terrain noise
 	// 1-up 1-down overgeneration
-	noise_mountain = new Noise(&sp->np_mountain, seed, csize.X, csize.Y + 2, csize.Z);
-	noise_ridge    = new Noise(&sp->np_ridge,    seed, csize.X, csize.Y + 2, csize.Z);
+	noise_mountain = new Noise(&params->np_mountain, seed, csize.X, csize.Y + 2, csize.Z);
+	noise_ridge    = new Noise(&params->np_ridge,    seed, csize.X, csize.Y + 2, csize.Z);
 
-	MapgenBasic::np_cave1 = sp->np_cave1;
-	MapgenBasic::np_cave2 = sp->np_cave2;
+	MapgenBasic::np_cave1 = params->np_cave1;
+	MapgenBasic::np_cave2 = params->np_cave2;
 }
 
 
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index c75f18a93..3a6bc0801 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -32,7 +32,7 @@ class BiomeManager;
 extern FlagDesc flagdesc_mapgen_v7[];
 
 
-struct MapgenV7Params : public MapgenSpecificParams {
+struct MapgenV7Params : public MapgenParams {
 	u32 spflags;
 	float cave_width;
 	NoiseParams np_terrain_base;
@@ -56,7 +56,7 @@ struct MapgenV7Params : public MapgenSpecificParams {
 
 class MapgenV7 : public MapgenBasic {
 public:
-	MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
 	~MapgenV7();
 
 	virtual MapgenType getType() const { return MAPGEN_V7; }
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 02a8fbfe0..a61f1b329 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -64,7 +64,7 @@ static FlagDesc flagdesc_mapgen_valleys[] = {
 ///////////////////////////////////////////////////////////////////////////////
 
 
-MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+MapgenValleys::MapgenValleys(int mapgenid, MapgenValleysParams *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
 	// NOTE: MapgenValleys has a hard dependency on BiomeGenOriginal
@@ -73,34 +73,33 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
 	this->map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT,
 			g_settings->getU16("map_generation_limit"));
 
-	MapgenValleysParams *sp = (MapgenValleysParams *)params->sparams;
 	BiomeParamsOriginal *bp = (BiomeParamsOriginal *)params->bparams;
 
-	this->spflags            = sp->spflags;
-	this->altitude_chill     = sp->altitude_chill;
-	this->large_cave_depth   = sp->large_cave_depth;
-	this->lava_features_lim  = rangelim(sp->lava_features, 0, 10);
-	this->massive_cave_depth = sp->massive_cave_depth;
-	this->river_depth_bed    = sp->river_depth + 1.f;
-	this->river_size_factor  = sp->river_size / 100.f;
-	this->water_features_lim = rangelim(sp->water_features, 0, 10);
-	this->cave_width         = sp->cave_width;
+	this->spflags            = params->spflags;
+	this->altitude_chill     = params->altitude_chill;
+	this->large_cave_depth   = params->large_cave_depth;
+	this->lava_features_lim  = rangelim(params->lava_features, 0, 10);
+	this->massive_cave_depth = params->massive_cave_depth;
+	this->river_depth_bed    = params->river_depth + 1.f;
+	this->river_size_factor  = params->river_size / 100.f;
+	this->water_features_lim = rangelim(params->water_features, 0, 10);
+	this->cave_width         = params->cave_width;
 
 	//// 2D Terrain noise
-	noise_filler_depth       = new Noise(&sp->np_filler_depth,       seed, csize.X, csize.Z);
-	noise_inter_valley_slope = new Noise(&sp->np_inter_valley_slope, seed, csize.X, csize.Z);
-	noise_rivers             = new Noise(&sp->np_rivers,             seed, csize.X, csize.Z);
-	noise_terrain_height     = new Noise(&sp->np_terrain_height,     seed, csize.X, csize.Z);
-	noise_valley_depth       = new Noise(&sp->np_valley_depth,       seed, csize.X, csize.Z);
-	noise_valley_profile     = new Noise(&sp->np_valley_profile,     seed, csize.X, csize.Z);
+	noise_filler_depth       = new Noise(&params->np_filler_depth,       seed, csize.X, csize.Z);
+	noise_inter_valley_slope = new Noise(&params->np_inter_valley_slope, seed, csize.X, csize.Z);
+	noise_rivers             = new Noise(&params->np_rivers,             seed, csize.X, csize.Z);
+	noise_terrain_height     = new Noise(&params->np_terrain_height,     seed, csize.X, csize.Z);
+	noise_valley_depth       = new Noise(&params->np_valley_depth,       seed, csize.X, csize.Z);
+	noise_valley_profile     = new Noise(&params->np_valley_profile,     seed, csize.X, csize.Z);
 
 	//// 3D Terrain noise
 	// 1-up 1-down overgeneration
-	noise_inter_valley_fill = new Noise(&sp->np_inter_valley_fill, seed, csize.X, csize.Y + 2, csize.Z);
+	noise_inter_valley_fill = new Noise(&params->np_inter_valley_fill, seed, csize.X, csize.Y + 2, csize.Z);
 	// 1-down overgeneraion
-	noise_cave1             = new Noise(&sp->np_cave1,             seed, csize.X, csize.Y + 1, csize.Z);
-	noise_cave2             = new Noise(&sp->np_cave2,             seed, csize.X, csize.Y + 1, csize.Z);
-	noise_massive_caves     = new Noise(&sp->np_massive_caves,     seed, csize.X, csize.Y + 1, csize.Z);
+	noise_cave1             = new Noise(&params->np_cave1,             seed, csize.X, csize.Y + 1, csize.Z);
+	noise_cave2             = new Noise(&params->np_cave2,             seed, csize.X, csize.Y + 1, csize.Z);
+	noise_massive_caves     = new Noise(&params->np_massive_caves,     seed, csize.X, csize.Y + 1, csize.Z);
 
 	this->humid_rivers       = (spflags & MGVALLEYS_HUMID_RIVERS);
 	this->use_altitude_chill = (spflags & MGVALLEYS_ALT_CHILL);
diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index 00f6aff07..6dd7ebc47 100644
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -46,7 +46,7 @@ class BiomeGenOriginal;
 //extern Profiler *mapgen_profiler;
 
 
-struct MapgenValleysParams : public MapgenSpecificParams {
+struct MapgenValleysParams : public MapgenParams {
 	u32 spflags;
 	s16 large_cave_depth;
 	s16 massive_cave_depth;
@@ -88,7 +88,7 @@ struct TerrainNoise {
 class MapgenValleys : public MapgenBasic {
 public:
 
-	MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	MapgenValleys(int mapgenid, MapgenValleysParams *params, EmergeManager *emerge);
 	~MapgenValleys();
 
 	virtual MapgenType getType() const { return MAPGEN_VALLEYS; }
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index dc188f8a4..9f14838ce 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -600,24 +600,37 @@ int ModApiMapgen::l_get_mapgen_params(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	MapgenParams *params = &getServer(L)->getEmergeManager()->params;
+	log_deprecated(L, "get_mapgen_params is deprecated; "
+		"use get_mapgen_setting instead");
+
+	std::string value;
+
+	MapSettingsManager *settingsmgr =
+		getServer(L)->getEmergeManager()->map_settings_mgr;
 
 	lua_newtable(L);
 
-	lua_pushstring(L, params->mg_name.c_str());
+	settingsmgr->getMapSetting("mg_name", &value);
+	lua_pushstring(L, value.c_str());
 	lua_setfield(L, -2, "mgname");
 
-	lua_pushinteger(L, params->seed);
+	settingsmgr->getMapSetting("seed", &value);
+	std::istringstream ss(value);
+	u64 seed;
+	ss >> seed;
+	lua_pushinteger(L, seed);
 	lua_setfield(L, -2, "seed");
 
-	lua_pushinteger(L, params->water_level);
+	settingsmgr->getMapSetting("water_level", &value);
+	lua_pushinteger(L, stoi(value, -32768, 32767));
 	lua_setfield(L, -2, "water_level");
 
-	lua_pushinteger(L, params->chunksize);
+	settingsmgr->getMapSetting("chunksize", &value);
+	lua_pushinteger(L, stoi(value, -32768, 32767));
 	lua_setfield(L, -2, "chunksize");
 
-	std::string flagstr = writeFlagString(params->flags, flagdesc_mapgen, U32_MAX);
-	lua_pushstring(L, flagstr.c_str());
+	settingsmgr->getMapSetting("mg_flags", &value);
+	lua_pushstring(L, value.c_str());
 	lua_setfield(L, -2, "flags");
 
 	return 1;
@@ -630,44 +643,120 @@ int ModApiMapgen::l_set_mapgen_params(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
+	log_deprecated(L, "set_mapgen_params is deprecated; "
+		"use set_mapgen_setting instead");
+
 	if (!lua_istable(L, 1))
 		return 0;
 
-	EmergeManager *emerge = getServer(L)->getEmergeManager();
-	if (emerge->isRunning())
-		throw LuaError("Cannot set parameters while mapgen is running");
-
-	MapgenParams *params = &emerge->params;
-	u32 flags = 0, flagmask = 0;
+	MapSettingsManager *settingsmgr =
+		getServer(L)->getEmergeManager()->map_settings_mgr;
 
 	lua_getfield(L, 1, "mgname");
-	if (lua_isstring(L, -1)) {
-		params->mg_name = lua_tostring(L, -1);
-		delete params->sparams;
-		params->sparams = NULL;
-	}
+	if (lua_isstring(L, -1))
+		settingsmgr->setMapSetting("mg_name", lua_tostring(L, -1), true);
 
 	lua_getfield(L, 1, "seed");
 	if (lua_isnumber(L, -1))
-		params->seed = lua_tointeger(L, -1);
+		settingsmgr->setMapSetting("seed", lua_tostring(L, -1), true);
 
 	lua_getfield(L, 1, "water_level");
 	if (lua_isnumber(L, -1))
-		params->water_level = lua_tointeger(L, -1);
+		settingsmgr->setMapSetting("water_level", lua_tostring(L, -1), true);
 
 	lua_getfield(L, 1, "chunksize");
 	if (lua_isnumber(L, -1))
-		params->chunksize = lua_tointeger(L, -1);
+		settingsmgr->setMapSetting("chunksize", lua_tostring(L, -1), true);
 
 	warn_if_field_exists(L, 1, "flagmask",
 		"Deprecated: flags field now includes unset flags.");
-	lua_getfield(L, 1, "flagmask");
-	if (lua_isstring(L, -1))
-		params->flags &= ~readFlagString(lua_tostring(L, -1), flagdesc_mapgen, NULL);
 
-	if (getflagsfield(L, 1, "flags", flagdesc_mapgen, &flags, &flagmask)) {
-		params->flags &= ~flagmask;
-		params->flags |= flags;
+	lua_getfield(L, 1, "flags");
+	if (lua_isstring(L, -1))
+		settingsmgr->setMapSetting("mg_flags", lua_tostring(L, -1), true);
+
+	return 0;
+}
+
+// get_mapgen_setting(name)
+int ModApiMapgen::l_get_mapgen_setting(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	std::string value;
+	MapSettingsManager *settingsmgr =
+		getServer(L)->getEmergeManager()->map_settings_mgr;
+
+	const char *name = luaL_checkstring(L, 1);
+	if (!settingsmgr->getMapSetting(name, &value))
+		return 0;
+
+	lua_pushstring(L, value.c_str());
+	return 1;
+}
+
+// get_mapgen_setting_noiseparams(name)
+int ModApiMapgen::l_get_mapgen_setting_noiseparams(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	NoiseParams np;
+	MapSettingsManager *settingsmgr =
+		getServer(L)->getEmergeManager()->map_settings_mgr;
+
+	const char *name = luaL_checkstring(L, 1);
+	if (!settingsmgr->getMapSettingNoiseParams(name, &np))
+		return 0;
+
+	push_noiseparams(L, &np);
+	return 1;
+}
+
+// set_mapgen_setting(name, value, override_meta)
+// set mapgen config values
+int ModApiMapgen::l_set_mapgen_setting(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	MapSettingsManager *settingsmgr =
+		getServer(L)->getEmergeManager()->map_settings_mgr;
+
+	const char *name   = luaL_checkstring(L, 1);
+	const char *value  = luaL_checkstring(L, 2);
+	bool override_meta = lua_isboolean(L, 3) ? lua_toboolean(L, 3) : false;
+
+	if (!settingsmgr->setMapSetting(name, value, override_meta)) {
+		errorstream << "set_mapgen_setting: cannot set '"
+			<< name << "' after initialization" << std::endl;
+	}
+
+	return 0;
+}
+
+
+// set_mapgen_setting_noiseparams(name, noiseparams, set_default)
+// set mapgen config values for noise parameters
+int ModApiMapgen::l_set_mapgen_setting_noiseparams(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	MapSettingsManager *settingsmgr =
+		getServer(L)->getEmergeManager()->map_settings_mgr;
+
+	const char *name = luaL_checkstring(L, 1);
+
+	NoiseParams np;
+	if (!read_noiseparams(L, 2, &np)) {
+		errorstream << "set_mapgen_setting_noiseparams: cannot set '" << name
+			<< "'; invalid noiseparams table" << std::endl;
+		return 0;
+	}
+
+	bool override_meta = lua_isboolean(L, 3) ? lua_toboolean(L, 3) : false;
+
+	if (!settingsmgr->setMapSettingNoiseParams(name, &np, override_meta)) {
+		errorstream << "set_mapgen_setting_noiseparams: cannot set '"
+			<< name << "' after initialization" << std::endl;
 	}
 
 	return 0;
@@ -683,8 +772,11 @@ int ModApiMapgen::l_set_noiseparams(lua_State *L)
 	const char *name = luaL_checkstring(L, 1);
 
 	NoiseParams np;
-	if (!read_noiseparams(L, 2, &np))
+	if (!read_noiseparams(L, 2, &np)) {
+		errorstream << "set_noiseparams: cannot set '" << name
+			<< "'; invalid noiseparams table" << std::endl;
 		return 0;
+	}
 
 	bool set_default = lua_isboolean(L, 3) ? lua_toboolean(L, 3) : true;
 
@@ -1143,7 +1235,7 @@ int ModApiMapgen::l_generate_ores(lua_State *L)
 	EmergeManager *emerge = getServer(L)->getEmergeManager();
 
 	Mapgen mg;
-	mg.seed = emerge->params.seed;
+	mg.seed = emerge->mgparams->seed;
 	mg.vm   = LuaVoxelManip::checkobject(L, 1)->vm;
 	mg.ndef = getServer(L)->getNodeDefManager();
 
@@ -1169,7 +1261,7 @@ int ModApiMapgen::l_generate_decorations(lua_State *L)
 	EmergeManager *emerge = getServer(L)->getEmergeManager();
 
 	Mapgen mg;
-	mg.seed = emerge->params.seed;
+	mg.seed = emerge->mgparams->seed;
 	mg.vm   = LuaVoxelManip::checkobject(L, 1)->vm;
 	mg.ndef = getServer(L)->getNodeDefManager();
 
@@ -1393,6 +1485,10 @@ void ModApiMapgen::Initialize(lua_State *L, int top)
 
 	API_FCT(get_mapgen_params);
 	API_FCT(set_mapgen_params);
+	API_FCT(get_mapgen_setting);
+	API_FCT(set_mapgen_setting);
+	API_FCT(get_mapgen_setting_noiseparams);
+	API_FCT(set_mapgen_setting_noiseparams);
 	API_FCT(set_noiseparams);
 	API_FCT(get_noiseparams);
 	API_FCT(set_gen_notify);
diff --git a/src/script/lua_api/l_mapgen.h b/src/script/lua_api/l_mapgen.h
index 9751c0db6..bb94575c7 100644
--- a/src/script/lua_api/l_mapgen.h
+++ b/src/script/lua_api/l_mapgen.h
@@ -40,6 +40,18 @@ private:
 	// set mapgen parameters
 	static int l_set_mapgen_params(lua_State *L);
 
+	// get_mapgen_setting(name)
+	static int l_get_mapgen_setting(lua_State *L);
+
+	// set_mapgen_setting(name, value, override_meta)
+	static int l_set_mapgen_setting(lua_State *L);
+
+	// get_mapgen_setting_noiseparams(name)
+	static int l_get_mapgen_setting_noiseparams(lua_State *L);
+
+	// set_mapgen_setting_noiseparams(name, value, override_meta)
+	static int l_set_mapgen_setting_noiseparams(lua_State *L);
+
 	// set_noiseparam_defaults(name, noiseparams, set_default)
 	static int l_set_noiseparams(lua_State *L);
 
diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp
index f13866408..0d8123acd 100644
--- a/src/script/lua_api/l_vmanip.cpp
+++ b/src/script/lua_api/l_vmanip.cpp
@@ -190,7 +190,7 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L)
 	Mapgen mg;
 	mg.vm          = vm;
 	mg.ndef        = ndef;
-	mg.water_level = emerge->params.water_level;
+	mg.water_level = emerge->mgparams->water_level;
 
 	mg.calcLighting(pmin, pmax, fpmin, fpmax, propagate_shadow);
 
diff --git a/src/server.cpp b/src/server.cpp
index f7f698d50..97a53f189 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -266,9 +266,6 @@ Server::Server(
 	//lock environment
 	MutexAutoLock envlock(m_env_mutex);
 
-	// Load mapgen params from Settings
-	m_emerge->loadMapgenParams();
-
 	// Create the Map (loads map_meta.txt, overriding configured mapgen params)
 	ServerMap *servermap = new ServerMap(path_world, this, m_emerge);
 
@@ -331,8 +328,11 @@ Server::Server(
 
 	m_clients.setEnv(m_env);
 
+	if (!servermap->settings_mgr.makeMapgenParams())
+		FATAL_ERROR("Couldn't create any mapgen type");
+
 	// Initialize mapgens
-	m_emerge->initMapgens();
+	m_emerge->initMapgens(servermap->getMapgenParams());
 
 	m_enable_rollback_recording = g_settings->getBool("enable_rollback_recording");
 	if (m_enable_rollback_recording) {
@@ -402,11 +402,8 @@ Server::~Server()
 	m_emerge->stopThreads();
 
 	// Delete things in the reverse order of creation
-	delete m_env;
-
-	// N.B. the EmergeManager should be deleted after the Environment since Map
-	// depends on EmergeManager to write its current params to the map meta
 	delete m_emerge;
+	delete m_env;
 	delete m_rollback;
 	delete m_banmanager;
 	delete m_event;
@@ -655,7 +652,7 @@ void Server::AsyncRunStep(bool initial_step)
 					m_env->getGameTime(),
 					m_lag,
 					m_gamespec.id,
-					m_emerge->params.mg_name,
+					Mapgen::getMapgenName(m_emerge->mgparams->mgtype),
 					m_mods);
 			counter = 0.01;
 		}
diff --git a/src/subgame.cpp b/src/subgame.cpp
index 7e9a0b368..55bbd3954 100644
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -313,8 +313,8 @@ bool loadGameConfAndInitWorld(const std::string &path, const SubgameSpec &gamesp
 		Settings conf;
 		MapgenParams params;
 
-		params.load(*g_settings);
-		params.save(conf);
+		params.readParams(g_settings);
+		params.writeParams(&conf);
 		conf.writeLines(oss);
 		oss << "[end_of_params]\n";
 
diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
index a07ed8ba5..34de99e12 100644
--- a/src/unittest/CMakeLists.txt
+++ b/src/unittest/CMakeLists.txt
@@ -6,6 +6,7 @@ set (UNITTEST_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/test_connection.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_filepath.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_inventory.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_map_settings_manager.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_mapnode.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_nodedef.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_noderesolver.cpp
diff --git a/src/unittest/test_map_settings_manager.cpp b/src/unittest/test_map_settings_manager.cpp
new file mode 100644
index 000000000..b2ad53192
--- /dev/null
+++ b/src/unittest/test_map_settings_manager.cpp
@@ -0,0 +1,255 @@
+ /*
+Minetest
+Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "test.h"
+
+#include "noise.h"
+#include "settings.h"
+#include "mapgen_v5.h"
+#include "util/sha1.h"
+#include "map_settings_manager.h"
+
+class TestMapSettingsManager : public TestBase {
+public:
+	TestMapSettingsManager() { TestManager::registerTestModule(this); }
+	const char *getName() { return "TestMapSettingsManager"; }
+
+	void makeUserConfig(Settings *conf);
+	std::string makeMetaFile(bool make_corrupt);
+
+	void runTests(IGameDef *gamedef);
+
+	void testMapSettingsManager();
+	void testMapMetaSaveLoad();
+	void testMapMetaFailures();
+};
+
+static TestMapSettingsManager g_test_instance;
+
+void TestMapSettingsManager::runTests(IGameDef *gamedef)
+{
+	TEST(testMapSettingsManager);
+	TEST(testMapMetaSaveLoad);
+	TEST(testMapMetaFailures);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+
+void check_noise_params(const NoiseParams *np1, const NoiseParams *np2)
+{
+	UASSERTEQ(float, np1->offset, np2->offset);
+	UASSERTEQ(float, np1->scale, np2->scale);
+	UASSERT(np1->spread == np2->spread);
+	UASSERTEQ(s32, np1->seed, np2->seed);
+	UASSERTEQ(u16, np1->octaves, np2->octaves);
+	UASSERTEQ(float, np1->persist, np2->persist);
+	UASSERTEQ(float, np1->lacunarity, np2->lacunarity);
+	UASSERTEQ(u32, np1->flags, np2->flags);
+}
+
+
+std::string read_file_to_string(const std::string &filepath)
+{
+	std::string buf;
+	FILE *f = fopen(filepath.c_str(), "rb");
+	if (!f)
+		return "";
+
+	fseek(f, 0, SEEK_END);
+
+	long filesize = ftell(f);
+	if (filesize == -1)
+		return "";
+	rewind(f);
+
+	buf.resize(filesize);
+
+	fread(&buf[0], 1, filesize, f);
+
+	fclose(f);
+	return buf;
+}
+
+
+void TestMapSettingsManager::makeUserConfig(Settings *conf)
+{
+	conf->set("mg_name", "v7");
+	conf->set("seed", "5678");
+	conf->set("water_level", "20");
+	conf->set("mgv5_np_factor", "0, 12,  (500, 250, 500), 920382, 5, 0.45, 3.0");
+	conf->set("mgv5_np_height", "0, 15, (500, 250, 500), 841746,  5, 0.5,  3.0");
+	conf->set("mgv5_np_filler_depth", "20, 1, (150, 150, 150), 261, 4, 0.7,  1.0");
+	conf->set("mgv5_np_ground", "-43, 40, (80,  80,  80),  983240, 4, 0.55, 2.0");
+}
+
+
+std::string TestMapSettingsManager::makeMetaFile(bool make_corrupt)
+{
+	std::string metafile = getTestTempFile();
+
+	const char *metafile_contents =
+		"mg_name = v5\n"
+		"seed = 1234\n"
+		"mg_flags = light\n"
+		"mgv5_np_filler_depth = 20, 1, (150, 150, 150), 261, 4, 0.7,  1.0\n"
+		"mgv5_np_height = 20, 10, (250, 250, 250), 84174,  4, 0.5,  1.0\n";
+
+	FILE *f = fopen(metafile.c_str(), "wb");
+	UASSERT(f != NULL);
+
+	fputs(metafile_contents, f);
+	if (!make_corrupt)
+		fputs("[end_of_params]\n", f);
+
+	fclose(f);
+
+	return metafile;
+}
+
+
+void TestMapSettingsManager::testMapSettingsManager()
+{
+	Settings user_settings;
+	makeUserConfig(&user_settings);
+
+	std::string test_mapmeta_path = makeMetaFile(false);
+
+	MapSettingsManager mgr(&user_settings, test_mapmeta_path);
+	std::string value;
+
+	UASSERT(mgr.getMapSetting("mg_name", &value));
+	UASSERT(value == "v7");
+
+	// Pretend we're initializing the ServerMap
+	UASSERT(mgr.loadMapMeta());
+
+	// Pretend some scripts are requesting mapgen params
+	UASSERT(mgr.getMapSetting("mg_name", &value));
+	UASSERT(value == "v5");
+	UASSERT(mgr.getMapSetting("seed", &value));
+	UASSERT(value == "1234");
+	UASSERT(mgr.getMapSetting("water_level", &value));
+	UASSERT(value == "20");
+
+    // Pretend we have some mapgen settings configured from the scripting
+	UASSERT(mgr.setMapSetting("water_level", "15"));
+	UASSERT(mgr.setMapSetting("seed", "02468"));
+	UASSERT(mgr.setMapSetting("mg_flags", "nolight", true));
+
+	NoiseParams script_np_filler_depth(0, 100, v3f(200, 100, 200), 261, 4, 0.7, 2.0);
+	NoiseParams script_np_factor(0, 100, v3f(50, 50, 50), 920381, 3, 0.45, 2.0);
+	NoiseParams script_np_height(0, 100, v3f(450, 450, 450), 84174, 4, 0.5, 2.0);
+	NoiseParams meta_np_height(20, 10, v3f(250, 250, 250), 84174,  4, 0.5,  1.0);
+	NoiseParams user_np_ground(-43, 40, v3f(80,  80,  80),  983240, 4, 0.55, 2.0, NOISE_FLAG_EASED);
+
+	mgr.setMapSettingNoiseParams("mgv5_np_filler_depth", &script_np_filler_depth, true);
+	mgr.setMapSettingNoiseParams("mgv5_np_height", &script_np_height);
+	mgr.setMapSettingNoiseParams("mgv5_np_factor", &script_np_factor);
+
+	// Now make our Params and see if the values are correctly sourced
+	MapgenParams *params = mgr.makeMapgenParams();
+	UASSERT(params->mgtype == MAPGEN_V5);
+	UASSERT(params->chunksize == 5);
+	UASSERT(params->water_level == 15);
+	UASSERT(params->seed == 1234);
+	UASSERT((params->flags & MG_LIGHT) == 0);
+
+	MapgenV5Params *v5params = (MapgenV5Params *)params;
+
+	check_noise_params(&v5params->np_filler_depth, &script_np_filler_depth);
+	check_noise_params(&v5params->np_factor, &script_np_factor);
+	check_noise_params(&v5params->np_height, &meta_np_height);
+	check_noise_params(&v5params->np_ground, &user_np_ground);
+
+	UASSERT(mgr.setMapSetting("foobar", "25") == false);
+
+	// Pretend the ServerMap is shutting down
+	UASSERT(mgr.saveMapMeta());
+
+	// Make sure our interface expectations are met
+	UASSERT(mgr.mapgen_params == params);
+	UASSERT(mgr.makeMapgenParams() == params);
+
+	// Load the resulting map_meta.txt and make sure it contains what we expect
+	unsigned char expected_contents_hash[20] = {
+		0xf6, 0x44, 0x90, 0xb7, 0xab, 0xd8, 0x91, 0xf4, 0x08, 0x96,
+		0xfc, 0x7e, 0xed, 0x01, 0xc5, 0x9a, 0xfd, 0x2f, 0x2d, 0x79
+	};
+
+	SHA1 ctx;
+	std::string metafile_contents = read_file_to_string(test_mapmeta_path);
+	ctx.addBytes(&metafile_contents[0], metafile_contents.size());
+	unsigned char *sha1_result = ctx.getDigest();
+	int resultdiff = memcmp(sha1_result, expected_contents_hash, 20);
+	free(sha1_result);
+
+	UASSERT(!resultdiff);
+}
+
+
+void TestMapSettingsManager::testMapMetaSaveLoad()
+{
+	Settings conf;
+	std::string path = getTestTempDirectory()
+		+ DIR_DELIM + "foobar" + DIR_DELIM + "map_meta.txt";
+
+	// Create a set of mapgen params and save them to map meta
+	conf.set("seed", "12345");
+	conf.set("water_level", "5");
+	MapSettingsManager mgr1(&conf, path);
+	MapgenParams *params1 = mgr1.makeMapgenParams();
+	UASSERT(params1);
+	UASSERT(mgr1.saveMapMeta());
+
+	// Now try loading the map meta to mapgen params
+	conf.set("seed", "67890");
+	conf.set("water_level", "32");
+	MapSettingsManager mgr2(&conf, path);
+	UASSERT(mgr2.loadMapMeta());
+	MapgenParams *params2 = mgr2.makeMapgenParams();
+	UASSERT(params2);
+
+	// Check that both results are correct
+	UASSERTEQ(u64, params1->seed, 12345);
+	UASSERTEQ(s16, params1->water_level, 5);
+	UASSERTEQ(u64, params2->seed, 12345);
+	UASSERTEQ(s16, params2->water_level, 5);
+}
+
+
+void TestMapSettingsManager::testMapMetaFailures()
+{
+	std::string test_mapmeta_path;
+	Settings conf;
+
+	// Check to see if it'll fail on a non-existent map meta file
+	test_mapmeta_path = "woobawooba/fgdfg/map_meta.txt";
+	UASSERT(!fs::PathExists(test_mapmeta_path));
+
+	MapSettingsManager mgr1(&conf, test_mapmeta_path);
+	UASSERT(!mgr1.loadMapMeta());
+
+	// Check to see if it'll fail on a corrupt map meta file
+	test_mapmeta_path = makeMetaFile(true);
+	UASSERT(fs::PathExists(test_mapmeta_path));
+
+	MapSettingsManager mgr2(&conf, test_mapmeta_path);
+	UASSERT(!mgr2.loadMapMeta());
+}

From e1aa98fe077faecb14a9820f3861bb1c82b5db6e Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Sun, 3 Jul 2016 19:36:51 +0200
Subject: [PATCH 080/418] Remove top left minetest watermark

Move version information into the window caption.

On popular player request.

Fixes #4209.
---
 src/client/clientlauncher.cpp |  5 ++++-
 src/game.cpp                  | 11 ++++-------
 src/guiEngine.cpp             | 16 +++-------------
 src/guiEngine.h               |  4 ++--
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index ee8662ed6..a0781ef37 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "fontengine.h"
 #include "joystick_controller.h"
 #include "clientlauncher.h"
+#include "version.h"
 
 /* mainmenumanager.h
  */
@@ -185,7 +186,9 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
 	{
 		// Set the window caption
 		const wchar_t *text = wgettext("Main Menu");
-		device->setWindowCaption((utf8_to_wide(PROJECT_NAME_C) + L" [" + text + L"]").c_str());
+		device->setWindowCaption((utf8_to_wide(PROJECT_NAME_C) +
+			L" " + utf8_to_wide(g_version_hash) +
+			L" [" + text + L"]").c_str());
 		delete[] text;
 
 		try {	// This is used for catching disconnects
diff --git a/src/game.cpp b/src/game.cpp
index ba77d299a..93d9e6d2c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1273,10 +1273,10 @@ static void updateChat(Client &client, f32 dtime, bool show_debug,
 	setStaticText(guitext_chat, recent_chat);
 
 	// Update gui element size and position
-	s32 chat_y = 5 + line_height;
+	s32 chat_y = 5;
 
 	if (show_debug)
-		chat_y += line_height;
+		chat_y += 2 * line_height;
 
 	// first pass to calculate height of text to be set
 	s32 width = std::min(g_fontengine->getTextWidth(recent_chat.c_str()) + 10,
@@ -2205,6 +2205,8 @@ bool Game::createClient(const std::string &playername,
 	/* Set window caption
 	 */
 	std::wstring str = utf8_to_wide(PROJECT_NAME_C);
+	str += L" ";
+	str += utf8_to_wide(g_version_hash);
 	str += L" [";
 	str += driver->getName();
 	str += L"]";
@@ -4347,11 +4349,6 @@ void Game::updateGui(float *statustext_time, const RunStats &stats,
 		   << ", RTT = " << client->getRTT();
 		setStaticText(guitext, utf8_to_wide(os.str()).c_str());
 		guitext->setVisible(true);
-	} else if (flags.show_hud || flags.show_chat) {
-		std::ostringstream os(std::ios_base::binary);
-		os << PROJECT_NAME_C " " << g_version_hash;
-		setStaticText(guitext, utf8_to_wide(os.str()).c_str());
-		guitext->setVisible(true);
 	} else {
 		guitext->setVisible(false);
 	}
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index b9d796ccb..e15533dcd 100644
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -174,8 +174,7 @@ GUIEngine::GUIEngine(	irr::IrrlichtDevice* dev,
 		m_sound_manager = &dummySoundManager;
 
 	//create topleft header
-	m_toplefttext = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
-			g_version_hash);
+	m_toplefttext = L"";
 
 	core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()),
 		g_fontengine->getTextHeight());
@@ -571,18 +570,9 @@ bool GUIEngine::downloadFile(std::string url, std::string target)
 }
 
 /******************************************************************************/
-void GUIEngine::setTopleftText(std::string append)
+void GUIEngine::setTopleftText(const std::string &text)
 {
-	std::wstring toset = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
-		g_version_hash);
-
-	if (append != "")
-	{
-		toset += L" / ";
-		toset += utf8_to_wide(append);
-	}
-
-	m_toplefttext = toset;
+	m_toplefttext = utf8_to_wide(text);
 
 	updateTopLeftTextSize();
 }
diff --git a/src/guiEngine.h b/src/guiEngine.h
index a59436953..897244808 100644
--- a/src/guiEngine.h
+++ b/src/guiEngine.h
@@ -270,10 +270,10 @@ private:
 	void drawVersion();
 
 	/**
-	 * specify text to be appended to version string
+	 * specify text to appear as top left string
 	 * @param text to set
 	 */
-	void setTopleftText(std::string append);
+	void setTopleftText(const std::string &text);
 
 	/** pointer to gui element shown at topleft corner */
 	irr::gui::IGUIStaticText*	m_irr_toplefttext;

From f64914708092958f735337b3a14a33ca402b7893 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 4 Jul 2016 20:49:13 +0200
Subject: [PATCH 081/418] Disable joysticks per default for now

It seems that various different devices register as
Joysticks on linux, and their presence has caused
lots of confusion amongst minetest users.

Therefore, disable the joystick feature.

Closes #4261
Closes #4221
---
 builtin/settingtypes.txt | 2 +-
 src/defaultsettings.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index c751f34f2..3f256ec43 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -105,7 +105,7 @@ random_input (Random input) bool false
 continuous_forward (Continuous forward) bool false
 
 #    Enable Joysticks
-enable_joysticks (Enable Joysticks) bool true
+enable_joysticks (Enable Joysticks) bool false
 
 #    The time in seconds it takes between repeated events
 #    when holding down a joystick button combination.
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 43a7a7c00..8ee26ecff 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -116,7 +116,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("free_move", "false");
 	settings->setDefault("noclip", "false");
 	settings->setDefault("continuous_forward", "false");
-	settings->setDefault("enable_joysticks", "true");
+	settings->setDefault("enable_joysticks", "false");
 	settings->setDefault("repeat_joystick_button_time", "0.17");
 	settings->setDefault("joystick_frustum_sensitivity", "170");
 	settings->setDefault("cinematic", "false");

From 1dfd977ec43370da6931b11a8d0469792c8ebc36 Mon Sep 17 00:00:00 2001
From: Rogier-5 <Rogier-5@users.noreply.github.com>
Date: Mon, 4 Jul 2016 21:00:57 +0200
Subject: [PATCH 082/418] Fix & make linux conditionals uniform (#4278)

The source used a hodge-podge of different combinations of different
macros to check for linux: 'linux', '__linux', '__linux__'.

As '__linux__' is standard (Posix), and the others are not, the source
now uniformly uses __linux__. If either linux or __linux are defined,
it is made sure that __linux__ is defined as well.
---
 src/guiChatConsole.cpp   | 2 +-
 src/intlGUIEditBox.cpp   | 2 +-
 src/porting.cpp          | 4 ++--
 src/porting.h            | 8 ++++++--
 src/threading/thread.cpp | 8 ++++----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp
index bb58d1305..8dd5ab032 100644
--- a/src/guiChatConsole.cpp
+++ b/src/guiChatConsole.cpp
@@ -630,7 +630,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event)
 		}
 		else if(event.KeyInput.Char != 0 && !event.KeyInput.Control)
 		{
-			#if (defined(linux) || defined(__linux))
+			#if (defined(__linux__))
 				wchar_t wc = L'_';
 				mbtowc( &wc, (char *) &event.KeyInput.Char, sizeof(event.KeyInput.Char) );
 				prompt.input(wc);
diff --git a/src/intlGUIEditBox.cpp b/src/intlGUIEditBox.cpp
index 33bf8a13c..29f828076 100644
--- a/src/intlGUIEditBox.cpp
+++ b/src/intlGUIEditBox.cpp
@@ -271,7 +271,7 @@ bool intlGUIEditBox::OnEvent(const SEvent& event)
 			break;
 		case EET_KEY_INPUT_EVENT:
         {
-#if (defined(linux) || defined(__linux) || defined(__FreeBSD__))
+#if (defined(__linux__) || defined(__FreeBSD__))
             // ################################################################
 			// ValkaTR:
             // This part is the difference from the original intlGUIEditBox
diff --git a/src/porting.cpp b/src/porting.cpp
index 7ded58b3f..02ce6174b 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -258,7 +258,7 @@ bool getCurrentExecPath(char *buf, size_t len)
 
 
 //// Linux
-#elif defined(linux) || defined(__linux) || defined(__linux__)
+#elif defined(__linux__)
 
 bool getCurrentExecPath(char *buf, size_t len)
 {
@@ -374,7 +374,7 @@ bool setSystemPaths()
 
 
 //// Linux
-#elif defined(linux) || defined(__linux)
+#elif defined(__linux__)
 
 bool setSystemPaths()
 {
diff --git a/src/porting.h b/src/porting.h
index 4d51c5058..d101a7324 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -60,7 +60,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#include <unistd.h>
 	#include <stdint.h> //for uintptr_t
 
-	#if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE)
+	// Use standard Posix macro for Linux
+	#if (defined(linux) || defined(__linux)) && !defined(__linux__)
+		#define __linux__ 
+	#endif
+	#if (defined(__linux__) || defined(__GNU__)) && !defined(_GNU_SOURCE)
 		#define _GNU_SOURCE
 	#endif
 
@@ -321,7 +325,7 @@ inline const char *getPlatformName()
 	return
 #if defined(ANDROID)
 	"Android"
-#elif defined(linux) || defined(__linux) || defined(__linux__)
+#elif defined(__linux__)
 	"Linux"
 #elif defined(_WIN32) || defined(_WIN64)
 	"Windows"
diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp
index 5161a6c01..0cd536795 100644
--- a/src/threading/thread.cpp
+++ b/src/threading/thread.cpp
@@ -54,7 +54,7 @@ DEALINGS IN THE SOFTWARE.
 
 
 // for setName
-#if defined(linux) || defined(__linux)
+#if defined(__linux__)
 	#include <sys/prctl.h>
 #elif defined(__FreeBSD__) || defined(__OpenBSD__)
 	#include <pthread_np.h>
@@ -70,7 +70,7 @@ DEALINGS IN THE SOFTWARE.
 // for bindToProcessor
 #if __FreeBSD_version >= 702106
 	typedef cpuset_t cpu_set_t;
-#elif defined(__linux) || defined(linux)
+#elif defined(__linux__)
 	#include <sched.h>
 #elif defined(__sun) || defined(sun)
 	#include <sys/types.h>
@@ -261,7 +261,7 @@ DWORD WINAPI Thread::threadProc(LPVOID param)
 
 void Thread::setName(const std::string &name)
 {
-#if defined(linux) || defined(__linux)
+#if defined(__linux__)
 
 	// It would be cleaner to do this with pthread_setname_np,
 	// which was added to glibc in version 2.12, but some major
@@ -363,7 +363,7 @@ bool Thread::bindToProcessor(unsigned int proc_number)
 
 	return SetThreadAffinityMask(getThreadHandle(), 1 << proc_number);
 
-#elif __FreeBSD_version >= 702106 || defined(__linux) || defined(linux)
+#elif __FreeBSD_version >= 702106 || defined(__linux__)
 
 	cpu_set_t cpuset;
 

From c1bdb552bc3ec0fda1b82ab2c44a5c31ab53bd24 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 4 Jul 2016 21:32:32 +0200
Subject: [PATCH 083/418] Temporarily disable "testStartStopWait" Threading
 unit test on mac

The "testStartStopWait" unit test is unreliably failing on mac,
for some time already. See bug #3786.

Having the unittest fail unreliably doesn't help anybody but mostly
inhibits the main feature of travis builds: to test PRs for regressions.

Therefore, disable the specific unit test for until bug #3786
is fixed.
---
 src/unittest/test_threading.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/unittest/test_threading.cpp b/src/unittest/test_threading.cpp
index f0df85b2d..224e123df 100644
--- a/src/unittest/test_threading.cpp
+++ b/src/unittest/test_threading.cpp
@@ -39,7 +39,9 @@ static TestThreading g_test_instance;
 
 void TestThreading::runTests(IGameDef *gamedef)
 {
+#if !(defined(__MACH__) && defined(__APPLE__))
 	TEST(testStartStopWait);
+#endif
 	TEST(testThreadKill);
 	TEST(testAtomicSemaphoreThread);
 }

From 5d4d3f8366b74d9c3da892d94188defc49407ebf Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 4 Jul 2016 01:33:46 +0200
Subject: [PATCH 084/418] Finally set a window icon on X11

Since the creation of minetest, it had no window icon on X11.
Now we have one.

The misc/minetest-xorg-icon-128.png file is a rendering of the
misc/minetest.svg file with inkscape, created with something like:

inkscape -z -e misc/minetest-xorg-icon-128.png -w 128 -h 128 misc/minetest.svg
---
 misc/minetest-xorg-icon-128.png | Bin 0 -> 11241 bytes
 src/client/clientlauncher.cpp   |   3 ++
 src/porting.cpp                 |  87 ++++++++++++++++++++++++++++++++
 src/porting.h                   |   3 ++
 4 files changed, 93 insertions(+)
 create mode 100644 misc/minetest-xorg-icon-128.png

diff --git a/misc/minetest-xorg-icon-128.png b/misc/minetest-xorg-icon-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..0241a911ce70586f2b1a59a665661ef4115e14cf
GIT binary patch
literal 11241
zcmV<FD;Cs=P)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00004b3#c}2nYxW
zd<bNS00009a7bBm001QE001QE0Z=68_y7O^8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1AOJ~3K~#90?VWdYRo9*GKl_y1?^Oi}i6TIv2?<0K*ccOV!!5BL
zVyCzz87G;PNoJhHvy%75nMq!fm&{9<Ntuk}IQBTPjh(~=V}p(99YpUSkU$jGdv$f|
zIcL8=F4C2ZP`yGJ^IeOz#J=b3z0cX-v-fZR+J<YmhHJQnYq*AMxQ1)EhHJQnYq*AM
zxQ1)^P(TcJ2ijxiBjg&WKaf)R5yrpne1@jM?$gzdD}n&Ui?P{V+SjGvJAm&(ajg*I
ze~k^spIWj6b1?gNHDk~TQ1-BTH}LNWQFw_<c1ig9&S#8Om$6$P8Vni%raWvbR)qC4
z;O4f@sNfqekOnl@NTh6cgXCo?jBoCIh7*^)vsW=LI{`{QMTTb6z72c>u(kHWl_^Ls
z0M(x8k{OjWRY9n>Jqw5-_-#lS-#zp+&6m0BS0yeV0iHxDt5iRO5I+Tmv=-YukTF`p
z=I#8ph+ooFDT#+V6xRqTzPDp^{3)Kq8pv*6?YJxinD(f)KuUfFl(v?sHbL4*a1RmP
z_Cf-o^Ai6_FypfQ58I@|KkWR2v0-3(e)VHO2{8R(`&cQgA4=rnwgwgO3={Z<3lz0?
z^;rf4PD_GkBr^HkOM!S<Sn<cVKTB20I{zWTfDoYcLEM_EeN)1>0Y_`OBSVleTA(?)
zxVZ<2hrxeB5^n4uAA|(_#E0>tRnHLVUke`|q?!Pt>|ymmg!nO#+gfPzKzf0K-PgsP
zeL&~(fv84W->vwg`D|)iyE>6F0!)2GpDBd=1(G?fWr_yA5dv>+_v?ILAteOQN&;09
ztE0MT6^i(J#nbU!1Jm-=fqoB5>E{`)8v2hxezLVbp@1h>;2Y8Vb-u4K<C4HhNz3_!
z(AZjB@r<Eeo*sNK(eIa|8rmU{uGarMGX!Y`0^Ql)ntRy~U64^I@C<{xLl#Ct3b;)4
z``{uKUxy1ovk5W^!I3_=+GX7hx<_C{WcL?$f~gNU3RIOFy{9A3uUdtX;_h8>P*PQq
z?i>8U?+>OwhHKhqTu&;h*e?;!1oEAG%0BH{G}!$bXrzn)A7F^-pK>miEzbQ&`7c20
z;x$1a-<<Yo=j+q&w~rmn4h|$f)C5>?yZezji(L&;@DeZzKz9nV#&i%J?v$#suk6##
zA71}iE}^jg;Nn9mA>VwvduqgPz36vZ<K%@^ODHg`RA<Z$c665@aK_}wiYS3ICJ5{T
zo(M;s4^R7)cyeq!^!uyDN1@+~cG)AE1aM{xvd3K+GC<v7Nw_W{1Xes_v~}wGyYcF{
z{uFd`ho#82@{Ca$MGNh?hjg3}rG#_);~af2O1!0mP`O=Le0}?$!|Mk2Nd_Jtni*i>
zo$mkB?6MvYt5R<*b7m-voo8prgw9`s5RhA}Go(nPYHOUTjWH}!0!)_*Yo>k1`LeX+
zH!J=WIeD2LBjvd2XMpTF+Z`bX&xGx=%>=FLf)V95MwRO*TF?6&YP2}MCQ9wW4!gq;
zLj1%Y4gGlI62hr^hRcPko&X}QCx5u`MUS0t$L8*PUmH#s9DO%ROI^|=Dd3bP<aa9m
zC-NK}l#y39J~RaI4pSL-lO11PYLtW0f-}409A6V99_}#Sn}xzZY=17iIVBAZFs^z6
zIP5mY%(s&}Ngoh{lo6IxZisSfd%XR3ZvoHimh#Qbe{MOK`c_kiet!<brYcVY=q`aP
z>&hTNs2+?9CgSVA<ij^i9WZO8q6@OdXyi=L2sc`Un<OM!n_>z1#bHxyc6WY!W5dxa
zbK7{;D}q$p<sqdjOJ&L@ToixIi6gD;wR({9Uow5px`lUnKXzF<(o0<R1i0K7I$opv
z^DfdyCAXG_h9{<*Kj~>5lRr<+fOM`CTq8h=5j=0PYe|HrlgX{3Vu7z&In~|0(;q`G
zdqn%TZfMnI4{IyR9<@yx(9ZH9QUnb&Iuizk1aFH%c7uXui1S_DKlKrPrWKQa0E!bg
za}(04nD&VF3q5XpfAjMM2BP2BW`KS|T2Qky&Zhrv;ncR|;AdgyyVorwr&dAjLi{WI
zD)woQXg?5AZXh}Mt*}Y>W=z)(PkThYcOd$IZ3gHEI#USQErq+rPUN$5uR{oUfz<#A
zMRw{V<qK%rq+oLEpgXe!8KWW6DDYRw);Ne9ODOk)`Il5b!!-i*0ii~VqbsA-A8o(R
z3ua~J@%SwZa624?!cms3s!0CsFz<TkPTOC?&e#J>mJn+#mx9TVaG*^eBXDOYnBdL<
zSGM5P=7Cizri=jb07RPP2ihyBI~Y-@+7zXFYrNGc1i%Q*%eNLRpfGnRre(2q%K_e8
zT|rAI+IEd%H_<%CJ?^;H_|P5Vo6jzd|GItM_Vnc7w?bS7kH%CGAOyIKn51?;I5QX&
zr_ff!TOb}x?N@Utv#?j{JT|?Yn<h^L;L!0J{_^$~&YW*-yCx&c&V(s$_MbS7VSu7r
zE=A{8kKCjEZ!4^Sd=K%I_O-X@Hvvq|7~kG4JlrUW_~n)17M_C1sHw{2=*kGq=aTEZ
zZV7J5FXBr#-GC|->KdDQ{oU<U?5k|M#%5Ew_0HjZ^y39Mohs*Qi}>5p18lE21At<;
za)d3qcCh8}t2QtsV}wr8d>5V}ePdvxSyH(s%GrG#w{?@;S$yZVTgmXaiNy@w-LRJx
z>vv-q$;QiOWb@G9jbrH0i(}vp9<JkszwD#tOk!78;YbkRQnr-p4GH2&Azs?~hxq+{
zdYCSd^3brUkEkCPDE|&}L~EhV4e6r?C^YQ2B;L*nZ}%#Uz1~UgBzvFgG!04B<~UWG
zVpv9Uy3bWyd~^N+CJi5kl(2R8QC@pz8-ZZ5@lj(uJoMRdOejw8vJK0WtlM10-`+UL
zS~DR?UM&Ow1}8XF)dVAFIv6$6(JLp9Hb|&FWN>s<l!!k$-8(In2PaSGo*7dBsH&;s
zm1Uc$JeAbzc)dCw`^0E&xji36>3Q2Np&0YOw<6KbAQ50dwt>5!qXmp7XFkgB4XOVC
z<bwc_M#)*fOl^3$fT2Y;3g<a-`1&^8H=naOygWjnCOM6(7TlCOmM`CYBf6^66lme~
zcek@`&#|`DHL9j?(`|Wt{DCpJ+`WI5ZkMf3{Y@nXR1c6==NuKXiTPot1*!=mF>uYN
zC81hK8!m9=c0UbWDnW!dM`hec+@$68{V^;<Qt{^yW;9uEu`7#j-Es><eIDX*gSXf1
zWX1YD#Nx?)|I`^-eCE+2hUK|BtM&tf0U^NMce`_%H2F%SLtZb1L`VUKhBqI=0h4&d
z!i-58j!S~)FUSX7rHDBpiMJ%n>~4k8bDRt-u_OAqhzUiYJ46QpC|)~3Gsda?mAtxq
zD~<kS<9WkfJoxB1N~dM^ui;)IEhazq@NM?H|M*t)wN%!dS{Yz5>WwkyFT+m0V5muF
z6K{?};X()LBUIuMN!8Xc)jOg|Wl9f|L@BBue~OLK*SXMAXy=cIB*)i8IkP+7Av0N8
zK#<j_qFUhgXxw}M7;e5T4^>Ou)@|mumjd0(0O=Ntj#?NIb+0a!dw%~~^k^#DPuW|X
zf4BSLsNMRHs4W>iqdNr!*V`CA&2~{sE%heVfACY&?p=13CT^sF;h#(E^E%%XG@r9L
z`fh}#>ZB~7STNq<<fo6%U`TfAwOhR+KrHdMWeRCV^q1?5$b-w45xwZ9UZCG^^QJ|v
zvb<7#eb6l*HC618h_V?zU8m$;7wIE9cgM216sE3jAyZ14RFTN(A|dLBXuAY(*}&Ym
z#YDRxGSA)L?sf^gM=-2J$D6CtTw`HGB~n10Y4Ga$YBbZLv?wd3ZT|N=M}SMa)CH;&
zUqSJx3^FZ2I1)!F2-Rj5yEXM&QwnVCI%2HpYx{jBz^%8EIlS2QO2EfY;x^f~AZ8Y5
zl-%nice0MsjfCM_7a~o<Os7V!*T%`XMeEkvqX<5h;b2D8!XCGfHbJob^5~acnF@Jj
zIyRTUf679d5SOs|coVO$J;|7%ZiWv{4H<h(fPzfE_l0s)RZw}N5zCSYMXHM3Trj0b
z{ZdJhZR_sCMy~@@`b2>FcYFRV=uuw{I~k8ieBZ7Ng^71K7(LI9&DFD&#kVfux#_a0
zOv`dm?$!udP-NG5G~3A-yGlcIoS1QW2>=P<(3hu@TcTseCBX}-;9%V1t%|d3+jExk
zi9>KZ^=@kF8a*Yzm>e&+mgO<ND4XlbM-Xg@ar%NbQE1Ym>gFRQW3_vx6xm<jb=c@}
z63t!_;O5)ipUj!6uM4@XTP!u9#MbOkFxSq+I~=&Pdr_TC62NIw$?)jd6+wwpV}esd
zzaZY%w-P`X1ZO!fdu~(BCde+-$Q+{)s<VhTCkEtfbDWpfR&lx}!1X0Ly;1<R!m=b!
zz1uSaj2hx)!Q@<o5ICJWWu?OyUzkPJ>1G1WQ4pZ$GFPb9*GtFhMfc>Hudh1MeG<(c
zjo8h1`ik<3)s+FC{IaPgG<!lo?qr>kkGsekts#2)0wh=#SaF5)jfw45D*-w~D*-HB
z!9UH75b{DIqMkLED%iaW!%B2K*(!lE3HiVR4xbP4;>t=KLNIx3Mvv-}5)4z)5|%u>
zCLzpsM}S<foASb3bWJ4Qfe>V6x|ny}NQPv&IbPXFG-e_cgkrNw8*S?2C8O1b-AAl#
zUG=3)0xVvPnp^03!S6AC6SF1LzNL>$tn>M0I;!6Dk&qThQxFfTgz8m>?g;`tB!H@L
zcBB`9NXQm~e(L~w4FT?Kg}f;`5@<eSAtl5lY&_b)@{LtY9+}RNjLw%TDZw-)kr*^I
zS)8vk`CG+tpnC%3_&iJ)I+RGvLe&I{0*Vj_AsCVGWA1e$0XR|Bl#mZpsjGH*XGxLv
zXz3Vr<L)EY>CXDpB>_g|+Q-yq@n7=7I*)+yw>cPhQ}1Hyqy?CQcvvCQpb-tISaF4%
z1Bo@PM+DFm&W-kAL=>!8LX9jGnIOSsCW4|0G7B_vCTc_il2Aipru9cHUfWW`%rWWY
zW_8pMnx-UfK%?K{T%C!(*&-g3ys@We1Q?d?W@`RWqA_S`F)>WgG=ZWBgaDhaGI9J6
zrcKSGwyuTRy2SFTXfj>Z`TXQjj<nrJjJGd(maZPu=~qMUaJx=PIKDbcO+~zC;g1q5
zQ(#6FBK0caT8&tXii`tRADlKUiHt+6MI}_L5v|uSBMO!&1|=NRk*<(6R&7&WK_VvX
zU}e%F#Ih0t?+;3<P8*!7H3_y@7>4Xqmn};YjY55+Mb&A8x<->|JV7vkVL2ZD;fu5R
z>SN{P4D}>#QY4CQ+}BxsU2fD=MaaCf3e6si<{Xt4D^5HtIkY^&sfrjyH`&P;*+~^L
zG2K~)LabR3Z`Ls5fGOyB2tWd{xWtqa^?h@?VM+|Mlh<TQEK4C`2x4Ico5#fFlPH>X
z*=B^sDuZJyqa7SYG$g|;lfog1Euv*fLSbm|oA{eeVlj}NJU@UmNszb)eV2e?NDM;~
zi%Ehl7MbY^X&wbtO;k`)Jd{ZjviZ_KCKOFVbY63hYysY&!fnOlh!1nHWZy1ghCxfM
z#m+y6$tu(+T42YSk(f-{*7=Y^)UP0;3TE5DcmD7#QG@*_gXCp8$n+(af?9u!GxZV7
zOUx8fN-)4Q6=HFL5w@`T1iH&Ys1h+ijy9d;2+$OT@?m)ds*a<!dq&d&f3rn%P<A=^
zkg$}V-zUi!t)RQXj7j`GNPQhQB%!cCQzb43C`wW`Qq}HXLXV9>8VdJMnZ~U}<N4!`
zt*op(f|O8y)S%(GL4KLes5uS<3NgPzJgj0F;=)wl`GcRHnnBJ1KU&lxZdjZ=AEMT;
zVo8X^lIqyFOQWXv65b?IVj5tERLq!y;WV+OStxc3RV8J!K|BK0n=f_<oi%(UUz|CI
zy1MiHsp?pVdo)!rBum9^x2SKlh(-i4qvN}nSCr4%qcun=i3Z@@E(=GdAlf9c+HK;p
z-5s4M1PNKht_#xA6f)CQY`W|q7@w%>{>-gjTLXu<+&n&aKDQK(=XcvSa;%{qX+iaN
zle4>{<V|vrF<L`NI-Ty@qrSjJW4?pjL(OCzZ$Vg+P&7I4mL{kz^io^o!BV>!NlRkI
zAZltD5fhtFU`w}9RoO2RwB`Y*TpJ}8N<L3vW;TB}V>YF^!vNTJ@H|_pXJJ|@bB@KC
zUY7V0bqz9n0=LUXqu;>aB#Fc&mYI+NJ~?Y5^NL2WWXB;6ooz${;f7>8IX)NnO&do^
zes)`#5CWSGeD1`+I~<^?iE;pcAi`hYILO8=-A1Ez{c0A^bmuC%at7eW@`>Dc+w2a%
zTS!(OKf>>~Z=o?9g}4faiZerF_%s{t?4HlV_Mkz|{s8GU2^XtCj)T)v(uliy&QT!*
zQjw^-#O5{oO@Ph<KeAjdK3zJUTZ_h{2tjSY<Uil8=d~TpZG0C<W{zv(|2^SjR9?b0
zt#$7ojY5Op!ryEXk0<1WR_r-l%S+o1Qx^<l*HmtvIEq^*7oaIh+w<ufxSWEl3<Zx{
zMO9>*5-M(3ta$G@%T^pA8ts_m)QYIp&-^Vu@}hUv)eGp30IdkdV!X6xCx6|)kGLrz
zt|6sL`f!c>DSEHAjNWrmEFD@hd+F1s2o%jicY!U<M6sEDUIIe(CP&_j(r_#}8`)Kj
zk4`M+fzqisH5-w*<k>Y%JhP^eP_*-zPFLgHH@}5{`&tGLdt%3JSrXF{1Va`LjTS8-
zi@1@L4-C^{^NF*R<Y(h^v>mC0rU@K2NKaQu_bF&9Z2})a#jdlw{OW#c>yy3<*=gz2
z`4h{)fD)h;rvrYTso2K46DN?Sf;3b#p^-gFCwGE2Fo6z2psEtZVPW%G{SpG>VabX2
z2Y3pYJ8BG{pI**Tw+AU<#hxHPU)DfPW74PJo1R7KoSV@!jqR)7Bp7ID`_1PJ^Y@Dl
zzWk}Arm%H;*c7m6XflaK6Ej46DhU#nRl8jw-Iw@h*AoNZy4IgL*UU?Q-N(KIwQcv=
zbe$WD%lJs?biVuSZxZcYf&eM?2+H@R@tqqNvZLrU|Fv}^RZRg*!{XdNi-zNI@=9%F
zj7kj)gb<)g6y3t^Gts>gMeW-*&@v@8I}_`?(ayR)K6@yS&794oA&GGPz12~Ey0ng+
zCz1z}*c?tKO}~NhQ?El&6R$IOWD!U9Y+=u)cZkQL1j0^!^ep^oSpz@*2Rn0TxKR{=
zO^2*>1+Pb;(Qo1RTSPC&2MB?#gV(K+m7(BtB!tS=fo}=Lc;l_Zytnp5+cF{$OdUIp
z+h<;n$JsMiwE=Mno0gZ)ukN~+<wp+l%+75zhocx#jT4(K>W*vVPqpF7=!ayc3KZSK
z=1P3^!X{CazOD6jM-7g=8zs_|T<5dh9v&{6&ce~-5CYEn4gT}32A1wjuJeje7*jl*
zlGzJ!xI7)|R8*DmQ|B<UXfk^@ujJUiZAdAps`c^d?@G!i)${Xj`^d}D(KLaof}W+|
zb1O9XO@b{FyA3ikR6H&PO--)zrfIQq?Fp8?b(l~%IRlN(&F9WpbIHpZLT@l&PNABj
zaQpZP%qtkpbGx>)^x#3HY0^?>ad^2&MuATL6uoyY;)+1165VNHPcu;+R>HHm4+GzP
z_Ja4%spLBE)OGHiRLcF6r=Y7U;h4oA*Z6sQRbz+kTh55FOq+K*=~-PT@^HGn%v|tM
z#!jBW_BC%(S91~z!N&b*-0(Sr2X1QSdtc2!Qw6#vP+by-Ln9WG=(<2vWI~R)@PK>w
zpJ&P6_HpK1u&s>@kB>z&uA^l1r4C+&hF}KGL0>vlUi4c^Wq__w?Qi6_TQ{-ebWKt|
zP&I~3(8=jeJ`e&$Nv!jBpM~!3`#K*DN=~ega%NZ3|4%{ikuimQetJ3SPA8Uxr4`Nm
z;>~*Mf=Pn-GO{VV;db&0#`V5oDXBWTkBW862sQiLiZk3{o_N&aQ+KAdzqG@C{_MFR
zOa8WxJ^Pcf2sTY;e(7}P7EeXjI{%IjpKjq>Pj8|n;>KqWG_PBK@FHc(Wg|c<HdR&e
z+pQZp7i>WqiEX3ZtCCk@BW*;-5lyV~psEtxXJYeNeOC9HhUC<?I43v8Fk{KDdFrry
z9-A?n(HRM+rY*<9{Pc}F4xed@;Kt@~GI`blil&sK^i#!X8gUM6U(5b&YcS2^R&88f
zfS-NaMd|qDlo$%fS^CytR<1pPX(pB^Az;dwaojfJI?~>^^t7U(ImYjoSMyFq9o7Yw
zyF}>JrmcHNy#LzEP5=PIGI`_R0sdIAgGkH(OT#i0yg53<%XA!RBC)O0Eo>f%&1<39
ztiG-Dtr0)(MTrEG>-=zEIuA{q&J6`)061A2=T|ElSiU<sy(+3oVaY5?W-r8M>t{IA
z`w$BH*}Y)}l?QjWl?h>SLrH+2|8qJ=kDTR|*Y+ozJuV<WYbbY?&!r$IuhTl?hQ%xE
z&+z9}HH2av(~`JEsCv`Zy#u=q>@Dg;A^vCAc2*oYf@un@xQaj}t59QPxr!&pLUT$`
z`ZnDMYD|v28|@JB<FVUWTs(z)Crw6ER03g(Kdfrxxpn>yhNt|32~3-RJ09P_`v0Fh
zRmqMuOKGY*+g9e#q7-HyVYu%ULP)$$H@D50Ls?;)2i`?kzrTUsEvurYA-O~GdfYSz
z6MBKmN`Oer#9{0CcJFX~9lzbYfdl7jk(L5TbT<@SuQ6iA#V+ODA>3$jtP_LH&4uH5
zWa><O4hL~l^5RB6zk9clK)9WzFLyZ8<}M;TZ&dFZ?FXck9NW8%-5XaBjU*32%y9a7
z;?5`^DV>2$@7!Oasy57jy?K%?hm(4LP1Be-ek_wF6!GFKZvdAjz<}%me)hLY(%c#k
zEf|i+*?kk^va<R2MR&9I#Bu(6`(|oef*4Uay3(X(mqF1&JDH=qC)A}fc+46;k}u4h
zO`bO)Xsz1c!vA}-o~pX!Hp=BmW6E{6P%ysqvb!1yAt)@Fnb<aNS;>*zTd*vX#&8<9
zPVfA*n&z;{b1SQPZPU3ni>VNTf|0|SI%N`0N6(h50U>~CO8&axEbmm*@!*2td~{AO
z-MI`30rN(Wp?u^>mh9clOM7<`H%&tICc9n=kyWTMZlN7V`o(KOR|cEMW|mWOVa+^L
z6XmB%>)CoN8PcukHYQG=$HZyZqiX&0@a->b4ky#*-9fmenW`guFL~X2yXyIm*DGlb
zCug|q>?~$XolItC*P-d}N52X1<nxF5!lIE3%e<Iz&0&LIFFnEAJ8JpT9ix~sy88qH
zc2(muQ>Jli;W++Sv5j|+C%k6sj~Z;QG|4N|7;}TYEd^}D34^06qqNjs+F;YvV)DC{
zjl8(QPus*G1S1QJDVw_pmpASG-56wa{k5#$-_SPrE|-(C(qcxA$ZN9(_6GeX!210S
zY&qP-eb*1;Q#a=0v|s#%9y`;*<4^79#*!=^yKNLh)4LCg9^&@!_}uy2TsV&3Zr#9%
z#zrhNv6ZVmXfSGyow}n24VB5Sz^-cCTU^TG;!>QtPBbogZe1f!uj**98Jb_fw0XCa
zF{E>8dN5&{2H}<-yY+L|qJ^kx-_`3WSpwpQ#S5!XvwTM_pSxuQm-2R7y{Ddy2OC*D
zcNh=M%j=P#I3+iaU)^~h%MKspk2|;09E}nUN)E3`O1nb9{LzIxS~im*7YsIU?F{ns
zx9U0Dlq85JEt9gjw=sO|fM;Os6RMBxW9PcJ2>Kf@dCk$97LJ}tTKxJm_>f{5prJX&
zPhL6J<$52BTRi{XX_jxV<#V@<WI<_mw=$O^1b2*|$h^^Gd4AV6mL58Qalu_?($E~f
zFk=qmvJ*P+-Bl5O`bIswtC9rK?G7f-{0QTw%tq<w3mXVD)tzI<+NGSUKHgU5btrs(
zLDG8I6f}7HohshmR@<iB>C2S=ehi2Z*b|4}+CYpSy>yh<HlE|lca36Pe&<@P_VC(l
zd~xP=+%aw<Zyr8KaZWDRj~I;*aHh%N=gaC@zB|~#U{hE!i^;PWV0T=Zi5#}R_bSKs
zZfo-gPy~E*rjM`Ql1ZjV#V{qWZ$8H#->s%4lGJAm9h$}TvXXwcKj@i4_g6Rb)!*#n
z=CW))d&>wiz1_<PBhoVX!puZ6vX-dD)2kYJZmqwA!6vU@9A$GC;mhoub?kEE=$@@@
ze@`oL@XfoknV6S!hWWc+?&4HkayIk0U6f5NW<-8!<d;Dw0DvVWZ||sO_1=brd~jnv
zwr&zVnG#;x8sJyU8#)+l(z9|Xo4bhIQJ1!kU5S`G-o<}BGVG$|uyyb?O{I9^I3|oQ
zL{(Df@_a=QpcRpr$#W}DF>0uj8%r)7hhK3b!Vh1q?O?F6JKdDdzKJoDr}x`nGZ=8&
zlrCkVykWT%PwaygvKw4c1n4PVSnqEed_~n5KXne1X5N@`gUyElgF*lu_`6t?U)%bY
z%&|T0c<^fjZm_wUF(`AT2gw>$W0Ylax6!|3$sgpwKU>vxo~QOP5(9-nnE@IRG^#3-
zER%KW2XYna7g_?1>{z>uQ^)pq`nx41%eU9^^or^M?@N#0eqVxlyTks=l}h{yfoT{V
z*uIAS+t*+k2@RzXuxP4>Z!Ahg{_H)`%&(W8;7CnU+vl*`88xzZ+rGGAuy6n2Zm;Vx
z0XA$ugd$+k{AsuxgP-EG6+73zP4Ue6=qZpV1`^dr_ffHS87<98yZ!h)J5Su5O<941
z#$cQuym*||d+L*lEJa~_(HKf5jYrdaHdIndj-RY%_wECPBkk4YR;LDrE^Bo}J<Tya
zv<aAPnii`!A7I;_<J|F)X<RowVQCu-_*_ZR<-qo}R34~c%AA`SJ!x7>)T5XcP0j!S
z3tCA;K~$-Pzu`RFS1;vUbuw@?&86_=Te7&X+(&D0&+f_qt9IA7U6Y@e%e1MJ@p^im
zjjXo5fgL;cP~Vs&nJNs+qXhq?Za(~IXZLhD2k$=D65m%HdwTM4+dhPt1*FI0Ci{+@
zqGDeq*_l4x+S#+y%ydm<Xm$od2x76W1;2Tdvna^9wCZ;51UJLdHTIl}5{^lXc#PAP
z2RU7Nh>=B;2i>j@5Q|0Fy?zCo-}x&+e_~)&0gGq*_}PQQm_FLk!De#ue3&(R6VXJ|
zrW7+{S}As0&t}?CILy`^yQ$c@k5D-A)e9s(HMoC>%|GXzjmMupLFWmhdNQxb7dHl%
z+%-LKsoNg>mPCFFaGtC4^V{c_0~6nOH66^^LI^U`y<}zh5JHgVbrVVRa<0CSNF+vI
zpa}TbOdmIudU$GOBmZ;3pRcjDhFCO=%`r&l)c{Dz@dFj?+OV8RDCuBYR^Z@?yR#Xe
z*ZorEa`nt^VVWj~jvQy-{=>wLq}9_Y!U2!c{DpTnpLn6WI(jSvyuQ6A1U&iaa_3Wq
zs{J3}Gj!&;(5}SiaWf=44efmvIETZ=$h@KWgDuoG_%V%+<UDXH*rg`06&}07*B50W
zfIqD6J{EqUQGf0<J663x-MOUnKE$W;jYZikn(9fZr`hS6vuv-}L$D?3LueCmBTY2_
z^4%>*AE$>&b9%i8dwz5H6!6gEIiBAuLj46W<^9(<>^6oDNyllwG~0y`q<cO1+%D=G
z12p-AZ5FXt)}3Mfz6QSg$#IO&?|uzby2~9fz=%ac?Ah`jM|N#$dj?$<ES~M-?{CS(
z(}|NzU(wju#P*$gIbWNU7ZhRPRRZhNjo`;#-(FMKoBH~^316}?xOzU!u+NOHj7s|r
z7hTZ9ZKI+n49!X>!{?#4!B2BA!RWJ%QNHr)J(Lu9`Ik?PC#??$G7K~<X>oktc6M**
z=*>H;(8&{bXESDK>UK-fSd6{<4{`WNWgE!^;8KETGim<B(#_Rt`%-Ve-s&na*t%=p
zoH-LpVuo`?T<SRhk!Xyn)8{X_1at;n*T~DsqQ&dxe0@`!pt$EmGoSd;HtwI7&u4GG
zD6r)sNUKv>C*?R-eLUgMUw^KxY(%Ec<9B9p<D}FjwYDsaBgam#d+$Nw@ucwV5TR(g
z>i_=oP1WD;PyH$RtTt{uxCh9cQ$Fdl5!3k_6V(O~2(}Omg~?3!l9}%9(H70^a!}yR
zp(&7%4=l^VvJ%TePYAH;)n}P{!>x=MTioyG>I|WvpNh3_QFUZbTba|Q@VSqq^Uw|H
z-I}p`gR|#q*<P^+e;~Pq*NMwCCGhG<*RfANvx-O;xAzDsomV$*-v2c4^sHGW&qOW9
zLlPk@%c8Eqk3SG(NLD&tPxlh85Q2;}4?d5RqbF**y}o3)9gkfh7_|rn8d$gV&*Tmt
zOWBQ!NYBdc_Wqv0Gz|{!SjWDtt1;WzFK#XI@QpjO$W2S#s|*C1d2h`|&YVpKgDS!z
zUGX3EI$Q2}eO1lDRJAo=($h`T$D}o>-nV0xy}W(7!(k&QD+5OlwTXw0B_wK_rm*yT
zvo3j^KV<P=?>2OB{T4z{Fn$VC=iYWv41aG>Q+e>BtRDqKY<%mkEUp`u8dtN`d+PcA
z3r9Nr&8q~PeX9Q}%Ql{VHYJU<!+?v=<>e*Q<CgxGA+@$NS3(H99w$SxGSIroW!F;z
zwBq3DC_j0lp6!*%;1AvIpm@eS#!tPzS5BeLP4!f)eUsCbhuX@#PKD3T&)~tiX=o|j
zeZ0BlG(UT_qw&Wf!dAB0__WM8^_Bjf400)4w*AxWStb7%wH!Y-5p8p&q9|l%_()Il
zTv9&hEdg4w=0J!azh2AfhNObTn~_b~+(qP%9^d7?Mm(07?zgSMGLuG|JEnU1#_d^T
zc~fV^ipLG!S-+Q;S65OMOQf9BM4T+OX-m3xcJY#R;U1)m>^m;|271PfDSwSg+eh1v
zxJ}m?lAVsnb+JcJD*-?-uQ-Emf1(gu4-ajM#wCB+;OD7#8)=CpcLzBm#xniJJ4nkM
zdeJ>Kl?U0n>h%su946)4dE%qll#WcT$I;%y)x5lH6Aev40+x>&BM+bAugz4O9(;A<
z`HK=e4+I89gR-!Ea*p59*2JW(gOi)v<z#498a7)}mw)_Z4e@s8^6IMKp@k!O;KrVt
zN6-5We);|!KZ;6WX)^Y|srC%pRxhQt=0w|lX)c8?EXd@6>(jc8ZR`!s*9UmztxX&_
zn#|xHvFrg$Xuog_Kl{BUOBi@hkP8@871|B6if?VP>@ON<ZNYg7dx4AW%rsP0MM_CS
zQ!@=sfeuL()7(1$ym&0ri+Uamx${JX|ND9!`%fpAQ-{mL(BY%0KC-ui7VrK!X?*eK
zjFf8eS`V9EzHT?B**3-&@VuqUe_FCOSlh+z1A;5Ub~<~;<nKp>>j_IHt&^&%G9=SS
znlB-}#|?wp`lO~1Kv4v5|6BRR6?OqB;f+r6|FmM}SSR1UE1SaH)M@c9b=Wkp)so^X
zOEw0!q^z-C;))=^1*kJ;l)fFsv9Nui!=^JdI|HXPVOI!8qMSL`&}RKw@q@l)EeS>~
zo?6++^XvV@4M|>x&OhCm#lqs$9!+=ZOg%5ZwTa_Z$vwS<GeU|dUfdXXjzKx;Ac-r9
z007J@EgjurS69WQ-XWVs>$XwXRBF!F(|o}S)>i_wqPjlL+5;i(EB9gV#ql@YAry|X
zY;^@|w;XJX<pbgp`5WD|{jcXYH}uSrVt{eQ5ug=wW=&cgwp`CxC~cY+MF=v|y+ori
zf}w;Kw7&#MHKdem-F=L|F5gN^D5<HHuu>KBYkyuJ+&75by9ie-0a`J8=Hy?8rQ?h8
z5_0&JM1Yg0>v(zDMoykiT4W`h5>kBU#f^cKYw=QnE1m!ViwX<v_37?+qS)uYf5H6S
z7soJq#Krsh%ZWfR#H%Z|v2D+>_D3XyCHzv_9N%BEsy5ig?SqOB1OZx6UOu_huxxL~
zrPgNQnPfk})JdcH*v&J^NE_I*h2Ia;v{<+GAWK*6AQJ81=lF)DDPLQ%#(!~c)+-Dj
zC<3%%&Ya1g4ae=ju~2OjZ3lqFv1tphE9K_7C1~2f#~U1}Jj0S@n>kzCA)Ch$Da6-b
zS|50Gz&ns4d>{$XitA=g{Lu*Y)LjVLa=xVdJlwgUj9F6#COo_;(8BBQZfEQ6cIN|0
zT7(ck^``}XI8a8Lfx-ux0056oNB7%&e~*yg1KKo-MFqpS_qJK&=cFcfu+?a@V*PFm
zqk{tJ4WSu-|H7K^z{hb706y>pXvICVyji*?|F=MVnG5j_LI`G*jNzVJX5n%7-H@~Q
za5b+i+eCd+ds$BGv=sT(CF`2k^|R}PimQeIt$1LLt4s>@=fJ$yGMB@~O>;~6$m~hI
z%Bpp~KEPkz+Qj~&9gf{?M2hcO!vp_$IgK_0g{zJLt@y-T?_I*;mq0;l+0ZN>_uN`e
zanbND?`<{OtXQ`j;|ej_3>2<f0st(YgHsjWuSxh0;B74*KPHd+7L}8m-O-XLCG6Z^
z$zPXmqbbl~>%L7W;wvw#3v9kTJ->XostM4F#dDnbiqL*YyJ#j=RhT<tJh#uEj?<xc
zYP3OcR!IJ3!iMIjp1eeC-3J{X3Iep^6SKY7D+<4mFuk?R>v2+4FpP?Q$$$$W4*XIx
z^?$umj5Y&>4;29}K-@pa_aKV=F_O-F#@_?^wHG%8FP*OYD#C}6004ZtJkw{W@$Ud%
z2W-GeiTtORHUwW8<gQ&-d}s;Kip6t$g$mpmig|u_Ap-guuHhQ4;To>t!+`$}Mx_|A
TH&;SP00000NkvXXu0mjf3!wJT

literal 0
HcmV?d00001

diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index a0781ef37..aa3c2d548 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -114,6 +114,9 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
 
 	porting::setXorgClassHint(video_driver->getExposedVideoData(), PROJECT_NAME_C);
 
+	porting::setXorgWindowIcon(device,
+		porting::path_share + "/misc/minetest-xorg-icon-128.png");
+
 	/*
 		This changes the minimum allowed number of vertices in a VBO.
 		Default is 500.
diff --git a/src/porting.cpp b/src/porting.cpp
index 02ce6174b..ddf8139ea 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -611,6 +611,93 @@ void setXorgClassHint(const video::SExposedVideoData &video_data,
 #endif
 }
 
+bool setXorgWindowIcon(IrrlichtDevice *device,
+	const std::string &icon_file)
+{
+#ifdef XORG_USED
+
+	video::IVideoDriver *v_driver = device->getVideoDriver();
+
+	video::IImageLoader *image_loader = NULL;
+	for (u32 i = v_driver->getImageLoaderCount() - 1; i >= 0; i--) {
+		if (v_driver->getImageLoader(i)->isALoadableFileExtension(icon_file.c_str())) {
+			image_loader = v_driver->getImageLoader(i);
+			break;
+		}
+	}
+
+	if (!image_loader) {
+		warningstream << "Could not find image loader for file '"
+			<< icon_file << "'" << std::endl;
+		return false;
+	}
+
+	io::IReadFile *icon_f = device->getFileSystem()->createAndOpenFile(icon_file.c_str());
+
+	if (!icon_f) {
+		warningstream << "Could not load icon file '"
+			<< icon_file << "'" << std::endl;
+		return false;
+	}
+
+	video::IImage *img = image_loader->loadImage(icon_f);
+
+	if (!img) {
+		warningstream << "Could not load icon file '"
+			<< icon_file << "'" << std::endl;
+		icon_f->drop();
+		return false;
+	}
+
+	u32 height = img->getDimension().Height;
+	u32 width = img->getDimension().Width;
+
+	size_t icon_buffer_len = 2 + height * width;
+	long *icon_buffer = new long[icon_buffer_len];
+
+	icon_buffer[0] = width;
+	icon_buffer[1] = height;
+
+	for (u32 x = 0; x < width; x++) {
+		for (u32 y = 0; y < height; y++) {
+			video::SColor col = img->getPixel(x, y);
+			long pixel_val = 0;
+			pixel_val |= (u8)col.getAlpha() << 24;
+			pixel_val |= (u8)col.getRed() << 16;
+			pixel_val |= (u8)col.getGreen() << 8;
+			pixel_val |= (u8)col.getBlue();
+			icon_buffer[2 + x + y * width] = pixel_val;
+		}
+	}
+
+	img->drop();
+	icon_f->drop();
+
+	const video::SExposedVideoData &video_data = v_driver->getExposedVideoData();
+
+	Display *x11_dpl = (Display *)video_data.OpenGLLinux.X11Display;
+
+	if (x11_dpl == NULL) {
+		warningstream << "Could not find x11 display for setting its icon."
+			<< std::endl;
+		delete [] icon_buffer;
+		return false;
+	}
+
+	Window x11_win = (Window)video_data.OpenGLLinux.X11Window;
+
+	Atom net_wm_icon = XInternAtom(x11_dpl, "_NET_WM_ICON", False);
+	Atom cardinal = XInternAtom(x11_dpl, "CARDINAL", False);
+	XChangeProperty(x11_dpl, x11_win,
+		net_wm_icon, cardinal, 32,
+		PropModeReplace, (const unsigned char *)icon_buffer,
+		icon_buffer_len);
+
+	delete [] icon_buffer;
+
+	return true;
+#endif
+}
 
 ////
 //// Video/Display Information (Client-only)
diff --git a/src/porting.h b/src/porting.h
index d101a7324..40f6b4dc3 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -367,6 +367,9 @@ inline const char *getPlatformName()
 void setXorgClassHint(const video::SExposedVideoData &video_data,
 	const std::string &name);
 
+bool setXorgWindowIcon(IrrlichtDevice *device,
+	const std::string &icon_file);
+
 // This only needs to be called at the start of execution, since all future
 // threads in the process inherit this exception handler
 void setWin32ExceptionHandler();

From 538af97d8d0d0a3c50a7092c029d8585079144c4 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Mon, 4 Jul 2016 18:01:58 +0100
Subject: [PATCH 085/418] Remove cinematic toggle on F8

Also update cinematic mode's description to include mouse
---
 builtin/settingtypes.txt | 4 ++--
 minetest.conf.example    | 5 ++---
 src/defaultsettings.cpp  | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 3f256ec43..0b9d29a33 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -70,7 +70,7 @@ fast_move (Fast movement) bool false
 #    This requires the "noclip" privilege on the server.
 noclip (Noclip) bool false
 
-#    Smooths camera when moving and looking around.
+#    Smooths camera when looking around. Also called look or mouse smoothing.
 #    Useful for recording videos.
 cinematic (Cinematic mode) bool false
 
@@ -178,7 +178,7 @@ keymap_noclip (Noclip key) key KEY_KEY_H
 
 #    Key for toggling cinematic mode.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
-keymap_cinematic (Cinematic mode key) key KEY_F8
+keymap_cinematic (Cinematic mode key) key
 
 #    Key for toggling display of minimap.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
diff --git a/minetest.conf.example b/minetest.conf.example
index 35675dfe3..bc0d4c527 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -38,7 +38,7 @@
 #    type: bool
 # noclip = false
 
-#    Smooths camera when moving and looking around.
+#    Smooths camera when looking around. Also called look or mouse smoothing.
 #    Useful for recording videos.
 #    type: bool
 # cinematic = false
@@ -162,7 +162,7 @@
 #    Key for toggling cinematic mode.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 #    type: key
-# keymap_cinematic = KEY_F8
+# keymap_cinematic =
 
 #    Key for toggling display of minimap.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
@@ -1527,4 +1527,3 @@
 
 #    type: string
 # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/
-
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 8ee26ecff..3220b915a 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -50,7 +50,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("keymap_freemove", "KEY_KEY_K");
 	settings->setDefault("keymap_fastmove", "KEY_KEY_J");
 	settings->setDefault("keymap_noclip", "KEY_KEY_H");
-	settings->setDefault("keymap_cinematic", "KEY_F8");
+	settings->setDefault("keymap_cinematic", "");
 	settings->setDefault("keymap_screenshot", "KEY_F12");
 	settings->setDefault("keymap_toggle_hud", "KEY_F1");
 	settings->setDefault("keymap_toggle_chat", "KEY_F2");

From 6014e7257e1052b8a4b3e29793aaf296b94b80d7 Mon Sep 17 00:00:00 2001
From: Snipie <poganiac@gmail.com>
Date: Tue, 5 Jul 2016 07:43:25 +0000
Subject: [PATCH 086/418] Fix for cropped text "Toggle Cinematic"

---
 src/guiKeyChangeMenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index b05818256..785e921f7 100644
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -137,7 +137,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		key_setting *k = key_settings.at(i);
 		{
-			core::rect < s32 > rect(0, 0, 110, 20);
+			core::rect < s32 > rect(0, 0, 150, 20);
 			rect += topleft + v2s32(offset.X, offset.Y);
 			Environment->addStaticText(k->button_name, rect, false, true, this, -1);
 		}

From 7a532056e29d00006382caad9ccde66e54ca8aa5 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Mon, 20 Jun 2016 18:11:05 +0200
Subject: [PATCH 087/418] Use mathematical function to determine yaw direction

---
 src/game.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 93d9e6d2c..9b9f3a75f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -4298,23 +4298,12 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats,
 
 inline static const char *yawToDirectionString(int yaw)
 {
-	// NOTE: TODO: This can be done mathematically without the else/else-if
-	// cascade.
-
-	const char *player_direction;
+	static const char *direction[4] = {"North [+Z]", "West [-X]", "South [-Z]", "East [+X]"};
 
 	yaw = wrapDegrees_0_360(yaw);
+	yaw = (yaw + 45) % 360 / 90;
 
-	if (yaw >= 45 && yaw < 135)
-		player_direction = "West [-X]";
-	else if (yaw >= 135 && yaw < 225)
-		player_direction = "South [-Z]";
-	else if (yaw >= 225 && yaw < 315)
-		player_direction = "East [+X]";
-	else
-		player_direction = "North [+Z]";
-
-	return player_direction;
+	return direction[yaw];
 }
 
 

From 281e9f39fdffd106e79122ae23e2b5443a5daea3 Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Mon, 25 Apr 2016 18:50:10 +0300
Subject: [PATCH 088/418] Adding minetest.clear_craft

Modifications by est31: grammar fixes in doc + error messages and
a little style fix, no functional change.
---
 doc/lua_api.txt                |  8 +++
 src/craftdef.cpp               | 90 ++++++++++++++++++++++++++++++++++
 src/craftdef.h                 |  4 ++
 src/script/lua_api/l_craft.cpp | 76 +++++++++++++++++++++++++++-
 src/script/lua_api/l_craft.h   |  1 +
 5 files changed, 178 insertions(+), 1 deletion(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 297566068..a59a9c0f2 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1847,6 +1847,14 @@ Call these functions only at load time!
 * `minetest.register_craftitem(name, item definition)`
 * `minetest.register_alias(name, convert_to)`
 * `minetest.register_craft(recipe)`
+    * Check recipe table syntax for different types below.
+* `minetest.clear_craft(recipe)`
+    * Will erase existing craft based either on output item or on input recipe.
+    * Specify either output or input only. If you specify both, input will be ignored. For input use the same recipe table
+      syntax as for `minetest.register_craft(recipe)`. For output specify only the item, without a quantity.
+    * If no erase candidate could be found, Lua exception will be thrown.
+    * Warning! The type field ("shaped","cooking" or any other) will be ignored if the recipe
+      contains output. Erasing is then done independently from the crafting method.
 * `minetest.register_ore(ore definition)`
 * `minetest.register_decoration(decoration definition)`
 * `minetest.override_item(name, redefinition)`
diff --git a/src/craftdef.cpp b/src/craftdef.cpp
index d3f1edaf9..45d3018a7 100644
--- a/src/craftdef.cpp
+++ b/src/craftdef.cpp
@@ -960,6 +960,96 @@ public:
 
 		return recipes;
 	}
+
+	virtual bool clearCraftRecipesByOutput(const CraftOutput &output, IGameDef *gamedef)
+	{
+		std::map<std::string, std::vector<CraftDefinition*> >::iterator vec_iter =
+			m_output_craft_definitions.find(output.item);
+
+		if (vec_iter == m_output_craft_definitions.end())
+			return false;
+
+		std::vector<CraftDefinition*> &vec = vec_iter->second;
+		for (std::vector<CraftDefinition*>::iterator i = vec.begin();
+				i != vec.end(); ++i) {
+			CraftDefinition *def = *i;
+			// Recipes are not yet hashed at this point
+			std::vector<CraftDefinition*> &unhashed_inputs_vec = m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0];
+			std::vector<CraftDefinition*> new_vec_by_input;
+			/* We will preallocate necessary memory addresses, so we don't need to reallocate them later.
+				This would save us some performance. */
+			new_vec_by_input.reserve(unhashed_inputs_vec.size());
+			for (std::vector<CraftDefinition*>::iterator i2 = unhashed_inputs_vec.begin();
+					i2 != unhashed_inputs_vec.end(); ++i2) {
+				if (def != *i2) {
+					new_vec_by_input.push_back(*i2);
+				}
+			}
+			m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].swap(new_vec_by_input);
+		}
+		m_output_craft_definitions.erase(output.item);
+		return true;
+	}
+
+	virtual bool clearCraftRecipesByInput(CraftMethod craft_method, unsigned int craft_grid_width,
+		const std::vector<std::string> &recipe, IGameDef *gamedef)
+	{
+		bool all_empty = true;
+		for (std::vector<std::string>::size_type i = 0;
+				i < recipe.size(); i++) {
+			if (!recipe[i].empty()) {
+				all_empty = false;
+				break;
+			}
+		}
+		if (all_empty)
+			return false;
+
+		CraftInput input(craft_method, craft_grid_width, craftGetItems(recipe, gamedef));
+		// Recipes are not yet hashed at this point
+		std::vector<CraftDefinition*> &unhashed_inputs_vec = m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0];
+		std::vector<CraftDefinition*> new_vec_by_input;
+		bool got_hit = false;
+		for (std::vector<CraftDefinition*>::size_type
+				i = unhashed_inputs_vec.size(); i > 0; i--) {
+			CraftDefinition *def = unhashed_inputs_vec[i - 1];
+			/* If the input doesn't match the recipe definition, this recipe definition later
+				will be added back in source map. */
+			if (!def->check(input, gamedef)) {
+				new_vec_by_input.push_back(def);
+				continue;
+			}
+			CraftOutput output = def->getOutput(input, gamedef);
+			got_hit = true;
+			std::map<std::string, std::vector<CraftDefinition*> >::iterator
+				vec_iter = m_output_craft_definitions.find(output.item);
+			if (vec_iter == m_output_craft_definitions.end())
+				continue;
+			std::vector<CraftDefinition*> &vec = vec_iter->second;
+			std::vector<CraftDefinition*> new_vec_by_output;
+			/* We will preallocate necessary memory addresses, so we don't need
+				to reallocate them later. This would save us some performance. */
+			new_vec_by_output.reserve(vec.size());
+			for (std::vector<CraftDefinition*>::iterator i = vec.begin();
+					i != vec.end(); ++i) {
+				/* If pointers from map by input and output are not same,
+					we will add 'CraftDefinition*' to a new vector. */
+				if (def != *i) {
+					/* Adding dereferenced iterator value (which are
+						'CraftDefinition' reference) to a new vector. */
+					new_vec_by_output.push_back(*i);
+				}
+			}
+			// Swaps assigned to current key value with new vector for output map.
+			m_output_craft_definitions[output.item].swap(new_vec_by_output);
+		}
+		if (got_hit)
+			// Swaps value with new vector for input map.
+			m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].swap(new_vec_by_input);
+
+		return got_hit;
+	}
+
 	virtual std::string dump() const
 	{
 		std::ostringstream os(std::ios::binary);
diff --git a/src/craftdef.h b/src/craftdef.h
index cebb2d7ae..695ee0c2c 100644
--- a/src/craftdef.h
+++ b/src/craftdef.h
@@ -426,6 +426,10 @@ public:
 	virtual std::vector<CraftDefinition*> getCraftRecipes(CraftOutput &output,
 			IGameDef *gamedef, unsigned limit=0) const=0;
 
+	virtual bool clearCraftRecipesByOutput(const CraftOutput &output, IGameDef *gamedef) = 0;
+	virtual bool clearCraftRecipesByInput(CraftMethod craft_method,
+			unsigned int craft_grid_width, const std::vector<std::string> &recipe, IGameDef *gamedef) = 0;
+
 	// Print crafting recipes for debugging
 	virtual std::string dump() const=0;
 
diff --git a/src/script/lua_api/l_craft.cpp b/src/script/lua_api/l_craft.cpp
index 391a0133d..d135c689f 100644
--- a/src/script/lua_api/l_craft.cpp
+++ b/src/script/lua_api/l_craft.cpp
@@ -34,7 +34,6 @@ struct EnumString ModApiCraft::es_CraftMethod[] =
 	{0, NULL},
 };
 
-
 // helper for register_craft
 bool ModApiCraft::readCraftRecipeShaped(lua_State *L, int index,
 		int &width, std::vector<std::string> &recipe)
@@ -281,6 +280,80 @@ int ModApiCraft::l_register_craft(lua_State *L)
 	return 0; /* number of results */
 }
 
+// clear_craft({[output=item], [recipe={{item00,item10},{item01,item11}}])
+int ModApiCraft::l_clear_craft(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	luaL_checktype(L, 1, LUA_TTABLE);
+	int table = 1;
+
+	// Get the writable craft definition manager from the server
+	IWritableCraftDefManager *craftdef =
+			getServer(L)->getWritableCraftDefManager();
+
+	std::string output = getstringfield_default(L, table, "output", "");
+	std::string type = getstringfield_default(L, table, "type", "shaped");
+	CraftOutput c_output(output, 0);
+	if (output != "") {
+		if (craftdef->clearCraftRecipesByOutput(c_output, getServer(L)))
+			return 0;
+		else
+			throw LuaError("No craft recipe known for output"
+					" (output=\"" + output + "\")");
+	}
+	std::vector<std::string> recipe;
+	int width = 0;
+	CraftMethod method = CRAFT_METHOD_NORMAL;
+	/*
+		CraftDefinitionShaped
+	*/
+	if (type == "shaped") {
+		lua_getfield(L, table, "recipe");
+		if (lua_isnil(L, -1))
+			throw LuaError("Either output or recipe has to be defined");
+		if (!readCraftRecipeShaped(L, -1, width, recipe))
+			throw LuaError("Invalid crafting recipe");
+	}
+	/*
+		CraftDefinitionShapeless
+	*/
+	else if (type == "shapeless") {
+		lua_getfield(L, table, "recipe");
+		if (lua_isnil(L, -1))
+			throw LuaError("Either output or recipe has to be defined");
+		if (!readCraftRecipeShapeless(L, -1, recipe))
+			throw LuaError("Invalid crafting recipe");
+	}
+	/*
+		CraftDefinitionCooking
+	*/
+	else if (type == "cooking") {
+		method = CRAFT_METHOD_COOKING;
+		std::string rec = getstringfield_default(L, table, "recipe", "");
+		if (rec == "")
+			throw LuaError("Crafting definition (cooking)"
+					" is missing a recipe");
+		recipe.push_back(rec);
+	}
+	/*
+		CraftDefinitionFuel
+	*/
+	else if (type == "fuel") {
+		method = CRAFT_METHOD_FUEL;
+		std::string rec = getstringfield_default(L, table, "recipe", "");
+		if (rec == "")
+			throw LuaError("Crafting definition (fuel)"
+					" is missing a recipe");
+		recipe.push_back(rec);
+	} else {
+		throw LuaError("Unknown crafting definition type: \"" + type + "\"");
+	}
+	if (!craftdef->clearCraftRecipesByInput(method, width, recipe, getServer(L)))
+		throw LuaError("No crafting specified for input");
+	lua_pop(L, 1);
+	return 0;
+}
+
 // get_craft_result(input)
 int ModApiCraft::l_get_craft_result(lua_State *L)
 {
@@ -431,4 +504,5 @@ void ModApiCraft::Initialize(lua_State *L, int top)
 	API_FCT(get_craft_recipe);
 	API_FCT(get_craft_result);
 	API_FCT(register_craft);
+	API_FCT(clear_craft);
 }
diff --git a/src/script/lua_api/l_craft.h b/src/script/lua_api/l_craft.h
index 548608776..eb2bce706 100644
--- a/src/script/lua_api/l_craft.h
+++ b/src/script/lua_api/l_craft.h
@@ -33,6 +33,7 @@ private:
 	static int l_get_craft_recipe(lua_State *L);
 	static int l_get_all_craft_recipes(lua_State *L);
 	static int l_get_craft_result(lua_State *L);
+	static int l_clear_craft(lua_State *L);
 
 	static bool readCraftReplacements(lua_State *L, int index,
 			CraftReplacements &replacements);

From 795f1c75cb6e337984cccd042371cb8b9a3ef6c1 Mon Sep 17 00:00:00 2001
From: Jay Arndt <jayarn27182@windstream.net>
Date: Wed, 6 Jul 2016 20:15:36 -0500
Subject: [PATCH 089/418] Fix warning in porting::setXorgWindowIcon when
 building without X11 (#4288)

---
 src/porting.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/porting.cpp b/src/porting.cpp
index ddf8139ea..15a18bdfb 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -695,8 +695,8 @@ bool setXorgWindowIcon(IrrlichtDevice *device,
 
 	delete [] icon_buffer;
 
-	return true;
 #endif
+	return true;
 }
 
 ////

From 483cca78a1312aa3b9c01049b5ebf6842929ec7a Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 8 Jul 2016 06:24:22 +0200
Subject: [PATCH 090/418] Fix -Wterminate warning on GCC 6

Fixes #4137
---
 src/database-sqlite3.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
index 07df976d4..095d485c0 100644
--- a/src/database-sqlite3.cpp
+++ b/src/database-sqlite3.cpp
@@ -56,8 +56,14 @@ SQLite format specification:
 	SQLOK(sqlite3_prepare_v2(m_database, query, -1, &m_stmt_##name, NULL),\
 		"Failed to prepare query '" query "'")
 
-#define FINALIZE_STATEMENT(statement) \
-	SQLOK(sqlite3_finalize(statement), "Failed to finalize " #statement)
+#define SQLOK_ERRSTREAM(s, m)                           \
+	if ((s) != SQLITE_OK) {                             \
+		errorstream << (m) << ": "                      \
+			<< sqlite3_errmsg(m_database) << std::endl; \
+	}
+
+#define FINALIZE_STATEMENT(statement) SQLOK_ERRSTREAM(sqlite3_finalize(statement), \
+	"Failed to finalize " #statement)
 
 int Database_SQLite3::busyHandler(void *data, int count)
 {
@@ -289,6 +295,6 @@ Database_SQLite3::~Database_SQLite3()
 	FINALIZE_STATEMENT(m_stmt_end)
 	FINALIZE_STATEMENT(m_stmt_delete)
 
-	SQLOK(sqlite3_close(m_database), "Failed to close database");
+	SQLOK_ERRSTREAM(sqlite3_close(m_database), "Failed to close database");
 }
 

From 9db78dc4c4130c1ef08696e5d381a157cb66e656 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 8 Jul 2016 07:26:00 +0200
Subject: [PATCH 091/418] Fix -Wterminate warnings in rollback.cpp as well

Fix #4137 for rollback.cpp as well.
---
 src/rollback.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/rollback.cpp b/src/rollback.cpp
index ac4324cab..4d34decf3 100644
--- a/src/rollback.cpp
+++ b/src/rollback.cpp
@@ -42,6 +42,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	}
 #define SQLOK(f) SQLRES(f, SQLITE_OK)
 
+#define SQLOK_ERRSTREAM(s, m)                             \
+	if ((s) != SQLITE_OK) {                               \
+		errorstream << "RollbackManager: " << (m) << ": " \
+			<< sqlite3_errmsg(db) << std::endl;           \
+	}
+
+#define FINALIZE_STATEMENT(statement) \
+	SQLOK_ERRSTREAM(sqlite3_finalize(statement), "Failed to finalize " #statement)
 
 class ItemStackRow : public ItemStack {
 public:
@@ -109,17 +117,17 @@ RollbackManager::~RollbackManager()
 {
 	flush();
 
-	SQLOK(sqlite3_finalize(stmt_insert));
-	SQLOK(sqlite3_finalize(stmt_replace));
-	SQLOK(sqlite3_finalize(stmt_select));
-	SQLOK(sqlite3_finalize(stmt_select_range));
-	SQLOK(sqlite3_finalize(stmt_select_withActor));
-	SQLOK(sqlite3_finalize(stmt_knownActor_select));
-	SQLOK(sqlite3_finalize(stmt_knownActor_insert));
-	SQLOK(sqlite3_finalize(stmt_knownNode_select));
-	SQLOK(sqlite3_finalize(stmt_knownNode_insert));
+	FINALIZE_STATEMENT(stmt_insert);
+	FINALIZE_STATEMENT(stmt_replace);
+	FINALIZE_STATEMENT(stmt_select);
+	FINALIZE_STATEMENT(stmt_select_range);
+	FINALIZE_STATEMENT(stmt_select_withActor);
+	FINALIZE_STATEMENT(stmt_knownActor_select);
+	FINALIZE_STATEMENT(stmt_knownActor_insert);
+	FINALIZE_STATEMENT(stmt_knownNode_select);
+	FINALIZE_STATEMENT(stmt_knownNode_insert);
 
-	SQLOK(sqlite3_close(db));
+	SQLOK_ERRSTREAM(sqlite3_close(db), "Could not close db");
 }
 
 

From 27905f1a4a87a284e95673eeee2440a806b15d16 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 8 Jul 2016 17:07:31 +0200
Subject: [PATCH 092/418] Ubuntu build HOWTO: Suggest to install git instead of
 git-core

The package docs for the git-core Ubuntu package in all supported
Ubuntu versions, including 12.04 say:

This is a transitional dummy package.  The 'git-core' package has been
renamed to 'git', which has been installed automatically.  This git-core
package is now obsolete, and can safely be removed from the system if no
other package depends on it.

Fixes #4109
---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index bd2dadebb..352f4628b 100644
--- a/README.txt
+++ b/README.txt
@@ -111,7 +111,7 @@ $ sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl* openal*
 You can install git for easily keeping your copy up to date.
 If you dont want git, read below on how to get the source without git.
 This is an example for installing git on Debian/Ubuntu:
-$ sudo apt-get install git-core
+$ sudo apt-get install git
 
 For Fedora users:
 $ sudo dnf install git-core

From 4c530dea1a156c1ae307b5f304fb55d0619ee372 Mon Sep 17 00:00:00 2001
From: Snipie <poganiac@gmail.com>
Date: Sat, 9 Jul 2016 14:00:14 +0000
Subject: [PATCH 093/418] Fix typos (#4298)

---
 src/guiEngine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index e15533dcd..a3c35f68d 100644
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -433,7 +433,7 @@ void GUIEngine::drawOverlay(video::IVideoDriver* driver)
 
 	video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY].texture;
 
-	/* If no texture, draw background of solid color */
+	/* If no texture, draw nothing */
 	if(!texture)
 		return;
 
@@ -462,7 +462,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver)
 	v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult,
 			((f32)texture->getOriginalSize().Height) * mult);
 
-	// Don't draw the header is there isn't enough room
+	// Don't draw the header if there isn't enough room
 	s32 free_space = (((s32)screensize.Height)-320)/2;
 
 	if (free_space > splashsize.Y) {

From c7cd76f69a1d251159b2b220ed7a3bda11c496d9 Mon Sep 17 00:00:00 2001
From: susan <2033905535@qq.com>
Date: Fri, 3 Jun 2016 12:31:02 +0000
Subject: [PATCH 094/418] Translated using Weblate (Chinese (China))

Currently translated at 74.1% (658 of 887 strings)
---
 po/zh_CN/minetest.po | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po
index 62ebcd217..41418f89f 100644
--- a/po/zh_CN/minetest.po
+++ b/po/zh_CN/minetest.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-05-05 19:09+0000\n"
-"Last-Translator: Claybiokiller <clay0305@hotmail.com>\n"
+"PO-Revision-Date: 2016-06-03 12:31+0000\n"
+"Last-Translator: susan <2033905535@qq.com>\n"
 "Language-Team: Chinese (China) "
 "<https://hosted.weblate.org/projects/minetest/minetest/zh_CN/>\n"
 "Language: zh_CN\n"
@@ -4134,6 +4134,8 @@ msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
+"世界目录（世界里的所有东西都存在这里）。\n"
+"如果从主菜单开始游戏就不需要。"
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
@@ -4141,7 +4143,7 @@ msgstr "平地的 Y。"
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large pseudorandom caves."
-msgstr ""
+msgstr "大型随机洞穴的Y轴最大值。"
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"

From 235d2ed2460388253477eae84caeb8e282a3ef30 Mon Sep 17 00:00:00 2001
From: Tim <t4im@openmailbox.org>
Date: Sat, 4 Jun 2016 13:18:08 +0000
Subject: [PATCH 095/418] Translated using Weblate (Esperanto)

Currently translated at 32.2% (286 of 887 strings)
---
 po/eo/minetest.po | 76 ++++++++++++++---------------------------------
 1 file changed, 23 insertions(+), 53 deletions(-)

diff --git a/po/eo/minetest.po b/po/eo/minetest.po
index d1c137f21..cea8dff0c 100644
--- a/po/eo/minetest.po
+++ b/po/eo/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2015-09-13 12:36+0200\n"
+"PO-Revision-Date: 2016-06-04 13:18+0000\n"
 "Last-Translator: Tim <t4im@openmailbox.org>\n"
-"Language-Team: Esperanto <https://hosted.weblate.org/projects/minetest/"
-"minetest/eo/>\n"
+"Language-Team: Esperanto "
+"<https://hosted.weblate.org/projects/minetest/minetest/eo/>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.4-dev\n"
+"X-Generator: Weblate 2.7-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -220,18 +220,16 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Disabled"
-msgstr "Malŝaltu modifaron"
+msgstr "Malŝaltita"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Edit"
-msgstr ""
+msgstr "Redakti"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Enabled"
-msgstr "ŝaltita"
+msgstr "Ŝaltita"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Format is 3 numbers separated by commas and inside brackets."
@@ -244,9 +242,8 @@ msgid ""
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Games"
-msgstr "Ludo"
+msgstr "Ludoj"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
 msgid "Mods"
@@ -407,9 +404,8 @@ msgid "Uninstall selected modpack"
 msgstr "Malinstali selektan modifaron"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "Adreso / Pordo:"
+msgstr "Adreso / Pordo"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -436,9 +432,8 @@ msgid "Favorite"
 msgstr ""
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "Nomo / Pasvorto:"
+msgstr "Nomo / Pasvorto"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -503,7 +498,6 @@ msgid "2x"
 msgstr "2x"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "3D Clouds"
 msgstr "3D nuboj"
 
@@ -516,9 +510,8 @@ msgid "8x"
 msgstr "8x"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Advanced Settings"
-msgstr "Agordoj"
+msgstr "Pliaj Agordoj"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
@@ -529,12 +522,10 @@ msgid "Are you sure to reset your singleplayer world?"
 msgstr "Ĉu vi certas, ke vi volas nuligi vian solludantan mondon?"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bilinear Filter"
 msgstr "Bilineara filtrilo"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
 msgstr "Protuberancmapado"
 
@@ -543,7 +534,6 @@ msgid "Change keys"
 msgstr "Ŝanĝi klavojn"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Connected Glass"
 msgstr "Ligata glaco"
 
@@ -564,7 +554,6 @@ msgid "No"
 msgstr "Ne"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "No Filter"
 msgstr "Neniu filtrilo"
 
@@ -573,23 +562,20 @@ msgid "No Mipmap"
 msgstr "Neniu Mipmapo"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Highlighting"
-msgstr "Marki nodaĵojn"
+msgstr "Nodaĵa emfazado"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Outlining"
-msgstr "Marki nodaĵojn"
+msgstr "Nodaĵa kadrado"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
-msgstr ""
+msgstr "Neniu"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Normal Mapping"
-msgstr "Protuberancmapado"
+msgstr "Normalmapado"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -643,22 +629,18 @@ msgid "Touchthreshold (px)"
 msgstr "Tuŝa sojlo (px)"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Trilinear Filter"
-msgstr "Triineara filtrilo"
+msgstr "Trilineara filtrilo"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Leaves"
 msgstr "Ondantaj foliaĵoj"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Plants"
 msgstr "Ondantaj plantoj"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Water"
 msgstr "Ondanta akvo"
 
@@ -1325,7 +1307,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D clouds"
 msgstr "3D nuboj"
 
@@ -1468,7 +1449,6 @@ msgid "Basic Privileges"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bilinear filtering"
 msgstr "Bilineara filtrilo"
 
@@ -1585,9 +1565,8 @@ msgid "Cloud radius"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clouds"
-msgstr "3D nuboj"
+msgstr "Nuboj"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client side effect."
@@ -1639,14 +1618,12 @@ msgid "Console alpha"
 msgstr "Konzolo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Console color"
-msgstr "Konzolo"
+msgstr "Konzola koloro"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Console key"
-msgstr "Konzolo"
+msgstr "Konzola klavo"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward"
@@ -1657,9 +1634,8 @@ msgid "Continuous forward movement (only used for testing)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Controls"
-msgstr "Stiro"
+msgstr "Stirado"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1727,9 +1703,8 @@ msgid "DPI"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Damage"
-msgstr "Ŝalti damaĝon"
+msgstr "Damaĝon"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
@@ -1758,9 +1733,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default password"
-msgstr "Nova pasvorto"
+msgstr "Defaŭlta pasvorto"
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
@@ -4042,22 +4016,18 @@ msgid "Water surface level of the world."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving Nodes"
-msgstr "Ondantaj foliaĵoj"
+msgstr "Ondantaj nodaĵoj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving leaves"
 msgstr "Ondantaj foliaĵoj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving plants"
 msgstr "Ondantaj plantoj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving water"
 msgstr "Ondanta akvo"
 

From ac20a5182f5160a5326aca4a8bce8713389fe2d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9B=D0=B0=D0=B7=D0=B0=D1=80=20=D0=92=D1=83=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B8=D1=9B?= <gavranvukhome@gmail.com>
Date: Thu, 9 Jun 2016 08:40:00 +0000
Subject: [PATCH 096/418] Added translation using Weblate (Serbian (cyrillic))

---
 po/sr_Cyrl/minetest.po | 4031 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 4031 insertions(+)
 create mode 100644 po/sr_Cyrl/minetest.po

diff --git a/po/sr_Cyrl/minetest.po b/po/sr_Cyrl/minetest.po
new file mode 100644
index 000000000..359ef3bec
--- /dev/null
+++ b/po/sr_Cyrl/minetest.po
@@ -0,0 +1,4031 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: minetest\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sr_Cyrl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: builtin/fstk/ui.lua
+msgid "The server has requested a reconnect:"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "Main menu"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "Reconnect"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "An error occured in a Lua script, such as a mod:"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "An error occured:"
+msgstr ""
+
+#: builtin/fstk/ui.lua builtin/mainmenu/store.lua
+msgid "Ok"
+msgstr ""
+
+#: builtin/mainmenu/common.lua src/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Server supports protocol versions between $1 and $2. "
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Server enforces protocol version $1. "
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "We support protocol versions between version $1 and $2."
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "We only support protocol version $1."
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Protocol version mismatch. "
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "World:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Hide Game"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Hide mp content"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Mod:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
+msgid "Depends:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
+msgid "Save"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
+#: builtin/mainmenu/dlg_rename_modpack.lua
+#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
+#: src/keycode.cpp
+msgid "Cancel"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Enable MP"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Disable MP"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "enabled"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Enable all"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid ""
+"Failed to enable mod \"$1\" as it contains disallowed characters. Only "
+"chararacters [a-z0-9_] are allowed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "World name"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Seed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Mapgen"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Game"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Create"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "You have no subgames installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Download one from minetest.net"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Warning: The minimal development test is meant for developers."
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Download a subgame, such as minetest_game, from minetest.net"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "A world named \"$1\" already exists"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "No worldname given or no game selected"
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_mod.lua
+msgid "Are you sure you want to delete \"$1\"?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+#: src/keycode.cpp
+msgid "Delete"
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_mod.lua
+msgid "Modmgr: failed to delete \"$1\""
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_mod.lua
+msgid "Modmgr: invalid modpath \"$1\""
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_world.lua
+msgid "Delete World \"$1\"?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid "Rename Modpack:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
+msgid "Accept"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "(No description of setting given)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a comma seperated list of flags."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Possible values are: "
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid ""
+"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
+"<octaves>, <persistence>"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Optionally the lacunarity can be appended with a leading comma."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Format is 3 numbers separated by commas and inside brackets."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Disabled"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Enabled"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Browse"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a valid integer."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "The value must be greater than $1."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "The value must be lower than $1."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a valid number."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "\"$1\" is not a valid flag."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Select path"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "< Back to Settings page"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Edit"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Restore Default"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Show technical names"
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid "Install Mod: file: \"$1\""
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid ""
+"\n"
+"Install Mod: unsupported filetype \"$1\" or broken archive"
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid "Failed to install $1 to $2"
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid "Install Mod: unable to find suitable foldername for modpack $1"
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid "Install Mod: unable to find real modname for: $1"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Unsorted"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Downloading $1, please wait..."
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Successfully installed:"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Shortname:"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Rating"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "re-Install"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Close store"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Page $1 of $2"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Credits"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Core Developers"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Active Contributors"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Previous Core Developers"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Previous Contributors"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Installed Mods:"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "No mod description available"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Mod information:"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Rename"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Uninstall selected modpack"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Uninstall selected mod"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Select Mod File:"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua
+msgid "Address / Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Name / Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Connect"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Del. Favorite"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Favorite"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Creative mode"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Damage enabled"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "PvP enabled"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
+msgid "Client"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "New"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "Configure"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Start Game"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "Select World:"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_singleplayer.lua
+msgid "Creative Mode"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_singleplayer.lua
+msgid "Enable Damage"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Public"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Name/Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Bind Address"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Server Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "No world created or selected!"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Server"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Opaque Leaves"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Simple Leaves"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Fancy Leaves"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Node Outlining"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Node Highlighting"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No Filter"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Bilinear Filter"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Trilinear Filter"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No Mipmap"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Mipmap"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Mipmap + Aniso. Filter"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
+msgid "None"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "2x"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "4x"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "8x"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Are you sure to reset your singleplayer world?"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Yes"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Smooth Lighting"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Particles"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "3D Clouds"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Opaque Water"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Connected Glass"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Texturing:"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Antialiasing:"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Shaders"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Change keys"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Advanced Settings"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Touchthreshold (px)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Bump Mapping"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Tone Mapping"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Normal Mapping"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Parallax Occlusion"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Waving Water"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Waving Leaves"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Waving Plants"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "To enable shaders the OpenGL driver needs to be used."
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Settings"
+msgstr ""
+
+#: builtin/mainmenu/tab_simple_main.lua
+msgid "Start Singleplayer"
+msgstr ""
+
+#: builtin/mainmenu/tab_simple_main.lua
+msgid "Config mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_simple_main.lua
+msgid "Main"
+msgstr ""
+
+#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
+msgid "Play"
+msgstr ""
+
+#: builtin/mainmenu/tab_singleplayer.lua
+msgid "Singleplayer"
+msgstr ""
+
+#: builtin/mainmenu/tab_texturepacks.lua
+msgid "Select texture pack:"
+msgstr ""
+
+#: builtin/mainmenu/tab_texturepacks.lua
+msgid "No information available"
+msgstr ""
+
+#: builtin/mainmenu/tab_texturepacks.lua
+msgid "Texturepacks"
+msgstr ""
+
+#: src/client.cpp
+msgid "Connection timed out."
+msgstr ""
+
+#: src/client.cpp
+msgid "Loading textures..."
+msgstr ""
+
+#: src/client.cpp
+msgid "Rebuilding shaders..."
+msgstr ""
+
+#: src/client.cpp
+msgid "Initializing nodes..."
+msgstr ""
+
+#: src/client.cpp
+msgid "Initializing nodes"
+msgstr ""
+
+#: src/client.cpp
+msgid "Done!"
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Main Menu"
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Player name too long."
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "No world selected and no address provided. Nothing to do."
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Provided world path doesn't exist: "
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Could not find or load game \""
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Invalid gamespec."
+msgstr ""
+
+#: src/fontengine.cpp
+msgid "needs_fallback_font"
+msgstr ""
+
+#: src/game.cpp
+msgid "You died."
+msgstr ""
+
+#: src/game.cpp
+msgid "Respawn"
+msgstr ""
+
+#: src/game.cpp
+msgid ""
+"Default Controls:\n"
+"No menu visible:\n"
+"- single tap: button activate\n"
+"- double tap: place/use\n"
+"- slide finger: look around\n"
+"Menu/Inventory visible:\n"
+"- double tap (outside):\n"
+" -->close\n"
+"- touch stack, touch slot:\n"
+" --> move stack\n"
+"- touch&drag, tap 2nd finger\n"
+" --> place single item to slot\n"
+msgstr ""
+
+#: src/game.cpp
+msgid ""
+"Default Controls:\n"
+"- WASD: move\n"
+"- Space: jump/climb\n"
+"- Shift: sneak/go down\n"
+"- Q: drop item\n"
+"- I: inventory\n"
+"- Mouse: turn/look\n"
+"- Mouse left: dig/punch\n"
+"- Mouse right: place/use\n"
+"- Mouse wheel: select item\n"
+"- T: chat\n"
+msgstr ""
+
+#: src/game.cpp
+msgid "Continue"
+msgstr ""
+
+#: src/game.cpp
+msgid "Change Password"
+msgstr ""
+
+#: src/game.cpp
+msgid "Sound Volume"
+msgstr ""
+
+#: src/game.cpp
+msgid "Change Keys"
+msgstr ""
+
+#: src/game.cpp
+msgid "Exit to Menu"
+msgstr ""
+
+#: src/game.cpp
+msgid "Exit to OS"
+msgstr ""
+
+#: src/game.cpp
+msgid "Shutting down..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Creating server..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Creating client..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Resolving address..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Connecting to server..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Item definitions..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Node definitions..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/game.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/game.cpp
+msgid "MiB/s"
+msgstr ""
+
+#: src/game.cpp src/guiFormSpecMenu.cpp
+msgid "ok"
+msgstr ""
+
+#: src/game.cpp
+msgid ""
+"\n"
+"Check debug.txt for details."
+msgstr ""
+
+#: src/guiFormSpecMenu.cpp
+msgid "Proceed"
+msgstr ""
+
+#: src/guiFormSpecMenu.cpp
+msgid "Enter "
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "\"Use\" = climb down"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Double tap \"jump\" to toggle fly"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Key already in use"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "press key"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Forward"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Backward"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Left"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Right"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Use"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Jump"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Sneak"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Drop"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Inventory"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Chat"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Command"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Console"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle fly"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle fast"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle Cinematic"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle noclip"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Range select"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
+msgid "Print stacks"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "Old Password"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "New Password"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "Confirm Password"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "Change"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "Passwords do not match!"
+msgstr ""
+
+#: src/guiVolumeChange.cpp
+msgid "Sound Volume: "
+msgstr ""
+
+#: src/guiVolumeChange.cpp
+msgid "Exit"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Button"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Middle Button"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Button"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "X Button 1"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Back"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Clear"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Return"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Tab"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "X Button 2"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Capital"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Control"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Kana"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Menu"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Pause"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Shift"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Convert"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Escape"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Final"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Junja"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Kanji"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Nonconvert"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "End"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Home"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Mode Change"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Next"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Prior"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Space"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Down"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Execute"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Print"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Select"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Up"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Help"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Insert"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Snapshot"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Windows"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Apps"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 0"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 1"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Windows"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Sleep"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 2"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 3"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 4"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 5"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 6"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 7"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad *"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad +"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad -"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad /"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 8"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 9"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Num Lock"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Scroll Lock"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Shift"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Shift"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Control"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Menu"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Control"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Menu"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Comma"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Minus"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Period"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Plus"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Attn"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "CrSel"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Erase OEF"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "ExSel"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "OEM Clear"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "PA1"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Zoom"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Build inside player"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, you can place blocks at the position (feet + eye level) where "
+"you stand.\n"
+"This is helpful when working with nodeboxes in small areas."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Flying"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Player is able to fly without being affected by gravity.\n"
+"This requires the \"fly\" privilege on the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast movement"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Fast movement (via use key).\n"
+"This requires the \"fast\" privilege on the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noclip"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled together with fly mode, player is able to fly through solid "
+"nodes.\n"
+"This requires the \"noclip\" privilege on the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cinematic mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Smooths camera when moving and looking around.\n"
+"Useful for recording videos."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera smoothing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooths rotation of camera. 0 to disable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera smoothing in cinematic mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert mouse"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert vertical mouse movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity multiplier."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Key use for climbing/descending"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
+"and descending."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double tap jump for fly"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double-tapping the jump key toggles fly mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Always fly and fast"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If disabled \"use\" key is used to fly fast if both fly and fast mode are "
+"enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rightclick repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated right clicks when holding the "
+"right mouse button."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Random input"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable random user input (only used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Continuous forward"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Continuous forward movement (only used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Forward key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player forward.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Backward key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player backward.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Left key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player left.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Right key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player right.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Jump key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for jumping.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sneak key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for sneaking.\n"
+"Also used for climbing down and descending in water if aux1_descends is "
+"disabled.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Inventory key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the inventory.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving fast in fast mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat window.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Command key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat window to type commands.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat console.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Range select key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling unlimited view range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fly key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling flying.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling fast mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noclip key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling noclip mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cinematic mode key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling cinematic mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling display of minimap.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for taking screenshots.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Drop item key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for dropping the currently selected item.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "HUD toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the HUD.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the chat.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fog toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the fog.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera update toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the camrea update. Only used for development\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug info toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of debug info.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiler toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the profiler. Used for development.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Toggle camera mode key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for switching between first- and third-person camera.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View range increase key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for increasing the viewing range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View range decrease key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for decreasing the viewing range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for printing debug stacks. Used for development.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Network"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Address to connect to.\n"
+"Leave this blank to start a local server.\n"
+"Note that the address field in the main menu overrides this setting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remote port"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Port to connect to (UDP).\n"
+"Note that the port field in the main menu overrides this setting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Support older servers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to support older servers before protocol version 25.\n"
+"Enable if you want to connect to 0.4.12 servers and before.\n"
+"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
+"Disabling this option will protect your password better."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Saving map received from server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Save the map received by the client on disk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show entity selection boxes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connect to external media server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable usage of remote media server (if provided by server).\n"
+"Remote servers offer a significantly faster way to download media (e.g. "
+"textures)\n"
+"when connecting to the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "URL to the server list displayed in the Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist file"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"File in client/serverlist/ that contains your favorite servers displayed in "
+"the Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Graphics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-Game"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Basic"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "VBO"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable VBO"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fog"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether to fog out the end of the visible area."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Leaves style"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Leaves style:\n"
+"-   Fancy:  all faces visible\n"
+"-   Simple: only outer faces, if defined special_tiles are used\n"
+"-   Opaque: disable transparency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connect glass"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connects glass if supported by node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooth lighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable smooth lighting with simple ambient occlusion.\n"
+"Disable for speed or for different looks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds are a client side effect."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D clouds"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use 3D cloud look instead of flat."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Node highlighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Method used to highlight selected object."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mipmapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use mip mapping to scale textures. May slightly increase performance."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Anisotropic filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use anisotropic filtering when viewing at textures from an angle."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bilinear filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use bilinear filtering when scaling textures."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trilinear filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use trilinear filtering when scaling textures."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clean transparent textures"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Filtered textures can blend RGB values with fully-transparent neighbors,\n"
+"which PNG optimizers usually discard, sometimes resulting in a dark or\n"
+"light edge to transparent textures.  Apply this filter to clean that up\n"
+"at texture load time."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimum texture size for filters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
+"can be blurred, so automatically upscale them with nearest-neighbor\n"
+"interpolation to preserve crisp pixels.  This sets the minimum texture size\n"
+"for the upscaled textures; higher values look sharper, but require more\n"
+"memory.  Powers of 2 are recommended.  Setting this higher than 1 may not\n"
+"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
+"enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FSAA"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Experimental option, might cause visible spaces between blocks\n"
+"when set to higher number than 0."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Shaders allow advanced visul effects and may increase performance on some "
+"video cards.\n"
+"Thy only work with the OpenGL video backend."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filmic tone mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables filmic tone mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bumpmapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+"texture pack\n"
+"or need to be auto-generated.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Generate normalmaps"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables on the fly normalmap generation (Emboss effect).\n"
+"Requires bumpmapping to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Normalmaps strength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strength of generated normalmaps."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Normalmaps sampling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines sampling step of texture.\n"
+"A higher value results in smoother normal maps."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables parallax occlusion mapping.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"0 = parallax occlusion with slope information (faster).\n"
+"1 = relief mapping (slower, more accurate)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion strength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strength of parallax."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion iterations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Number of parallax occlusion iterations."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion Scale"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Overall scale of parallax occlusion effect."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion bias"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Overall bias of parallax occlusion effect, usually scale/2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving Nodes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true enables waving water.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water length"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving leaves"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true enables waving leaves.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving plants"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true enables waving plants.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Advanced"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If FPS would go higher than this, limit it by sleeping\n"
+"to not waste CPU power for no benefit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FPS in pause menu"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS when game is paused."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Viewing range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"View distance in nodes.\n"
+"Min = 20"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Full screen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fullscreen mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Full screen BPP"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bits per pixel (aka color depth) in fullscreen mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "V-Sync"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Vertical screen synchronization."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view in degrees."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
+"This setting is for the client only and is ignored by the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Texture path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Path to texture directory. All textures are first searched from here."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Video driver"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The rendering back-end for Irrlicht."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cloud height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height on which clouds are appearing."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cloud radius"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Radius of cloud area stated in number of 64 node cloud squares.\n"
+"Values larger than 26 will start to produce sharp cutoffs at cloud area "
+"corners."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View bobbing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Multiplier for view bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fall bobbing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Multiplier for fall bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"3D support.\n"
+"Currently supported:\n"
+"-    none: no 3d output.\n"
+"-    anaglyph: cyan/magenta color 3d.\n"
+"-    interlaced: odd/even line based polarisation screen support.\n"
+"-    topbottom: split screen top/bottom.\n"
+"-    sidebyside: split screen side by side.\n"
+"-    pageflip: quadbuffer based 3d."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box border color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width of the selectionbox's lines around nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Desynchronize block animation"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether node texture animations should be desynchronized per mapblock."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum hotbar width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum proportion of current window to be used for hotbar.\n"
+"Useful if there's something to be displayed right or left of hotbar."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mesh cache"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables caching of facedir rotated meshes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables minimap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Round minimap"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shape of the minimap. Enabled = round, disabled = square."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap scan height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"True = 256\n"
+"False = 128\n"
+"Useable to make minimap smoother on slower machines."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Colored fog"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ambient occlusion gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The strength (darkness) of node ambient-occlusion shading.\n"
+"Lower is darker, Higher is lighter. The valid range of values for this\n"
+"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
+"set to the nearest valid value."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Inventory items animations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables animation of inventory items."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Menus"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds in menu"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use a cloud animation for the main menu background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Scale gui by a user specified value.\n"
+"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
+"This will smooth over some of the rough edges, and blend\n"
+"pixels when scaling down, at the cost of blurring some\n"
+"edge pixels when images are scaled by non-integer sizes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter is true, all GUI images need to be\n"
+"filtered in software, but some images are generated directly\n"
+"to hardware (e.g. render-to-texture for nodes in inventory)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter txr2img"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter_txr2img is true, copy those images\n"
+"from hardware to software for scaling.  When false, fall back\n"
+"to the old scaling method, for video drivers that don't\n"
+"propery support downloading textures back from hardware."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Tooltip delay"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Delay showing tooltips, stated in milliseconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Freetype fonts"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether freetype fonts are used, requires freetype support to be compiled in."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Path to TrueTypeFont or bitmap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow offset, if 0 then shadow will not be drawn."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "This font will be used for certain languages."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font shadow"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font shadow alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot folder"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Path to save screenshots at."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Format of screenshots."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot quality"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Screenshot quality. Only used for JPEG format.\n"
+"1 means worst quality; 100 means best quality.\n"
+"Use 0 for default quality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "DPI"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
+"screens."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volume"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock unload timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Timeout for client to remove unused map data from memory."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of mapblocks for client to be kept in memory.\n"
+"Set to -1 for unlimited amount."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show debug info"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to show the client debug info (has the same effect as hitting F5)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server / Singleplayer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the server, to be displayed when players join and in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server description"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Description of server, to be displayed when players join and in the "
+"serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Domain name of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Homepage of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Announce server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Automaticaly report to the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Announce to this serverlist.\n"
+"If you want to announce your ipv6 address, use  serverlist_url = v6.servers."
+"minetest.net."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server port"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Network port to listen (UDP).\n"
+"This value will be overridden when starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bind address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The network interface that the server listens on."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strict protocol checking"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable to disallow old clients from connecting.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remote media"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Specifies URL from which client fetches media instead of using UDP.\n"
+"$filename should be accessible from $remote_media$filename via cURL\n"
+"(obviously, remote_media should end with a slash).\n"
+"Files that are not present will be fetched the usual way."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable/disable running an IPv6 server.  An IPv6 server may be restricted\n"
+"to IPv6 clients, depending on system configuration.\n"
+"Ignored if bind_address is set."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum simultaneously blocks send per client"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How many blocks are flying in the wire simultaneously per client."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum simultaneously bocks send total"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How many blocks are flying in the wire simultaneously for the whole server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"To reduce lag, block transfers are slowed down when a player is building "
+"something.\n"
+"This determines how long they are slowed down after placing or removing a "
+"node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. packets per iteration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of packets sent per send step, if you have a slow connection\n"
+"try reducing it, but don't reduce it to a number below double of targeted\n"
+"client number."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default game"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default game when creating a new world.\n"
+"This will be overridden when creating a world from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day displayed to players connecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum users"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of players that can connect simultaneously."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map directory"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"World directory (everything in the world is stored here).\n"
+"Not needed if starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Item entity TTL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Time in seconds for item entity (dropped items) to live.\n"
+"Setting it to -1 disables the feature."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Damage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable players getting damage and dying."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fixed map seed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"A chosen map seed for a new map, leave empty for random.\n"
+"Will be overridden when creating a new world in the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default password"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "New users need to input this password."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default privileges"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The privileges that new users automatically get.\n"
+"See /privs in game for a full list on your server and mod configuration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Basic Privileges"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Privileges that players with basic_privs can grant"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unlimited player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether players are shown to clients without any range limit.\n"
+"Deprecated, use the setting player_transfer_distance instead."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player versus Player"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether to allow players to damage and kill each other."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Static spawnpoint"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If this is set, players will always (re)spawn at the given position."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disallow empty passwords"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, new players cannot join with an empty password."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disable anticheat"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, disable cheat prevention in multiplayer."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rollback recording"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, actions are recorded for rollback.\n"
+"This option is only read when server starts."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shutdown message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "A message to be displayed to all clients when the server shuts down."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crash message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "A message to be displayed to all clients when the server crashes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ask to reconnect after crash"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to ask clients to reconnect after a (Lua) crash.\n"
+"Set this to true if your server is set up to restart automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active object send range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far clients know about objects, stated in mapblocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active block range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How large area of blocks are subject to the active block stuff, stated in "
+"mapblocks (16 nodes).\n"
+"In active blocks objects are loaded and ABMs run."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block send distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum forceloaded blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of forceloaded mapblocks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time send interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of sending time of day to clients."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls length of day/night cycle.\n"
+"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
+"unchanged."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map save interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of saving important changes in the world, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Physics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Acceleration in air"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Walking speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crouch speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Climbing speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Jumping speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Descending speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity smoothing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid sink"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Gravity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Deprecated Lua API handling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Handling for deprecated lua api calls:\n"
+"-    legacy: (try to) mimic old behaviour (default for release).\n"
+"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    error: abort on usage of deprecated call (suggested for mod developers)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mod profiling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Useful for mod developers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Detailed mod profiling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Detailed mod profile data. Useful for mod developers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiling print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. clearobjects extra blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of extra blocks that can be loaded by /clearobjects at once.\n"
+"This is a trade-off between sqlite transaction overhead and\n"
+"memory consumption (4096=100MB, as a rule of thumb)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unload unused server data"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How much the server will wait before unloading unused mapblocks.\n"
+"Higher value is smoother, but will use more RAM."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maxmimum objects per block"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of statically stored objects in a block."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Synchronous SQLite"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dedicated server step"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of a server tick and the interval at which objects are generally "
+"updated over network."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active Block Management interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time in between active block management cycles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifier interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between ABM execution cycles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "NodeTimer interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between NodeTimer execution cycles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ignore world errors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, invalid world data won't cause the server to shut down.\n"
+"Only enable this if you know what you are doing."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid loop max"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max liquids processed per step."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid queue purge time"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time (in seconds) that the liquids queue may grow beyond processing\n"
+"capacity until an attempt is made to decrease its size by dumping old queue\n"
+"items.  A value of 0 disables the functionality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update tick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update interval in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of map generator to be used when creating a new world.\n"
+"Creating a world in the main menu will override this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water surface level of the world."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block generate distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are generated for clients, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map generation limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Where the map generator stops.\n"
+"Please note:\n"
+"-    Limited to 31000 (setting above has no effect)\n"
+"-    The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n"
+"-    Those groups have an offset of -32, -32 nodes from the origin.\n"
+"-    Only groups which are within the map_generation_limit are generated"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Global map generation attributes.\n"
+"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
+"and junglegrass, in all other mapgens this flag controls all decorations.\n"
+"The default flags set in the engine are: caves, light, decorations\n"
+"The flags string modifies the engine defaults.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chunk size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dump the mapgen debug infos."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Absolute limit of emerge queues"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that can be queued for loading."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Limit of emerge queues on disk"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be loaded from file.\n"
+"Set to blank for an appropriate amount to be chosen automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Limit of emerge queues to generate"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be generated.\n"
+"Set to blank for an appropriate amount to be chosen automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Number of emerge threads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of emerge threads to use. Make this field blank, or increase this "
+"number\n"
+"to use multiple threads. On multiprocessor systems, this will improve mapgen "
+"speed greatly\n"
+"at the cost of slightly buggy caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome heat noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noise parameters for biome API temperature, humidity and biome blend."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen heat blend noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome humidity noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome humidity blend noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls width of tunnels, a smaller value creates wider tunnels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 factor noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 height noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v6.\n"
+"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
+"flag is ignored.\n"
+"The default flags set in the engine are: biomeblend, mudflow\n"
+"The flags string modifies the engine defaults.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 desert frequency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls size of deserts and beaches in Mapgen v6.\n"
+"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 beach frequency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 terrain base noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 terrain altitude noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 steepness noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 height select noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 mud noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 beach noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 biome noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 cave noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 humidity noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 trees noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 apple trees noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v7.\n"
+"The 'ridges' flag controls the rivers.\n"
+"The default flags set in the engine are: mountains, ridges\n"
+"The flags string modifies the engine defaults.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain base noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain altitude noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain persistation noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 height select noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 mount height noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 ridge water noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 mountain noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 ridge noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen flat.\n"
+"Occasional lakes and hills can be added to the flat world.\n"
+"The default flags set in the engine are: none\n"
+"The flags string modifies the engine defaults.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat ground level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of flat ground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat large cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of upper limit of large pseudorandom caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat lake threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for lakes.\n"
+"Controls proportion of world area covered by lakes.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat lake steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/depth of lake depressions."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat hill threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for hills.\n"
+"Controls proportion of world area covered by hills.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat hill steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/height of hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat terrain noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Determines terrain shape.\n"
+"The 3 numbers in brackets control the scale of the\n"
+"terrain, the 3 numbers should be identical."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal fractal"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Choice of 18 fractals from 9 formulas.\n"
+"1 = 4D \"Roundy\" mandelbrot set.\n"
+"2 = 4D \"Roundy\" julia set.\n"
+"3 = 4D \"Squarry\" mandelbrot set.\n"
+"4 = 4D \"Squarry\" julia set.\n"
+"5 = 4D \"Mandy Cousin\" mandelbrot set.\n"
+"6 = 4D \"Mandy Cousin\" julia set.\n"
+"7 = 4D \"Variation\" mandelbrot set.\n"
+"8 = 4D \"Variation\" julia set.\n"
+"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n"
+"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n"
+"11 = 3D \"Christmas Tree\" mandelbrot set.\n"
+"12 = 3D \"Christmas Tree\" julia set.\n"
+"13 = 3D \"Mandelbulb\" mandelbrot set.\n"
+"14 = 3D \"Mandelbulb\" julia set.\n"
+"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n"
+"16 = 3D \"Cosine Mandelbulb\" julia set.\n"
+"17 = 4D \"Mandelbulb\" mandelbrot set.\n"
+"18 = 4D \"Mandelbulb\" julia set."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal iterations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Iterations of the recursive function.\n"
+"Controls the amount of fine detail."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal scale"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Approximate (X,Y,Z) scale of fractal in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal offset"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
+"Used to move a suitable spawn area of low land close to (0, 0).\n"
+"The default is suitable for mandelbrot sets, it needs to be edited for julia "
+"sets.\n"
+"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal slice w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"W co-ordinate of the generated 3D slice of a 4D fractal.\n"
+"Determines which 3D slice of the 4D shape is generated.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia x"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only: X component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only: Y component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia z"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only: Z component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only: W component of hypercomplex constant determining julia "
+"shape.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal seabed noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Valleys"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "General"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valleys C Flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Valleys.\n"
+"'altitude_chill' makes higher elevations colder, which may cause biome "
+"issues.\n"
+"'humid_rivers' modifies the humidity around rivers and in areas where water "
+"would tend to pool,\n"
+"it may interfere with delicately adjusted biomes.\n"
+"The default flags set in the engine are: altitude_chill, humid_rivers\n"
+"The flags string modifies the engine defaults.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Altitude Chill"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The altitude at which temperature drops by 20C"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Large cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find large caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lava Features"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable lava features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find massive caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How deep to make rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How wide to make rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water Features"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable water features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noises"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #1"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Caves and tunnels form at the intersection of the two noises"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #2"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filler Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The depth of dirt or other filler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive cave noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive caves form here."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River noise -- rivers occur close to zero"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain Height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Base terrain height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Raises terrain to make valleys around the rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Fill"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Slope and fill work together to modify the heights"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Profile"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Amplifies the valleys"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Slope"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable mod security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Prevent mods from doing insecure things like running shell commands."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trusted mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "HTTP Mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client and Server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the player.\n"
+"When running a server, clients connecting with this name are admins.\n"
+"When starting from the main menu, this is overridden."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Language"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the language. Leave empty to use the system language.\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug log level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Level of logging to be written to debug.txt:\n"
+"-    <nothing> (no logging)\n"
+"-    none (messages with no level)\n"
+"-    error\n"
+"-    warning\n"
+"-    action\n"
+"-    info\n"
+"-    verbose"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 support."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default timeout for cURL, stated in milliseconds.\n"
+"Only has an effect if compiled with cURL."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL parallel limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Limits number of parallel HTTP requests. Affects:\n"
+"-    Media fetch if server uses remote_media setting.\n"
+"-    Serverlist download and server announcement.\n"
+"-    Downloads performed by main menu (e.g. mod manager).\n"
+"Only has an effect if compiled with cURL."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL file download timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum time in ms a file download (e.g. a mod download) may take."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "High-precision FPU"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Main menu script"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Replaces the default main menu with a custom one."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Main menu game manager"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Main menu mod manager"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Modstore download URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Modstore mods list URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Modstore details URL"
+msgstr ""

From c9c07ae7541e9808006b7e0fb885bddaf3b8b8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9B=D0=B0=D0=B7=D0=B0=D1=80=20=D0=92=D1=83=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B8=D1=9B?= <gavranvukhome@gmail.com>
Date: Thu, 9 Jun 2016 11:11:15 +0000
Subject: [PATCH 097/418] Translated using Weblate (Serbian (cyrillic))

Currently translated at 31.5% (280 of 887 strings)
---
 po/sr_Cyrl/minetest.po | 578 ++++++++++++++++++++++-------------------
 1 file changed, 306 insertions(+), 272 deletions(-)

diff --git a/po/sr_Cyrl/minetest.po b/po/sr_Cyrl/minetest.po
index 359ef3bec..92413f32a 100644
--- a/po/sr_Cyrl/minetest.po
+++ b/po/sr_Cyrl/minetest.po
@@ -8,90 +8,96 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2016-06-09 11:11+0000\n"
+"Last-Translator: Лазар Вукановић <gavranvukhome@gmail.com>\n"
+"Language-Team: Serbian (cyrillic) "
+"<https://hosted.weblate.org/projects/minetest/minetest/sr_Cyrl/>\n"
 "Language: sr_Cyrl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.7-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr ""
+msgstr "Сервер тражи поновно повезивање:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
-msgstr ""
+msgstr "Главни мени"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr ""
+msgstr "Поновно повезивање"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr ""
+msgstr "Догодила се грешка у Lua скрипти, у моду:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
-msgstr ""
+msgstr "Догодила се грешка:"
 
 #: builtin/fstk/ui.lua builtin/mainmenu/store.lua
 msgid "Ok"
-msgstr ""
+msgstr "Уреду"
 
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
-msgstr ""
+msgstr "Учитавање..."
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
 msgstr ""
+"Покушајте да поновно укључите листу сервера и проверите вашу интернет "
+"конекцију."
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr ""
+msgstr "Сервер подржава верзије протокола између $1 и $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr ""
+msgstr "Сервер примењује $1 верзију протокола. "
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr ""
+msgstr "Ми подржавамо верзије протокола између верзије $1 и $2."
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr ""
+msgstr "Ми подржавамо само $1 верзију протокола."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr ""
+msgstr "Неслагање верзија протокола. "
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
-msgstr ""
+msgstr "Свет:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
-msgstr ""
+msgstr "Сакриј игру"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide mp content"
-msgstr ""
+msgstr "Сакриј садржину мод-паковања"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr ""
+msgstr "Мод:"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
 msgid "Depends:"
-msgstr ""
+msgstr "Зависи од:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
 msgid "Save"
-msgstr ""
+msgstr "Сачувај"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -99,129 +105,133 @@ msgstr ""
 #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
 #: src/keycode.cpp
 msgid "Cancel"
-msgstr ""
+msgstr "Прекини"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable MP"
-msgstr ""
+msgstr "Омогући мод-паковање"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable MP"
-msgstr ""
+msgstr "Онемогући мод-паковање"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
-msgstr ""
+msgstr "укључено"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr ""
+msgstr "Укључи све"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
+"Неуспело укључивање мода \"$1\" зато што садржи неподржане симболе.Само "
+"симболи [a-z0-9_] су дозвољени."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
-msgstr ""
+msgstr "Име света"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Seed"
-msgstr ""
+msgstr "Семе"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
-msgstr ""
+msgstr "Генератор мапе"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
-msgstr ""
+msgstr "Игра"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
-msgstr ""
+msgstr "Направи"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no subgames installed."
-msgstr ""
+msgstr "Нема инсталираних подигара."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr ""
+msgstr "Преузми један са minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The minimal development test is meant for developers."
-msgstr ""
+msgstr "Упозорење: Минимални развојни тест је намењен развијачима."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr ""
+msgstr "Преузми подигру, као што је minetest_game, са minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr ""
+msgstr "Свет \"$1\" већ постоји"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No worldname given or no game selected"
-msgstr ""
+msgstr "Име није дато или ниједна игра није изабрана"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr ""
+msgstr "Да ли сте сигурни да желите да обришете \"$1\"?"
 
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 #: src/keycode.cpp
 msgid "Delete"
-msgstr ""
+msgstr "Обриши"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: failed to delete \"$1\""
-msgstr ""
+msgstr "Modmgr: неуспело брисање \"$1\""
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: invalid modpath \"$1\""
-msgstr ""
+msgstr "Modmgr: локација мода \"$1\" није валидна"
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr ""
+msgstr "Обриши свет \"$1\"?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr ""
+msgstr "Преименуј мод-паковање:"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
 msgid "Accept"
-msgstr ""
+msgstr "Прихвати"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
-msgstr ""
+msgstr "Игре"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
 msgid "Mods"
-msgstr ""
+msgstr "Модови"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
-msgstr ""
+msgstr "(Није дат опис поставке)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a comma seperated list of flags."
-msgstr ""
+msgstr "Молим вас унесите листу ознака раздвојену зарезима."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Possible values are: "
-msgstr ""
+msgstr "Могуће вредности су: "
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
+"Формат:  <офсет>, <скала>, (<распонX>, <распонY>, <распонZ>), <семе>, "
+"<октаве>, <упорност>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
@@ -229,307 +239,311 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Format is 3 numbers separated by commas and inside brackets."
-msgstr ""
+msgstr "Формат су три броја унутар заграда раздвојени зарезима."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
-msgstr ""
+msgstr "Онемогућено"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Enabled"
-msgstr ""
+msgstr "Омогућено"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
-msgstr ""
+msgstr "Прегледај"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
-msgstr ""
+msgstr "Молим вас унесите валидан број."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be greater than $1."
-msgstr ""
+msgstr "Вредност мора бити већа од $1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be lower than $1."
-msgstr ""
+msgstr "Вредност мора бити мања од $1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid number."
-msgstr ""
+msgstr "Молим вас унесите валидан број."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "\"$1\" is not a valid flag."
-msgstr ""
+msgstr "\"$1\" није валидна ознака."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select path"
-msgstr ""
+msgstr "Одабери локацију"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
-msgstr ""
+msgstr "< Назад на страну са поставкама"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Edit"
-msgstr ""
+msgstr "Промени"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
-msgstr ""
+msgstr "Поврати уобичајено"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
-msgstr ""
+msgstr "Прикажи техничка имена"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: file: \"$1\""
-msgstr ""
+msgstr "Инсталирај мод: фајл: \"$1\""
 
 #: builtin/mainmenu/modmgr.lua
 msgid ""
 "\n"
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
+"\n"
+"Инсталирај мод: неподржан тип фајла \"$1\" или оштећена архива"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Failed to install $1 to $2"
-msgstr ""
+msgstr "Неуспела инсталација $1 у $2"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find suitable foldername for modpack $1"
 msgstr ""
+"Инсталирај мод: не може се пронаћи одговарајуће име за фасциклу мод-паковања "
+"$1"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find real modname for: $1"
-msgstr ""
+msgstr "Инсталирај мод: не може се пронаћи право име за: $1"
 
 #: builtin/mainmenu/store.lua
 msgid "Unsorted"
-msgstr ""
+msgstr "Нераспоређено"
 
 #: builtin/mainmenu/store.lua
 msgid "Search"
-msgstr ""
+msgstr "Тражи"
 
 #: builtin/mainmenu/store.lua
 msgid "Downloading $1, please wait..."
-msgstr ""
+msgstr "Преузима се $1, молим вас сачекајте..."
 
 #: builtin/mainmenu/store.lua
 msgid "Successfully installed:"
-msgstr ""
+msgstr "Успешно инсталиран:"
 
 #: builtin/mainmenu/store.lua
 msgid "Shortname:"
-msgstr ""
+msgstr "Краће име:"
 
 #: builtin/mainmenu/store.lua
 msgid "Rating"
-msgstr ""
+msgstr "Оцена"
 
 #: builtin/mainmenu/store.lua
 msgid "re-Install"
-msgstr ""
+msgstr "поново инсталирај"
 
 #: builtin/mainmenu/store.lua
 msgid "Install"
-msgstr ""
+msgstr "Инсталирај"
 
 #: builtin/mainmenu/store.lua
 msgid "Close store"
-msgstr ""
+msgstr "Затвори складиште"
 
 #: builtin/mainmenu/store.lua
 msgid "Page $1 of $2"
-msgstr ""
+msgstr "Страна $1 од $2"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
-msgstr ""
+msgstr "Заслуге"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
-msgstr ""
+msgstr "Главни развијачи"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
-msgstr ""
+msgstr "Активни сарадници"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr ""
+msgstr "Предходни главни развијачи"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
-msgstr ""
+msgstr "Предходни сарадници"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Installed Mods:"
-msgstr ""
+msgstr "Инсталирани модови:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "No mod description available"
-msgstr ""
+msgstr "Није доступан опис мода"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Mod information:"
-msgstr ""
+msgstr "Информације о моду:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Rename"
-msgstr ""
+msgstr "Преименуј"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected modpack"
-msgstr ""
+msgstr "Уклони одабрано мод-паковање"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected mod"
-msgstr ""
+msgstr "Уклони изабрани мод"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Select Mod File:"
-msgstr ""
+msgstr "Изаберите фајл мода:"
 
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port"
-msgstr ""
+msgstr "Адреса / Порт"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Name / Password"
-msgstr ""
+msgstr "Име / Шифра"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Connect"
-msgstr ""
+msgstr "Прикључи се"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr ""
+msgstr "Обриши Омиљени"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
-msgstr ""
+msgstr "Омиљени"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative mode"
-msgstr ""
+msgstr "Слободни мод"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Damage enabled"
-msgstr ""
+msgstr "Оштећење омогућено"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
-msgstr ""
+msgstr "Туча омогућена"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
-msgstr ""
+msgstr "Клијент"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "New"
-msgstr ""
+msgstr "Нови"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Configure"
-msgstr ""
+msgstr "Подеси"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Start Game"
-msgstr ""
+msgstr "Почни игру"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Select World:"
-msgstr ""
+msgstr "Одабери свет:"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Creative Mode"
-msgstr ""
+msgstr "Слободни мод"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Enable Damage"
-msgstr ""
+msgstr "Омогући оштећење"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Public"
-msgstr ""
+msgstr "Јавни"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Name/Password"
-msgstr ""
+msgstr "Име/Шифра"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Bind Address"
-msgstr ""
+msgstr "Вежи адресу"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Port"
-msgstr ""
+msgstr "Порт"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Server Port"
-msgstr ""
+msgstr "Серверски порт"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "No world created or selected!"
-msgstr ""
+msgstr "Ниједан свет није направљен или изабран!"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Server"
-msgstr ""
+msgstr "Сервер"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
-msgstr ""
+msgstr "Непровидно лишће"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Simple Leaves"
-msgstr ""
+msgstr "Једноставно лишће"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Fancy Leaves"
-msgstr ""
+msgstr "Елегантно лишће"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Outlining"
-msgstr ""
+msgstr "Обцртавање блокова"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr ""
+msgstr "Истицање блокова"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
-msgstr ""
+msgstr "Без филтера"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
-msgstr ""
+msgstr "Билинеарни филтер"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
-msgstr ""
+msgstr "Трилинеарни филтер"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
-msgstr ""
+msgstr "Без Mipmap-а"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
-msgstr ""
+msgstr "Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
-msgstr ""
+msgstr "Mipmap + Анизотропни филтер"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
-msgstr ""
+msgstr "Ништа"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
@@ -545,179 +559,180 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
+msgstr "Да ли сте сигурни да желите да ресетујете ваш свет?"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No"
-msgstr ""
+msgstr "Не"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Smooth Lighting"
-msgstr ""
+msgstr "Глатко осветљење"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
-msgstr ""
+msgstr "Честице"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "3D Clouds"
-msgstr ""
+msgstr "3Д Облаци"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Water"
-msgstr ""
+msgstr "Непрозирна вода"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Connected Glass"
-msgstr ""
+msgstr "Спојено стакло"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Texturing:"
-msgstr ""
+msgstr "Филтери за текстуре:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr ""
+msgstr "Гланчање текстура:"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Shaders"
-msgstr ""
+msgstr "Шејдери"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
-msgstr ""
+msgstr "Промени дугмад"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Напредне поставке"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold (px)"
-msgstr ""
+msgstr "Праг додиривања (px)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bump Mapping"
-msgstr ""
+msgstr "Bump-Мапирање"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr ""
+msgstr "Тонско Мапирање"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Normal Mapping"
-msgstr ""
+msgstr "Нормал-мапирање"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Parallax Occlusion"
-msgstr ""
+msgstr "Parallax Occlusion Мапирање"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Water"
-msgstr ""
+msgstr "Веслајућа вода"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
-msgstr ""
+msgstr "Лепршајуће лишће"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Plants"
-msgstr ""
+msgstr "Лепршајуће биљке"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr ""
+msgstr "Да би се омогућили шејдери мора се користити OpenGL драјвер."
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
-msgstr ""
+msgstr "Поставке"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Start Singleplayer"
-msgstr ""
+msgstr "Започни игру за једног играча"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Config mods"
-msgstr ""
+msgstr "Подеси модове"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Main"
-msgstr ""
+msgstr "Главно"
 
 #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
 msgid "Play"
-msgstr ""
+msgstr "Играј"
 
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Singleplayer"
-msgstr ""
+msgstr "Један играч"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Select texture pack:"
-msgstr ""
+msgstr "Одабери сет текстура:"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "No information available"
-msgstr ""
+msgstr "Нема доступних информација"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Texturepacks"
-msgstr ""
+msgstr "Сетови текстура"
 
 #: src/client.cpp
 msgid "Connection timed out."
-msgstr ""
+msgstr "Конекцији је истекло време."
 
 #: src/client.cpp
 msgid "Loading textures..."
-msgstr ""
+msgstr "Учитавам текстуре..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr ""
+msgstr "Обнављам шејдере..."
 
 #: src/client.cpp
 msgid "Initializing nodes..."
-msgstr ""
+msgstr "Припремам блокове..."
 
 #: src/client.cpp
 msgid "Initializing nodes"
-msgstr ""
+msgstr "Припремам блокове"
 
 #: src/client.cpp
 msgid "Done!"
-msgstr ""
+msgstr "Готово!"
 
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
-msgstr ""
+msgstr "Главни мени"
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
-msgstr ""
+msgstr "Име играча је предуачко."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
-msgstr ""
+msgstr "Грешка у конекцији (истекло време?)"
 
 #: src/client/clientlauncher.cpp
 msgid "No world selected and no address provided. Nothing to do."
 msgstr ""
+"Ниједан свет није изабран и ниједна адреса није дата. Немогу ништа да урадим."
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr ""
+msgstr "Дата локација света не постоји: "
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
-msgstr ""
+msgstr "Немогу пронаћи или учитати игру \""
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
-msgstr ""
+msgstr "Неважећи gamespec."
 
 #: src/fontengine.cpp
 msgid "needs_fallback_font"
@@ -725,11 +740,11 @@ msgstr ""
 
 #: src/game.cpp
 msgid "You died."
-msgstr ""
+msgstr "Умро/ла си."
 
 #: src/game.cpp
 msgid "Respawn"
-msgstr ""
+msgstr "Врати се у живот"
 
 #: src/game.cpp
 msgid ""
@@ -761,62 +776,73 @@ msgid ""
 "- Mouse wheel: select item\n"
 "- T: chat\n"
 msgstr ""
+"Уобичајене контроле:\n"
+"- WASD: кретање\n"
+"- Space: скакање/пењање\n"
+"- Shift: шуњање/силажење\n"
+"- Q: баци ставку\n"
+"- I: инвентар\n"
+"- Миш: окретање/гледање\n"
+"- Леви клик миша: копање/ударање\n"
+"- Десни клик миша: постављање/коришћење\n"
+"- Точкић миша: одабирање ставке\n"
+"- T: причање\n"
 
 #: src/game.cpp
 msgid "Continue"
-msgstr ""
+msgstr "Настави"
 
 #: src/game.cpp
 msgid "Change Password"
-msgstr ""
+msgstr "Промени шифру"
 
 #: src/game.cpp
 msgid "Sound Volume"
-msgstr ""
+msgstr "Јачина звука"
 
 #: src/game.cpp
 msgid "Change Keys"
-msgstr ""
+msgstr "Подеси контроле"
 
 #: src/game.cpp
 msgid "Exit to Menu"
-msgstr ""
+msgstr "Изађи у мени"
 
 #: src/game.cpp
 msgid "Exit to OS"
-msgstr ""
+msgstr "Изађи из програма"
 
 #: src/game.cpp
 msgid "Shutting down..."
-msgstr ""
+msgstr "Искључивање..."
 
 #: src/game.cpp
 msgid "Creating server..."
-msgstr ""
+msgstr "Правим сервер..."
 
 #: src/game.cpp
 msgid "Creating client..."
-msgstr ""
+msgstr "Правим клијента..."
 
 #: src/game.cpp
 msgid "Resolving address..."
-msgstr ""
+msgstr "Разлучујем адресу..."
 
 #: src/game.cpp
 msgid "Connecting to server..."
-msgstr ""
+msgstr "Повезујем се на сервер..."
 
 #: src/game.cpp
 msgid "Item definitions..."
-msgstr ""
+msgstr "Дефиниције предмета..."
 
 #: src/game.cpp
 msgid "Node definitions..."
-msgstr ""
+msgstr "Дефиниције блокова..."
 
 #: src/game.cpp
 msgid "Media..."
-msgstr ""
+msgstr "Медија..."
 
 #: src/game.cpp
 msgid "KiB/s"
@@ -828,185 +854,189 @@ msgstr ""
 
 #: src/game.cpp src/guiFormSpecMenu.cpp
 msgid "ok"
-msgstr ""
+msgstr "уреду"
 
 #: src/game.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
+"\n"
+"Проверите debug.txt за више детаља."
 
 #: src/guiFormSpecMenu.cpp
 msgid "Proceed"
-msgstr ""
+msgstr "Настави"
 
 #: src/guiFormSpecMenu.cpp
 msgid "Enter "
-msgstr ""
+msgstr "Уреду "
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 msgstr ""
+"Подешавање контрола.(Ако овај мени нешто поквари, обришите ствари из "
+"minetest.conf)"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "\"Use\" = climb down"
-msgstr ""
+msgstr "\"Користи\" = Силажење"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr ""
+msgstr "Дупли скок за летење"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Key already in use"
-msgstr ""
+msgstr "Дугме се већ користи"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
-msgstr ""
+msgstr "притисните дугме"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Forward"
-msgstr ""
+msgstr "Напред"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Backward"
-msgstr ""
+msgstr "Назад"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Left"
-msgstr ""
+msgstr "Лево"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Right"
-msgstr ""
+msgstr "Десно"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Use"
-msgstr ""
+msgstr "Коришћење"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Jump"
-msgstr ""
+msgstr "Скакање"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Sneak"
-msgstr ""
+msgstr "Шуњање"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Drop"
-msgstr ""
+msgstr "Бацање"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Inventory"
-msgstr ""
+msgstr "Инвентар"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Chat"
-msgstr ""
+msgstr "Чет"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Command"
-msgstr ""
+msgstr "Команда"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Console"
-msgstr ""
+msgstr "Конзола"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fly"
-msgstr ""
+msgstr "Укључи/Искључи летење"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
-msgstr ""
+msgstr "Укључи/Искључи трчање"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle Cinematic"
-msgstr ""
+msgstr "Укључи/Искључи Cinematic мод"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
-msgstr ""
+msgstr "Укључи/искључи пролажење кроз препреке"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Range select"
-msgstr ""
+msgstr "Одабир домета"
 
 #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Print stacks"
-msgstr ""
+msgstr "Прикажи stack-ове"
 
 #: src/guiPasswordChange.cpp
 msgid "Old Password"
-msgstr ""
+msgstr "Стара шифра"
 
 #: src/guiPasswordChange.cpp
 msgid "New Password"
-msgstr ""
+msgstr "Нова шифра"
 
 #: src/guiPasswordChange.cpp
 msgid "Confirm Password"
-msgstr ""
+msgstr "Потврди шифру"
 
 #: src/guiPasswordChange.cpp
 msgid "Change"
-msgstr ""
+msgstr "Промени"
 
 #: src/guiPasswordChange.cpp
 msgid "Passwords do not match!"
-msgstr ""
+msgstr "Шифре се не поклапају!"
 
 #: src/guiVolumeChange.cpp
 msgid "Sound Volume: "
-msgstr ""
+msgstr "Јачина звука: "
 
 #: src/guiVolumeChange.cpp
 msgid "Exit"
-msgstr ""
+msgstr "Изађи"
 
 #: src/keycode.cpp
 msgid "Left Button"
-msgstr ""
+msgstr "Лево дугме"
 
 #: src/keycode.cpp
 msgid "Middle Button"
-msgstr ""
+msgstr "Средње дугме"
 
 #: src/keycode.cpp
 msgid "Right Button"
-msgstr ""
+msgstr "Десно дугме"
 
 #: src/keycode.cpp
 msgid "X Button 1"
-msgstr ""
+msgstr "X Дугме 1"
 
 #: src/keycode.cpp
 msgid "Back"
-msgstr ""
+msgstr "Назад"
 
 #: src/keycode.cpp
 msgid "Clear"
-msgstr ""
+msgstr "Очисти"
 
 #: src/keycode.cpp
 msgid "Return"
-msgstr ""
+msgstr "Повратак"
 
 #: src/keycode.cpp
 msgid "Tab"
-msgstr ""
+msgstr "Таб"
 
 #: src/keycode.cpp
 msgid "X Button 2"
-msgstr ""
+msgstr "X Дугме 2"
 
 #: src/keycode.cpp
 msgid "Capital"
-msgstr ""
+msgstr "Главно"
 
 #: src/keycode.cpp
 msgid "Control"
-msgstr ""
+msgstr "Контрола"
 
 #: src/keycode.cpp
 msgid "Kana"
@@ -1014,27 +1044,27 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Menu"
-msgstr ""
+msgstr "Мени"
 
 #: src/keycode.cpp
 msgid "Pause"
-msgstr ""
+msgstr "Заустави"
 
 #: src/keycode.cpp
 msgid "Shift"
-msgstr ""
+msgstr "Шифт"
 
 #: src/keycode.cpp
 msgid "Convert"
-msgstr ""
+msgstr "Конвертуј"
 
 #: src/keycode.cpp
 msgid "Escape"
-msgstr ""
+msgstr "Побегни"
 
 #: src/keycode.cpp
 msgid "Final"
-msgstr ""
+msgstr "Крајњи"
 
 #: src/keycode.cpp
 msgid "Junja"
@@ -1046,7 +1076,7 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Nonconvert"
-msgstr ""
+msgstr "Не конвертуј"
 
 #: src/keycode.cpp
 msgid "End"
@@ -1058,11 +1088,11 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Mode Change"
-msgstr ""
+msgstr "Промена мода"
 
 #: src/keycode.cpp
 msgid "Next"
-msgstr ""
+msgstr "Следеће"
 
 #: src/keycode.cpp
 msgid "Prior"
@@ -1074,31 +1104,31 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Down"
-msgstr ""
+msgstr "Доле"
 
 #: src/keycode.cpp
 msgid "Execute"
-msgstr ""
+msgstr "Изврши"
 
 #: src/keycode.cpp
 msgid "Print"
-msgstr ""
+msgstr "Прикажи"
 
 #: src/keycode.cpp
 msgid "Select"
-msgstr ""
+msgstr "Одабери"
 
 #: src/keycode.cpp
 msgid "Up"
-msgstr ""
+msgstr "Горе"
 
 #: src/keycode.cpp
 msgid "Help"
-msgstr ""
+msgstr "Помоћ"
 
 #: src/keycode.cpp
 msgid "Insert"
-msgstr ""
+msgstr "Убаци"
 
 #: src/keycode.cpp
 msgid "Snapshot"
@@ -1106,23 +1136,23 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Left Windows"
-msgstr ""
+msgstr "Леви Windows"
 
 #: src/keycode.cpp
 msgid "Apps"
-msgstr ""
+msgstr "Апликације"
 
 #: src/keycode.cpp
 msgid "Numpad 0"
-msgstr ""
+msgstr "Нумеричка тастатура 0"
 
 #: src/keycode.cpp
 msgid "Numpad 1"
-msgstr ""
+msgstr "Нумеричка тастатура 1"
 
 #: src/keycode.cpp
 msgid "Right Windows"
-msgstr ""
+msgstr "Десни Windows"
 
 #: src/keycode.cpp
 msgid "Sleep"
@@ -1130,51 +1160,51 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Numpad 2"
-msgstr ""
+msgstr "Нумеричка тастатура 2"
 
 #: src/keycode.cpp
 msgid "Numpad 3"
-msgstr ""
+msgstr "Нумеричка тастатура 3"
 
 #: src/keycode.cpp
 msgid "Numpad 4"
-msgstr ""
+msgstr "Нумеричка тастатура 4"
 
 #: src/keycode.cpp
 msgid "Numpad 5"
-msgstr ""
+msgstr "Нумеричка тастатура 5"
 
 #: src/keycode.cpp
 msgid "Numpad 6"
-msgstr ""
+msgstr "Нумеричка тастатура 6"
 
 #: src/keycode.cpp
 msgid "Numpad 7"
-msgstr ""
+msgstr "Нумеричка тастатура 7"
 
 #: src/keycode.cpp
 msgid "Numpad *"
-msgstr ""
+msgstr "Нумеричка тастатура *"
 
 #: src/keycode.cpp
 msgid "Numpad +"
-msgstr ""
+msgstr "Нумеричка тастатура +"
 
 #: src/keycode.cpp
 msgid "Numpad -"
-msgstr ""
+msgstr "Нумеричка тастатура -"
 
 #: src/keycode.cpp
 msgid "Numpad /"
-msgstr ""
+msgstr "Нумеричка тастатура /"
 
 #: src/keycode.cpp
 msgid "Numpad 8"
-msgstr ""
+msgstr "Нумеричка тастатура 8"
 
 #: src/keycode.cpp
 msgid "Numpad 9"
-msgstr ""
+msgstr "Нумеричка тастатура 9"
 
 #: src/keycode.cpp
 msgid "Num Lock"
@@ -1186,43 +1216,43 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Left Shift"
-msgstr ""
+msgstr "Леви Shift"
 
 #: src/keycode.cpp
 msgid "Right Shift"
-msgstr ""
+msgstr "Десни Shift"
 
 #: src/keycode.cpp
 msgid "Left Control"
-msgstr ""
+msgstr "Леви Control"
 
 #: src/keycode.cpp
 msgid "Left Menu"
-msgstr ""
+msgstr "Леви мени"
 
 #: src/keycode.cpp
 msgid "Right Control"
-msgstr ""
+msgstr "Десни Control"
 
 #: src/keycode.cpp
 msgid "Right Menu"
-msgstr ""
+msgstr "Десни мени"
 
 #: src/keycode.cpp
 msgid "Comma"
-msgstr ""
+msgstr "Зарез"
 
 #: src/keycode.cpp
 msgid "Minus"
-msgstr ""
+msgstr "Минус"
 
 #: src/keycode.cpp
 msgid "Period"
-msgstr ""
+msgstr "Тачка"
 
 #: src/keycode.cpp
 msgid "Plus"
-msgstr ""
+msgstr "Плус"
 
 #: src/keycode.cpp
 msgid "Attn"
@@ -1250,15 +1280,15 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Zoom"
-msgstr ""
+msgstr "Зумирај"
 
 #: src/settings_translation_file.cpp
 msgid "Controls"
-msgstr ""
+msgstr "Контроле"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
-msgstr ""
+msgstr "Градња унутар играча"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1266,20 +1296,24 @@ msgid ""
 "you stand.\n"
 "This is helpful when working with nodeboxes in small areas."
 msgstr ""
+"Ако је укључено, можете стављати блокове унутар позиције где стојите.\n"
+"Ово је корисно при раду са nodebox-евима у малим местима."
 
 #: src/settings_translation_file.cpp
 msgid "Flying"
-msgstr ""
+msgstr "Летење"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
 msgstr ""
+"Играч је у могућности д лети без утицаја гравитације.\n"
+"Ово захтева \"fly\" привилегију на серверима."
 
 #: src/settings_translation_file.cpp
 msgid "Fast movement"
-msgstr ""
+msgstr "Брзо кретање"
 
 #: src/settings_translation_file.cpp
 msgid ""

From e07247f8da4763187f2eabbf7e189f2fce8fcaa8 Mon Sep 17 00:00:00 2001
From: arsdragonfly <arsdragonfly@gmail.com>
Date: Sat, 11 Jun 2016 10:56:31 +0000
Subject: [PATCH 098/418] Translated using Weblate (Chinese (China))

Currently translated at 75.1% (667 of 887 strings)
---
 po/zh_CN/minetest.po | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po
index 41418f89f..be0bf9c0b 100644
--- a/po/zh_CN/minetest.po
+++ b/po/zh_CN/minetest.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-06-03 12:31+0000\n"
-"Last-Translator: susan <2033905535@qq.com>\n"
+"PO-Revision-Date: 2016-06-11 10:56+0000\n"
+"Last-Translator: arsdragonfly <arsdragonfly@gmail.com>\n"
 "Language-Team: Chinese (China) "
 "<https://hosted.weblate.org/projects/minetest/minetest/zh_CN/>\n"
 "Language: zh_CN\n"
@@ -400,9 +400,8 @@ msgid "Uninstall selected modpack"
 msgstr "删除选中的MOD包"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "地址/端口:"
+msgstr "地址/端口"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -423,17 +422,16 @@ msgstr "启用伤害"
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 #, fuzzy
 msgid "Del. Favorite"
-msgstr "最爱的服务器："
+msgstr "删除收藏的服务器"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 #, fuzzy
 msgid "Favorite"
-msgstr "最爱的服务器："
+msgstr "收藏的服务器"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "用户名/密码:"
+msgstr "用户名/密码"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -569,16 +567,15 @@ msgstr "节点高亮"
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Node Outlining"
-msgstr "节点高亮"
+msgstr "方块高亮"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
 msgstr "无"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Normal Mapping"
-msgstr "一般地图采样"
+msgstr "法线贴图"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -593,9 +590,8 @@ msgid "Parallax Occlusion"
 msgstr "视差贴图"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "启用粒子"
+msgstr "粒子效果"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -1367,12 +1363,12 @@ msgstr "空中加速"
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Active Block Management interval"
-msgstr "活动块范围"
+msgstr "活动区块管理间隔"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Active Block Modifier interval"
-msgstr "活动块范围"
+msgstr "活动区块修改间隔"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1468,9 +1464,8 @@ msgid "Basic"
 msgstr "基础"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic Privileges"
-msgstr "默认权限"
+msgstr "基本权限"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
@@ -1702,7 +1697,7 @@ msgstr "控制山丘的坡度/高度。"
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
+msgstr "控制隧道宽度，较小的值创建更宽的隧道。"
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -1717,10 +1712,13 @@ msgstr ""
 "这可以使挖掘更加困难。0 表示禁用。 (0-10)"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Creates unpredictable water features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
+"在洞穴中创建随机的水域。\n"
+"会使挖矿变得困难。值为0则禁用。（0-10）"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
@@ -1808,7 +1806,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
+msgstr "工具提示显示延迟，按毫秒计算。"
 
 #: src/settings_translation_file.cpp
 msgid "Deprecated Lua API handling"
@@ -1816,11 +1814,11 @@ msgstr "已弃用 Lua API 处理"
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find large caves."
-msgstr ""
+msgstr "大型洞穴的最浅深度。"
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find massive caves."
-msgstr ""
+msgstr "巨型洞穴的最浅深度。"
 
 #: src/settings_translation_file.cpp
 msgid "Descending speed"

From 18c2aed1c9c86a501e5bddabf5afb0c8f24cdca1 Mon Sep 17 00:00:00 2001
From: Guillaume Robert <guillaume63200@hotmail.fr>
Date: Mon, 13 Jun 2016 18:39:36 +0000
Subject: [PATCH 099/418] Translated using Weblate (French)

Currently translated at 91.2% (809 of 887 strings)
---
 po/fr/minetest.po | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index 523c73bbf..316f269b3 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-05-07 11:19+0000\n"
-"Last-Translator: Yvan YR <yvan_yr@yahoo.fr>\n"
+"PO-Revision-Date: 2016-06-13 18:39+0000\n"
+"Last-Translator: Guillaume Robert <guillaume63200@hotmail.fr>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
 "Language: fr\n"
@@ -40,6 +40,7 @@ msgid "Reconnect"
 msgstr "Se reconnecter"
 
 #: builtin/fstk/ui.lua
+#, fuzzy
 msgid "The server has requested a reconnect:"
 msgstr "Le serveur souhaite rétablir une connexion :"
 
@@ -53,7 +54,7 @@ msgstr "La version du protocole ne correspond pas. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "Le serveur impose une version du protocole $1. "
+msgstr "Le serveur impose la version $1 du protocole. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
@@ -110,8 +111,9 @@ msgid "Hide Game"
 msgstr "Cacher le jeu"
 
 #: builtin/mainmenu/dlg_config_world.lua
+#, fuzzy
 msgid "Hide mp content"
-msgstr "Cacher le pack de mods"
+msgstr "Cacher le contenu du mod"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -412,7 +414,6 @@ msgid "Uninstall selected modpack"
 msgstr "Désinstaller le pack de mods"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
 msgstr "Adresse / Port :"
 
@@ -433,17 +434,14 @@ msgid "Damage enabled"
 msgstr "Dégâts activés"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Del. Favorite"
 msgstr "Supprimer favoris :"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Favorite"
 msgstr "Favoris :"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
 msgstr "Nom / Mot de passe :"
 
@@ -1705,6 +1703,8 @@ msgstr "Contrôle l'élévation/hauteur des collines."
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 msgstr ""
+"Contrôle la largeur des tunnels, une valeur plus petite crée des tunnels "
+"plus larges."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -2847,12 +2847,13 @@ msgid ""
 msgstr "Temps d'intervalle entre la mise à jour des objets sur le réseau."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Length of time between ABM execution cycles"
-msgstr ""
+msgstr "Durée entre les cycles d’exécution ABM"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between NodeTimer execution cycles"
-msgstr ""
+msgstr "Durée entre les cycles d’exécution NodeTimer"
 
 #: src/settings_translation_file.cpp
 msgid ""

From 8667566f78f40f1ab1bdd780a55220e5204e0c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Meng=C3=ADbar=20Fern=C3=A1ndez?=
 <rroobbeerr@gmail.com>
Date: Tue, 14 Jun 2016 21:57:46 +0000
Subject: [PATCH 100/418] Translated using Weblate (Spanish)

Currently translated at 59.0% (524 of 887 strings)
---
 po/es/minetest.po | 67 +++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/po/es/minetest.po b/po/es/minetest.po
index 03df1d597..a3ce47c12 100644
--- a/po/es/minetest.po
+++ b/po/es/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-05-10 18:21+0000\n"
-"Last-Translator: Diego Martínez <lkaezadl3@gmail.com>\n"
+"PO-Revision-Date: 2016-06-14 21:57+0000\n"
+"Last-Translator: Roberto Mengíbar Fernández <rroobbeerr@gmail.com>\n"
 "Language-Team: Spanish "
 "<https://hosted.weblate.org/projects/minetest/minetest/es/>\n"
 "Language: es\n"
@@ -49,11 +49,11 @@ msgstr "Cargando..."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr "Desajuste con la versión del protocolo. "
+msgstr "La versión del protocolo no coincide. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "El servidor hace respetar la versión $1 del protocolo "
+msgstr "El servidor utiliza el protocolo versión $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
@@ -103,7 +103,7 @@ msgid ""
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
 "Error al activar el mod \"$1\" por contener caracteres no permitidos. Solo "
-"los caracteres [a-z0-9_] estan permitidos."
+"los caracteres [a-z0-9_] están permitidos."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -257,7 +257,9 @@ msgstr "Mods"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
-msgstr "Opcionalmente, el lacunaridad puede ser anexado con una coma líder."
+msgstr ""
+"Opcionalmente, el parámetro \"lacunarity\" puede ser anexado separándolo "
+"mediante una coma."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a comma seperated list of flags."
@@ -1394,7 +1396,7 @@ msgstr "Rango de bloque activo"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
-msgstr "Alcance de objetos activos a enviar"
+msgstr "Rango de envío en objetos activos"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1437,7 +1439,7 @@ msgstr "Siempre volar y rápido"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
-msgstr "Gamma de oclusión de ambiente"
+msgstr "Oclusión ambiental gamma"
 
 #: src/settings_translation_file.cpp
 msgid "Amplifies the valleys"
@@ -1463,7 +1465,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
-msgstr "Escala aproximada (X,Y,Z) en nodos, de los fractales"
+msgstr "Escala aproximada (X,Y,Z) del fractal en nodos."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
@@ -2030,7 +2032,7 @@ msgstr "FPS (cuadros/s) en el menú de pausa"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
-msgstr ""
+msgstr "FSAA"
 
 #: src/settings_translation_file.cpp
 msgid "Fall bobbing"
@@ -2221,11 +2223,11 @@ msgstr "Filtro de escala de IGU \"txr2img\""
 
 #: src/settings_translation_file.cpp
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #: src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #: src/settings_translation_file.cpp
 msgid "Generate normalmaps"
@@ -2245,16 +2247,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
-msgstr ""
+msgstr "Gráficos"
 
 #: src/settings_translation_file.cpp
 msgid "Gravity"
-msgstr ""
+msgstr "Gravedad"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HTTP Mods"
-msgstr "Mods"
+msgstr "HTTP Mods"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
@@ -2267,26 +2268,34 @@ msgid ""
 "-    log: mimic and log backtrace of deprecated call (default for debug).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
+"Manejo de las llamadas de la API LUA obsoletas:\n"
+"- legacy: (intenta)imita el antiguo comportamiento (por defecto para "
+"lanzamientos).\n"
+"- log: imita y guarda el seguimiento de las llamadas obsoletas (por defecto "
+"para depuración).\n"
+"- error: Cancela en el uso de llamadas obsoletas (sugerido para los "
+"desarrolladores de Mods)."
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
-msgstr ""
+msgstr "Componente de altura del tamaño inicial de la ventana."
 
 #: src/settings_translation_file.cpp
 msgid "Height on which clouds are appearing."
-msgstr ""
+msgstr "Altura sobre la cual están apareciendo las nubes."
 
 #: src/settings_translation_file.cpp
 msgid "High-precision FPU"
-msgstr ""
+msgstr "Alta-precisión FPU"
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
 msgstr ""
+"Página de inicio del servidor, que se mostrará en la lista de servidores."
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers"
-msgstr ""
+msgstr "Profundidad para los ríos"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2298,33 +2307,36 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
+msgstr "Cantidad de bloques que flotan simultáneamente en todo el servidor."
 
 #: src/settings_translation_file.cpp
 msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
+msgstr "Cantidad de bloques que flotan simultáneamente por cliente."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
 "Higher value is smoother, but will use more RAM."
 msgstr ""
+"Cuanto espera el servidor antes de descargar los bloques de mapa no "
+"utilizados.\n"
+"Con valores mayores es mas fluido, pero se utiliza mas RAM."
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers"
-msgstr ""
+msgstr "Ancho de los ríos"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 server"
-msgstr ""
+msgstr "servidor IPv6"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 support."
-msgstr ""
+msgstr "soporte IPv6."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4116,9 +4128,8 @@ msgid "Waving water"
 msgstr "Oleaje en el agua"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving water height"
-msgstr "Oleaje en el agua"
+msgstr "Altura de las ondulaciones del agua"
 
 #: src/settings_translation_file.cpp
 #, fuzzy

From bda12ddd7dd9f9d36d8d567e74c708869e0fe102 Mon Sep 17 00:00:00 2001
From: Muhammad Rifqi Priyo Susanto <muhammadrifqipriyosusanto@gmail.com>
Date: Thu, 23 Jun 2016 17:34:59 +0000
Subject: [PATCH 101/418] Translated using Weblate (Indonesian)

Currently translated at 55.8% (495 of 887 strings)
---
 po/id/minetest.po | 236 +++++++++++++++++++++++-----------------------
 1 file changed, 116 insertions(+), 120 deletions(-)

diff --git a/po/id/minetest.po b/po/id/minetest.po
index 3505fca58..24a2deb45 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -7,17 +7,17 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-04-12 19:07+0000\n"
+"PO-Revision-Date: 2016-06-23 16:06+0000\n"
 "Last-Translator: Muhammad Rifqi Priyo Susanto "
 "<muhammadrifqipriyosusanto@gmail.com>\n"
-"Language-Team: Indonesian <https://hosted.weblate.org/projects/minetest/"
-"minetest/id/>\n"
+"Language-Team: Indonesian "
+"<https://hosted.weblate.org/projects/minetest/minetest/id/>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.6-dev\n"
+"X-Generator: Weblate 2.7-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -261,7 +261,7 @@ msgstr "Mod"
 #, fuzzy
 msgid "Optionally the lacunarity can be appended with a leading comma."
 msgstr ""
-"lacunarity (celah, opsional) dapat ditambahkan dengan awalan tanda koma."
+"Lacunarity (celah, opsional) dapat ditambahkan dengan awalan tanda koma."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a comma seperated list of flags."
@@ -414,9 +414,8 @@ msgid "Uninstall selected modpack"
 msgstr "Copot pemasangan paket mod terpilih"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "Alamat / Port :"
+msgstr "Alamat / Port"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -436,16 +435,15 @@ msgstr "Kerusakan diaktifkan"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr ""
+msgstr "Hapus Favorit"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
-msgstr ""
+msgstr "Favorit"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "Nama / Kata sandi :"
+msgstr "Nama / Kata sandi"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -526,7 +524,6 @@ msgid "Advanced Settings"
 msgstr "Pengaturan Lanjutan"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
@@ -535,14 +532,12 @@ msgid "Are you sure to reset your singleplayer world?"
 msgstr "Apakah Anda yakin ingin mengatur ulang dunia Anda?"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bilinear Filter"
 msgstr "Bilinear Filter"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
-msgstr "Bumpmapping"
+msgstr "Bump Mapping"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
@@ -557,12 +552,10 @@ msgid "Fancy Leaves"
 msgstr "Daun Megah"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Mipmap"
 msgstr "Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Aniso. Filter"
 
@@ -586,7 +579,7 @@ msgstr "Node Highlighting"
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Node Outlining"
-msgstr "Node Highlighting"
+msgstr "Node Outlining"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
@@ -595,7 +588,7 @@ msgstr "Tidak ada"
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Normal Mapping"
-msgstr "Tone Mapping"
+msgstr "Normal Mapping"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -611,9 +604,8 @@ msgid "Parallax Occlusion"
 msgstr "Parallax Occlusion"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "Aktifkan Partikel"
+msgstr "Partikel"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -648,7 +640,6 @@ msgid "Touchthreshold (px)"
 msgstr "Batas sentuhan (px)"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Trilinear Filter"
 msgstr "Trilinear Filter"
 
@@ -805,7 +796,7 @@ msgstr ""
 "Kontrol Bawaan:\n"
 "- WASD: bergerak\n"
 "- Space: lompat/panjat\n"
-"- Shift: merayap/turun\n"
+"- Shift: menyelinap/turun\n"
 "- Q: jatuhkan barang\n"
 "- I: inventaris\n"
 "- Mouse: belok/melihat\n"
@@ -924,9 +915,7 @@ msgstr "Konsol"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr ""
-"Tekan ganda \"lompat\" untuk\n"
-"beralih terbang"
+msgstr "Tekan ganda \"lompat\" untuk terbang"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Drop"
@@ -976,7 +965,7 @@ msgstr "Menyelinap"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle Cinematic"
-msgstr "Toggle Sinematik"
+msgstr "Mode sinema"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
@@ -988,7 +977,7 @@ msgstr "Terbang"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
-msgstr "Beralih tembus blok"
+msgstr "Tembus blok"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Use"
@@ -1396,7 +1385,7 @@ msgstr "Batas blok aktif"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr "Batas blok aktif"
+msgstr "Jangkauan blok aktif"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
@@ -1447,9 +1436,8 @@ msgid "Ambient occlusion gamma"
 msgstr "Ambient occlusion gamma"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Amplifies the valleys"
-msgstr "Menguatkan lembah"
+msgstr "Memperbesar lembah"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1467,8 +1455,8 @@ msgid ""
 "minetest.net."
 msgstr ""
 "Mengumumkan kepada daftar server ini.\n"
-"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = v6."
-"servers.minetest.net."
+"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = "
+"v6.servers.minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
@@ -1483,26 +1471,22 @@ msgid "Automaticaly report to the serverlist."
 msgstr "Secara otomatis melaporkan ke daftar server."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Backward key"
-msgstr "Mundur"
+msgstr "Tombol mundur"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base terrain height"
-msgstr "Air Berombak"
+msgstr "Tinggi dasar medan"
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
 msgstr "Dasar"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic Privileges"
-msgstr "Izin bawaan"
+msgstr "Izin Dasar"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bilinear filtering"
 msgstr "Bilinear filtering"
 
@@ -1519,7 +1503,6 @@ msgid "Build inside player"
 msgstr "Bangun di dalam pemain"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bumpmapping"
 msgstr "Bumpmapping"
 
@@ -1545,7 +1528,7 @@ msgstr "Noise #2 gua"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "Lebar gua"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
@@ -1735,7 +1718,7 @@ msgstr "Mengatur kecuraman/ketinggian dari bukit."
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
+msgstr "Mengatur lebar terowongan, nilai lebih kecil terowongan semakin lebar."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -1775,7 +1758,7 @@ msgstr "Warna crosshair (merah,hijau,biru atau R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Crouch speed"
-msgstr ""
+msgstr "Kecepatan jalan merunduk"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -1787,7 +1770,7 @@ msgstr "Kerusakan"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
-msgstr "Tombol beralih info debug"
+msgstr "Tombol info debug"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log level"
@@ -1907,7 +1890,7 @@ msgstr "Tekan ganda \"lompat\" untuk terbang"
 
 #: src/settings_translation_file.cpp
 msgid "Double-tapping the jump key toggles fly mode."
-msgstr "Menekan ganda tombol \"lompat\" untuk beralih terbang."
+msgstr "Menekan ganda tombol lompat untuk beralih terbang."
 
 #: src/settings_translation_file.cpp
 msgid "Drop item key"
@@ -2057,7 +2040,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fast key"
-msgstr ""
+msgstr "Tombol gerak cepat"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode acceleration"
@@ -2163,7 +2146,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Forward key"
-msgstr "Maju"
+msgstr "Tombol maju"
 
 #: src/settings_translation_file.cpp
 msgid "Freetype fonts"
@@ -2218,9 +2201,8 @@ msgid "General"
 msgstr "Umum"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Generate normalmaps"
-msgstr "Gunakan Normalmaps"
+msgstr "Hasilkan normalmaps"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2339,8 +2321,8 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
-"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node "
-"padat.\n"
+"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node padat."
+"\n"
 "Hal ini memerlukan hak istimewa \"noclip\" pada server."
 
 #: src/settings_translation_file.cpp
@@ -2348,6 +2330,8 @@ msgid ""
 "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
 "and descending."
 msgstr ""
+"Jika diaktifkan, tombol \"gunakan\" akan digunakan untuk memanjat turun "
+"danbergerak turun dari pada tombol \"menyelinap\"."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2409,9 +2393,8 @@ msgid "Inventory items animations"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Inventory key"
-msgstr "Inventaris"
+msgstr "Tombol inventaris"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
@@ -2461,24 +2444,22 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Jump key"
-msgstr "Lompat"
+msgstr "Tombol lompat"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for decreasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tombol untuk bergerak cepat dalam mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tombol untuk mengurangi jarak pandang.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2487,19 +2468,18 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk menjatuhkan barang yang sedang dipilih.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for increasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tombol untuk bergerak cepat dalam mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tombol untuk menambah jarak pandang.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2508,8 +2488,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk lompat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2518,8 +2498,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak cepat dalam mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2528,8 +2508,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak mundur.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2538,8 +2518,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak maju.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2548,8 +2528,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak ke kiri.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2558,8 +2538,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak ke kanan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2567,6 +2547,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk membuka konsol obrolan.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2574,6 +2557,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk membuka jendela obrolan untuk mengetik perintah.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2581,6 +2567,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk membuka jendela obrolan.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2589,8 +2578,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka inventaris.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2607,6 +2596,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk menyelinap.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2615,8 +2607,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengganti kamera antara orang pertama dan ketiga.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2625,8 +2617,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengambil tangkapan layar.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2635,8 +2627,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode sinema.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2645,8 +2637,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mennganti tampilan peta mini.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2655,8 +2647,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2665,8 +2657,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih terbang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2675,8 +2667,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode tembus blok.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2691,6 +2683,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk beralih tampilan info debug.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2698,6 +2693,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk beralih tampilan HUD.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2705,6 +2703,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk beralih tampilan obrolan.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2712,6 +2713,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk beralih tampilan kabut.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2726,10 +2730,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk beralih menjadi jarak pandang tanpa batas.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
-msgstr ""
+msgstr "Tombol untuk memanjat/turun"
 
 #: src/settings_translation_file.cpp
 msgid "Language"
@@ -2756,9 +2763,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Left key"
-msgstr "Left Menu"
+msgstr "Tombol kiri"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2938,9 +2944,8 @@ msgid "Mapgen biome humidity noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen debug"
-msgstr "Generator peta"
+msgstr "Debug generator peta"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3006,9 +3011,8 @@ msgid "Mapgen flat terrain noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal"
-msgstr "Generator peta"
+msgstr "Generator peta fraktal"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3540,7 +3544,6 @@ msgid "Parallax occlusion"
 msgstr "Parallax occlusion"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Parallax occlusion Scale"
 msgstr "Skala parallax occlusion"
 
@@ -3639,9 +3642,8 @@ msgid "Random input"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Range select key"
-msgstr "Jarak pandang"
+msgstr "Tombol memilih jarak pandang"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
@@ -3656,9 +3658,8 @@ msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Right key"
-msgstr "Right Menu"
+msgstr "Tombol kanan"
 
 #: src/settings_translation_file.cpp
 msgid "Rightclick repetition interval"
@@ -3722,14 +3723,12 @@ msgid "Screenshot folder"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "Tangkapan layar"
+msgstr "Format tangkapan layar"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "Tangkapan layar"
+msgstr "Kualitas tangkapan layar"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3868,7 +3867,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Sneak key"
-msgstr "Menyelinap"
+msgstr "Tombol menyelinap"
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
@@ -4059,9 +4058,8 @@ msgid "Use bilinear filtering when scaling textures."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use key"
-msgstr "tekan tombol"
+msgstr "Tombol gunakan"
 
 #: src/settings_translation_file.cpp
 msgid "Use mip mapping to scale textures. May slightly increase performance."
@@ -4123,15 +4121,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
-msgstr ""
+msgstr "Tombol mengurangi jarak pandang"
 
 #: src/settings_translation_file.cpp
 msgid "View range increase key"
-msgstr ""
+msgstr "Tombol menambah jarak pandang"
 
 #: src/settings_translation_file.cpp
 msgid "Viewing range"
-msgstr ""
+msgstr "Jarak pandang"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
@@ -4150,9 +4148,8 @@ msgid "Walking speed"
 msgstr "Kecepatan berjalan"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Water Features"
-msgstr "Tekstur barang..."
+msgstr "Corak air"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
@@ -4163,9 +4160,8 @@ msgid "Water surface level of the world."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving Nodes"
-msgstr "Daun Melambai"
+msgstr "Node Melambai"
 
 #: src/settings_translation_file.cpp
 msgid "Waving leaves"

From 23933dcb24637b67c6adb555b707640172467d61 Mon Sep 17 00:00:00 2001
From: ikmaak <info@ikmaak.nl>
Date: Fri, 8 Jul 2016 10:32:09 +0000
Subject: [PATCH 102/418] Translated using Weblate (Dutch)

Currently translated at 89.6% (795 of 887 strings)
---
 po/nl/minetest.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/nl/minetest.po b/po/nl/minetest.po
index 533917153..1ec92bc48 100644
--- a/po/nl/minetest.po
+++ b/po/nl/minetest.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-05-07 00:58+0000\n"
-"Last-Translator: Auke Kok <sofar+github@foo-projects.org>\n"
+"PO-Revision-Date: 2016-07-08 10:32+0000\n"
+"Last-Translator: ikmaak <info@ikmaak.nl>\n"
 "Language-Team: Dutch "
 "<https://hosted.weblate.org/projects/minetest/minetest/nl/>\n"
 "Language: nl\n"

From e323ba4f270125528796eb5a6d16c891041d8b82 Mon Sep 17 00:00:00 2001
From: Onyx Steinheim <thevoxelmanonyx@gmail.com>
Date: Tue, 12 Jul 2016 16:56:29 +0000
Subject: [PATCH 103/418] Translated using Weblate (French)

Currently translated at 100.0% (887 of 887 strings)
---
 po/fr/minetest.po | 283 ++++++++++++++++++++++++----------------------
 1 file changed, 145 insertions(+), 138 deletions(-)

diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index 316f269b3..a699c7394 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-05 16:13+0200\n"
-"PO-Revision-Date: 2016-06-13 18:39+0000\n"
-"Last-Translator: Guillaume Robert <guillaume63200@hotmail.fr>\n"
+"PO-Revision-Date: 2016-07-12 16:57+0000\n"
+"Last-Translator: Onyx Steinheim <thevoxelmanonyx@gmail.com>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
 "Language: fr\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -40,7 +40,6 @@ msgid "Reconnect"
 msgstr "Se reconnecter"
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "The server has requested a reconnect:"
 msgstr "Le serveur souhaite rétablir une connexion :"
 
@@ -111,7 +110,6 @@ msgid "Hide Game"
 msgstr "Cacher le jeu"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Hide mp content"
 msgstr "Cacher le contenu du mod"
 
@@ -435,7 +433,7 @@ msgstr "Dégâts activés"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr "Supprimer favoris :"
+msgstr "Supprimer favori :"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
@@ -536,16 +534,14 @@ msgid "Bilinear Filter"
 msgstr "Filtrage bilinéaire"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
-msgstr "Bump mapping"
+msgstr "Placage de relief"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
 msgstr "Changer les touches"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Connected Glass"
 msgstr "Verre unifié"
 
@@ -574,23 +570,20 @@ msgid "No Mipmap"
 msgstr "Sans MIP map"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Highlighting"
 msgstr "Surbrillance des blocs"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Outlining"
-msgstr "Surbrillance des blocs"
+msgstr "Non-surbrillance des blocs"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
 msgstr "Aucun"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Normal Mapping"
-msgstr "Échantillonnage de normalmaps"
+msgstr "Mappage de texture"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -605,7 +598,6 @@ msgid "Parallax Occlusion"
 msgstr "Occlusion parallaxe"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
 msgstr "Activer les particules"
 
@@ -634,9 +626,8 @@ msgid "To enable shaders the OpenGL driver needs to be used."
 msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-#, fuzzy
 msgid "Tone Mapping"
-msgstr "Mip-mapping"
+msgstr "mappage tonal"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold (px)"
@@ -1309,6 +1300,14 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X,Y,Z) décalage de fractale à partir du centre du monde en unités \"d'"
+"échelle\".\n"
+"Utilisé pour déplacer une zone de frai convenable à proximité des basses "
+"terres (0, 0).\n"
+"La valeur par défaut est adaptée pour les réglages de Mandelbrot, elle doit "
+"être modifiée pour les réglages de julia.\n"
+"Portée environ -2 à 2. A multiplier par \"l'échelle\" pour le décalage dans "
+"les nœuds."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1374,14 +1373,12 @@ msgid "Acceleration in air"
 msgstr "Accélération en l'air"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Management interval"
-msgstr "Portée des mapblocks actifs"
+msgstr "intervalle de gestion des blocs actifs"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifier interval"
-msgstr "Portée des mapblocks actifs"
+msgstr "Intervalle du modificateur de bloc actif"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1420,9 +1417,8 @@ msgid "Advanced"
 msgstr "Avancé"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Altitude Chill"
-msgstr "Altitude d'état de froid"
+msgstr "Refroidissement en altitude"
 
 #: src/settings_translation_file.cpp
 msgid "Always fly and fast"
@@ -1455,9 +1451,8 @@ msgstr ""
 "servers.minetest.net."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
-msgstr "Série Julia : échelles (X,Y,Z) en blocs."
+msgstr "Série Julia: échelles (X,Y,Z) en blocs."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
@@ -1481,7 +1476,6 @@ msgid "Basic"
 msgstr "Principal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic Privileges"
 msgstr "Privilèges par défaut"
 
@@ -1523,16 +1517,15 @@ msgstr "Bruit de cave #1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #2"
-msgstr "Bruit de cave #2"
+msgstr "Bruit de grotte #2"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cave width"
-msgstr "Largeur de la fenêtre"
+msgstr "Largeur de la grotte"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
-msgstr "Les caves et tunnels se forment à l'intersection de deux bruits"
+msgstr "Les grottes et tunnels se forment à l'intersection de deux bruits"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
@@ -1564,6 +1557,25 @@ msgid ""
 "17 = 4D \"Mandelbulb\" mandelbrot set.\n"
 "18 = 4D \"Mandelbulb\" julia set."
 msgstr ""
+"Choix de 18 fractales provenant de 9 formules.\n"
+"1 = réglage Mandelbrot \"Roundy\" 4D.\n"
+"2 = réglage Julia \"Roundy\" 4D.\n"
+"3 = réglage Mandelbrot \"Squarry\" 4D.\n"
+"4 = réglage Julia \"Squarry\" 4D.\n"
+"5 = réglage Mandelbrot \"Cousin Mandy\" 4D.\n"
+"6 = réglage Julia \"Cousin Mandy\" 4D.\n"
+"7 = réglage Mandelbrot \"Variation\" 4D.\n"
+"8 = réglage Julia \"Variation\" 4D.\n"
+"9 = réglage Mandelbrot \"Mandelbrot/Mandelbar\" 3D.\n"
+"10 = réglage Julia \"Mandelbrot/Mandelbar\" 3D.\n"
+"11 = réglage Mandelbrot \"Christmas Tree\" 3D.\n"
+"12 = réglage Julia \"Christmas Tree\" 3D.\n"
+"13 = réglage Mandelbrot \"Mandelbulb\" 3D.\n"
+"14 = réglage Julia \"Mandelbulb\" 3D.\n"
+"15 = réglage Mandelbrot \"Cosine Mandelbulb\" 3D.\n"
+"16 = réglage Julia \"Cosine Mandelbulb\" 3D.\n"
+"17 = réglage Mandelbrot \"Mandelbulb\" 4D.\n"
+"18 = réglage Julia \"Mandelbulb\" 4D."
 
 #: src/settings_translation_file.cpp
 msgid "Chunk size"
@@ -1890,9 +1902,8 @@ msgid "Dump the mapgen debug infos."
 msgstr "Afficher les infos de débogage de la génération de terrain."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable VBO"
-msgstr "Activer le pack de mods"
+msgstr "Activer Vertex Buffer Object: objet tampon de vertex"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod security"
@@ -1974,9 +1985,8 @@ msgid "Enables caching of facedir rotated meshes."
 msgstr "Active la mise en cache des meshnodes."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enables filmic tone mapping"
-msgstr "Active la mini-carte."
+msgstr "Autorise le mappage tonal cinématographique"
 
 #: src/settings_translation_file.cpp
 msgid "Enables minimap."
@@ -2076,11 +2086,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Filler Depth"
-msgstr ""
+msgstr "Profondeur de remplissage"
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
-msgstr "Tone Mapping"
+msgstr "Mappage tonal cinématographique"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2146,9 +2156,8 @@ msgid "Font size"
 msgstr "Taille de la police"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Format of screenshots."
-msgstr "Chemin où les captures d'écran sont sauvegardées."
+msgstr "Format de captures d'écran."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
@@ -2217,7 +2226,6 @@ msgid "Generate normalmaps"
 msgstr "Normal mapping"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -2228,9 +2236,12 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributs spécifiques à Mapgen V6.\n"
-"Quand les terrains neigeux sont activés, les jungles sont activés et les "
-"drapeaux jungle est ignoré.\n"
+"Attributs de génération de terrain globaux.\n"
+"Dans le générateur de terrain V6, le drapeau 'décorations' contrôle toutes "
+"les décorations sauf les arbres\n"
+"et l'herbe de la jungle, dans tous les autres générateurs de terrain, ce "
+"drapeau contrôle toutes les décorations.\n"
+"La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
 "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
 "défaut.\n"
 "Les drapeaux commençant par \"non\" sont désactivés."
@@ -2244,9 +2255,8 @@ msgid "Gravity"
 msgstr "Gravité"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HTTP Mods"
-msgstr "Mods"
+msgstr "Mods utilisant le protocole de transfert hypertexte"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
@@ -2266,7 +2276,6 @@ msgstr ""
 "développeurs de mods)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height component of the initial window size."
 msgstr "Résolution verticale de la fenêtre de jeu."
 
@@ -2453,13 +2462,12 @@ msgid "Item entity TTL"
 msgstr "Durée de vie des items abandonnés"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Iterations of the recursive function.\n"
 "Controls the amount of fine detail."
 msgstr ""
 "Série Julia : itérations de la fonction récursive.\n"
-"Contrôle l'échelle du détail le plus subtil."
+"Contrôle la quantité de détails fins."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2468,35 +2476,37 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Réglage Julia uniquement: composante W de la constante \"hypercomplex\" "
+"déterminant la forme Julia.\n"
+"N'a aucun effet sur fractales 3D.\n"
+"Portée environ -2 et 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only: X component of hypercomplex constant determining julia "
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Série Julia : valeur X déterminant la forme 4D.\n"
-"La portée est environ entre -2 et 2."
+"Série Julia uniquement: composant X de la constante \"hypercomplex\" "
+"déterminant la forme Julia.\n"
+"Portée environ -2 et 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only: Y component of hypercomplex constant determining julia "
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Série Julia : valeur Y déterminant la forme 4D.\n"
+"Série Julia uniquement: valeur Y déterminant la forme 4D.\n"
 "La portée est environ entre -2 et 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only: Z component of hypercomplex constant determining julia "
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Série Julia : valeur Z déterminant la forme 4D.\n"
+"Série Julia uniquement: valeur Z déterminant la forme 4D.\n"
 "La portée est environ entre -2 et 2."
 
 #: src/settings_translation_file.cpp
@@ -2508,15 +2518,14 @@ msgid "Jumping speed"
 msgstr "Vitesse de saut du joueur"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for decreasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche pour activer/désactiver la distance de vue illimitée.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Touche pour diminuer le champ de vision.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
+"5e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2529,15 +2538,14 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for increasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche pour activer/désactiver la distance de vue illimitée.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Touche pour accroitre le champ de vision.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
+"5e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2847,7 +2855,6 @@ msgid ""
 msgstr "Temps d'intervalle entre la mise à jour des objets sur le réseau."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of time between ABM execution cycles"
 msgstr "Durée entre les cycles d’exécution ABM"
 
@@ -2955,7 +2962,6 @@ msgid "Map directory"
 msgstr "Chemin du monde"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -2969,15 +2975,19 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributs spécifiques à Mapgen V6.\n"
-"Quand les terrains neigeux sont activés, les jungles sont activés et les "
-"drapeaux jungle est ignoré.\n"
+"Attributs spécifiques au générateur de terrain: Mapgen Valleys.\n"
+"Le paramètre: 'altitude_chill' provoque un refroidissement à des altitudes "
+"élevées, ce qui cause des problèmes dans les biomes.\n"
+"Le paramètre 'humid_river' modifie l'humidité autour des rivières et dans "
+"les zones où l'eau est assez présente,\n"
+"cela peut interférer avec des biomes ajustés délicatement.\n"
+"La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
 "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
 "défaut.\n"
-"Les drapeaux commençant par \"non\" sont désactivés."
+"Les drapeaux commençant par \"non\" sont utilisés pour désactiver de manière "
+"explicite."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
@@ -2987,14 +2997,15 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributs de terrain spécifiques à Mapgen V7.\n"
-"'ridges' sont les rivières.\n"
-"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
-"défaut.\n"
+"Attributs de terrain spécifiques au générateur de carte plate.\n"
+"Lacs et collines peuvent partiellement être ajoutés à un monde plat.\n"
+"Aucun drapeau par défaut défini dans le moteur.\n"
+"La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
+"Les drapeaux qui ne sont pas spécifiés dans le champ gardent leurs valeurs "
+"par défaut.\n"
 "Les drapeaux commençant par \"non\" sont désactivés."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
@@ -3007,13 +3018,14 @@ msgid ""
 msgstr ""
 "Attributs spécifiques à Mapgen V6.\n"
 "Quand les terrains neigeux sont activés, les jungles sont activés et les "
-"drapeaux jungle est ignoré.\n"
+"drapeaux \"jungle\" sont ignorés.\n"
+"Les drapeaux par défaut définis dans le moteur sont: biomeblend, mudflow.\n"
+"La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
 "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
 "défaut.\n"
 "Les drapeaux commençant par \"non\" sont désactivés."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
@@ -3023,9 +3035,10 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributs spécifiques à Mapgen V6.\n"
-"Quand les terrains neigeux sont activés, les jungles sont activés et les "
-"drapeaux jungle est ignoré.\n"
+"Attributs spécifiques à Mapgen V7.\n"
+"Le drapeau 'des crêtes' contrôle les rivières.\n"
+"Les drapeaux par défaut définis dans le moteur sont: montagnes, crêtes.\n"
+"La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
 "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
 "défaut.\n"
 "Les drapeaux commençant par \"non\" sont désactivés."
@@ -3047,9 +3060,8 @@ msgid "Mapblock unload timeout"
 msgstr "Délais d'interruption du déchargement des mapblocks"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Valleys"
-msgstr "Nom du générateur de carte"
+msgstr "Générateur de carte avec des vallées"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome heat noise parameters"
@@ -3072,39 +3084,32 @@ msgid "Mapgen flags"
 msgstr "Drapeaux de génération de terrain"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat"
-msgstr "Drapeaux de génération de terrain"
+msgstr "Générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave width"
-msgstr "Mapgen Julia : échelles fractales"
+msgstr "Ampleur de grotte du générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave1 noise parameters"
-msgstr "Mapgen V5 : paramètres de bruit cave1"
+msgstr "Générateur de terrain plat: paramètres de bruit grotte1"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave2 noise parameters"
-msgstr "Mapgen V5 : paramètre de bruit cave2"
+msgstr "Générateur de terrain plat: paramètres de bruit grotte2"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat filler depth noise parameters"
-msgstr "Mapgen V5 : paramètres de bruit sur la profondeur"
+msgstr "Générateur de terrain plat: paramètres de bruit sur la profondeur"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat flags"
-msgstr "Drapeaux des fractales de la génération de terrain"
+msgstr "Drapeaux du générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat ground level"
-msgstr "Drapeaux de génération de terrain"
+msgstr "Niveau du sol du générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill steepness"
@@ -3112,36 +3117,31 @@ msgstr "Élévation des collines plates"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill threshold"
-msgstr ""
+msgstr "Seuil du générateur de cartes avec de faibles collines"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat lake steepness"
-msgstr "Mapgen Julia : itérations fractales"
+msgstr "Escarpement des lacs du générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat lake threshold"
-msgstr "Mapgen Julia : échelles fractales"
+msgstr "Seuil des lacs du générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat large cave depth"
-msgstr "Mapgen Julia : échelles fractales"
+msgstr "Profondeur des grandes grottes du générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat terrain noise parameters"
-msgstr "Mapgen V6 : paramètres de bruit du terrain de base"
+msgstr "Paramètres de bruit du générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal"
 msgstr "Fractales de la génération de terrain"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal cave width"
-msgstr "Mapgen Julia : couche fractale W"
+msgstr "Ampleur des grottes du générateur de terrain Julia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave1 noise parameters"
@@ -3156,14 +3156,12 @@ msgid "Mapgen fractal filler depth noise parameters"
 msgstr "Mapgen V5 : paramètres de bruit sur la profondeur"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal fractal"
 msgstr "Drapeaux des fractales de la génération de terrain"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal iterations"
-msgstr "Mapgen Julia : itérations fractales"
+msgstr "Générateur de terrain Julia: itérations fractales"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia w"
@@ -3182,23 +3180,20 @@ msgid "Mapgen fractal julia z"
 msgstr "Mapgen Julia : fractale Z"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal offset"
-msgstr "Mapgen Julia : décalages fractals"
+msgstr "Générateur de terrain Julia: décalages fractals"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal scale"
-msgstr "Mapgen Julia : échelles fractales"
+msgstr "Générateur de terrain Julia: échelles fractales"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal seabed noise parameters"
 msgstr "Mapgen : paramètres de bruit du fond de l'eau"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal slice w"
-msgstr "Mapgen Julia : couche fractale W"
+msgstr "Générateur de terrain Julia: couche fractale W"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen heat blend noise parameters"
@@ -3213,9 +3208,8 @@ msgid "Mapgen v5"
 msgstr "Mapgen V5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave width"
-msgstr "Mapgen Julia : échelles fractales"
+msgstr "Ampleur des grottes du générateur de terrain: Mapgen V5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave1 noise parameters"
@@ -3302,9 +3296,8 @@ msgid "Mapgen v7"
 msgstr "Mapgen V7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 cave width"
-msgstr "Mapgen Julia : échelles fractales"
+msgstr "Ampleur des grottes du générateur de terrain: Mapgen V7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave1 noise parameters"
@@ -3628,9 +3621,8 @@ msgid "Node highlighting"
 msgstr "Eclairage des blocs"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "NodeTimer interval"
-msgstr "Intervalle d'envoi du temps"
+msgstr "Intervalle de temps d'un nœud"
 
 #: src/settings_translation_file.cpp
 msgid "Noise parameters for biome API temperature, humidity and biome blend."
@@ -3771,6 +3763,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
+"Les privilèges que les joueurs ayant le privilège basic_privs peuvent "
+"accorder"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler data print interval. 0 = disable. Useful for developers."
@@ -3893,14 +3887,12 @@ msgid "Screenshot folder"
 msgstr "Dossier des captures d'écran"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "Dossier des captures d'écran"
+msgstr "Format des captures d'écran"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "Capture d'écran"
+msgstr "Qualité des captures d'écran"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3908,6 +3900,9 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"Qualité de capture d'écran. Utilisé uniquement pour le format JPEG.\n"
+"1 signifie mauvaise qualité; 100 signifie la meilleure qualité.\n"
+"Utilisez 0 pour la qualité par défaut."
 
 #: src/settings_translation_file.cpp
 msgid "Security"
@@ -4013,7 +4008,7 @@ msgstr "Afficher les infos de débogage"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
-msgstr ""
+msgstr "Afficher les boîtes de sélection de l'entité"
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
@@ -4028,6 +4023,7 @@ msgstr "Taille des chunks à générer, établie en mapblocks (16^3 blocs)."
 #: src/settings_translation_file.cpp
 msgid "Slope and fill work together to modify the heights"
 msgstr ""
+"La pente et le remplissage fonctionnent ensemble pour modifier les hauteurs"
 
 #: src/settings_translation_file.cpp
 msgid "Smooth lighting"
@@ -4089,7 +4085,7 @@ msgstr "Vérification stricte du protocole"
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
-msgstr ""
+msgstr "Fonctionne sur d'anciens serveurs"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -4105,6 +4101,9 @@ msgid ""
 "Controls proportion of world area covered by hills.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Seuil du bruit de relief pour les collines.\n"
+"Contrôle la proportion sur la superficie d'un monde recouvert de collines.\n"
+"Ajuster vers 0. 0 pour une plus grande proportion."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4112,6 +4111,9 @@ msgid ""
 "Controls proportion of world area covered by lakes.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Seuil du bruit de relief pour les lacs.\n"
+"Contrôle la proportion sur la superficie d'un monde recouvert de lacs.\n"
+"Ajuster vers 0. 0 pour une plus grande proportion."
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
@@ -4123,7 +4125,7 @@ msgstr "L'altitude à laquelle la température descend de 20°C"
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
-msgstr ""
+msgstr "La profondeur de la terre ou autre matériau"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -4181,7 +4183,7 @@ msgstr "Cette police sera utilisée pour certaines langues."
 
 #: src/settings_translation_file.cpp
 msgid "Time in between active block management cycles"
-msgstr ""
+msgstr "Temps entre les cycles de gestion des blocs actifs"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4303,7 +4305,7 @@ msgstr "Profondeur des vallées"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Fill"
-msgstr ""
+msgstr "Comblement de vallée"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Profile"
@@ -4315,7 +4317,7 @@ msgstr "Inclinaison des vallées"
 
 #: src/settings_translation_file.cpp
 msgid "Valleys C Flags"
-msgstr ""
+msgstr "Drapeaux de Valleys C"
 
 #: src/settings_translation_file.cpp
 msgid "Vertical screen synchronization."
@@ -4346,16 +4348,14 @@ msgid "View range increase key"
 msgstr "Augmenter la distance d'affichage"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Viewing range"
-msgstr "Distance de vue maximum"
+msgstr "Plage de visualisation"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
 msgstr "Volume du son"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "W co-ordinate of the generated 3D slice of a 4D fractal.\n"
 "Determines which 3D slice of the 4D shape is generated.\n"
@@ -4363,6 +4363,8 @@ msgid ""
 "Range roughly -2 to 2."
 msgstr ""
 "Série Julia : coordonnée W de la couche 3D de la forme 4D.\n"
+"Détermine la tranche 3D de la forme 4D qui est générée.\n"
+"N'a aucun effet sur les fractales 3D.\n"
 "La portée est environ entre -2 et 2."
 
 #: src/settings_translation_file.cpp
@@ -4370,9 +4372,8 @@ msgid "Walking speed"
 msgstr "Vitesse de marche"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Water Features"
-msgstr "Niveau de l'eau"
+msgstr "Caractéristiques de l'eau"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
@@ -4525,9 +4526,14 @@ msgid ""
 "Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
 "Disabling this option will protect your password better."
 msgstr ""
+"Supporte les anciens serveurs antérieurs au protocole version 25.\n"
+"A activer si vous souhaitez vous connecter aux serveurs version 0.4.12 et "
+"antérieure.\n"
+"Les serveurs démarrant en 0.4.13 vont fonctionner, pas ceux en 0.4.12-dev.\n"
+"La désactivation de cette option permettra de mieux protéger votre mot de "
+"passe."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width component of the initial window size."
 msgstr "Résolution verticale de la fenêtre de jeu."
 
@@ -4545,11 +4551,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
-msgstr ""
+msgstr "Coordonnée Y des terrains plats."
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large pseudorandom caves."
 msgstr ""
+"Coordonnée Y de la limite supérieure des grandes grottes pseudo-aléatoires."
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"

From 24ca754bd5cc2a6340d8a393a37b71643c6fda60 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Tue, 12 Jul 2016 20:49:33 +0200
Subject: [PATCH 104/418] Update minetest.conf.example, and
 settings_translation_file.cpp

---
 minetest.conf.example             | 21 +++++++++++++++++++++
 src/settings_translation_file.cpp | 20 ++++++++++++++------
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/minetest.conf.example b/minetest.conf.example
index bc0d4c527..704501f36 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -83,6 +83,20 @@
 #    type: bool
 # continuous_forward = false
 
+#    Enable Joysticks
+#    type: bool
+# enable_joysticks = false
+
+#    The time in seconds it takes between repeated events
+#    when holding down a joystick button combination.
+#    type: float
+# repeat_joystick_button_time = 0.17
+
+#    The sensitivity of the joystick axes for moving the
+#    ingame view frustum around.
+#    type: float
+# joystick_frustum_sensitivity = 170
+
 #    Key for moving the player forward.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 #    type: key
@@ -732,6 +746,12 @@
 #    type: string
 # serverlist_url = servers.minetest.net
 
+#    Disable escape sequences, e.g. chat coloring.
+#    Use this if you want to run a server with pre-0.4.14 clients and you want to disable
+#    the escape sequences generated by mods.
+#    type: bool
+# disable_escape_sequences = false
+
 ## Network
 
 #    Network port to listen (UDP).
@@ -1527,3 +1547,4 @@
 
 #    type: string
 # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/
+
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index f7e14dd65..78d1c799f 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -14,7 +14,7 @@ fake_function() {
 	gettext("Noclip");
 	gettext("If enabled together with fly mode, player is able to fly through solid nodes.\nThis requires the \"noclip\" privilege on the server.");
 	gettext("Cinematic mode");
-	gettext("Smooths camera when moving and looking around.\nUseful for recording videos.");
+	gettext("Smooths camera when looking around. Also called look or mouse smoothing.\nUseful for recording videos.");
 	gettext("Camera smoothing");
 	gettext("Smooths rotation of camera. 0 to disable.");
 	gettext("Camera smoothing in cinematic mode");
@@ -35,6 +35,12 @@ fake_function() {
 	gettext("Enable random user input (only used for testing).");
 	gettext("Continuous forward");
 	gettext("Continuous forward movement (only used for testing).");
+	gettext("Enable Joysticks");
+	gettext("Enable Joysticks");
+	gettext("Joystick button repetition invterval");
+	gettext("The time in seconds it takes between repeated events\nwhen holding down a joystick button combination.");
+	gettext("Joystick frustum sensitivity");
+	gettext("The sensitivity of the joystick axes for moving the\ningame view frustum around.");
 	gettext("Forward key");
 	gettext("Key for moving the player forward.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Backward key");
@@ -306,6 +312,8 @@ fake_function() {
 	gettext("Automaticaly report to the serverlist.");
 	gettext("Serverlist URL");
 	gettext("Announce to this serverlist.\nIf you want to announce your ipv6 address, use  serverlist_url = v6.servers.minetest.net.");
+	gettext("Disable escape sequences");
+	gettext("Disable escape sequences, e.g. chat coloring.\nUse this if you want to run a server with pre-0.4.14 clients and you want to disable\nthe escape sequences generated by mods.");
 	gettext("Network");
 	gettext("Server port");
 	gettext("Network port to listen (UDP).\nThis value will be overridden when starting from the main menu.");
@@ -437,7 +445,7 @@ fake_function() {
 	gettext("Map generation limit");
 	gettext("Where the map generator stops.\nPlease note:\n-    Limited to 31000 (setting above has no effect)\n-    The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n-    Those groups have an offset of -32, -32 nodes from the origin.\n-    Only groups which are within the map_generation_limit are generated");
 	gettext("Mapgen flags");
-	gettext("Global map generation attributes.\nIn Mapgen v6 the 'decorations' flag controls all decorations except trees\nand junglegrass, in all other mapgens this flag controls all decorations.\nThe default flags set in the engine are: caves, light, decorations\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
+	gettext("Global map generation attributes.\nIn Mapgen v6 the 'decorations' flag controls all decorations except trees\nand junglegrass, in all other mapgens this flag controls all decorations.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
 	gettext("Advanced");
 	gettext("Chunk size");
 	gettext("Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes).");
@@ -466,7 +474,7 @@ fake_function() {
 	gettext("Mapgen v5 cave2 noise parameters");
 	gettext("Mapgen v6");
 	gettext("Mapgen v6 flags");
-	gettext("Map generation attributes specific to Mapgen v6.\nWhen snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored.\nThe default flags set in the engine are: biomeblend, mudflow\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
+	gettext("Map generation attributes specific to Mapgen v6.\nWhen snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
 	gettext("Mapgen v6 desert frequency");
 	gettext("Controls size of deserts and beaches in Mapgen v6.\nWhen snowbiomes are enabled 'mgv6_freq_desert' is ignored.");
 	gettext("Mapgen v6 beach frequency");
@@ -483,7 +491,7 @@ fake_function() {
 	gettext("Mapgen v6 apple trees noise parameters");
 	gettext("Mapgen v7");
 	gettext("Mapgen v7 flags");
-	gettext("Map generation attributes specific to Mapgen v7.\nThe 'ridges' flag controls the rivers.\nThe default flags set in the engine are: mountains, ridges\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
+	gettext("Map generation attributes specific to Mapgen v7.\nThe 'ridges' flag controls the rivers.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
 	gettext("Mapgen v7 cave width");
 	gettext("Controls width of tunnels, a smaller value creates wider tunnels.");
 	gettext("Mapgen v7 terrain base noise parameters");
@@ -499,7 +507,7 @@ fake_function() {
 	gettext("Mapgen v7 cave2 noise parameters");
 	gettext("Mapgen flat");
 	gettext("Mapgen flat flags");
-	gettext("Map generation attributes specific to Mapgen flat.\nOccasional lakes and hills can be added to the flat world.\nThe default flags set in the engine are: none\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
+	gettext("Map generation attributes specific to Mapgen flat.\nOccasional lakes and hills can be added to the flat world.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
 	gettext("Mapgen flat ground level");
 	gettext("Y of flat ground.");
 	gettext("Mapgen flat large cave depth");
@@ -547,7 +555,7 @@ fake_function() {
 	gettext("Mapgen Valleys");
 	gettext("General");
 	gettext("Valleys C Flags");
-	gettext("Map generation attributes specific to Mapgen Valleys.\n'altitude_chill' makes higher elevations colder, which may cause biome issues.\n'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool,\nit may interfere with delicately adjusted biomes.\nThe default flags set in the engine are: altitude_chill, humid_rivers\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
+	gettext("Map generation attributes specific to Mapgen Valleys.\n'altitude_chill' makes higher elevations colder, which may cause biome issues.\n'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool,\nit may interfere with delicately adjusted biomes.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
 	gettext("Altitude Chill");
 	gettext("The altitude at which temperature drops by 20C");
 	gettext("Large cave depth");

From 7eeb735cab749958fdad996d4804942155806ab6 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Tue, 12 Jul 2016 20:50:20 +0200
Subject: [PATCH 105/418] Run updatepo.sh

---
 po/be/minetest.po      |   54 +-
 po/ca/minetest.po      |   75 +-
 po/cs/minetest.po      |  231 +-
 po/da/minetest.po      |  211 +-
 po/de/minetest.po      |  781 ++---
 po/eo/minetest.po      |  119 +-
 po/es/minetest.po      |  125 +-
 po/et/minetest.po      |  263 +-
 po/fr/minetest.po      |  775 ++---
 po/he/minetest.po      |   69 +-
 po/hu/minetest.po      |  421 +--
 po/id/minetest.po      |  241 +-
 po/it/minetest.po      |  321 +-
 po/ja/minetest.po      |  131 +-
 po/jbo/minetest.po     |   75 +-
 po/ko/minetest.po      |   54 +-
 po/ky/minetest.po      |  177 +-
 po/lt/minetest.po      |  167 +-
 po/minetest.pot        |   56 +-
 po/nb/minetest.po      |   92 +-
 po/nl/minetest.po      |  672 +++--
 po/pl/minetest.po      |  333 ++-
 po/pt/minetest.po      |  309 +-
 po/pt_BR/minetest.po   |  443 +--
 po/ro/minetest.po      |  211 +-
 po/ru/minetest.po      |  498 ++--
 po/sr_Cyrl/minetest.po | 6351 ++++++++++++++++++++--------------------
 po/tr/minetest.po      |  151 +-
 po/uk/minetest.po      |  219 +-
 po/zh_CN/minetest.po   |  303 +-
 po/zh_TW/minetest.po   |  187 +-
 31 files changed, 7622 insertions(+), 6493 deletions(-)

diff --git a/po/be/minetest.po b/po/be/minetest.po
index c8a707a8f..093c23593 100644
--- a/po/be/minetest.po
+++ b/po/be/minetest.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2013-11-23 17:37+0100\n"
 "Last-Translator: Selat <LongExampleTestName@gmail.com>\n"
 "Language-Team: Belarusian\n"
@@ -582,6 +582,10 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr ""
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr ""
@@ -1753,6 +1757,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1777,6 +1793,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr ""
@@ -2062,8 +2082,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2257,6 +2275,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2635,8 +2661,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2646,8 +2670,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2658,8 +2680,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2669,8 +2689,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3585,7 +3603,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3681,6 +3699,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3696,6 +3720,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
diff --git a/po/ca/minetest.po b/po/ca/minetest.po
index c81cfa76e..0d157db06 100644
--- a/po/ca/minetest.po
+++ b/po/ca/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-04-20 13:21+0000\n"
 "Last-Translator: Joan Ciprià Moreno Teodoro <joancipria@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/minetest/"
@@ -608,6 +608,11 @@ msgstr "Oclusió de paral·laxi"
 msgid "Particles"
 msgstr "Activar tot"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Esteu segur que voleu reiniciar el seu món d'un sol jugador?"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Configuració"
@@ -1885,6 +1890,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1909,6 +1926,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2197,8 +2218,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2393,6 +2412,16 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick button repetition invterval"
+msgstr "Interval de repetició del click dret"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick frustum sensitivity"
+msgstr "Sensibilitat del ratolí"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2797,8 +2826,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2808,8 +2835,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2820,8 +2845,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2831,8 +2854,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3750,8 +3771,9 @@ msgid "Smooth lighting"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 "Suavitza la càmera quan estiga movent-se i mirant al seu voltant.\n"
@@ -3850,6 +3872,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3865,6 +3893,15 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+"El temps en segons que es pren entre la repetició de clicks drets quan "
+"s'està mantenint el botó dret del ratolí."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4201,14 +4238,14 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No!!!"
-#~ msgstr "No!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generar Mapes Normals"
+#~ msgid "No of course not!"
+#~ msgstr "No, per descomptat que no!"
 
 #~ msgid "Public Serverlist"
 #~ msgstr "Llista de servidors públics"
 
-#~ msgid "No of course not!"
-#~ msgstr "No, per descomptat que no!"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generar Mapes Normals"
+
+#~ msgid "No!!!"
+#~ msgstr "No!!!"
diff --git a/po/cs/minetest.po b/po/cs/minetest.po
index a3d57a4d3..7cb9be505 100644
--- a/po/cs/minetest.po
+++ b/po/cs/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-03-04 04:45+0000\n"
 "Last-Translator: Jakub Vaněk <vanek.jakub4@seznam.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -606,6 +606,10 @@ msgstr "Parallax Occlusion"
 msgid "Particles"
 msgstr "Povolit částice"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Reset místního světa"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Nastavení"
@@ -1840,6 +1844,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Zakázat anticheat"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Zakázat prázdná hesla"
@@ -1864,6 +1880,10 @@ msgstr "Klávesa pro vyhození předmětu"
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "Povolit VBO"
@@ -2158,8 +2178,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2353,6 +2371,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2731,8 +2757,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2742,8 +2766,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2754,8 +2776,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2765,8 +2785,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3688,7 +3706,7 @@ msgstr "Plynulé osvětlení"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3784,6 +3802,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3799,6 +3823,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4132,114 +4162,111 @@ msgstr "cURL limit paralelních stahování"
 msgid "cURL timeout"
 msgstr "cURL timeout"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "Přednačíst inventářové textury"
+#~ msgid "No of course not!"
+#~ msgstr "Jistě že ne!"
 
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Reset místního světa"
+#~ msgid "Public Serverlist"
+#~ msgstr "Seznam veřejných serverů"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Měřítko aplikované na prvky menu: "
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generovat normálové mapy"
 
-#~ msgid "Touch free target"
-#~ msgstr "Středový kurzor"
+#~ msgid "No!!!"
+#~ msgstr "Ne!!!"
 
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
+#~ msgid "\""
+#~ msgstr "\""
 
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
+#~ msgid "If disabled "
+#~ msgstr "Je-li zakázáno "
 
-#~ msgid "Downloading"
-#~ msgstr "Stahuji"
+#~ msgid "If enabled, "
+#~ msgstr "Je-li povoleno, "
 
-#~ msgid "Game Name"
-#~ msgstr "Název hry"
+#~ msgid "Rendering:"
+#~ msgstr "Renderování:"
 
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\""
-
-#~ msgid "GAMES"
-#~ msgstr "HRY"
-
-#~ msgid "Mods:"
-#~ msgstr "Mody:"
-
-#~ msgid "new game"
-#~ msgstr "nová hra"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "UPRAVIT HRU"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Odstranit vybraný mod"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Přidat mod"
-
-#~ msgid "CLIENT"
-#~ msgstr "KLIENT"
-
-#~ msgid "START SERVER"
-#~ msgstr "MÍSTNÍ SERVER"
-
-#~ msgid "Name"
-#~ msgstr "Jméno"
-
-#~ msgid "Password"
-#~ msgstr "Heslo"
-
-#~ msgid "SETTINGS"
-#~ msgstr "NASTAVENÍ"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Přednačíst textury předmětů"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Konečná voda"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "HRA JEDNOHO HRÁČE"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "BALÍČKY TEXTUR"
-
-#~ msgid "MODS"
-#~ msgstr "MODY"
-
-#~ msgid "Add mod:"
-#~ msgstr "Přidat mod:"
-
-#~ msgid "Local install"
-#~ msgstr "Místní instalace"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest"
 
 #~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
 #~ "Levý klik: Přesunout všechny předměty, Pravý klik: Přesunout jeden předmět"
 
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest"
+#~ msgid "Local install"
+#~ msgstr "Místní instalace"
 
-#~ msgid "Rendering:"
-#~ msgstr "Renderování:"
+#~ msgid "Add mod:"
+#~ msgstr "Přidat mod:"
 
-#~ msgid "If enabled, "
-#~ msgstr "Je-li povoleno, "
+#~ msgid "MODS"
+#~ msgstr "MODY"
 
-#~ msgid "If disabled "
-#~ msgstr "Je-li zakázáno "
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "BALÍČKY TEXTUR"
 
-#~ msgid "\""
-#~ msgstr "\""
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "HRA JEDNOHO HRÁČE"
 
-#~ msgid "No!!!"
-#~ msgstr "Ne!!!"
+#~ msgid "Finite Liquid"
+#~ msgstr "Konečná voda"
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generovat normálové mapy"
+#~ msgid "Preload item visuals"
+#~ msgstr "Přednačíst textury předmětů"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Seznam veřejných serverů"
+#~ msgid "SETTINGS"
+#~ msgstr "NASTAVENÍ"
 
-#~ msgid "No of course not!"
-#~ msgstr "Jistě že ne!"
+#~ msgid "Password"
+#~ msgstr "Heslo"
+
+#~ msgid "Name"
+#~ msgstr "Jméno"
+
+#~ msgid "START SERVER"
+#~ msgstr "MÍSTNÍ SERVER"
+
+#~ msgid "CLIENT"
+#~ msgstr "KLIENT"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Přidat mod"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Odstranit vybraný mod"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "UPRAVIT HRU"
+
+#~ msgid "new game"
+#~ msgstr "nová hra"
+
+#~ msgid "Mods:"
+#~ msgstr "Mody:"
+
+#~ msgid "GAMES"
+#~ msgstr "HRY"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\""
+
+#~ msgid "Game Name"
+#~ msgstr "Název hry"
+
+#~ msgid "Downloading"
+#~ msgstr "Stahuji"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid "Touch free target"
+#~ msgstr "Středový kurzor"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Měřítko aplikované na prvky menu: "
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Přednačíst inventářové textury"
diff --git a/po/da/minetest.po b/po/da/minetest.po
index 6337ba14e..fb33a1e88 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-05-06 13:58+0000\n"
 "Last-Translator: Thomas Wagner Nielsen <thomas@viawords.com>\n"
-"Language-Team: Danish "
-"<https://hosted.weblate.org/projects/minetest/minetest/da/>\n"
+"Language-Team: Danish <https://hosted.weblate.org/projects/minetest/minetest/"
+"da/>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -618,6 +618,11 @@ msgstr ""
 msgid "Particles"
 msgstr "Aktivér partikler"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Er du sikker på, at du vil nulstille din enkelt spiller-verden?"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Indstillinger"
@@ -1867,6 +1872,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Aktivér partikler"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1897,6 +1914,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2187,8 +2208,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2385,6 +2404,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2767,8 +2794,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2778,8 +2803,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2790,8 +2813,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2801,8 +2822,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3730,7 +3749,7 @@ msgstr "Glat belysning"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3827,6 +3846,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3842,6 +3867,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4178,54 +4209,47 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
+#~ msgid "No of course not!"
+#~ msgstr "Nej selvfølgelig ikke!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Offentlig serverliste"
+
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Ned"
+#~ msgid "If disabled "
+#~ msgstr "Deaktivér alle"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "aktiveret"
 
-#~ msgid "is required by:"
-#~ msgstr "er påkrævet af:"
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Spil"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguration gemt.  "
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Gammelt kodeord"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende.  "
+#~ msgid "Preload item visuals"
+#~ msgstr "For-indlæs elementernes grafik"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver"
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n"
+#~ "De vil blive aktiveret som standard når du gemmer konfigurationen.  "
 
-#~ msgid "Show Public"
-#~ msgstr "Vis offentlig"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n"
+#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen.  "
 
-#~ msgid "Show Favorites"
-#~ msgstr "Vis favoritter"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server."
-
-#~ msgid "Create world"
-#~ msgstr "Skab verden"
-
-#~ msgid "Address required."
-#~ msgstr "Adresse påkrævet."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Kan ikke slette verden: ingenting valgt"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Filer som slettes"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Kan ikke skabe verden: ingen spil fundet"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Kan ikke konfigurere verden: ingenting valgt"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Mislykkedes i at slette alle verdenens filer"
+#~ msgid "Delete map"
+#~ msgstr "Slet mappen"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4252,44 +4276,51 @@ msgstr ""
 #~ "- ESC: denne menu\n"
 #~ "- T: snak\n"
 
-#~ msgid "Delete map"
-#~ msgstr "Slet mappen"
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Mislykkedes i at slette alle verdenens filer"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n"
-#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen.  "
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Kan ikke konfigurere verden: ingenting valgt"
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n"
-#~ "De vil blive aktiveret som standard når du gemmer konfigurationen.  "
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Kan ikke skabe verden: ingen spil fundet"
 
-#~ msgid "Preload item visuals"
-#~ msgstr "For-indlæs elementernes grafik"
+#~ msgid "Files to be deleted"
+#~ msgstr "Filer som slettes"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Kan ikke slette verden: ingenting valgt"
+
+#~ msgid "Address required."
+#~ msgstr "Adresse påkrævet."
+
+#~ msgid "Create world"
+#~ msgstr "Skab verden"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Vis favoritter"
+
+#~ msgid "Show Public"
+#~ msgstr "Vis offentlig"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguration gemt.  "
+
+#~ msgid "is required by:"
+#~ msgstr "er påkrævet af:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed"
 
 #, fuzzy
-#~ msgid "Password"
-#~ msgstr "Gammelt kodeord"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Spil"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "aktiveret"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Deaktivér alle"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Offentlig serverliste"
-
-#~ msgid "No of course not!"
-#~ msgstr "Nej selvfølgelig ikke!"
+#~ msgid "Downloading"
+#~ msgstr "Ned"
diff --git a/po/de/minetest.po b/po/de/minetest.po
index 25d49957c..7da4ca4d8 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-05-11 04:34+0000\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
-"Language-Team: German "
-"<https://hosted.weblate.org/projects/minetest/minetest/de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/minetest/minetest/"
+"de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -605,6 +605,10 @@ msgstr "Parallax-Occlusion"
 msgid "Particles"
 msgstr "Partikel"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Einzelspielerwelt zurücksetzen"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Einstellungen"
@@ -1887,6 +1891,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Anti-Cheat deaktivieren"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Leere Passwörter verbieten"
@@ -1911,6 +1927,10 @@ msgstr "Wegwerfen-Taste"
 msgid "Dump the mapgen debug infos."
 msgstr "Die Kartengenerator-Debuginformationen auf Konsole ausgeben."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "VBO aktivieren"
@@ -2239,12 +2259,11 @@ msgid "Generate normalmaps"
 msgstr "Normalmaps generieren"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2289,8 +2308,8 @@ msgstr ""
 "- log: Imitieren, und den Backtrace des veralteten Funktionsaufrufs "
 "protokollieren (Standard für\n"
 "  Debug).\n"
-"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen ("
-"empfohlen für Mod-\n"
+"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen "
+"(empfohlen für Mod-\n"
 "  Entwickler)."
 
 #: src/settings_translation_file.cpp
@@ -2499,6 +2518,16 @@ msgstr ""
 "Iterationen der rekursiven Funktion.\n"
 "Steuert die Skalierung mit einem sehr hohem Detailgrad."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick button repetition invterval"
+msgstr "Rechtsklick-Wiederholungsrate"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick frustum sensitivity"
+msgstr "Mausempfindlichkeit"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -3000,6 +3029,7 @@ msgid "Map directory"
 msgstr "Kartenordner"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -3007,8 +3037,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3028,31 +3056,27 @@ msgstr ""
 "zu deaktivieren."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n"
-"Gelegentlich werden Seen und Hügel zur flachen Welt hinzugefügt.\n"
-"Die von der Engine standardmäßig gesetzten Flags sind: keine.\n"
-"Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
-"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
+"Kartengenerierungsattribute speziell für Kartengenerator v7.\n"
+"„ridges“ sind die Flüsse.\n"
+"Flags, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
 "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
 "zu deaktivieren."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3070,21 +3094,17 @@ msgstr ""
 "zu deaktivieren."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Kartengenerierungsattribute speziell für den Kartengenerator v7.\n"
-"Das „ridges“-Flag steuert die Flüsse.\n"
-"Die von der Engine standardmäßig gesetzten Flags lauten:\n"
-"„mountains, ridges“.\n"
-"Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
-"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
+"Kartengenerierungsattribute speziell für Kartengenerator v7.\n"
+"„ridges“ sind die Flüsse.\n"
+"Flags, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
 "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
 "zu deaktivieren."
@@ -4087,8 +4107,9 @@ msgid "Smooth lighting"
 msgstr "Geglättetes Licht"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 "Glättet Kamerabewegungen bei der Fortbewegung und\n"
@@ -4203,6 +4224,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr "Das Render-Backend für Irrlicht."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -4229,6 +4256,16 @@ msgstr ""
 "deaktiviert\n"
 "diese Funktion."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+"Das Intervall in Sekunden, in dem Rechtsklicks wiederholt werden, wenn die "
+"rechte\n"
+"Maustaste gedrückt gehalten wird."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4635,273 +4672,106 @@ msgstr "cURL-Parallel-Begrenzung"
 msgid "cURL timeout"
 msgstr "cURL-Zeitüberschreitung"
 
-#~ msgid "Item textures..."
-#~ msgstr "Inventarbilder ..."
+#~ msgid "No of course not!"
+#~ msgstr "Nein, natürlich nicht!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Öffentliche Serverliste"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normalmaps generieren"
+
+#~ msgid "No!!!"
+#~ msgstr "Nein!!!"
 
 #~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n"
-#~ "nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n"
-#~ "optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n"
-#~ "nicht mit dieser Einstellung funktioniert."
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)."
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
-#~ "Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n"
-#~ "Nodes multipliziert."
-
-#~ msgid ""
-#~ "Julia set: W value determining the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Julia-Menge: W-Wert, der die 4D-Form festlegt.\n"
-#~ "Weite liegt grob zwischen -2 und 2."
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n"
-#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n"
-#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
-#~ "Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n"
-#~ "Versätze in Nodes multipliziert."
-
-#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
-#~ msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes."
-
-#~ msgid ""
-#~ "Mandelbrot set: Iterations of the recursive function.\n"
-#~ "Controls scale of finest detail."
-#~ msgstr ""
-#~ "Mandelbrotmenge: Iterationen der rekursiven Funktion.\n"
-#~ "Steuert die Skalierung mit einem sehr hohem Detailgrad."
-
-#~ msgid ""
-#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-"
-#~ "Form.\n"
-#~ "Die Weite liegt grob zwischen -2 und 2."
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen fractal.\n"
-#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Kartengenerierungsattribute, die speziell für den Fraktale-\n"
-#~ "Kartenerzeuger sind.\n"
-#~ "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n"
-#~ "Mandelbrotmenge aus.\n"
-#~ "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
+#~ "Kartengenerierungsattribute speziell für den Täler-Kartengenerator.\n"
+#~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 #~ "werden von der Standardeinstellung unverändert gelassen.\n"
-#~ "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren."
+#~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
+#~ "zu deaktivieren.\n"
+#~ "„altitude_chill“ macht höhere Höhen kälter, was zu einigen Biomproblemen "
+#~ "führen könnte.\n"
+#~ "„humid_rivers“ modifiziert die Luftfeuchtigkeit um Flüssen und in "
+#~ "Gebieten, in denen das Wasser sich in Pfützen ansammeln würde.\n"
+#~ "Dies könnte mit fein abgestimmten Biomen zu Konflikten führen."
 
-#~ msgid "Mapgen fractal mandelbrot iterations"
-#~ msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger"
+#, fuzzy
+#~ msgid "\""
+#~ msgstr "”"
 
-#~ msgid "Mapgen fractal mandelbrot offset"
-#~ msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger"
+#~ msgid "Enable a bit lower water surface, so it doesn't "
+#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht "
 
-#~ msgid "Mapgen fractal mandelbrot scale"
-#~ msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger"
+#~ msgid "If disabled "
+#~ msgstr "Wenn deaktiviert "
 
-#~ msgid "Mapgen fractal mandelbrot slice w"
-#~ msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger"
+#~ msgid "If enabled, "
+#~ msgstr "Wenn aktiviert, "
 
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Höchstabstand über dem Meeresspiegel für den Spieler-\n"
-#~ "startpunkt. Größere Werte führen zu Startpunkten näher an\n"
-#~ "(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n"
-#~ "brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n"
-#~ "Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n"
-#~ "eingegraben ist."
+#~ msgid "Rendering:"
+#~ msgstr "Rendering:"
 
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Minimal gewünschte Bildwiederholrate.\n"
-#~ "Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch "
-#~ "angepasst; auch\n"
-#~ "die minimale und maximale Sichtweite werden angepasst."
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Neustart nach Ändern des Treibers erforderlich"
 
-#~ msgid "New style water"
-#~ msgstr "Wasser im neuen Stil"
+#~ msgid "Downloading"
+#~ msgstr "Lade herunter"
 
-#~ msgid ""
-#~ "Pre-generate all item visuals used in the inventory.\n"
-#~ "This increases startup time, but runs smoother in-game.\n"
-#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
-#~ "the inventory."
-#~ msgstr ""
-#~ "Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n"
-#~ "Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel "
-#~ "führen.\n"
-#~ "Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte "
-#~ "im Inventar\n"
-#~ "verursachen kann."
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "Texturen vorgenerieren"
+#~ msgid "is required by:"
+#~ msgstr "wird benötigt von:"
 
-#~ msgid ""
-#~ "The allowed adjustment range for the automatic rendering range "
-#~ "adjustment.\n"
-#~ "Set this to be equal to viewing range minimum to disable the auto-"
-#~ "adjustment algorithm."
-#~ msgstr ""
-#~ "Die erlaubte Anpassungsreichweite für die automatische Render-"
-#~ "Reichweitenanpassung.\n"
-#~ "Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um "
-#~ "den automatischen\n"
-#~ "Anpassungsalgorithmus zu deaktivieren."
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguration gespeichert.  "
 
-#~ msgid "Vertical initial window size."
-#~ msgstr "Anfängliche Fensterhöhe."
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Warnung: Konfiguration nicht konsistent.  "
 
-#~ msgid "Vertical spawn range"
-#~ msgstr "Vertikaler Startpunktbereich"
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen"
 
-#~ msgid "Viewing range minimum"
-#~ msgstr "Minimale Sichtweite"
+#~ msgid "Show Public"
+#~ msgstr "Zeige öffentliche"
 
-#~ msgid "Wanted FPS"
-#~ msgstr "Gewünschte Bildwiederholrate"
+#~ msgid "Show Favorites"
+#~ msgstr "Zeige Favoriten"
 
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Einzelspielerwelt zurücksetzen"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten."
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: "
+#~ msgid "Create world"
+#~ msgstr "Welt erstellen"
 
-#~ msgid "Touch free target"
-#~ msgstr "Berührungsfreies Ziel"
+#~ msgid "Address required."
+#~ msgstr "Adresse benötigt."
 
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt"
 
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
+#~ msgid "Files to be deleted"
+#~ msgstr "Zu löschende Dateien"
 
-#~ msgid "Game Name"
-#~ msgstr "Spielname"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden"
 
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren"
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt"
 
-#~ msgid "GAMES"
-#~ msgstr "SPIELE"
-
-#~ msgid "Mods:"
-#~ msgstr "Mods:"
-
-#~ msgid "new game"
-#~ msgstr "neues Spiel"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "SPIEL ÄNDERN"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Ausgewählte Mod löschen"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Mod hinzufügen"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "START SERVER"
-#~ msgstr "SERVER STARTEN"
-
-#~ msgid "Name"
-#~ msgstr "Name"
-
-#~ msgid "Password"
-#~ msgstr "Passwort"
-
-#~ msgid "SETTINGS"
-#~ msgstr "EINSTELLUNGEN"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Lade Inventarbilder vor"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Endliches Wasser"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "EINZELSPIELER"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "TEXTUREN PAKETE"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "Add mod:"
-#~ msgstr "Modifikation hinzufügen:"
-
-#~ msgid "Local install"
-#~ msgstr "Lokale Install."
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n"
-#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird.  "
-
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Warnung: Einige konfigurierte Mods fehlen.\n"
-#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert "
-#~ "wird.  "
-
-#~ msgid "KEYBINDINGS"
-#~ msgstr "TASTEN EINST."
-
-#~ msgid "Delete map"
-#~ msgstr "Karte löschen"
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4927,117 +4797,304 @@ msgstr "cURL-Zeitüberschreitung"
 #~ "- I: Inventar\n"
 #~ "- T: Chat\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden"
+#~ msgid "Delete map"
+#~ msgstr "Karte löschen"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Zu löschende Dateien"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt"
-
-#~ msgid "Address required."
-#~ msgstr "Adresse benötigt."
-
-#~ msgid "Create world"
-#~ msgstr "Welt erstellen"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Zeige Favoriten"
-
-#~ msgid "Show Public"
-#~ msgstr "Zeige öffentliche"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Warnung: Konfiguration nicht konsistent.  "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguration gespeichert.  "
-
-#~ msgid "is required by:"
-#~ msgstr "wird benötigt von:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen"
-
-#~ msgid "Downloading"
-#~ msgstr "Lade herunter"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Neustart nach Ändern des Treibers erforderlich"
-
-#~ msgid "Rendering:"
-#~ msgstr "Rendering:"
-
-#~ msgid "If enabled, "
-#~ msgstr "Wenn aktiviert, "
-
-#~ msgid "If disabled "
-#~ msgstr "Wenn deaktiviert "
-
-#~ msgid "Enable a bit lower water surface, so it doesn't "
-#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht "
-
-#, fuzzy
-#~ msgid "\""
-#~ msgstr "”"
+#~ msgid "KEYBINDINGS"
+#~ msgstr "TASTEN EINST."
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "'ridges' are the rivers.\n"
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Warnung: Einige konfigurierte Mods fehlen.\n"
+#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert "
+#~ "wird.  "
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n"
+#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird.  "
+
+#~ msgid "Local install"
+#~ msgstr "Lokale Install."
+
+#~ msgid "Add mod:"
+#~ msgstr "Modifikation hinzufügen:"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "TEXTUREN PAKETE"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "EINZELSPIELER"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Endliches Wasser"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Lade Inventarbilder vor"
+
+#~ msgid "SETTINGS"
+#~ msgstr "EINSTELLUNGEN"
+
+#~ msgid "Password"
+#~ msgstr "Passwort"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "START SERVER"
+#~ msgstr "SERVER STARTEN"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Mod hinzufügen"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Ausgewählte Mod löschen"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "SPIEL ÄNDERN"
+
+#~ msgid "new game"
+#~ msgstr "neues Spiel"
+
+#~ msgid "Mods:"
+#~ msgstr "Mods:"
+
+#~ msgid "GAMES"
+#~ msgstr "SPIELE"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren"
+
+#~ msgid "Game Name"
+#~ msgstr "Spielname"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid "Touch free target"
+#~ msgstr "Berührungsfreies Ziel"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: "
+
+#~ msgid "Wanted FPS"
+#~ msgstr "Gewünschte Bildwiederholrate"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Minimale Sichtweite"
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Vertikaler Startpunktbereich"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Anfängliche Fensterhöhe."
+
+#~ msgid ""
+#~ "The allowed adjustment range for the automatic rendering range "
+#~ "adjustment.\n"
+#~ "Set this to be equal to viewing range minimum to disable the auto-"
+#~ "adjustment algorithm."
+#~ msgstr ""
+#~ "Die erlaubte Anpassungsreichweite für die automatische Render-"
+#~ "Reichweitenanpassung.\n"
+#~ "Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um "
+#~ "den automatischen\n"
+#~ "Anpassungsalgorithmus zu deaktivieren."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Texturen vorgenerieren"
+
+#~ msgid ""
+#~ "Pre-generate all item visuals used in the inventory.\n"
+#~ "This increases startup time, but runs smoother in-game.\n"
+#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
+#~ "the inventory."
+#~ msgstr ""
+#~ "Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n"
+#~ "Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel "
+#~ "führen.\n"
+#~ "Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte "
+#~ "im Inventar\n"
+#~ "verursachen kann."
+
+#~ msgid "New style water"
+#~ msgstr "Wasser im neuen Stil"
+
+#~ msgid ""
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Minimal gewünschte Bildwiederholrate.\n"
+#~ "Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch "
+#~ "angepasst; auch\n"
+#~ "die minimale und maximale Sichtweite werden angepasst."
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Höchstabstand über dem Meeresspiegel für den Spieler-\n"
+#~ "startpunkt. Größere Werte führen zu Startpunkten näher an\n"
+#~ "(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n"
+#~ "brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n"
+#~ "Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n"
+#~ "eingegraben ist."
+
+#~ msgid "Mapgen fractal mandelbrot slice w"
+#~ msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger"
+
+#~ msgid "Mapgen fractal mandelbrot scale"
+#~ msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger"
+
+#~ msgid "Mapgen fractal mandelbrot offset"
+#~ msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger"
+
+#~ msgid "Mapgen fractal mandelbrot iterations"
+#~ msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger"
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen fractal.\n"
+#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
 #~ "Flags starting with \"no\" are used to explicitly disable them."
 #~ msgstr ""
-#~ "Kartengenerierungsattribute speziell für Kartengenerator v7.\n"
-#~ "„ridges“ sind die Flüsse.\n"
-#~ "Flags, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
+#~ "Kartengenerierungsattribute, die speziell für den Fraktale-\n"
+#~ "Kartenerzeuger sind.\n"
+#~ "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n"
+#~ "Mandelbrotmenge aus.\n"
+#~ "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
+#~ "werden von der Standardeinstellung unverändert gelassen.\n"
+#~ "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
+#~ "zu deaktivieren."
+
+#~ msgid ""
+#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-"
+#~ "Form.\n"
+#~ "Die Weite liegt grob zwischen -2 und 2."
+
+#~ msgid ""
+#~ "Mandelbrot set: Iterations of the recursive function.\n"
+#~ "Controls scale of finest detail."
+#~ msgstr ""
+#~ "Mandelbrotmenge: Iterationen der rekursiven Funktion.\n"
+#~ "Steuert die Skalierung mit einem sehr hohem Detailgrad."
+
+#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+#~ msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes."
+
+#~ msgid ""
+#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
+#~ "Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n"
+#~ "Versätze in Nodes multipliziert."
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n"
+#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n"
+#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Julia set: W value determining the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Julia-Menge: W-Wert, der die 4D-Form festlegt.\n"
+#~ "Weite liegt grob zwischen -2 und 2."
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
+#~ "Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n"
+#~ "Nodes multipliziert."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n"
+#~ "nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n"
+#~ "optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n"
+#~ "nicht mit dieser Einstellung funktioniert."
+
+#~ msgid "Item textures..."
+#~ msgstr "Inventarbilder ..."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Kartengenerierungsattribute speziell für den Kartengenerator v7.\n"
+#~ "Das „ridges“-Flag steuert die Flüsse.\n"
+#~ "Die von der Engine standardmäßig gesetzten Flags lauten:\n"
+#~ "„mountains, ridges“.\n"
+#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
+#~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 #~ "werden von der Standardeinstellung unverändert gelassen.\n"
 #~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
 #~ "zu deaktivieren."
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Kartengenerierungsattribute speziell für den Täler-Kartengenerator.\n"
+#~ "Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n"
+#~ "Gelegentlich werden Seen und Hügel zur flachen Welt hinzugefügt.\n"
+#~ "Die von der Engine standardmäßig gesetzten Flags sind: keine.\n"
+#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
 #~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 #~ "werden von der Standardeinstellung unverändert gelassen.\n"
 #~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren.\n"
-#~ "„altitude_chill“ macht höhere Höhen kälter, was zu einigen Biomproblemen "
-#~ "führen könnte.\n"
-#~ "„humid_rivers“ modifiziert die Luftfeuchtigkeit um Flüssen und in "
-#~ "Gebieten, in denen das Wasser sich in Pfützen ansammeln würde.\n"
-#~ "Dies könnte mit fein abgestimmten Biomen zu Konflikten führen."
-
-#~ msgid "No!!!"
-#~ msgstr "Nein!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normalmaps generieren"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Öffentliche Serverliste"
-
-#~ msgid "No of course not!"
-#~ msgstr "Nein, natürlich nicht!"
+#~ "zu deaktivieren."
diff --git a/po/eo/minetest.po b/po/eo/minetest.po
index cea8dff0c..fce3627f9 100644
--- a/po/eo/minetest.po
+++ b/po/eo/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-06-04 13:18+0000\n"
 "Last-Translator: Tim <t4im@openmailbox.org>\n"
-"Language-Team: Esperanto "
-"<https://hosted.weblate.org/projects/minetest/minetest/eo/>\n"
+"Language-Team: Esperanto <https://hosted.weblate.org/projects/minetest/"
+"minetest/eo/>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -594,6 +594,10 @@ msgstr "Paralaksa Okludo"
 msgid "Particles"
 msgstr "Ŝaltu ĉiujn"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Nuligi solludantan mondon"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Agordoj"
@@ -1806,6 +1810,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Ŝalti partiklojn"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1832,6 +1848,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2126,8 +2146,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2324,6 +2342,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2706,8 +2732,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2717,8 +2741,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2729,8 +2751,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2740,8 +2760,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3702,7 +3720,7 @@ msgstr "Glatiga lumo"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3801,6 +3819,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3816,6 +3840,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4158,42 +4188,39 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Ŝargi teksturojn…"
+#~ msgid "No of course not!"
+#~ msgstr "Ne, memkompreneble!"
 
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Nuligi solludantan mondon"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Skala faktoro por menuoj "
-
-#~ msgid "Touch free target"
-#~ msgstr "Sentuŝa celo"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon"
-
-#~ msgid "Rendering:"
-#~ msgstr "Bildigo:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "ŝaltita"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Malŝaltu modifaron"
-
-#~ msgid "No!!!"
-#~ msgstr "Ne!!!"
+#~ msgid "Public Serverlist"
+#~ msgstr "Publika servilolisto"
 
 #, fuzzy
 #~ msgid "Generate Normalmaps"
 #~ msgstr "Generi Normalmapojn"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Publika servilolisto"
+#~ msgid "No!!!"
+#~ msgstr "Ne!!!"
 
-#~ msgid "No of course not!"
-#~ msgstr "Ne, memkompreneble!"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Malŝaltu modifaron"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "ŝaltita"
+
+#~ msgid "Rendering:"
+#~ msgstr "Bildigo:"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon"
+
+#~ msgid "Touch free target"
+#~ msgstr "Sentuŝa celo"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Skala faktoro por menuoj "
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Ŝargi teksturojn…"
diff --git a/po/es/minetest.po b/po/es/minetest.po
index a3ce47c12..72779142c 100644
--- a/po/es/minetest.po
+++ b/po/es/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-06-14 21:57+0000\n"
 "Last-Translator: Roberto Mengíbar Fernández <rroobbeerr@gmail.com>\n"
-"Language-Team: Spanish "
-"<https://hosted.weblate.org/projects/minetest/minetest/es/>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/minetest/"
+"minetest/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -604,6 +604,10 @@ msgstr "Oclusión de paralaje"
 msgid "Particles"
 msgstr "Partículas"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Reiniciar mundo de un jugador"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Configuración"
@@ -1890,6 +1894,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Desactivar Anticheat"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "No permitir contraseñas vacías"
@@ -1915,6 +1931,10 @@ msgstr "Tecla de \"Soltar objeto\""
 msgid "Dump the mapgen debug infos."
 msgstr "Imprimir información de depuración del generador de mapas."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "Activar VBO"
@@ -2006,8 +2026,8 @@ msgid ""
 "Enables on the fly normalmap generation (Emboss effect).\n"
 "Requires bumpmapping to be enabled."
 msgstr ""
-"Habilita la generación de mapas de normales (efecto realzado) en el momento."
-"\n"
+"Habilita la generación de mapas de normales (efecto realzado) en el "
+"momento.\n"
 "Requiere habilitar mapeado de relieve."
 
 #: src/settings_translation_file.cpp
@@ -2238,8 +2258,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2445,6 +2463,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2823,8 +2849,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2834,8 +2858,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2846,8 +2868,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2857,8 +2877,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3803,7 +3821,7 @@ msgstr "Iluminación suave"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3901,6 +3919,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3916,6 +3940,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4252,47 +4282,44 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "Tiempo de espera de cURL"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "Precarga de las texturas del inventario"
+#~ msgid "No of course not!"
+#~ msgstr "¡No, claro que no!"
 
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Reiniciar mundo de un jugador"
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista de servidores públicos"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Factor de escala aplicado a los elementos del menú: "
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generar mapas normales"
 
-#~ msgid "Touch free target"
-#~ msgstr "Tocar para interactuar"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr ""
-#~ "Reinicia minetest para que los cambios en el controlador tengan efecto"
-
-#~ msgid "Rendering:"
-#~ msgstr "Renderizado:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Activado"
+#~ msgid "No!!!"
+#~ msgstr "¡¡¡No!!!"
 
 #, fuzzy
 #~ msgid "If disabled "
 #~ msgstr "Desactivar paquete"
 
-#~ msgid "No!!!"
-#~ msgstr "¡¡¡No!!!"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Activado"
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generar mapas normales"
+#~ msgid "Rendering:"
+#~ msgstr "Renderizado:"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista de servidores públicos"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr ""
+#~ "Reinicia minetest para que los cambios en el controlador tengan efecto"
 
-#~ msgid "No of course not!"
-#~ msgstr "¡No, claro que no!"
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid "Touch free target"
+#~ msgstr "Tocar para interactuar"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Factor de escala aplicado a los elementos del menú: "
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Precarga de las texturas del inventario"
diff --git a/po/et/minetest.po b/po/et/minetest.po
index 15cfe12ae..9973568c5 100644
--- a/po/et/minetest.po
+++ b/po/et/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-04-09 13:53+0000\n"
 "Last-Translator: Jan Harald <kuus29@gmail.com>\n"
 "Language-Team: Estonian <https://hosted.weblate.org/projects/minetest/"
@@ -615,6 +615,11 @@ msgstr ""
 msgid "Particles"
 msgstr "Luba kõik"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Üksikmäng"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Sätted"
@@ -1826,6 +1831,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Lülita osakesed sisse"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1852,6 +1869,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2142,8 +2163,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2339,6 +2358,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2721,8 +2748,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2732,8 +2757,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2744,8 +2767,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2755,8 +2776,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3704,7 +3723,7 @@ msgstr "Ilus valgustus"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3802,6 +3821,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3817,6 +3842,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4155,56 +4186,67 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
+#~ msgid "Public Serverlist"
+#~ msgstr "Avalikud serverid"
+
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Alla"
+#~ msgid "If disabled "
+#~ msgstr "Lülita kõik välja"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Sisse lülitatud"
+
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Mäng"
+
+#~ msgid "GAMES"
+#~ msgstr "MÄNGUD"
+
+#~ msgid "new game"
+#~ msgstr "uus mängu"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MUUDA MÄNGU"
+
+#, fuzzy
+#~ msgid "Remove selected mod"
+#~ msgstr "Eemalda valitud muutus"
+
+#, fuzzy
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Lisama muutus"
+
+#~ msgid "Name"
+#~ msgstr "Nimi"
+
+#~ msgid "Password"
+#~ msgstr "Parool"
+
+#~ msgid "SETTINGS"
+#~ msgstr "Seaded"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Lae asjade visuaale"
+
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Löppev vedelik"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut "
-#~ "asja"
+#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n"
+#~ "Need lülitatakse sisse kohe pärast sätete salvestamist."
 
-#~ msgid "is required by:"
-#~ msgstr "Seda vajavad:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguratsioon salvestatud. "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Hoiatus: Konfiguratsioon pole kindel."
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti"
-
-#~ msgid "Show Public"
-#~ msgstr "Näita avalikke"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Näita lemmikuid"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit."
-
-#~ msgid "Create world"
-#~ msgstr "Loo maailm"
-
-#~ msgid "Address required."
-#~ msgstr "IP on vajalkik."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Failid mida kustutada"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n"
+#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon."
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4231,64 +4273,53 @@ msgstr ""
 #~ "- ESC: Menüü\n"
 #~ "- T: Jututupa\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Failid mida kustutada"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud"
+
+#~ msgid "Address required."
+#~ msgstr "IP on vajalkik."
+
+#~ msgid "Create world"
+#~ msgstr "Loo maailm"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Näita lemmikuid"
+
+#~ msgid "Show Public"
+#~ msgstr "Näita avalikke"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Hoiatus: Konfiguratsioon pole kindel."
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguratsioon salvestatud. "
+
+#~ msgid "is required by:"
+#~ msgstr "Seda vajavad:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
-#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n"
-#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon."
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n"
-#~ "Need lülitatakse sisse kohe pärast sätete salvestamist."
+#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut "
+#~ "asja"
 
 #, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Löppev vedelik"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Lae asjade visuaale"
-
-#~ msgid "SETTINGS"
-#~ msgstr "Seaded"
-
-#~ msgid "Password"
-#~ msgstr "Parool"
-
-#~ msgid "Name"
-#~ msgstr "Nimi"
-
-#, fuzzy
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Lisama muutus"
-
-#, fuzzy
-#~ msgid "Remove selected mod"
-#~ msgstr "Eemalda valitud muutus"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MUUDA MÄNGU"
-
-#~ msgid "new game"
-#~ msgstr "uus mängu"
-
-#~ msgid "GAMES"
-#~ msgstr "MÄNGUD"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Mäng"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Sisse lülitatud"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Lülita kõik välja"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Avalikud serverid"
+#~ msgid "Downloading"
+#~ msgstr "Alla"
diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index a699c7394..dd3f6d2c3 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-07-12 16:57+0000\n"
 "Last-Translator: Onyx Steinheim <thevoxelmanonyx@gmail.com>\n"
-"Language-Team: French "
-"<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/minetest/minetest/"
+"fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -601,6 +601,10 @@ msgstr "Occlusion parallaxe"
 msgid "Particles"
 msgstr "Activer les particules"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Réinitialiser le monde"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Réglages"
@@ -1300,8 +1304,8 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"(X,Y,Z) décalage de fractale à partir du centre du monde en unités \"d'"
-"échelle\".\n"
+"(X,Y,Z) décalage de fractale à partir du centre du monde en unités "
+"\"d'échelle\".\n"
 "Utilisé pour déplacer une zone de frai convenable à proximité des basses "
 "terres (0, 0).\n"
 "La valeur par défaut est adaptée pour les réglages de Mandelbrot, elle doit "
@@ -1877,6 +1881,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Désactiver l'anti-triche"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Refuser les mots de passe vides"
@@ -1901,6 +1917,10 @@ msgstr "Lâcher"
 msgid "Dump the mapgen debug infos."
 msgstr "Afficher les infos de débogage de la génération de terrain."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "Activer Vertex Buffer Object: objet tampon de vertex"
@@ -2226,12 +2246,11 @@ msgid "Generate normalmaps"
 msgstr "Normal mapping"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2469,6 +2488,16 @@ msgstr ""
 "Série Julia : itérations de la fonction récursive.\n"
 "Contrôle la quantité de détails fins."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick button repetition invterval"
+msgstr "Intervalle de répétition du clic droit"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick frustum sensitivity"
+msgstr "Sensibilité de la souris"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2524,8 +2553,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Touche pour diminuer le champ de vision.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
-"5e3da1b0edf72eb3"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2544,8 +2573,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Touche pour accroitre le champ de vision.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
-"5e3da1b0edf72eb3"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2962,6 +2991,7 @@ msgid "Map directory"
 msgstr "Chemin du monde"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -2969,8 +2999,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2988,30 +3016,26 @@ msgstr ""
 "explicite."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributs de terrain spécifiques au générateur de carte plate.\n"
-"Lacs et collines peuvent partiellement être ajoutés à un monde plat.\n"
-"Aucun drapeau par défaut défini dans le moteur.\n"
-"La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
-"Les drapeaux qui ne sont pas spécifiés dans le champ gardent leurs valeurs "
-"par défaut.\n"
+"Attributs de terrain spécifiques à Mapgen V7.\n"
+"'ridges' sont les rivières.\n"
+"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
+"défaut.\n"
 "Les drapeaux commençant par \"non\" sont désactivés."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3026,19 +3050,16 @@ msgstr ""
 "Les drapeaux commençant par \"non\" sont désactivés."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributs spécifiques à Mapgen V7.\n"
-"Le drapeau 'des crêtes' contrôle les rivières.\n"
-"Les drapeaux par défaut définis dans le moteur sont: montagnes, crêtes.\n"
-"La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
+"Attributs de terrain spécifiques à Mapgen V7.\n"
+"'ridges' sont les rivières.\n"
 "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
 "défaut.\n"
 "Les drapeaux commençant par \"non\" sont désactivés."
@@ -4030,8 +4051,9 @@ msgid "Smooth lighting"
 msgstr "Lumière douce"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 "Lisse les mouvement de la caméra en se déplaçant et en regardant autour.\n"
@@ -4143,6 +4165,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr "Le pilote vidéo pour Irrlicht."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -4169,6 +4197,15 @@ msgstr ""
 "taille en vidant\n"
 "l'ancienne file d'items. Une valeur de 0 désactive cette fonctionnalité."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+"L'intervalle en secondes entre des clics droits répétés lors de l'appui sur "
+"le bouton droit de la souris."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4570,237 +4607,132 @@ msgstr "Limite parallèle de cURL"
 msgid "cURL timeout"
 msgstr "Délais d'interruption de cURL"
 
-#~ msgid "Item textures..."
-#~ msgstr "Textures d'items..."
+#~ msgid "No of course not!"
+#~ msgstr "Non, bien sûr que non !"
 
+#~ msgid "Public Serverlist"
+#~ msgstr "Liste de serveurs publics"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normal Mapping"
+
+#~ msgid "No!!!"
+#~ msgstr "Non !"
+
+#, fuzzy
 #~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne "
-#~ "submerge pas\n"
-#~ "entièrement le bloc voisin.\n"
-#~ "Cette fonctionnalité est encore expérimentale et la lumière douce "
-#~ "n’apparaît pas à la\n"
-#~ "surface de l'eau."
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr ""
-#~ "Active l'éclairage des blocs pointés (et supprime les bordures noires de "
-#~ "sélection)."
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n"
-#~ "La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler "
-#~ "en nombre de blocs."
-
-#~ msgid ""
-#~ "Julia set: W value determining the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Série Julia : valeur W déterminant la forme 4D.\n"
-#~ "La portée est environ entre -2 et 2."
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Touche pour réduire la distance de vue. Modifie la distance de vue "
-#~ "minimale.\n"
-#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Touche pour augmenter la distance de vue. Modifie la distance de vue "
-#~ "minimale.\n"
-#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n"
-#~ "La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler "
-#~ "en nombre de blocs."
-
-#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
-#~ msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs."
-
-#~ msgid ""
-#~ "Mandelbrot set: Iterations of the recursive function.\n"
-#~ "Controls scale of finest detail."
-#~ msgstr ""
-#~ "Série Mandelbrot : itérations de la fonction récursive.\n"
-#~ "Contrôle l'échelle du détail le plus subtil."
-
-#~ msgid ""
-#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n"
-#~ "La portée est environ entre -2 et 2."
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen fractal.\n"
-#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Attributs de terrain spécifiques à Mapgen V7.\n"
-#~ "'ridges' sont les rivières.\n"
-#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
-#~ "par défaut.\n"
-#~ "Les drapeaux commençant par \"non\" sont désactivés."
+#~ "Attributs généraux de la génération de terrain.\n"
+#~ "Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent "
+#~ "leurs valeurs par défaut."
 
-#~ msgid "Mapgen fractal mandelbrot iterations"
-#~ msgstr "Mapgen Mandelbrot : itérations fractales"
+#~ msgid "\""
+#~ msgstr "\""
 
-#~ msgid "Mapgen fractal mandelbrot offset"
-#~ msgstr "Mapgen Mandelbrot : décalages fractals"
+#~ msgid "Enable a bit lower water surface, so it doesn't "
+#~ msgstr ""
+#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas "
+#~ "le bloc complètement.\n"
+#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux "
+#~ "ne fonctionne pas dessus. "
 
-#~ msgid "Mapgen fractal mandelbrot scale"
-#~ msgstr "Mapgen Mandelbrot : échelles fractales"
+#~ msgid "If disabled "
+#~ msgstr "Si désactivé "
 
-#~ msgid "Mapgen fractal mandelbrot slice w"
-#~ msgstr "Mapgen Mandelbrot : couche fractale W"
+#~ msgid "If enabled, "
+#~ msgstr "Si activé, "
+
+#~ msgid "Rendering:"
+#~ msgstr "Affichage :"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet"
+
+#~ msgid "Game Name"
+#~ msgstr "Nom du jeu"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\""
+
+#~ msgid "GAMES"
+#~ msgstr "JEUX"
+
+#~ msgid "Mods:"
+#~ msgstr "Mods :"
+
+#~ msgid "new game"
+#~ msgstr "nouveau jeu"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MODIFIER LE JEU"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Supprimer le mod sélectionné"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Ajouter un mod"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "DÉMARRER LE SERVEUR"
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "SETTINGS"
+#~ msgstr "PARAMÈTRES"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Précharger les objets"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Liquides limités"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "PARTIE SOLO"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACKS DE TEXTURES"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "Add mod:"
+#~ msgstr "Ajouter un mod :"
+
+#~ msgid "Local install"
+#~ msgstr "Installation locale"
 
 #~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n"
-#~ "Des valeurs plus grandes aboutissent à des locations plus proches de (x = "
-#~ "0, z = 0).\n"
-#~ "Des valeurs plus petites peut résulter à une location de spawn non-"
-#~ "trouvée, résultant\n"
-#~ "à une location située à (0, 0, 0) probablement enterrée sous le sol."
+#~ "Attention : certains mods ne sont pas encore configurés.\n"
+#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. "
 
 #~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
 #~ msgstr ""
-#~ "Images par seconde (FPS) minimum.\n"
-#~ "Le niveau de rendu est dynamiquement adapté selon ce paramètre et la "
-#~ "distance de vue (minimale et maximale)."
+#~ "Attention : certains mods configurés sont introuvables.\n"
+#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. "
 
-#~ msgid "New style water"
-#~ msgstr "Nouveau style de liquide"
-
-#~ msgid ""
-#~ "Pre-generate all item visuals used in the inventory.\n"
-#~ "This increases startup time, but runs smoother in-game.\n"
-#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
-#~ "the inventory."
-#~ msgstr ""
-#~ "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n"
-#~ "Cela augmente le temps de démarrage, mais rend les inventaires plus "
-#~ "fluides.\n"
-#~ "Les textures générées peuvent facilement déborder votre VRAM, causant des "
-#~ "bugs dans votre inventaire."
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Pré-chargement des textures d'inventaire"
-
-#~ msgid ""
-#~ "The allowed adjustment range for the automatic rendering range "
-#~ "adjustment.\n"
-#~ "Set this to be equal to viewing range minimum to disable the auto-"
-#~ "adjustment algorithm."
-#~ msgstr ""
-#~ "Distance d'affichage maximum.\n"
-#~ "Définir cette valeur égale à la distance de vue minimum pour désactiver\n"
-#~ "l'auto-ajustement dynamique de la distance d'affichage."
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Largeur initiale de la fenêtre de jeu."
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Portée verticale du spawn"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Distance de vue minimum"
-
-#~ msgid "Wanted FPS"
-#~ msgstr "FPS minimum"
-
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Réinitialiser le monde"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Taille appliquée aux menus : "
-
-#~ msgid "Downloading"
-#~ msgstr "Téléchargement"
-
-#~ msgid " KB/s"
-#~ msgstr " Ko/s"
-
-#~ msgid " MB/s"
-#~ msgstr " Mo/s"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr ""
-#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet"
-
-#~ msgid "is required by:"
-#~ msgstr "est requis par :"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Configuration enregistrée. "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Attention : configuration incorrecte. "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr ""
-#~ "Impossible de créer le monde : le nom contient des caractères invalides"
-
-#~ msgid "Show Public"
-#~ msgstr "Voir les serveurs publics"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Voir les serveurs favoris"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Laisser l'adresse vide pour lancer un serveur local."
-
-#~ msgid "Create world"
-#~ msgstr "Créer un monde"
-
-#~ msgid "Address required."
-#~ msgstr "Adresse requise."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Fichiers à supprimer"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Impossible de configurer ce monde : aucune sélection active"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés"
+#~ msgid "Delete map"
+#~ msgstr "Supprimer la carte"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4827,108 +4759,142 @@ msgstr "Délais d'interruption de cURL"
 #~ "- Échap : ce menu\n"
 #~ "- T : discuter\n"
 
-#~ msgid "Delete map"
-#~ msgstr "Supprimer la carte"
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Impossible de configurer ce monde : aucune sélection active"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Fichiers à supprimer"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné"
+
+#~ msgid "Address required."
+#~ msgstr "Adresse requise."
+
+#~ msgid "Create world"
+#~ msgstr "Créer un monde"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Laisser l'adresse vide pour lancer un serveur local."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Voir les serveurs favoris"
+
+#~ msgid "Show Public"
+#~ msgstr "Voir les serveurs publics"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr ""
+#~ "Impossible de créer le monde : le nom contient des caractères invalides"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Attention : configuration incorrecte. "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Configuration enregistrée. "
+
+#~ msgid "is required by:"
+#~ msgstr "est requis par :"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr ""
+#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet"
+
+#~ msgid " MB/s"
+#~ msgstr " Mo/s"
+
+#~ msgid " KB/s"
+#~ msgstr " Ko/s"
+
+#~ msgid "Downloading"
+#~ msgstr "Téléchargement"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Taille appliquée aux menus : "
+
+#~ msgid "Wanted FPS"
+#~ msgstr "FPS minimum"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Distance de vue minimum"
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Portée verticale du spawn"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Largeur initiale de la fenêtre de jeu."
 
 #~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ "The allowed adjustment range for the automatic rendering range "
+#~ "adjustment.\n"
+#~ "Set this to be equal to viewing range minimum to disable the auto-"
+#~ "adjustment algorithm."
 #~ msgstr ""
-#~ "Attention : certains mods configurés sont introuvables.\n"
-#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. "
+#~ "Distance d'affichage maximum.\n"
+#~ "Définir cette valeur égale à la distance de vue minimum pour désactiver\n"
+#~ "l'auto-ajustement dynamique de la distance d'affichage."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Pré-chargement des textures d'inventaire"
 
 #~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
+#~ "Pre-generate all item visuals used in the inventory.\n"
+#~ "This increases startup time, but runs smoother in-game.\n"
+#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
+#~ "the inventory."
 #~ msgstr ""
-#~ "Attention : certains mods ne sont pas encore configurés.\n"
-#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. "
+#~ "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n"
+#~ "Cela augmente le temps de démarrage, mais rend les inventaires plus "
+#~ "fluides.\n"
+#~ "Les textures générées peuvent facilement déborder votre VRAM, causant des "
+#~ "bugs dans votre inventaire."
 
-#~ msgid "Local install"
-#~ msgstr "Installation locale"
-
-#~ msgid "Add mod:"
-#~ msgstr "Ajouter un mod :"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACKS DE TEXTURES"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "PARTIE SOLO"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Liquides limités"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Précharger les objets"
-
-#~ msgid "SETTINGS"
-#~ msgstr "PARAMÈTRES"
-
-#~ msgid "Password"
-#~ msgstr "Mot de passe"
-
-#~ msgid "Name"
-#~ msgstr "Nom"
-
-#~ msgid "START SERVER"
-#~ msgstr "DÉMARRER LE SERVEUR"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Ajouter un mod"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Supprimer le mod sélectionné"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MODIFIER LE JEU"
-
-#~ msgid "new game"
-#~ msgstr "nouveau jeu"
-
-#~ msgid "Mods:"
-#~ msgstr "Mods :"
-
-#~ msgid "GAMES"
-#~ msgstr "JEUX"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Nom du jeu"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet"
-
-#~ msgid "Rendering:"
-#~ msgstr "Affichage :"
-
-#~ msgid "If enabled, "
-#~ msgstr "Si activé, "
-
-#~ msgid "If disabled "
-#~ msgstr "Si désactivé "
-
-#~ msgid "Enable a bit lower water surface, so it doesn't "
-#~ msgstr ""
-#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas "
-#~ "le bloc complètement.\n"
-#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux "
-#~ "ne fonctionne pas dessus. "
-
-#~ msgid "\""
-#~ msgstr "\""
+#~ msgid "New style water"
+#~ msgstr "Nouveau style de liquide"
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "'ridges' are the rivers.\n"
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Images par seconde (FPS) minimum.\n"
+#~ "Le niveau de rendu est dynamiquement adapté selon ce paramètre et la "
+#~ "distance de vue (minimale et maximale)."
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n"
+#~ "Des valeurs plus grandes aboutissent à des locations plus proches de (x = "
+#~ "0, z = 0).\n"
+#~ "Des valeurs plus petites peut résulter à une location de spawn non-"
+#~ "trouvée, résultant\n"
+#~ "à une location située à (0, 0, 0) probablement enterrée sous le sol."
+
+#~ msgid "Mapgen fractal mandelbrot slice w"
+#~ msgstr "Mapgen Mandelbrot : couche fractale W"
+
+#~ msgid "Mapgen fractal mandelbrot scale"
+#~ msgstr "Mapgen Mandelbrot : échelles fractales"
+
+#~ msgid "Mapgen fractal mandelbrot offset"
+#~ msgstr "Mapgen Mandelbrot : décalages fractals"
+
+#~ msgid "Mapgen fractal mandelbrot iterations"
+#~ msgstr "Mapgen Mandelbrot : itérations fractales"
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen fractal.\n"
+#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
 #~ "Flags starting with \"no\" are used to explicitly disable them."
@@ -4939,30 +4905,119 @@ msgstr "Délais d'interruption de cURL"
 #~ "par défaut.\n"
 #~ "Les drapeaux commençant par \"non\" sont désactivés."
 
-#, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n"
+#~ "La portée est environ entre -2 et 2."
+
+#~ msgid ""
+#~ "Mandelbrot set: Iterations of the recursive function.\n"
+#~ "Controls scale of finest detail."
+#~ msgstr ""
+#~ "Série Mandelbrot : itérations de la fonction récursive.\n"
+#~ "Contrôle l'échelle du détail le plus subtil."
+
+#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+#~ msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs."
+
+#~ msgid ""
+#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n"
+#~ "La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler "
+#~ "en nombre de blocs."
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Touche pour augmenter la distance de vue. Modifie la distance de vue "
+#~ "minimale.\n"
+#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Touche pour réduire la distance de vue. Modifie la distance de vue "
+#~ "minimale.\n"
+#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Julia set: W value determining the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Série Julia : valeur W déterminant la forme 4D.\n"
+#~ "La portée est environ entre -2 et 2."
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n"
+#~ "La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler "
+#~ "en nombre de blocs."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr ""
+#~ "Active l'éclairage des blocs pointés (et supprime les bordures noires de "
+#~ "sélection)."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne "
+#~ "submerge pas\n"
+#~ "entièrement le bloc voisin.\n"
+#~ "Cette fonctionnalité est encore expérimentale et la lumière douce "
+#~ "n’apparaît pas à la\n"
+#~ "surface de l'eau."
+
+#~ msgid "Item textures..."
+#~ msgstr "Textures d'items..."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Attributs généraux de la génération de terrain.\n"
-#~ "Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent "
-#~ "leurs valeurs par défaut."
+#~ "Attributs spécifiques à Mapgen V7.\n"
+#~ "Le drapeau 'des crêtes' contrôle les rivières.\n"
+#~ "Les drapeaux par défaut définis dans le moteur sont: montagnes, crêtes.\n"
+#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
+#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
+#~ "par défaut.\n"
+#~ "Les drapeaux commençant par \"non\" sont désactivés."
 
-#~ msgid "No!!!"
-#~ msgstr "Non !"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normal Mapping"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Liste de serveurs publics"
-
-#~ msgid "No of course not!"
-#~ msgstr "Non, bien sûr que non !"
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Attributs de terrain spécifiques au générateur de carte plate.\n"
+#~ "Lacs et collines peuvent partiellement être ajoutés à un monde plat.\n"
+#~ "Aucun drapeau par défaut défini dans le moteur.\n"
+#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
+#~ "Les drapeaux qui ne sont pas spécifiés dans le champ gardent leurs "
+#~ "valeurs par défaut.\n"
+#~ "Les drapeaux commençant par \"non\" sont désactivés."
diff --git a/po/he/minetest.po b/po/he/minetest.po
index f3e1e6500..0a10da50d 100644
--- a/po/he/minetest.po
+++ b/po/he/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-05-26 21:01+0000\n"
 "Last-Translator: yuval hreman <huckvrni@gmail.com>\n"
-"Language-Team: Hebrew "
-"<https://hosted.weblate.org/projects/minetest/minetest/he/>\n"
+"Language-Team: Hebrew <https://hosted.weblate.org/projects/minetest/minetest/"
+"he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -100,8 +100,8 @@ msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
-"טעינת המוד \"1$\" נכשלה מכיוון שהוא מכיל תווים לא חוקיים. רק התווים [a-z0-9_]"
-" מותרים."
+"טעינת המוד \"1$\" נכשלה מכיוון שהוא מכיל תווים לא חוקיים. רק התווים [a-"
+"z0-9_] מותרים."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -589,6 +589,11 @@ msgstr ""
 msgid "Particles"
 msgstr "חלקיקים"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "שרת"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "הגדרות"
@@ -1760,6 +1765,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1784,6 +1801,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2070,8 +2091,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2266,6 +2285,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2644,8 +2671,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2655,8 +2680,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2667,8 +2690,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2678,8 +2699,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3594,7 +3613,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3690,6 +3709,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3705,6 +3730,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4038,8 +4069,8 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Public Serverlist"
-#~ msgstr "רשימת שרתים פומבי"
-
 #~ msgid "No of course not!"
 #~ msgstr "לא ברור שלא!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "רשימת שרתים פומבי"
diff --git a/po/hu/minetest.po b/po/hu/minetest.po
index 776ce693f..7af585181 100644
--- a/po/hu/minetest.po
+++ b/po/hu/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-05-07 03:17+0000\n"
 "Last-Translator: Kisbenedek Márton <martonkisbenedek@gmail.com>\n"
-"Language-Team: Hungarian "
-"<https://hosted.weblate.org/projects/minetest/minetest/hu/>\n"
+"Language-Team: Hungarian <https://hosted.weblate.org/projects/minetest/"
+"minetest/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -599,6 +599,10 @@ msgstr "Parallax Occlusion"
 msgid "Particles"
 msgstr "Részecskék"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Egyjátékos világ visszaállítása"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Beállítások"
@@ -1860,6 +1864,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Csalás elleni védelem letiltása"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Üres jelszavak tiltása"
@@ -1884,6 +1900,10 @@ msgstr "Tárgy eldobás gomb"
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "VBO engedélyez"
@@ -2191,16 +2211,22 @@ msgid "Generate normalmaps"
 msgstr "Normálfelületek generálása"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Térkép generálási jellemzők csak a Flat (lapos) térképgenerátor esetében.\n"
+"Esetenkénti tavak és dombok generálása a lapos világba.\n"
+"The default flags set in the engine are: none\n"
+"The flags string modifies the engine defaults.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with \"no\" are used to explicitly disable them."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
@@ -2414,6 +2440,16 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick button repetition invterval"
+msgstr "Jobb kattintás ismétlés időköz"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick frustum sensitivity"
+msgstr "Egér érzékenység"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2884,8 +2920,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2907,8 +2941,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2927,8 +2959,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2943,15 +2973,21 @@ msgstr ""
 "Flags starting with \"no\" are used to explicitly disable them."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Térkép generálási jellemzők csak a Flat (lapos) térképgenerátor esetében.\n"
+"Esetenkénti tavak és dombok generálása a lapos világba.\n"
+"The default flags set in the engine are: none\n"
+"The flags string modifies the engine defaults.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with \"no\" are used to explicitly disable them."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -3913,8 +3949,9 @@ msgid "Smooth lighting"
 msgstr "Simított megvilágítás"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 "Kamera mozgásának simítása mozgáskor és körbenézéskor.\n"
@@ -4016,6 +4053,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -4031,6 +4074,15 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+"Ennyi másodperc szükséges az ismételt jobb kattintáshoz a jobb egérgomb "
+"nyomva tartásakor."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4392,173 +4444,17 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Item textures..."
-#~ msgstr "Elem textúrák..."
+#~ msgid "No of course not!"
+#~ msgstr "Persze, hogy nem!"
 
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg "
-#~ "teljesen a blokkot.\n"
-#~ "Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n"
-#~ "így nem működik a víz felszínén."
+#~ msgid "Public Serverlist"
+#~ msgstr "Nyilvános szerverlista"
 
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr ""
-#~ "Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a "
-#~ "kijelölődobozt)."
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normálfelületek generálása"
 
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n"
-#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n"
-#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Maximum távolság a vízszinttől, ahol a játékosok újraéledhetnek/"
-#~ "megjelenhetnek csatlakozáskor (spawn).\n"
-#~ "Magasabb értékek közelebb visznek az (x = 0, z = 0)-hoz.\n"
-#~ "Alacsonyabb értékek azt eredményezhetik, hogy nem lesz megfelelő pont a "
-#~ "feléledéshez,\n"
-#~ "(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz."
-
-#, fuzzy
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Minimum kívánt FPS.\n"
-#~ "A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a "
-#~ "látórerület min és max)."
-
-#~ msgid "New style water"
-#~ msgstr "Új stílusú víz"
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Eszköztár textúráinak előtöltése"
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Függőleges kezdeti ablak méret."
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Az (újra)éledés függőleges irányú területe"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Minimum látóterület"
-
-#~ msgid "Wanted FPS"
-#~ msgstr "Kívánt FPS"
-
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Egyjátékos világ visszaállítása"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "A méretarány alkalmazva a menü elemekre: "
-
-#, fuzzy
-#~ msgid "Touch free target"
-#~ msgstr "Touch free target"
-
-#, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Le"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat"
-
-#~ msgid "is required by:"
-#~ msgstr "kell neki:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Beállítások mentve.  "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Figyelem: A beállítások nem egyformák.  "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak"
-
-#~ msgid "Show Public"
-#~ msgstr "Publikus mutatása"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Kedvencek mutatása"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts."
-
-#~ msgid "Create world"
-#~ msgstr "Világ létrehozása"
-
-#~ msgid "Address required."
-#~ msgstr "Cím szükséges."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Nem törölhető a világ: Nincs kiválasztva"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "A fájl törölve lett"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Hiba az összes világ törlése közben"
-
-#, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Végtelen folyadék"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Előretöltött tárgy láthatóság"
-
-#, fuzzy
-#~ msgid "Password"
-#~ msgstr "Régi jelszó"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Játék"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet"
-
-#~ msgid "Rendering:"
-#~ msgstr "Renderelés:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Engedélyez"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Csomag letiltás"
+#~ msgid "No!!!"
+#~ msgstr "Nem!!!"
 
 #, fuzzy
 #~ msgid ""
@@ -4582,14 +4478,167 @@ msgstr ""
 #~ "water would tend to pool. It may interfere with delicately adjusted "
 #~ "biomes."
 
-#~ msgid "No!!!"
-#~ msgstr "Nem!!!"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Csomag letiltás"
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normálfelületek generálása"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Engedélyez"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Nyilvános szerverlista"
+#~ msgid "Rendering:"
+#~ msgstr "Renderelés:"
 
-#~ msgid "No of course not!"
-#~ msgstr "Persze, hogy nem!"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet"
+
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Játék"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Régi jelszó"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Előretöltött tárgy láthatóság"
+
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Végtelen folyadék"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Hiba az összes világ törlése közben"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "A fájl törölve lett"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Nem törölhető a világ: Nincs kiválasztva"
+
+#~ msgid "Address required."
+#~ msgstr "Cím szükséges."
+
+#~ msgid "Create world"
+#~ msgstr "Világ létrehozása"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Kedvencek mutatása"
+
+#~ msgid "Show Public"
+#~ msgstr "Publikus mutatása"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Figyelem: A beállítások nem egyformák.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Beállítások mentve.  "
+
+#~ msgid "is required by:"
+#~ msgstr "kell neki:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat"
+
+#, fuzzy
+#~ msgid "Downloading"
+#~ msgstr "Le"
+
+#, fuzzy
+#~ msgid "Touch free target"
+#~ msgstr "Touch free target"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "A méretarány alkalmazva a menü elemekre: "
+
+#~ msgid "Wanted FPS"
+#~ msgstr "Kívánt FPS"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Minimum látóterület"
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Az (újra)éledés függőleges irányú területe"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Függőleges kezdeti ablak méret."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Eszköztár textúráinak előtöltése"
+
+#~ msgid "New style water"
+#~ msgstr "Új stílusú víz"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Minimum kívánt FPS.\n"
+#~ "A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a "
+#~ "látórerület min és max)."
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Maximum távolság a vízszinttől, ahol a játékosok újraéledhetnek/"
+#~ "megjelenhetnek csatlakozáskor (spawn).\n"
+#~ "Magasabb értékek közelebb visznek az (x = 0, z = 0)-hoz.\n"
+#~ "Alacsonyabb értékek azt eredményezhetik, hogy nem lesz megfelelő pont a "
+#~ "feléledéshez,\n"
+#~ "(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz."
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n"
+#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n"
+#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr ""
+#~ "Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a "
+#~ "kijelölődobozt)."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg "
+#~ "teljesen a blokkot.\n"
+#~ "Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n"
+#~ "így nem működik a víz felszínén."
+
+#~ msgid "Item textures..."
+#~ msgstr "Elem textúrák..."
diff --git a/po/id/minetest.po b/po/id/minetest.po
index 24a2deb45..5571967f5 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-06-23 16:06+0000\n"
 "Last-Translator: Muhammad Rifqi Priyo Susanto "
 "<muhammadrifqipriyosusanto@gmail.com>\n"
-"Language-Team: Indonesian "
-"<https://hosted.weblate.org/projects/minetest/minetest/id/>\n"
+"Language-Team: Indonesian <https://hosted.weblate.org/projects/minetest/"
+"minetest/id/>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -607,6 +607,10 @@ msgstr "Parallax Occlusion"
 msgid "Particles"
 msgstr "Partikel"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Atur ulang dunia pemain tunggal"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Pengaturan"
@@ -1455,8 +1459,8 @@ msgid ""
 "minetest.net."
 msgstr ""
 "Mengumumkan kepada daftar server ini.\n"
-"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = "
-"v6.servers.minetest.net."
+"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = v6."
+"servers.minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
@@ -1876,6 +1880,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Nonaktifkan anticurang (anticheat)"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Larang kata sandi kosong"
@@ -1900,6 +1916,10 @@ msgstr "Tombol menjatuhkan barang"
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "Aktifkan VBO"
@@ -2209,8 +2229,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2321,8 +2339,8 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
-"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node padat."
-"\n"
+"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node "
+"padat.\n"
 "Hal ini memerlukan hak istimewa \"noclip\" pada server."
 
 #: src/settings_translation_file.cpp
@@ -2414,6 +2432,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2458,8 +2484,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengurangi jarak pandang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2468,8 +2494,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk menjatuhkan barang yang sedang dipilih.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2478,8 +2504,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk menambah jarak pandang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2488,8 +2514,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk lompat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2498,8 +2524,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak cepat dalam mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2508,8 +2534,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak mundur.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2518,8 +2544,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak maju.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2528,8 +2554,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak ke kiri.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2538,8 +2564,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak ke kanan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2548,8 +2574,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka konsol obrolan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2558,8 +2584,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka jendela obrolan untuk mengetik perintah.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2568,8 +2594,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka jendela obrolan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2578,8 +2604,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka inventaris.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2597,8 +2623,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk menyelinap.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2607,8 +2633,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengganti kamera antara orang pertama dan ketiga.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2617,8 +2643,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengambil tangkapan layar.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2627,8 +2653,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode sinema.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2637,8 +2663,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mennganti tampilan peta mini.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2647,8 +2673,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2657,8 +2683,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih terbang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2667,8 +2693,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode tembus blok.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2684,8 +2710,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan info debug.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2694,8 +2720,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan HUD.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2704,8 +2730,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan obrolan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2714,8 +2740,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan kabut.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2731,8 +2757,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih menjadi jarak pandang tanpa batas.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
@@ -2870,8 +2896,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2881,8 +2905,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2893,8 +2915,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2904,8 +2924,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3852,7 +3870,7 @@ msgstr "Pencahayaan halus"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3951,6 +3969,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3966,6 +3990,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4299,53 +4329,50 @@ msgstr "Batas cURL paralel"
 msgid "cURL timeout"
 msgstr "Batas waktu cURL"
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Memuat tekstur..."
+#~ msgid "No of course not!"
+#~ msgstr "Tentu tidak!"
 
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Atur ulang dunia pemain tunggal"
+#~ msgid "Public Serverlist"
+#~ msgstr "Daftar Server Publik"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Faktor skala yang diatur untuk elemen menu: "
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Hasilkan Normalmaps"
 
-#~ msgid "Touch free target"
-#~ msgstr "Bebas sentuhan"
+#~ msgid "No!!!"
+#~ msgstr "Tidak!!!"
 
-#~ msgid "Downloading"
-#~ msgstr "Mengunduh"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/detik"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/detik"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih"
-
-#~ msgid "Rendering:"
-#~ msgstr "Rendering:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "diaktifkan"
+#~ msgid "\""
+#~ msgstr "\""
 
 #, fuzzy
 #~ msgid "If disabled "
 #~ msgstr "Nonaktifkan PM"
 
-#~ msgid "\""
-#~ msgstr "\""
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "diaktifkan"
 
-#~ msgid "No!!!"
-#~ msgstr "Tidak!!!"
+#~ msgid "Rendering:"
+#~ msgstr "Rendering:"
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Hasilkan Normalmaps"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Daftar Server Publik"
+#~ msgid " MB/s"
+#~ msgstr " MB/detik"
 
-#~ msgid "No of course not!"
-#~ msgstr "Tentu tidak!"
+#~ msgid " KB/s"
+#~ msgstr " KB/detik"
+
+#~ msgid "Downloading"
+#~ msgstr "Mengunduh"
+
+#~ msgid "Touch free target"
+#~ msgstr "Bebas sentuhan"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Faktor skala yang diatur untuk elemen menu: "
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Memuat tekstur..."
diff --git a/po/it/minetest.po b/po/it/minetest.po
index bd6a22e32..3a94e4200 100644
--- a/po/it/minetest.po
+++ b/po/it/minetest.po
@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Minetest 0.4.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-05-14 13:34+0000\n"
 "Last-Translator: Emon Omen <emon@openmailbox.org>\n"
-"Language-Team: Italian "
-"<https://hosted.weblate.org/projects/minetest/minetest/it/>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/minetest/"
+"minetest/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -597,6 +597,11 @@ msgstr "Occlusione di parallasse"
 msgid "Particles"
 msgstr "Particelle"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Siete certi di volere azzerare il vostro mondo di giocatore singolo?"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Impostazioni"
@@ -1633,8 +1638,8 @@ msgid ""
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 "Lista separata da virgole dei mod affidabili ai quali è permesso accedere a "
-"funzioni non sicure anche quando il valore \"mod security\" è impostato su \""
-"on\" (utilizzando request_insecure_environment())."
+"funzioni non sicure anche quando il valore \"mod security\" è impostato su "
+"\"on\" (utilizzando request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1878,6 +1883,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Disabilita anti-trucchi"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Rifiutare le password vuote"
@@ -1903,6 +1920,10 @@ msgstr "Tasto per il rilascio di un oggetto"
 msgid "Dump the mapgen debug infos."
 msgstr "Pubblica le informazioni di debug del generatore della mappa."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "Abilitare VBO"
@@ -1950,8 +1971,8 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
-"Abilita l'utilizzo di un server di materiale remoto (se fornito dal server)."
-"\n"
+"Abilita l'utilizzo di un server di materiale remoto (se fornito dal "
+"server).\n"
 "I server remoti offrono un modo significativamente più veloce di "
 "scaricamento\n"
 "del materiale (ad es. le immagini) quando ci si collega al server."
@@ -2230,12 +2251,11 @@ msgid "Generate normalmaps"
 msgstr "Generare le normalmap"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2478,6 +2498,16 @@ msgstr ""
 "Iterazioni della funzione ricorsiva.\n"
 "Controlla l'ammontare del dettaglio fine."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick button repetition invterval"
+msgstr "Intervallo di ripetizione del click destro"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick frustum sensitivity"
+msgstr "Sensibilità del mouse"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2975,6 +3005,7 @@ msgid "Map directory"
 msgstr "Cartella della mappa"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -2982,14 +3013,12 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributi di generazione della mappa specifici per il Generatore mappa valli."
-"\n"
+"Attributi di generazione della mappa specifici per il Generatore mappa "
+"valli.\n"
 "'altitude_chill' rende più fredde le altitudini più elevate, il che potrebbe "
 "causare problemi di bioma.\n"
 "'humid_rivers' modifica l'umidità attorno ai fiumi e in aree dove l'acqua "
@@ -3004,32 +3033,27 @@ msgstr ""
 "esplicitamente."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributi di generazione della mappa specifici per Generatore mappa piatto.\n"
-"Laghi e colline occasionali possono essere aggiunti al mondo piatto.\n"
-"Le impostazioni predefinite impostate nel motore sono: nessuna\n"
-"La stringa delle impostazioni modifica le impostazioni predefinite del "
-"motore.\n"
+"Attributi di generazione della mappa specifici per Generatore mappa v. 7.\n"
+"'ridges' sono i fiumi.\n"
 "Le impostazioni che non sono specificate nella stringa mantengono i valori "
 "predefiniti.\n"
 "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
 "esplicitamente."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3046,20 +3070,16 @@ msgstr ""
 "esplicitamente."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributi di generazione della mappa specifici per Generatore mappa v. 6.\n"
-"L'impostazione 'ridges' controlla i fiumi.\n"
-"Le impostazioni predefinite impostate nel motore sono: mountains, ridges\n"
-"La stringa delle impostazioni modifica le impostazioni predefinite del "
-"motore.\n"
+"Attributi di generazione della mappa specifici per Generatore mappa v. 7.\n"
+"'ridges' sono i fiumi.\n"
 "Le impostazioni che non sono specificate nella stringa mantengono i valori "
 "predefiniti.\n"
 "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
@@ -4055,8 +4075,9 @@ msgid "Smooth lighting"
 msgstr "Illuminazione uniforme"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 "Rende fluida la camera quando ci si muove e si guarda attorno.\n"
@@ -4170,6 +4191,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr "Il supporto di rendering per Irrlicht."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -4197,6 +4224,15 @@ msgstr ""
 "scaricando gli oggetti della vecchia coda. Un valore 0 disattiva questa "
 "funzionalità."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+"Il tempo in secondi richiesto tra click destri ripetuti quando si tiene il "
+"pulsante mouse destro."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4596,101 +4632,17 @@ msgstr "Limite cURL parallelo"
 msgid "cURL timeout"
 msgstr "Tempo di scadenza cURL"
 
-#~ msgid "Item textures..."
-#~ msgstr "Immagini degli oggetti..."
+#~ msgid "No of course not!"
+#~ msgstr "No, certo che no!"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "Precaricamento delle textures dell'inventario"
+#~ msgid "Public Serverlist"
+#~ msgstr "Elenco dei server pubblici"
 
-#~ msgid "Viewing range minimum"
-#~ msgstr "Distanza minima di visibilità"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generare normalmap"
 
-#~ msgid "Wanted FPS"
-#~ msgstr "FPS desiderati"
-
-#~ msgid "Local install"
-#~ msgstr "Installazione locale"
-
-#~ msgid "Add mod:"
-#~ msgstr "Aggiungere un modulo:"
-
-#~ msgid "MODS"
-#~ msgstr "MODULI"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACCH. DI IMM."
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "GIOC. SING."
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Liquido limitato"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Precaricare le immagini"
-
-#~ msgid "SETTINGS"
-#~ msgstr "IMPOSTAZIONI"
-
-#~ msgid "Password"
-#~ msgstr "Password"
-
-#~ msgid "Name"
-#~ msgstr "Nome"
-
-#~ msgid "START SERVER"
-#~ msgstr "AVVIO SERVER"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Aggiungere il modulo"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Rimuovere il modulo selezionato"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MODIFICARE IL GIOCO"
-
-#~ msgid "new game"
-#~ msgstr "nuovo gioco"
-
-#~ msgid "Mods:"
-#~ msgstr "Moduli:"
-
-#~ msgid "GAMES"
-#~ msgstr "GIOCHI"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Nome del gioco"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Riavviare minetest per rendere effettive le modifiche"
-
-#~ msgid "If enabled, "
-#~ msgstr "attivata"
-
-#~ msgid "If disabled "
-#~ msgstr "Disatt. pacch."
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "'ridges' are the rivers.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
-#~ msgstr ""
-#~ "Attributi di generazione della mappa specifici per Generatore mappa v. "
-#~ "7.\n"
-#~ "'ridges' sono i fiumi.\n"
-#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
-#~ "valori predefiniti.\n"
-#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
-#~ "esplicitamente."
+#~ msgid "No!!!"
+#~ msgstr "No!!!"
 
 #~ msgid ""
 #~ "Map generation attributes specific to Mapgen Valleys.\n"
@@ -4714,14 +4666,123 @@ msgstr "Tempo di scadenza cURL"
 #~ "\"humid_rivers\" modifica l'umidità attorno ai fiumi e nelle aree in cui "
 #~ "l'acqua tenderebbe a stagnare. Potrebbe interferire con biomi"
 
-#~ msgid "No!!!"
-#~ msgstr "No!!!"
+#~ msgid "If disabled "
+#~ msgstr "Disatt. pacch."
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generare normalmap"
+#~ msgid "If enabled, "
+#~ msgstr "attivata"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Elenco dei server pubblici"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Riavviare minetest per rendere effettive le modifiche"
 
-#~ msgid "No of course not!"
-#~ msgstr "No, certo che no!"
+#~ msgid "Game Name"
+#~ msgstr "Nome del gioco"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\""
+
+#~ msgid "GAMES"
+#~ msgstr "GIOCHI"
+
+#~ msgid "Mods:"
+#~ msgstr "Moduli:"
+
+#~ msgid "new game"
+#~ msgstr "nuovo gioco"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MODIFICARE IL GIOCO"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Rimuovere il modulo selezionato"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Aggiungere il modulo"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "AVVIO SERVER"
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "Password"
+#~ msgstr "Password"
+
+#~ msgid "SETTINGS"
+#~ msgstr "IMPOSTAZIONI"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Precaricare le immagini"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Liquido limitato"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "GIOC. SING."
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACCH. DI IMM."
+
+#~ msgid "MODS"
+#~ msgstr "MODULI"
+
+#~ msgid "Add mod:"
+#~ msgstr "Aggiungere un modulo:"
+
+#~ msgid "Local install"
+#~ msgstr "Installazione locale"
+
+#~ msgid "Wanted FPS"
+#~ msgstr "FPS desiderati"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Distanza minima di visibilità"
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Precaricamento delle textures dell'inventario"
+
+#~ msgid "Item textures..."
+#~ msgstr "Immagini degli oggetti..."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Attributi di generazione della mappa specifici per Generatore mappa v. "
+#~ "6.\n"
+#~ "L'impostazione 'ridges' controlla i fiumi.\n"
+#~ "Le impostazioni predefinite impostate nel motore sono: mountains, ridges\n"
+#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
+#~ "motore.\n"
+#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
+#~ "valori predefiniti.\n"
+#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
+#~ "esplicitamente."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Attributi di generazione della mappa specifici per Generatore mappa "
+#~ "piatto.\n"
+#~ "Laghi e colline occasionali possono essere aggiunti al mondo piatto.\n"
+#~ "Le impostazioni predefinite impostate nel motore sono: nessuna\n"
+#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
+#~ "motore.\n"
+#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
+#~ "valori predefiniti.\n"
+#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
+#~ "esplicitamente."
diff --git a/po/ja/minetest.po b/po/ja/minetest.po
index c6bc38d74..7c63ee0b0 100644
--- a/po/ja/minetest.po
+++ b/po/ja/minetest.po
@@ -2,11 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-05-07 16:10+0000\n"
 "Last-Translator: BreadW <toshiharu.uno@gmail.com>\n"
-"Language-Team: Japanese "
-"<https://hosted.weblate.org/projects/minetest/minetest/ja/>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/minetest/"
+"minetest/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -590,6 +590,10 @@ msgstr "視差遮蔽マッピング"
 msgid "Particles"
 msgstr "パーティクル有効化"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "シングルプレイヤーのワールドをリセット"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "設定"
@@ -1908,6 +1912,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "対チート機関無効化"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Disallow empty passwords"
@@ -1937,6 +1953,10 @@ msgstr "アイテムを捨てるキー"
 msgid "Dump the mapgen debug infos."
 msgstr "マップ生成のデバッグ情報を出力します。"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "有効化"
@@ -2290,8 +2310,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2486,6 +2504,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2864,8 +2890,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2875,8 +2899,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2887,8 +2909,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2898,8 +2918,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3820,7 +3838,7 @@ msgstr "滑らかな照明"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3916,6 +3934,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3931,6 +3955,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4285,45 +4315,42 @@ msgstr "cURLパラレル制限"
 msgid "cURL timeout"
 msgstr "cURLタイムアウト"
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "テクスチャ読み込み中..."
-
-#~ msgid "Reset singleplayer world"
-#~ msgstr "シングルプレイヤーのワールドをリセット"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "メニューの大きさとして設定されている数値: "
-
-#~ msgid "Touch free target"
-#~ msgstr "タッチ位置を自由にする"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/秒"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/秒"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "ドライバーを変更するためMinetestを再起動します"
-
-#~ msgid "Rendering:"
-#~ msgstr "レンダリング:"
-
-#~ msgid "If enabled, "
-#~ msgstr "有効化の場合 "
-
-#~ msgid "If disabled "
-#~ msgstr "無効化の場合 "
-
-#~ msgid "No!!!"
-#~ msgstr "いいえ！！！"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "ノーマルマップの生成"
+#~ msgid "No of course not!"
+#~ msgstr "いいえ！"
 
 #~ msgid "Public Serverlist"
 #~ msgstr "公開サーバ一覧"
 
-#~ msgid "No of course not!"
-#~ msgstr "いいえ！"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "ノーマルマップの生成"
+
+#~ msgid "No!!!"
+#~ msgstr "いいえ！！！"
+
+#~ msgid "If disabled "
+#~ msgstr "無効化の場合 "
+
+#~ msgid "If enabled, "
+#~ msgstr "有効化の場合 "
+
+#~ msgid "Rendering:"
+#~ msgstr "レンダリング:"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "ドライバーを変更するためMinetestを再起動します"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/秒"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/秒"
+
+#~ msgid "Touch free target"
+#~ msgstr "タッチ位置を自由にする"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "メニューの大きさとして設定されている数値: "
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "テクスチャ読み込み中..."
diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po
index 522433c1a..362917350 100644
--- a/po/jbo/minetest.po
+++ b/po/jbo/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-05-08 17:39+0000\n"
 "Last-Translator: senpi <saikos@openmailbox.org>\n"
-"Language-Team: Lojban "
-"<https://hosted.weblate.org/projects/minetest/minetest/jbo/>\n"
+"Language-Team: Lojban <https://hosted.weblate.org/projects/minetest/minetest/"
+"jbo/>\n"
 "Language: jbo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -606,6 +606,10 @@ msgstr ""
 msgid "Particles"
 msgstr "lo kantu"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "kraga'igau le za'e pavykelci munje"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr ""
@@ -1800,6 +1804,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "lo kantu"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1824,6 +1840,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2112,8 +2132,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2308,6 +2326,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2690,8 +2716,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2701,8 +2725,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2713,8 +2735,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2724,8 +2744,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3651,7 +3669,7 @@ msgstr "lo xutla se gusni"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3748,6 +3766,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3763,6 +3787,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4102,19 +4132,16 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr ".i ca'o samymo'i le tengu datnyvei"
+#~ msgid "No of course not!"
+#~ msgstr "nasai go'i"
 
-#~ msgid "Reset singleplayer world"
-#~ msgstr "kraga'igau le za'e pavykelci munje"
+#~ msgid "No!!!"
+#~ msgstr "nasai go'i"
 
 #, fuzzy
 #~ msgid "If enabled, "
 #~ msgstr "selpli"
 
-#~ msgid "No!!!"
-#~ msgstr "nasai go'i"
-
-#~ msgid "No of course not!"
-#~ msgstr "nasai go'i"
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr ".i ca'o samymo'i le tengu datnyvei"
diff --git a/po/ko/minetest.po b/po/ko/minetest.po
index bf5ba3da9..6981029a2 100644
--- a/po/ko/minetest.po
+++ b/po/ko/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2015-07-08 23:30+0200\n"
 "Last-Translator: Tae Lim Kook <tkook11@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -586,6 +586,10 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr ""
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr ""
@@ -1757,6 +1761,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1781,6 +1797,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr ""
@@ -2067,8 +2087,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2262,6 +2280,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2640,8 +2666,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2651,8 +2675,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2663,8 +2685,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2674,8 +2694,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3590,7 +3608,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3686,6 +3704,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3701,6 +3725,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
diff --git a/po/ky/minetest.po b/po/ky/minetest.po
index 01a5910be..ec59e03f5 100644
--- a/po/ky/minetest.po
+++ b/po/ky/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2013-06-01 18:09+0200\n"
 "Last-Translator: Chynggyz Jumaliev <translatorky@lavabit.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -625,6 +625,11 @@ msgstr ""
 msgid "Particles"
 msgstr "Баарын күйгүзүү"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Бир кишилик"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Ырастоолор"
@@ -1850,6 +1855,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Бөлүкчөлөрдү күйгүзүү"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1874,6 +1891,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2164,8 +2185,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2361,6 +2380,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2743,8 +2770,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2754,8 +2779,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2766,8 +2789,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2777,8 +2798,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3703,7 +3722,7 @@ msgstr "Тегиз жарык"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3800,6 +3819,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3815,6 +3840,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4154,54 +4185,28 @@ msgid "cURL timeout"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Жүктөлүүдө..."
+#~ msgid "Public Serverlist"
+#~ msgstr "Жалпылык серверлердин тизмеси:"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Ылдый"
+#~ msgid "If disabled "
+#~ msgstr "Баарын өчүрүү"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "күйгүзүлгөн"
 
-#~ msgid "is required by:"
-#~ msgstr "талап кылынганы:"
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Оюн"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Конфигурация сакталды.  "
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Эски сырсөз"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Эскертүү: Туура эмес конфигурация.  "
-
-#~ msgid "Show Public"
-#~ msgstr "Жалпылыкты көрсөтүү"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Тандалмаларды көрсөтүү"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз."
-
-#~ msgid "Create world"
-#~ msgstr "Дүйнөнү жаратуу"
-
-#~ msgid "Address required."
-#~ msgstr "Дареги талап кылынат."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Өчүрүлө турган файлдар"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок"
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Чектүү суюктук"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4228,26 +4233,52 @@ msgstr ""
 #~ "- ESC: бул меню\n"
 #~ "- T: маек\n"
 
-#, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Чектүү суюктук"
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Өчүрүлө турган файлдар"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок"
+
+#~ msgid "Address required."
+#~ msgstr "Дареги талап кылынат."
+
+#~ msgid "Create world"
+#~ msgstr "Дүйнөнү жаратуу"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Тандалмаларды көрсөтүү"
+
+#~ msgid "Show Public"
+#~ msgstr "Жалпылыкты көрсөтүү"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Эскертүү: Туура эмес конфигурация.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Конфигурация сакталды.  "
+
+#~ msgid "is required by:"
+#~ msgstr "талап кылынганы:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу"
 
 #, fuzzy
-#~ msgid "Password"
-#~ msgstr "Эски сырсөз"
+#~ msgid "Downloading"
+#~ msgstr "Ылдый"
 
 #, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Оюн"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "күйгүзүлгөн"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Баарын өчүрүү"
-
-#, fuzzy
-#~ msgid "Public Serverlist"
-#~ msgstr "Жалпылык серверлердин тизмеси:"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Жүктөлүүдө..."
diff --git a/po/lt/minetest.po b/po/lt/minetest.po
index 9818d29d0..9d80d7e51 100644
--- a/po/lt/minetest.po
+++ b/po/lt/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2015-11-19 05:14+0000\n"
 "Last-Translator: Liudas Ališauskas <liudas@akmc.lt>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/minetest/"
@@ -609,6 +609,11 @@ msgstr "Paralaksinė okliuzija"
 msgid "Particles"
 msgstr "Įjungti visus"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Atstatyti vieno žaidėjo pasaulį"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Nustatymai"
@@ -1826,6 +1831,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1850,6 +1867,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2140,8 +2161,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2338,6 +2357,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2720,8 +2747,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2731,8 +2756,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2743,8 +2766,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2754,8 +2775,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3685,7 +3704,7 @@ msgstr "Apšvietimo efektai"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3782,6 +3801,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3797,6 +3822,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4133,66 +4164,66 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Įkeliama..."
+#~ msgid "No of course not!"
+#~ msgstr "Ne, tikrai ne!"
 
-#~ msgid "Add mod:"
-#~ msgstr "Pridėti papildinį:"
-
-#~ msgid "MODS"
-#~ msgstr "PAPILDINIAI"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "VIENAS ŽAIDĖJAS"
-
-#~ msgid "SETTINGS"
-#~ msgstr "NUSTATYMAI"
-
-#~ msgid "Password"
-#~ msgstr "Slaptažodis"
-
-#~ msgid "Name"
-#~ msgstr "Vardas"
-
-#~ msgid "START SERVER"
-#~ msgstr "PALEISTI SERVERĮ"
-
-#~ msgid "CLIENT"
-#~ msgstr "ŽAISTI TINKLE"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Pridėti papildinį"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Pašalinti pasirinktą papildinį"
-
-#, fuzzy
-#~ msgid "EDIT GAME"
-#~ msgstr "KEISTI ŽAIDIMĄ"
-
-#~ msgid "new game"
-#~ msgstr "naujas žaidimas"
-
-#~ msgid "Mods:"
-#~ msgstr "Papildiniai:"
-
-#~ msgid "GAMES"
-#~ msgstr "ŽAIDIMAI"
-
-#~ msgid "Game Name"
-#~ msgstr "Žaidimo pavadinimas"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "įjungtas"
+#~ msgid "Public Serverlist"
+#~ msgstr "Viešų serverių sąrašas"
 
 #, fuzzy
 #~ msgid "If disabled "
 #~ msgstr "Išjungti papildinį"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Viešų serverių sąrašas"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "įjungtas"
 
-#~ msgid "No of course not!"
-#~ msgstr "Ne, tikrai ne!"
+#~ msgid "Game Name"
+#~ msgstr "Žaidimo pavadinimas"
+
+#~ msgid "GAMES"
+#~ msgstr "ŽAIDIMAI"
+
+#~ msgid "Mods:"
+#~ msgstr "Papildiniai:"
+
+#~ msgid "new game"
+#~ msgstr "naujas žaidimas"
+
+#, fuzzy
+#~ msgid "EDIT GAME"
+#~ msgstr "KEISTI ŽAIDIMĄ"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Pašalinti pasirinktą papildinį"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Pridėti papildinį"
+
+#~ msgid "CLIENT"
+#~ msgstr "ŽAISTI TINKLE"
+
+#~ msgid "START SERVER"
+#~ msgstr "PALEISTI SERVERĮ"
+
+#~ msgid "Name"
+#~ msgstr "Vardas"
+
+#~ msgid "Password"
+#~ msgstr "Slaptažodis"
+
+#~ msgid "SETTINGS"
+#~ msgstr "NUSTATYMAI"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "VIENAS ŽAIDĖJAS"
+
+#~ msgid "MODS"
+#~ msgstr "PAPILDINIAI"
+
+#~ msgid "Add mod:"
+#~ msgstr "Pridėti papildinį:"
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Įkeliama..."
diff --git a/po/minetest.pot b/po/minetest.pot
index ed014c01f..0057f76e9 100644
--- a/po/minetest.pot
+++ b/po/minetest.pot
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the minetest package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -588,6 +588,10 @@ msgstr ""
 msgid "Shaders"
 msgstr ""
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr ""
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
 msgstr ""
@@ -1305,7 +1309,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -1395,6 +1399,30 @@ msgstr ""
 msgid "Continuous forward movement (only used for testing)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Forward key"
 msgstr ""
@@ -2633,6 +2661,18 @@ msgid ""
 "minetest.net."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Server port"
 msgstr ""
@@ -3214,8 +3254,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3345,8 +3383,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3422,8 +3458,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3489,8 +3523,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3736,8 +3768,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index 7ae1156e2..2d6f3e39c 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2015-09-20 17:15+0200\n"
 "Last-Translator: Christian Haug <christian@metaboks.org>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
@@ -600,6 +600,10 @@ msgstr ""
 msgid "Particles"
 msgstr "Aktiver Alle"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr ""
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr ""
@@ -1774,6 +1778,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1798,6 +1814,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2086,8 +2106,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2282,6 +2300,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2660,8 +2686,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2671,8 +2695,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2683,8 +2705,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2694,8 +2714,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3610,7 +3628,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3706,6 +3724,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3721,6 +3745,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4054,18 +4084,17 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "is required by:"
-#~ msgstr "trengs av:"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Deaktiver Alle"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfigurasjon lagret. "
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "aktivert"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Advarsel: Noen konfigurerte modifikasjoner mangler. \n"
-#~ "Instillingene deres vil bli fjernet når du lagrer konfigurasjonen."
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Spill"
 
 #~ msgid ""
 #~ "Warning: Some mods are not configured yet.\n"
@@ -4074,14 +4103,15 @@ msgstr ""
 #~ "Advarsel: Noen modifikasjoner er ikke konfigurert enda. \n"
 #~ "De vil bli aktivert som standard når du lagrer konfigurasjonen."
 
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Spill"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Advarsel: Noen konfigurerte modifikasjoner mangler. \n"
+#~ "Instillingene deres vil bli fjernet når du lagrer konfigurasjonen."
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "aktivert"
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfigurasjon lagret. "
 
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Deaktiver Alle"
+#~ msgid "is required by:"
+#~ msgstr "trengs av:"
diff --git a/po/nl/minetest.po b/po/nl/minetest.po
index 1ec92bc48..b47d630f5 100644
--- a/po/nl/minetest.po
+++ b/po/nl/minetest.po
@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-07-08 10:32+0000\n"
 "Last-Translator: ikmaak <info@ikmaak.nl>\n"
-"Language-Team: Dutch "
-"<https://hosted.weblate.org/projects/minetest/minetest/nl/>\n"
+"Language-Team: Dutch <https://hosted.weblate.org/projects/minetest/minetest/"
+"nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
-"Formaat: <basiswaarde>, <schaal>, (<X-spreiding>, <Y-spreiding>, "
-"<Z-spreiding>), <kiemgetal>, <octaven>, <persistentie>"
+"Formaat: <basiswaarde>, <schaal>, (<X-spreiding>, <Y-spreiding>, <Z-"
+"spreiding>), <kiemgetal>, <octaven>, <persistentie>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
@@ -601,6 +601,10 @@ msgstr "Parallax occlusie"
 msgid "Particles"
 msgstr "Effectdeeltjes"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Reset Singleplayer wereld"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Instellingen"
@@ -1847,6 +1851,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Valsspeelbescherming uitschakelen"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Lege wachtwoorden niet toestaan"
@@ -1871,6 +1887,10 @@ msgstr "Weggooi-toets"
 msgid "Dump the mapgen debug infos."
 msgstr "Print wereldgenerator debug informatie."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "VBO aanzetten"
@@ -2184,8 +2204,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2426,6 +2444,16 @@ msgstr ""
 "Juliaverzameling: Aantal iteraties van de recursieve functie.\n"
 "Bepaalt de schaal van de kleinste details."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick button repetition invterval"
+msgstr "Rechts-klik herhalingsinterval"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick frustum sensitivity"
+msgstr "Muis-gevoeligheid"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2928,8 +2956,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2946,8 +2972,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2964,8 +2988,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2982,15 +3004,12 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Wereldgenerator instellingen specified voor generator v6.\n"
-"Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en wordt "
-"de \"jungles\" vlag genegeerd.\n"
+"Wereldgenerator instellingen specified voor generator v7.\n"
+"\"ridges\" zijn rivieren.\n"
 "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 "waarde.\n"
 "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
@@ -3998,8 +4017,9 @@ msgid "Smooth lighting"
 msgstr "Vloeiende verlichting"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 "Maakt camerabewegingen vloeiender bij het rondkijken.\n"
@@ -4106,6 +4126,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr "Het Irrlicht backend voor renderen."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -4125,6 +4151,15 @@ msgstr ""
 "items\n"
 "uit de rij verwijderd. Gebruik 0 om dit uit te zetten."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+"De tijd in seconden tussen herhaalde rechts-klikken als de rechter muisknop "
+"ingedrukt gehouden wordt."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4509,209 +4544,121 @@ msgstr "Maximaal parallellisme in cURL"
 msgid "cURL timeout"
 msgstr "cURL timeout"
 
-#~ msgid "Item textures..."
-#~ msgstr "Voorwerp-texturen..."
+#~ msgid "No of course not!"
+#~ msgstr "Nee, natuurlijk niet!"
 
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n"
-#~ "Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n"
-#~ "wateroppervlakte werkt niet als dit is aangeschakeld."
+#~ msgid "Public Serverlist"
+#~ msgstr "Publieke Serverlijst"
 
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr "Laat geselecteerde nodes oplichten (schakelt selectie-randen uit)."
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Juliaverzameling: (X,Y,X) afstanden van wereld-centrum.\n"
-#~ "Bereik is ongeveer -2 tot 2. Vermenigvuldig met j_scale voor de afstand "
-#~ "in nodes."
-
-#~ msgid ""
-#~ "Julia set: W value determining the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Juliaverzameling: W-waarde van de 4D vorm.\n"
-#~ "Bereik is ongeveer -2 tot 2."
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Toets voor het verkleinen van de zichtafstand. Dit verandert de minimale "
-#~ "zichtafstand.\n"
-#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Toets voor het vergroten van de zichtafstand. Dit verandert de minimale "
-#~ "zichtafstand.\n"
-#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Mandelbrot verzameling: (X,Y,Z) afstanden vanaf wereld-centrum.\n"
-#~ " Bereik is ongeveer -2 tot 2. Vermenigvuldig met m_scale voor de afstand "
-#~ "in nodes."
-
-#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
-#~ msgstr "Mandelbrot verzameling: (X,Y,Z) schaal, in nodes (bij benadering)."
-
-#~ msgid ""
-#~ "Mandelbrot set: Iterations of the recursive function.\n"
-#~ "Controls scale of finest detail."
-#~ msgstr ""
-#~ "Mandelbrot verzameling: Aantal iteraties van de recursieve functie.\n"
-#~ "Bepaalt de schaal van de kleinste details."
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen fractal.\n"
-#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
-#~ msgstr ""
-#~ "Wereldgeneratie instellingen voor de fractal generator.\n"
-#~ "'julia' selecterd een julia-verzameling in plaats van een mandebrot-"
-#~ "verzameling.\n"
-#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
-#~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
-
-#~ msgid "Mapgen fractal mandelbrot iterations"
-#~ msgstr "Fractal wereldgenerator mandelbrot iteraties"
-
-#~ msgid "Mapgen fractal mandelbrot offset"
-#~ msgstr "Fractal wereldgenerator mandelbrot centrum-afstand"
-
-#~ msgid "Mapgen fractal mandelbrot scale"
-#~ msgstr "Fractal wereldgenerator mandelbrot schaal"
-
-#~ msgid "Mapgen fractal mandelbrot slice w"
-#~ msgstr "Fractal wereldgenerator mandelbrot w-doorsnede"
-
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Maximum hoogte boven waterniveau waar een speler geboren wordt.\n"
-#~ "Bij hogere waarden zullen de plaatsen dichter bij (x = 0, z = 0) liggen.\n"
-#~ "Bij lagere waarden kan het zijn dat een geschikte plek niet gevonden "
-#~ "wordt,\n"
-#~ "in dat geval wordt de speler geboren op (0, 0, 0), mogelijk onder de "
-#~ "grond."
-
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Minimaal gewenste FPS.\n"
-#~ "De hoeveelheid gerenderd materiaal wordt aangepast afhankelijk van deze "
-#~ "waarde, en van de min en max zichtafstanden."
-
-#~ msgid "New style water"
-#~ msgstr "Nieuw water"
-
-#~ msgid ""
-#~ "Pre-generate all item visuals used in the inventory.\n"
-#~ "This increases startup time, but runs smoother in-game.\n"
-#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
-#~ "the inventory."
-#~ msgstr ""
-#~ "Genereer beelden van objecten in de rugzak vooraf.\n"
-#~ "De start-tijd wordt hierdoor langer, maar het spel wordt vloeiender.\n"
-#~ "Dit kost veel geheugen op de videokaart. Als die onvoldoende geheugen "
-#~ "heeft kan dit resulteren in vreemde effecten."
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Laad rugzak-texturen vooraf"
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Aanvangshoogte van het window."
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Vertikaal geboortegebied"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Minimale zichtafstand"
-
-#~ msgid "Wanted FPS"
-#~ msgstr "Gewenste FPS"
-
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Reset Singleplayer wereld"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Schaal-factor toegepast op menu elementen: "
+#~ msgid "No!!!"
+#~ msgstr "Nee!!!"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Downloaden"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item"
+#~ "Algemene wereldgenerator instellingen.\n"
+#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
+#~ "waarde.\n"
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten.\n"
+#~ "'trees' en 'flat' zijn enkel van toepassing in mgv6."
 
-#~ msgid "is required by:"
-#~ msgstr "is benodigd voor:"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "MP uitschakelen"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Instellingen bewaard. "
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "ingeschakeld"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Waarschuwing: Instellingen niet consistent. "
+#~ msgid "Rendering:"
+#~ msgstr "Rendering:"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Herstart minetest om de driver te activeren"
 
-#~ msgid "Show Public"
-#~ msgstr "Publieke server"
+#~ msgid "Game Name"
+#~ msgstr "Spel"
 
-#~ msgid "Show Favorites"
-#~ msgstr "Favourieten"
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Laat het adres leeg om een lokale server te starten."
+#~ msgid "GAMES"
+#~ msgstr "SPELLEN"
 
-#~ msgid "Create world"
-#~ msgstr "Maak wereld aan"
+#~ msgid "Mods:"
+#~ msgstr "Mods:"
 
-#~ msgid "Address required."
-#~ msgstr "IP-adres nodig."
+#~ msgid "new game"
+#~ msgstr "nieuw spel"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd"
+#~ msgid "EDIT GAME"
+#~ msgstr "SPEL AANPASSEN"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "Deze bestanden worden verwijderd"
+#~ msgid "Remove selected mod"
+#~ msgstr "Geselecteerde mod verwijderen"
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden"
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Mod toevoegen"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd"
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Niet alle bestanden zijn verwijderd"
+#~ msgid "START SERVER"
+#~ msgstr "START SERVER"
+
+#~ msgid "Name"
+#~ msgstr "Naam"
+
+#~ msgid "Password"
+#~ msgstr "Wachtwoord"
+
+#~ msgid "SETTINGS"
+#~ msgstr "INSTELLINGEN"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Voorwerpen vooraf laden"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Eindige vloeistoffen"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "SINGLEPLAYER"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "TEXTUREN"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "Add mod:"
+#~ msgstr "Mod toevoegen:"
+
+#~ msgid "Local install"
+#~ msgstr "Plaatselijk installeren"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n"
+#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie "
+#~ "bewaard. "
+
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "LEt op: Sommige ingestelde mods zijn vermist.\n"
+#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4738,131 +4685,236 @@ msgstr "cURL timeout"
 #~ "- ESC: Menu\n"
 #~ "- T: Chat\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Niet alle bestanden zijn verwijderd"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Deze bestanden worden verwijderd"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd"
+
+#~ msgid "Address required."
+#~ msgstr "IP-adres nodig."
+
+#~ msgid "Create world"
+#~ msgstr "Maak wereld aan"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Laat het adres leeg om een lokale server te starten."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Favourieten"
+
+#~ msgid "Show Public"
+#~ msgstr "Publieke server"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Waarschuwing: Instellingen niet consistent. "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Instellingen bewaard. "
+
+#~ msgid "is required by:"
+#~ msgstr "is benodigd voor:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
-#~ "LEt op: Sommige ingestelde mods zijn vermist.\n"
-#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. "
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n"
-#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie "
-#~ "bewaard. "
-
-#~ msgid "Local install"
-#~ msgstr "Plaatselijk installeren"
-
-#~ msgid "Add mod:"
-#~ msgstr "Mod toevoegen:"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "TEXTUREN"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "SINGLEPLAYER"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Eindige vloeistoffen"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Voorwerpen vooraf laden"
-
-#~ msgid "SETTINGS"
-#~ msgstr "INSTELLINGEN"
-
-#~ msgid "Password"
-#~ msgstr "Wachtwoord"
-
-#~ msgid "Name"
-#~ msgstr "Naam"
-
-#~ msgid "START SERVER"
-#~ msgstr "START SERVER"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Mod toevoegen"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Geselecteerde mod verwijderen"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "SPEL AANPASSEN"
-
-#~ msgid "new game"
-#~ msgstr "nieuw spel"
-
-#~ msgid "Mods:"
-#~ msgstr "Mods:"
-
-#~ msgid "GAMES"
-#~ msgstr "SPELLEN"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren"
-
-#~ msgid "Game Name"
-#~ msgstr "Spel"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Herstart minetest om de driver te activeren"
-
-#~ msgid "Rendering:"
-#~ msgstr "Rendering:"
+#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item"
 
 #, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "ingeschakeld"
+#~ msgid "Downloading"
+#~ msgstr "Downloaden"
 
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "MP uitschakelen"
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Schaal-factor toegepast op menu elementen: "
+
+#~ msgid "Wanted FPS"
+#~ msgstr "Gewenste FPS"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Minimale zichtafstand"
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Vertikaal geboortegebied"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Aanvangshoogte van het window."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Laad rugzak-texturen vooraf"
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "'ridges' are the rivers.\n"
+#~ "Pre-generate all item visuals used in the inventory.\n"
+#~ "This increases startup time, but runs smoother in-game.\n"
+#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
+#~ "the inventory."
+#~ msgstr ""
+#~ "Genereer beelden van objecten in de rugzak vooraf.\n"
+#~ "De start-tijd wordt hierdoor langer, maar het spel wordt vloeiender.\n"
+#~ "Dit kost veel geheugen op de videokaart. Als die onvoldoende geheugen "
+#~ "heeft kan dit resulteren in vreemde effecten."
+
+#~ msgid "New style water"
+#~ msgstr "Nieuw water"
+
+#~ msgid ""
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Minimaal gewenste FPS.\n"
+#~ "De hoeveelheid gerenderd materiaal wordt aangepast afhankelijk van deze "
+#~ "waarde, en van de min en max zichtafstanden."
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Maximum hoogte boven waterniveau waar een speler geboren wordt.\n"
+#~ "Bij hogere waarden zullen de plaatsen dichter bij (x = 0, z = 0) liggen.\n"
+#~ "Bij lagere waarden kan het zijn dat een geschikte plek niet gevonden "
+#~ "wordt,\n"
+#~ "in dat geval wordt de speler geboren op (0, 0, 0), mogelijk onder de "
+#~ "grond."
+
+#~ msgid "Mapgen fractal mandelbrot slice w"
+#~ msgstr "Fractal wereldgenerator mandelbrot w-doorsnede"
+
+#~ msgid "Mapgen fractal mandelbrot scale"
+#~ msgstr "Fractal wereldgenerator mandelbrot schaal"
+
+#~ msgid "Mapgen fractal mandelbrot offset"
+#~ msgstr "Fractal wereldgenerator mandelbrot centrum-afstand"
+
+#~ msgid "Mapgen fractal mandelbrot iterations"
+#~ msgstr "Fractal wereldgenerator mandelbrot iteraties"
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen fractal.\n"
+#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
 #~ "Flags starting with \"no\" are used to explicitly disable them."
 #~ msgstr ""
-#~ "Wereldgenerator instellingen specified voor generator v7.\n"
-#~ "\"ridges\" zijn rivieren.\n"
+#~ "Wereldgeneratie instellingen voor de fractal generator.\n"
+#~ "'julia' selecterd een julia-verzameling in plaats van een mandebrot-"
+#~ "verzameling.\n"
+#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
+#~ "waarde.\n"
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+
+#~ msgid ""
+#~ "Mandelbrot set: Iterations of the recursive function.\n"
+#~ "Controls scale of finest detail."
+#~ msgstr ""
+#~ "Mandelbrot verzameling: Aantal iteraties van de recursieve functie.\n"
+#~ "Bepaalt de schaal van de kleinste details."
+
+#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+#~ msgstr "Mandelbrot verzameling: (X,Y,Z) schaal, in nodes (bij benadering)."
+
+#~ msgid ""
+#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Mandelbrot verzameling: (X,Y,Z) afstanden vanaf wereld-centrum.\n"
+#~ " Bereik is ongeveer -2 tot 2. Vermenigvuldig met m_scale voor de afstand "
+#~ "in nodes."
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Toets voor het vergroten van de zichtafstand. Dit verandert de minimale "
+#~ "zichtafstand.\n"
+#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Toets voor het verkleinen van de zichtafstand. Dit verandert de minimale "
+#~ "zichtafstand.\n"
+#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Julia set: W value determining the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Juliaverzameling: W-waarde van de 4D vorm.\n"
+#~ "Bereik is ongeveer -2 tot 2."
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Juliaverzameling: (X,Y,X) afstanden van wereld-centrum.\n"
+#~ "Bereik is ongeveer -2 tot 2. Vermenigvuldig met j_scale voor de afstand "
+#~ "in nodes."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr "Laat geselecteerde nodes oplichten (schakelt selectie-randen uit)."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n"
+#~ "Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n"
+#~ "wateroppervlakte werkt niet als dit is aangeschakeld."
+
+#~ msgid "Item textures..."
+#~ msgstr "Voorwerp-texturen..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Wereldgenerator instellingen specified voor generator v6.\n"
+#~ "Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en "
+#~ "wordt de \"jungles\" vlag genegeerd.\n"
 #~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 #~ "waarde.\n"
 #~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
 
 #, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Algemene wereldgenerator instellingen.\n"
+#~ "Wereldgenerator instellingen specified voor generator v7.\n"
+#~ "\"ridges\" zijn rivieren.\n"
 #~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 #~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten.\n"
-#~ "'trees' en 'flat' zijn enkel van toepassing in mgv6."
-
-#~ msgid "No!!!"
-#~ msgstr "Nee!!!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Publieke Serverlijst"
-
-#~ msgid "No of course not!"
-#~ msgstr "Nee, natuurlijk niet!"
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index ea404e32b..4b36d0a5f 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-03-24 19:38+0000\n"
 "Last-Translator: red-001 <red-001@openmailbox.org>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -605,6 +605,11 @@ msgstr "Mapowanie paralaksy"
 msgid "Particles"
 msgstr "Włącz Efekty Cząsteczkowe"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Pojedynczy gracz"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Ustawienia"
@@ -1830,6 +1835,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Włącz cząstki"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1856,6 +1873,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2146,8 +2167,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2344,6 +2363,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2726,8 +2753,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2737,8 +2762,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2749,8 +2772,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2760,8 +2781,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3714,7 +3733,7 @@ msgstr "Płynne oświetlenie"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3812,6 +3831,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3827,6 +3852,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4167,60 +4198,101 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "Limit czasu cURL"
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Ładowanie..."
+#~ msgid "No of course not!"
+#~ msgstr "Oczywiście, że nie!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista publicznych serwerów"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generuj mapy normalnych"
+
+#~ msgid "No!!!"
+#~ msgstr "Nie!!"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Ściągnij"
+#~ msgid "If disabled "
+#~ msgstr "Wyłącz wszystkie"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "włączone"
+
+#~ msgid "Game Name"
+#~ msgstr "Nazwa Gry"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się"
+
+#~ msgid "GAMES"
+#~ msgstr "GRY"
+
+#~ msgid "Mods:"
+#~ msgstr "Mody:"
+
+#~ msgid "new game"
+#~ msgstr "nowa gra"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "EDYTUJ GRĘ"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Usuń zaznaczony mod"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<--Dodaj mod"
+
+#~ msgid "CLIENT"
+#~ msgstr "KLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "URUCHOM SERWER"
+
+#~ msgid "Name"
+#~ msgstr "Nazwa"
+
+#~ msgid "Password"
+#~ msgstr "Hasło"
+
+#~ msgid "SETTINGS"
+#~ msgstr "USTAWIENIA"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Ładuj obrazy przedmiotów"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Realistyczne ciecze"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "TRYB JEDNOOSOBOWY"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACZKI TEKSTUR"
+
+#~ msgid "MODS"
+#~ msgstr "MODY"
+
+#, fuzzy
+#~ msgid "Add mod:"
+#~ msgstr "<<--Dodaj mod"
+
+#, fuzzy
+#~ msgid "Local install"
+#~ msgstr "Instaluj"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: "
-#~ "przenieś pojedynczy przedmiot"
+#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n"
+#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację.  "
 
-#~ msgid "is required by:"
-#~ msgstr "wymagane przez:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguracja zapisana.  "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny.  "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki"
-
-#~ msgid "Show Public"
-#~ msgstr "Pokaż publiczne"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Pokaż ulubione"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny."
-
-#~ msgid "Create world"
-#~ msgstr "Stwórz świat"
-
-#~ msgid "Address required."
-#~ msgstr "Wymagany adres."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Nie można skasować świata: nic nie zaznaczono"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Pliki do skasowania"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Nie udało się skasować wszystkich plików świata"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n"
+#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację.  "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4247,98 +4319,57 @@ msgstr "Limit czasu cURL"
 #~ "- ESC: to menu\n"
 #~ "- T: czat\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Nie udało się skasować wszystkich plików świata"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Pliki do skasowania"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Nie można skasować świata: nic nie zaznaczono"
+
+#~ msgid "Address required."
+#~ msgstr "Wymagany adres."
+
+#~ msgid "Create world"
+#~ msgstr "Stwórz świat"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Pokaż ulubione"
+
+#~ msgid "Show Public"
+#~ msgstr "Pokaż publiczne"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguracja zapisana.  "
+
+#~ msgid "is required by:"
+#~ msgstr "wymagane przez:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
-#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n"
-#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację.  "
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n"
-#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację.  "
+#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: "
+#~ "przenieś pojedynczy przedmiot"
 
 #, fuzzy
-#~ msgid "Local install"
-#~ msgstr "Instaluj"
+#~ msgid "Downloading"
+#~ msgstr "Ściągnij"
 
 #, fuzzy
-#~ msgid "Add mod:"
-#~ msgstr "<<--Dodaj mod"
-
-#~ msgid "MODS"
-#~ msgstr "MODY"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACZKI TEKSTUR"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "TRYB JEDNOOSOBOWY"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Realistyczne ciecze"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Ładuj obrazy przedmiotów"
-
-#~ msgid "SETTINGS"
-#~ msgstr "USTAWIENIA"
-
-#~ msgid "Password"
-#~ msgstr "Hasło"
-
-#~ msgid "Name"
-#~ msgstr "Nazwa"
-
-#~ msgid "START SERVER"
-#~ msgstr "URUCHOM SERWER"
-
-#~ msgid "CLIENT"
-#~ msgstr "KLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<--Dodaj mod"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Usuń zaznaczony mod"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "EDYTUJ GRĘ"
-
-#~ msgid "new game"
-#~ msgstr "nowa gra"
-
-#~ msgid "Mods:"
-#~ msgstr "Mody:"
-
-#~ msgid "GAMES"
-#~ msgstr "GRY"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się"
-
-#~ msgid "Game Name"
-#~ msgstr "Nazwa Gry"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "włączone"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Wyłącz wszystkie"
-
-#~ msgid "No!!!"
-#~ msgstr "Nie!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generuj mapy normalnych"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista publicznych serwerów"
-
-#~ msgid "No of course not!"
-#~ msgstr "Oczywiście, że nie!"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Ładowanie..."
diff --git a/po/pt/minetest.po b/po/pt/minetest.po
index 4bdd22ee1..4755928a1 100644
--- a/po/pt/minetest.po
+++ b/po/pt/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-04-01 00:21+0000\n"
 "Last-Translator: Fernando Reis <fernando.reis@pt.lu>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/minetest/"
@@ -608,6 +608,11 @@ msgstr "Oclusão de paralaxe"
 msgid "Particles"
 msgstr "Ativar Partículas"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Tem a certeza que deseja reiniciar o seu mundo?"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Definições"
@@ -1891,6 +1896,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Desativar anti-batota"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Não permitir senhas vazias"
@@ -1915,6 +1932,10 @@ msgstr "Tecla para largar item"
 msgid "Dump the mapgen debug infos."
 msgstr "Mostrar informações de depuração do gerador de mapa."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "Ativar VBO"
@@ -2220,8 +2241,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2428,6 +2447,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2846,8 +2873,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2857,8 +2882,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2869,8 +2892,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2880,8 +2901,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3813,7 +3832,7 @@ msgstr "Iluminação suave"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3909,6 +3928,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3924,6 +3949,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4286,58 +4317,103 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "A carregar..."
+#~ msgid "No of course not!"
+#~ msgstr "Não, é claro que não!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista de Servidores Públicos"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Gerar Normalmaps"
+
+#~ msgid "No!!!"
+#~ msgstr "Não!!!"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Descarregar"
+#~ msgid "If disabled "
+#~ msgstr "Desativar Tudo"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Botão esq: Mover todos os itens  Botão dir: Mover um item"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "ativo"
 
-#~ msgid "is required by:"
-#~ msgstr "é necessário pelo:"
+#~ msgid "Game Name"
+#~ msgstr "Nome do Jogo"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Configuração gravada.  "
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr ""
+#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo "
+#~ "\"$2\""
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Atenção: Configuração não compatível.  "
+#~ msgid "GAMES"
+#~ msgstr "JOGOS"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos"
+#~ msgid "Mods:"
+#~ msgstr "Extras:"
 
-#~ msgid "Show Public"
-#~ msgstr "Mostrar Públicos"
+#~ msgid "new game"
+#~ msgstr "novo jogo"
 
-#~ msgid "Show Favorites"
-#~ msgstr "Mostrar Favoritos"
+#~ msgid "EDIT GAME"
+#~ msgstr "EDITAR JOGO"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Deixe endereço em branco para iniciar servidor local."
+#~ msgid "Remove selected mod"
+#~ msgstr "Remover extra selecionado"
 
-#~ msgid "Create world"
-#~ msgstr "Criar mundo"
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Adicionar extra"
 
-#~ msgid "Address required."
-#~ msgstr "Endereço necessário."
+#~ msgid "CLIENT"
+#~ msgstr "CLIENTE"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado"
+#~ msgid "START SERVER"
+#~ msgstr "INICIAR SERVIDOR"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "Ficheiros para eliminar"
+#~ msgid "Name"
+#~ msgstr "Nome"
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos"
+#~ msgid "Password"
+#~ msgstr "Senha"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Não foi possível configurar mundo: Nada seleccionado"
+#~ msgid "SETTINGS"
+#~ msgstr "DEFINIÇÕES"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos"
+#~ msgid "Preload item visuals"
+#~ msgstr "Pré-carregamento dos itens"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Líquido Finito"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "Um Jogador"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACOTES DE TEXTURAS"
+
+#~ msgid "MODS"
+#~ msgstr "EXTRAS"
+
+#, fuzzy
+#~ msgid "Add mod:"
+#~ msgstr "<<-- Adicionar extra"
+
+#, fuzzy
+#~ msgid "Local install"
+#~ msgstr "Instalar"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods ainda não estão configurados.\n"
+#~ "Eles vão ser ativados por predefinição quando guardar a configuração.  "
+
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods configurados estão em falta.\n"
+#~ "As suas definições vão ser removidas quando gravar a configuração.  "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4364,100 +4440,55 @@ msgstr ""
 #~ "- ESC: Este menu\n"
 #~ "- T: Chat\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods configurados estão em falta.\n"
-#~ "As suas definições vão ser removidas quando gravar a configuração.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos"
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods ainda não estão configurados.\n"
-#~ "Eles vão ser ativados por predefinição quando guardar a configuração.  "
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Não foi possível configurar mundo: Nada seleccionado"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Ficheiros para eliminar"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado"
+
+#~ msgid "Address required."
+#~ msgstr "Endereço necessário."
+
+#~ msgid "Create world"
+#~ msgstr "Criar mundo"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Deixe endereço em branco para iniciar servidor local."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Mostrar Favoritos"
+
+#~ msgid "Show Public"
+#~ msgstr "Mostrar Públicos"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Atenção: Configuração não compatível.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Configuração gravada.  "
+
+#~ msgid "is required by:"
+#~ msgstr "é necessário pelo:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Botão esq: Mover todos os itens  Botão dir: Mover um item"
 
 #, fuzzy
-#~ msgid "Local install"
-#~ msgstr "Instalar"
+#~ msgid "Downloading"
+#~ msgstr "Descarregar"
 
 #, fuzzy
-#~ msgid "Add mod:"
-#~ msgstr "<<-- Adicionar extra"
-
-#~ msgid "MODS"
-#~ msgstr "EXTRAS"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACOTES DE TEXTURAS"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "Um Jogador"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Líquido Finito"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Pré-carregamento dos itens"
-
-#~ msgid "SETTINGS"
-#~ msgstr "DEFINIÇÕES"
-
-#~ msgid "Password"
-#~ msgstr "Senha"
-
-#~ msgid "Name"
-#~ msgstr "Nome"
-
-#~ msgid "START SERVER"
-#~ msgstr "INICIAR SERVIDOR"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENTE"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Adicionar extra"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Remover extra selecionado"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "EDITAR JOGO"
-
-#~ msgid "new game"
-#~ msgstr "novo jogo"
-
-#~ msgid "Mods:"
-#~ msgstr "Extras:"
-
-#~ msgid "GAMES"
-#~ msgstr "JOGOS"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr ""
-#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo "
-#~ "\"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Nome do Jogo"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "ativo"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Desativar Tudo"
-
-#~ msgid "No!!!"
-#~ msgstr "Não!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Gerar Normalmaps"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista de Servidores Públicos"
-
-#~ msgid "No of course not!"
-#~ msgstr "Não, é claro que não!"
+#~ msgid "Preload inventory textures"
+#~ msgstr "A carregar..."
diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index 3b345226b..edfd03fa0 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-03-31 13:45+0000\n"
 "Last-Translator: Ian giestas pauli <iangiestaspauli@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -610,6 +610,11 @@ msgstr "Oclusão de paralaxe"
 msgid "Particles"
 msgstr "Habilitar partículas"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Você tem certeza que deseja resetar seu mundo?"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Configurações"
@@ -1891,6 +1896,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Habilitar Anti-Hack"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Não permitir logar sem senha"
@@ -1915,6 +1932,10 @@ msgstr "Tecla para largar item"
 msgid "Dump the mapgen debug infos."
 msgstr "Mostrar informações de depuração do Mapgen."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "Habilitar VBO"
@@ -2241,8 +2262,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2481,6 +2500,14 @@ msgstr ""
 "Iterações da função recursiva.\n"
 "Controles da escala de detalhes."
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2989,8 +3016,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3008,17 +3033,15 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Atributos de mapgen específicos para Mapgen plano.\n"
-"Alguns lagos e colinas são ocasionalmente adicionados num mundo plano.\n"
-"Flags que não estão especificadas na string de flags não são modificados a "
-"partir do padrão.\n"
-"Flags começando com \"no\" (não) são usadas para desativá-los explicitamente."
+"Atributos de geração de mapas específicos para o Mapgen v7.\n"
+"'ridges' são os rios.\n"
+"Flags que não estão especificadas na string da flag não são modificadas por "
+"padrão.\n"
+"Flags começando com \"no\" são usadas para explicitamente desabilitá-las."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3026,8 +3049,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3045,19 +3066,15 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Atributos para o gerador de mapas específico para o Mapgen v6.\n"
-"Quando biomas de neve estão habilitados, pântanos ficam habilitados e a flag "
-"de pântanos é ignorada.\n"
-"Flags que não são especificadas na string da flag não são modificadas por "
+"Atributos de geração de mapas específicos para o Mapgen v7.\n"
+"'ridges' são os rios.\n"
+"Flags que não estão especificadas na string da flag não são modificadas por "
 "padrão.\n"
-"Flags começando com \"no\" (não) são usadas para explicitamente desabilitá-"
-"las."
+"Flags começando com \"no\" são usadas para explicitamente desabilitá-las."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -3974,7 +3991,7 @@ msgstr "Iluminação suave"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -4070,6 +4087,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -4085,6 +4108,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4418,103 +4447,121 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Habilita recurso permitindo que o nível da água seja um pouco menor, "
-#~ "portando não preenche todo o espaço disponível para bloco.\n"
-#~ "Note que isso não está bem otimizado e que suavização da iluminação na "
-#~ "superfície da água não funciona bem com esse recurso."
+#~ msgid "No of course not!"
+#~ msgstr "Claro que não!"
 
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr ""
-#~ "Habilitar destaque de bloco selecionado (desabilita o modo de destaque "
-#~ "selectionbox [Padrão])."
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista de servidores públicos"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Gerar Normalmaps"
+
+#~ msgid "No!!!"
+#~ msgstr "Não!!!"
 
 #~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n"
-#~ "Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos "
-#~ "em nós."
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Tecla para diminuir o intervalo de visualização. Modifica o intervalo "
-#~ "mínimo de visualização.\n"
-#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Tecla para aumentar o intervalo de visualização. Modifica o mínimo "
-#~ "intervalo de visualização.\n"
-#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "pré-carregando texturas de inventário"
+#~ "Atributos de mapgen específicos para vales (Mapgen Valleys).\n"
+#~ "Flags que não estão especificadas na string de flags não são modificados "
+#~ "a partir do padrão.\n"
+#~ "Flags começando com \"no\" (não) são usadas para desativá-los "
+#~ "explicitamente.\n"
+#~ "\"altitude_chill\" torna terrenos de elevada altitude mais frios, o que "
+#~ "pode causar algumas falhas nos biomas.\n"
+#~ "\"humid_rivers\" modifica a umidade ao redor dos rios e em áreas onde a "
+#~ "água tende a ser represada em poças. Pode interferir em biomas que são "
+#~ "sensíveis a mudanças."
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Baixar"
+#~ msgid "If disabled "
+#~ msgstr "Desabilitar PMs"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "habilitado"
 
-#~ msgid "is required by:"
-#~ msgstr "é necessário para:"
+#~ msgid "Game Name"
+#~ msgstr "Nome do jogo"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "A configuração foi salva. "
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\""
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Atenção: A configuração não está consistente."
+#~ msgid "GAMES"
+#~ msgstr "JOGOS"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos"
+#~ msgid "Mods:"
+#~ msgstr "Módulos:"
 
-#~ msgid "Show Public"
-#~ msgstr "Exibir públicos"
+#~ msgid "new game"
+#~ msgstr "novo jogo"
 
-#~ msgid "Show Favorites"
-#~ msgstr "Exibir favoritos"
+#~ msgid "EDIT GAME"
+#~ msgstr "EDITAR JOGO"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Deixe o endereço em branco para iniciar um servidor local."
+#~ msgid "Remove selected mod"
+#~ msgstr "Remover o módulo selecionado"
 
-#~ msgid "Create world"
-#~ msgstr "Criar o mundo"
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Adicionar módulo"
 
-#~ msgid "Address required."
-#~ msgstr "É necessário um endereço."
+#~ msgid "CLIENT"
+#~ msgstr "CLIENTE"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado"
+#~ msgid "START SERVER"
+#~ msgstr "SERVIDOR"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "Arquivos a serem excluídos"
+#~ msgid "Name"
+#~ msgstr "Nome"
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo"
+#~ msgid "Password"
+#~ msgstr "Senha"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado"
+#~ msgid "SETTINGS"
+#~ msgstr "CONFIGURAÇÕES"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Não foi possível excluir todos os arquivos do mundo"
+#~ msgid "Preload item visuals"
+#~ msgstr "Precarga de elementos visuais"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Líquido finito"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "UM JOGADOR"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "TEXTURAS"
+
+#~ msgid "MODS"
+#~ msgstr "MÓDULOS"
+
+#~ msgid "Add mod:"
+#~ msgstr "Adicionar módulo:"
+
+#~ msgid "Local install"
+#~ msgstr "Instalação local"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods ainda não foram configurados.\n"
+#~ "E eles serão ativados por padrão, quando você salvar a configuração."
+
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods configurados não foram encontrados.\n"
+#~ "Suas definições serão removidas quando você salvar a configuração."
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4541,131 +4588,135 @@ msgstr ""
 #~ "- ESC: este menu\n"
 #~ "- T: bate-papo\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods configurados não foram encontrados.\n"
-#~ "Suas definições serão removidas quando você salvar a configuração."
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Não foi possível excluir todos os arquivos do mundo"
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods ainda não foram configurados.\n"
-#~ "E eles serão ativados por padrão, quando você salvar a configuração."
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado"
 
-#~ msgid "Local install"
-#~ msgstr "Instalação local"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo"
 
-#~ msgid "Add mod:"
-#~ msgstr "Adicionar módulo:"
+#~ msgid "Files to be deleted"
+#~ msgstr "Arquivos a serem excluídos"
 
-#~ msgid "MODS"
-#~ msgstr "MÓDULOS"
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado"
 
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "TEXTURAS"
+#~ msgid "Address required."
+#~ msgstr "É necessário um endereço."
 
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "UM JOGADOR"
+#~ msgid "Create world"
+#~ msgstr "Criar o mundo"
 
-#~ msgid "Finite Liquid"
-#~ msgstr "Líquido finito"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Deixe o endereço em branco para iniciar um servidor local."
 
-#~ msgid "Preload item visuals"
-#~ msgstr "Precarga de elementos visuais"
+#~ msgid "Show Favorites"
+#~ msgstr "Exibir favoritos"
 
-#~ msgid "SETTINGS"
-#~ msgstr "CONFIGURAÇÕES"
+#~ msgid "Show Public"
+#~ msgstr "Exibir públicos"
 
-#~ msgid "Password"
-#~ msgstr "Senha"
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos"
 
-#~ msgid "Name"
-#~ msgstr "Nome"
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Atenção: A configuração não está consistente."
 
-#~ msgid "START SERVER"
-#~ msgstr "SERVIDOR"
+#~ msgid "Configuration saved.  "
+#~ msgstr "A configuração foi salva. "
 
-#~ msgid "CLIENT"
-#~ msgstr "CLIENTE"
+#~ msgid "is required by:"
+#~ msgstr "é necessário para:"
 
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Adicionar módulo"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Remover o módulo selecionado"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "EDITAR JOGO"
-
-#~ msgid "new game"
-#~ msgstr "novo jogo"
-
-#~ msgid "Mods:"
-#~ msgstr "Módulos:"
-
-#~ msgid "GAMES"
-#~ msgstr "JOGOS"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Nome do jogo"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item"
 
 #, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "habilitado"
+#~ msgid "Downloading"
+#~ msgstr "Baixar"
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "pré-carregando texturas de inventário"
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Tecla para aumentar o intervalo de visualização. Modifica o mínimo "
+#~ "intervalo de visualização.\n"
+#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Tecla para diminuir o intervalo de visualização. Modifica o intervalo "
+#~ "mínimo de visualização.\n"
+#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n"
+#~ "Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos "
+#~ "em nós."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr ""
+#~ "Habilitar destaque de bloco selecionado (desabilita o modo de destaque "
+#~ "selectionbox [Padrão])."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Habilita recurso permitindo que o nível da água seja um pouco menor, "
+#~ "portando não preenche todo o espaço disponível para bloco.\n"
+#~ "Note que isso não está bem otimizado e que suavização da iluminação na "
+#~ "superfície da água não funciona bem com esse recurso."
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Desabilitar PMs"
-
 #~ msgid ""
 #~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "'ridges' are the rivers.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Atributos de geração de mapas específicos para o Mapgen v7.\n"
-#~ "'ridges' são os rios.\n"
-#~ "Flags que não estão especificadas na string da flag não são modificadas "
-#~ "por padrão.\n"
-#~ "Flags começando com \"no\" são usadas para explicitamente desabilitá-las."
+#~ "Atributos para o gerador de mapas específico para o Mapgen v6.\n"
+#~ "Quando biomas de neve estão habilitados, pântanos ficam habilitados e a "
+#~ "flag de pântanos é ignorada.\n"
+#~ "Flags que não são especificadas na string da flag não são modificadas por "
+#~ "padrão.\n"
+#~ "Flags começando com \"no\" (não) são usadas para explicitamente "
+#~ "desabilitá-las."
 
+#, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Atributos de mapgen específicos para vales (Mapgen Valleys).\n"
+#~ "Atributos de mapgen específicos para Mapgen plano.\n"
+#~ "Alguns lagos e colinas são ocasionalmente adicionados num mundo plano.\n"
 #~ "Flags que não estão especificadas na string de flags não são modificados "
 #~ "a partir do padrão.\n"
 #~ "Flags começando com \"no\" (não) são usadas para desativá-los "
-#~ "explicitamente.\n"
-#~ "\"altitude_chill\" torna terrenos de elevada altitude mais frios, o que "
-#~ "pode causar algumas falhas nos biomas.\n"
-#~ "\"humid_rivers\" modifica a umidade ao redor dos rios e em áreas onde a "
-#~ "água tende a ser represada em poças. Pode interferir em biomas que são "
-#~ "sensíveis a mudanças."
-
-#~ msgid "No!!!"
-#~ msgstr "Não!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Gerar Normalmaps"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista de servidores públicos"
-
-#~ msgid "No of course not!"
-#~ msgstr "Claro que não!"
+#~ "explicitamente."
diff --git a/po/ro/minetest.po b/po/ro/minetest.po
index ac4bf7937..aac35f811 100644
--- a/po/ro/minetest.po
+++ b/po/ro/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-03-17 15:28+0000\n"
 "Last-Translator: Lordmusic Player <lordmusicplro1@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/minetest/"
@@ -623,6 +623,11 @@ msgstr ""
 msgid "Particles"
 msgstr "Activează tot"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Singleplayer"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Setări"
@@ -1849,6 +1854,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Activează particulele"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1875,6 +1892,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2167,8 +2188,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2365,6 +2384,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2747,8 +2774,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2758,8 +2783,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2770,8 +2793,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2781,8 +2802,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3735,7 +3754,7 @@ msgstr "Lumină mai bună"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3833,6 +3852,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3848,6 +3873,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4187,88 +4218,88 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Se încarcă..."
+#~ msgid "No of course not!"
+#~ msgstr "Nu, sigur că nu!"
 
-#, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Descarcă"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr ""
-#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect"
-
-#~ msgid "Local install"
-#~ msgstr "Instalare locală"
-
-#~ msgid "Add mod:"
-#~ msgstr "Adăugaţi mod:"
-
-#~ msgid "MODS"
-#~ msgstr "MODURI"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACHETE DE TEXTURĂ"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "SINGLE PLAYER"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Lichid finit"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Pre-încarcă imaginile obiectelor"
-
-#~ msgid "SETTINGS"
-#~ msgstr "SETĂRI"
-
-#~ msgid "Password"
-#~ msgstr "Parolă"
-
-#~ msgid "Name"
-#~ msgstr "Nume"
-
-#~ msgid "START SERVER"
-#~ msgstr "DESCHIDE SERVERUL"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Adaugă modul"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Șterge modul selectat"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MODIFICĂ JOCUL"
-
-#~ msgid "new game"
-#~ msgstr "joc nou"
-
-#~ msgid "Mods:"
-#~ msgstr "Moduri:"
-
-#~ msgid "GAMES"
-#~ msgstr "JOCURI"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Numele jocului"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "activat"
+#~ msgid "Public Serverlist"
+#~ msgstr "Listă de servere publică"
 
 #, fuzzy
 #~ msgid "If disabled "
 #~ msgstr "Dezactivează MP"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Listă de servere publică"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "activat"
 
-#~ msgid "No of course not!"
-#~ msgstr "Nu, sigur că nu!"
+#~ msgid "Game Name"
+#~ msgstr "Numele jocului"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\""
+
+#~ msgid "GAMES"
+#~ msgstr "JOCURI"
+
+#~ msgid "Mods:"
+#~ msgstr "Moduri:"
+
+#~ msgid "new game"
+#~ msgstr "joc nou"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MODIFICĂ JOCUL"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Șterge modul selectat"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Adaugă modul"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "DESCHIDE SERVERUL"
+
+#~ msgid "Name"
+#~ msgstr "Nume"
+
+#~ msgid "Password"
+#~ msgstr "Parolă"
+
+#~ msgid "SETTINGS"
+#~ msgstr "SETĂRI"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Pre-încarcă imaginile obiectelor"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Lichid finit"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "SINGLE PLAYER"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACHETE DE TEXTURĂ"
+
+#~ msgid "MODS"
+#~ msgstr "MODURI"
+
+#~ msgid "Add mod:"
+#~ msgstr "Adăugaţi mod:"
+
+#~ msgid "Local install"
+#~ msgstr "Instalare locală"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr ""
+#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect"
+
+#, fuzzy
+#~ msgid "Downloading"
+#~ msgstr "Descarcă"
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Se încarcă..."
diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index 8c48a2c2e..768c65dda 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-05-20 15:18+0000\n"
 "Last-Translator: Andrey K. <contact@libnaru.so>\n"
-"Language-Team: Russian "
-"<https://hosted.weblate.org/projects/minetest/minetest/ru/>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/minetest/"
+"minetest/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.7-dev\n"
 
 #: builtin/fstk/ui.lua
@@ -609,6 +609,10 @@ msgstr "Parallax Occlusion"
 msgid "Particles"
 msgstr "Включить частицы"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Сброс одиночной игры"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Настройки"
@@ -1861,6 +1865,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Отключить анти-чит"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "Запретить пустой пароль"
@@ -1885,6 +1901,10 @@ msgstr "Кнопка выброса блока"
 msgid "Dump the mapgen debug infos."
 msgstr "Дамп отладочной информации генератора мира."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2186,8 +2206,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2339,8 +2357,8 @@ msgid ""
 "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
 "and descending."
 msgstr ""
-"Если включено, клавиша \"use\"(\"использовать\"?) вместо \"sneak\"(\""
-"подкрасться\"?) будет использоваться для climbing down and descending."
+"Если включено, клавиша \"use\"(\"использовать\"?) вместо \"sneak"
+"\"(\"подкрасться\"?) будет использоваться для climbing down and descending."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2433,6 +2451,16 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick button repetition invterval"
+msgstr "Интервал повторного клика правой кнопкой."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick frustum sensitivity"
+msgstr "Чувствительность мыши"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2893,6 +2921,7 @@ msgid "Map directory"
 msgstr "Каталог сохранения карт"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -2900,46 +2929,81 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Параметры глобального генератора карты.\n"
+"В генераторе карт v6 флаг 'decorations' управляет всем оформлением за "
+"исключением деревьев\n"
+" и junglegras(травы джунглей?), в остальных генераторах этот флаг управляет "
+"всем оформлением.\n"
+"Стандартные флаги, установленные в engine(инструменте?) следующие: caves, "
+"light, decorations\n"
+"Строка флагов изменяет стандартные настройки engine(инструмента?).\n"
+"Флаги, не указанные в строке флагов, по умолчанию не изменяются.\n"
+"Флаги, начинающиеся с 'no' используются для их явного отключения."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Параметры глобального генератора карты.\n"
+"В генераторе карт v6 флаг 'decorations' управляет всем оформлением за "
+"исключением деревьев\n"
+" и junglegras(травы джунглей?), в остальных генераторах этот флаг управляет "
+"всем оформлением.\n"
+"Стандартные флаги, установленные в engine(инструменте?) следующие: caves, "
+"light, decorations\n"
+"Строка флагов изменяет стандартные настройки engine(инструмента?).\n"
+"Флаги, не указанные в строке флагов, по умолчанию не изменяются.\n"
+"Флаги, начинающиеся с 'no' используются для их явного отключения."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Параметры глобального генератора карты.\n"
+"В генераторе карт v6 флаг 'decorations' управляет всем оформлением за "
+"исключением деревьев\n"
+" и junglegras(травы джунглей?), в остальных генераторах этот флаг управляет "
+"всем оформлением.\n"
+"Стандартные флаги, установленные в engine(инструменте?) следующие: caves, "
+"light, decorations\n"
+"Строка флагов изменяет стандартные настройки engine(инструмента?).\n"
+"Флаги, не указанные в строке флагов, по умолчанию не изменяются.\n"
+"Флаги, начинающиеся с 'no' используются для их явного отключения."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Параметры глобального генератора карты.\n"
+"В генераторе карт v6 флаг 'decorations' управляет всем оформлением за "
+"исключением деревьев\n"
+" и junglegras(травы джунглей?), в остальных генераторах этот флаг управляет "
+"всем оформлением.\n"
+"Стандартные флаги, установленные в engine(инструменте?) следующие: caves, "
+"light, decorations\n"
+"Строка флагов изменяет стандартные настройки engine(инструмента?).\n"
+"Флаги, не указанные в строке флагов, по умолчанию не изменяются.\n"
+"Флаги, начинающиеся с 'no' используются для их явного отключения."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -3922,7 +3986,7 @@ msgstr "Мягкое освещение"
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 "Сглаживать движения камеры при ходьбе и поворотах.\n"
@@ -4031,6 +4095,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -4046,6 +4116,13 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr "Задержка в секундах между кликами при зажатой правой кнопке мыши."
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -4426,110 +4503,107 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "cURL тайм-аут"
 
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Включите немного более низкую поверхность воды, чтобы она\n"
-#~ "не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n"
-#~ "и мягкое освещение на поверхности воды не работает с этим."
+#~ msgid "No of course not!"
+#~ msgstr "Нет, конечно нет!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Список публичных серверов"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Генерировать карты нормалей"
+
+#~ msgid "No!!!"
+#~ msgstr "Нет!"
+
+#~ msgid "\""
+#~ msgstr "\""
+
+#~ msgid "If disabled "
+#~ msgstr "Если выключено "
+
+#~ msgid "If enabled, "
+#~ msgstr "Если включено "
+
+#~ msgid "Rendering:"
+#~ msgstr "Рендеринг:"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Перезапустите Minetest для принятия изменений"
+
+#~ msgid "Game Name"
+#~ msgstr "Название"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\""
+
+#~ msgid "GAMES"
+#~ msgstr "ИГРЫ"
+
+#~ msgid "Mods:"
+#~ msgstr "Моды:"
+
+#~ msgid "new game"
+#~ msgstr "Создать игру"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "РЕДАКТИРОВАНИЕ"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Удалить мод"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Добавить мод"
+
+#~ msgid "CLIENT"
+#~ msgstr "КЛИЕНТ"
+
+#~ msgid "START SERVER"
+#~ msgstr "СЕРВЕР"
+
+#~ msgid "Name"
+#~ msgstr "Имя"
+
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#~ msgid "SETTINGS"
+#~ msgstr "НАСТРОЙКИ"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Предзагрузка изображений"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Конечные жидкости"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "ОДИНОЧНАЯ ИГРА"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "ПАКЕТЫ ТЕКСТУР"
+
+#~ msgid "MODS"
+#~ msgstr "МОДЫ"
+
+#~ msgid "Add mod:"
+#~ msgstr "Добавить мод:"
+
+#~ msgid "Local install"
+#~ msgstr "Локальная установка"
 
 #~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность "
-#~ "отображения.\n"
-#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ "Предупреждение: Некоторые моды еще не настроены.\n"
+#~ "Их стандартные настройки будут установлены, когда вы сохраните "
+#~ "конфигурацию.  "
 
 #~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
 #~ msgstr ""
-#~ "Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность "
-#~ "отображения.\n"
-#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#, fuzzy
-#~ msgid "New style water"
-#~ msgstr "Новый стиль воды"
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Предзагрузка текстур..."
-
-#, fuzzy
-#~ msgid "Viewing range minimum"
-#~ msgstr "Минимальная граница дальности отрисовки."
-
-#, fuzzy
-#~ msgid "Wanted FPS"
-#~ msgstr "Ожидаемый FPS"
-
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Сброс одиночной игры"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Коэффициент масштаба интерфейса: "
-
-#~ msgid "Touch free target"
-#~ msgstr "Свободный выбор цели"
-
-#, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Загрузить"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет"
-
-#~ msgid "is required by:"
-#~ msgstr "требуется для:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Настройки сохранены.  "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Предупреждение: Неверная конфигурация.  "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы"
-
-#~ msgid "Show Public"
-#~ msgstr "Публичные"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Избранные"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Оставьте адрес пустым для запуска локального сервера."
-
-#~ msgid "Create world"
-#~ msgstr "Создать мир"
-
-#~ msgid "Address required."
-#~ msgstr "Нужно ввести адрес."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Невозможно удалить мир: Ничего не выбрано"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Следующие файлы будут удалены"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Невозможно создать мир: Ни одной игры не найдено"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Невозможно настроить мир: ничего не выбрано"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Ошибка при удалении файлов мира"
+#~ "Предупреждение: Некоторые моды не найдены.\n"
+#~ "Их настройки будут удалены, когда вы сохраните конфигурацию.  "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4556,104 +4630,104 @@ msgstr "cURL тайм-аут"
 #~ "- ESC: это меню\n"
 #~ "- T: чат\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Предупреждение: Некоторые моды не найдены.\n"
-#~ "Их настройки будут удалены, когда вы сохраните конфигурацию.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Ошибка при удалении файлов мира"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Невозможно настроить мир: ничего не выбрано"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Невозможно создать мир: Ни одной игры не найдено"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Следующие файлы будут удалены"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Невозможно удалить мир: Ничего не выбрано"
+
+#~ msgid "Address required."
+#~ msgstr "Нужно ввести адрес."
+
+#~ msgid "Create world"
+#~ msgstr "Создать мир"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Оставьте адрес пустым для запуска локального сервера."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Избранные"
+
+#~ msgid "Show Public"
+#~ msgstr "Публичные"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Предупреждение: Неверная конфигурация.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Настройки сохранены.  "
+
+#~ msgid "is required by:"
+#~ msgstr "требуется для:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет"
+
+#, fuzzy
+#~ msgid "Downloading"
+#~ msgstr "Загрузить"
+
+#~ msgid "Touch free target"
+#~ msgstr "Свободный выбор цели"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Коэффициент масштаба интерфейса: "
+
+#, fuzzy
+#~ msgid "Wanted FPS"
+#~ msgstr "Ожидаемый FPS"
+
+#, fuzzy
+#~ msgid "Viewing range minimum"
+#~ msgstr "Минимальная граница дальности отрисовки."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Предзагрузка текстур..."
+
+#, fuzzy
+#~ msgid "New style water"
+#~ msgstr "Новый стиль воды"
 
 #~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
 #~ msgstr ""
-#~ "Предупреждение: Некоторые моды еще не настроены.\n"
-#~ "Их стандартные настройки будут установлены, когда вы сохраните "
-#~ "конфигурацию.  "
+#~ "Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность "
+#~ "отображения.\n"
+#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
 
-#~ msgid "Local install"
-#~ msgstr "Локальная установка"
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность "
+#~ "отображения.\n"
+#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
 
-#~ msgid "Add mod:"
-#~ msgstr "Добавить мод:"
-
-#~ msgid "MODS"
-#~ msgstr "МОДЫ"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "ПАКЕТЫ ТЕКСТУР"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "ОДИНОЧНАЯ ИГРА"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Конечные жидкости"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Предзагрузка изображений"
-
-#~ msgid "SETTINGS"
-#~ msgstr "НАСТРОЙКИ"
-
-#~ msgid "Password"
-#~ msgstr "Пароль"
-
-#~ msgid "Name"
-#~ msgstr "Имя"
-
-#~ msgid "START SERVER"
-#~ msgstr "СЕРВЕР"
-
-#~ msgid "CLIENT"
-#~ msgstr "КЛИЕНТ"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Добавить мод"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Удалить мод"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "РЕДАКТИРОВАНИЕ"
-
-#~ msgid "new game"
-#~ msgstr "Создать игру"
-
-#~ msgid "Mods:"
-#~ msgstr "Моды:"
-
-#~ msgid "GAMES"
-#~ msgstr "ИГРЫ"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Название"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Перезапустите Minetest для принятия изменений"
-
-#~ msgid "Rendering:"
-#~ msgstr "Рендеринг:"
-
-#~ msgid "If enabled, "
-#~ msgstr "Если включено "
-
-#~ msgid "If disabled "
-#~ msgstr "Если выключено "
-
-#~ msgid "\""
-#~ msgstr "\""
-
-#~ msgid "No!!!"
-#~ msgstr "Нет!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Генерировать карты нормалей"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Список публичных серверов"
-
-#~ msgid "No of course not!"
-#~ msgstr "Нет, конечно нет!"
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Включите немного более низкую поверхность воды, чтобы она\n"
+#~ "не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n"
+#~ "и мягкое освещение на поверхности воды не работает с этим."
diff --git a/po/sr_Cyrl/minetest.po b/po/sr_Cyrl/minetest.po
index 92413f32a..304c9bded 100644
--- a/po/sr_Cyrl/minetest.po
+++ b/po/sr_Cyrl/minetest.po
@@ -7,31 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-06-09 11:11+0000\n"
 "Last-Translator: Лазар Вукановић <gavranvukhome@gmail.com>\n"
-"Language-Team: Serbian (cyrillic) "
-"<https://hosted.weblate.org/projects/minetest/minetest/sr_Cyrl/>\n"
+"Language-Team: Serbian (cyrillic) <https://hosted.weblate.org/projects/"
+"minetest/minetest/sr_Cyrl/>\n"
 "Language: sr_Cyrl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.7-dev\n"
 
-#: builtin/fstk/ui.lua
-msgid "The server has requested a reconnect:"
-msgstr "Сервер тражи поновно повезивање:"
-
-#: builtin/fstk/ui.lua
-msgid "Main menu"
-msgstr "Главни мени"
-
-#: builtin/fstk/ui.lua
-msgid "Reconnect"
-msgstr "Поновно повезивање"
-
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
 msgstr "Догодила се грешка у Lua скрипти, у моду:"
@@ -40,64 +28,51 @@ msgstr "Догодила се грешка у Lua скрипти, у моду:"
 msgid "An error occured:"
 msgstr "Догодила се грешка:"
 
+#: builtin/fstk/ui.lua
+msgid "Main menu"
+msgstr "Главни мени"
+
 #: builtin/fstk/ui.lua builtin/mainmenu/store.lua
 msgid "Ok"
 msgstr "Уреду"
 
+#: builtin/fstk/ui.lua
+msgid "Reconnect"
+msgstr "Поновно повезивање"
+
+#: builtin/fstk/ui.lua
+msgid "The server has requested a reconnect:"
+msgstr "Сервер тражи поновно повезивање:"
+
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
 msgstr "Учитавање..."
 
+#: builtin/mainmenu/common.lua
+msgid "Protocol version mismatch. "
+msgstr "Неслагање верзија протокола. "
+
+#: builtin/mainmenu/common.lua
+msgid "Server enforces protocol version $1. "
+msgstr "Сервер примењује $1 верзију протокола. "
+
+#: builtin/mainmenu/common.lua
+msgid "Server supports protocol versions between $1 and $2. "
+msgstr "Сервер подржава верзије протокола између $1 и $2. "
+
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
 msgstr ""
 "Покушајте да поновно укључите листу сервера и проверите вашу интернет "
 "конекцију."
 
-#: builtin/mainmenu/common.lua
-msgid "Server supports protocol versions between $1 and $2. "
-msgstr "Сервер подржава верзије протокола између $1 и $2. "
-
-#: builtin/mainmenu/common.lua
-msgid "Server enforces protocol version $1. "
-msgstr "Сервер примењује $1 верзију протокола. "
-
-#: builtin/mainmenu/common.lua
-msgid "We support protocol versions between version $1 and $2."
-msgstr "Ми подржавамо верзије протокола између верзије $1 и $2."
-
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Ми подржавамо само $1 верзију протокола."
 
 #: builtin/mainmenu/common.lua
-msgid "Protocol version mismatch. "
-msgstr "Неслагање верзија протокола. "
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "World:"
-msgstr "Свет:"
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Hide Game"
-msgstr "Сакриј игру"
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Hide mp content"
-msgstr "Сакриј садржину мод-паковања"
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Mod:"
-msgstr "Мод:"
-
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
-msgid "Depends:"
-msgstr "Зависи од:"
-
-#: builtin/mainmenu/dlg_config_world.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
-msgid "Save"
-msgstr "Сачувај"
+msgid "We support protocol versions between version $1 and $2."
+msgstr "Ми подржавамо верзије протокола између верзије $1 и $2."
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -107,17 +82,17 @@ msgstr "Сачувај"
 msgid "Cancel"
 msgstr "Прекини"
 
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Enable MP"
-msgstr "Омогући мод-паковање"
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
+msgid "Depends:"
+msgstr "Зависи од:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable MP"
 msgstr "Онемогући мод-паковање"
 
 #: builtin/mainmenu/dlg_config_world.lua
-msgid "enabled"
-msgstr "укључено"
+msgid "Enable MP"
+msgstr "Омогући мод-паковање"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -131,50 +106,75 @@ msgstr ""
 "Неуспело укључивање мода \"$1\" зато што садржи неподржане симболе.Само "
 "симболи [a-z0-9_] су дозвољени."
 
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "World name"
-msgstr "Име света"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Hide Game"
+msgstr "Сакриј игру"
 
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Seed"
-msgstr "Семе"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Hide mp content"
+msgstr "Сакриј садржину мод-паковања"
 
-#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-msgid "Mapgen"
-msgstr "Генератор мапе"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Mod:"
+msgstr "Мод:"
 
-#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-msgid "Game"
-msgstr "Игра"
+#: builtin/mainmenu/dlg_config_world.lua
+#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
+msgid "Save"
+msgstr "Сачувај"
 
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Create"
-msgstr "Направи"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "World:"
+msgstr "Свет:"
 
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "You have no subgames installed."
-msgstr "Нема инсталираних подигара."
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Download one from minetest.net"
-msgstr "Преузми један са minetest.net"
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Warning: The minimal development test is meant for developers."
-msgstr "Упозорење: Минимални развојни тест је намењен развијачима."
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "Преузми подигру, као што је minetest_game, са minetest.net"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "enabled"
+msgstr "укључено"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
 msgstr "Свет \"$1\" већ постоји"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Create"
+msgstr "Направи"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Download a subgame, such as minetest_game, from minetest.net"
+msgstr "Преузми подигру, као што је minetest_game, са minetest.net"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Download one from minetest.net"
+msgstr "Преузми један са minetest.net"
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Game"
+msgstr "Игра"
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Mapgen"
+msgstr "Генератор мапе"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No worldname given or no game selected"
 msgstr "Име није дато или ниједна игра није изабрана"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Seed"
+msgstr "Семе"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Warning: The minimal development test is meant for developers."
+msgstr "Упозорење: Минимални развојни тест је намењен развијачима."
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "World name"
+msgstr "Име света"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "You have no subgames installed."
+msgstr "Нема инсталираних подигара."
+
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
 msgstr "Да ли сте сигурни да желите да обришете \"$1\"?"
@@ -197,33 +197,45 @@ msgstr "Modmgr: локација мода \"$1\" није валидна"
 msgid "Delete World \"$1\"?"
 msgstr "Обриши свет \"$1\"?"
 
-#: builtin/mainmenu/dlg_rename_modpack.lua
-msgid "Rename Modpack:"
-msgstr "Преименуј мод-паковање:"
-
 #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
 msgid "Accept"
 msgstr "Прихвати"
 
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Games"
-msgstr "Игре"
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid "Rename Modpack:"
+msgstr "Преименуј мод-паковање:"
 
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
-msgid "Mods"
-msgstr "Модови"
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "\"$1\" is not a valid flag."
+msgstr "\"$1\" није валидна ознака."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
 msgstr "(Није дат опис поставке)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Please enter a comma seperated list of flags."
-msgstr "Молим вас унесите листу ознака раздвојену зарезима."
+msgid "< Back to Settings page"
+msgstr "< Назад на страну са поставкама"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Possible values are: "
-msgstr "Могуће вредности су: "
+msgid "Browse"
+msgstr "Прегледај"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Disabled"
+msgstr "Онемогућено"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Edit"
+msgstr "Промени"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Enabled"
+msgstr "Омогућено"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Format is 3 numbers separated by commas and inside brackets."
+msgstr "Формат су три броја унутар заграда раздвојени зарезима."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid ""
@@ -233,30 +245,46 @@ msgstr ""
 "Формат:  <офсет>, <скала>, (<распонX>, <распонY>, <распонZ>), <семе>, "
 "<октаве>, <упорност>"
 
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Games"
+msgstr "Игре"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
+msgid "Mods"
+msgstr "Модови"
+
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Format is 3 numbers separated by commas and inside brackets."
-msgstr "Формат су три броја унутар заграда раздвојени зарезима."
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Disabled"
-msgstr "Онемогућено"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Enabled"
-msgstr "Омогућено"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Browse"
-msgstr "Прегледај"
+msgid "Please enter a comma seperated list of flags."
+msgstr "Молим вас унесите листу ознака раздвојену зарезима."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
 msgstr "Молим вас унесите валидан број."
 
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a valid number."
+msgstr "Молим вас унесите валидан број."
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Possible values are: "
+msgstr "Могуће вредности су: "
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Restore Default"
+msgstr "Поврати уобичајено"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Select path"
+msgstr "Одабери локацију"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Show technical names"
+msgstr "Прикажи техничка имена"
+
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be greater than $1."
 msgstr "Вредност мора бити већа од $1."
@@ -265,38 +293,6 @@ msgstr "Вредност мора бити већа од $1."
 msgid "The value must be lower than $1."
 msgstr "Вредност мора бити мања од $1."
 
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Please enter a valid number."
-msgstr "Молим вас унесите валидан број."
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "\"$1\" is not a valid flag."
-msgstr "\"$1\" није валидна ознака."
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Select path"
-msgstr "Одабери локацију"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "< Back to Settings page"
-msgstr "< Назад на страну са поставкама"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Edit"
-msgstr "Промени"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Restore Default"
-msgstr "Поврати уобичајено"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Show technical names"
-msgstr "Прикажи техничка имена"
-
-#: builtin/mainmenu/modmgr.lua
-msgid "Install Mod: file: \"$1\""
-msgstr "Инсталирај мод: фајл: \"$1\""
-
 #: builtin/mainmenu/modmgr.lua
 msgid ""
 "\n"
@@ -310,123 +306,119 @@ msgid "Failed to install $1 to $2"
 msgstr "Неуспела инсталација $1 у $2"
 
 #: builtin/mainmenu/modmgr.lua
-msgid "Install Mod: unable to find suitable foldername for modpack $1"
-msgstr ""
-"Инсталирај мод: не може се пронаћи одговарајуће име за фасциклу мод-паковања "
-"$1"
+msgid "Install Mod: file: \"$1\""
+msgstr "Инсталирај мод: фајл: \"$1\""
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find real modname for: $1"
 msgstr "Инсталирај мод: не може се пронаћи право име за: $1"
 
-#: builtin/mainmenu/store.lua
-msgid "Unsorted"
-msgstr "Нераспоређено"
-
-#: builtin/mainmenu/store.lua
-msgid "Search"
-msgstr "Тражи"
-
-#: builtin/mainmenu/store.lua
-msgid "Downloading $1, please wait..."
-msgstr "Преузима се $1, молим вас сачекајте..."
-
-#: builtin/mainmenu/store.lua
-msgid "Successfully installed:"
-msgstr "Успешно инсталиран:"
-
-#: builtin/mainmenu/store.lua
-msgid "Shortname:"
-msgstr "Краће име:"
-
-#: builtin/mainmenu/store.lua
-msgid "Rating"
-msgstr "Оцена"
-
-#: builtin/mainmenu/store.lua
-msgid "re-Install"
-msgstr "поново инсталирај"
-
-#: builtin/mainmenu/store.lua
-msgid "Install"
-msgstr "Инсталирај"
+#: builtin/mainmenu/modmgr.lua
+msgid "Install Mod: unable to find suitable foldername for modpack $1"
+msgstr ""
+"Инсталирај мод: не може се пронаћи одговарајуће име за фасциклу мод-паковања "
+"$1"
 
 #: builtin/mainmenu/store.lua
 msgid "Close store"
 msgstr "Затвори складиште"
 
+#: builtin/mainmenu/store.lua
+msgid "Downloading $1, please wait..."
+msgstr "Преузима се $1, молим вас сачекајте..."
+
+#: builtin/mainmenu/store.lua
+msgid "Install"
+msgstr "Инсталирај"
+
 #: builtin/mainmenu/store.lua
 msgid "Page $1 of $2"
 msgstr "Страна $1 од $2"
 
-#: builtin/mainmenu/tab_credits.lua
-msgid "Credits"
-msgstr "Заслуге"
+#: builtin/mainmenu/store.lua
+msgid "Rating"
+msgstr "Оцена"
 
-#: builtin/mainmenu/tab_credits.lua
-msgid "Core Developers"
-msgstr "Главни развијачи"
+#: builtin/mainmenu/store.lua
+msgid "Search"
+msgstr "Тражи"
+
+#: builtin/mainmenu/store.lua
+msgid "Shortname:"
+msgstr "Краће име:"
+
+#: builtin/mainmenu/store.lua
+msgid "Successfully installed:"
+msgstr "Успешно инсталиран:"
+
+#: builtin/mainmenu/store.lua
+msgid "Unsorted"
+msgstr "Нераспоређено"
+
+#: builtin/mainmenu/store.lua
+msgid "re-Install"
+msgstr "поново инсталирај"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
 msgstr "Активни сарадници"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Previous Core Developers"
-msgstr "Предходни главни развијачи"
+msgid "Core Developers"
+msgstr "Главни развијачи"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Credits"
+msgstr "Заслуге"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
 msgstr "Предходни сарадници"
 
+#: builtin/mainmenu/tab_credits.lua
+msgid "Previous Core Developers"
+msgstr "Предходни главни развијачи"
+
 #: builtin/mainmenu/tab_mods.lua
 msgid "Installed Mods:"
 msgstr "Инсталирани модови:"
 
-#: builtin/mainmenu/tab_mods.lua
-msgid "No mod description available"
-msgstr "Није доступан опис мода"
-
 #: builtin/mainmenu/tab_mods.lua
 msgid "Mod information:"
 msgstr "Информације о моду:"
 
+#: builtin/mainmenu/tab_mods.lua
+msgid "No mod description available"
+msgstr "Није доступан опис мода"
+
 #: builtin/mainmenu/tab_mods.lua
 msgid "Rename"
 msgstr "Преименуј"
 
 #: builtin/mainmenu/tab_mods.lua
-msgid "Uninstall selected modpack"
-msgstr "Уклони одабрано мод-паковање"
+msgid "Select Mod File:"
+msgstr "Изаберите фајл мода:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected mod"
 msgstr "Уклони изабрани мод"
 
 #: builtin/mainmenu/tab_mods.lua
-msgid "Select Mod File:"
-msgstr "Изаберите фајл мода:"
+msgid "Uninstall selected modpack"
+msgstr "Уклони одабрано мод-паковање"
 
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port"
 msgstr "Адреса / Порт"
 
-#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Name / Password"
-msgstr "Име / Шифра"
+#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
+msgid "Client"
+msgstr "Клијент"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Connect"
 msgstr "Прикључи се"
 
-#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Del. Favorite"
-msgstr "Обриши Омиљени"
-
-#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Favorite"
-msgstr "Омиљени"
-
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative mode"
 msgstr "Слободни мод"
@@ -435,30 +427,30 @@ msgstr "Слободни мод"
 msgid "Damage enabled"
 msgstr "Оштећење омогућено"
 
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Del. Favorite"
+msgstr "Обриши Омиљени"
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Favorite"
+msgstr "Омиљени"
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Name / Password"
+msgstr "Име / Шифра"
+
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
 msgstr "Туча омогућена"
 
-#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
-msgid "Client"
-msgstr "Клијент"
-
-#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
-msgid "New"
-msgstr "Нови"
+#: builtin/mainmenu/tab_server.lua
+msgid "Bind Address"
+msgstr "Вежи адресу"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Configure"
 msgstr "Подеси"
 
-#: builtin/mainmenu/tab_server.lua
-msgid "Start Game"
-msgstr "Почни игру"
-
-#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
-msgid "Select World:"
-msgstr "Одабери свет:"
-
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Creative Mode"
@@ -469,86 +461,50 @@ msgstr "Слободни мод"
 msgid "Enable Damage"
 msgstr "Омогући оштећење"
 
-#: builtin/mainmenu/tab_server.lua
-msgid "Public"
-msgstr "Јавни"
-
 #: builtin/mainmenu/tab_server.lua
 msgid "Name/Password"
 msgstr "Име/Шифра"
 
-#: builtin/mainmenu/tab_server.lua
-msgid "Bind Address"
-msgstr "Вежи адресу"
-
-#: builtin/mainmenu/tab_server.lua
-msgid "Port"
-msgstr "Порт"
-
-#: builtin/mainmenu/tab_server.lua
-msgid "Server Port"
-msgstr "Серверски порт"
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "New"
+msgstr "Нови"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "No world created or selected!"
 msgstr "Ниједан свет није направљен или изабран!"
 
+#: builtin/mainmenu/tab_server.lua
+msgid "Port"
+msgstr "Порт"
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Public"
+msgstr "Јавни"
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "Select World:"
+msgstr "Одабери свет:"
+
 #: builtin/mainmenu/tab_server.lua
 msgid "Server"
 msgstr "Сервер"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Opaque Leaves"
-msgstr "Непровидно лишће"
+#: builtin/mainmenu/tab_server.lua
+msgid "Server Port"
+msgstr "Серверски порт"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Simple Leaves"
-msgstr "Једноставно лишће"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Fancy Leaves"
-msgstr "Елегантно лишће"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Node Outlining"
-msgstr "Обцртавање блокова"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Node Highlighting"
-msgstr "Истицање блокова"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No Filter"
-msgstr "Без филтера"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bilinear Filter"
-msgstr "Билинеарни филтер"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Trilinear Filter"
-msgstr "Трилинеарни филтер"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No Mipmap"
-msgstr "Без Mipmap-а"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Mipmap"
-msgstr "Mipmap"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Mipmap + Aniso. Filter"
-msgstr "Mipmap + Анизотропни филтер"
-
-#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
-msgid "None"
-msgstr "Ништа"
+#: builtin/mainmenu/tab_server.lua
+msgid "Start Game"
+msgstr "Почни игру"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
 msgstr ""
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "3D Clouds"
+msgstr "3Д Облаци"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
 msgstr ""
@@ -558,80 +514,129 @@ msgid "8x"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Да ли сте сигурни да желите да ресетујете ваш свет?"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Да"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Не"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Smooth Lighting"
-msgstr "Глатко осветљење"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Particles"
-msgstr "Честице"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "3D Clouds"
-msgstr "3Д Облаци"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Opaque Water"
-msgstr "Непрозирна вода"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Connected Glass"
-msgstr "Спојено стакло"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Texturing:"
-msgstr "Филтери за текстуре:"
+msgid "Advanced Settings"
+msgstr "Напредне поставке"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
 msgstr "Гланчање текстура:"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Shaders"
-msgstr "Шејдери"
+#: builtin/mainmenu/tab_settings.lua
+msgid "Are you sure to reset your singleplayer world?"
+msgstr "Да ли сте сигурни да желите да ресетујете ваш свет?"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Bilinear Filter"
+msgstr "Билинеарни филтер"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Bump Mapping"
+msgstr "Bump-Мапирање"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
 msgstr "Промени дугмад"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Advanced Settings"
-msgstr "Напредне поставке"
+msgid "Connected Glass"
+msgstr "Спојено стакло"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Touchthreshold (px)"
-msgstr "Праг додиривања (px)"
+msgid "Fancy Leaves"
+msgstr "Елегантно лишће"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bump-Мапирање"
+msgid "Mipmap"
+msgstr "Mipmap"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Tone Mapping"
-msgstr "Тонско Мапирање"
+#: builtin/mainmenu/tab_settings.lua
+msgid "Mipmap + Aniso. Filter"
+msgstr "Mipmap + Анизотропни филтер"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No"
+msgstr "Не"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No Filter"
+msgstr "Без филтера"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No Mipmap"
+msgstr "Без Mipmap-а"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Node Highlighting"
+msgstr "Истицање блокова"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Node Outlining"
+msgstr "Обцртавање блокова"
+
+#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
+msgid "None"
+msgstr "Ништа"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Normal Mapping"
 msgstr "Нормал-мапирање"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Opaque Leaves"
+msgstr "Непровидно лишће"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Opaque Water"
+msgstr "Непрозирна вода"
+
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Parallax Occlusion"
 msgstr "Parallax Occlusion Мапирање"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Waving Water"
-msgstr "Веслајућа вода"
+msgid "Particles"
+msgstr "Честице"
+
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "Да ли сте сигурни да желите да ресетујете ваш свет?"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Settings"
+msgstr "Поставке"
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Shaders"
+msgstr "Шејдери"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Simple Leaves"
+msgstr "Једноставно лишће"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Smooth Lighting"
+msgstr "Глатко осветљење"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Texturing:"
+msgstr "Филтери за текстуре:"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "To enable shaders the OpenGL driver needs to be used."
+msgstr "Да би се омогућили шејдери мора се користити OpenGL драјвер."
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Tone Mapping"
+msgstr "Тонско Мапирање"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Touchthreshold (px)"
+msgstr "Праг додиривања (px)"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Trilinear Filter"
+msgstr "Трилинеарни филтер"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
@@ -642,16 +647,12 @@ msgid "Waving Plants"
 msgstr "Лепршајуће биљке"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr "Да би се омогућили шејдери мора се користити OpenGL драјвер."
+msgid "Waving Water"
+msgstr "Веслајућа вода"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Settings"
-msgstr "Поставке"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Започни игру за једног играча"
+msgid "Yes"
+msgstr "Да"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Config mods"
@@ -661,6 +662,10 @@ msgstr "Подеси модове"
 msgid "Main"
 msgstr "Главно"
 
+#: builtin/mainmenu/tab_simple_main.lua
+msgid "Start Singleplayer"
+msgstr "Започни игру за једног играча"
+
 #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
 msgid "Play"
 msgstr "Играј"
@@ -669,14 +674,14 @@ msgstr "Играј"
 msgid "Singleplayer"
 msgstr "Један играч"
 
-#: builtin/mainmenu/tab_texturepacks.lua
-msgid "Select texture pack:"
-msgstr "Одабери сет текстура:"
-
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "No information available"
 msgstr "Нема доступних информација"
 
+#: builtin/mainmenu/tab_texturepacks.lua
+msgid "Select texture pack:"
+msgstr "Одабери сет текстура:"
+
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Texturepacks"
 msgstr "Сетови текстура"
@@ -685,6 +690,18 @@ msgstr "Сетови текстура"
 msgid "Connection timed out."
 msgstr "Конекцији је истекло време."
 
+#: src/client.cpp
+msgid "Done!"
+msgstr "Готово!"
+
+#: src/client.cpp
+msgid "Initializing nodes"
+msgstr "Припремам блокове"
+
+#: src/client.cpp
+msgid "Initializing nodes..."
+msgstr "Припремам блокове..."
+
 #: src/client.cpp
 msgid "Loading textures..."
 msgstr "Учитавам текстуре..."
@@ -693,39 +710,10 @@ msgstr "Учитавам текстуре..."
 msgid "Rebuilding shaders..."
 msgstr "Обнављам шејдере..."
 
-#: src/client.cpp
-msgid "Initializing nodes..."
-msgstr "Припремам блокове..."
-
-#: src/client.cpp
-msgid "Initializing nodes"
-msgstr "Припремам блокове"
-
-#: src/client.cpp
-msgid "Done!"
-msgstr "Готово!"
-
-#: src/client/clientlauncher.cpp
-msgid "Main Menu"
-msgstr "Главни мени"
-
-#: src/client/clientlauncher.cpp
-msgid "Player name too long."
-msgstr "Име играча је предуачко."
-
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
 msgstr "Грешка у конекцији (истекло време?)"
 
-#: src/client/clientlauncher.cpp
-msgid "No world selected and no address provided. Nothing to do."
-msgstr ""
-"Ниједан свет није изабран и ниједна адреса није дата. Немогу ништа да урадим."
-
-#: src/client/clientlauncher.cpp
-msgid "Provided world path doesn't exist: "
-msgstr "Дата локација света не постоји: "
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
 msgstr "Немогу пронаћи или учитати игру \""
@@ -734,33 +722,58 @@ msgstr "Немогу пронаћи или учитати игру \""
 msgid "Invalid gamespec."
 msgstr "Неважећи gamespec."
 
+#: src/client/clientlauncher.cpp
+msgid "Main Menu"
+msgstr "Главни мени"
+
+#: src/client/clientlauncher.cpp
+msgid "No world selected and no address provided. Nothing to do."
+msgstr ""
+"Ниједан свет није изабран и ниједна адреса није дата. Немогу ништа да урадим."
+
+#: src/client/clientlauncher.cpp
+msgid "Player name too long."
+msgstr "Име играча је предуачко."
+
+#: src/client/clientlauncher.cpp
+msgid "Provided world path doesn't exist: "
+msgstr "Дата локација света не постоји: "
+
 #: src/fontengine.cpp
 msgid "needs_fallback_font"
 msgstr ""
 
-#: src/game.cpp
-msgid "You died."
-msgstr "Умро/ла си."
-
-#: src/game.cpp
-msgid "Respawn"
-msgstr "Врати се у живот"
-
 #: src/game.cpp
 msgid ""
-"Default Controls:\n"
-"No menu visible:\n"
-"- single tap: button activate\n"
-"- double tap: place/use\n"
-"- slide finger: look around\n"
-"Menu/Inventory visible:\n"
-"- double tap (outside):\n"
-" -->close\n"
-"- touch stack, touch slot:\n"
-" --> move stack\n"
-"- touch&drag, tap 2nd finger\n"
-" --> place single item to slot\n"
+"\n"
+"Check debug.txt for details."
 msgstr ""
+"\n"
+"Проверите debug.txt за више детаља."
+
+#: src/game.cpp
+msgid "Change Keys"
+msgstr "Подеси контроле"
+
+#: src/game.cpp
+msgid "Change Password"
+msgstr "Промени шифру"
+
+#: src/game.cpp
+msgid "Connecting to server..."
+msgstr "Повезујем се на сервер..."
+
+#: src/game.cpp
+msgid "Continue"
+msgstr "Настави"
+
+#: src/game.cpp
+msgid "Creating client..."
+msgstr "Правим клијента..."
+
+#: src/game.cpp
+msgid "Creating server..."
+msgstr "Правим сервер..."
 
 #: src/game.cpp
 msgid ""
@@ -789,20 +802,20 @@ msgstr ""
 "- T: причање\n"
 
 #: src/game.cpp
-msgid "Continue"
-msgstr "Настави"
-
-#: src/game.cpp
-msgid "Change Password"
-msgstr "Промени шифру"
-
-#: src/game.cpp
-msgid "Sound Volume"
-msgstr "Јачина звука"
-
-#: src/game.cpp
-msgid "Change Keys"
-msgstr "Подеси контроле"
+msgid ""
+"Default Controls:\n"
+"No menu visible:\n"
+"- single tap: button activate\n"
+"- double tap: place/use\n"
+"- slide finger: look around\n"
+"Menu/Inventory visible:\n"
+"- double tap (outside):\n"
+" -->close\n"
+"- touch stack, touch slot:\n"
+" --> move stack\n"
+"- touch&drag, tap 2nd finger\n"
+" --> place single item to slot\n"
+msgstr ""
 
 #: src/game.cpp
 msgid "Exit to Menu"
@@ -812,124 +825,66 @@ msgstr "Изађи у мени"
 msgid "Exit to OS"
 msgstr "Изађи из програма"
 
-#: src/game.cpp
-msgid "Shutting down..."
-msgstr "Искључивање..."
-
-#: src/game.cpp
-msgid "Creating server..."
-msgstr "Правим сервер..."
-
-#: src/game.cpp
-msgid "Creating client..."
-msgstr "Правим клијента..."
-
-#: src/game.cpp
-msgid "Resolving address..."
-msgstr "Разлучујем адресу..."
-
-#: src/game.cpp
-msgid "Connecting to server..."
-msgstr "Повезујем се на сервер..."
-
 #: src/game.cpp
 msgid "Item definitions..."
 msgstr "Дефиниције предмета..."
 
-#: src/game.cpp
-msgid "Node definitions..."
-msgstr "Дефиниције блокова..."
-
-#: src/game.cpp
-msgid "Media..."
-msgstr "Медија..."
-
 #: src/game.cpp
 msgid "KiB/s"
 msgstr ""
 
+#: src/game.cpp
+msgid "Media..."
+msgstr "Медија..."
+
 #: src/game.cpp
 msgid "MiB/s"
 msgstr ""
 
+#: src/game.cpp
+msgid "Node definitions..."
+msgstr "Дефиниције блокова..."
+
+#: src/game.cpp
+msgid "Resolving address..."
+msgstr "Разлучујем адресу..."
+
+#: src/game.cpp
+msgid "Respawn"
+msgstr "Врати се у живот"
+
+#: src/game.cpp
+msgid "Shutting down..."
+msgstr "Искључивање..."
+
+#: src/game.cpp
+msgid "Sound Volume"
+msgstr "Јачина звука"
+
+#: src/game.cpp
+msgid "You died."
+msgstr "Умро/ла си."
+
 #: src/game.cpp src/guiFormSpecMenu.cpp
 msgid "ok"
 msgstr "уреду"
 
-#: src/game.cpp
-msgid ""
-"\n"
-"Check debug.txt for details."
-msgstr ""
-"\n"
-"Проверите debug.txt за више детаља."
-
-#: src/guiFormSpecMenu.cpp
-msgid "Proceed"
-msgstr "Настави"
-
 #: src/guiFormSpecMenu.cpp
 msgid "Enter "
 msgstr "Уреду "
 
-#: src/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
-msgstr ""
-"Подешавање контрола.(Ако овај мени нешто поквари, обришите ствари из "
-"minetest.conf)"
+#: src/guiFormSpecMenu.cpp
+msgid "Proceed"
+msgstr "Настави"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "\"Use\" = climb down"
 msgstr "\"Користи\" = Силажење"
 
-#: src/guiKeyChangeMenu.cpp
-msgid "Double tap \"jump\" to toggle fly"
-msgstr "Дупли скок за летење"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Key already in use"
-msgstr "Дугме се већ користи"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "press key"
-msgstr "притисните дугме"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Forward"
-msgstr "Напред"
-
 #: src/guiKeyChangeMenu.cpp
 msgid "Backward"
 msgstr "Назад"
 
-#: src/guiKeyChangeMenu.cpp src/keycode.cpp
-msgid "Left"
-msgstr "Лево"
-
-#: src/guiKeyChangeMenu.cpp src/keycode.cpp
-msgid "Right"
-msgstr "Десно"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Use"
-msgstr "Коришћење"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Jump"
-msgstr "Скакање"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Sneak"
-msgstr "Шуњање"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Drop"
-msgstr "Бацање"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Inventory"
-msgstr "Инвентар"
-
 #: src/guiKeyChangeMenu.cpp
 msgid "Chat"
 msgstr "Чет"
@@ -943,148 +898,226 @@ msgid "Console"
 msgstr "Конзола"
 
 #: src/guiKeyChangeMenu.cpp
-msgid "Toggle fly"
-msgstr "Укључи/Искључи летење"
+msgid "Double tap \"jump\" to toggle fly"
+msgstr "Дупли скок за летење"
 
 #: src/guiKeyChangeMenu.cpp
-msgid "Toggle fast"
-msgstr "Укључи/Искључи трчање"
+msgid "Drop"
+msgstr "Бацање"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Forward"
+msgstr "Напред"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Inventory"
+msgstr "Инвентар"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Jump"
+msgstr "Скакање"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Key already in use"
+msgstr "Дугме се већ користи"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgstr ""
+"Подешавање контрола.(Ако овај мени нешто поквари, обришите ствари из "
+"minetest.conf)"
+
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Left"
+msgstr "Лево"
+
+#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
+msgid "Print stacks"
+msgstr "Прикажи stack-ове"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Range select"
+msgstr "Одабир домета"
+
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Right"
+msgstr "Десно"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Sneak"
+msgstr "Шуњање"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle Cinematic"
 msgstr "Укључи/Искључи Cinematic мод"
 
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle fast"
+msgstr "Укључи/Искључи трчање"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle fly"
+msgstr "Укључи/Искључи летење"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
 msgstr "Укључи/искључи пролажење кроз препреке"
 
 #: src/guiKeyChangeMenu.cpp
-msgid "Range select"
-msgstr "Одабир домета"
+msgid "Use"
+msgstr "Коришћење"
 
-#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
-msgid "Print stacks"
-msgstr "Прикажи stack-ове"
-
-#: src/guiPasswordChange.cpp
-msgid "Old Password"
-msgstr "Стара шифра"
-
-#: src/guiPasswordChange.cpp
-msgid "New Password"
-msgstr "Нова шифра"
-
-#: src/guiPasswordChange.cpp
-msgid "Confirm Password"
-msgstr "Потврди шифру"
+#: src/guiKeyChangeMenu.cpp
+msgid "press key"
+msgstr "притисните дугме"
 
 #: src/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Промени"
 
+#: src/guiPasswordChange.cpp
+msgid "Confirm Password"
+msgstr "Потврди шифру"
+
+#: src/guiPasswordChange.cpp
+msgid "New Password"
+msgstr "Нова шифра"
+
+#: src/guiPasswordChange.cpp
+msgid "Old Password"
+msgstr "Стара шифра"
+
 #: src/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Шифре се не поклапају!"
 
-#: src/guiVolumeChange.cpp
-msgid "Sound Volume: "
-msgstr "Јачина звука: "
-
 #: src/guiVolumeChange.cpp
 msgid "Exit"
 msgstr "Изађи"
 
-#: src/keycode.cpp
-msgid "Left Button"
-msgstr "Лево дугме"
+#: src/guiVolumeChange.cpp
+msgid "Sound Volume: "
+msgstr "Јачина звука: "
 
 #: src/keycode.cpp
-msgid "Middle Button"
-msgstr "Средње дугме"
+msgid "Apps"
+msgstr "Апликације"
 
 #: src/keycode.cpp
-msgid "Right Button"
-msgstr "Десно дугме"
-
-#: src/keycode.cpp
-msgid "X Button 1"
-msgstr "X Дугме 1"
+msgid "Attn"
+msgstr ""
 
 #: src/keycode.cpp
 msgid "Back"
 msgstr "Назад"
 
+#: src/keycode.cpp
+msgid "Capital"
+msgstr "Главно"
+
 #: src/keycode.cpp
 msgid "Clear"
 msgstr "Очисти"
 
 #: src/keycode.cpp
-msgid "Return"
-msgstr "Повратак"
-
-#: src/keycode.cpp
-msgid "Tab"
-msgstr "Таб"
-
-#: src/keycode.cpp
-msgid "X Button 2"
-msgstr "X Дугме 2"
-
-#: src/keycode.cpp
-msgid "Capital"
-msgstr "Главно"
+msgid "Comma"
+msgstr "Зарез"
 
 #: src/keycode.cpp
 msgid "Control"
 msgstr "Контрола"
 
 #: src/keycode.cpp
-msgid "Kana"
+msgid "Convert"
+msgstr "Конвертуј"
+
+#: src/keycode.cpp
+msgid "CrSel"
 msgstr ""
 
 #: src/keycode.cpp
-msgid "Menu"
-msgstr "Мени"
+msgid "Down"
+msgstr "Доле"
 
 #: src/keycode.cpp
-msgid "Pause"
-msgstr "Заустави"
+msgid "End"
+msgstr ""
 
 #: src/keycode.cpp
-msgid "Shift"
-msgstr "Шифт"
-
-#: src/keycode.cpp
-msgid "Convert"
-msgstr "Конвертуј"
+msgid "Erase OEF"
+msgstr ""
 
 #: src/keycode.cpp
 msgid "Escape"
 msgstr "Побегни"
 
+#: src/keycode.cpp
+msgid "ExSel"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Execute"
+msgstr "Изврши"
+
 #: src/keycode.cpp
 msgid "Final"
 msgstr "Крајњи"
 
+#: src/keycode.cpp
+msgid "Help"
+msgstr "Помоћ"
+
+#: src/keycode.cpp
+msgid "Home"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Insert"
+msgstr "Убаци"
+
 #: src/keycode.cpp
 msgid "Junja"
 msgstr ""
 
+#: src/keycode.cpp
+msgid "Kana"
+msgstr ""
+
 #: src/keycode.cpp
 msgid "Kanji"
 msgstr ""
 
 #: src/keycode.cpp
-msgid "Nonconvert"
-msgstr "Не конвертуј"
+msgid "Left Button"
+msgstr "Лево дугме"
 
 #: src/keycode.cpp
-msgid "End"
-msgstr ""
+msgid "Left Control"
+msgstr "Леви Control"
 
 #: src/keycode.cpp
-msgid "Home"
-msgstr ""
+msgid "Left Menu"
+msgstr "Леви мени"
+
+#: src/keycode.cpp
+msgid "Left Shift"
+msgstr "Леви Shift"
+
+#: src/keycode.cpp
+msgid "Left Windows"
+msgstr "Леви Windows"
+
+#: src/keycode.cpp
+msgid "Menu"
+msgstr "Мени"
+
+#: src/keycode.cpp
+msgid "Middle Button"
+msgstr "Средње дугме"
+
+#: src/keycode.cpp
+msgid "Minus"
+msgstr "Минус"
 
 #: src/keycode.cpp
 msgid "Mode Change"
@@ -1095,52 +1128,28 @@ msgid "Next"
 msgstr "Следеће"
 
 #: src/keycode.cpp
-msgid "Prior"
+msgid "Nonconvert"
+msgstr "Не конвертуј"
+
+#: src/keycode.cpp
+msgid "Num Lock"
 msgstr ""
 
 #: src/keycode.cpp
-msgid "Space"
-msgstr ""
+msgid "Numpad *"
+msgstr "Нумеричка тастатура *"
 
 #: src/keycode.cpp
-msgid "Down"
-msgstr "Доле"
+msgid "Numpad +"
+msgstr "Нумеричка тастатура +"
 
 #: src/keycode.cpp
-msgid "Execute"
-msgstr "Изврши"
+msgid "Numpad -"
+msgstr "Нумеричка тастатура -"
 
 #: src/keycode.cpp
-msgid "Print"
-msgstr "Прикажи"
-
-#: src/keycode.cpp
-msgid "Select"
-msgstr "Одабери"
-
-#: src/keycode.cpp
-msgid "Up"
-msgstr "Горе"
-
-#: src/keycode.cpp
-msgid "Help"
-msgstr "Помоћ"
-
-#: src/keycode.cpp
-msgid "Insert"
-msgstr "Убаци"
-
-#: src/keycode.cpp
-msgid "Snapshot"
-msgstr ""
-
-#: src/keycode.cpp
-msgid "Left Windows"
-msgstr "Леви Windows"
-
-#: src/keycode.cpp
-msgid "Apps"
-msgstr "Апликације"
+msgid "Numpad /"
+msgstr "Нумеричка тастатура /"
 
 #: src/keycode.cpp
 msgid "Numpad 0"
@@ -1150,14 +1159,6 @@ msgstr "Нумеричка тастатура 0"
 msgid "Numpad 1"
 msgstr "Нумеричка тастатура 1"
 
-#: src/keycode.cpp
-msgid "Right Windows"
-msgstr "Десни Windows"
-
-#: src/keycode.cpp
-msgid "Sleep"
-msgstr ""
-
 #: src/keycode.cpp
 msgid "Numpad 2"
 msgstr "Нумеричка тастатура 2"
@@ -1182,22 +1183,6 @@ msgstr "Нумеричка тастатура 6"
 msgid "Numpad 7"
 msgstr "Нумеричка тастатура 7"
 
-#: src/keycode.cpp
-msgid "Numpad *"
-msgstr "Нумеричка тастатура *"
-
-#: src/keycode.cpp
-msgid "Numpad +"
-msgstr "Нумеричка тастатура +"
-
-#: src/keycode.cpp
-msgid "Numpad -"
-msgstr "Нумеричка тастатура -"
-
-#: src/keycode.cpp
-msgid "Numpad /"
-msgstr "Нумеричка тастатура /"
-
 #: src/keycode.cpp
 msgid "Numpad 8"
 msgstr "Нумеричка тастатура 8"
@@ -1206,70 +1191,6 @@ msgstr "Нумеричка тастатура 8"
 msgid "Numpad 9"
 msgstr "Нумеричка тастатура 9"
 
-#: src/keycode.cpp
-msgid "Num Lock"
-msgstr ""
-
-#: src/keycode.cpp
-msgid "Scroll Lock"
-msgstr ""
-
-#: src/keycode.cpp
-msgid "Left Shift"
-msgstr "Леви Shift"
-
-#: src/keycode.cpp
-msgid "Right Shift"
-msgstr "Десни Shift"
-
-#: src/keycode.cpp
-msgid "Left Control"
-msgstr "Леви Control"
-
-#: src/keycode.cpp
-msgid "Left Menu"
-msgstr "Леви мени"
-
-#: src/keycode.cpp
-msgid "Right Control"
-msgstr "Десни Control"
-
-#: src/keycode.cpp
-msgid "Right Menu"
-msgstr "Десни мени"
-
-#: src/keycode.cpp
-msgid "Comma"
-msgstr "Зарез"
-
-#: src/keycode.cpp
-msgid "Minus"
-msgstr "Минус"
-
-#: src/keycode.cpp
-msgid "Period"
-msgstr "Тачка"
-
-#: src/keycode.cpp
-msgid "Plus"
-msgstr "Плус"
-
-#: src/keycode.cpp
-msgid "Attn"
-msgstr ""
-
-#: src/keycode.cpp
-msgid "CrSel"
-msgstr ""
-
-#: src/keycode.cpp
-msgid "Erase OEF"
-msgstr ""
-
-#: src/keycode.cpp
-msgid "ExSel"
-msgstr ""
-
 #: src/keycode.cpp
 msgid "OEM Clear"
 msgstr ""
@@ -1278,774 +1199,101 @@ msgstr ""
 msgid "PA1"
 msgstr ""
 
+#: src/keycode.cpp
+msgid "Pause"
+msgstr "Заустави"
+
+#: src/keycode.cpp
+msgid "Period"
+msgstr "Тачка"
+
+#: src/keycode.cpp
+msgid "Plus"
+msgstr "Плус"
+
+#: src/keycode.cpp
+msgid "Print"
+msgstr "Прикажи"
+
+#: src/keycode.cpp
+msgid "Prior"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Return"
+msgstr "Повратак"
+
+#: src/keycode.cpp
+msgid "Right Button"
+msgstr "Десно дугме"
+
+#: src/keycode.cpp
+msgid "Right Control"
+msgstr "Десни Control"
+
+#: src/keycode.cpp
+msgid "Right Menu"
+msgstr "Десни мени"
+
+#: src/keycode.cpp
+msgid "Right Shift"
+msgstr "Десни Shift"
+
+#: src/keycode.cpp
+msgid "Right Windows"
+msgstr "Десни Windows"
+
+#: src/keycode.cpp
+msgid "Scroll Lock"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Select"
+msgstr "Одабери"
+
+#: src/keycode.cpp
+msgid "Shift"
+msgstr "Шифт"
+
+#: src/keycode.cpp
+msgid "Sleep"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Snapshot"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Space"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Tab"
+msgstr "Таб"
+
+#: src/keycode.cpp
+msgid "Up"
+msgstr "Горе"
+
+#: src/keycode.cpp
+msgid "X Button 1"
+msgstr "X Дугме 1"
+
+#: src/keycode.cpp
+msgid "X Button 2"
+msgstr "X Дугме 2"
+
 #: src/keycode.cpp
 msgid "Zoom"
 msgstr "Зумирај"
 
-#: src/settings_translation_file.cpp
-msgid "Controls"
-msgstr "Контроле"
-
-#: src/settings_translation_file.cpp
-msgid "Build inside player"
-msgstr "Градња унутар играча"
-
 #: src/settings_translation_file.cpp
 msgid ""
-"If enabled, you can place blocks at the position (feet + eye level) where "
-"you stand.\n"
-"This is helpful when working with nodeboxes in small areas."
-msgstr ""
-"Ако је укључено, можете стављати блокове унутар позиције где стојите.\n"
-"Ово је корисно при раду са nodebox-евима у малим местима."
-
-#: src/settings_translation_file.cpp
-msgid "Flying"
-msgstr "Летење"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Player is able to fly without being affected by gravity.\n"
-"This requires the \"fly\" privilege on the server."
-msgstr ""
-"Играч је у могућности д лети без утицаја гравитације.\n"
-"Ово захтева \"fly\" привилегију на серверима."
-
-#: src/settings_translation_file.cpp
-msgid "Fast movement"
-msgstr "Брзо кретање"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Fast movement (via use key).\n"
-"This requires the \"fast\" privilege on the server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Noclip"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled together with fly mode, player is able to fly through solid "
-"nodes.\n"
-"This requires the \"noclip\" privilege on the server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cinematic mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Smooths camera when moving and looking around.\n"
-"Useful for recording videos."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Camera smoothing"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Smooths rotation of camera. 0 to disable."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Camera smoothing in cinematic mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Invert mouse"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Invert vertical mouse movement."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mouse sensitivity"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mouse sensitivity multiplier."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Key use for climbing/descending"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
-"and descending."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Double tap jump for fly"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Double-tapping the jump key toggles fly mode."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Always fly and fast"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If disabled \"use\" key is used to fly fast if both fly and fast mode are "
-"enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right mouse button."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Random input"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable random user input (only used for testing)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Continuous forward"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Continuous forward movement (only used for testing)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Forward key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player forward.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Backward key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player backward.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Left key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player left.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Right key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player right.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Jump key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for jumping.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Sneak key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for sneaking.\n"
-"Also used for climbing down and descending in water if aux1_descends is "
-"disabled.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Inventory key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the inventory.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving fast in fast mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the chat window.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Command key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the chat window to type commands.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Console key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the chat console.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Range select key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling unlimited view range.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fly key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling flying.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fast key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling fast mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Noclip key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling noclip mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cinematic mode key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling cinematic mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimap key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling display of minimap.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for taking screenshots.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Drop item key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for dropping the currently selected item.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "HUD toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the HUD.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the chat.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fog toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the fog.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Camera update toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the camrea update. Only used for development\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Debug info toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of debug info.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Profiler toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the profiler. Used for development.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Toggle camera mode key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for switching between first- and third-person camera.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "View range increase key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for increasing the viewing range.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "View range decrease key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for decreasing the viewing range.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for printing debug stacks. Used for development.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Network"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Server address"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Address to connect to.\n"
-"Leave this blank to start a local server.\n"
-"Note that the address field in the main menu overrides this setting."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Remote port"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Port to connect to (UDP).\n"
-"Note that the port field in the main menu overrides this setting."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Support older servers"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether to support older servers before protocol version 25.\n"
-"Enable if you want to connect to 0.4.12 servers and before.\n"
-"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
-"Disabling this option will protect your password better."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Saving map received from server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Save the map received by the client on disk."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Show entity selection boxes"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Connect to external media server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable usage of remote media server (if provided by server).\n"
-"Remote servers offer a significantly faster way to download media (e.g. "
-"textures)\n"
-"when connecting to the server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Serverlist URL"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "URL to the server list displayed in the Multiplayer Tab."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Serverlist file"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"File in client/serverlist/ that contains your favorite servers displayed in "
-"the Multiplayer Tab."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Graphics"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "In-Game"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Basic"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable VBO"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fog"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Whether to fog out the end of the visible area."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Leaves style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Leaves style:\n"
-"-   Fancy:  all faces visible\n"
-"-   Simple: only outer faces, if defined special_tiles are used\n"
-"-   Opaque: disable transparency"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Connect glass"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Connects glass if supported by node."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Smooth lighting"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable smooth lighting with simple ambient occlusion.\n"
-"Disable for speed or for different looks."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Clouds"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Clouds are a client side effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "3D clouds"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use 3D cloud look instead of flat."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Node highlighting"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Method used to highlight selected object."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Filtering"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mipmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use mip mapping to scale textures. May slightly increase performance."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Anisotropic filtering"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use anisotropic filtering when viewing at textures from an angle."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bilinear filtering"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use bilinear filtering when scaling textures."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Trilinear filtering"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use trilinear filtering when scaling textures."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Clean transparent textures"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Filtered textures can blend RGB values with fully-transparent neighbors,\n"
-"which PNG optimizers usually discard, sometimes resulting in a dark or\n"
-"light edge to transparent textures.  Apply this filter to clean that up\n"
-"at texture load time."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimum texture size for filters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
-"can be blurred, so automatically upscale them with nearest-neighbor\n"
-"interpolation to preserve crisp pixels.  This sets the minimum texture size\n"
-"for the upscaled textures; higher values look sharper, but require more\n"
-"memory.  Powers of 2 are recommended.  Setting this higher than 1 may not\n"
-"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
-"enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "FSAA"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
-"video cards.\n"
-"Thy only work with the OpenGL video backend."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Filmic tone mapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enables filmic tone mapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
+"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
+"Used to move a suitable spawn area of low land close to (0, 0).\n"
+"The default is suitable for mandelbrot sets, it needs to be edited for julia "
+"sets.\n"
+"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2055,226 +1303,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Parallax occlusion strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strength of parallax."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion Scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving Nodes"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving water"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set to true enables waving water.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving water height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving water length"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving water speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving leaves"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set to true enables waving leaves.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving plants"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set to true enables waving plants.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Advanced"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum FPS"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If FPS would go higher than this, limit it by sleeping\n"
-"to not waste CPU power for no benefit."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Viewing range"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"View distance in nodes.\n"
-"Min = 20"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screen width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Width component of the initial window size."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screen height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Height component of the initial window size."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Full screen"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fullscreen mode."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Full screen BPP"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "V-Sync"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Vertical screen synchronization."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Field of view"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Field of view in degrees."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Gamma"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
-"This setting is for the client only and is ignored by the server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Texture path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Path to texture directory. All textures are first searched from here."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Video driver"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The rendering back-end for Irrlicht."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cloud height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Height on which clouds are appearing."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cloud radius"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Radius of cloud area stated in number of 64 node cloud squares.\n"
-"Values larger than 26 will start to produce sharp cutoffs at cloud area "
-"corners."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "View bobbing"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Multiplier for view bobbing.\n"
-"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fall bobbing"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Multiplier for fall bobbing.\n"
-"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgid "3D clouds"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2294,285 +1323,48 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Console color"
+msgid ""
+"A chosen map seed for a new map, leave empty for random.\n"
+"Will be overridden when creating a new world in the main menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "In-game chat console background color (R,G,B)."
+msgid "A message to be displayed to all clients when the server crashes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Console alpha"
+msgid "A message to be displayed to all clients when the server shuts down."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
+msgid "Absolute limit of emerge queues"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Selection box color"
+msgid "Acceleration in air"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Selection box border color (R,G,B)."
+msgid "Active Block Management interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Selection box width"
+msgid "Active Block Modifier interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Width of the selectionbox's lines around nodes."
+msgid "Active block range"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crosshair alpha"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Desynchronize block animation"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Whether node texture animations should be desynchronized per mapblock."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum hotbar width"
+msgid "Active object send range"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Maximum proportion of current window to be used for hotbar.\n"
-"Useful if there's something to be displayed right or left of hotbar."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mesh cache"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enables caching of facedir rotated meshes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimap"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enables minimap."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Round minimap"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimap scan height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"True = 256\n"
-"False = 128\n"
-"Useable to make minimap smoother on slower machines."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Colored fog"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ambient occlusion gamma"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The strength (darkness) of node ambient-occlusion shading.\n"
-"Lower is darker, Higher is lighter. The valid range of values for this\n"
-"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
-"set to the nearest valid value."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Inventory items animations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enables animation of inventory items."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Menus"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Clouds in menu"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use a cloud animation for the main menu background."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "GUI scaling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Scale gui by a user specified value.\n"
-"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
-"This will smooth over some of the rough edges, and blend\n"
-"pixels when scaling down, at the cost of blurring some\n"
-"edge pixels when images are scaled by non-integer sizes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "GUI scaling filter"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"When gui_scaling_filter is true, all GUI images need to be\n"
-"filtered in software, but some images are generated directly\n"
-"to hardware (e.g. render-to-texture for nodes in inventory)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "GUI scaling filter txr2img"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"When gui_scaling_filter_txr2img is true, copy those images\n"
-"from hardware to software for scaling.  When false, fall back\n"
-"to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Tooltip delay"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Freetype fonts"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether freetype fonts are used, requires freetype support to be compiled in."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Path to TrueTypeFont or bitmap."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow offset, if 0 then shadow will not be drawn."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow alpha"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow alpha (opaqueness, between 0 and 255)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Monospace font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Monospace font size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "This font will be used for certain languages."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font shadow"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font shadow alpha"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot folder"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Path to save screenshots at."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot format"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Format of screenshots."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot quality"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Screenshot quality. Only used for JPEG format.\n"
-"1 means worst quality; 100 means best quality.\n"
-"Use 0 for default quality."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "DPI"
+"Address to connect to.\n"
+"Leave this blank to start a local server.\n"
+"Note that the address field in the main menu overrides this setting."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2581,84 +1373,40 @@ msgid ""
 "screens."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Sound"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Volume"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock unload timeout"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Timeout for client to remove unused map data from memory."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock limit"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
-"Maximum number of mapblocks for client to be kept in memory.\n"
-"Set to -1 for unlimited amount."
+"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
+"This setting is for the client only and is ignored by the server."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Show debug info"
+msgid "Advanced"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Whether to show the client debug info (has the same effect as hitting F5)."
+msgid "Altitude Chill"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Server / Singleplayer"
+msgid "Always fly and fast"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Server name"
+msgid "Ambient occlusion gamma"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Name of the server, to be displayed when players join and in the serverlist."
+msgid "Amplifies the valleys"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Server description"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Description of server, to be displayed when players join and in the "
-"serverlist."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Domain name of server, to be displayed in the serverlist."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Server URL"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Homepage of server, to be displayed in the serverlist."
+msgid "Anisotropic filtering"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Announce server"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Automaticaly report to the serverlist."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Announce to this serverlist.\n"
@@ -2667,259 +1415,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Server port"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Network port to listen (UDP).\n"
-"This value will be overridden when starting from the main menu."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bind address"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The network interface that the server listens on."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strict protocol checking"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable to disallow old clients from connecting.\n"
-"Older clients are compatible in the sense that they will not crash when "
-"connecting\n"
-"to new servers, but they may not support all new features that you are "
-"expecting."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Remote media"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Specifies URL from which client fetches media instead of using UDP.\n"
-"$filename should be accessible from $remote_media$filename via cURL\n"
-"(obviously, remote_media should end with a slash).\n"
-"Files that are not present will be fetched the usual way."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "IPv6 server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable/disable running an IPv6 server.  An IPv6 server may be restricted\n"
-"to IPv6 clients, depending on system configuration.\n"
-"Ignored if bind_address is set."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"To reduce lag, block transfers are slowed down when a player is building "
-"something.\n"
-"This determines how long they are slowed down after placing or removing a "
-"node."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Max. packets per iteration"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of packets sent per send step, if you have a slow connection\n"
-"try reducing it, but don't reduce it to a number below double of targeted\n"
-"client number."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default game"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Default game when creating a new world.\n"
-"This will be overridden when creating a world from the main menu."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Message of the day"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Message of the day displayed to players connecting."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum users"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of players that can connect simultaneously."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Map directory"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"World directory (everything in the world is stored here).\n"
-"Not needed if starting from the main menu."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Item entity TTL"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Time in seconds for item entity (dropped items) to live.\n"
-"Setting it to -1 disables the feature."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Damage"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable players getting damage and dying."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fixed map seed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"A chosen map seed for a new map, leave empty for random.\n"
-"Will be overridden when creating a new world in the main menu."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default password"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "New users need to input this password."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default privileges"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The privileges that new users automatically get.\n"
-"See /privs in game for a full list on your server and mod configuration."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Basic Privileges"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Privileges that players with basic_privs can grant"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Unlimited player transfer distance"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether players are shown to clients without any range limit.\n"
-"Deprecated, use the setting player_transfer_distance instead."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Player transfer distance"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Player versus Player"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Whether to allow players to damage and kill each other."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Static spawnpoint"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "If this is set, players will always (re)spawn at the given position."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Disallow empty passwords"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "If enabled, new players cannot join with an empty password."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Disable anticheat"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "If enabled, disable cheat prevention in multiplayer."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Rollback recording"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, actions are recorded for rollback.\n"
-"This option is only read when server starts."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Shutdown message"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "A message to be displayed to all clients when the server shuts down."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crash message"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "A message to be displayed to all clients when the server crashes."
+msgid "Approximate (X,Y,Z) scale of fractal in nodes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2927,699 +1423,79 @@ msgid "Ask to reconnect after crash"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Whether to ask clients to reconnect after a (Lua) crash.\n"
-"Set this to true if your server is set up to restart automatically."
+msgid "Automaticaly report to the serverlist."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Active object send range"
+msgid "Backward key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"From how far clients know about objects, stated in mapblocks (16 nodes)."
+msgid "Base terrain height"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Active block range"
+msgid "Basic"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"How large area of blocks are subject to the active block stuff, stated in "
-"mapblocks (16 nodes).\n"
-"In active blocks objects are loaded and ABMs run."
+msgid "Basic Privileges"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Max block send distance"
+msgid "Bilinear filtering"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
+msgid "Bind address"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum forceloaded blocks"
+msgid "Bits per pixel (aka color depth) in fullscreen mode."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum number of forceloaded mapblocks."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Time send interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Interval of sending time of day to clients."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Time speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Controls length of day/night cycle.\n"
-"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
-"unchanged."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Map save interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Interval of saving important changes in the world, stated in seconds."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Physics"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default acceleration"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Acceleration in air"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fast mode acceleration"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Walking speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crouch speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fast mode speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Climbing speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Jumping speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Descending speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid fluidity"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid fluidity smoothing"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid sink"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Gravity"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Deprecated Lua API handling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Handling for deprecated lua api calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
-"-    error: abort on usage of deprecated call (suggested for mod developers)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Max. clearobjects extra blocks"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Number of extra blocks that can be loaded by /clearobjects at once.\n"
-"This is a trade-off between sqlite transaction overhead and\n"
-"memory consumption (4096=100MB, as a rule of thumb)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Unload unused server data"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"How much the server will wait before unloading unused mapblocks.\n"
-"Higher value is smoother, but will use more RAM."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of statically stored objects in a block."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Synchronous SQLite"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dedicated server step"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over network."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Active Block Management interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Time in between active block management cycles"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Active Block Modifier interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Length of time between ABM execution cycles"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "NodeTimer interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Length of time between NodeTimer execution cycles"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ignore world errors"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, invalid world data won't cause the server to shut down.\n"
-"Only enable this if you know what you are doing."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid loop max"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Max liquids processed per step."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid queue purge time"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The time (in seconds) that the liquids queue may grow beyond processing\n"
-"capacity until an attempt is made to decrease its size by dumping old queue\n"
-"items.  A value of 0 disables the functionality."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid update tick"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid update interval in seconds."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen name"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Name of map generator to be used when creating a new world.\n"
-"Creating a world in the main menu will override this."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Water level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Water surface level of the world."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Max block generate distance"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"From how far blocks are generated for clients, stated in mapblocks (16 "
-"nodes)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Map generation limit"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Where the map generator stops.\n"
-"Please note:\n"
-"-    Limited to 31000 (setting above has no effect)\n"
-"-    The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n"
-"-    Those groups have an offset of -32, -32 nodes from the origin.\n"
-"-    Only groups which are within the map_generation_limit are generated"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Global map generation attributes.\n"
-"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
-"and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
-"Flags that are not specified in the flag string are not modified from the "
-"default.\n"
-"Flags starting with 'no' are used to explicitly disable them."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chunk size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 "
-"nodes)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen debug"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dump the mapgen debug infos."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Absolute limit of emerge queues"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of blocks that can be queued for loading."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Limit of emerge queues on disk"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of blocks to be queued that are to be loaded from file.\n"
-"Set to blank for an appropriate amount to be chosen automatically."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Limit of emerge queues to generate"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of blocks to be queued that are to be generated.\n"
-"Set to blank for an appropriate amount to be chosen automatically."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Number of emerge threads"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Number of emerge threads to use. Make this field blank, or increase this "
-"number\n"
-"to use multiple threads. On multiprocessor systems, this will improve mapgen "
-"speed greatly\n"
-"at the cost of slightly buggy caves."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen biome heat noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Noise parameters for biome API temperature, humidity and biome blend."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen heat blend noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen biome humidity noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen biome humidity blend noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 cave width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 filler depth noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 factor noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 height noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 cave1 noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 cave2 noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen v6.\n"
-"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
-"flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
-"Flags that are not specified in the flag string are not modified from the "
-"default.\n"
-"Flags starting with 'no' are used to explicitly disable them."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 desert frequency"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Controls size of deserts and beaches in Mapgen v6.\n"
-"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 beach frequency"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 terrain base noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 terrain altitude noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 steepness noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 height select noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 mud noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 beach noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 biome noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 cave noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 humidity noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 trees noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 apple trees noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen v7.\n"
-"The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
-"Flags that are not specified in the flag string are not modified from the "
-"default.\n"
-"Flags starting with 'no' are used to explicitly disable them."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 cave width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 terrain base noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 terrain altitude noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 terrain persistation noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 height select noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 filler depth noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 mount height noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 ridge water noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 mountain noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 ridge noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 cave1 noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 cave2 noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen flat.\n"
-"Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
-"Flags that are not specified in the flag string are not modified from the "
-"default.\n"
-"Flags starting with 'no' are used to explicitly disable them."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat ground level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y of flat ground."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat large cave depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y of upper limit of large pseudorandom caves."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat cave width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat lake threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Terrain noise threshold for lakes.\n"
-"Controls proportion of world area covered by lakes.\n"
-"Adjust towards 0.0 for a larger proportion."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat lake steepness"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Controls steepness/depth of lake depressions."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat hill threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Terrain noise threshold for hills.\n"
-"Controls proportion of world area covered by hills.\n"
-"Adjust towards 0.0 for a larger proportion."
-msgstr ""
+msgid "Build inside player"
+msgstr "Градња унутар играча"
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen flat hill steepness"
+msgid "Bumpmapping"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Controls steepness/height of hills."
+msgid "Camera smoothing"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen flat terrain noise parameters"
+msgid "Camera smoothing in cinematic mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Determines terrain shape.\n"
-"The 3 numbers in brackets control the scale of the\n"
-"terrain, the 3 numbers should be identical."
+msgid "Camera update toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen flat filler depth noise parameters"
+msgid "Cave noise #1"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen flat cave1 noise parameters"
+msgid "Cave noise #2"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen flat cave2 noise parameters"
+msgid "Cave width"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal"
+msgid "Caves and tunnels form at the intersection of the two noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal cave width"
+msgid "Chat key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal fractal"
+msgid "Chat toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3646,7 +1522,785 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal iterations"
+msgid "Chunk size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cinematic mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cinematic mode key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clean transparent textures"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client and Server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Climbing speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cloud height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cloud radius"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds are a client side effect."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds in menu"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Colored fog"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Command key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connect glass"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connect to external media server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connects glass if supported by node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Continuous forward"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Continuous forward movement (only used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls"
+msgstr "Контроле"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls length of day/night cycle.\n"
+"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
+"unchanged."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls size of deserts and beaches in Mapgen v6.\n"
+"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/depth of lake depressions."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/height of hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls width of tunnels, a smaller value creates wider tunnels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crash message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable lava features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable water features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crouch speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "DPI"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Damage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug info toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug log level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dedicated server step"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default game"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default game when creating a new world.\n"
+"This will be overridden when creating a world from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default password"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default privileges"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default timeout for cURL, stated in milliseconds.\n"
+"Only has an effect if compiled with cURL."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines sampling step of texture.\n"
+"A higher value results in smoother normal maps."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Delay showing tooltips, stated in milliseconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Deprecated Lua API handling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find large caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find massive caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Descending speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Description of server, to be displayed when players join and in the "
+"serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Desynchronize block animation"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Detailed mod profile data. Useful for mod developers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Detailed mod profiling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Determines terrain shape.\n"
+"The 3 numbers in brackets control the scale of the\n"
+"terrain, the 3 numbers should be identical."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disable anticheat"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disallow empty passwords"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Domain name of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double tap jump for fly"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double-tapping the jump key toggles fly mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Drop item key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dump the mapgen debug infos."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable VBO"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable mod security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable players getting damage and dying."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable random user input (only used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable smooth lighting with simple ambient occlusion.\n"
+"Disable for speed or for different looks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable to disallow old clients from connecting.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable usage of remote media server (if provided by server).\n"
+"Remote servers offer a significantly faster way to download media (e.g. "
+"textures)\n"
+"when connecting to the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable/disable running an IPv6 server.  An IPv6 server may be restricted\n"
+"to IPv6 clients, depending on system configuration.\n"
+"Ignored if bind_address is set."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables animation of inventory items."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+"texture pack\n"
+"or need to be auto-generated.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables caching of facedir rotated meshes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables filmic tone mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables minimap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables on the fly normalmap generation (Emboss effect).\n"
+"Requires bumpmapping to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables parallax occlusion mapping.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Experimental option, might cause visible spaces between blocks\n"
+"when set to higher number than 0."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FPS in pause menu"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FSAA"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fall bobbing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font shadow"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font shadow alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast movement"
+msgstr "Брзо кретање"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Fast movement (via use key).\n"
+"This requires the \"fast\" privilege on the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view in degrees."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"File in client/serverlist/ that contains your favorite servers displayed in "
+"the Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filler Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filmic tone mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Filtered textures can blend RGB values with fully-transparent neighbors,\n"
+"which PNG optimizers usually discard, sometimes resulting in a dark or\n"
+"light edge to transparent textures.  Apply this filter to clean that up\n"
+"at texture load time."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fixed map seed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fly key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Flying"
+msgstr "Летење"
+
+#: src/settings_translation_file.cpp
+msgid "Fog"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fog toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow offset, if 0 then shadow will not be drawn."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Format of screenshots."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Forward key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Freetype fonts"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are generated for clients, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far clients know about objects, stated in mapblocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Full screen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Full screen BPP"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fullscreen mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter txr2img"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "General"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Generate normalmaps"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Global map generation attributes.\n"
+"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
+"and junglegrass, in all other mapgens this flag controls all decorations.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Graphics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Gravity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "HTTP Mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "HUD toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Handling for deprecated lua api calls:\n"
+"-    legacy: (try to) mimic old behaviour (default for release).\n"
+"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    error: abort on usage of deprecated call (suggested for mod developers)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height on which clouds are appearing."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "High-precision FPU"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Homepage of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How deep to make rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How large area of blocks are subject to the active block stuff, stated in "
+"mapblocks (16 nodes).\n"
+"In active blocks objects are loaded and ABMs run."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How many blocks are flying in the wire simultaneously for the whole server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How many blocks are flying in the wire simultaneously per client."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How much the server will wait before unloading unused mapblocks.\n"
+"Higher value is smoother, but will use more RAM."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How wide to make rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 support."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If FPS would go higher than this, limit it by sleeping\n"
+"to not waste CPU power for no benefit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If disabled \"use\" key is used to fly fast if both fly and fast mode are "
+"enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled together with fly mode, player is able to fly through solid "
+"nodes.\n"
+"This requires the \"noclip\" privilege on the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
+"and descending."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, actions are recorded for rollback.\n"
+"This option is only read when server starts."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, disable cheat prevention in multiplayer."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, invalid world data won't cause the server to shut down.\n"
+"Only enable this if you know what you are doing."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, new players cannot join with an empty password."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, you can place blocks at the position (feet + eye level) where "
+"you stand.\n"
+"This is helpful when working with nodeboxes in small areas."
+msgstr ""
+"Ако је укључено, можете стављати блокове унутар позиције где стојите.\n"
+"Ово је корисно при раду са nodebox-евима у малим местима."
+
+#: src/settings_translation_file.cpp
+msgid "If this is set, players will always (re)spawn at the given position."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ignore world errors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-Game"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of saving important changes in the world, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of sending time of day to clients."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Inventory items animations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Inventory key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert mouse"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert vertical mouse movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Item entity TTL"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3656,73 +2310,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal scale"
+msgid "Joystick button repetition invterval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Approximate (X,Y,Z) scale of fractal in nodes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal offset"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
-"Used to move a suitable spawn area of low land close to (0, 0).\n"
-"The default is suitable for mandelbrot sets, it needs to be edited for julia "
-"sets.\n"
-"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal slice w"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"W co-ordinate of the generated 3D slice of a 4D fractal.\n"
-"Determines which 3D slice of the 4D shape is generated.\n"
-"Has no effect on 3D fractals.\n"
-"Range roughly -2 to 2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia x"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only: X component of hypercomplex constant determining julia "
-"shape.\n"
-"Range roughly -2 to 2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia y"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only: Y component of hypercomplex constant determining julia "
-"shape.\n"
-"Range roughly -2 to 2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia z"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only: Z component of hypercomplex constant determining julia "
-"shape.\n"
-"Range roughly -2 to 2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia w"
+msgid "Joystick frustum sensitivity"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3734,233 +2326,241 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal seabed noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal filler depth noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal cave1 noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal cave2 noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen Valleys"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "General"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Valleys C Flags"
+msgid ""
+"Julia set only: X component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Map generation attributes specific to Mapgen Valleys.\n"
-"'altitude_chill' makes higher elevations colder, which may cause biome "
-"issues.\n"
-"'humid_rivers' modifies the humidity around rivers and in areas where water "
-"would tend to pool,\n"
-"it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
-"Flags that are not specified in the flag string are not modified from the "
-"default.\n"
-"Flags starting with 'no' are used to explicitly disable them."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Altitude Chill"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The altitude at which temperature drops by 20C"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Large cave depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Depth below which you'll find large caves."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Lava Features"
+"Julia set only: Y component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Creates unpredictable lava features in caves.\n"
-"These can make mining difficult. Zero disables them. (0-10)"
+"Julia set only: Z component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Massive cave depth"
+msgid "Jump key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Depth below which you'll find massive caves."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River Depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How deep to make rivers"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River Size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How wide to make rivers"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Water Features"
+msgid "Jumping speed"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Creates unpredictable water features in caves.\n"
-"These can make mining difficult. Zero disables them. (0-10)"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cave width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Noises"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cave noise #1"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Caves and tunnels form at the intersection of the two noises"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cave noise #2"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Filler Depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The depth of dirt or other filler"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Massive cave noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Massive caves form here."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River Noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River noise -- rivers occur close to zero"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Terrain Height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Base terrain height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Valley Depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Raises terrain to make valleys around the rivers"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Valley Fill"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Slope and fill work together to modify the heights"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Valley Profile"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Amplifies the valleys"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Valley Slope"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Security"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable mod security"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Prevent mods from doing insecure things like running shell commands."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Trusted mods"
+"Key for decreasing the viewing range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "HTTP Mods"
+"Key for dropping the currently selected item.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Client and Server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Player name"
+"Key for increasing the viewing range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Name of the player.\n"
-"When running a server, clients connecting with this name are admins.\n"
-"When starting from the main menu, this is overridden."
+"Key for jumping.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving fast in fast mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player backward.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player forward.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player left.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player right.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat console.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat window to type commands.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat window.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the inventory.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for printing debug stacks. Used for development.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for sneaking.\n"
+"Also used for climbing down and descending in water if aux1_descends is "
+"disabled.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for switching between first- and third-person camera.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for taking screenshots.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling cinematic mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling display of minimap.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling fast mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling flying.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling noclip mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the camrea update. Only used for development\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of debug info.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the HUD.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the chat.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the fog.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the profiler. Used for development.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling unlimited view range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Key use for climbing/descending"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3968,13 +2568,41 @@ msgid "Language"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Set the language. Leave empty to use the system language.\n"
-"A restart is required after changing this."
+msgid "Large cave depth"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Debug log level"
+msgid "Lava Features"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Leaves style"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Leaves style:\n"
+"-   Fancy:  all faces visible\n"
+"-   Simple: only outer faces, if defined special_tiles are used\n"
+"-   Opaque: disable transparency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Left key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of a server tick and the interval at which objects are generally "
+"updated over network."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between ABM execution cycles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between NodeTimer execution cycles"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3990,25 +2618,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "IPv6"
+msgid "Limit of emerge queues on disk"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "IPv6 support."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "cURL timeout"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Default timeout for cURL, stated in milliseconds.\n"
-"Only has an effect if compiled with cURL."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "cURL parallel limit"
+msgid "Limit of emerge queues to generate"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4021,27 +2635,31 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "cURL file download timeout"
+msgid "Liquid fluidity"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum time in ms a file download (e.g. a mod download) may take."
+msgid "Liquid fluidity smoothing"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "High-precision FPU"
+msgid "Liquid loop max"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
+msgid "Liquid queue purge time"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu script"
+msgid "Liquid sink"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Replaces the default main menu with a custom one."
+msgid "Liquid update interval in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update tick"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4052,6 +2670,531 @@ msgstr ""
 msgid "Main menu mod manager"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Main menu script"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map directory"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Valleys.\n"
+"'altitude_chill' makes higher elevations colder, which may cause biome "
+"issues.\n"
+"'humid_rivers' modifies the humidity around rivers and in areas where water "
+"would tend to pool,\n"
+"it may interfere with delicately adjusted biomes.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen flat.\n"
+"Occasional lakes and hills can be added to the flat world.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v6.\n"
+"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
+"flag is ignored.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v7.\n"
+"The 'ridges' flag controls the rivers.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map generation limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map save interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock unload timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Valleys"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome heat noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome humidity blend noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome humidity noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat ground level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat hill steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat hill threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat lake steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat lake threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat large cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat terrain noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal fractal"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal iterations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia x"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia z"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal offset"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal scale"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal seabed noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal slice w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen heat blend noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 factor noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 height noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 apple trees noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 beach frequency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 beach noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 biome noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 cave noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 desert frequency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 height select noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 humidity noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 mud noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 steepness noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 terrain altitude noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 terrain base noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 trees noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 height select noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 mount height noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 mountain noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 ridge noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 ridge water noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain altitude noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain base noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain persistation noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive cave noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive caves form here."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block generate distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block send distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max liquids processed per step."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. clearobjects extra blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. packets per iteration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS when game is paused."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum forceloaded blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum hotbar width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that can be queued for loading."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be generated.\n"
+"Set to blank for an appropriate amount to be chosen automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be loaded from file.\n"
+"Set to blank for an appropriate amount to be chosen automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of forceloaded mapblocks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of mapblocks for client to be kept in memory.\n"
+"Set to -1 for unlimited amount."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of packets sent per send step, if you have a slow connection\n"
+"try reducing it, but don't reduce it to a number below double of targeted\n"
+"client number."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of players that can connect simultaneously."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of statically stored objects in a block."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum proportion of current window to be used for hotbar.\n"
+"Useful if there's something to be displayed right or left of hotbar."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum simultaneously blocks send per client"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum simultaneously bocks send total"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum time in ms a file download (e.g. a mod download) may take."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum users"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maxmimum objects per block"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Menus"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mesh cache"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day displayed to players connecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Method used to highlight selected object."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap scan height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimum texture size for filters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mipmapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mod profiling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Modstore details URL"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Modstore download URL"
 msgstr ""
@@ -4061,5 +3204,893 @@ msgid "Modstore mods list URL"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Modstore details URL"
+msgid "Monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity multiplier."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Multiplier for fall bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Multiplier for view bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of map generator to be used when creating a new world.\n"
+"Creating a world in the main menu will override this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the player.\n"
+"When running a server, clients connecting with this name are admins.\n"
+"When starting from the main menu, this is overridden."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the server, to be displayed when players join and in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Network"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Network port to listen (UDP).\n"
+"This value will be overridden when starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "New users need to input this password."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noclip"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noclip key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Node highlighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "NodeTimer interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noise parameters for biome API temperature, humidity and biome blend."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noises"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Normalmaps sampling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Normalmaps strength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Number of emerge threads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of emerge threads to use. Make this field blank, or increase this "
+"number\n"
+"to use multiple threads. On multiprocessor systems, this will improve mapgen "
+"speed greatly\n"
+"at the cost of slightly buggy caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of extra blocks that can be loaded by /clearobjects at once.\n"
+"This is a trade-off between sqlite transaction overhead and\n"
+"memory consumption (4096=100MB, as a rule of thumb)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Number of parallax occlusion iterations."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Overall bias of parallax occlusion effect, usually scale/2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Overall scale of parallax occlusion effect."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion Scale"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion bias"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion iterations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion strength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Path to TrueTypeFont or bitmap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Path to save screenshots at."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Path to texture directory. All textures are first searched from here."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Physics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Player is able to fly without being affected by gravity.\n"
+"This requires the \"fly\" privilege on the server."
+msgstr ""
+"Играч је у могућности д лети без утицаја гравитације.\n"
+"Ово захтева \"fly\" привилегију на серверима."
+
+#: src/settings_translation_file.cpp
+msgid "Player name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player versus Player"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Port to connect to (UDP).\n"
+"Note that the port field in the main menu overrides this setting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Prevent mods from doing insecure things like running shell commands."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Privileges that players with basic_privs can grant"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiler toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiling print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Radius of cloud area stated in number of 64 node cloud squares.\n"
+"Values larger than 26 will start to produce sharp cutoffs at cloud area "
+"corners."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Raises terrain to make valleys around the rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Random input"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Range select key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remote media"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remote port"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Replaces the default main menu with a custom one."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Right key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rightclick repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River noise -- rivers occur close to zero"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rollback recording"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Round minimap"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Save the map received by the client on disk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Saving map received from server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Scale gui by a user specified value.\n"
+"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
+"This will smooth over some of the rough edges, and blend\n"
+"pixels when scaling down, at the cost of blurring some\n"
+"edge pixels when images are scaled by non-integer sizes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot folder"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot quality"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Screenshot quality. Only used for JPEG format.\n"
+"1 means worst quality; 100 means best quality.\n"
+"Use 0 for default quality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box border color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server / Singleplayer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server description"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server port"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist file"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the language. Leave empty to use the system language.\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true enables waving leaves.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true enables waving plants.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true enables waving water.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Shaders allow advanced visul effects and may increase performance on some "
+"video cards.\n"
+"Thy only work with the OpenGL video backend."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shape of the minimap. Enabled = round, disabled = square."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show debug info"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show entity selection boxes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shutdown message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Slope and fill work together to modify the heights"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooth lighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
+"Useful for recording videos."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooths rotation of camera. 0 to disable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sneak key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Specifies URL from which client fetches media instead of using UDP.\n"
+"$filename should be accessible from $remote_media$filename via cURL\n"
+"(obviously, remote_media should end with a slash).\n"
+"Files that are not present will be fetched the usual way."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Static spawnpoint"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strength of generated normalmaps."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strength of parallax."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strict protocol checking"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Support older servers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Synchronous SQLite"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain Height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for hills.\n"
+"Controls proportion of world area covered by hills.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for lakes.\n"
+"Controls proportion of world area covered by lakes.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Texture path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The altitude at which temperature drops by 20C"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The depth of dirt or other filler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The network interface that the server listens on."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The privileges that new users automatically get.\n"
+"See /privs in game for a full list on your server and mod configuration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The rendering back-end for Irrlicht."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The strength (darkness) of node ambient-occlusion shading.\n"
+"Lower is darker, Higher is lighter. The valid range of values for this\n"
+"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
+"set to the nearest valid value."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time (in seconds) that the liquids queue may grow beyond processing\n"
+"capacity until an attempt is made to decrease its size by dumping old queue\n"
+"items.  A value of 0 disables the functionality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated right clicks when holding the "
+"right mouse button."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "This font will be used for certain languages."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time in between active block management cycles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Time in seconds for item entity (dropped items) to live.\n"
+"Setting it to -1 disables the feature."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time send interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Timeout for client to remove unused map data from memory."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"To reduce lag, block transfers are slowed down when a player is building "
+"something.\n"
+"This determines how long they are slowed down after placing or removing a "
+"node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Toggle camera mode key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Tooltip delay"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trilinear filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"True = 256\n"
+"False = 128\n"
+"Useable to make minimap smoother on slower machines."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trusted mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "URL to the server list displayed in the Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unlimited player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unload unused server data"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use 3D cloud look instead of flat."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use a cloud animation for the main menu background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use anisotropic filtering when viewing at textures from an angle."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use bilinear filtering when scaling textures."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use mip mapping to scale textures. May slightly increase performance."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use trilinear filtering when scaling textures."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Useful for mod developers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "V-Sync"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "VBO"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Fill"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Profile"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Slope"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valleys C Flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Vertical screen synchronization."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Video driver"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View bobbing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"View distance in nodes.\n"
+"Min = 20"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View range decrease key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View range increase key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Viewing range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volume"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"W co-ordinate of the generated 3D slice of a 4D fractal.\n"
+"Determines which 3D slice of the 4D shape is generated.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Walking speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water Features"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water surface level of the world."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving Nodes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving leaves"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving plants"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water length"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter is true, all GUI images need to be\n"
+"filtered in software, but some images are generated directly\n"
+"to hardware (e.g. render-to-texture for nodes in inventory)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter_txr2img is true, copy those images\n"
+"from hardware to software for scaling.  When false, fall back\n"
+"to the old scaling method, for video drivers that don't\n"
+"propery support downloading textures back from hardware."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
+"can be blurred, so automatically upscale them with nearest-neighbor\n"
+"interpolation to preserve crisp pixels.  This sets the minimum texture size\n"
+"for the upscaled textures; higher values look sharper, but require more\n"
+"memory.  Powers of 2 are recommended.  Setting this higher than 1 may not\n"
+"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
+"enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Where the map generator stops.\n"
+"Please note:\n"
+"-    Limited to 31000 (setting above has no effect)\n"
+"-    The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n"
+"-    Those groups have an offset of -32, -32 nodes from the origin.\n"
+"-    Only groups which are within the map_generation_limit are generated"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether freetype fonts are used, requires freetype support to be compiled in."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether node texture animations should be desynchronized per mapblock."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether players are shown to clients without any range limit.\n"
+"Deprecated, use the setting player_transfer_distance instead."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether to allow players to damage and kill each other."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to ask clients to reconnect after a (Lua) crash.\n"
+"Set this to true if your server is set up to restart automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether to fog out the end of the visible area."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to show the client debug info (has the same effect as hitting F5)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to support older servers before protocol version 25.\n"
+"Enable if you want to connect to 0.4.12 servers and before.\n"
+"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
+"Disabling this option will protect your password better."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width of the selectionbox's lines around nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"World directory (everything in the world is stored here).\n"
+"Not needed if starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of flat ground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of upper limit of large pseudorandom caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL file download timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL parallel limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL timeout"
 msgstr ""
diff --git a/po/tr/minetest.po b/po/tr/minetest.po
index b3c063d21..32f03e666 100644
--- a/po/tr/minetest.po
+++ b/po/tr/minetest.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2015-10-27 16:46+0200\n"
 "Last-Translator: PilzAdam <PilzAdam@minetest.net>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/minetest/"
@@ -610,6 +610,10 @@ msgstr "Parallax Occlusion"
 msgid "Particles"
 msgstr "Hepsini etkinleştir"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Tek kişilik oyunu sıfırlayın"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Ayarlar"
@@ -1838,6 +1842,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Parçacıkları etkinleştir"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1864,6 +1880,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enable VBO"
@@ -2159,8 +2179,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2357,6 +2375,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2739,8 +2765,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2750,8 +2774,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2762,8 +2784,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2773,8 +2793,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3735,7 +3753,7 @@ msgstr "Pürüzsüz ışıklandırma"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3834,6 +3852,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3849,6 +3873,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4195,60 +4225,57 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Dokular yükleniyor..."
+#~ msgid "No of course not!"
+#~ msgstr "Elbette hayır!"
 
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Tek kişilik oyunu sıfırlayın"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Ölçeklendirme menülere işlendi:"
-
-#~ msgid "Touch free target"
-#~ msgstr "Touch free target"
-
-#~ msgid "Downloading"
-#~ msgstr "İndiriliyor"
-
-#~ msgid "please wait..."
-#~ msgstr "lütfen bekleyin..."
-
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
-
-#~ msgid "Numpad "
-#~ msgstr "Numpad "
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın"
-
-#~ msgid "Rendering:"
-#~ msgstr "Kaplama:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Etkinleştirildi"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Paketi Kapat"
-
-#~ msgid "\""
-#~ msgstr "\""
-
-#~ msgid "No!!!"
-#~ msgstr "Hayır!!!"
+#~ msgid "Public Serverlist"
+#~ msgstr "Çevirimiçi Oyun Listesi"
 
 #, fuzzy
 #~ msgid "Generate Normalmaps"
 #~ msgstr "Normal haritalar oluştur"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Çevirimiçi Oyun Listesi"
+#~ msgid "No!!!"
+#~ msgstr "Hayır!!!"
 
-#~ msgid "No of course not!"
-#~ msgstr "Elbette hayır!"
+#~ msgid "\""
+#~ msgstr "\""
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Paketi Kapat"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Etkinleştirildi"
+
+#~ msgid "Rendering:"
+#~ msgstr "Kaplama:"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın"
+
+#~ msgid "Numpad "
+#~ msgstr "Numpad "
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid "please wait..."
+#~ msgstr "lütfen bekleyin..."
+
+#~ msgid "Downloading"
+#~ msgstr "İndiriliyor"
+
+#~ msgid "Touch free target"
+#~ msgstr "Touch free target"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Ölçeklendirme menülere işlendi:"
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Dokular yükleniyor..."
diff --git a/po/uk/minetest.po b/po/uk/minetest.po
index 1ae1094a3..102ccf729 100644
--- a/po/uk/minetest.po
+++ b/po/uk/minetest.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-05-12 01:10+0000\n"
 "Last-Translator: Fixer <artem.brz@gmail.com>\n"
-"Language-Team: Ukrainian "
-"<https://hosted.weblate.org/projects/minetest/minetest/uk/>\n"
+"Language-Team: Ukrainian <https://hosted.weblate.org/projects/minetest/"
+"minetest/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.7-dev\n"
 
 #: builtin/fstk/ui.lua
@@ -602,6 +602,10 @@ msgstr "Паралаксова оклюзія"
 msgid "Particles"
 msgstr "Часточки"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Скинути світ однокористувацької гри"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "Налаштування"
@@ -1810,6 +1814,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "Вимкнути античіт"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -1834,6 +1850,10 @@ msgstr ""
 msgid "Dump the mapgen debug infos."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "Увімкнути VBO"
@@ -2120,8 +2140,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2315,6 +2333,14 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition invterval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2693,8 +2719,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2704,8 +2728,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2716,8 +2738,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2727,8 +2747,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3643,7 +3661,7 @@ msgstr "Згладжене освітлення"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3739,6 +3757,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3754,6 +3778,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4088,99 +4118,96 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Завантаження текстур..."
+#~ msgid "No of course not!"
+#~ msgstr "Ні, звісно ні!"
 
-#~ msgid "Reset singleplayer world"
-#~ msgstr "Скинути світ однокористувацької гри"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Масштабування елементів меню: "
+#~ msgid "Public Serverlist"
+#~ msgstr "Список публічних серверів"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Вниз"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Генерувати карти нормалей"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr ""
-#~ "Ліва кнопка миші: Перемістити усі предмети, Права кнопка миші: "
-#~ "Перемістити один предмет"
-
-#~ msgid "is required by:"
-#~ msgstr "необхідний для:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Налаштування Збережено.  "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Попередження: Помилкова конфігурація.  "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи"
-
-#~ msgid "Show Public"
-#~ msgstr "Показати Публічні"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Показати Улюблені"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Залишіть адресу незаповненою для створення локального серверу."
-
-#~ msgid "Create world"
-#~ msgstr "Створити світ"
-
-#~ msgid "Address required."
-#~ msgstr "Адреса необхідна."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Неможливо видалити світ: Нічого не вибрано"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Файлів, що підлягають видаленню"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Неможливо створити світ: Не знайдено жодної гри"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Помилка при видаленні файлів світу"
+#~ msgid "No!!!"
+#~ msgstr "Ні!!!"
 
 #, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Кінцеві рідини"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Попереднє завантаження зображень"
-
-#, fuzzy
-#~ msgid "Password"
-#~ msgstr "Старий Пароль"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Гра"
+#~ msgid "If disabled "
+#~ msgstr "Вимкнути багатокористувацьку гру"
 
 #, fuzzy
 #~ msgid "If enabled, "
 #~ msgstr "Увімкнено"
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Вимкнути багатокористувацьку гру"
-
-#~ msgid "No!!!"
-#~ msgstr "Ні!!!"
+#~ msgid "Game Name"
+#~ msgstr "Гра"
 
 #, fuzzy
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Генерувати карти нормалей"
+#~ msgid "Password"
+#~ msgstr "Старий Пароль"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Список публічних серверів"
+#~ msgid "Preload item visuals"
+#~ msgstr "Попереднє завантаження зображень"
 
-#~ msgid "No of course not!"
-#~ msgstr "Ні, звісно ні!"
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Кінцеві рідини"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Помилка при видаленні файлів світу"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Неможливо створити світ: Не знайдено жодної гри"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Файлів, що підлягають видаленню"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Неможливо видалити світ: Нічого не вибрано"
+
+#~ msgid "Address required."
+#~ msgstr "Адреса необхідна."
+
+#~ msgid "Create world"
+#~ msgstr "Створити світ"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Залишіть адресу незаповненою для створення локального серверу."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Показати Улюблені"
+
+#~ msgid "Show Public"
+#~ msgstr "Показати Публічні"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Попередження: Помилкова конфігурація.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Налаштування Збережено.  "
+
+#~ msgid "is required by:"
+#~ msgstr "необхідний для:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr ""
+#~ "Ліва кнопка миші: Перемістити усі предмети, Права кнопка миші: "
+#~ "Перемістити один предмет"
+
+#, fuzzy
+#~ msgid "Downloading"
+#~ msgstr "Вниз"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Масштабування елементів меню: "
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Завантаження текстур..."
diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po
index be0bf9c0b..e2912ca75 100644
--- a/po/zh_CN/minetest.po
+++ b/po/zh_CN/minetest.po
@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-06-11 10:56+0000\n"
 "Last-Translator: arsdragonfly <arsdragonfly@gmail.com>\n"
-"Language-Team: Chinese (China) "
-"<https://hosted.weblate.org/projects/minetest/minetest/zh_CN/>\n"
+"Language-Team: Chinese (China) <https://hosted.weblate.org/projects/minetest/"
+"minetest/zh_CN/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -593,6 +593,11 @@ msgstr "视差贴图"
 msgid "Particles"
 msgstr "粒子效果"
 
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Reset singleplayer world"
+msgstr "重置单人游戏"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "设置"
@@ -1853,6 +1858,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "禁用反作弊"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "禁止使用空密码"
@@ -1877,6 +1894,10 @@ msgstr "丢弃物品键"
 msgid "Dump the mapgen debug infos."
 msgstr "转储地图生成器调试信息。"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "启用 VBO"
@@ -2170,8 +2191,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2365,6 +2384,16 @@ msgid ""
 "Controls the amount of fine detail."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick button repetition invterval"
+msgstr "右击重复间隔"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick frustum sensitivity"
+msgstr "鼠标灵敏度"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2743,8 +2772,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2754,8 +2781,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2766,8 +2791,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2777,8 +2800,6 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -3705,7 +3726,7 @@ msgstr "平滑光照"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 
@@ -3801,6 +3822,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr "Irrlicht 的渲染后端。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -3816,6 +3843,12 @@ msgid ""
 "items.  A value of 0 disables the functionality."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4155,74 +4188,102 @@ msgstr "cURL 并发限制"
 msgid "cURL timeout"
 msgstr "cURL 超时"
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "载入中..."
+#~ msgid "No of course not!"
+#~ msgstr "当然不！"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "公共服务器列表"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "生成一般地图"
+
+#~ msgid "No!!!"
+#~ msgstr "不!!!"
 
 #, fuzzy
-#~ msgid "Reset singleplayer world"
-#~ msgstr "重置单人游戏"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "菜单元素应用缩放因子"
-
-#~ msgid "Touch free target"
-#~ msgstr "自由触摸目标"
+#~ msgid "If disabled "
+#~ msgstr "禁用MOD包"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "下载中"
+#~ msgid "If enabled, "
+#~ msgstr "启用"
 
-#~ msgid " KB/s"
-#~ msgstr "千字节/秒"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "重启minetest让驱动变化生效"
 
-#~ msgid " MB/s"
-#~ msgstr "兆字节/秒"
+#~ msgid "Game Name"
+#~ msgstr "游戏名"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "左键：移动所有物品，右键：移动单个物品"
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”"
 
-#~ msgid "is required by:"
-#~ msgstr "被需要："
+#~ msgid "GAMES"
+#~ msgstr "游戏"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "配置已保存。  "
+#~ msgid "Mods:"
+#~ msgstr "MODS："
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "警告：配置不一致。  "
+#~ msgid "new game"
+#~ msgstr "新建游戏"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "无法创建世界：名字包含非法字符"
+#~ msgid "EDIT GAME"
+#~ msgstr "编辑游戏"
 
-#~ msgid "Show Public"
-#~ msgstr "显示公共"
+#~ msgid "Remove selected mod"
+#~ msgstr "删除选中MOD"
 
-#~ msgid "Show Favorites"
-#~ msgstr "显示最爱"
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- 添加MOD"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "地址栏留空可启动本地服务器。"
+#~ msgid "CLIENT"
+#~ msgstr "客户端"
 
-#~ msgid "Create world"
-#~ msgstr "创造世界"
+#~ msgid "START SERVER"
+#~ msgstr "启动服务器"
 
-#~ msgid "Address required."
-#~ msgstr "需要地址。"
+#~ msgid "Name"
+#~ msgstr "名字"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "无法删除世界：没有选择世界"
+#~ msgid "Password"
+#~ msgstr "密码"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "将被删除的文件"
+#~ msgid "SETTINGS"
+#~ msgstr "设置"
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "无法创造世界：未找到游戏模式"
+#~ msgid "Preload item visuals"
+#~ msgstr "预先加载物品图像"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "无法配置世界：没有选择世界"
+#~ msgid "Finite Liquid"
+#~ msgstr "液体有限延伸"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "无法删除所有该世界的文件"
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "单人游戏"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "材质包"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "Add mod:"
+#~ msgstr "添加MOD："
+
+#~ msgid "Local install"
+#~ msgstr "本地安装"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "警告：一些MOD仍未设定。\n"
+#~ "它们会在你保存配置的时候自动启用。  "
+
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "警告：缺少一些设定了的MOD。\n"
+#~ "它们的设置会在你保存配置的时候被移除。  "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4250,99 +4311,67 @@ msgstr "cURL 超时"
 #~ "ESC：菜单\n"
 #~ "T：聊天\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "警告：缺少一些设定了的MOD。\n"
-#~ "它们的设置会在你保存配置的时候被移除。  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "无法删除所有该世界的文件"
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "警告：一些MOD仍未设定。\n"
-#~ "它们会在你保存配置的时候自动启用。  "
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "无法配置世界：没有选择世界"
 
-#~ msgid "Local install"
-#~ msgstr "本地安装"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "无法创造世界：未找到游戏模式"
 
-#~ msgid "Add mod:"
-#~ msgstr "添加MOD："
+#~ msgid "Files to be deleted"
+#~ msgstr "将被删除的文件"
 
-#~ msgid "MODS"
-#~ msgstr "MODS"
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "无法删除世界：没有选择世界"
 
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "材质包"
+#~ msgid "Address required."
+#~ msgstr "需要地址。"
 
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "单人游戏"
+#~ msgid "Create world"
+#~ msgstr "创造世界"
 
-#~ msgid "Finite Liquid"
-#~ msgstr "液体有限延伸"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "地址栏留空可启动本地服务器。"
 
-#~ msgid "Preload item visuals"
-#~ msgstr "预先加载物品图像"
+#~ msgid "Show Favorites"
+#~ msgstr "显示最爱"
 
-#~ msgid "SETTINGS"
-#~ msgstr "设置"
+#~ msgid "Show Public"
+#~ msgstr "显示公共"
 
-#~ msgid "Password"
-#~ msgstr "密码"
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "无法创建世界：名字包含非法字符"
 
-#~ msgid "Name"
-#~ msgstr "名字"
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "警告：配置不一致。  "
 
-#~ msgid "START SERVER"
-#~ msgstr "启动服务器"
+#~ msgid "Configuration saved.  "
+#~ msgstr "配置已保存。  "
 
-#~ msgid "CLIENT"
-#~ msgstr "客户端"
+#~ msgid "is required by:"
+#~ msgstr "被需要："
 
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- 添加MOD"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "左键：移动所有物品，右键：移动单个物品"
 
-#~ msgid "Remove selected mod"
-#~ msgstr "删除选中MOD"
+#~ msgid " MB/s"
+#~ msgstr "兆字节/秒"
 
-#~ msgid "EDIT GAME"
-#~ msgstr "编辑游戏"
-
-#~ msgid "new game"
-#~ msgstr "新建游戏"
-
-#~ msgid "Mods:"
-#~ msgstr "MODS："
-
-#~ msgid "GAMES"
-#~ msgstr "游戏"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”"
-
-#~ msgid "Game Name"
-#~ msgstr "游戏名"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "重启minetest让驱动变化生效"
+#~ msgid " KB/s"
+#~ msgstr "千字节/秒"
 
 #, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "启用"
+#~ msgid "Downloading"
+#~ msgstr "下载中"
+
+#~ msgid "Touch free target"
+#~ msgstr "自由触摸目标"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "菜单元素应用缩放因子"
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "禁用MOD包"
-
-#~ msgid "No!!!"
-#~ msgstr "不!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "生成一般地图"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "公共服务器列表"
-
-#~ msgid "No of course not!"
-#~ msgstr "当然不！"
+#~ msgid "Preload inventory textures"
+#~ msgstr "载入中..."
diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po
index abe574c93..cd3c6525f 100644
--- a/po/zh_TW/minetest.po
+++ b/po/zh_TW/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-05 16:13+0200\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
 "PO-Revision-Date: 2016-03-05 14:43+0000\n"
 "Last-Translator: Jeff Huang <s8321414@chakraos.org>\n"
 "Language-Team: Chinese (Taiwan) <https://hosted.weblate.org/projects/"
@@ -598,6 +598,10 @@ msgstr "視差遮蔽"
 msgid "Particles"
 msgstr "啟用粒子"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "重置單人遊戲世界"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
 msgstr "設定"
@@ -1861,6 +1865,18 @@ msgstr ""
 msgid "Disable anticheat"
 msgstr "停用反作弊"
 
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr "不允許空密碼"
@@ -1885,6 +1901,10 @@ msgstr "丟棄物品鍵"
 msgid "Dump the mapgen debug infos."
 msgstr "轉儲 mapgen 的除錯資訊。"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
 msgstr "啟用 VBO"
@@ -2199,8 +2219,6 @@ msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"The default flags set in the engine are: caves, light, decorations\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2419,6 +2437,16 @@ msgstr ""
 "遞迴函數的迭代。\n"
 "控制細節的品質。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick button repetition invterval"
+msgstr "右鍵點擊重覆間隔"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick frustum sensitivity"
+msgstr "滑鼠靈敏度"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
@@ -2915,8 +2943,6 @@ msgid ""
 "'humid_rivers' modifies the humidity around rivers and in areas where water "
 "would tend to pool,\n"
 "it may interfere with delicately adjusted biomes.\n"
-"The default flags set in the engine are: altitude_chill, humid_rivers\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2931,14 +2957,12 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
-"The default flags set in the engine are: none\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"專用於 Mapgen flat 的地圖生成屬性。\n"
-"偶而會在平坦的世界中加入湖泊與山丘。\n"
+"專用於 Mapgen v7 的地圖生成屬性。\n"
+"「ridges」為河流。\n"
 "未在旗標字串中指定的旗標將不會自預設值修改。\n"
 "以「no」開頭的旗標字串將會用於明確的停用它們。"
 
@@ -2948,8 +2972,6 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
 "flag is ignored.\n"
-"The default flags set in the engine are: biomeblend, mudflow\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
@@ -2964,14 +2986,12 @@ msgstr ""
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
-"The default flags set in the engine are: mountains, ridges\n"
-"The flags string modifies the engine defaults.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"專用於 Mapgen v6 的地圖生成屬性。\n"
-"當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n"
+"專用於 Mapgen v7 的地圖生成屬性。\n"
+"「ridges」為河流。\n"
 "未在旗標字串中指定的旗標將不會自預設值修改。\n"
 "以「no」開頭的旗標字串將會用於明確的停用它們。"
 
@@ -3939,8 +3959,9 @@ msgid "Smooth lighting"
 msgstr "平滑光"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Smooths camera when moving and looking around.\n"
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 "當移動與東張西望時讓攝影機變流暢。\n"
@@ -4050,6 +4071,12 @@ msgstr ""
 msgid "The rendering back-end for Irrlicht."
 msgstr "Irrlicht 的成像後端。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
@@ -4072,6 +4099,13 @@ msgstr ""
 "超過時將會嘗試透過傾倒舊佇列項目減少其\n"
 "大小。將值設為 0 以停用此功能。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr "當按住滑鼠右鍵時，重覆右鍵點選的間隔以秒計。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
@@ -4444,54 +4478,17 @@ msgstr "cURL 並行限制"
 msgid "cURL timeout"
 msgstr "cURL 逾時"
 
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "啟用略低的的水面，所以它就不會完全「填滿」節點。\n"
-#~ "注意，這個功能並未最佳化完成，水面的\n"
-#~ "柔和光功能無法與此功能一同運作。"
+#~ msgid "No of course not!"
+#~ msgstr "不，絕對不是！"
 
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr "啟用節點選擇突顯（停用選取框）。"
+#~ msgid "Public Serverlist"
+#~ msgstr "公共伺服器清單"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "預先載入物品欄材質"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "生成一般地圖"
 
-#~ msgid "Reset singleplayer world"
-#~ msgstr "重置單人遊戲世界"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "套用在選單元素的縮放係數： "
-
-#~ msgid "Touch free target"
-#~ msgstr "碰觸自由目標"
-
-#~ msgid "If enabled, "
-#~ msgstr "若啟用， "
-
-#~ msgid "If disabled "
-#~ msgstr "若停用 "
-
-#~ msgid "Enable a bit lower water surface, so it doesn't "
-#~ msgstr "啟用較低的水面，所以它不會 "
-
-#~ msgid "\""
-#~ msgstr "\""
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "'ridges' are the rivers.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
-#~ msgstr ""
-#~ "專用於 Mapgen v7 的地圖生成屬性。\n"
-#~ "「ridges」為河流。\n"
-#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
-#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"
+#~ msgid "No!!!"
+#~ msgstr "否！！！"
 
 #~ msgid ""
 #~ "Map generation attributes specific to Mapgen Valleys.\n"
@@ -4511,14 +4508,66 @@ msgstr "cURL 逾時"
 #~ "「humid_rivers」會修改在河流附近的濕度，在那些區域附近水將會傾向變為一池。"
 #~ "這可能會對微妙調整過的生物群落造成干擾。"
 
-#~ msgid "No!!!"
-#~ msgstr "否！！！"
+#~ msgid "\""
+#~ msgstr "\""
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "生成一般地圖"
+#~ msgid "Enable a bit lower water surface, so it doesn't "
+#~ msgstr "啟用較低的水面，所以它不會 "
 
-#~ msgid "Public Serverlist"
-#~ msgstr "公共伺服器清單"
+#~ msgid "If disabled "
+#~ msgstr "若停用 "
 
-#~ msgid "No of course not!"
-#~ msgstr "不，絕對不是！"
+#~ msgid "If enabled, "
+#~ msgstr "若啟用， "
+
+#~ msgid "Touch free target"
+#~ msgstr "碰觸自由目標"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "套用在選單元素的縮放係數： "
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "預先載入物品欄材質"
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr "啟用節點選擇突顯（停用選取框）。"
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "啟用略低的的水面，所以它就不會完全「填滿」節點。\n"
+#~ "注意，這個功能並未最佳化完成，水面的\n"
+#~ "柔和光功能無法與此功能一同運作。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "專用於 Mapgen v6 的地圖生成屬性。\n"
+#~ "當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n"
+#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
+#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "專用於 Mapgen flat 的地圖生成屬性。\n"
+#~ "偶而會在平坦的世界中加入湖泊與山丘。\n"
+#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
+#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"

From 91f68e7d11e89dbc73ec259eb057de51099dfe8c Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 10 Jul 2016 16:03:53 +0100
Subject: [PATCH 106/418] Treegen: Improve use of signed vs. unsigned integers

To fix GCC 6.1.1 compilation warning:
'assuming signed overflow does not occur when assuming
that (X - c) > X is always false'
---
 src/treegen.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/treegen.cpp b/src/treegen.cpp
index 36d387c57..f37bf0e86 100644
--- a/src/treegen.cpp
+++ b/src/treegen.cpp
@@ -770,9 +770,9 @@ void make_pine_tree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
 	MapNode snownode(c_snow);
 
 	PseudoRandom pr(seed);
-	s16 trunk_h = pr.range(9, 13);
+	u16 trunk_h = pr.range(9, 13);
 	v3s16 p1 = p0;
-	for (s16 ii = 0; ii < trunk_h; ii++) {
+	for (u16 ii = 0; ii < trunk_h; ii++) {
 		if (vmanip.m_area.contains(p1)) {
 			u32 vi = vmanip.m_area.index(p1);
 			vmanip.m_data[vi] = treenode;
@@ -790,7 +790,7 @@ void make_pine_tree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
 		leaves_d[i] = 0;
 
 	// Upper branches
-	s16 dev = 3;
+	u16 dev = 3;
 	for (s16 yy = -1; yy <= 1; yy++) {
 		for (s16 zz = -dev; zz <= dev; zz++) {
 			u32 i = leaves_a.index(v3s16(-dev, yy, zz));

From d6865c4d8d0eb7aaf2d35447ab01e06ef8249010 Mon Sep 17 00:00:00 2001
From: Duane <duane@duanerobertson.com>
Date: Mon, 11 Jul 2016 09:46:01 -0500
Subject: [PATCH 107/418] Lua_api.txt: Fix description of node drop behaviour

---
 doc/lua_api.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index a59a9c0f2..12b0a9299 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3612,8 +3612,8 @@ Definition tables
             max_items = 1,  -- Maximum number of items to drop.
             items = { -- Choose max_items randomly from this list.
                 {
-                    items = {"foo:bar", "baz:frob"},  -- Choose one item randomly from this list.
-                    rarity = 1,  -- Probability of getting is 1 / rarity.
+                    items = {"foo:bar", "baz:frob"},  -- Items to drop.
+                    rarity = 1,  -- Probability of dropping is 1 / rarity.
                 },
             },
         },

From d7060c212f3d9fb9a69719e9041fdef1f5792fef Mon Sep 17 00:00:00 2001
From: Tim <t4im@users.noreply.github.com>
Date: Tue, 12 Jul 2016 21:51:10 +0200
Subject: [PATCH 108/418] Builtin/profiler: Replace game profiler (#4245)

Use the setting "profiler.load" to enable profiling.
Other settings can be found in settingtypes.txt.

* /profiler print [filter] - report statistics to in-game console
* /profiler dump [filter] - report statistics to STDOUT and debug.txt
* /profiler save [format [filter]] - saves statistics to a file in your worldpath
	* txt (default) - same treetable format as used by the dump and print commands
	* csv - ready for spreadsheet import
	* json - useful for adhoc D3 visualizations
	* json_pretty - line wrapped and intended json for humans
	* lua - serialized lua table of the profile-data, for adhoc scripts
* /profiler reset - reset all gathered profile data.
	This can be helpful to discard of any startup measurements that often spike during loading or to get more useful min-values.

[filter] allows limiting the output of the data via substring/pattern matching against the modname.

Note: Serialized data structures might be subject to change with changed or added measurements.
	csv might be the most stable, due to flat structure.

Changes to the previous version include:

* Updated and extended API monitoring
* Correct calculation of average (mean) values (undistorted by idleness)
* Reduce instrumentation overhead.
* Fix crashes related to missing parameters for the future and occasional DIV/0's.
* Prevent issues caused by timetravel (overflow, timejump, NTP corrections)
* Prevent modname clashes with internal names.
* Measure each instrumentation individually and label based on registration order.
* Labeling of ABM's and LBM's for easier classification.
  Giving several ABM's or LBM's the same label will treat them as one.
  Missing labels will be autogenerated based on name or registration order.
* Configurable instrumentation and reporting. Skip e.g. builtin if you don't need it.
* Profile the profiler to measure instrumentation overhead.
---
 builtin/game/chatcommands.lua        |  19 +-
 builtin/game/init.lua                |   6 +-
 builtin/game/mod_profiling.lua       | 356 ---------------------------
 builtin/profiler/init.lua            |  72 ++++++
 builtin/profiler/instrumentation.lua | 232 +++++++++++++++++
 builtin/profiler/reporter.lua        | 277 +++++++++++++++++++++
 builtin/profiler/sampling.lua        | 206 ++++++++++++++++
 builtin/settingtypes.txt             |  57 ++++-
 doc/lua_api.txt                      |   6 +
 9 files changed, 851 insertions(+), 380 deletions(-)
 delete mode 100644 builtin/game/mod_profiling.lua
 create mode 100644 builtin/profiler/init.lua
 create mode 100644 builtin/profiler/instrumentation.lua
 create mode 100644 builtin/profiler/reporter.lua
 create mode 100644 builtin/profiler/sampling.lua

diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua
index 22755386b..24792bc8a 100644
--- a/builtin/game/chatcommands.lua
+++ b/builtin/game/chatcommands.lua
@@ -14,19 +14,6 @@ function core.register_chatcommand(cmd, def)
 	core.chatcommands[cmd] = def
 end
 
-if core.setting_getbool("mod_profiling") then
-	local tracefct = profiling_print_log
-	profiling_print_log = nil
-	core.register_chatcommand("save_mod_profile",
-			{
-				params      = "",
-				description = "save mod profiling data to logfile " ..
-						"(depends on default loglevel)",
-				func        = tracefct,
-				privs       = { server=true }
-			})
-end
-
 core.register_on_chat_message(function(name, message)
 	local cmd, param = string.match(message, "^/([^ ]+) *(.*)")
 	if not param then
@@ -51,6 +38,12 @@ core.register_on_chat_message(function(name, message)
 	return true  -- Handled chat message
 end)
 
+if core.setting_getbool("profiler.load") then
+	-- Run after register_chatcommand and its register_on_chat_message
+	-- Before any chattcommands that should be profiled
+	profiler.init_chatcommand()
+end
+
 -- Parses a "range" string in the format of "here (number)" or
 -- "(x1, y1, z1) (x2, y2, z2)", returning two position vectors
 local function parse_range_str(player_name, str)
diff --git a/builtin/game/init.lua b/builtin/game/init.lua
index a6cfa3bf8..2f9f90315 100644
--- a/builtin/game/init.lua
+++ b/builtin/game/init.lua
@@ -9,8 +9,8 @@ dofile(gamepath.."constants.lua")
 dofile(gamepath.."item.lua")
 dofile(gamepath.."register.lua")
 
-if core.setting_getbool("mod_profiling") then
-	dofile(gamepath.."mod_profiling.lua")
+if core.setting_getbool("profiler.load") then
+	profiler = dofile(scriptpath.."profiler"..DIR_DELIM.."init.lua")
 end
 
 dofile(gamepath.."item_entity.lua")
@@ -26,3 +26,5 @@ dofile(gamepath.."features.lua")
 dofile(gamepath.."voxelarea.lua")
 dofile(gamepath.."forceloading.lua")
 dofile(gamepath.."statbars.lua")
+
+profiler = nil
diff --git a/builtin/game/mod_profiling.lua b/builtin/game/mod_profiling.lua
deleted file mode 100644
index df2d10221..000000000
--- a/builtin/game/mod_profiling.lua
+++ /dev/null
@@ -1,356 +0,0 @@
--- Minetest: builtin/game/mod_profiling.lua
-
-local mod_statistics = {}
-mod_statistics.step_total = 0
-mod_statistics.data = {}
-mod_statistics.stats = {}
-mod_statistics.stats["total"] = {
-	min_us = math.huge,
-	max_us = 0,
-	avg_us = 0,
-	min_per = 100,
-	max_per = 100,
-	avg_per = 100
-}
-
-local replacement_table = {
-	"register_globalstep",
-	"register_on_placenode",
-	"register_on_dignode",
-	"register_on_punchnode",
-	"register_on_generated",
-	"register_on_newplayer",
-	"register_on_dieplayer",
-	"register_on_respawnplayer",
-	"register_on_prejoinplayer",
-	"register_on_joinplayer",
-	"register_on_leaveplayer",
-	"register_on_cheat",
-	"register_on_chat_message",
-	"register_on_player_receive_fields",
-	"register_on_mapgen_init",
-	"register_on_craft",
-	"register_craft_predict",
-	"register_on_item_eat"
-}
-
---------------------------------------------------------------------------------
-function mod_statistics.log_time(type, modname, time_in_us)
-
-	if modname == nil then
-		modname = "builtin"
-	end
-	
-	if mod_statistics.data[modname] == nil then
-		mod_statistics.data[modname] = {}
-	end
-	
-	if mod_statistics.data[modname][type] == nil then
-		mod_statistics.data[modname][type] = 0
-	end
-	
-	mod_statistics.data[modname][type] =
-		mod_statistics.data[modname][type] + time_in_us
-	mod_statistics.step_total = mod_statistics.step_total + time_in_us
-end
-
---------------------------------------------------------------------------------
-function mod_statistics.update_statistics(dtime)
-	for modname,types in pairs(mod_statistics.data) do
-		
-		if mod_statistics.stats[modname] == nil then
-			mod_statistics.stats[modname] = {
-				min_us = math.huge,
-				max_us = 0,
-				avg_us = 0,
-				min_per = 100,
-				max_per = 0,
-				avg_per = 0
-			}
-		end
-		
-		local modtime = 0
-		for type,time in pairs(types) do
-			modtime = modtime + time
-			if mod_statistics.stats[modname].types == nil then
-				mod_statistics.stats[modname].types = {}
-			end
-			if mod_statistics.stats[modname].types[type] == nil then
-				mod_statistics.stats[modname].types[type] = {
-					min_us = math.huge,
-					max_us = 0,
-					avg_us = 0,
-					min_per = 100,
-					max_per = 0,
-					avg_per = 0
-				}
-			end
-			
-			local toupdate = mod_statistics.stats[modname].types[type]
-			
-			--update us values
-			toupdate.min_us = math.min(time, toupdate.min_us)
-			toupdate.max_us = math.max(time, toupdate.max_us)
-			--TODO find better algorithm
-			toupdate.avg_us = toupdate.avg_us * 0.99 + modtime * 0.01
-				
-			--update percentage values
-			local cur_per = (time/mod_statistics.step_total) * 100
-			toupdate.min_per = math.min(toupdate.min_per, cur_per)
-				
-			toupdate.max_per = math.max(toupdate.max_per, cur_per)
-				
-			--TODO find better algorithm
-			toupdate.avg_per = toupdate.avg_per * 0.99 + cur_per * 0.01
-			
-			mod_statistics.data[modname][type] = 0
-		end
-		
-		--per mod statistics
-		--update us values
-		mod_statistics.stats[modname].min_us =
-			math.min(modtime, mod_statistics.stats[modname].min_us)
-		mod_statistics.stats[modname].max_us =
-			math.max(modtime, mod_statistics.stats[modname].max_us)
-		--TODO find better algorithm
-		mod_statistics.stats[modname].avg_us =
-			mod_statistics.stats[modname].avg_us * 0.99 + modtime * 0.01
-			
-		--update percentage values
-		local cur_per = (modtime/mod_statistics.step_total) * 100
-		mod_statistics.stats[modname].min_per =
-			math.min(mod_statistics.stats[modname].min_per, cur_per)
-			
-		mod_statistics.stats[modname].max_per =
-			math.max(mod_statistics.stats[modname].max_per, cur_per)
-			
-		--TODO find better algorithm
-		mod_statistics.stats[modname].avg_per =
-			mod_statistics.stats[modname].avg_per * 0.99 + cur_per * 0.01
-	end
-	
-	--update "total"
-	mod_statistics.stats["total"].min_us =
-		math.min(mod_statistics.step_total, mod_statistics.stats["total"].min_us)
-	mod_statistics.stats["total"].max_us =
-		math.max(mod_statistics.step_total, mod_statistics.stats["total"].max_us)
-	--TODO find better algorithm
-	mod_statistics.stats["total"].avg_us =
-		mod_statistics.stats["total"].avg_us * 0.99 +
-		mod_statistics.step_total * 0.01
-	
-	mod_statistics.step_total = 0
-end
-
---------------------------------------------------------------------------------
-local function build_callback(log_id, fct)
-	return function( toregister )
-		local modname = core.get_current_modname()
-		
-		fct(function(...)
-			local starttime = core.get_us_time()
-			-- note maximum 10 return values are supported unless someone finds
-			-- a way to store a variable lenght return value list
-			local r0, r1, r2, r3, r4, r5, r6, r7, r8, r9 = toregister(...)
-			local delta = core.get_us_time() - starttime
-			mod_statistics.log_time(log_id, modname, delta)
-			return r0, r1, r2, r3, r4, r5, r6, r7, r8, r9
-			end
-		)
-	end
-end
-
---------------------------------------------------------------------------------
-function profiling_print_log(cmd, filter)
-
-	print("Filter:" .. dump(filter))
-
-	core.log("action", "Values below show times/percentages per server step.")
-	core.log("action", "Following suffixes are used for entities:")
-	core.log("action", "\t#oa := on_activate, #os := on_step, #op := on_punch, #or := on_rightclick, #gs := get_staticdata")
-	core.log("action",
-		string.format("%16s | %25s | %10s | %10s | %10s | %9s | %9s | %9s",
-		"modname", "type" , "min µs", "max µs", "avg µs", "min %", "max %", "avg %")
-	)
-	core.log("action",
-		"-----------------+---------------------------+-----------+" ..
-		"-----------+-----------+-----------+-----------+-----------")
-	for modname,statistics in pairs(mod_statistics.stats) do
-		if modname ~= "total" then
-		
-			if (filter == "") or (modname == filter) then
-				if modname:len() > 16 then
-					modname = "..." .. modname:sub(-13)
-				end
-			
-				core.log("action",
-					string.format("%16s | %25s | %9d | %9d | %9d | %9d | %9d | %9d",
-					modname,
-					" ",
-					statistics.min_us,
-					statistics.max_us,
-					statistics.avg_us,
-					statistics.min_per,
-					statistics.max_per,
-					statistics.avg_per)
-				)
-				if core.setting_getbool("detailed_profiling") then
-					if statistics.types ~= nil then
-						for type,typestats in pairs(statistics.types) do
-						
-							if type:len() > 25 then
-								type = "..." .. type:sub(-22)
-							end
-						
-							core.log("action",
-								string.format(
-								"%16s | %25s | %9d | %9d | %9d | %9d | %9d | %9d",
-								" ",
-								type,
-								typestats.min_us,
-								typestats.max_us,
-								typestats.avg_us,
-								typestats.min_per,
-								typestats.max_per,
-								typestats.avg_per)
-							)
-						end
-					end
-				end
-			end
-		end
-	end
-		core.log("action",
-			"-----------------+---------------------------+-----------+" ..
-			"-----------+-----------+-----------+-----------+-----------")
-			
-	if filter == "" then
-		core.log("action",
-			string.format("%16s | %25s | %9d | %9d | %9d | %9d | %9d | %9d",
-			"total",
-			" ",
-			mod_statistics.stats["total"].min_us,
-			mod_statistics.stats["total"].max_us,
-			mod_statistics.stats["total"].avg_us,
-			mod_statistics.stats["total"].min_per,
-			mod_statistics.stats["total"].max_per,
-			mod_statistics.stats["total"].avg_per)
-		)
-	end
-	core.log("action", " ")
-	
-	return true
-end
-
---------------------------------------------------------------------------------
-local function initialize_profiling()
-	core.log("action", "Initialize tracing")
-	
-	mod_statistics.entity_callbacks = {}
-	
-	-- first register our own globalstep handler
-	core.register_globalstep(mod_statistics.update_statistics)
-	
-	local rp_register_entity = core.register_entity
-	core.register_entity = function(name, prototype)
-		local modname = core.get_current_modname()
-		local new_on_activate = nil
-		local new_on_step = nil
-		local new_on_punch = nil
-		local new_rightclick = nil
-		local new_get_staticdata = nil
-		
-		if prototype.on_activate ~= nil then
-			local cbid = name .. "#oa"
-			mod_statistics.entity_callbacks[cbid] = prototype.on_activate
-			new_on_activate = function(self, staticdata, dtime_s)
-				local starttime = core.get_us_time()
-				mod_statistics.entity_callbacks[cbid](self, staticdata, dtime_s)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-			end
-		end
-		
-		if prototype.on_step ~= nil then
-			local cbid = name .. "#os"
-			mod_statistics.entity_callbacks[cbid] = prototype.on_step
-			new_on_step = function(self, dtime)
-				local starttime = core.get_us_time()
-				mod_statistics.entity_callbacks[cbid](self, dtime)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-			end
-		end
-	
-		if prototype.on_punch ~= nil then
-			local cbid = name .. "#op"
-			mod_statistics.entity_callbacks[cbid] = prototype.on_punch
-			new_on_punch = function(self, hitter)
-				local starttime = core.get_us_time()
-				mod_statistics.entity_callbacks[cbid](self, hitter)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-			end
-		end
-		
-		if prototype.rightclick ~= nil then
-			local cbid = name .. "#rc"
-			mod_statistics.entity_callbacks[cbid] = prototype.rightclick
-			new_rightclick = function(self, clicker)
-				local starttime = core.get_us_time()
-				mod_statistics.entity_callbacks[cbid](self, clicker)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-			end
-		end
-		
-		if prototype.get_staticdata ~= nil then
-			local cbid = name .. "#gs"
-			mod_statistics.entity_callbacks[cbid] = prototype.get_staticdata
-			new_get_staticdata = function(self)
-				local starttime = core.get_us_time()
-				local retval = mod_statistics.entity_callbacks[cbid](self)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-				return retval
-			end
-		end
-	
-		prototype.on_activate = new_on_activate
-		prototype.on_step = new_on_step
-		prototype.on_punch = new_on_punch
-		prototype.rightclick = new_rightclick
-		prototype.get_staticdata = new_get_staticdata
-		
-		rp_register_entity(name,prototype)
-	end
-	
-	for i,v in ipairs(replacement_table) do
-		local to_replace = core[v]
-		core[v] = build_callback(v, to_replace)
-	end
-	
-	local rp_register_abm = core.register_abm
-	core.register_abm = function(spec)
-	
-		local modname = core.get_current_modname()
-	
-		local replacement_spec = {
-			nodenames = spec.nodenames,
-			neighbors = spec.neighbors,
-			interval  = spec.interval,
-			chance    = spec.chance,
-			action = function(pos, node, active_object_count, active_object_count_wider)
-				local starttime = core.get_us_time()
-				spec.action(pos, node, active_object_count, active_object_count_wider)
-				local delta = core.get_us_time() - starttime
-				mod_statistics.log_time("abm", modname, delta)
-			end
-		}
-		rp_register_abm(replacement_spec)
-	end
-	
-	core.log("action", "Mod profiling initialized")
-end
-
-initialize_profiling()
diff --git a/builtin/profiler/init.lua b/builtin/profiler/init.lua
new file mode 100644
index 000000000..c1597d280
--- /dev/null
+++ b/builtin/profiler/init.lua
@@ -0,0 +1,72 @@
+--Minetest
+--Copyright (C) 2016 T4im
+--
+--This program is free software; you can redistribute it and/or modify
+--it under the terms of the GNU Lesser General Public License as published by
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+local profiler_path = core.get_builtin_path()..DIR_DELIM.."profiler"..DIR_DELIM
+local profiler = {}
+local sampler = assert(loadfile(profiler_path .. "sampling.lua"))(profiler)
+local instrumentation  = assert(loadfile(profiler_path .. "instrumentation.lua"))(profiler, sampler)
+local reporter = dofile(profiler_path .. "reporter.lua")
+profiler.instrument = instrumentation.instrument
+
+---
+-- Delayed registration of the /profiler chat command
+-- Is called later, after `core.register_chatcommand` was set up.
+--
+function profiler.init_chatcommand()
+	local instrument_profiler = core.setting_getbool("instrument.profiler") or false
+	if instrument_profiler then
+		instrumentation.init_chatcommand()
+	end
+
+	local param_usage = "print [filter] | dump [filter] | save [format [filter]] | reset"
+	core.register_chatcommand("profiler", {
+		description = "handle the profiler and profiling data",
+		params = param_usage,
+		privs = { server=true },
+		func = function(name, param)
+			local command, arg0 = string.match(param, "([^ ]+) ?(.*)")
+			local args = arg0 and string.split(arg0, " ")
+
+			if command == "dump" then
+				core.log("action", reporter.print(sampler.profile, arg0))
+				return true, "Statistics written to action log"
+			elseif command == "print" then
+				return true, reporter.print(sampler.profile, arg0)
+			elseif command == "save" then
+				return reporter.save(sampler.profile, args[1] or "txt", args[2])
+			elseif command == "reset" then
+				sampler.reset()
+				return true, "Statistics were reset"
+			end
+
+			return false, string.format(
+				"Usage: %s\n" ..
+				"Format can be one of txt, csv, lua, json, json_pretty (structures may be subject to change).",
+				param_usage
+			)
+		end
+	})
+
+	if not instrument_profiler then
+		instrumentation.init_chatcommand()
+	end
+end
+
+sampler.init()
+instrumentation.init()
+
+return profiler
diff --git a/builtin/profiler/instrumentation.lua b/builtin/profiler/instrumentation.lua
new file mode 100644
index 000000000..4311215b2
--- /dev/null
+++ b/builtin/profiler/instrumentation.lua
@@ -0,0 +1,232 @@
+--Minetest
+--Copyright (C) 2016 T4im
+--
+--This program is free software; you can redistribute it and/or modify
+--it under the terms of the GNU Lesser General Public License as published by
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+local format, pairs, type = string.format, pairs, type
+local core, get_current_modname = core, core.get_current_modname
+local profiler, sampler = ...
+local instrument_builtin = core.setting_getbool("instrument.builtin") or false
+
+local register_functions = {
+	register_globalstep = 0,
+	register_playerevent = 0,
+	register_on_placenode = 0,
+	register_on_dignode = 0,
+	register_on_punchnode = 0,
+	register_on_generated = 0,
+	register_on_newplayer = 0,
+	register_on_dieplayer = 0,
+	register_on_respawnplayer = 0,
+	register_on_prejoinplayer = 0,
+	register_on_joinplayer = 0,
+	register_on_leaveplayer = 0,
+	register_on_cheat = 0,
+	register_on_chat_message = 0,
+	register_on_player_receive_fields = 0,
+	register_on_craft = 0,
+	register_craft_predict = 0,
+	register_on_protection_violation = 0,
+	register_on_item_eat = 0,
+	register_on_punchplayer = 0,
+	register_on_player_hpchange = 0,
+}
+
+---
+-- Create an unique instrument name.
+-- Generate a missing label with a running index number.
+--
+local counts = {}
+local function generate_name(def)
+	local class, label, func_name = def.class, def.label, def.func_name
+	if label then
+		if class or func_name then
+			return format("%s '%s' %s", class or "", label, func_name or ""):trim()
+		end
+		return format("%s", label):trim()
+	elseif label == false then
+		return format("%s", class or func_name):trim()
+	end
+
+	local index_id = def.mod .. (class or func_name)
+	local index = counts[index_id] or 1
+	counts[index_id] = index + 1
+	return format("%s[%d] %s", class or func_name, index, class and func_name or ""):trim()
+end
+
+---
+-- Keep `measure` and the closure in `instrument` lean, as these, and their
+-- directly called functions are the overhead that is caused by instrumentation.
+--
+local time, log = core.get_us_time, sampler.log
+local function measure(modname, instrument_name, start, ...)
+	log(modname, instrument_name, time() - start)
+	return ...
+end
+--- Automatically instrument a function to measure and log to the sampler.
+-- def = {
+-- 		mod = "",
+-- 		class = "",
+-- 		func_name = "",
+-- 		-- if nil, will create a label based on registration order
+-- 		label = "" | false,
+-- }
+local function instrument(def)
+	if not def or not def.func then
+		return
+	end
+	def.mod = def.mod or get_current_modname()
+	local modname = def.mod
+	local instrument_name = generate_name(def)
+	local func = def.func
+
+	if not instrument_builtin and modname == "*builtin*" then
+		return func
+	end
+
+	return function(...)
+		-- This tail-call allows passing all return values of `func`
+		-- also called https://en.wikipedia.org/wiki/Continuation_passing_style
+		-- Compared to table creation and unpacking it won't lose `nil` returns
+		-- and is expected to be faster
+		-- `measure` will be executed after time() and func(...)
+		return measure(modname, instrument_name, time(), func(...))
+	end
+end
+
+local function can_be_called(func)
+	-- It has to be a function or callable table
+	return type(func) == "function" or
+		((type(func) == "table" or type(func) == "userdata") and
+		getmetatable(func) and getmetatable(func).__call)
+end
+
+local function assert_can_be_called(func, func_name, level)
+	if not can_be_called(func) then
+		-- Then throw an *helpful* error, by pointing on our caller instead of us.
+		error(format("Invalid argument to %s. Expected function-like type instead of '%s'.", func_name, type(func)), level + 1)
+	end
+end
+
+---
+-- Wraps a registration function `func` in such a way,
+-- that it will automatically instrument any callback function passed as first argument.
+--
+local function instrument_register(func, func_name)
+	local register_name = func_name:gsub("^register_", "", 1)
+	return function(callback, ...)
+		assert_can_be_called(callback, func_name, 2)
+		register_functions[func_name] = register_functions[func_name] + 1
+		return func(instrument {
+			func = callback,
+			func_name = register_name
+		}), ...
+	end
+end
+
+local function init_chatcommand()
+	if core.setting_getbool("instrument.chatcommand") or true then
+		local orig_register_chatcommand = core.register_chatcommand
+		core.register_chatcommand = function(cmd, def)
+			def.func = instrument {
+				func = def.func,
+				label = "/" .. cmd,
+			}
+			orig_register_chatcommand(cmd, def)
+		end
+	end
+end
+
+---
+-- Start instrumenting selected functions
+--
+local function init()
+	local is_set = core.setting_getbool
+	if is_set("instrument.entity") or true then
+		-- Explicitly declare entity api-methods.
+		-- Simple iteration would ignore lookup via __index.
+		local entity_instrumentation = {
+			"on_activate",
+			"on_step",
+			"on_punch",
+			"rightclick",
+			"get_staticdata",
+		}
+		-- Wrap register_entity() to instrument them on registration.
+		local orig_register_entity = core.register_entity
+		core.register_entity = function(name, prototype)
+			local modname = get_current_modname()
+			for _, func_name in pairs(entity_instrumentation) do
+				prototype[func_name] = instrument {
+					func = prototype[func_name],
+					mod = modname,
+					func_name = func_name,
+					label = prototype.label,
+				}
+			end
+			orig_register_entity(name,prototype)
+		end
+	end
+
+	if is_set("instrument.abm") or true then
+		-- Wrap register_abm() to automatically instrument abms.
+		local orig_register_abm = core.register_abm
+		core.register_abm = function(spec)
+			spec.action = instrument {
+				func = spec.action,
+				class = "ABM",
+				label = spec.label,
+			}
+			orig_register_abm(spec)
+		end
+	end
+
+	if is_set("instrument.lbm") or true then
+		-- Wrap register_lbm() to automatically instrument lbms.
+		local orig_register_lbm = core.register_lbm
+		core.register_lbm = function(spec)
+			spec.action = instrument {
+				func = spec.action,
+				class = "LBM",
+				label = spec.label or spec.name,
+			}
+			orig_register_lbm(spec)
+		end
+	end
+
+	if is_set("instrument.global_callback") or true then
+		for func_name, _ in pairs(register_functions) do
+			core[func_name] = instrument_register(core[func_name], func_name)
+		end
+	end
+
+	if is_set("instrument.profiler") or false then
+		-- Measure overhead of instrumentation, but keep it down for functions
+		-- So keep the `return` for better optimization.
+		profiler.empty_instrument = instrument {
+			func = function() return end,
+			mod = "*profiler*",
+			class = "Instrumentation overhead",
+			label = false,
+		}
+	end
+end
+
+return {
+	register_functions = register_functions,
+	instrument = instrument,
+	init = init,
+	init_chatcommand = init_chatcommand,
+}
diff --git a/builtin/profiler/reporter.lua b/builtin/profiler/reporter.lua
new file mode 100644
index 000000000..5b38ed4df
--- /dev/null
+++ b/builtin/profiler/reporter.lua
@@ -0,0 +1,277 @@
+--Minetest
+--Copyright (C) 2016 T4im
+--
+--This program is free software; you can redistribute it and/or modify
+--it under the terms of the GNU Lesser General Public License as published by
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+local DIR_DELIM, LINE_DELIM = DIR_DELIM, "\n"
+local table, unpack, string, pairs, io, os = table, unpack, string, pairs, io, os
+local rep, sprintf, tonumber = string.rep, string.format, tonumber
+local core, setting_get = core, core.setting_get
+local reporter = {}
+
+---
+-- Shorten a string. End on an ellipsis if shortened.
+--
+local function shorten(str, length)
+	if str and str:len() > length then
+		return "..." .. str:sub(-(length-3))
+	end
+	return str
+end
+
+local function filter_matches(filter, text)
+	return not filter or string.match(text, filter)
+end
+
+local function format_number(number, fmt)
+	number = tonumber(number)
+	if not number then
+		return "N/A"
+	end
+	return sprintf(fmt or "%d", number)
+end
+
+local Formatter = {
+	new = function(self, object)
+		object = object or {}
+		object.out = {} -- output buffer
+		self.__index = self
+		return setmetatable(object, self)
+	end,
+	__tostring = function (self)
+		return table.concat(self.out, LINE_DELIM)
+	end,
+	print = function(self, text, ...)
+		if (...) then
+			text = sprintf(text, ...)
+		end
+
+		if text then
+			-- Avoid format unicode issues.
+			text = text:gsub("Ms", "µs")
+		end
+
+		table.insert(self.out, text or LINE_DELIM)
+	end,
+	flush = function(self)
+		table.insert(self.out, LINE_DELIM)
+		local text = table.concat(self.out, LINE_DELIM)
+		self.out = {}
+		return text
+	end
+}
+
+local widths = { 55, 9, 9, 9, 5, 5, 5 }
+local txt_row_format = sprintf(" %%-%ds | %%%ds | %%%ds | %%%ds | %%%ds | %%%ds | %%%ds", unpack(widths))
+
+local HR = {}
+for i=1, #widths do
+	HR[i]= rep("-", widths[i])
+end
+-- ' | ' should break less with github than '-+-', when people are pasting there
+HR = sprintf("-%s-", table.concat(HR, " | "))
+
+local TxtFormatter = Formatter:new {
+	format_row = function(self, modname, instrument_name, statistics)
+		local label
+		if instrument_name then
+			label = shorten(instrument_name, widths[1] - 5)
+			label = sprintf(" - %s %s", label, rep(".", widths[1] - 5 - label:len()))
+		else -- Print mod_stats
+			label = shorten(modname, widths[1] - 2) .. ":"
+		end
+
+		self:print(txt_row_format, label,
+			format_number(statistics.time_min),
+			format_number(statistics.time_max),
+			format_number(statistics:get_time_avg()),
+			format_number(statistics.part_min, "%.1f"),
+			format_number(statistics.part_max, "%.1f"),
+			format_number(statistics:get_part_avg(), "%.1f")
+		)
+	end,
+	format = function(self, filter)
+		local profile = self.profile
+		self:print("Values below show absolute/relative times spend per server step by the instrumented function.")
+		self:print("A total of %d samples were taken", profile.stats_total.samples)
+
+		if filter then
+			self:print("The output is limited to '%s'", filter)
+		end
+
+		self:print()
+		self:print(
+			txt_row_format,
+			"instrumentation", "min Ms", "max Ms", "avg Ms", "min %", "max %", "avg %"
+		)
+		self:print(HR)
+		for modname,mod_stats in pairs(profile.stats) do
+			if filter_matches(filter, modname) then
+				self:format_row(modname, nil, mod_stats)
+
+				if mod_stats.instruments ~= nil then
+					for instrument_name, instrument_stats in pairs(mod_stats.instruments) do
+						self:format_row(nil, instrument_name, instrument_stats)
+					end
+				end
+			end
+		end
+		self:print(HR)
+		if not filter then
+			self:format_row("total", nil, profile.stats_total)
+		end
+	end
+}
+
+local CsvFormatter = Formatter:new {
+	format_row = function(self, modname, instrument_name, statistics)
+		self:print(
+			"%q,%q,%d,%d,%d,%d,%d,%f,%f,%f",
+			modname, instrument_name,
+			statistics.samples,
+			statistics.time_min,
+			statistics.time_max,
+			statistics:get_time_avg(),
+			statistics.time_all,
+			statistics.part_min,
+			statistics.part_max,
+			statistics:get_part_avg()
+		)
+	end,
+	format = function(self, filter)
+		self:print(
+			"%q,%q,%q,%q,%q,%q,%q,%q,%q,%q",
+			"modname", "instrumentation",
+			"samples",
+			"time min µs",
+			"time max µs",
+			"time avg µs",
+			"time all µs",
+			"part min %",
+			"part max %",
+			"part avg %"
+		)
+		for modname, mod_stats in pairs(self.profile.stats) do
+			if filter_matches(filter, modname) then
+				self:format_row(modname, "*", mod_stats)
+
+				if mod_stats.instruments ~= nil then
+					for instrument_name, instrument_stats in pairs(mod_stats.instruments) do
+						self:format_row(modname, instrument_name, instrument_stats)
+					end
+				end
+			end
+		end
+	end
+}
+
+local function format_statistics(profile, format, filter)
+	local formatter
+	if format == "csv" then
+		formatter = CsvFormatter:new {
+			profile = profile
+		}
+	else
+		formatter = TxtFormatter:new {
+			profile = profile
+		}
+	end
+	formatter:format(filter)
+	return formatter:flush()
+end
+
+---
+-- Format the profile ready for display and
+-- @return string to be printed to the console
+--
+function reporter.print(profile, filter)
+	if filter == "" then filter = nil end
+	return format_statistics(profile, "txt", filter)
+end
+
+---
+-- Serialize the profile data and
+-- @return serialized data to be saved to a file
+--
+local function serialize_profile(profile, format, filter)
+	if format == "lua" or format == "json" or format == "json_pretty" then
+		local stats = filter and {} or profile.stats
+		if filter then
+			for modname, mod_stats in pairs(profile.stats) do
+				if filter_matches(filter, modname) then
+					stats[modname] = mod_stats
+				end
+			end
+		end
+		if format == "lua" then
+			return core.serialize(stats)
+		elseif format == "json" then
+			return core.write_json(stats)
+		elseif format == "json_pretty" then
+			return core.write_json(stats, true)
+		end
+	end
+	-- Fall back to textual formats.
+	return format_statistics(profile, format, filter)
+end
+
+local worldpath = core.get_worldpath()
+local function get_save_path(format, filter)
+	local report_path = setting_get("profiler.report_path") or ""
+	if report_path ~= "" then
+		core.mkdir(sprintf("%s%s%s", worldpath, DIR_DELIM, report_path))
+	end
+	return (sprintf(
+		"%s/%s/profile-%s%s.%s",
+		worldpath,
+		report_path,
+		os.date("%Y%m%dT%H%M%S"),
+		filter and ("-" .. filter) or "",
+		format
+	):gsub("[/\\]+", DIR_DELIM))-- Clean up delims
+end
+
+---
+-- Save the profile to the world path.
+-- @return success, log message
+--
+function reporter.save(profile, format, filter)
+	if not format or format == "" then
+		format = setting_get("profiler.default_report_format") or "txt"
+	end
+	if filter == "" then
+		filter = nil
+	end
+
+	local path = get_save_path(format, filter)
+
+	local output, io_err = io.open(path, "w")
+	if not output then
+		return false, "Saving of profile failed with: " .. io_err
+	end
+	local content, err = serialize_profile(profile, format, filter)
+	if not content then
+		output:close()
+		return false, "Saving of profile failed with: " .. err
+	end
+	output:write(content)
+	output:close()
+
+	local logmessage = "Profile saved to " .. path
+	core.log("action", logmessage)
+	return true, logmessage
+end
+
+return reporter
diff --git a/builtin/profiler/sampling.lua b/builtin/profiler/sampling.lua
new file mode 100644
index 000000000..1d1ef256d
--- /dev/null
+++ b/builtin/profiler/sampling.lua
@@ -0,0 +1,206 @@
+--Minetest
+--Copyright (C) 2016 T4im
+--
+--This program is free software; you can redistribute it and/or modify
+--it under the terms of the GNU Lesser General Public License as published by
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+local setmetatable = setmetatable
+local pairs, format = pairs, string.format
+local min, max, huge = math.min, math.max, math.huge
+local core = core
+
+local profiler = ...
+-- Split sampler and profile up, to possibly allow for rotation later.
+local sampler = {}
+local profile
+local stats_total
+local logged_time, logged_data
+
+local _stat_mt = {
+	get_time_avg = function(self)
+		return self.time_all/self.samples
+	end,
+	get_part_avg = function(self)
+		if not self.part_all then
+			return 100 -- Extra handling for "total"
+		end
+		return self.part_all/self.samples
+	end,
+}
+_stat_mt.__index = _stat_mt
+
+function sampler.reset()
+	-- Accumulated logged time since last sample.
+	-- This helps determining, the relative time a mod used up.
+	logged_time = 0
+	-- The measurements taken through instrumentation since last sample.
+	logged_data = {}
+
+	profile = {
+		-- Current mod statistics (max/min over the entire mod lifespan)
+		-- Mod specific instrumentation statistics are nested within.
+		stats = {},
+		-- Current stats over all mods.
+		stats_total = setmetatable({
+			samples = 0,
+			time_min = huge,
+			time_max = 0,
+			time_all = 0,
+			part_min = 100,
+			part_max = 100
+		}, _stat_mt)
+	}
+	stats_total = profile.stats_total
+
+	-- Provide access to the most recent profile.
+	sampler.profile = profile
+end
+
+---
+-- Log a measurement for the sampler to pick up later.
+-- Keep `log` and its often called functions lean.
+-- It will directly add to the instrumentation overhead.
+--
+function sampler.log(modname, instrument_name, time_diff)
+	if time_diff <= 0 then
+		if time_diff < 0 then
+			-- This **might** have happened on a semi-regular basis with huge mods,
+			-- resulting in negative statistics (perhaps midnight time jumps or ntp corrections?).
+			core.log("warning", format(
+					"Time travel of %s::%s by %dµs.",
+					modname, instrument_name, time_diff
+			))
+		end
+		-- Throwing these away is better, than having them mess with the overall result.
+		return
+	end
+
+	local mod_data = logged_data[modname]
+	if mod_data == nil then
+		mod_data = {}
+		logged_data[modname] = mod_data
+	end
+
+	mod_data[instrument_name] = (mod_data[instrument_name] or 0) + time_diff
+	-- Update logged time since last sample.
+	logged_time = logged_time + time_diff
+end
+
+---
+-- Return a requested statistic.
+-- Initialize if necessary.
+--
+local function get_statistic(stats_table, name)
+	local statistic = stats_table[name]
+	if statistic == nil then
+		statistic = setmetatable({
+			samples = 0,
+			time_min = huge,
+			time_max = 0,
+			time_all = 0,
+			part_min = 100,
+			part_max = 0,
+			part_all = 0,
+		}, _stat_mt)
+		stats_table[name] = statistic
+	end
+	return statistic
+end
+
+---
+-- Update a statistic table
+--
+local function update_statistic(stats_table, time)
+	stats_table.samples = stats_table.samples + 1
+
+	-- Update absolute time (µs) spend by the subject
+	stats_table.time_min = min(stats_table.time_min, time)
+	stats_table.time_max = max(stats_table.time_max, time)
+	stats_table.time_all = stats_table.time_all + time
+
+	-- Update relative time (%) of this sample spend by the subject
+	local current_part = (time/logged_time) * 100
+	stats_table.part_min = min(stats_table.part_min, current_part)
+	stats_table.part_max = max(stats_table.part_max, current_part)
+	stats_table.part_all = stats_table.part_all + current_part
+end
+
+---
+-- Sample all logged measurements each server step.
+-- Like any globalstep function, this should not be too heavy,
+-- but does not add to the instrumentation overhead.
+--
+local function sample(dtime)
+	-- Rare, but happens and is currently of no informational value.
+	if logged_time == 0 then
+		return
+	end
+
+	for modname, instruments in pairs(logged_data) do
+		local mod_stats = get_statistic(profile.stats, modname)
+		if mod_stats.instruments == nil then
+			-- Current statistics for each instrumentation component
+			mod_stats.instruments = {}
+		end
+
+		local mod_time = 0
+		for instrument_name, time in pairs(instruments) do
+			if time > 0 then
+				mod_time = mod_time + time
+				local instrument_stats = get_statistic(mod_stats.instruments, instrument_name)
+
+				-- Update time of this sample spend by the instrumented function.
+				update_statistic(instrument_stats, time)
+				-- Reset logged data for the next sample.
+				instruments[instrument_name] = 0
+			end
+		end
+
+		-- Update time of this sample spend by this mod.
+		update_statistic(mod_stats, mod_time)
+	end
+
+	-- Update the total time spend over all mods.
+	stats_total.time_min = min(stats_total.time_min, logged_time)
+	stats_total.time_max = max(stats_total.time_max, logged_time)
+	stats_total.time_all = stats_total.time_all + logged_time
+
+	stats_total.samples = stats_total.samples + 1
+	logged_time = 0
+end
+
+---
+-- Setup empty profile and register the sampling function
+--
+function sampler.init()
+	sampler.reset()
+
+	if core.setting_getbool("instrument.profiler") then
+		core.register_globalstep(function()
+			if logged_time == 0 then
+				return
+			end
+			return profiler.empty_instrument()
+		end)
+		core.register_globalstep(profiler.instrument {
+			func = sample,
+			mod = "*profiler*",
+			class = "Sampler (update stats)",
+			label = false,
+		})
+	else
+		core.register_globalstep(sample)
+	end
+end
+
+return sampler
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 0b9d29a33..b5878dfe8 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -790,15 +790,6 @@ movement_gravity (Gravity) float 9.81
 #    -    error: abort on usage of deprecated call (suggested for mod developers).
 deprecated_lua_api_handling (Deprecated Lua API handling) enum legacy legacy,log,error
 
-#    Useful for mod developers.
-mod_profiling (Mod profiling) bool false
-
-#    Detailed mod profile data. Useful for mod developers.
-detailed_profiling (Detailed mod profiling) bool false
-
-#    Profiler data print interval. 0 = disable. Useful for developers.
-profiler_print_interval (Profiling print interval) int 0
-
 #    Number of extra blocks that can be loaded by /clearobjects at once.
 #    This is a trade-off between sqlite transaction overhead and
 #    memory consumption (4096=100MB, as a rule of thumb).
@@ -1163,6 +1154,51 @@ secure.trusted_mods (Trusted mods) string
 #	allow them to upload and download data to/from the internet.
 secure.http_mods (HTTP Mods) string
 
+[*Advanced]
+
+[**Profiling]
+#    Load the game profiler to collect game profiling data.
+#    Provides a /profiler command to access the compiled profile.
+#    Useful for mod developers and server operators.
+profiler.load (Load the game profiler) bool false
+
+#    The default format in which profiles are being saved,
+#    when calling `/profiler save [format]` without format.
+profiler.default_report_format (Default report format) enum txt txt,csv,lua,json,json_pretty
+
+#    The file path relative to your worldpath in which profiles will be saved to.
+#
+profiler.report_path (Report path) string ""
+
+[***Instrumentation]
+
+#    Instrument the methods of entities on registration.
+instrument.entity (Entity methods) bool true
+
+#    Instrument the action function of Active Block Modifiers on registration.
+instrument.abm (Active Block Modifiers) bool true
+
+#    Instrument the action function of Loading Block Modifiers on registration.
+instrument.lbm (Loading Block Modifiers) bool true
+
+#    Instrument chatcommands on registration.
+instrument.chatcommand (Chatcommands) bool true
+
+#    Instrument global callback functions on registration.
+#    (anything you pass to a minetest.register_*() function)
+instrument.global_callback (Global callbacks) bool true
+
+[****Advanced]
+#    Instrument builtin.
+#    This is usually only needed by core/builtin contributors
+instrument.builtin (Builtin) bool false
+
+#    Have the profiler instrument itself:
+#     * Instrument an empty function.
+#       This estimates the overhead, that instrumentation is adding (+1 function call).
+#     * Instrument the sampler being used to update the statistics.
+instrument.profiler (Profiler) bool false
+
 [Client and Server]
 
 #    Name of the player.
@@ -1218,3 +1254,6 @@ modstore_download_url (Modstore download URL) string https://forum.minetest.net/
 modstore_listmods_url (Modstore mods list URL) string https://forum.minetest.net/mmdb/mods/
 
 modstore_details_url (Modstore details URL) string https://forum.minetest.net/mmdb/mod/*/
+
+#    Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers.
+profiler_print_interval (Engine profiling data print interval) int 0
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 12b0a9299..e1077a2bb 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3423,6 +3423,9 @@ Definition tables
 ### ABM (ActiveBlockModifier) definition (`register_abm`)
 
     {
+        label = "Lava cooling",
+    --  ^ Descriptive label for profiling purposes (optional).
+    --    Definitions with identical labels will be listed as one.
     --  In the following two fields, also group:groupname will work.
         nodenames = {"default:lava_source"},
         neighbors = {"default:water_source", "default:water_flowing"}, -- Any of these --[[
@@ -3439,6 +3442,9 @@ Definition tables
 ### LBM (LoadingBlockModifier) definition (`register_lbm`)
 
     {
+        label = "Upgrade legacy doors",
+    --  ^ Descriptive label for profiling purposes (optional).
+    --    Definitions with identical labels will be listed as one.
         name = "modname:replace_legacy_door",
         nodenames = {"default:lava_source"},
     --  ^ List of node names to trigger the LBM on.

From 6621daee504bbc6755e0240a5515e16f56199197 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Tue, 12 Jul 2016 22:45:34 +0200
Subject: [PATCH 109/418] HTTP lua API docs: correct some function references

---
 doc/lua_api.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index e1077a2bb..1b38aeb6f 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2439,7 +2439,7 @@ These functions return the leftover itemstack.
     * callback: `function(HTTPRequestResult res)`
     * Use this HTTP function if you are unsure, the others are for advanced use.
 * `HTTPApiTable.fetch_async(HTTPRequest req)`: returns handle
-    * Performs given request asynchronously and returns handle for `minetest.http_fetch_async_get`
+    * Performs given request asynchronously and returns handle for `HTTPApiTable.fetch_async_get`
 * `HTTPApiTable.fetch_async_get(handle)`: returns HTTPRequestResult
     * Return response data for given asynchronous HTTP request
 
@@ -4031,7 +4031,7 @@ The Biome API is still in an experimental phase and subject to change.
     --  ^ Playername is optional, if specified spawns particle only on the player's client
     }
 
-### `HTTPRequest` definition (`http_fetch`, `http_fetch_async`)
+### `HTTPRequest` definition (`HTTPApiTable.fetch_async`, `HTTPApiTable.fetch_async`)
 
     {
         url = "http://example.org",
@@ -4051,7 +4051,7 @@ The Biome API is still in an experimental phase and subject to change.
      -- ^ Optional, if true performs a multipart HTTP request. Default is false.
     }
 
-### `HTTPRequestResult` definition (`http_fetch` callback, `http_fetch_async_get`)
+### `HTTPRequestResult` definition (`HTTPApiTable.fetch` callback, `HTTPApiTable.fetch_async_get`)
 
     {
         completed = true,

From 97c763158c3efd733bca1b4b46fb82c135df09f7 Mon Sep 17 00:00:00 2001
From: James Stevenson <everamzah@gmail.com>
Date: Thu, 14 Jul 2016 10:07:40 -0400
Subject: [PATCH 110/418] lua_api.txt: Remove tooltip checkbox[] element

---
 doc/lua_api.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 1b38aeb6f..8656e43e6 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1596,13 +1596,12 @@ examples.
 * Items to be shown in dropdown
 * Index of currently selected dropdown item
 
-#### `checkbox[<X>,<Y>;<name>;<label>;<selected>;<tooltip>]`
+#### `checkbox[<X>,<Y>;<name>;<label>;<selected>]`
 * Show a checkbox
 * `x` and `y`: position of checkbox
 * `name` fieldname data is transferred to Lua
 * `label` to be shown left of checkbox
 * `selected` (optional): `true`/`false`
-* `tooltip` (optional)
 
 #### `scrollbar[<X>,<Y>;<W>,<H>;<orientation>;<name>;<value>]`
 * Show a scrollbar

From 2ba8ad1dfe2698cf9820a6dde3b40423cd719ddf Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 20 Jul 2016 00:23:08 +0100
Subject: [PATCH 111/418] Mgvalleys / cavegen: Place riverbed nodes under river
 water

When a CavesNoiseIntersection tunnel intersects a river place biome
'riverbed' nodes in tunnel entrance instead of biome 'top' nodes.
---
 src/cavegen.cpp        | 13 +++++++++++--
 src/mapgen_valleys.cpp | 16 +++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/cavegen.cpp b/src/cavegen.cpp
index dc7355fe0..bb6aa25a6 100644
--- a/src/cavegen.cpp
+++ b/src/cavegen.cpp
@@ -79,6 +79,7 @@ void CavesNoiseIntersection::generateCaves(MMVManip *vm,
 	for (s16 z = nmin.Z; z <= nmax.Z; z++)
 	for (s16 x = nmin.X; x <= nmax.X; x++, index2d++) {
 		bool column_is_open = false;  // Is column open to overground
+		bool is_under_river = false;  // Is column under river water
 		bool is_tunnel = false;  // Is tunnel or tunnel floor
 		u32 vi = vm->m_area.index(x, nmax.Y, z);
 		u32 index3d = (z - nmin.Z) * m_zstride_1d + m_csize.Y * m_ystride +
@@ -99,6 +100,10 @@ void CavesNoiseIntersection::generateCaves(MMVManip *vm,
 					c == biome->c_water) {
 				column_is_open = true;
 				continue;
+			} else if (c == biome->c_river_water) {
+				column_is_open = true;
+				is_under_river = true;
+				continue;
 			}
 			// Ground
 			float d1 = contour(noise_cave1->result[index3d]);
@@ -111,9 +116,13 @@ void CavesNoiseIntersection::generateCaves(MMVManip *vm,
 			} else {
 				// Not in tunnel or not ground content
 				if (is_tunnel && column_is_open &&
-						(c == biome->c_filler || c == biome->c_stone))
+						(c == biome->c_filler || c == biome->c_stone)) {
 					// Tunnel entrance floor
-					vm->m_data[vi] = MapNode(biome->c_top);
+					if (is_under_river)
+						vm->m_data[vi] = MapNode(biome->c_riverbed);
+					else
+						vm->m_data[vi] = MapNode(biome->c_top);
+				}
 
 				column_is_open = false;
 				is_tunnel = false;
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index a61f1b329..456e6aa1a 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -665,6 +665,7 @@ void MapgenValleys::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 	for (s16 x = node_min.X; x <= node_max.X; x++, index_2d++) {
 		Biome *biome = (Biome *)m_bmgr->getRaw(biomemap[index_2d]);
 		bool tunnel_air_above = false;
+		bool is_under_river = false;
 		bool underground = false;
 		u32 index_data = vm->m_area.index(x, node_max.Y, z);
 		u32 index_3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride + (x - node_min.X);
@@ -696,14 +697,13 @@ void MapgenValleys::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 			}
 
 			content_t c = vm->m_data[index_data].getContent();
+			// Detect river water to place riverbed nodes in tunnels
+			if (c == biome->c_river_water)
+				is_under_river = true;
+
 			float d1 = contour(noise_cave1->result[index_3d]);
 			float d2 = contour(noise_cave2->result[index_3d]);
 
-			// River water is not set as ground content
-			// in the default game. This can produce strange results
-			// when a tunnel undercuts a river. However, that's not for
-			// the mapgen to correct. Fix it in lua.
-
 			if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) {
 				// in a tunnel
 				vm->m_data[index_data] = n_air;
@@ -716,8 +716,10 @@ void MapgenValleys::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 					vm->m_area.add_y(em, j, 1);
 
 					if (sr > terrain - y) {
-						// Put dirt in tunnels near the surface.
-						if (underground)
+						// Put biome nodes in tunnels near the surface
+						if (is_under_river)
+							vm->m_data[index_data] = MapNode(biome->c_riverbed);
+						else if (underground)
 							vm->m_data[index_data] = MapNode(biome->c_filler);
 						else
 							vm->m_data[index_data] = MapNode(biome->c_top);

From f833159a68f2ff605224ed7a5ac956e5a0ca42d8 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Sun, 24 Jul 2016 17:41:36 +0200
Subject: [PATCH 112/418] Update minetest.conf.example and the settings
 translation file

---
 minetest.conf.example             | 73 ++++++++++++++++++++++++++-----
 src/settings_translation_file.cpp | 32 +++++++++++---
 2 files changed, 87 insertions(+), 18 deletions(-)

diff --git a/minetest.conf.example b/minetest.conf.example
index 704501f36..139909d29 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -973,18 +973,6 @@
 #    type: enum values: legacy, log, error
 # deprecated_lua_api_handling = legacy
 
-#    Useful for mod developers.
-#    type: bool
-# mod_profiling = false
-
-#    Detailed mod profile data. Useful for mod developers.
-#    type: bool
-# detailed_profiling = false
-
-#    Profiler data print interval. 0 = disable. Useful for developers.
-#    type: int
-# profiler_print_interval = 0
-
 #    Number of extra blocks that can be loaded by /clearobjects at once.
 #    This is a trade-off between sqlite transaction overhead and
 #    memory consumption (4096=100MB, as a rule of thumb).
@@ -1476,6 +1464,63 @@
 #    type: string
 # secure.http_mods =
 
+## Advanced
+
+### Profiling
+
+#    Load the game profiler to collect game profiling data.
+#    Provides a /profiler command to access the compiled profile.
+#    Useful for mod developers and server operators.
+#    type: bool
+# profiler.load = false
+
+#    The default format in which profiles are being saved,
+#    when calling `/profiler save [format]` without format.
+#    type: enum values: txt, csv, lua, json, json_pretty
+# profiler.default_report_format = txt
+
+#    The file path relative to your worldpath in which profiles will be saved to.
+#    
+#    type: string
+# profiler.report_path = ""
+
+#### Instrumentation
+
+#    Instrument the methods of entities on registration.
+#    type: bool
+# instrument.entity = true
+
+#    Instrument the action function of Active Block Modifiers on registration.
+#    type: bool
+# instrument.abm = true
+
+#    Instrument the action function of Loading Block Modifiers on registration.
+#    type: bool
+# instrument.lbm = true
+
+#    Instrument chatcommands on registration.
+#    type: bool
+# instrument.chatcommand = true
+
+#    Instrument global callback functions on registration.
+#    (anything you pass to a minetest.register_*() function)
+#    type: bool
+# instrument.global_callback = true
+
+##### Advanced
+
+#    Instrument builtin.
+#    This is usually only needed by core/builtin contributors
+#    type: bool
+# instrument.builtin = false
+
+#    Have the profiler instrument itself:
+#    * Instrument an empty function.
+#    This estimates the overhead, that instrumentation is adding (+1 function call).
+#    * Instrument the sampler being used to update the statistics.
+#    type: bool
+# instrument.profiler = false
+
 #
 # Client and Server
 #
@@ -1548,3 +1593,7 @@
 #    type: string
 # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/
 
+#    Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers.
+#    type: int
+# profiler_print_interval = 0
+
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index 78d1c799f..3e82279cd 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -405,12 +405,6 @@ fake_function() {
 	gettext("Advanced");
 	gettext("Deprecated Lua API handling");
 	gettext("Handling for deprecated lua api calls:\n-    legacy: (try to) mimic old behaviour (default for release).\n-    log: mimic and log backtrace of deprecated call (default for debug).\n-    error: abort on usage of deprecated call (suggested for mod developers).");
-	gettext("Mod profiling");
-	gettext("Useful for mod developers.");
-	gettext("Detailed mod profiling");
-	gettext("Detailed mod profile data. Useful for mod developers.");
-	gettext("Profiling print interval");
-	gettext("Profiler data print interval. 0 = disable. Useful for developers.");
 	gettext("Max. clearobjects extra blocks");
 	gettext("Number of extra blocks that can be loaded by /clearobjects at once.\nThis is a trade-off between sqlite transaction overhead and\nmemory consumption (4096=100MB, as a rule of thumb).");
 	gettext("Unload unused server data");
@@ -600,6 +594,30 @@ fake_function() {
 	gettext("Comma-separated list of trusted mods that are allowed to access insecure\nfunctions even when mod security is on (via request_insecure_environment()).");
 	gettext("HTTP Mods");
 	gettext("Comma-seperated list of mods that are allowed to access HTTP APIs, which\nallow them to upload and download data to/from the internet.");
+	gettext("Advanced");
+	gettext("Profiling");
+	gettext("Load the game profiler");
+	gettext("Load the game profiler to collect game profiling data.\nProvides a /profiler command to access the compiled profile.\nUseful for mod developers and server operators.");
+	gettext("Default report format");
+	gettext("The default format in which profiles are being saved,\nwhen calling `/profiler save [format]` without format.");
+	gettext("Report path");
+	gettext("The file path relative to your worldpath in which profiles will be saved to.\n");
+	gettext("Instrumentation");
+	gettext("Entity methods");
+	gettext("Instrument the methods of entities on registration.");
+	gettext("Active Block Modifiers");
+	gettext("Instrument the action function of Active Block Modifiers on registration.");
+	gettext("Loading Block Modifiers");
+	gettext("Instrument the action function of Loading Block Modifiers on registration.");
+	gettext("Chatcommands");
+	gettext("Instrument chatcommands on registration.");
+	gettext("Global callbacks");
+	gettext("Instrument global callback functions on registration.\n(anything you pass to a minetest.register_*() function)");
+	gettext("Advanced");
+	gettext("Builtin");
+	gettext("Instrument builtin.\nThis is usually only needed by core/builtin contributors");
+	gettext("Profiler");
+	gettext("Have the profiler instrument itself:\n* Instrument an empty function.\nThis estimates the overhead, that instrumentation is adding (+1 function call).\n* Instrument the sampler being used to update the statistics.");
 	gettext("Client and Server");
 	gettext("Player name");
 	gettext("Name of the player.\nWhen running a server, clients connecting with this name are admins.\nWhen starting from the main menu, this is overridden.");
@@ -625,4 +643,6 @@ fake_function() {
 	gettext("Modstore download URL");
 	gettext("Modstore mods list URL");
 	gettext("Modstore details URL");
+	gettext("Engine profiling data print interval");
+	gettext("Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers.");
 }

From 58eb5f39d4e57fd9c7409efade54b5792dfefab3 Mon Sep 17 00:00:00 2001
From: Tim <t4im@users.noreply.github.com>
Date: Thu, 7 Jul 2016 23:58:52 +0200
Subject: [PATCH 113/418] Builtin: Fix check for a player object in
 core.check_player_privs

core.check_player_privs accepts as first argument a name or player object, but just tested for a string.
This caused crashes inside builtin, when being passed any unexpected types.

This provides a better (duck-typing like) test, better error reporting.
---
 builtin/game/misc.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 918315656..4773e0012 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -48,11 +48,13 @@ function core.after(after, func, ...)
 	}
 end
 
-function core.check_player_privs(player_or_name, ...)
-	local name = player_or_name
-	-- Check if we have been provided with a Player object.
-	if type(name) ~= "string" then
+function core.check_player_privs(name, ...)
+	local arg_type = type(name)
+	if (arg_type == "userdata" or arg_type == "table") and
+			name.get_player_name then -- If it quacks like a Player...
 		name = name:get_player_name()
+	elseif arg_type ~= "string" then
+		error("Invalid core.check_player_privs argument type: " .. arg_type, 2)
 	end
 	
 	local requested_privs = {...}

From c8b4bedaa89ac5246161b1bb9e3826dcce083fcf Mon Sep 17 00:00:00 2001
From: Tim <t4im@users.noreply.github.com>
Date: Sat, 23 Jul 2016 13:29:53 +0200
Subject: [PATCH 114/418] Builtin: Add core.MAP_BLOCKSIZE constant

---
 builtin/game/constants.lua    | 5 +++++
 builtin/game/forceloading.lua | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/builtin/game/constants.lua b/builtin/game/constants.lua
index d0b7c753c..56fca9289 100644
--- a/builtin/game/constants.lua
+++ b/builtin/game/constants.lua
@@ -4,14 +4,19 @@
 -- Constants values for use with the Lua API
 --
 
+-- mapnode.h
 -- Built-in Content IDs (for use with VoxelManip API)
 core.CONTENT_UNKNOWN = 125
 core.CONTENT_AIR     = 126
 core.CONTENT_IGNORE  = 127
 
+-- emerge.h
 -- Block emerge status constants (for use with core.emerge_area)
 core.EMERGE_CANCELLED   = 0
 core.EMERGE_ERRORED     = 1
 core.EMERGE_FROM_MEMORY = 2
 core.EMERGE_FROM_DISK   = 3
 core.EMERGE_GENERATED   = 4
+
+-- constants.h
+core.MAP_BLOCKSIZE = 16
diff --git a/builtin/game/forceloading.lua b/builtin/game/forceloading.lua
index 8c9fbf512..468572e6e 100644
--- a/builtin/game/forceloading.lua
+++ b/builtin/game/forceloading.lua
@@ -7,7 +7,7 @@ core.forceload_free_block = nil
 local blocks_forceloaded
 local total_forceloaded = 0
 
-local BLOCKSIZE = 16
+local BLOCKSIZE = core.MAP_BLOCKSIZE
 local function get_blockpos(pos)
 	return {
 		x = math.floor(pos.x/BLOCKSIZE),

From 2cb0f649f4429ffda9dbc2f8ef81d9a29914ec20 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 25 Jul 2016 22:52:42 +0200
Subject: [PATCH 115/418] Main menu, lua_api.txt: Fix mod/texture pack
 screenshot size issues

Recommend mod screenshot size in lua_api.txt
Adjust displayed screenshot size of texture packs
Document texture pack files in lua_api.txt
---
 builtin/mainmenu/tab_texturepacks.lua |   4 +--
 doc/lua_api.txt                       |  37 +++++++++++++++++++++++++-
 textures/base/pack/no_screenshot.png  | Bin 140 -> 586 bytes
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/builtin/mainmenu/tab_texturepacks.lua b/builtin/mainmenu/tab_texturepacks.lua
index a102fd61d..4614a2974 100644
--- a/builtin/mainmenu/tab_texturepacks.lua
+++ b/builtin/mainmenu/tab_texturepacks.lua
@@ -96,8 +96,8 @@ local function get_formspec(tabview, name, tabdata)
 	return	retval ..
 			render_texture_pack_list(list) ..
 			";" .. index .. "]" ..
-			"image[0.25,0.25;4.0,3.7;" .. core.formspec_escape(screenfile or no_screenshot) .. "]" ..
-			"textarea[0.6,3.5;3.7,1.5;;" .. core.formspec_escape(infotext or "") .. ";]"
+			"image[0.25,0.25;4.05,2.7;" .. core.formspec_escape(screenfile or no_screenshot) .. "]" ..
+			"textarea[0.6,2.85;3.7,1.5;;" .. core.formspec_escape(infotext or "") .. ";]"
 end
 
 --------------------------------------------------------------------------------
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 8656e43e6..4a7a3c0a0 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -157,7 +157,8 @@ to a single modname. Their meaning is that if the specified mod
 is missing, that does not prevent this mod from being loaded.
 
 ### `screenshot.png`
-A screenshot shown in modmanager within mainmenu.
+A screenshot shown in the mod manager within the main menu. It should
+have an aspect ratio of 3:2 and a minimum size of 300×200 pixels.
 
 ### `description.txt`
 A File containing description to be shown within mainmenu.
@@ -234,6 +235,40 @@ stripping out the file extension:
 * e.g. `foomod_foothing.png`
 * e.g. `foomod_foothing`
 
+Texture pack directory structure
+--------------------------------
+
+    textures
+    |-- Texture Pack
+    |   |-- screenshot.png
+    |   |-- description.txt
+    |   |-- your_texture_1.png
+    |   |-- your_texture_2.png
+    `-- Another Texture Pack
+
+### Texture Pack
+This is a directory containing the entire contents of a single texture pack.
+It can be chosen more or less freely and will also become the name of the
+texture pack. The name must not be “base”.
+
+### `description.txt`
+A file containing a short description of the texture pack to be shown in the
+texture packs tab.
+
+### `screenshot.png`
+A preview image showing an in-game screenshot of this texture pack; it will be
+shown in the texture packs tab. It should have an aspect ratio of 3:2 and a
+minimum size of 300×200 pixels.
+
+### `your_texture_1.png`, `your_texture_2.png`, etc.
+Any other PNG files will be interpreted as textures. They must have the same
+names as the textures they are supposed to override. For example, to override
+the apple texture of Minetest Game, add a PNG file named `default_apple.png`.
+
+The custom textures do not necceessarily require the same size as their
+originals, but this might be required for a few particular textures. When
+unsure, just test your texture pack in-game.
+
 Texture modifiers
 -----------------
 There are various texture modifiers that can be used
diff --git a/textures/base/pack/no_screenshot.png b/textures/base/pack/no_screenshot.png
index fbaacc9b0921dc6c13d8a0fbcbccfcfeb748bf89..8c7089897218a4aa453493ad6d25e360501dfc5a 100644
GIT binary patch
literal 586
zcmeAS@N?(olHy`uVBq!ia0y~yVAKJ!PjIjR$sgB5?g1&r;vjb?hIQv;UIIBxN#5=*
z46WwzA#;H|&H|6fVg?3oVGw3ym^DWND9B#o>Fdh=fL&6=&|34x1X-X7=R92;Ln>~)
zz3a$#NI}HG(O}Mu=7Q8aTV_W!&f3OVmX_=je)PF}FQ?%F|5u+R%GdAH5eOF$JLD9>
z!QIljK|qXyJMm-0@BPQyXX)}bcXhU|6-YeTe&r`en9jwUx9ZJjzOXBLZRewt(+X7B
z2vmQFDN#|Ug%!mBMIEq-3OYa&9e@TCr7*!`6HAX}nb8`son#q7v|U&f`si-e57%z#
z1ckwzf0Ei!iasPcAB&NQ5LMKP`05vNc3Ow8@Z9HWV%wZrSRcL?Tvb|pGxOW_{VZx?
tGXKJU+<&hHv=S1MiIGgeu&dZ+esB^$*Y|&yHv%J@!PC{xWt~$(69CRl!ZrW^

literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^CxCbwBQua(C=?n6q}T#{LR^9L|NsA&-kg6I$YLr9
z@(X4tIx*v}29Rg$>Eakt5%>1GAuof10L#H(CbNlt>}+=Nf~#(piR9ce@xNN9rySZX
k;KZTWBH(0K>p5LdaO1bcstGoWf!Y~7UHx3vIVCg!01#Iw!vFvP


From 8a98cbda8417c713e03d1ac0be80e88cd2f08a0c Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Tue, 26 Jul 2016 14:39:03 +0200
Subject: [PATCH 116/418] Upright sprite objects: Horizontally flip the front
 image

For consistent horizontal sprite structure when seen from front and back
Fix code style
---
 src/content_cao.cpp | 84 +++++++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 44 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index eeb85c8a6..f414b2b9b 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -839,54 +839,50 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr,
 			setBillboardTextureMatrix(m_spritenode,
 					txs, tys, 0, 0);
 		}
-	}
-	else if(m_prop.visual == "upright_sprite") {
+	} else if (m_prop.visual == "upright_sprite") {
 		scene::SMesh *mesh = new scene::SMesh();
-		double dx = BS*m_prop.visual_size.X/2;
-		double dy = BS*m_prop.visual_size.Y/2;
-		{ // Front
-		scene::IMeshBuffer *buf = new scene::SMeshBuffer();
+		double dx = BS * m_prop.visual_size.X / 2;
+		double dy = BS * m_prop.visual_size.Y / 2;
 		u8 li = m_last_light;
-		video::SColor c(255,li,li,li);
-		video::S3DVertex vertices[4] =
-		{
-			video::S3DVertex(-dx,-dy,0, 0,0,0, c, 0,1),
-			video::S3DVertex(dx,-dy,0, 0,0,0, c, 1,1),
-			video::S3DVertex(dx,dy,0, 0,0,0, c, 1,0),
-			video::S3DVertex(-dx,dy,0, 0,0,0, c, 0,0),
-		};
-		u16 indices[] = {0,1,2,2,3,0};
-		buf->append(vertices, 4, indices, 6);
-		// Set material
-		buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-		buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-		buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-		buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-		// Add to mesh
-		mesh->addMeshBuffer(buf);
-		buf->drop();
+		video::SColor c(255, li, li, li);
+
+		{ // Front
+			scene::IMeshBuffer *buf = new scene::SMeshBuffer();
+			video::S3DVertex vertices[4] = {
+				video::S3DVertex(-dx, -dy, 0, 0,0,0, c, 1,1),
+				video::S3DVertex( dx, -dy, 0, 0,0,0, c, 0,1),
+				video::S3DVertex( dx,  dy, 0, 0,0,0, c, 0,0),
+				video::S3DVertex(-dx,  dy, 0, 0,0,0, c, 1,0),
+			};
+			u16 indices[] = {0,1,2,2,3,0};
+			buf->append(vertices, 4, indices, 6);
+			// Set material
+			buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
+			buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
+			buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
+			buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+			// Add to mesh
+			mesh->addMeshBuffer(buf);
+			buf->drop();
 		}
 		{ // Back
-		scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-		u8 li = m_last_light;
-		video::SColor c(255,li,li,li);
-		video::S3DVertex vertices[4] =
-		{
-			video::S3DVertex(dx,-dy,0, 0,0,0, c, 1,1),
-			video::S3DVertex(-dx,-dy,0, 0,0,0, c, 0,1),
-			video::S3DVertex(-dx,dy,0, 0,0,0, c, 0,0),
-			video::S3DVertex(dx,dy,0, 0,0,0, c, 1,0),
-		};
-		u16 indices[] = {0,1,2,2,3,0};
-		buf->append(vertices, 4, indices, 6);
-		// Set material
-		buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-		buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-		buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-		buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-		// Add to mesh
-		mesh->addMeshBuffer(buf);
-		buf->drop();
+			scene::IMeshBuffer *buf = new scene::SMeshBuffer();
+			video::S3DVertex vertices[4] = {
+				video::S3DVertex( dx,-dy, 0, 0,0,0, c, 1,1),
+				video::S3DVertex(-dx,-dy, 0, 0,0,0, c, 0,1),
+				video::S3DVertex(-dx, dy, 0, 0,0,0, c, 0,0),
+				video::S3DVertex( dx, dy, 0, 0,0,0, c, 1,0),
+			};
+			u16 indices[] = {0,1,2,2,3,0};
+			buf->append(vertices, 4, indices, 6);
+			// Set material
+			buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
+			buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
+			buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
+			buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+			// Add to mesh
+			mesh->addMeshBuffer(buf);
+			buf->drop();
 		}
 		m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
 		m_meshnode->grab();

From 919d9d791c7dd2336792c5569a0604b062c8adc8 Mon Sep 17 00:00:00 2001
From: Ner'zhul <nerzhul@users.noreply.github.com>
Date: Thu, 28 Jul 2016 13:13:25 +0200
Subject: [PATCH 117/418] Increase android versionCode (#4350)

This little update is due to a packaging problem when uploading on play store. They don't permit to re upload an APK with same version code.
This case was a fail on openssl packaged version which was old and rejected by Google but they don't remove the APK then i should increase the version code to permit having it on play store
---
 build/android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/android/build.gradle b/build/android/build.gradle
index 391e250ad..e0a0a186a 100644
--- a/build/android/build.gradle
+++ b/build/android/build.gradle
@@ -14,7 +14,7 @@ android {
 	buildToolsVersion "23.0.3"
 
 	defaultConfig {
-		versionCode 14
+		versionCode 15
 		versionName "${System.env.VERSION_STR}.${versionCode}"
 		minSdkVersion 9
 		targetSdkVersion 9

From 6b74e196aec228aa0de8852f784f4bc8904c14e2 Mon Sep 17 00:00:00 2001
From: Fernando Carmona Varo <ferkiwi@gmail.com>
Date: Sun, 24 Jul 2016 14:01:20 +0200
Subject: [PATCH 118/418] buildbot: retrieve short commit hash properly

Instead of trying to manually parse the output of 'git show' which can be different across different git configurations, properly use the 'git rev-parse' command that is intended for this purpose.
---
 util/buildbot/buildwin32.sh | 2 +-
 util/buildbot/buildwin64.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index 78d189b87..a1132a90a 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -81,7 +81,7 @@ else
 	[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
 fi
 cd minetest
-git_hash=`git show | head -c14 | tail -c7`
+git_hash=$(git rev-parse --short HEAD)
 
 # Get minetest_game
 cd games
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index e13cbd024..897f15ea8 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -76,7 +76,7 @@ else
 	[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
 fi
 cd minetest
-git_hash=`git show | head -c14 | tail -c7`
+git_hash=$(git rev-parse --short HEAD)
 
 # Get minetest_game
 cd games

From cc01c3cb4d3725e0d96238fed5f69c17a7046c6d Mon Sep 17 00:00:00 2001
From: Nathaniel Olsen <NateTenn5123@Gmail.com>
Date: Fri, 29 Jul 2016 16:37:06 -0500
Subject: [PATCH 119/418] Update README.txt (#4368)

* Update README.txt

As of Ubuntu 16.10, libpng12-dev is replaced with libpng12-0, since libpng12-0 is available in 16.04 repositories, I think that needed to be changed.

Also I changed 'git-core' to 'git' for fedora users, keep it consistent with the ubuntu/debian instructions.

* Update README.txt
---
 README.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.txt b/README.txt
index 352f4628b..2963614e9 100644
--- a/README.txt
+++ b/README.txt
@@ -103,7 +103,7 @@ Compiling on GNU/Linux:
 -----------------------
 
 Install dependencies. Here's an example for Debian/Ubuntu:
-$ sudo apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+$ sudo apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
 For Fedora users:
 $ sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl* openal* libvorbis* libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel bzip2-libs gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel doxygen spatialindex-devel bzip2-devel
@@ -114,7 +114,7 @@ This is an example for installing git on Debian/Ubuntu:
 $ sudo apt-get install git
 
 For Fedora users:
-$ sudo dnf install git-core
+$ sudo dnf install git
 
 Download source (this is the URL to the latest of source repository, which might not work at all times) using git:
 $ git clone --depth 1 https://github.com/minetest/minetest.git

From 573b50ab2c964466c67739406c7eae0dd302b106 Mon Sep 17 00:00:00 2001
From: mtango688 <mtango688@gmail.com>
Date: Thu, 28 Jul 2016 15:40:23 -0600
Subject: [PATCH 120/418] lua_api.txt: Document how to properly clear node
 metadata

---
 doc/lua_api.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 4a7a3c0a0..5a2f370ef 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2641,6 +2641,7 @@ Can be gotten via `minetest.get_meta(pos)`.
 * `get_inventory()`: returns `InvRef`
 * `to_table()`: returns `nil` or `{fields = {...}, inventory = {list1 = {}, ...}}`
 * `from_table(nil or {})`
+    * to clear metadata, use from_table(nil)
     * See "Node Metadata"
 
 ### `NodeTimerRef`

From 927adf9bdd2620789d09f29f122fe7cf032226b2 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Fri, 29 Jul 2016 15:39:36 +0100
Subject: [PATCH 121/418] Documentation: Create texture_packs.txt

Combine texture_overrides.txt and sections of lua_api.txt
---
 doc/lua_api.txt           | 36 +-----------------
 doc/texture_overrides.txt | 35 ------------------
 doc/texture_packs.txt     | 77 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 70 deletions(-)
 delete mode 100644 doc/texture_overrides.txt
 create mode 100644 doc/texture_packs.txt

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 5a2f370ef..ce40e082c 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -235,40 +235,6 @@ stripping out the file extension:
 * e.g. `foomod_foothing.png`
 * e.g. `foomod_foothing`
 
-Texture pack directory structure
---------------------------------
-
-    textures
-    |-- Texture Pack
-    |   |-- screenshot.png
-    |   |-- description.txt
-    |   |-- your_texture_1.png
-    |   |-- your_texture_2.png
-    `-- Another Texture Pack
-
-### Texture Pack
-This is a directory containing the entire contents of a single texture pack.
-It can be chosen more or less freely and will also become the name of the
-texture pack. The name must not be “base”.
-
-### `description.txt`
-A file containing a short description of the texture pack to be shown in the
-texture packs tab.
-
-### `screenshot.png`
-A preview image showing an in-game screenshot of this texture pack; it will be
-shown in the texture packs tab. It should have an aspect ratio of 3:2 and a
-minimum size of 300×200 pixels.
-
-### `your_texture_1.png`, `your_texture_2.png`, etc.
-Any other PNG files will be interpreted as textures. They must have the same
-names as the textures they are supposed to override. For example, to override
-the apple texture of Minetest Game, add a PNG file named `default_apple.png`.
-
-The custom textures do not necceessarily require the same size as their
-originals, but this might be required for a few particular textures. When
-unsure, just test your texture pack in-game.
-
 Texture modifiers
 -----------------
 There are various texture modifiers that can be used
@@ -1997,7 +1963,7 @@ Call these functions only at load time!
 * `minetest.register_privilege(name, definition)`
     * `definition`: `"description text"`
     * `definition`: `{ description = "description text", give_to_singleplayer = boolean}`
-      the default of `give_to_singleplayer` is true 
+      the default of `give_to_singleplayer` is true
     * To allow players with basic_privs to grant, see basic_privs minetest.conf setting.
 * `minetest.register_authentication_handler(handler)`
     * See `minetest.builtin_auth_handler` in `builtin.lua` for reference
diff --git a/doc/texture_overrides.txt b/doc/texture_overrides.txt
deleted file mode 100644
index 1a4e11a3c..000000000
--- a/doc/texture_overrides.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Texture Overrides
-=================
-
-You can override the textures of a node from a texture pack using
-texture overrides. To do this, create a file in a texture pack
-called override.txt
-
-Basic Format
-------------
-
-Each line in an override.txt file is a rule. It consists of
-
-	nodename face-selector texture
-
-For example,
-
-	default:dirt_with_grass sides default_stone.png
-
-You can use ^ operators as usual:
-
-	default:dirt_with_grass sides default_stone.png^[brighten
-
-Face Selectors
---------------
-
-| face-selector | behavior                                          |
-|---------------|---------------------------------------------------|
-| left          | x-                                                |
-| right         | x+                                                |
-| front         | z-                                                |
-| back          | z+                                                |
-| top           | y+                                                |
-| bottom        | y-                                                |
-| sides         | x-, x+, z-, z+                                    |
-| all           | All faces. You can also use '*' instead of 'all'. |
diff --git a/doc/texture_packs.txt b/doc/texture_packs.txt
new file mode 100644
index 000000000..44871ebba
--- /dev/null
+++ b/doc/texture_packs.txt
@@ -0,0 +1,77 @@
+Minetest Texture Pack Reference
+===============================
+
+Texture packs allow you to replace textures provided by a mod with your own
+textures.
+
+Texture pack directory structure
+--------------------------------
+
+    textures
+    |-- Texture Pack
+    |   |-- screenshot.png
+    |   |-- description.txt
+    |   |-- override.txt
+    |   |-- your_texture_1.png
+    |   |-- your_texture_2.png
+    `-- Another Texture Pack
+
+### Texture Pack
+This is a directory containing the entire contents of a single texture pack.
+It can be chosen more or less freely and will also become the name of the
+texture pack. The name must not be “base”.
+
+### `description.txt`
+A file containing a short description of the texture pack to be shown in the
+texture packs tab.
+
+### `screenshot.png`
+A preview image showing an in-game screenshot of this texture pack; it will be
+shown in the texture packs tab. It should have an aspect ratio of 3:2 and a
+minimum size of 300×200 pixels.
+
+### `your_texture_1.png`, `your_texture_2.png`, etc.
+Any other PNG files will be interpreted as textures. They must have the same
+names as the textures they are supposed to override. For example, to override
+the apple texture of Minetest Game, add a PNG file named `default_apple.png`.
+
+The custom textures do not necceessarily require the same size as their
+originals, but this might be required for a few particular textures. When
+unsure, just test your texture pack in-game.
+
+Texture modifiers
+-----------------
+
+See lua_api.txt for texture modifiers
+
+Texture Overrides
+-----------------
+
+You can override the textures of a node from a texture pack using
+texture overrides. To do this, create a file in a texture pack
+called override.txt
+
+Each line in an override.txt file is a rule. It consists of
+
+	nodename face-selector texture
+
+For example,
+
+	default:dirt_with_grass sides default_stone.png
+
+You can use ^ operators as usual:
+
+	default:dirt_with_grass sides default_stone.png^[brighten
+
+Here are face selectors you can choose from:
+
+| face-selector | behavior                                          |
+|---------------|---------------------------------------------------|
+| left          | x-                                                |
+| right         | x+                                                |
+| front         | z-                                                |
+| back          | z+                                                |
+| top           | y+                                                |
+| bottom        | y-                                                |
+| sides         | x-, x+, z-, z+                                    |
+| all           | All faces. You can also use '*' instead of 'all'. |

From e559f8714bc2a995fa7867022ef3002107ae1cc6 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Fri, 29 Jul 2016 10:23:09 +0200
Subject: [PATCH 122/418] texture_packs.txt: Document special textures

---
 doc/texture_packs.txt | 81 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/doc/texture_packs.txt b/doc/texture_packs.txt
index 44871ebba..5c535a9f1 100644
--- a/doc/texture_packs.txt
+++ b/doc/texture_packs.txt
@@ -44,6 +44,87 @@ Texture modifiers
 
 See lua_api.txt for texture modifiers
 
+Special textures
+----------------
+
+These texture names are hardcoded into the engine but can also be overwritten
+by texture packs. All existing fallback textures can be found in the directory
+`textures/base/pack`.
+
+### Gameplay textures
+
+* `bubble.png`: the bubble texture when the player is drowning
+
+* `crack_anylength.png`: node overlay texture when digging
+
+* `crosshair.png`
+    * the crosshair texture in the center of the screen. The settings
+      `crosshair_color` and `crosshair_alpha` are used to create a cross
+      when no texture was found
+
+* `halo.png`: used for the node highlighting mesh
+
+* `heart.png`: used to display the health points of the player
+
+* `minimap_mask_round.png`: round minimap mask, white gets replaced by the map
+* `minimap_mask_square.png`: mask used for the square minimap
+* `minimap_overlay_round.png`: overlay texture for the round minimap
+* `minimap_overlay_square.png`: overlay texture for the square minimap
+* `object_marker_red.png`: texture for players on the minimap
+* `player_marker.png`: texture for the own player on the square minimap
+
+* `player.png`: front texture of the 2D upright sprite player
+* `player_back.png`: back texture of the 2D upright sprite player
+
+* `moon.png`: texture of the moon. Default texture is generated by Minetest
+* `moon_tonemap.png`: tonemap to be used when `moon.png` was found
+* `sun.png`: texture of the sun. Default texture is generated by Minetest
+* `sun_tonemap.png`: tonemap to be used when `sun.png` was found
+* `sunrisebg.png`: shown sky texture when the sun rises
+
+* `smoke_puff.png`: texture used when an object died by punching
+
+* `unknown_item.png`: shown texture when an item definition was not found
+* `unknown_node.png`: shown texture when a node definition was not found
+* `unknown_object.png`: shown texture when an entity definition was not found
+
+* `wieldhand.png`: texture of the wieldhand
+
+### Mainmenu textures
+
+* `menu_bg.png`: used as mainmenu background when the clouds are disabled
+* `menu_header.png`: header texture when no texture pack is selected
+
+* `no_screenshot.png`
+    * texture when no screenshot was found for a texture pack or mod
+
+* `server_flags_creative.png`: icon for creative servers
+* `server_flags_damage.png`: icon for enabled damage on servers
+* `server_flags_favorite.png`: icon for your favorite servers
+* `server_flags_pvp.png`: icon for enabled PvP on servers
+
+### Android textures
+
+* `down_arrow.png`
+* `left_arrow.png`
+* `right_arrow.png`
+* `up_arrow.png`
+
+* `drop_btn.png`
+* `fast_btn.png`
+* `fly_btn.png`
+* `jump_btn.png`
+* `noclip_btn.png`
+
+* `camera_btn.png`
+* `chat_btn.png`
+* `inventory_btn.png`
+* `rangeview_btn.png`
+
+* `debug_btn.png`
+* `gear_icon.png`
+* `rare_controls.png`
+
 Texture Overrides
 -----------------
 

From 9edc984b090ca585c0850fa05e0cecac86679638 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 3 Aug 2016 23:20:36 +0200
Subject: [PATCH 123/418] Porting: Fix endless loop if image format is not
 recognized

---
 src/porting.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/porting.cpp b/src/porting.cpp
index 15a18bdfb..acd047232 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -619,7 +619,8 @@ bool setXorgWindowIcon(IrrlichtDevice *device,
 	video::IVideoDriver *v_driver = device->getVideoDriver();
 
 	video::IImageLoader *image_loader = NULL;
-	for (u32 i = v_driver->getImageLoaderCount() - 1; i >= 0; i--) {
+	u32 cnt = v_driver->getImageLoaderCount();
+	for (u32 i = 0; i < cnt; i++) {
 		if (v_driver->getImageLoader(i)->isALoadableFileExtension(icon_file.c_str())) {
 			image_loader = v_driver->getImageLoader(i);
 			break;

From 4ec667190967591727294ebbca0a38259fc006c7 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Thu, 4 Aug 2016 00:29:06 +0200
Subject: [PATCH 124/418] test_map_settings_manager: Fix Wunused-result warning

---
 src/unittest/test_map_settings_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/unittest/test_map_settings_manager.cpp b/src/unittest/test_map_settings_manager.cpp
index b2ad53192..597ec9a31 100644
--- a/src/unittest/test_map_settings_manager.cpp
+++ b/src/unittest/test_map_settings_manager.cpp
@@ -81,7 +81,7 @@ std::string read_file_to_string(const std::string &filepath)
 
 	buf.resize(filesize);
 
-	fread(&buf[0], 1, filesize, f);
+	UASSERTEQ(size_t, fread(&buf[0], 1, filesize, f), 1);
 
 	fclose(f);
 	return buf;

From fca8e53842718f7f23e11587ae6235c072892b97 Mon Sep 17 00:00:00 2001
From: Dorian Wouters <elementw@openmailbox.org>
Date: Thu, 4 Aug 2016 00:41:54 +0200
Subject: [PATCH 125/418] Fix l_request_insecure_environment not ignoring all
 whitespace (#4395)

l_request_insecure_environment didn't ignore all whitespace in the
secure.trusted_mods config option.

Replaces std::remove with std::remove_if and the isspace function.
---
 src/script/lua_api/l_util.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index d090fc91c..95a5fc4d1 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -446,8 +446,9 @@ int ModApiUtil::l_request_insecure_environment(lua_State *L)
 	// Check secure.trusted_mods
 	const char *mod_name = lua_tostring(L, -1);
 	std::string trusted_mods = g_settings->get("secure.trusted_mods");
-	trusted_mods.erase(std::remove(trusted_mods.begin(),
-			trusted_mods.end(), ' '), trusted_mods.end());
+	trusted_mods.erase(std::remove_if(trusted_mods.begin(),
+			trusted_mods.end(), static_cast<int(*)(int)>(&std::isspace)),
+			trusted_mods.end());
 	std::vector<std::string> mod_list = str_split(trusted_mods, ',');
 	if (std::find(mod_list.begin(), mod_list.end(), mod_name) ==
 			mod_list.end()) {

From ea12da939fdb0a8fd13de885d104af3031ffc3ac Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Fri, 29 Jul 2016 03:44:58 +0100
Subject: [PATCH 126/418] Mapgen: Remove unused 'flat' and 'trees' flags from
 mg_flags

When the 'flat' and 'trees' flags were moved into mgv6_spflags they
were left in mg_flags in an attempt to support old mgv6 worlds. However
their appearence in mg_flags causes confusion, also, later, old-world
support was found to be broken for mgv6 worlds with 'notrees'.

This commit cleans up the mess and comes a month after a thread warning
of the change, and explaining the required action, was posted in the
news subforum. Only old mgv6 worlds with 'flat' or 'notrees' are
affected, a small minority of worlds, the required action being
correctly setting these flags in mgv6_spflags.

Disable a section of the 'map settings manager' unit test which is to
be changed as it is causing problems for pull requests.
---
 src/mapgen.cpp                             |  2 --
 src/mapgen.h                               |  4 ++--
 src/mapgen_v6.cpp                          | 10 +++++-----
 src/unittest/test_map_settings_manager.cpp |  8 ++++++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index b6fda91ac..fd4f5858f 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -50,10 +50,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "dungeongen.h"
 
 FlagDesc flagdesc_mapgen[] = {
-	{"trees",       MG_TREES},
 	{"caves",       MG_CAVES},
 	{"dungeons",    MG_DUNGEONS},
-	{"flat",        MG_FLAT},
 	{"light",       MG_LIGHT},
 	{"decorations", MG_DECORATIONS},
 	{NULL,       0}
diff --git a/src/mapgen.h b/src/mapgen.h
index 5fcf2a365..403fb7470 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -30,10 +30,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MAPGEN_DEFAULT_NAME "v6"
 
 /////////////////// Mapgen flags
-#define MG_TREES       0x01
+#define MG_TREES       0x01  // Deprecated. Moved into mgv6 flags
 #define MG_CAVES       0x02
 #define MG_DUNGEONS    0x04
-#define MG_FLAT        0x08
+#define MG_FLAT        0x08  // Deprecated. Moved into mgv6 flags
 #define MG_LIGHT       0x10
 #define MG_DECORATIONS 0x20
 
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index e4444963f..79617a830 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -268,7 +268,7 @@ float MapgenV6::baseTerrainLevel(float terrain_base, float terrain_higher,
 
 float MapgenV6::baseTerrainLevelFromNoise(v2s16 p)
 {
-	if ((spflags & MGV6_FLAT) || (flags & MG_FLAT))
+	if (spflags & MGV6_FLAT)
 		return water_level;
 
 	float terrain_base   = NoisePerlin2D_PO(&noise_terrain_base->np,
@@ -294,7 +294,7 @@ float MapgenV6::baseTerrainLevelFromMap(v2s16 p)
 
 float MapgenV6::baseTerrainLevelFromMap(int index)
 {
-	if ((spflags & MGV6_FLAT) || (flags & MG_FLAT))
+	if (spflags & MGV6_FLAT)
 		return water_level;
 
 	float terrain_base   = noise_terrain_base->result[index];
@@ -402,7 +402,7 @@ bool MapgenV6::getHaveAppleTree(v2s16 p)
 
 float MapgenV6::getMudAmount(int index)
 {
-	if ((spflags & MGV6_FLAT) || (flags & MG_FLAT))
+	if (spflags & MGV6_FLAT)
 		return MGV6_AVERAGE_MUD_AMOUNT;
 
 	/*return ((float)AVERAGE_MUD_AMOUNT + 2.0 * noise2d_perlin(
@@ -599,7 +599,7 @@ void MapgenV6::makeChunk(BlockMakeData *data)
 	growGrass();
 
 	// Generate some trees, and add grass, if a jungle
-	if ((spflags & MGV6_TREES) || (flags & MG_TREES))
+	if (spflags & MGV6_TREES)
 		placeTreesAndJungleGrass();
 
 	// Generate the registered decorations
@@ -626,7 +626,7 @@ void MapgenV6::calculateNoise()
 	int fx = full_node_min.X;
 	int fz = full_node_min.Z;
 
-	if (!((spflags & MGV6_FLAT) || (flags & MG_FLAT))) {
+	if (!(spflags & MGV6_FLAT)) {
 		noise_terrain_base->perlinMap2D_PO(x, 0.5, z, 0.5);
 		noise_terrain_higher->perlinMap2D_PO(x, 0.5, z, 0.5);
 		noise_steepness->perlinMap2D_PO(x, 0.5, z, 0.5);
diff --git a/src/unittest/test_map_settings_manager.cpp b/src/unittest/test_map_settings_manager.cpp
index 597ec9a31..9292bf87c 100644
--- a/src/unittest/test_map_settings_manager.cpp
+++ b/src/unittest/test_map_settings_manager.cpp
@@ -187,10 +187,13 @@ void TestMapSettingsManager::testMapSettingsManager()
 	UASSERT(mgr.mapgen_params == params);
 	UASSERT(mgr.makeMapgenParams() == params);
 
+#if 0
+	// TODO(paramat or hmmmm): change this to compare the result against a static file
+
 	// Load the resulting map_meta.txt and make sure it contains what we expect
 	unsigned char expected_contents_hash[20] = {
-		0xf6, 0x44, 0x90, 0xb7, 0xab, 0xd8, 0x91, 0xf4, 0x08, 0x96,
-		0xfc, 0x7e, 0xed, 0x01, 0xc5, 0x9a, 0xfd, 0x2f, 0x2d, 0x79
+		0x48, 0x3f, 0x88, 0x5a, 0xc0, 0x7a, 0x14, 0x48, 0xa4, 0x71,
+		0x78, 0x56, 0x95, 0x2d, 0xdc, 0x6a, 0xf7, 0x61, 0x36, 0x5f
 	};
 
 	SHA1 ctx;
@@ -201,6 +204,7 @@ void TestMapSettingsManager::testMapSettingsManager()
 	free(sha1_result);
 
 	UASSERT(!resultdiff);
+#endif
 }
 
 

From b6d845adb4a0f39a58610c827817b1f881bfcebc Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 3 Aug 2016 03:44:33 +0100
Subject: [PATCH 127/418] Decorations: Fix decoration height check errors

Fix height check comparison from '>=' to '>'.
Fix getHeight() for schematic decorations to account for
'deco place center y' flag and for how normal placement
sinks schematic 1 node into the ground.

Jungletrees were not being placed at y = 46, y = 47 despite
having an acceptable 16 nodes of height above ground surface.
---
 src/mg_decoration.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index 8b6abb5d5..70dd9817a 100644
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -145,7 +145,7 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 				y < y_min  || y > y_max)
 				continue;
 
-			if (y + getHeight() >= mg->vm->m_area.MaxEdge.Y) {
+			if (y + getHeight() > mg->vm->m_area.MaxEdge.Y) {
 				continue;
 #if 0
 				printf("Decoration at (%d %d %d) cut off\n", x, y, z);
@@ -370,5 +370,9 @@ size_t DecoSchematic::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
 
 int DecoSchematic::getHeight()
 {
-	return schematic->size.Y;
+	// Account for a schematic being sunk into the ground by flag.
+	// When placed normally account for how a schematic is placed
+	// sunk 1 node into the ground.
+	return (flags & DECO_PLACE_CENTER_Y) ?
+		(schematic->size.Y - 1) / 2 : schematic->size.Y - 1;
 }

From 8df89db30e80eff2ebbf30f0331b8ab4906a410e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <remi@verschelde.fr>
Date: Wed, 10 Aug 2016 08:51:36 +0200
Subject: [PATCH 128/418] Add simulation category

---
 misc/minetest.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/minetest.desktop b/misc/minetest.desktop
index 1d2430a2c..ca493c44e 100644
--- a/misc/minetest.desktop
+++ b/misc/minetest.desktop
@@ -12,6 +12,6 @@ Exec=minetest
 Icon=minetest
 Terminal=false
 Type=Application
-Categories=Game;
+Categories=Game;Simulation;
 StartupNotify=false
 Keywords=sandbox;world;mining;crafting;blocks;nodes;multiplayer;roleplaying;

From 058a869b70072aba8baea47e359c45e82daaf152 Mon Sep 17 00:00:00 2001
From: Ner'zhul <nerzhul@users.noreply.github.com>
Date: Wed, 10 Aug 2016 12:08:05 +0200
Subject: [PATCH 129/418] Permit usage of std::unordered_map &
 std::unorderered_set on c++11 compilers (#4430)

This fallback to std::map & std::set for older compilers

Use UNORDERED_SET as an example in decoration and ore biome sets

Use UNORDERED_MAP as an example in nameidmapping
---
 src/mg_decoration.cpp           |  2 +-
 src/mg_decoration.h             |  4 ++--
 src/mg_ore.cpp                  | 10 +++++-----
 src/mg_ore.h                    |  3 ++-
 src/nameidmapping.cpp           |  2 +-
 src/nameidmapping.h             | 12 +++++------
 src/script/lua_api/l_mapgen.cpp |  4 ++--
 src/util/cpp11_container.h      | 35 +++++++++++++++++++++++++++++++++
 8 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 src/util/cpp11_container.h

diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index 70dd9817a..127915b51 100644
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -156,7 +156,7 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 			}
 
 			if (mg->biomemap) {
-				std::set<u8>::iterator iter;
+				UNORDERED_SET<u8>::iterator iter;
 
 				if (!biomes.empty()) {
 					iter = biomes.find(mg->biomemap[mapindex]);
diff --git a/src/mg_decoration.h b/src/mg_decoration.h
index ba3e9d3b2..da98fd482 100644
--- a/src/mg_decoration.h
+++ b/src/mg_decoration.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MG_DECORATION_HEADER
 #define MG_DECORATION_HEADER
 
-#include <set>
+#include "util/cpp11_container.h"
 #include "objdef.h"
 #include "noise.h"
 #include "nodedef.h"
@@ -83,7 +83,7 @@ public:
 	float fill_ratio;
 	NoiseParams np;
 
-	std::set<u8> biomes;
+	UNORDERED_SET<u8> biomes;
 	//std::list<CutoffData> cutoffs;
 	//Mutex cutoff_mutex;
 };
diff --git a/src/mg_ore.cpp b/src/mg_ore.cpp
index 257901614..d840d745a 100644
--- a/src/mg_ore.cpp
+++ b/src/mg_ore.cpp
@@ -148,7 +148,7 @@ void OreScatter::generate(MMVManip *vm, int mapseed, u32 blockseed,
 
 		if (biomemap && !biomes.empty()) {
 			u32 index = sizex * (z0 - nmin.Z) + (x0 - nmin.X);
-			std::set<u8>::iterator it = biomes.find(biomemap[index]);
+			UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[index]);
 			if (it == biomes.end())
 				continue;
 		}
@@ -202,7 +202,7 @@ void OreSheet::generate(MMVManip *vm, int mapseed, u32 blockseed,
 			continue;
 
 		if (biomemap && !biomes.empty()) {
-			std::set<u8>::iterator it = biomes.find(biomemap[index]);
+			UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[index]);
 			if (it == biomes.end())
 				continue;
 		}
@@ -270,7 +270,7 @@ void OrePuff::generate(MMVManip *vm, int mapseed, u32 blockseed,
 			continue;
 
 		if (biomemap && !biomes.empty()) {
-			std::set<u8>::iterator it = biomes.find(biomemap[index]);
+			UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[index]);
 			if (it == biomes.end())
 				continue;
 		}
@@ -338,7 +338,7 @@ void OreBlob::generate(MMVManip *vm, int mapseed, u32 blockseed,
 
 		if (biomemap && !biomes.empty()) {
 			u32 bmapidx = sizex * (z0 - nmin.Z) + (x0 - nmin.X);
-			std::set<u8>::iterator it = biomes.find(biomemap[bmapidx]);
+			UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[bmapidx]);
 			if (it == biomes.end())
 				continue;
 		}
@@ -422,7 +422,7 @@ void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed,
 
 		if (biomemap && !biomes.empty()) {
 			u32 bmapidx = sizex * (z - nmin.Z) + (x - nmin.X);
-			std::set<u8>::iterator it = biomes.find(biomemap[bmapidx]);
+			UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[bmapidx]);
 			if (it == biomes.end())
 				continue;
 		}
diff --git a/src/mg_ore.h b/src/mg_ore.h
index 2e065cee3..e95fdd330 100644
--- a/src/mg_ore.h
+++ b/src/mg_ore.h
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MG_ORE_HEADER
 #define MG_ORE_HEADER
 
+#include "util/cpp11_container.h"
 #include "objdef.h"
 #include "noise.h"
 #include "nodedef.h"
@@ -64,7 +65,7 @@ public:
 	float nthresh;      // threshold for noise at which an ore is placed
 	NoiseParams np;     // noise for distribution of clusters (NULL for uniform scattering)
 	Noise *noise;
-	std::set<u8> biomes;
+	UNORDERED_SET<u8> biomes;
 
 	Ore();
 	virtual ~Ore();
diff --git a/src/nameidmapping.cpp b/src/nameidmapping.cpp
index ed59ddd16..2af8befff 100644
--- a/src/nameidmapping.cpp
+++ b/src/nameidmapping.cpp
@@ -25,7 +25,7 @@ void NameIdMapping::serialize(std::ostream &os) const
 {
 	writeU8(os, 0); // version
 	writeU16(os, m_id_to_name.size());
-	for(std::map<u16, std::string>::const_iterator
+	for(UNORDERED_MAP<u16, std::string>::const_iterator
 			i = m_id_to_name.begin();
 			i != m_id_to_name.end(); ++i){
 		writeU16(os, i->first);
diff --git a/src/nameidmapping.h b/src/nameidmapping.h
index 417c441d2..23838c8ff 100644
--- a/src/nameidmapping.h
+++ b/src/nameidmapping.h
@@ -23,15 +23,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 #include <iostream>
 #include <set>
-#include <map>
 #include "irrlichttypes_bloated.h"
+#include "util/cpp11_container.h"
 
 class NameIdMapping
 {
 public:
 	void serialize(std::ostream &os) const;
 	void deSerialize(std::istream &is);
-	
+
 	void clear(){
 		m_id_to_name.clear();
 		m_name_to_id.clear();
@@ -55,7 +55,7 @@ public:
 		m_name_to_id.erase(name);
 	}
 	bool getName(u16 id, std::string &result) const{
-		std::map<u16, std::string>::const_iterator i;
+		UNORDERED_MAP<u16, std::string>::const_iterator i;
 		i = m_id_to_name.find(id);
 		if(i == m_id_to_name.end())
 			return false;
@@ -63,7 +63,7 @@ public:
 		return true;
 	}
 	bool getId(const std::string &name, u16 &result) const{
-		std::map<std::string, u16>::const_iterator i;
+		UNORDERED_MAP<std::string, u16>::const_iterator i;
 		i = m_name_to_id.find(name);
 		if(i == m_name_to_id.end())
 			return false;
@@ -74,8 +74,8 @@ public:
 		return m_id_to_name.size();
 	}
 private:
-	std::map<u16, std::string> m_id_to_name;
-	std::map<std::string, u16> m_name_to_id;
+	UNORDERED_MAP<u16, std::string> m_id_to_name;
+	UNORDERED_MAP<std::string, u16> m_name_to_id;
 };
 
 #endif
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 9f14838ce..9f28231eb 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -100,7 +100,7 @@ Biome *get_or_load_biome(lua_State *L, int index,
 	BiomeManager *biomemgr);
 Biome *read_biome_def(lua_State *L, int index, INodeDefManager *ndef);
 size_t get_biome_list(lua_State *L, int index,
-	BiomeManager *biomemgr, std::set<u8> *biome_id_list);
+	BiomeManager *biomemgr, UNORDERED_SET<u8> *biome_id_list);
 
 Schematic *get_or_load_schematic(lua_State *L, int index,
 	SchematicManager *schemmgr, StringMap *replace_names);
@@ -401,7 +401,7 @@ Biome *read_biome_def(lua_State *L, int index, INodeDefManager *ndef)
 
 
 size_t get_biome_list(lua_State *L, int index,
-	BiomeManager *biomemgr, std::set<u8> *biome_id_list)
+	BiomeManager *biomemgr, UNORDERED_SET<u8> *biome_id_list)
 {
 	if (index < 0)
 		index = lua_gettop(L) + 1 + index;
diff --git a/src/util/cpp11_container.h b/src/util/cpp11_container.h
new file mode 100644
index 000000000..f839be19a
--- /dev/null
+++ b/src/util/cpp11_container.h
@@ -0,0 +1,35 @@
+/*
+Minetest
+Copyright (C) 2016 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef MT_CPP11CONTAINER_HEADER
+#define MT_CPP11CONTAINER_HEADER
+
+#if __cplusplus >= 201103L
+	#include <unordered_map>
+	#include <unordered_set>
+	#define UNORDERED_MAP std::unordered_map
+	#define UNORDERED_SET std::unordered_set
+#else
+	#include <map>
+	#include <set>
+	#define UNORDERED_MAP std::map
+	#define UNORDERED_SET std::set
+#endif
+
+#endif

From 4503b5097f99d2806763650f33d8ef3b49f77ce4 Mon Sep 17 00:00:00 2001
From: Rogier-5 <Rogier-5@users.noreply.github.com>
Date: Wed, 10 Aug 2016 12:10:00 +0200
Subject: [PATCH 130/418] Fixes for compiling with a newer (system) jsoncpp
 (#4429)

* Move included json code to jsoncpp subdirectory

This is needed to avoid having to specify the minetest src directory
as a system include when fixing the json includes.

* Fix json includes

They used "", so that the compiler searches the project's directory
first. The result was that when compiling with a system jsoncpp,
the project's own version of json.h was still included, instead of
the system version.

The includes now use <>, so a system location, or one specified with
'-Ilocation' is searched only.

* Fix for jsoncpp deprecated function warning

When compiling with a newer version of jsoncpp (and
ENABLE_SYSTEM_JSONCPP=true), jsoncpp emits a warning
about a deprecated function that minetest uses.
---
 cmake/Modules/FindJson.cmake          | 4 ++--
 src/convert_json.h                    | 2 +-
 src/{ => jsoncpp}/json/CMakeLists.txt | 0
 src/{ => jsoncpp}/json/UPDATING       | 0
 src/{ => jsoncpp}/json/json.h         | 0
 src/{ => jsoncpp}/json/jsoncpp.cpp    | 0
 src/mods.h                            | 2 +-
 src/script/common/c_content.cpp       | 7 ++++++-
 src/script/lua_api/l_util.cpp         | 2 +-
 src/serverlist.cpp                    | 2 +-
 src/serverlist.h                      | 2 +-
 11 files changed, 13 insertions(+), 8 deletions(-)
 rename src/{ => jsoncpp}/json/CMakeLists.txt (100%)
 rename src/{ => jsoncpp}/json/UPDATING (100%)
 rename src/{ => jsoncpp}/json/json.h (100%)
 rename src/{ => jsoncpp}/json/jsoncpp.cpp (100%)

diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
index 1558b0fcf..e69d6c4c0 100644
--- a/cmake/Modules/FindJson.cmake
+++ b/cmake/Modules/FindJson.cmake
@@ -20,8 +20,8 @@ endif()
 
 if(NOT JSONCPP_FOUND)
 	message(STATUS "Using bundled JSONCPP library.")
-	set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json)
+	set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp)
 	set(JSON_LIBRARY jsoncpp)
-	add_subdirectory(json)
+	add_subdirectory(jsoncpp/json)
 endif()
 
diff --git a/src/convert_json.h b/src/convert_json.h
index 6732fcfa3..55321af5f 100644
--- a/src/convert_json.h
+++ b/src/convert_json.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef __CONVERT_JSON_H__
 #define __CONVERT_JSON_H__
 
-#include "json/json.h"
+#include <json/json.h>
 
 struct ModStoreMod;
 struct ModStoreModDetails;
diff --git a/src/json/CMakeLists.txt b/src/jsoncpp/json/CMakeLists.txt
similarity index 100%
rename from src/json/CMakeLists.txt
rename to src/jsoncpp/json/CMakeLists.txt
diff --git a/src/json/UPDATING b/src/jsoncpp/json/UPDATING
similarity index 100%
rename from src/json/UPDATING
rename to src/jsoncpp/json/UPDATING
diff --git a/src/json/json.h b/src/jsoncpp/json/json.h
similarity index 100%
rename from src/json/json.h
rename to src/jsoncpp/json/json.h
diff --git a/src/json/jsoncpp.cpp b/src/jsoncpp/json/jsoncpp.cpp
similarity index 100%
rename from src/json/jsoncpp.cpp
rename to src/jsoncpp/json/jsoncpp.cpp
diff --git a/src/mods.h b/src/mods.h
index 12576516d..af7777d18 100644
--- a/src/mods.h
+++ b/src/mods.h
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <vector>
 #include <string>
 #include <map>
-#include "json/json.h"
+#include <json/json.h>
 #include "config.h"
 
 #define MODNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_"
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 06e20c2a0..c664101ea 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "mg_schematic.h"
 #include "noise.h"
-#include "json/json.h"
+#include <json/json.h>
 
 struct EnumString es_TileAnimationType[] =
 {
@@ -1250,8 +1250,13 @@ static bool push_json_value_helper(lua_State *L, const Json::Value &value,
 			lua_newtable(L);
 			for (Json::Value::const_iterator it = value.begin();
 					it != value.end(); ++it) {
+#ifndef JSONCPP_STRING
 				const char *str = it.memberName();
 				lua_pushstring(L, str ? str : "");
+#else
+				std::string str = it.name();
+				lua_pushstring(L, str.c_str());
+#endif
 				push_json_value_helper(L, *it, nullindex);
 				lua_rawset(L, -3);
 			}
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index 95a5fc4d1..13c0d702f 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common/c_content.h"
 #include "cpp_api/s_async.h"
 #include "serialization.h"
-#include "json/json.h"
+#include <json/json.h>
 #include "cpp_api/s_security.h"
 #include "porting.h"
 #include "debug.h"
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index de7962a68..87ca5dc04 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "log.h"
 #include "network/networkprotocol.h"
-#include "json/json.h"
+#include <json/json.h>
 #include "convert_json.h"
 #include "httpfetch.h"
 #include "util/string.h"
diff --git a/src/serverlist.h b/src/serverlist.h
index 8ffea44cc..0747c3920 100644
--- a/src/serverlist.h
+++ b/src/serverlist.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include "config.h"
 #include "mods.h"
-#include "json/json.h"
+#include <json/json.h>
 
 #ifndef SERVERLIST_HEADER
 #define SERVERLIST_HEADER

From c013c73f338b1c2227662458ebc650883f83271c Mon Sep 17 00:00:00 2001
From: Tomas <tomasbrod@azet.sk>
Date: Wed, 10 Aug 2016 12:17:48 +0200
Subject: [PATCH 131/418] Lua->C getintfield() use lua_tointeger (#4408)

previously function used tonumber which returned float
this caused errors in large numbers and resulted in
obj-def-handlers being invalid when retrived from lua tables in c
---
 src/script/common/c_converter.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/script/common/c_converter.cpp b/src/script/common/c_converter.cpp
index 55c4a5f5a..857300fa5 100644
--- a/src/script/common/c_converter.cpp
+++ b/src/script/common/c_converter.cpp
@@ -391,7 +391,7 @@ bool getintfield(lua_State *L, int table,
 	lua_getfield(L, table, fieldname);
 	bool got = false;
 	if(lua_isnumber(L, -1)){
-		result = lua_tonumber(L, -1);
+		result = lua_tointeger(L, -1);
 		got = true;
 	}
 	lua_pop(L, 1);
@@ -404,7 +404,7 @@ bool getintfield(lua_State *L, int table,
 	lua_getfield(L, table, fieldname);
 	bool got = false;
 	if(lua_isnumber(L, -1)){
-		result = lua_tonumber(L, -1);
+		result = lua_tointeger(L, -1);
 		got = true;
 	}
 	lua_pop(L, 1);
@@ -417,7 +417,7 @@ bool getintfield(lua_State *L, int table,
 	lua_getfield(L, table, fieldname);
 	bool got = false;
 	if(lua_isnumber(L, -1)){
-		result = lua_tonumber(L, -1);
+		result = lua_tointeger(L, -1);
 		got = true;
 	}
 	lua_pop(L, 1);
@@ -430,7 +430,7 @@ bool getintfield(lua_State *L, int table,
 	lua_getfield(L, table, fieldname);
 	bool got = false;
 	if(lua_isnumber(L, -1)){
-		result = lua_tonumber(L, -1);
+		result = lua_tointeger(L, -1);
 		got = true;
 	}
 	lua_pop(L, 1);

From 2c31b79235dd83de753fce5890c5797e149048b8 Mon Sep 17 00:00:00 2001
From: "Esteban I. Ruiz Moreno" <exio4.com@gmail.com>
Date: Sun, 31 Mar 2013 00:30:32 -0300
Subject: [PATCH 132/418] Add zoom, tweakable with zoom_fov, default key: Z
 (like optifine)

---
 src/camera.cpp           | 10 ++++++++--
 src/camera.h             |  1 +
 src/client/keys.h        |  1 +
 src/defaultsettings.cpp  |  2 ++
 src/game.cpp             |  2 ++
 src/guiKeyChangeMenu.cpp |  2 ++
 src/player.h             |  4 ++++
 7 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/camera.cpp b/src/camera.cpp
index 6893b8cbf..e1d6dd910 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -103,6 +103,7 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
 	m_cache_fall_bobbing_amount = g_settings->getFloat("fall_bobbing_amount");
 	m_cache_view_bobbing_amount = g_settings->getFloat("view_bobbing_amount");
 	m_cache_fov                 = g_settings->getFloat("fov");
+	m_cache_zoom_fov            = g_settings->getFloat("zoom_fov");
 	m_cache_view_bobbing        = g_settings->getBool("view_bobbing");
 	m_nametags.clear();
 }
@@ -387,8 +388,13 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
 	if (m_camera_mode == CAMERA_MODE_THIRD_FRONT)
 		m_camera_position = my_cp;
 
-	// Get FOV setting
-	f32 fov_degrees = m_cache_fov;
+	// Get FOV
+	f32 fov_degrees;
+	if (player->getPlayerControl().zoom) {
+		fov_degrees = m_cache_zoom_fov;
+	} else {
+		fov_degrees = m_cache_fov;
+	}
 	fov_degrees = MYMAX(fov_degrees, 10.0);
 	fov_degrees = MYMIN(fov_degrees, 170.0);
 
diff --git a/src/camera.h b/src/camera.h
index ce46c3190..cb0e9686d 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -231,6 +231,7 @@ private:
 	f32 m_cache_fall_bobbing_amount;
 	f32 m_cache_view_bobbing_amount;
 	f32 m_cache_fov;
+	f32 m_cache_zoom_fov;
 	bool m_cache_view_bobbing;
 
 	std::list<Nametag *> m_nametags;
diff --git a/src/client/keys.h b/src/client/keys.h
index 0921bc166..6467c443e 100644
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -59,6 +59,7 @@ public:
 		INCREASE_VIEWING_RANGE,
 		DECREASE_VIEWING_RANGE,
 		RANGESELECT,
+		ZOOM,
 
 		QUICKTUNE_NEXT,
 		QUICKTUNE_PREV,
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 3220b915a..42b232afc 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -40,6 +40,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("keymap_jump", "KEY_SPACE");
 	settings->setDefault("keymap_sneak", "KEY_LSHIFT");
 	settings->setDefault("keymap_drop", "KEY_KEY_Q");
+	settings->setDefault("keymap_zoom", "KEY_KEY_Z");
 	settings->setDefault("keymap_inventory", "KEY_KEY_I");
 	settings->setDefault("keymap_special1", "KEY_KEY_E");
 	settings->setDefault("keymap_chat", "KEY_KEY_T");
@@ -74,6 +75,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("always_fly_fast", "true");
 	settings->setDefault("directional_colored_fog", "true");
 	settings->setDefault("tooltip_show_delay", "400");
+	settings->setDefault("zoom_fov", "15");
 
 	// Some (temporary) keys for debugging
 	settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
diff --git a/src/game.cpp b/src/game.cpp
index 9b9f3a75f..1a036d03a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1371,6 +1371,7 @@ void KeyCache::populate()
 			= getKeySetting("keymap_decrease_viewing_range_min");
 	key[KeyType::RANGESELECT]
 			= getKeySetting("keymap_rangeselect");
+	key[KeyType::ZOOM] = getKeySetting("keymap_zoom");
 
 	key[KeyType::QUICKTUNE_NEXT] = getKeySetting("keymap_quicktune_next");
 	key[KeyType::QUICKTUNE_PREV] = getKeySetting("keymap_quicktune_prev");
@@ -3270,6 +3271,7 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
 		isKeyDown(KeyType::JUMP),
 		isKeyDown(KeyType::SPECIAL1),
 		isKeyDown(KeyType::SNEAK),
+		isKeyDown(KeyType::ZOOM),
 		isLeftPressed(),
 		isRightPressed(),
 		cam.camera_pitch,
diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index 785e921f7..07137d1bc 100644
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -59,6 +59,7 @@ enum
 	GUI_ID_KEY_INVENTORY_BUTTON,
 	GUI_ID_KEY_DUMP_BUTTON,
 	GUI_ID_KEY_RANGE_BUTTON,
+	GUI_ID_KEY_ZOOM_BUTTON,
 	// other
 	GUI_ID_CB_AUX1_DESCENDS,
 	GUI_ID_CB_DOUBLETAP_JUMP,
@@ -414,5 +415,6 @@ void GUIKeyChangeMenu::init_keys()
 	this->add_key(GUI_ID_KEY_NOCLIP_BUTTON,    wgettext("Toggle noclip"),    "keymap_noclip");
 	this->add_key(GUI_ID_KEY_RANGE_BUTTON,     wgettext("Range select"),     "keymap_rangeselect");
 	this->add_key(GUI_ID_KEY_DUMP_BUTTON,      wgettext("Print stacks"),     "keymap_print_debug_stacks");
+	this->add_key(GUI_ID_KEY_ZOOM_BUTTON,      wgettext("Zoom"),             "keymap_zoom");
 }
 
diff --git a/src/player.h b/src/player.h
index e6fcf388a..eab00bb04 100644
--- a/src/player.h
+++ b/src/player.h
@@ -49,6 +49,7 @@ struct PlayerControl
 		sidew_move_joystick_axis = .0f;
 		forw_move_joystick_axis = .0f;
 	}
+
 	PlayerControl(
 		bool a_up,
 		bool a_down,
@@ -57,6 +58,7 @@ struct PlayerControl
 		bool a_jump,
 		bool a_aux1,
 		bool a_sneak,
+		bool a_zoom,
 		bool a_LMB,
 		bool a_RMB,
 		float a_pitch,
@@ -72,6 +74,7 @@ struct PlayerControl
 		jump = a_jump;
 		aux1 = a_aux1;
 		sneak = a_sneak;
+		zoom = a_zoom;
 		LMB = a_LMB;
 		RMB = a_RMB;
 		pitch = a_pitch;
@@ -86,6 +89,7 @@ struct PlayerControl
 	bool jump;
 	bool aux1;
 	bool sneak;
+	bool zoom;
 	bool LMB;
 	bool RMB;
 	float pitch;

From d1df09841d0eac7a88f638676b80ec848522cca5 Mon Sep 17 00:00:00 2001
From: Ben Deutsch <ben@bendeutsch.de>
Date: Tue, 2 Aug 2016 22:47:47 +0200
Subject: [PATCH 133/418] Document zoom_fov in settingtypes.txt and
 minetest.conf.example

---
 builtin/settingtypes.txt | 4 ++++
 minetest.conf.example    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index b5878dfe8..864485cce 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -435,6 +435,10 @@ vsync (V-Sync) bool false
 #    Field of view in degrees.
 fov (Field of view) int 72 30 160
 
+#    Field of view while zooming in degrees.
+#    This requires the "zoom" privilege on the server.
+zoom_fov (Field of view for zoom) int 15 15 160
+
 #    Adjust the gamma encoding for the light tables. Lower numbers are brighter.
 #    This setting is for the client only and is ignored by the server.
 display_gamma (Gamma) float 1.8 1.0 3.0
diff --git a/minetest.conf.example b/minetest.conf.example
index 139909d29..03a917a39 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -496,6 +496,11 @@
 #    type: int min: 30 max: 160
 # fov = 72
 
+#    Field of view while zooming in degrees.
+#    This requires the "zoom" privilege on the server.
+#    type: int min: 15 max: 160
+# zoom_fov = 15
+
 #    Adjust the gamma encoding for the light tables. Lower numbers are brighter.
 #    This setting is for the client only and is ignored by the server.
 #    type: float min: 1 max: 3

From 82494b8cc199fb92248c6c30ce7ef18b7e7133ae Mon Sep 17 00:00:00 2001
From: Ben Deutsch <ben@bendeutsch.de>
Date: Tue, 2 Aug 2016 21:36:34 +0200
Subject: [PATCH 134/418] Zooming the camera requires the 'zoom' privilege

---
 builtin/game/privileges.lua | 4 ++++
 src/camera.cpp              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua
index 5838b9374..05c79440c 100644
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@@ -54,4 +54,8 @@ core.register_privilege("noclip", {
 	give_to_singleplayer = false,
 })
 core.register_privilege("rollback", "Can use the rollback functionality")
+core.register_privilege("zoom", {
+	description = "Can zoom the camera",
+	give_to_singleplayer = false,
+})
 
diff --git a/src/camera.cpp b/src/camera.cpp
index e1d6dd910..e1fec4a3e 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -390,7 +390,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
 
 	// Get FOV
 	f32 fov_degrees;
-	if (player->getPlayerControl().zoom) {
+	if (player->getPlayerControl().zoom && m_gamedef->checkLocalPrivilege("zoom")) {
 		fov_degrees = m_cache_zoom_fov;
 	} else {
 		fov_degrees = m_cache_fov;

From 1be3894e6f283b0538a725bc438922c7d7ec294a Mon Sep 17 00:00:00 2001
From: DLaboratory <dlaboratory@126.com>
Date: Wed, 13 Jul 2016 16:49:47 +0800
Subject: [PATCH 135/418] Update the version of irrlicht to 1.8.3, add steps
 for Sqlite3

Also add note for 64-bit Windows users
---
 README.txt | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/README.txt b/README.txt
index 2963614e9..4b2f50b5a 100644
--- a/README.txt
+++ b/README.txt
@@ -252,6 +252,8 @@ Compiling on Windows:
 		http://www.winimage.com/zLibDll/index.html
 	* Zlib library (zlibwapi.lib and zlibwapi.dll from zlib125dll.zip):
 		http://www.winimage.com/zLibDll/index.html
+	* SQLite3 headers and library
+		https://www.sqlite.org/download.html
 	* Optional: gettext library and tools:
 		http://gnuwin32.sourceforge.net/downlinks/gettext.php
 		- This is used for other UI languages. Feel free to leave it out.
@@ -263,6 +265,10 @@ Compiling on Windows:
 	- Download all the other stuff to DIR and extract them into there.
 	  ("extract here", not "extract to packagename/")
 	  NOTE: zlib125dll.zip needs to be extracted into zlib125dll
+	  NOTE: You need to extract sqlite3.h & sqlite3ext.h from sqlite3 source
+	      and sqlite3.dll & sqlite3.def from sqlite3 precompiled binaries
+	      into "sqlite3" directory, and generate sqlite3.lib using command
+	      "LIB /DEF:sqlite3.def /OUT:sqlite3.lib"
 	- All those packages contain a nice base directory in them, which
 	  should end up being the direct subdirectories of DIR.
 	- You will end up with a directory structure like this (+=dir, -=file):
@@ -270,7 +276,9 @@ Compiling on Windows:
 	+ DIR
 		- zlib-1.2.5.tar.gz
 		- zlib125dll.zip
-		- irrlicht-1.7.1.zip
+		- irrlicht-1.8.3.zip
+		- sqlite-amalgamation-3130000.zip (SQLite3 headers)
+		- sqlite-dll-win32-x86-3130000.zip (SQLite3 library for 32bit system)
 		- 110214175330.zip (or whatever, this is the minetest source)
 		+ zlib-1.2.5
 			- zlib.h
@@ -280,10 +288,15 @@ Compiling on Windows:
 			- readme.txt
 			+ dll32
 			...
-		+ irrlicht-1.7.1
+		+ irrlicht-1.8.3
 			+ lib
 			+ include
 			...
+		+ sqlite3
+			sqlite3.h
+			sqlite3ext.h
+			sqlite3.lib
+			sqlite3.dll
 		+ gettext (optional)
 			+bin
 			+include
@@ -310,7 +323,7 @@ Compiling on Windows:
 	BUILD_SERVER             [ ]
 	CMAKE_BUILD_TYPE         Release
 	CMAKE_INSTALL_PREFIX     DIR/minetest-install
-	IRRLICHT_SOURCE_DIR      DIR/irrlicht-1.7.1
+	IRRLICHT_SOURCE_DIR      DIR/irrlicht-1.8.3
 	RUN_IN_PLACE             [X]
 	WARN_ALL                 [ ]
 	ZLIB_DLL                 DIR/zlib125dll/dll32/zlibwapi.dll
@@ -321,6 +334,11 @@ Compiling on Windows:
 	GETTEXT_LIBRARIES        DIR/gettext/lib/intl.lib
 	GETTEXT_MSGFMT           DIR/gettext/bin/msgfmt
 	-----------------
+	- If CMake complains it couldn't find SQLITE3, choose "Advanced" box on the
+	  right top corner, then specify the location of SQLITE3_INCLUDE_DIR and
+	  SQLITE3_LIBRARY manually.
+	- If you want to build 64-bit minetest, you will need to build 64-bit version
+	  of irrlicht engine manually, as only 32-bit pre-built library is provided.
 	- Hit "Configure"
 	- Hit "Configure" once again 8)
 	- If something is still coloured red, you have a problem.

From 48b3bb980d4a026d32739acc1982f16e3c303c5b Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Thu, 28 Jul 2016 08:56:22 +0100
Subject: [PATCH 136/418] couple of memory leaks fixes.

---
 src/script/cpp_api/s_security.cpp          | 18 +++++++++++++++++-
 src/sound_openal.cpp                       |  1 +
 src/unittest/test_map_settings_manager.cpp |  4 +++-
 src/util/areastore.cpp                     |  1 +
 src/util/srp.cpp                           |  2 +-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index e117a4811..0e64c4c61 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -285,6 +285,10 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
 
 	if (c == LUA_SIGNATURE[0]) {
 		lua_pushliteral(L, "Bytecode prohibited when mod security is enabled.");
+		std::fclose(fp);
+		if (path) {
+			delete [] chunk_name;
+		}
 		return false;
 	}
 
@@ -295,7 +299,15 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
 	size_t size = std::ftell(fp) - start;
 	char *code = new char[size];
 	ret = std::fseek(fp, start, SEEK_SET);
-	CHECK_FILE_ERR(ret, fp);
+	if (ret) {
+		lua_pushfstring(L, "%s: %s", path, strerror(errno));
+		std::fclose(fp);
+		delete [] code;
+		if (path) {
+			delete [] chunk_name;
+		}
+		return false;
+	}
 
 	size_t num_read = std::fread(code, 1, size, fp);
 	if (path) {
@@ -303,6 +315,10 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
 	}
 	if (num_read != size) {
 		lua_pushliteral(L, "Error reading file to load.");
+		delete [] code;
+		if (path) {
+			delete [] chunk_name;
+		}
 		return false;
 	}
 
diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index e2b6d937a..1832a0c77 100644
--- a/src/sound_openal.cpp
+++ b/src/sound_openal.cpp
@@ -144,6 +144,7 @@ SoundBuffer *load_opened_ogg_file(OggVorbis_File *oggFile,
 			ov_clear(oggFile);
 			infostream << "Audio: Error decoding "
 				<< filename_for_logging << std::endl;
+			delete snd;
 			return NULL;
 		}
 
diff --git a/src/unittest/test_map_settings_manager.cpp b/src/unittest/test_map_settings_manager.cpp
index 9292bf87c..4f5ac80f2 100644
--- a/src/unittest/test_map_settings_manager.cpp
+++ b/src/unittest/test_map_settings_manager.cpp
@@ -75,8 +75,10 @@ std::string read_file_to_string(const std::string &filepath)
 	fseek(f, 0, SEEK_END);
 
 	long filesize = ftell(f);
-	if (filesize == -1)
+	if (filesize == -1) {
+		fclose(f);
 		return "";
+	}
 	rewind(f);
 
 	buf.resize(filesize);
diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp
index 58f08a8c2..cef67da2c 100644
--- a/src/util/areastore.cpp
+++ b/src/util/areastore.cpp
@@ -95,6 +95,7 @@ void AreaStore::deserialize(std::istream &is)
 		is.read(data, data_len);
 		a.data = std::string(data, data_len);
 		insertArea(&a);
+		delete [] data;
 	}
 }
 
diff --git a/src/util/srp.cpp b/src/util/srp.cpp
index 0d3c938a3..77c1816e8 100644
--- a/src/util/srp.cpp
+++ b/src/util/srp.cpp
@@ -542,7 +542,7 @@ static SRP_Result fill_buff()
 
 	if (!fp) return SRP_ERR;
 
-	if (fread(g_rand_buff, sizeof(g_rand_buff), 1, fp) != 1) return SRP_ERR;
+	if (fread(g_rand_buff, sizeof(g_rand_buff), 1, fp) != 1) { fclose(fp); return SRP_ERR; }
 	if (fclose(fp)) return SRP_ERR;
 #endif
 	return SRP_OK;

From 35f47e5461042b3d190f8ea583aec2aa26f1c484 Mon Sep 17 00:00:00 2001
From: Rogier-5 <rogier777@gmail.com>
Date: Thu, 11 Aug 2016 00:22:32 +0200
Subject: [PATCH 137/418] Add infotext containing entity type (e.g. mobs:cow)
 to unknown entities (#4431)

If a mod is disabled, or upgraded without sufficient backward compatibility,
then entities it has put into the world become unknown, and continue moving
around, but are completely unrecognisable.

This change allows the player to see their type, and therefore which mod is
or was responsible.
---
 src/content_sao.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 53bf3154f..937363b76 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -175,6 +175,8 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
 		// Activate entity, supplying serialized state
 		m_env->getScriptIface()->
 			luaentity_Activate(m_id, m_init_state.c_str(), dtime_s);
+	} else {
+		m_prop.infotext = m_init_name;
 	}
 }
 

From b11720af459d44a553cb5d23ef776a632fb30a65 Mon Sep 17 00:00:00 2001
From: Rogier-5 <rogier777@gmail.com>
Date: Thu, 11 Aug 2016 19:22:40 +0200
Subject: [PATCH 138/418] Use the standard to_string() functions for C++11
 (#4279)

If compiling according to a C++ version before C++11, then define
std::to_string ourselves.

Add a to_wstring version as well

As std::to_string() for floating point types uses %.6f as floating
point format converter, instead of %G, it needs special care.

To preserve ftos() behavior (which is expected to use the %G format
converter), it no longer uses to_string().
---
 src/client.cpp    |  2 +-
 src/util/string.h | 47 +++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 4ffcec6ba..483b22caa 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -820,7 +820,7 @@ void Client::initLocalMapSaving(const Address &address,
 	const std::string world_path = porting::path_user
 		+ DIR_DELIM + "worlds"
 		+ DIR_DELIM + "server_"
-		+ hostname + "_" + to_string(address.getPort());
+		+ hostname + "_" + std::to_string(address.getPort());
 
 	fs::CreateAllDirs(world_path);
 
diff --git a/src/util/string.h b/src/util/string.h
index 8f4ef4711..724543a36 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <vector>
 #include <map>
 #include <sstream>
+#include <iomanip>
 #include <cctype>
 
 #define STRINGIFY(x) #x
@@ -350,23 +351,57 @@ inline T from_string(const std::string &str)
 /// Returns a 64-bit signed value represented by the string \p str (decimal).
 inline s64 stoi64(const std::string &str) { return from_string<s64>(str); }
 
-// TODO: Replace with C++11 std::to_string.
+#if __cplusplus < 201103L
+namespace std {
 
 /// Returns a string representing the value \p val.
 template <typename T>
-inline std::string to_string(T val)
+inline string to_string(T val)
 {
-	std::ostringstream oss;
+	ostringstream oss;
 	oss << val;
 	return oss.str();
 }
+#define DEFINE_STD_TOSTRING_FLOATINGPOINT(T)		\
+	template <>					\
+	inline string to_string<T>(T val)		\
+	{						\
+		ostringstream oss;			\
+		oss << std::fixed			\
+			<< std::setprecision(6)		\
+			<< val;				\
+		return oss.str();			\
+	}
+DEFINE_STD_TOSTRING_FLOATINGPOINT(float)
+DEFINE_STD_TOSTRING_FLOATINGPOINT(double)
+DEFINE_STD_TOSTRING_FLOATINGPOINT(long double)
+
+#undef DEFINE_STD_TOSTRING_FLOATINGPOINT
+
+/// Returns a wide string representing the value \p val
+template <typename T>
+inline wstring to_wstring(T val)
+{
+      return utf8_to_wide(to_string(val));
+}
+}
+#endif
 
 /// Returns a string representing the decimal value of the 32-bit value \p i.
-inline std::string itos(s32 i) { return to_string(i); }
+inline std::string itos(s32 i) { return std::to_string(i); }
 /// Returns a string representing the decimal value of the 64-bit value \p i.
-inline std::string i64tos(s64 i) { return to_string(i); }
+inline std::string i64tos(s64 i) { return std::to_string(i); }
+
+// std::to_string uses the '%.6f' conversion, which is inconsistent with
+// std::ostream::operator<<() and impractical too.  ftos() uses the
+// more generic and std::ostream::operator<<()-compatible '%G' format.
 /// Returns a string representing the decimal value of the float value \p f.
-inline std::string ftos(float f) { return to_string(f); }
+inline std::string ftos(float f)
+{
+	std::ostringstream oss;
+	oss << f;
+	return oss.str();
+}
 
 
 /**

From c4e77b406aa73dd6db79f1183a0a65a32f284111 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Fri, 12 Aug 2016 14:33:26 +0200
Subject: [PATCH 139/418] Update AppData file with more URLs and keywords

---
 misc/minetest.appdata.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/misc/minetest.appdata.xml b/misc/minetest.appdata.xml
index 19d042805..65acf96ec 100644
--- a/misc/minetest.appdata.xml
+++ b/misc/minetest.appdata.xml
@@ -32,6 +32,15 @@
 		<screenshot width="1920" height="1080">http://www.minetest.net/media/gallery/3.jpg</screenshot>
 		<screenshot width="1920" height="1080">http://www.minetest.net/media/gallery/5.jpg</screenshot>
 	</screenshots>
+	<keywords>
+		<keyword>sandbox</keyword>
+		<keyword>world</keyword>
+		<keyword>mining</keyword>
+		<keyword>multiplayer</keyword>
+	</keywords>
 	<url type="homepage">http://minetest.net</url>
+	<url type="bugtracker">http://www.minetest.net/development/#reporting-issues</url>
+	<url type="translate">http://dev.minetest.net/Translation</url>
+	<url type="donation">http://www.minetest.net/development/#donate</url>
 	<updatecontact>sfan5@live.de</updatecontact>
 </application>

From f21dae63390aa872062bcfc96fc6817b0fcfe601 Mon Sep 17 00:00:00 2001
From: Thomas--S <Thomas--S@users.noreply.github.com>
Date: Sat, 2 Jul 2016 17:58:08 +0200
Subject: [PATCH 140/418] Add an [opacity:<r> texture modifier. Makes the base
 image transparent according to the given ratio. r must be between 0 and 255.
 0 means totally transparent. 255 means totally opaque. Useful for texture
 overlaying.

---
 doc/lua_api.txt     | 10 ++++++++++
 src/client/tile.cpp | 30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index ce40e082c..182f5c821 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -292,6 +292,16 @@ Example:
 
     default_sandstone.png^[resize:16x16
 
+#### `[opacity:<r>`
+    Makes the base image transparent according to the given ratio.
+    r must be between 0 and 255.
+    0 means totally transparent.
+    255 means totally opaque.
+
+Example:
+
+    default_sandstone.png^[opacity:127
+
 #### `[brighten`
 Brightens the texture.
 
diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index ec8c95f02..3b5d2a3ae 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -1735,6 +1735,36 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			baseimg->drop();
 			baseimg = image;
 		}
+		/*
+			[opacity:R
+			Makes the base image transparent according to the given ratio.
+			R must be between 0 and 255.
+			0 means totally transparent.
+			255 means totally opaque.
+		*/
+		else if (str_starts_with(part_of_name, "[opacity:")) {
+			if (baseimg == NULL) {
+				errorstream << "generateImagePart(): baseimg == NULL "
+						<< "for part_of_name=\"" << part_of_name
+						<< "\", cancelling." << std::endl;
+				return false;
+			}
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+
+			u32 ratio = mystoi(sf.next(""), 0, 255);
+
+			core::dimension2d<u32> dim = baseimg->getDimension();
+
+			for (u32 y = 0; y < dim.Height; y++)
+			for (u32 x = 0; x < dim.Width; x++)
+			{
+				video::SColor c = baseimg->getPixel(x,y);
+				c.setAlpha(floor((c.getAlpha() * ratio) / 255 + 0.5));
+				baseimg->setPixel(x,y,c);
+			}
+		}
 		else
 		{
 			errorstream << "generateImagePart(): Invalid "

From 986d70ccecb09fcbd247758643a4d623c9c4e1b8 Mon Sep 17 00:00:00 2001
From: DonBatman <serfdon@gmail.com>
Date: Sun, 14 Aug 2016 04:40:31 -0700
Subject: [PATCH 141/418] Lua_api.txt: Change 'maxwear' to 'uses' in
 'tool_capabilities'

'maxwear' has been deprecated for over 3 years
Add spaces around '=' nearby
---
 doc/lua_api.txt | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 182f5c821..38f19aadc 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3472,27 +3472,26 @@ Definition tables
 
     {
         description = "Steel Axe",
-        groups = {}, -- key=name, value=rating; rating=1..3.
+        groups = {}, -- key = name, value = rating; rating = 1..3.
                         if rating not applicable, use 1.
-                        e.g. {wool=1, fluffy=3}
-                            {soil=2, outerspace=1, crumbly=1}
-                            {bendy=2, snappy=1},
-                            {hard=1, metal=1, spikes=1}
+                        e.g. {wool = 1, fluffy = 3}
+                            {soil = 2, outerspace = 1, crumbly = 1}
+                            {bendy = 2, snappy = 1},
+                            {hard = 1, metal = 1, spikes = 1}
         inventory_image = "default_tool_steelaxe.png",
         wield_image = "",
-        wield_scale = {x=1,y=1,z=1},
+        wield_scale = {x = 1, y = 1, z = 1},
         stack_max = 99,
         range = 4.0,
         liquids_pointable = false,
         tool_capabilities = {
             full_punch_interval = 1.0,
-            max_drop_level=0,
-            groupcaps={
+            max_drop_level = 0,
+            groupcaps = {
                 -- For example:
-                snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
-                choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0}
+                choppy = {times = {[1] = 2.50, [2] = 1.40, [3] = 1.00}, uses = 20, maxlevel = 2},
             },
-            damage_groups = {groupname=damage},
+            damage_groups = {groupname = damage},
         },
         node_placement_prediction = nil,
         --[[

From 5c0e659516857733d968707490b16bcf62f33c92 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Sat, 30 Jul 2016 12:50:22 +0200
Subject: [PATCH 142/418] Script API: Make the craft recipe field 'method'
 consistent

---
 src/script/lua_api/l_craft.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/script/lua_api/l_craft.cpp b/src/script/lua_api/l_craft.cpp
index d135c689f..2236566de 100644
--- a/src/script/lua_api/l_craft.cpp
+++ b/src/script/lua_api/l_craft.cpp
@@ -422,20 +422,28 @@ static void push_craft_recipe(lua_State *L, IGameDef *gdef,
 	}
 	lua_setfield(L, -2, "items");
 	setintfield(L, -1, "width", input.width);
+
+	std::string method_s;
 	switch (input.method) {
 	case CRAFT_METHOD_NORMAL:
-		lua_pushstring(L, "normal");
+		method_s = "normal";
 		break;
 	case CRAFT_METHOD_COOKING:
-		lua_pushstring(L, "cooking");
+		method_s = "cooking";
 		break;
 	case CRAFT_METHOD_FUEL:
-		lua_pushstring(L, "fuel");
+		method_s = "fuel";
 		break;
 	default:
-		lua_pushstring(L, "unknown");
+		method_s = "unknown";
 	}
+	lua_pushstring(L, method_s.c_str());
+	lua_setfield(L, -2, "method");
+
+	// Deprecated, only for compatibility's sake
+	lua_pushstring(L, method_s.c_str());
 	lua_setfield(L, -2, "type");
+
 	lua_pushstring(L, output.item.c_str());
 	lua_setfield(L, -2, "output");
 }

From 7f4c6f32da3cd0c5f1367af63f084775131f2ecc Mon Sep 17 00:00:00 2001
From: obneq <obneq@users.noreply.github.com>
Date: Fri, 12 Aug 2016 19:11:56 +0200
Subject: [PATCH 143/418] Mapblock mesh: Fix updateFastFaceRow tiling issue

Increase maximum length of tiled node rows from 2 to mapblock size.
---
 src/mapblock_mesh.cpp | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index e1b044271..a11fb5887 100644
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -839,7 +839,7 @@ static void updateFastFaceRow(
 {
 	v3s16 p = startpos;
 
-	u16 continuous_tiles_count = 0;
+	u16 continuous_tiles_count = 1;
 
 	bool makes_face = false;
 	v3s16 p_corrected;
@@ -889,8 +889,8 @@ static void updateFastFaceRow(
 					&& (tile.material_flags & MATERIAL_FLAG_TILEABLE_HORIZONTAL)
 					&& (tile.material_flags & MATERIAL_FLAG_TILEABLE_VERTICAL)) {
 				next_is_different = false;
-			}
-			else{
+				continuous_tiles_count++;
+			} else {
 				/*if(makes_face){
 					g_profiler->add("Meshgen: diff: next_makes_face != makes_face",
 							next_makes_face != makes_face ? 1 : 0);
@@ -915,8 +915,6 @@ static void updateFastFaceRow(
 				g_profiler->add("Meshgen: diff: last position", 1);*/
 		}
 
-		continuous_tiles_count++;
-
 		if(next_is_different)
 		{
 			/*
@@ -928,8 +926,6 @@ static void updateFastFaceRow(
 				v3f pf(p_corrected.X, p_corrected.Y, p_corrected.Z);
 				// Center point of face (kind of)
 				v3f sp = pf - ((f32)continuous_tiles_count / 2.0 - 0.5) * translate_dir_f;
-				if(continuous_tiles_count != 1)
-					sp += translate_dir_f;
 				v3f scale(1,1,1);
 
 				if(translate_dir.X != 0) {
@@ -952,19 +948,18 @@ static void updateFastFaceRow(
 				}
 			}
 
-			continuous_tiles_count = 0;
-
-			makes_face = next_makes_face;
-			p_corrected = next_p_corrected;
-			face_dir_corrected = next_face_dir_corrected;
-			lights[0] = next_lights[0];
-			lights[1] = next_lights[1];
-			lights[2] = next_lights[2];
-			lights[3] = next_lights[3];
-			tile = next_tile;
-			light_source = next_light_source;
+			continuous_tiles_count = 1;
 		}
 
+		makes_face = next_makes_face;
+		p_corrected = next_p_corrected;
+		face_dir_corrected = next_face_dir_corrected;
+		lights[0] = next_lights[0];
+		lights[1] = next_lights[1];
+		lights[2] = next_lights[2];
+		lights[3] = next_lights[3];
+		tile = next_tile;
+		light_source = next_light_source;
 		p = p_next;
 	}
 }

From a4962240bdf7ddc221c477ada1c2a99c1aee3e2e Mon Sep 17 00:00:00 2001
From: Rogier-5 <rogier777@gmail.com>
Date: Fri, 19 Aug 2016 20:23:30 +0200
Subject: [PATCH 144/418] Fix for failure to find jsoncpp in android build
 (#4456)

Commit 4503b5 did not update the android build script.
---
 build/android/jni/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index a42ab76b8..2d850385e 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -99,7 +99,7 @@ LOCAL_C_INCLUDES := \
 		jni/src                                   \
 		jni/src/script                            \
 		jni/src/lua/src                           \
-		jni/src/json                              \
+		jni/src/jsoncpp                           \
 		jni/src/cguittfont                        \
 		deps/irrlicht/include                     \
 		deps/libiconv/include                     \
@@ -361,7 +361,7 @@ LOCAL_SRC_FILES += \
 		jni/src/threading/thread.cpp
 
 # JSONCPP
-LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
+LOCAL_SRC_FILES += jni/src/jsoncpp/json/jsoncpp.cpp
 
 LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp
 LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS)

From ba501273094b0c6c77404610f2dee81c031d0074 Mon Sep 17 00:00:00 2001
From: Tim <t4im@users.noreply.github.com>
Date: Wed, 27 Jul 2016 18:41:16 +0200
Subject: [PATCH 145/418] Move generation from settingtypes out of
 dlg_settings_advanced

Avoids unreachable code linter warning by moving generation code
(of minetest.conf.example and settings_translation_file.cpp)
out of dlg_settings_advanced.

Due to passing the settings, also it avoids reading the settings file twice.

Instead of activating the code by changing the active if-clauses,
its activation is now done by uncommenting the loadfile() statement.
---
 builtin/mainmenu/dlg_settings_advanced.lua    | 101 +-----------------
 .../mainmenu/generate_from_settingtypes.lua   |  99 +++++++++++++++++
 2 files changed, 101 insertions(+), 99 deletions(-)
 create mode 100644 builtin/mainmenu/generate_from_settingtypes.lua

diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua
index f5e80c252..68b5fd4ef 100644
--- a/builtin/mainmenu/dlg_settings_advanced.lua
+++ b/builtin/mainmenu/dlg_settings_advanced.lua
@@ -659,102 +659,5 @@ function create_adv_settings_dlg()
 				return dlg
 end
 
-local function create_minetest_conf_example()
-	local result = "#    This file contains a list of all available settings and their default value for minetest.conf\n" ..
-			"\n" ..
-			"#    By default, all the settings are commented and not functional.\n" ..
-			"#    Uncomment settings by removing the preceding #.\n" ..
-			"\n" ..
-			"#    minetest.conf is read by default from:\n" ..
-			"#    ../minetest.conf\n" ..
-			"#    ../../minetest.conf\n" ..
-			"#    Any other path can be chosen by passing the path as a parameter\n" ..
-			"#    to the program, eg. \"minetest.exe --config ../minetest.conf.example\".\n" ..
-			"\n" ..
-			"#    Further documentation:\n" ..
-			"#    http://wiki.minetest.net/\n" ..
-			"\n"
-
-	local settings = parse_config_file(true, false)
-	for _, entry in ipairs(settings) do
-		if entry.type == "category" then
-			if entry.level == 0 then
-				result = result .. "#\n# " .. entry.name .. "\n#\n\n"
-			else
-				for i = 1, entry.level do
-					result = result .. "#"
-				end
-				result = result .. "# " .. entry.name .. "\n\n"
-			end
-		else
-			if entry.comment ~= "" then
-				for _, comment_line in ipairs(entry.comment:split("\n", true)) do
-					result = result .."#    " .. comment_line .. "\n"
-				end
-			end
-			result = result .. "#    type: " .. entry.type
-			if entry.min then
-				result = result .. " min: " .. entry.min
-			end
-			if entry.max then
-				result = result .. " max: " .. entry.max
-			end
-			if entry.values then
-				result = result .. " values: " .. table.concat(entry.values, ", ")
-			end
-			if entry.possible then
-				result = result .. " possible values: " .. entry.possible:gsub(",", ", ")
-			end
-			result = result .. "\n"
-			local append = ""
-			if entry.default ~= "" then
-				append = " " .. entry.default
-			end
-			result = result .. "# " .. entry.name .. " =" .. append .. "\n\n"
-		end
-	end
-	return result
-end
-
-local function create_translation_file()
-	local result = "// This file is automatically generated\n" ..
-			"// It conatins a bunch of fake gettext calls, to tell xgettext about the strings in config files\n" ..
-			"// To update it, refer to the bottom of builtin/mainmenu/tab_settings.lua\n\n" ..
-			"fake_function() {\n"
-
-	local settings = parse_config_file(true, false)
-	for _, entry in ipairs(settings) do
-		if entry.type == "category" then
-			local name_escaped = entry.name:gsub("\"", "\\\"")
-			result = result .. "\tgettext(\"" .. name_escaped .. "\");\n"
-		else
-			if entry.readable_name then
-				local readable_name_escaped = entry.readable_name:gsub("\"", "\\\"")
-				result = result .. "\tgettext(\"" .. readable_name_escaped .. "\");\n"
-			end
-			if entry.comment ~= "" then
-				local comment_escaped = entry.comment:gsub("\n", "\\n")
-				comment_escaped = comment_escaped:gsub("\"", "\\\"")
-				result = result .. "\tgettext(\"" .. comment_escaped .. "\");\n"
-			end
-		end
-	end
-	result = result .. "}\n"
-	return result
-end
-
-if false then
-	local file = io.open("minetest.conf.example", "w")
-	if file then
-		file:write(create_minetest_conf_example())
-		file:close()
-	end
-end
-
-if false then
-	local file = io.open("src/settings_translation_file.cpp", "w")
-	if file then
-		file:write(create_translation_file())
-		file:close()
-	end
-end
+-- generate minetest.conf.example and settings_translation_file.cpp:
+--assert(loadfile(core.get_mainmenu_path()..DIR_DELIM.."generate_from_settingtypes.lua"))(parse_config_file(true, false))
diff --git a/builtin/mainmenu/generate_from_settingtypes.lua b/builtin/mainmenu/generate_from_settingtypes.lua
new file mode 100644
index 000000000..62d11b29b
--- /dev/null
+++ b/builtin/mainmenu/generate_from_settingtypes.lua
@@ -0,0 +1,99 @@
+local settings = ...
+
+local function create_minetest_conf_example()
+	local result = "#    This file contains a list of all available settings and their default value for minetest.conf\n" ..
+			"\n" ..
+			"#    By default, all the settings are commented and not functional.\n" ..
+			"#    Uncomment settings by removing the preceding #.\n" ..
+			"\n" ..
+			"#    minetest.conf is read by default from:\n" ..
+			"#    ../minetest.conf\n" ..
+			"#    ../../minetest.conf\n" ..
+			"#    Any other path can be chosen by passing the path as a parameter\n" ..
+			"#    to the program, eg. \"minetest.exe --config ../minetest.conf.example\".\n" ..
+			"\n" ..
+			"#    Further documentation:\n" ..
+			"#    http://wiki.minetest.net/\n" ..
+			"\n"
+
+	for _, entry in ipairs(settings) do
+		if entry.type == "category" then
+			if entry.level == 0 then
+				result = result .. "#\n# " .. entry.name .. "\n#\n\n"
+			else
+				for i = 1, entry.level do
+					result = result .. "#"
+				end
+				result = result .. "# " .. entry.name .. "\n\n"
+			end
+		else
+			if entry.comment ~= "" then
+				for _, comment_line in ipairs(entry.comment:split("\n", true)) do
+					result = result .."#    " .. comment_line .. "\n"
+				end
+			end
+			result = result .. "#    type: " .. entry.type
+			if entry.min then
+				result = result .. " min: " .. entry.min
+			end
+			if entry.max then
+				result = result .. " max: " .. entry.max
+			end
+			if entry.values then
+				result = result .. " values: " .. table.concat(entry.values, ", ")
+			end
+			if entry.possible then
+				result = result .. " possible values: " .. entry.possible:gsub(",", ", ")
+			end
+			result = result .. "\n"
+			local append = ""
+			if entry.default ~= "" then
+				append = " " .. entry.default
+			end
+			result = result .. "# " .. entry.name .. " =" .. append .. "\n\n"
+		end
+	end
+	return result
+end
+
+local function create_translation_file()
+	local result = "// This file is automatically generated\n" ..
+			"// It conatins a bunch of fake gettext calls, to tell xgettext about the strings in config files\n" ..
+			"// To update it, refer to the bottom of builtin/mainmenu/tab_settings.lua\n\n" ..
+			"fake_function() {\n"
+
+	for _, entry in ipairs(settings) do
+		if entry.type == "category" then
+			local name_escaped = entry.name:gsub("\"", "\\\"")
+			result = result .. "\tgettext(\"" .. name_escaped .. "\");\n"
+		else
+			if entry.readable_name then
+				local readable_name_escaped = entry.readable_name:gsub("\"", "\\\"")
+				result = result .. "\tgettext(\"" .. readable_name_escaped .. "\");\n"
+			end
+			if entry.comment ~= "" then
+				local comment_escaped = entry.comment:gsub("\n", "\\n")
+				comment_escaped = comment_escaped:gsub("\"", "\\\"")
+				result = result .. "\tgettext(\"" .. comment_escaped .. "\");\n"
+			end
+		end
+	end
+	result = result .. "}\n"
+	return result
+end
+
+if false then
+	local file = io.open("minetest.conf.example", "w")
+	if file then
+		file:write(create_minetest_conf_example())
+		file:close()
+	end
+end
+
+if false then
+	local file = io.open("src/settings_translation_file.cpp", "w")
+	if file then
+		file:write(create_translation_file())
+		file:close()
+	end
+end
\ No newline at end of file

From 6590140260d0338ab5a0fd2bbcd4c72f07dd963d Mon Sep 17 00:00:00 2001
From: Tim <t4im@users.noreply.github.com>
Date: Wed, 27 Jul 2016 18:46:02 +0200
Subject: [PATCH 146/418] Tidy up generate_from_settingtypes.lua a bit.

* Multiline strings
* Table-concat instead of String-concats
* string.rep instead of loop-concat
* string.format %q instead of manual quotation by gsub
* Assert writeable files
* Generate new settings_translation_file
---
 .../mainmenu/generate_from_settingtypes.lua   | 112 +++++++++---------
 src/settings_translation_file.cpp             |   2 +-
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/builtin/mainmenu/generate_from_settingtypes.lua b/builtin/mainmenu/generate_from_settingtypes.lua
index 62d11b29b..6c9ba27fb 100644
--- a/builtin/mainmenu/generate_from_settingtypes.lua
+++ b/builtin/mainmenu/generate_from_settingtypes.lua
@@ -1,99 +1,99 @@
 local settings = ...
 
-local function create_minetest_conf_example()
-	local result = "#    This file contains a list of all available settings and their default value for minetest.conf\n" ..
-			"\n" ..
-			"#    By default, all the settings are commented and not functional.\n" ..
-			"#    Uncomment settings by removing the preceding #.\n" ..
-			"\n" ..
-			"#    minetest.conf is read by default from:\n" ..
-			"#    ../minetest.conf\n" ..
-			"#    ../../minetest.conf\n" ..
-			"#    Any other path can be chosen by passing the path as a parameter\n" ..
-			"#    to the program, eg. \"minetest.exe --config ../minetest.conf.example\".\n" ..
-			"\n" ..
-			"#    Further documentation:\n" ..
-			"#    http://wiki.minetest.net/\n" ..
-			"\n"
+local concat = table.concat
+local insert = table.insert
+local sprintf = string.format
+local rep = string.rep
 
+local minetest_example_header = [[
+#    This file contains a list of all available settings and their default value for minetest.conf
+
+#    By default, all the settings are commented and not functional.
+#    Uncomment settings by removing the preceding #.
+
+#    minetest.conf is read by default from:
+#    ../minetest.conf
+#    ../../minetest.conf
+#    Any other path can be chosen by passing the path as a parameter
+#    to the program, eg. "minetest.exe --config ../minetest.conf.example".
+
+#    Further documentation:
+#    http://wiki.minetest.net/
+
+]]
+
+local function create_minetest_conf_example()
+	local result = { minetest_example_header }
 	for _, entry in ipairs(settings) do
 		if entry.type == "category" then
 			if entry.level == 0 then
-				result = result .. "#\n# " .. entry.name .. "\n#\n\n"
+				insert(result, "#\n# " .. entry.name .. "\n#\n\n")
 			else
-				for i = 1, entry.level do
-					result = result .. "#"
-				end
-				result = result .. "# " .. entry.name .. "\n\n"
+				insert(result, rep("#", entry.level))
+				insert(result, "# " .. entry.name .. "\n\n")
 			end
 		else
 			if entry.comment ~= "" then
 				for _, comment_line in ipairs(entry.comment:split("\n", true)) do
-					result = result .."#    " .. comment_line .. "\n"
+					insert(result, "#    " .. comment_line .. "\n")
 				end
 			end
-			result = result .. "#    type: " .. entry.type
+			insert(result, "#    type: " .. entry.type)
 			if entry.min then
-				result = result .. " min: " .. entry.min
+				insert(result, " min: " .. entry.min)
 			end
 			if entry.max then
-				result = result .. " max: " .. entry.max
+				insert(result, " max: " .. entry.max)
 			end
 			if entry.values then
-				result = result .. " values: " .. table.concat(entry.values, ", ")
+				insert(result, " values: " .. concat(entry.values, ", "))
 			end
 			if entry.possible then
-				result = result .. " possible values: " .. entry.possible:gsub(",", ", ")
+				insert(result, " possible values: " .. entry.possible:gsub(",", ", "))
 			end
-			result = result .. "\n"
-			local append = ""
+			insert(result, "\n")
+			local append
 			if entry.default ~= "" then
 				append = " " .. entry.default
 			end
-			result = result .. "# " .. entry.name .. " =" .. append .. "\n\n"
+			insert(result, sprintf("# %s =%s\n\n", entry.name, append or ""))
 		end
 	end
-	return result
+	return concat(result)
 end
 
-local function create_translation_file()
-	local result = "// This file is automatically generated\n" ..
-			"// It conatins a bunch of fake gettext calls, to tell xgettext about the strings in config files\n" ..
-			"// To update it, refer to the bottom of builtin/mainmenu/tab_settings.lua\n\n" ..
-			"fake_function() {\n"
+local translation_file_header = [[
+// This file is automatically generated
+// It conatins a bunch of fake gettext calls, to tell xgettext about the strings in config files
+// To update it, refer to the bottom of builtin/mainmenu/dlg_settings_advanced.lua
 
+fake_function() {]]
+
+local function create_translation_file()
+	local result = { translation_file_header }
 	for _, entry in ipairs(settings) do
 		if entry.type == "category" then
-			local name_escaped = entry.name:gsub("\"", "\\\"")
-			result = result .. "\tgettext(\"" .. name_escaped .. "\");\n"
+			insert(result, sprintf("\tgettext(%q);", entry.name))
 		else
 			if entry.readable_name then
-				local readable_name_escaped = entry.readable_name:gsub("\"", "\\\"")
-				result = result .. "\tgettext(\"" .. readable_name_escaped .. "\");\n"
+				insert(result, sprintf("\tgettext(%q);", entry.readable_name))
 			end
 			if entry.comment ~= "" then
 				local comment_escaped = entry.comment:gsub("\n", "\\n")
 				comment_escaped = comment_escaped:gsub("\"", "\\\"")
-				result = result .. "\tgettext(\"" .. comment_escaped .. "\");\n"
+				insert(result, "\tgettext(\"" .. comment_escaped .. "\");")
 			end
 		end
 	end
-	result = result .. "}\n"
-	return result
+	insert(result, "}\n")
+	return concat(result, "\n")
 end
 
-if false then
-	local file = io.open("minetest.conf.example", "w")
-	if file then
-		file:write(create_minetest_conf_example())
-		file:close()
-	end
-end
+local file = assert(io.open("minetest.conf.example", "w"))
+file:write(create_minetest_conf_example())
+file:close()
+
+file = assert(io.open("src/settings_translation_file.cpp", "w"))
+file:write(create_translation_file())
+file:close()
 
-if false then
-	local file = io.open("src/settings_translation_file.cpp", "w")
-	if file then
-		file:write(create_translation_file())
-		file:close()
-	end
-end
\ No newline at end of file
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index 3e82279cd..10e38e1a7 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -1,6 +1,6 @@
 // This file is automatically generated
 // It conatins a bunch of fake gettext calls, to tell xgettext about the strings in config files
-// To update it, refer to the bottom of builtin/mainmenu/tab_settings.lua
+// To update it, refer to the bottom of builtin/mainmenu/dlg_settings_advanced.lua
 
 fake_function() {
 	gettext("Client");

From f092dac9793b80c29a669b0d676ee3e4f55f682e Mon Sep 17 00:00:00 2001
From: est31 <est31@users.noreply.github.com>
Date: Sat, 20 Aug 2016 21:26:44 +0200
Subject: [PATCH 147/418] Also support X11 icon for minetest copies installed
 via make install (#4407)

Fixes #4323.
---
 CMakeLists.txt                |  3 +++
 src/client/clientlauncher.cpp |  3 +--
 src/cmake_config.h.in         |  1 +
 src/porting.cpp               | 19 ++++++++++++++++++-
 src/porting.h                 |  4 +++-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 592feb997..fbf6bb7fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,6 +175,9 @@ if(UNIX AND NOT APPLE)
 	install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
 	install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}")
 	install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
+	install(FILES "misc/minetest-xorg-icon-128.png"
+		DESTINATION "${ICONDIR}/hicolor/128x128/apps"
+		RENAME "minetest.png")
 endif()
 
 if(APPLE)
diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index aa3c2d548..6145e3dde 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -114,8 +114,7 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
 
 	porting::setXorgClassHint(video_driver->getExposedVideoData(), PROJECT_NAME_C);
 
-	porting::setXorgWindowIcon(device,
-		porting::path_share + "/misc/minetest-xorg-icon-128.png");
+	porting::setXorgWindowIcon(device);
 
 	/*
 		This changes the minimum allowed number of vertices in a VBO.
diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in
index 50f34a0b8..4b731020a 100644
--- a/src/cmake_config.h.in
+++ b/src/cmake_config.h.in
@@ -14,6 +14,7 @@
 #define STATIC_SHAREDIR "@SHAREDIR@"
 #define STATIC_LOCALEDIR "@LOCALEDIR@"
 #define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
+#define ICON_DIR "@ICONDIR@"
 #cmakedefine01 RUN_IN_PLACE
 #cmakedefine01 USE_GETTEXT
 #cmakedefine01 USE_CURL
diff --git a/src/porting.cpp b/src/porting.cpp
index acd047232..ae9114ac8 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -611,7 +611,24 @@ void setXorgClassHint(const video::SExposedVideoData &video_data,
 #endif
 }
 
-bool setXorgWindowIcon(IrrlichtDevice *device,
+bool setXorgWindowIcon(IrrlichtDevice *device)
+{
+#if RUN_IN_PLACE
+	return setXorgWindowIconFromPath(device,
+			path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
+#else
+	// We have semi-support for reading in-place data if we are
+	// compiled with RUN_IN_PLACE. Don't break with this and
+	// also try the path_share location.
+	return
+		setXorgWindowIconFromPath(device,
+			ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") ||
+		setXorgWindowIconFromPath(device,
+			path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
+#endif
+}
+
+bool setXorgWindowIconFromPath(IrrlichtDevice *device,
 	const std::string &icon_file)
 {
 #ifdef XORG_USED
diff --git a/src/porting.h b/src/porting.h
index 40f6b4dc3..f5c7efcb2 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -367,7 +367,9 @@ inline const char *getPlatformName()
 void setXorgClassHint(const video::SExposedVideoData &video_data,
 	const std::string &name);
 
-bool setXorgWindowIcon(IrrlichtDevice *device,
+bool setXorgWindowIcon(IrrlichtDevice *device);
+
+bool setXorgWindowIconFromPath(IrrlichtDevice *device,
 	const std::string &icon_file);
 
 // This only needs to be called at the start of execution, since all future

From cafa400fa5077e7cb9c627d79482941cb82a81cf Mon Sep 17 00:00:00 2001
From: kahrl <kahrl@gmx.net>
Date: Sun, 21 Aug 2016 02:40:23 +0200
Subject: [PATCH 148/418] gettext.h: include <locale> before defining the
 gettext macro (#4452)

Fixes #4446: a syntax error that happens if something else (such as
<iomanip> or <locale> in certain libstdc++ versions) includes
<libintl.h> later, which contains a function declaration for gettext
that gets mangled by the macro.

See the added comment in gettext.h and the discussion in #4446/#4452
for details.
---
 src/gettext.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/gettext.h b/src/gettext.h
index b8d27f77c..885d7ca2d 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -25,6 +25,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #if USE_GETTEXT
 	#include <libintl.h>
 #else
+	// In certain environments, some standard headers like <iomanip>
+	// and <locale> include libintl.h. If libintl.h is included after
+	// we define our gettext macro below, this causes a syntax error
+	// at the declaration of the gettext function in libintl.h.
+	// Fix this by including such a header before defining the macro.
+	// See issue #4446.
+	// Note that we can't include libintl.h directly since we're in
+	// the USE_GETTEXT=0 case and can't assume that gettext is installed.
+	#include <locale>
+
 	#define gettext(String) String
 #endif
 

From 0b0075e6ad0b3110cabdfc92cedb0a24d2b5ec42 Mon Sep 17 00:00:00 2001
From: Xunto <xunto@users.noreply.github.com>
Date: Mon, 22 Aug 2016 22:21:48 +0400
Subject: [PATCH 149/418] Move on join and on leave messages to lua (#4460)

---
 builtin/game/misc.lua | 14 +++++++++++---
 src/server.cpp        | 30 ------------------------------
 2 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 4773e0012..d7164812a 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -87,11 +87,19 @@ end
 local player_list = {}
 
 core.register_on_joinplayer(function(player)
-	player_list[player:get_player_name()] = player
+	local player_name = player:get_player_name()
+	player_list[player_name] = player
+	core.chat_send_all("*** " .. player_name .. " joined the game.")
 end)
 
-core.register_on_leaveplayer(function(player)
-	player_list[player:get_player_name()] = nil
+core.register_on_leaveplayer(function(player, timed_out)
+	local player_name = player:get_player_name()
+	player_list[player_name] = nil
+	local announcement = "*** " ..  player_name .. " left the game."
+	if timed_out then
+		announcement = announcement .. " (timed out)"
+	end
+	core.chat_send_all(announcement)
 end)
 
 function core.get_connected_players()
diff --git a/src/server.cpp b/src/server.cpp
index 97a53f189..fb241f179 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1118,23 +1118,6 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
 	if(!m_simple_singleplayer_mode) {
 		// Send information about server to player in chat
 		SendChatMessage(peer_id, getStatusString());
-
-		// Send information about joining in chat
-		{
-			std::string name = "unknown";
-			Player *player = m_env->getPlayer(peer_id);
-			if(player != NULL)
-				name = player->getName();
-
-			std::wstring message;
-			message += L"*** ";
-			message += narrow_to_wide(name);
-			message += L" joined the game.";
-			SendChatMessage(PEER_ID_INEXISTENT,message);
-			if (m_admin_chat)
-				m_admin_chat->outgoing_queue.push_back(
-					new ChatEventNick(CET_NICK_ADD, name));
-		}
 	}
 	Address addr = getPeerAddress(player->peer_id);
 	std::string ip_str = addr.serializeString();
@@ -2660,19 +2643,6 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 
 		Player *player = m_env->getPlayer(peer_id);
 
-		// Collect information about leaving in chat
-		{
-			if(player != NULL && reason != CDR_DENY)
-			{
-				std::wstring name = narrow_to_wide(player->getName());
-				message += L"*** ";
-				message += name;
-				message += L" left the game.";
-				if(reason == CDR_TIMEOUT)
-					message += L" (timed out)";
-			}
-		}
-
 		/* Run scripts and remove from environment */
 		{
 			if(player != NULL)

From d767f025cb0d5cca29c1f2147d2a0931a088b717 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 22 Aug 2016 04:27:44 +0200
Subject: [PATCH 150/418] Client: disable pre v25 init sending by default

Disable the ability to connect to old servers by default to
improve password security.

If people still want to connect to old (0.4.12 and earlier)
servers, they can flip the send_pre_v25_init setting.

Add the ability to detect if we've tried to connect
to a server which only supports the pre v25 init protocol,
and show an apropriate error message. Most times the error
will already be catched at the serverlist level, the
detection mechanism only acts as last resort, because the
"Connection timed out" error message that would be shown
otherwise would be very confusing.

Automatic "fixing" of this condition is not desired,
as it would allow for downgrade attacks.

As already 161 of the 167 servers on the serverlist
support the new srp based auth protocol (> 96%),
the breakage should be minimal.

Follow up of commit

af30183124d40a969040d7de4b3a487feec466e4 "Add option to not send pre v25 init packet"

Also change the pessimistic assumption of masterlist
server versions to optimistic, in order to avoid buggy
behaviour (favourites not in the serverlist would be
denied to connect to, etc).
---
 builtin/mainmenu/common.lua | 10 +++++++---
 builtin/settingtypes.txt    |  2 +-
 minetest.conf.example       |  4 ++--
 src/client.h                |  3 +++
 src/defaultsettings.cpp     |  2 +-
 src/game.cpp                | 21 ++++++++++++++++++++-
 6 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 1fd89ff77..da3667828 100644
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -248,14 +248,18 @@ end
 
 --------------------------------------------------------------------------------
 function is_server_protocol_compat(server_proto_min, server_proto_max)
-	return min_supp_proto <= (server_proto_max or 24) and max_supp_proto >= (server_proto_min or 13)
+	if (not server_proto_min) or (not server_proto_max) then
+		-- There is no info. Assume the best and act as if we would be compatible.
+		return true
+	end
+	return min_supp_proto <= server_proto_max and max_supp_proto >= server_proto_min
 end
 --------------------------------------------------------------------------------
 function is_server_protocol_compat_or_error(server_proto_min, server_proto_max)
 	if not is_server_protocol_compat(server_proto_min, server_proto_max) then
 		local server_prot_ver_info, client_prot_ver_info
-		local s_p_min = server_proto_min or 13
-		local s_p_max = server_proto_max or 24
+		local s_p_min = server_proto_min
+		local s_p_max = server_proto_max
 
 		if s_p_min ~= s_p_max then
 			server_prot_ver_info = fgettext_ne("Server supports protocol versions between $1 and $2. ",
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 864485cce..4d354a7ef 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -247,7 +247,7 @@ remote_port (Remote port) int 30000 1 65535
 #    Enable if you want to connect to 0.4.12 servers and before.
 #    Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.
 #    Disabling this option will protect your password better.
-send_pre_v25_init (Support older servers) bool true
+send_pre_v25_init (Support older servers) bool false
 
 #    Save the map received by the client on disk.
 enable_local_map_saving (Saving map received from server) bool false
diff --git a/minetest.conf.example b/minetest.conf.example
index 03a917a39..48c54c320 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -261,7 +261,7 @@
 #    Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.
 #    Disabling this option will protect your password better.
 #    type: bool
-# send_pre_v25_init = true
+# send_pre_v25_init = false
 
 #    Save the map received by the client on disk.
 #    type: bool
@@ -1485,7 +1485,7 @@
 # profiler.default_report_format = txt
 
 #    The file path relative to your worldpath in which profiles will be saved to.
-#    
+#
 #    type: string
 # profiler.report_path = ""
 
diff --git a/src/client.h b/src/client.h
index a7eb22ad9..b479062a0 100644
--- a/src/client.h
+++ b/src/client.h
@@ -499,6 +499,9 @@ public:
 	u8 getProtoVersion()
 	{ return m_proto_ver; }
 
+	bool connectedToServer()
+	{ return m_con.Connected(); }
+
 	float mediaReceiveProgress();
 
 	void afterContentReceived(IrrlichtDevice *device);
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 42b232afc..7c6f7ef3d 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -190,7 +190,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("minimap_shape_round", "true");
 	settings->setDefault("minimap_double_scan_height", "true");
 
-	settings->setDefault("send_pre_v25_init", "true");
+	settings->setDefault("send_pre_v25_init", "false");
 
 	settings->setDefault("curl_timeout", "5000");
 	settings->setDefault("curl_parallel_limit", "8");
diff --git a/src/game.cpp b/src/game.cpp
index 1a036d03a..5a3b10879 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2403,7 +2403,26 @@ bool Game::connectToServer(const std::string &playername,
 			wait_time += dtime;
 			// Only time out if we aren't waiting for the server we started
 			if ((*address != "") && (wait_time > 10)) {
-				*error_message = "Connection timed out.";
+				bool sent_old_init = g_settings->getFlag("send_pre_v25_init");
+				// If no pre v25 init was sent, and no answer was received,
+				// but the low level connection could be established
+				// (meaning that we have a peer id), then we probably wanted
+				// to connect to a legacy server. In this case, tell the user
+				// to enable the option to be able to connect.
+				if (!sent_old_init &&
+						(client->getProtoVersion() == 0) &&
+						client->connectedToServer()) {
+					*error_message = "Connection failure: init packet not "
+					"recognized by server.\n"
+					"Most likely the server uses an old protocol version (<v25).\n"
+					"Please ask the server owner to update to 0.4.13 or later.\n"
+					"To still connect to the server in the meantime,\n"
+					"you can enable the 'send_pre_v25_init' setting by editing minetest.conf,\n"
+					"or by enabling the 'Client -> Network -> Support older Servers'\n"
+					"entry in the advanced settings menu.";
+				} else {
+					*error_message = "Connection timed out.";
+				}
 				errorstream << *error_message << std::endl;
 				break;
 			}

From e58a55aa82dfc66325a694dcc3519d3c0f3388a6 Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar@foo-projects.org>
Date: Thu, 10 Dec 2015 22:58:11 -0800
Subject: [PATCH 151/418] Make plantlike drawtype more fun

Adds several new ways that the plantlike drawtype mesh can be changed.

This requires paramtype2 = "meshoptions" to be set in the node
definition. The drawtype for these nodes should be "plantlike".

These modifications are all done using param2. This field is now
a complex bitfield that allows some or more of the combinations to
be chosen, and the mesh draw code will choose the options based as
neeeded for each plantlike node.

bit layout:
bits 0, 1 and 2 (values 0x1 through 0x7) are for choosing the plant
mesh shape:
  0 - ordinary plantlike plant ("x" shaped)
  1 - ordinary plant, but rotated 45 degrees ("+" shaped)
  2 - a plant with 3 faces ("*" shaped)
  3 - a plant with 4 faces ("#" shaped)
  4 - a plant with 4 faces ("#" shaped, leaning outwards)
  5 through 7 are unused and reserved for future mesh shapes.

bit 3 (0x8) causes the plant to be randomly offset in the x,z
plane. The plant should fall within the 1x1x1 nodebox if regularly
sized.

bit 4 (0x10) causes the plant mesh to grow by sqrt(2), and will cause
the plant mesh to fill out 1x1x1, and appear slightly larger. Texture
makers will want to make their plant texture 23x16 pixels to have the
best visual fit in 1x1x1 size.

bit 5 (0x20) causes each face of the plant to have a slight negative
Y offset in position, descending up to 0.125 downwards into the node
below. Because this is per face, this causes the plant model to be
less symmetric.

bit 6 (0x40) through bit 7 (0x80) are unused and reserved for
future use.

!(https://youtu.be/qWuI664krsI)
---
 doc/lua_api.txt               |  16 ++++
 src/content_mapblock.cpp      | 152 +++++++++++++++++++++++++++++++---
 src/network/networkprotocol.h |   4 +-
 src/nodedef.cpp               |   5 +-
 src/nodedef.h                 |   2 +
 src/script/cpp_api/s_node.cpp |   1 +
 6 files changed, 167 insertions(+), 13 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 38f19aadc..440edd963 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -578,6 +578,22 @@ node definition:
     ^ The rotation of this node is stored in param2. Plants are rotated this way.
       Values range 0 - 179. The value stored in param2 is multiplied by two to
       get the actual rotation of the node.
+    paramtype2 == "meshoptions"
+    ^ Only valid for "plantlike". The value of param2 becomes a bitfield which can
+      be used to change how the client draws plantlike nodes. Bits 0, 1 and 2 form
+      a mesh selector. Currently the following meshes are choosable:
+        0 = a "x" shaped plant (ordinary plant)
+        1 = a "+" shaped plant (just rotated 45 degrees)
+        2 = a "*" shaped plant with 3 faces instead of 2
+        3 = a "#" shaped plant with 4 faces instead of 2
+        4 = a "#" shaped plant with 4 faces that lean outwards
+        5-7 are unused and reserved for future meshes.
+      Bits 3 through 7 are optional flags that can be combined and give these
+      effects:
+        bit 3 (0x08) - Makes the plant slightly vary placement horizontally
+        bit 4 (0x10) - Makes the plant mesh 1.4x larger
+        bit 5 (0x20) - Moves each face randomly a small bit down (1/8 max)
+        bits 6-7 are reserved for future use.
     collision_box = {
       type = "fixed",
       fixed = {
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 6a83bd8f3..b86b97822 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IMeshManipulator.h>
 #include "gamedef.h"
 #include "log.h"
+#include "noise.h"
 
 
 // Create a cuboid.
@@ -1104,6 +1105,8 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 		break;}
 		case NDT_PLANTLIKE:
 		{
+			PseudoRandom rng(x<<8 | z | y<<16);
+
 			TileSpec tile = getNodeTileN(n, p, 0, data);
 			tile.material_flags |= MATERIAL_FLAG_CRACK_OVERLAY;
 
@@ -1111,9 +1114,18 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 			video::SColor c = MapBlock_LightColor(255, l, f.light_source);
 
 			float s = BS / 2 * f.visual_scale;
+			// add sqrt(2) visual scale
+			if ((f.param_type_2 == CPT2_MESHOPTIONS) && ((n.param2 & 0x10) != 0))
+				s *= 1.41421;
 
-			for (int j = 0; j < 2; j++)
-			{
+			float random_offset_X = .0;
+			float random_offset_Z = .0;
+			if ((f.param_type_2 == CPT2_MESHOPTIONS) && ((n.param2 & 0x8) != 0)) {
+				random_offset_X = BS * ((rng.next() % 16 / 16.0) * 0.29 - 0.145);
+				random_offset_Z = BS * ((rng.next() % 16 / 16.0) * 0.29 - 0.145);
+			}
+
+			for (int j = 0; j < 4; j++) {
 				video::S3DVertex vertices[4] =
 				{
 					video::S3DVertex(-s,-BS/2, 0, 0,0,0, c, 0,1),
@@ -1121,28 +1133,146 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 					video::S3DVertex( s,-BS/2 + s*2,0, 0,0,0, c, 1,0),
 					video::S3DVertex(-s,-BS/2 + s*2,0, 0,0,0, c, 0,0),
 				};
+
 				float rotate_degree = 0;
+				u8 p2mesh = 0;
 				if (f.param_type_2 == CPT2_DEGROTATE)
 					rotate_degree = n.param2 * 2;
-
-				if (j == 0) {
-					for(u16 i = 0; i < 4; i++)
-						vertices[i].Pos.rotateXZBy(46 + rotate_degree);
-				} else if (j == 1) {
-					for(u16 i = 0; i < 4; i++)
-						vertices[i].Pos.rotateXZBy(-44 + rotate_degree);
+				else if (f.param_type_2 != CPT2_MESHOPTIONS) {
+					if (j == 0) {
+						for (u16 i = 0; i < 4; i++)
+							vertices[i].Pos.rotateXZBy(46 + rotate_degree);
+					} else if (j == 1) {
+						for (u16 i = 0; i < 4; i++)
+							vertices[i].Pos.rotateXZBy(-44 + rotate_degree);
+					}
+				} else {
+					p2mesh = n.param2 & 0x7;
+					switch (p2mesh) {
+					case 0:
+						// x
+						if (j == 0) {
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(46);
+						} else if (j == 1) {
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(-44);
+						}
+						break;
+					case 1:
+						// +
+						if (j == 0) {
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(91);
+						} else if (j == 1) {
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(1);
+						}
+						break;
+					case 2:
+						// *
+						if (j == 0) {
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(121);
+						} else if (j == 1) {
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(241);
+						} else { // (j == 2)
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(1);
+						}
+						break;
+					case 3:
+						// #
+						switch (j) {
+						case 0:
+							for (u16 i = 0; i < 4; i++) {
+								vertices[i].Pos.rotateXZBy(1);
+								vertices[i].Pos.Z += BS / 4;
+							}
+							break;
+						case 1:
+							for (u16 i = 0; i < 4; i++) {
+								vertices[i].Pos.rotateXZBy(91);
+								vertices[i].Pos.X += BS / 4;
+							}
+							break;
+						case 2:
+							for (u16 i = 0; i < 4; i++) {
+								vertices[i].Pos.rotateXZBy(181);
+								vertices[i].Pos.Z -= BS / 4;
+							}
+							break;
+						case 3:
+							for (u16 i = 0; i < 4; i++) {
+								vertices[i].Pos.rotateXZBy(271);
+								vertices[i].Pos.X -= BS / 4;
+							}
+							break;
+						}
+						break;
+					case 4:
+						// outward leaning #-like
+						switch (j) {
+						case 0:
+							for (u16 i = 2; i < 4; i++)
+								vertices[i].Pos.Z -= BS / 2;
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(1);
+							break;
+						case 1:
+							for (u16 i = 2; i < 4; i++)
+								vertices[i].Pos.Z -= BS / 2;
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(91);
+							break;
+						case 2:
+							for (u16 i = 2; i < 4; i++)
+								vertices[i].Pos.Z -= BS / 2;
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(181);
+							break;
+						case 3:
+							for (u16 i = 2; i < 4; i++)
+								vertices[i].Pos.Z -= BS / 2;
+							for (u16 i = 0; i < 4; i++)
+								vertices[i].Pos.rotateXZBy(271);
+							break;
+						}
+						break;
+					}
 				}
 
-				for (int i = 0; i < 4; i++)
-				{
+				for (int i = 0; i < 4; i++) {
 					vertices[i].Pos *= f.visual_scale;
 					vertices[i].Pos.Y += BS/2 * (f.visual_scale - 1);
 					vertices[i].Pos += intToFloat(p, BS);
+					// move to a random spot to avoid moire
+					if ((f.param_type_2 == CPT2_MESHOPTIONS) && ((n.param2 & 0x8) != 0)) {
+						vertices[i].Pos.X += random_offset_X;
+						vertices[i].Pos.Z += random_offset_Z;
+					}
+					// randomly move each face up/down
+					if ((f.param_type_2 == CPT2_MESHOPTIONS) && ((n.param2 & 0x20) != 0)) {
+						PseudoRandom yrng(j | x<<16 | z<<8 | y<<24 );
+						vertices[i].Pos.Y -= BS * ((yrng.next() % 16 / 16.0) * 0.125);
+					}
 				}
 
 				u16 indices[] = {0, 1, 2, 2, 3, 0};
 				// Add to mesh collector
 				collector.append(tile, vertices, 4, indices, 6);
+
+				// stop adding faces for meshes with less than 4 faces
+				if (f.param_type_2 == CPT2_MESHOPTIONS) {
+					if (((p2mesh == 0) || (p2mesh == 1)) && (j == 1))
+						break;
+					else if ((p2mesh == 2) && (j == 2))
+						break;
+				} else if (j == 1) {
+					break;
+				}
+
 			}
 		break;}
 		case NDT_FIRELIKE:
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index 3a9483efb..e3fcae0c6 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -136,9 +136,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 		backface_culling: backwards compatibility for playing with
 		newer client on pre-27 servers.
 		Add nodedef v3 - connected nodeboxes
+	PROTOCOL_VERSION 28:
+		CPT2_MESHOPTIONS
 */
 
-#define LATEST_PROTOCOL_VERSION 27
+#define LATEST_PROTOCOL_VERSION 28
 
 // Server's supported network protocol range
 #define SERVER_PROTOCOL_VERSION_MIN 13
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 764203efc..646375575 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -387,7 +387,10 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
 	writeU8(os, post_effect_color.getGreen());
 	writeU8(os, post_effect_color.getBlue());
 	writeU8(os, param_type);
-	writeU8(os, param_type_2);
+	if ((protocol_version < 28) && (param_type_2 == CPT2_MESHOPTIONS))
+		writeU8(os, CPT2_NONE);
+	else
+		writeU8(os, param_type_2);
 	writeU8(os, is_ground_content);
 	writeU8(os, light_propagates);
 	writeU8(os, sunlight_propagates);
diff --git a/src/nodedef.h b/src/nodedef.h
index 1c2f792d8..f17c53727 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -65,6 +65,8 @@ enum ContentParamType2
 	CPT2_LEVELED,
 	// 2D rotation for things like plants
 	CPT2_DEGROTATE,
+	// Mesh options for plants
+	CPT2_MESHOPTIONS
 };
 
 enum LiquidType
diff --git a/src/script/cpp_api/s_node.cpp b/src/script/cpp_api/s_node.cpp
index 17f0f0dac..379ed773f 100644
--- a/src/script/cpp_api/s_node.cpp
+++ b/src/script/cpp_api/s_node.cpp
@@ -58,6 +58,7 @@ struct EnumString ScriptApiNode::es_ContentParamType2[] =
 		{CPT2_WALLMOUNTED, "wallmounted"},
 		{CPT2_LEVELED, "leveled"},
 		{CPT2_DEGROTATE, "degrotate"},
+		{CPT2_MESHOPTIONS, "meshoptions"},
 		{0, NULL},
 	};
 

From fb20b45100490acd47038be43b6f257c1bd75d97 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sat, 20 Aug 2016 02:05:34 +0100
Subject: [PATCH 152/418] Camera: Higher frequency limit for view/hand bobbing
 and footsteps

Rebased and tuned version of Calinou's original pull request.

'm_view_bobbing_speed' controls the frequency of view bobbing,
hand bobbing and footsteps, it was limited to a maximum of 40 (walking
frequency) so did not increase if player speed was modified by a
'speed buff', a sprinting mod or modified in .conf or advanced
settngs.

This commit raises the limit to 70 which is suitable for sprinting.
---
 src/camera.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/camera.cpp b/src/camera.cpp
index e1fec4a3e..4feab1fe5 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -472,7 +472,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
 	{
 		// Start animation
 		m_view_bobbing_state = 1;
-		m_view_bobbing_speed = MYMIN(speed.getLength(), 40);
+		m_view_bobbing_speed = MYMIN(speed.getLength(), 70);
 	}
 	else if (m_view_bobbing_state == 1)
 	{

From 4330c63ea40a75d4b8fcf71dc749fed714b22a44 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Sun, 7 Aug 2016 16:01:00 +0100
Subject: [PATCH 153/418] Submit name of field on enter key press

---
 src/guiFormSpecMenu.cpp | 13 +++++++++++++
 src/guiFormSpecMenu.h   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index a9cbb6254..dd96da5a9 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -104,6 +104,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
 	m_formspec_version(0),
 	m_focused_element(""),
 	m_joystick(joystick),
+	current_field_enter_pending(""),
 	m_font(NULL),
 	m_remap_dbl_click(remap_dbl_click)
 #ifdef __ANDROID__
@@ -2695,6 +2696,10 @@ void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode=quit_mode_no)
 			current_keys_pending.key_enter = false;
 		}
 
+		if (!current_field_enter_pending.empty()) {
+			fields["key_enter_field"] = current_field_enter_pending;
+		}
+
 		if (current_keys_pending.key_escape) {
 			fields["key_escape"] = "true";
 			current_keys_pending.key_escape = false;
@@ -3625,8 +3630,16 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 
 		if (event.GUIEvent.EventType == gui::EGET_EDITBOX_ENTER) {
 			if (event.GUIEvent.Caller->getID() > 257) {
+				for (u32 i = 0; i < m_fields.size(); i++) {
+					FieldSpec &s = m_fields[i];
+					if (s.ftype == f_Unknown &&
+							s.fid == event.GUIEvent.Caller->getID()) {
+						current_field_enter_pending = s.fname;
+					}
+				}
 
 				if (m_allowclose) {
+					current_keys_pending.key_enter = true;
 					acceptInput(quit_mode_accept);
 					quitMenu();
 				} else {
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 2fb55070d..7b809df71 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -463,6 +463,7 @@ private:
 	} fs_key_pendig;
 
 	fs_key_pendig current_keys_pending;
+	std::string current_field_enter_pending;
 
 	void parseElement(parserData* data,std::string element);
 
@@ -557,4 +558,3 @@ public:
 };
 
 #endif
-

From e10fee00011f6c1ef8ee5b884adb11013954a1c9 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Sun, 7 Aug 2016 16:22:50 +0100
Subject: [PATCH 154/418] Allow fields to choose whether they close on enter
 press

---
 doc/lua_api.txt         | 18 +++++++++++++++---
 src/guiFormSpecMenu.cpp | 28 +++++++++++++++++++++++-----
 src/guiFormSpecMenu.h   | 12 +++++++-----
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 440edd963..579fe796e 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1503,17 +1503,23 @@ examples.
 * If `true` the background is clipped to formspec size
   (`x` and `y` are used as offset values, `w` and `h` are ignored)
 
-#### `pwdfield[<X>,<Y>;<W>,<H>;<name>;<label>]`
+#### `pwdfield[<X>,<Y>;<W>,<H>;<name>;<label>;<close_on_enter>]`
 * Textual password style field; will be sent to server when a button is clicked
+* When enter is pressed in field, fields.key_enter_field will be sent with the name
+  of this field.
 * `x` and `y` position the field relative to the top left of the menu
 * `w` and `h` are the size of the field
 * Fields are a set height, but will be vertically centred on `h`
 * Position and size units are inventory slots
 * `name` is the name of the field as returned in fields to `on_receive_fields`
 * `label`, if not blank, will be text printed on the top left above the field
+* `close_on_enter` (optional) is whether the form should accept and close when enter is
+  pressed in this field. Defaults to true.
 
-#### `field[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]`
+#### `field[<X>,<Y>;<W>,<H>;<name>;<label>;<default>;<close_on_enter>]`
 * Textual field; will be sent to server when a button is clicked
+* When enter is pressed in field, fields.key_enter_field will be sent with the name
+  of this field.
 * `x` and `y` position the field relative to the top left of the menu
 * `w` and `h` are the size of the field
 * Fields are a set height, but will be vertically centred on `h`
@@ -1524,12 +1530,18 @@ examples.
     * `default` may contain variable references such as `${text}'` which
       will fill the value from the metadata value `text`
     * **Note**: no extra text or more than a single variable is supported ATM.
+* `close_on_enter` (optional) is whether the form should accept and close when enter is
+  pressed in this field. Defaults to true.
 
-#### `field[<name>;<label>;<default>]`
+#### `field[<name>;<label>;<default>;<close_on_enter>]`
 * As above, but without position/size units
+* When enter is pressed in field, fields.key_enter_field will be sent with the name
+  of this field.
 * Special field for creating simple forms, such as sign text input
 * Must be used without a `size[]` element
 * A "Proceed" button will be added automatically
+* `close_on_enter` (optional) is whether the form should accept and close when enter is
+  pressed in this field. Defaults to true.
 
 #### `textarea[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]`
 * Same as fields above, but with multi-line input
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index dd96da5a9..2564671a3 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -894,8 +894,8 @@ void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element)
 {
 	std::vector<std::string> parts = split(element,';');
 
-	if ((parts.size() == 4) ||
-		((parts.size() > 4) && (m_formspec_version > FORMSPEC_API_VERSION)))
+	if ((parts.size() == 4) || (parts.size() == 5) ||
+		((parts.size() > 5) && (m_formspec_version > FORMSPEC_API_VERSION)))
 	{
 		std::vector<std::string> v_pos = split(parts[0],',');
 		std::vector<std::string> v_geom = split(parts[1],',');
@@ -952,6 +952,11 @@ void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element)
 		evt.KeyInput.Shift       = 0;
 		evt.KeyInput.PressedDown = true;
 		e->OnEvent(evt);
+
+		if (parts.size() >= 5 && !is_yes(parts[4])) {
+			spec.close_on_enter = false;
+		}
+
 		m_fields.push_back(spec);
 		return;
 	}
@@ -1033,6 +1038,10 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data,
 		}
 	}
 
+	if (parts.size() >= 4 && !is_yes(parts[3])) {
+		spec.close_on_enter = false;
+	}
+
 	m_fields.push_back(spec);
 }
 
@@ -1137,6 +1146,11 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,
 			addStaticText(Environment, spec.flabel.c_str(), rect, false, true, this, 0);
 		}
 	}
+
+	if (parts.size() >= 6 && !is_yes(parts[5])) {
+		spec.close_on_enter = false;
+	}
+
 	m_fields.push_back(spec);
 }
 
@@ -1150,8 +1164,8 @@ void GUIFormSpecMenu::parseField(parserData* data,std::string element,
 		return;
 	}
 
-	if ((parts.size() == 5) ||
-		((parts.size() > 5) && (m_formspec_version > FORMSPEC_API_VERSION)))
+	if ((parts.size() == 5) || (parts.size() == 6) ||
+		((parts.size() > 6) && (m_formspec_version > FORMSPEC_API_VERSION)))
 	{
 		parseTextArea(data,parts,type);
 		return;
@@ -2698,6 +2712,7 @@ void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode=quit_mode_no)
 
 		if (!current_field_enter_pending.empty()) {
 			fields["key_enter_field"] = current_field_enter_pending;
+			current_field_enter_pending = "";
 		}
 
 		if (current_keys_pending.key_escape) {
@@ -3630,15 +3645,18 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 
 		if (event.GUIEvent.EventType == gui::EGET_EDITBOX_ENTER) {
 			if (event.GUIEvent.Caller->getID() > 257) {
+				bool close_on_enter = true;
 				for (u32 i = 0; i < m_fields.size(); i++) {
 					FieldSpec &s = m_fields[i];
 					if (s.ftype == f_Unknown &&
 							s.fid == event.GUIEvent.Caller->getID()) {
 						current_field_enter_pending = s.fname;
+						close_on_enter = s.close_on_enter;
+						break;
 					}
 				}
 
-				if (m_allowclose) {
+				if (m_allowclose && close_on_enter) {
 					current_keys_pending.key_enter = true;
 					acceptInput(quit_mode_accept);
 					quitMenu();
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 7b809df71..d06aa6cf5 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -202,20 +202,22 @@ class GUIFormSpecMenu : public GUIModalMenu
 		FieldSpec(const std::string &name, const std::wstring &label,
 				const std::wstring &default_text, int id) :
 			fname(name),
-			fid(id)
+			flabel(label),
+			fid(id),
+			send(false),
+			close_on_enter(false),
+			ftype(f_Unknown),
+			is_exit(false)
 		{
 			//flabel = unescape_enriched(label);
-			flabel = label;
 			fdefault = unescape_enriched(default_text);
-			send = false;
-			ftype = f_Unknown;
-			is_exit = false;
 		}
 		std::string fname;
 		std::wstring flabel;
 		std::wstring fdefault;
 		int fid;
 		bool send;
+		bool close_on_enter; // used by text fields
 		FormspecFieldType ftype;
 		bool is_exit;
 		core::rect<s32> rect;

From 51e13ae58881233a837dafb1ef33eb141c172e8d Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Thu, 28 Jul 2016 14:32:32 +0200
Subject: [PATCH 155/418] Builtin: Disallow registering users with the same
 name

Prevents duplicate names: 'NickName', 'nickname', 'NICKNAME'.
Skips already registered users, so they can connect as usual.
---
 builtin/game/auth.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/builtin/game/auth.lua b/builtin/game/auth.lua
index deb811b14..46fe3d342 100644
--- a/builtin/game/auth.lua
+++ b/builtin/game/auth.lua
@@ -199,3 +199,19 @@ core.register_on_joinplayer(function(player)
 	record_login(player:get_player_name())
 end)
 
+core.register_on_prejoinplayer(function(name, ip)
+	local auth = core.auth_table
+	if auth[name] ~= nil then
+		return
+	end
+
+	local name_lower = name:lower()
+	for k in pairs(auth) do
+		if k:lower() == name_lower then
+			return string.format("\nCannot create new player called '%s'. "..
+					"Another account called '%s' is already registered. "..
+					"Please check the spelling if it's your account "..
+					"or use a different nickname.", name, k)
+		end
+	end
+end)

From fbe4a9267ff75dc8f27ea1f6bcd59bc6727f347a Mon Sep 17 00:00:00 2001
From: red-001 <red-001@openmailbox.org>
Date: Sun, 28 Aug 2016 15:02:33 +0100
Subject: [PATCH 156/418] Settingtypes.txt: Clarify comments, correct spelling

---
 builtin/settingtypes.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 4d354a7ef..aadcb5de8 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -3,7 +3,7 @@
 # General format:
 #    name (Readable name) type type_args
 #
-# Note that the parts are seperated by exactly one space
+# Note that the parts are separated by exactly one space
 #
 # `type` can be:
 #    - int
@@ -109,7 +109,7 @@ enable_joysticks (Enable Joysticks) bool false
 
 #    The time in seconds it takes between repeated events
 #    when holding down a joystick button combination.
-repeat_joystick_button_time (Joystick button repetition invterval) float 0.17
+repeat_joystick_button_time (Joystick button repetition interval) float 0.17
 
 #    The sensitivity of the joystick axes for moving the
 #    ingame view frustum around.
@@ -204,7 +204,7 @@ keymap_toggle_chat (Chat toggle key) key KEY_F2
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 keymap_toggle_force_fog_off (Fog toggle key) key KEY_F3
 
-#    Key for toggling the camrea update. Only used for development
+#    Key for toggling the camera update. Only used for development
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 keymap_toggle_update_camera (Camera update toggle key) key
 
@@ -335,7 +335,7 @@ fsaa (FSAA) enum 0 0,1,2,4,8,16
 
 [***Shaders]
 
-#    Shaders allow advanced visul effects and may increase performance on some video cards.
+#    Shaders allow advanced visual effects and may increase performance on some video cards.
 #    Thy only work with the OpenGL video backend.
 enable_shaders (Shaders) bool true
 
@@ -545,7 +545,7 @@ gui_scaling_filter (GUI scaling filter) bool false
 #    When gui_scaling_filter_txr2img is true, copy those images
 #    from hardware to software for scaling.  When false, fall back
 #    to the old scaling method, for video drivers that don't
-#    propery support downloading textures back from hardware.
+#    properly support downloading textures back from hardware.
 gui_scaling_filter_txr2img (GUI scaling filter txr2img) bool true
 
 #    Delay showing tooltips, stated in milliseconds.
@@ -662,15 +662,15 @@ ipv6_server (IPv6 server) bool false
 
 [**Advanced]
 
-#    How many blocks are flying in the wire simultaneously per client.
-max_simultaneous_block_sends_per_client (Maximum simultaneously blocks send per client) int 10
+#    Maximum number of blocks that are simultaneously sent per client.
+max_simultaneous_block_sends_per_client (Maximum simultaneous block sends per client) int 10
 
-#    How many blocks are flying in the wire simultaneously for the whole server.
-max_simultaneous_block_sends_server_total (Maximum simultaneously bocks send total) int 40
+#   Maximum number of blocks that are simultaneously sent in total.
+max_simultaneous_block_sends_server_total (Maximum simultaneous block sends total) int 40
 
 #    To reduce lag, block transfers are slowed down when a player is building something.
 #    This determines how long they are slowed down after placing or removing a node.
-full_block_send_enable_min_time_from_building () float 2.0
+full_block_send_enable_min_time_from_building (Delay in sending blocks after building) float 2.0
 
 #    Maximum number of packets sent per send step, if you have a slow connection
 #    try reducing it, but don't reduce it to a number below double of targeted
@@ -804,7 +804,7 @@ max_clearobjects_extra_loaded_blocks (Max. clearobjects extra blocks) int 4096
 server_unload_unused_data_timeout (Unload unused server data) int 29
 
 #    Maximum number of statically stored objects in a block.
-max_objects_per_block (Maxmimum objects per block) int 49
+max_objects_per_block (Maximum objects per block) int 49
 
 #    See http://www.sqlite.org/pragma.html#pragma_synchronous
 sqlite_synchronous (Synchronous SQLite) enum 2 0,1,2
@@ -1154,7 +1154,7 @@ secure.enable_security (Enable mod security) bool false
 #    functions even when mod security is on (via request_insecure_environment()).
 secure.trusted_mods (Trusted mods) string
 
-#	Comma-seperated list of mods that are allowed to access HTTP APIs, which
+#	Comma-separated list of mods that are allowed to access HTTP APIs, which
 #	allow them to upload and download data to/from the internet.
 secure.http_mods (HTTP Mods) string
 

From 78ff5c193683fc643fbec85dc398da91d91a9e44 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Sun, 7 Aug 2016 14:32:31 +0100
Subject: [PATCH 157/418] Fix background formspec elements from interfering
 with each other

Fixes #4397
---
 src/guiFormSpecMenu.cpp | 26 ++++++++++++--------------
 src/guiFormSpecMenu.h   | 39 ++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 2564671a3..084a53c9d 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -637,17 +637,17 @@ void GUIFormSpecMenu::parseBackground(parserData* data,std::string element)
 		geom.X = stof(v_geom[0]) * (float)spacing.X;
 		geom.Y = stof(v_geom[1]) * (float)spacing.Y;
 
-		if (parts.size() == 4) {
-			m_clipbackground = is_yes(parts[3]);
-			if (m_clipbackground) {
-				pos.X = stoi(v_pos[0]); //acts as offset
-				pos.Y = stoi(v_pos[1]); //acts as offset
-			}
-		}
-
-		if(!data->explicit_size)
+		if (!data->explicit_size)
 			warningstream<<"invalid use of background without a size[] element"<<std::endl;
-		m_backgrounds.push_back(ImageDrawSpec(name, pos, geom));
+
+		bool clip = false;
+		if (parts.size() == 4 && is_yes(parts[3])) {
+			pos.X = stoi(v_pos[0]); //acts as offset
+			pos.Y = stoi(v_pos[1]); //acts as offset
+			clip = true;
+		}
+		m_backgrounds.push_back(ImageDrawSpec(name, pos, geom, clip));
+
 		return;
 	}
 	errorstream<< "Invalid background element(" << parts.size() << "): '" << element << "'"  << std::endl;
@@ -1892,7 +1892,6 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 	m_slotbordercolor = video::SColor(200,0,0,0);
 	m_slotborder = false;
 
-	m_clipbackground = false;
 	// Add tooltip
 	{
 		assert(m_tooltip_element == NULL);
@@ -2344,7 +2343,7 @@ void GUIFormSpecMenu::drawMenu()
 			// Image rectangle on screen
 			core::rect<s32> rect = imgrect + spec.pos;
 
-			if (m_clipbackground) {
+			if (spec.clip) {
 				core::dimension2d<s32> absrec_size = AbsoluteRect.getSize();
 				rect = core::rect<s32>(AbsoluteRect.UpperLeftCorner.X - spec.pos.X,
 									AbsoluteRect.UpperLeftCorner.Y - spec.pos.Y,
@@ -2358,8 +2357,7 @@ void GUIFormSpecMenu::drawMenu()
 				core::rect<s32>(core::position2d<s32>(0,0),
 						core::dimension2di(texture->getOriginalSize())),
 				NULL/*&AbsoluteClippingRect*/, colors, true);
-		}
-		else {
+		} else {
 			errorstream << "GUIFormSpecMenu::drawMenu() Draw backgrounds unable to load texture:" << std::endl;
 			errorstream << "\t" << spec.name << std::endl;
 		}
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index d06aa6cf5..dbcbf126a 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -143,9 +143,10 @@ class GUIFormSpecMenu : public GUIModalMenu
 	struct ImageDrawSpec
 	{
 		ImageDrawSpec():
-			parent_button(NULL)
-		{
-		}
+			parent_button(NULL),
+			clip(false)
+		{}
+
 		ImageDrawSpec(const std::string &a_name,
 				const std::string &a_item_name,
 				gui::IGUIButton *a_parent_button,
@@ -155,9 +156,10 @@ class GUIFormSpecMenu : public GUIModalMenu
 			parent_button(a_parent_button),
 			pos(a_pos),
 			geom(a_geom),
-			scale(true)
-		{
-		}
+			scale(true),
+			clip(false)
+		{}
+
 		ImageDrawSpec(const std::string &a_name,
 				const std::string &a_item_name,
 				const v2s32 &a_pos, const v2s32 &a_geom):
@@ -166,32 +168,36 @@ class GUIFormSpecMenu : public GUIModalMenu
 			parent_button(NULL),
 			pos(a_pos),
 			geom(a_geom),
-			scale(true)
-		{
-		}
+			scale(true),
+			clip(false)
+		{}
+
 		ImageDrawSpec(const std::string &a_name,
-				const v2s32 &a_pos, const v2s32 &a_geom):
+				const v2s32 &a_pos, const v2s32 &a_geom, bool clip=false):
 			name(a_name),
 			parent_button(NULL),
 			pos(a_pos),
 			geom(a_geom),
-			scale(true)
-		{
-		}
+			scale(true),
+			clip(clip)
+		{}
+
 		ImageDrawSpec(const std::string &a_name,
 				const v2s32 &a_pos):
 			name(a_name),
 			parent_button(NULL),
 			pos(a_pos),
-			scale(false)
-		{
-		}
+			scale(false),
+			clip(false)
+		{}
+
 		std::string name;
 		std::string item_name;
 		gui::IGUIButton *parent_button;
 		v2s32 pos;
 		v2s32 geom;
 		bool scale;
+		bool clip;
 	};
 
 	struct FieldSpec
@@ -428,7 +434,6 @@ protected:
 
 	bool m_bgfullscreen;
 	bool m_slotborder;
-	bool m_clipbackground;
 	video::SColor m_bgcolor;
 	video::SColor m_slotbg_n;
 	video::SColor m_slotbg_h;

From 1f2ff860f53438e8afacc859cc6f48ebfcfc21db Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Tue, 30 Aug 2016 04:40:54 +0200
Subject: [PATCH 158/418] Update minetest.conf.example and
 settings_translation_file.cpp

---
 minetest.conf.example             | 14 +++++++-------
 src/settings_translation_file.cpp | 23 +++++++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/minetest.conf.example b/minetest.conf.example
index 48c54c320..2465907ad 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -208,7 +208,7 @@
 #    type: key
 # keymap_toggle_force_fog_off = KEY_F3
 
-#    Key for toggling the camrea update. Only used for development
+#    Key for toggling the camera update. Only used for development
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 #    type: key
 # keymap_toggle_update_camera =
@@ -369,7 +369,7 @@
 
 #### Shaders
 
-#    Shaders allow advanced visul effects and may increase performance on some video cards.
+#    Shaders allow advanced visual effects and may increase performance on some video cards.
 #    Thy only work with the OpenGL video backend.
 #    type: bool
 # enable_shaders = true
@@ -633,7 +633,7 @@
 #    When gui_scaling_filter_txr2img is true, copy those images
 #    from hardware to software for scaling.  When false, fall back
 #    to the old scaling method, for video drivers that don't
-#    propery support downloading textures back from hardware.
+#    properly support downloading textures back from hardware.
 #    type: bool
 # gui_scaling_filter_txr2img = true
 
@@ -789,11 +789,11 @@
 
 ### Advanced
 
-#    How many blocks are flying in the wire simultaneously per client.
+#    Maximum number of blocks that are simultaneously sent per client.
 #    type: int
 # max_simultaneous_block_sends_per_client = 10
 
-#    How many blocks are flying in the wire simultaneously for the whole server.
+#    Maximum number of blocks that are simultaneously sent in total.
 #    type: int
 # max_simultaneous_block_sends_server_total = 40
 
@@ -1464,7 +1464,7 @@
 #    type: string
 # secure.trusted_mods =
 
-#    Comma-seperated list of mods that are allowed to access HTTP APIs, which
+#    Comma-separated list of mods that are allowed to access HTTP APIs, which
 #    allow them to upload and download data to/from the internet.
 #    type: string
 # secure.http_mods =
@@ -1485,7 +1485,7 @@
 # profiler.default_report_format = txt
 
 #    The file path relative to your worldpath in which profiles will be saved to.
-#
+#    
 #    type: string
 # profiler.report_path = ""
 
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index 10e38e1a7..4b6a50b80 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -37,7 +37,7 @@ fake_function() {
 	gettext("Continuous forward movement (only used for testing).");
 	gettext("Enable Joysticks");
 	gettext("Enable Joysticks");
-	gettext("Joystick button repetition invterval");
+	gettext("Joystick button repetition interval");
 	gettext("The time in seconds it takes between repeated events\nwhen holding down a joystick button combination.");
 	gettext("Joystick frustum sensitivity");
 	gettext("The sensitivity of the joystick axes for moving the\ningame view frustum around.");
@@ -86,7 +86,7 @@ fake_function() {
 	gettext("Fog toggle key");
 	gettext("Key for toggling the display of the fog.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Camera update toggle key");
-	gettext("Key for toggling the camrea update. Only used for development\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Key for toggling the camera update. Only used for development\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Debug info toggle key");
 	gettext("Key for toggling the display of debug info.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Profiler toggle key");
@@ -152,7 +152,7 @@ fake_function() {
 	gettext("Experimental option, might cause visible spaces between blocks\nwhen set to higher number than 0.");
 	gettext("Shaders");
 	gettext("Shaders");
-	gettext("Shaders allow advanced visul effects and may increase performance on some video cards.\nThy only work with the OpenGL video backend.");
+	gettext("Shaders allow advanced visual effects and may increase performance on some video cards.\nThy only work with the OpenGL video backend.");
 	gettext("Tone Mapping");
 	gettext("Filmic tone mapping");
 	gettext("Enables filmic tone mapping");
@@ -207,6 +207,8 @@ fake_function() {
 	gettext("Vertical screen synchronization.");
 	gettext("Field of view");
 	gettext("Field of view in degrees.");
+	gettext("Field of view for zoom");
+	gettext("Field of view while zooming in degrees.\nThis requires the \"zoom\" privilege on the server.");
 	gettext("Gamma");
 	gettext("Adjust the gamma encoding for the light tables. Lower numbers are brighter.\nThis setting is for the client only and is ignored by the server.");
 	gettext("Texture path");
@@ -261,7 +263,7 @@ fake_function() {
 	gettext("GUI scaling filter");
 	gettext("When gui_scaling_filter is true, all GUI images need to be\nfiltered in software, but some images are generated directly\nto hardware (e.g. render-to-texture for nodes in inventory).");
 	gettext("GUI scaling filter txr2img");
-	gettext("When gui_scaling_filter_txr2img is true, copy those images\nfrom hardware to software for scaling.  When false, fall back\nto the old scaling method, for video drivers that don't\npropery support downloading textures back from hardware.");
+	gettext("When gui_scaling_filter_txr2img is true, copy those images\nfrom hardware to software for scaling.  When false, fall back\nto the old scaling method, for video drivers that don't\nproperly support downloading textures back from hardware.");
 	gettext("Tooltip delay");
 	gettext("Delay showing tooltips, stated in milliseconds.");
 	gettext("Freetype fonts");
@@ -326,10 +328,11 @@ fake_function() {
 	gettext("IPv6 server");
 	gettext("Enable/disable running an IPv6 server.  An IPv6 server may be restricted\nto IPv6 clients, depending on system configuration.\nIgnored if bind_address is set.");
 	gettext("Advanced");
-	gettext("Maximum simultaneously blocks send per client");
-	gettext("How many blocks are flying in the wire simultaneously per client.");
-	gettext("Maximum simultaneously bocks send total");
-	gettext("How many blocks are flying in the wire simultaneously for the whole server.");
+	gettext("Maximum simultaneous block sends per client");
+	gettext("Maximum number of blocks that are simultaneously sent per client.");
+	gettext("Maximum simultaneous block sends total");
+	gettext("Maximum number of blocks that are simultaneously sent in total.");
+	gettext("Delay in sending blocks after building");
 	gettext("To reduce lag, block transfers are slowed down when a player is building something.\nThis determines how long they are slowed down after placing or removing a node.");
 	gettext("Max. packets per iteration");
 	gettext("Maximum number of packets sent per send step, if you have a slow connection\ntry reducing it, but don't reduce it to a number below double of targeted\nclient number.");
@@ -409,7 +412,7 @@ fake_function() {
 	gettext("Number of extra blocks that can be loaded by /clearobjects at once.\nThis is a trade-off between sqlite transaction overhead and\nmemory consumption (4096=100MB, as a rule of thumb).");
 	gettext("Unload unused server data");
 	gettext("How much the server will wait before unloading unused mapblocks.\nHigher value is smoother, but will use more RAM.");
-	gettext("Maxmimum objects per block");
+	gettext("Maximum objects per block");
 	gettext("Maximum number of statically stored objects in a block.");
 	gettext("Synchronous SQLite");
 	gettext("See http://www.sqlite.org/pragma.html#pragma_synchronous");
@@ -593,7 +596,7 @@ fake_function() {
 	gettext("Trusted mods");
 	gettext("Comma-separated list of trusted mods that are allowed to access insecure\nfunctions even when mod security is on (via request_insecure_environment()).");
 	gettext("HTTP Mods");
-	gettext("Comma-seperated list of mods that are allowed to access HTTP APIs, which\nallow them to upload and download data to/from the internet.");
+	gettext("Comma-separated list of mods that are allowed to access HTTP APIs, which\nallow them to upload and download data to/from the internet.");
 	gettext("Advanced");
 	gettext("Profiling");
 	gettext("Load the game profiler");

From 3b0f7659c75f24f4ae2411c7ab49fe150e1911c1 Mon Sep 17 00:00:00 2001
From: Rui <Rui-Minetest@users.noreply.github.com>
Date: Tue, 30 Aug 2016 12:40:48 +0900
Subject: [PATCH 159/418] Document keymap_autorun in settingtypes.txt and
 minetest.conf.example (#4486)

---
 builtin/settingtypes.txt          | 4 ++++
 minetest.conf.example             | 5 +++++
 src/settings_translation_file.cpp | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index aadcb5de8..4622a7217 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -176,6 +176,10 @@ keymap_fastmove (Fast key) key KEY_KEY_J
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 keymap_noclip (Noclip key) key KEY_KEY_H
 
+#    Key for toggling autorun.
+#    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
+keymap_autorun (Autorun key) key
+
 #    Key for toggling cinematic mode.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 keymap_cinematic (Cinematic mode key) key
diff --git a/minetest.conf.example b/minetest.conf.example
index 2465907ad..3d9b77306 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -173,6 +173,11 @@
 #    type: key
 # keymap_noclip = KEY_KEY_H
 
+#    Key for toggling autorun.
+#    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
+#    type: key
+# keymap_autorun =
+
 #    Key for toggling cinematic mode.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 #    type: key
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index 4b6a50b80..bebada2f8 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -71,6 +71,8 @@ fake_function() {
 	gettext("Key for toggling fast mode.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Noclip key");
 	gettext("Key for toggling noclip mode.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Autorun key");
+	gettext("Key for toggling autorun.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Cinematic mode key");
 	gettext("Key for toggling cinematic mode.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Minimap key");

From f3ee6b992bf8e8ed8fd67d9e96701840c9d4a4ab Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 13 Jul 2016 08:23:52 +0000
Subject: [PATCH 160/418] Translated using Weblate (Chinese (Taiwan))

Currently translated at 100.0% (895 of 895 strings)
---
 po/zh_TW/minetest.po | 127 ++++++++++++++++++++-----------------------
 1 file changed, 58 insertions(+), 69 deletions(-)

diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po
index cd3c6525f..3d762ddbb 100644
--- a/po/zh_TW/minetest.po
+++ b/po/zh_TW/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-03-05 14:43+0000\n"
-"Last-Translator: Jeff Huang <s8321414@chakraos.org>\n"
-"Language-Team: Chinese (Taiwan) <https://hosted.weblate.org/projects/"
-"minetest/minetest/zh_TW/>\n"
+"PO-Revision-Date: 2016-07-13 08:25+0000\n"
+"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) "
+"<https://hosted.weblate.org/projects/minetest/minetest/zh_TW/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.5-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -403,9 +403,8 @@ msgid "Uninstall selected modpack"
 msgstr "解除安裝已選取的 mod 包"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "地址／埠："
+msgstr "地址／埠"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -425,16 +424,15 @@ msgstr "已啟用傷害"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr ""
+msgstr "刪除收藏"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
-msgstr ""
+msgstr "最愛"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "名稱／密碼："
+msgstr "名稱／密碼"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -527,7 +525,6 @@ msgid "Bilinear Filter"
 msgstr "雙線性過濾器"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
 msgstr "映射貼圖"
 
@@ -568,7 +565,6 @@ msgid "Node Highlighting"
 msgstr "突顯節點"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Outlining"
 msgstr "突顯節點"
 
@@ -577,9 +573,8 @@ msgid "None"
 msgstr "無"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Normal Mapping"
-msgstr "法線貼圖採樣"
+msgstr "法線貼圖"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -594,9 +589,8 @@ msgid "Parallax Occlusion"
 msgstr "視差遮蔽"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "啟用粒子"
+msgstr "粒子"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Reset singleplayer world"
@@ -1370,14 +1364,12 @@ msgid "Acceleration in air"
 msgstr "在空氣中的加速"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Management interval"
-msgstr "活動區塊範圍"
+msgstr "活動區塊管理間隔"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifier interval"
-msgstr "活動區塊範圍"
+msgstr "活動區塊調整間隔"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1473,9 +1465,8 @@ msgid "Basic"
 msgstr "基礎"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic Privileges"
-msgstr "預設特權"
+msgstr "基礎特權"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
@@ -1518,9 +1509,8 @@ msgid "Cave noise #2"
 msgstr "洞穴噪音 #2"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cave width"
-msgstr "螢幕寬度"
+msgstr "洞穴寬度"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
@@ -1707,7 +1697,7 @@ msgstr "控制山丘的陡度／深度。"
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
+msgstr "控制隧道的寬度，較小的值會創造出較寬的隧道。"
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -1867,7 +1857,7 @@ msgstr "停用反作弊"
 
 #: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "停用逃脫字元"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1876,6 +1866,9 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"停用逃脫字元。例如聊天訊息的顏色。\n"
+"如果您想要與早於 0.4.14 的客戶端一同執行伺服器並且您也想要停用\n"
+"由 mod 所生成的逃脫字元的話就用這個。"
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
@@ -1903,7 +1896,7 @@ msgstr "轉儲 mapgen 的除錯資訊。"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "啟用搖桿"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
@@ -2149,9 +2142,8 @@ msgid "Font size"
 msgstr "字型大小"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Format of screenshots."
-msgstr "儲存螢幕截圖的路徑。"
+msgstr "螢幕截圖的格式。"
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
@@ -2214,7 +2206,6 @@ msgid "Generate normalmaps"
 msgstr "生成一般地圖"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -2438,14 +2429,12 @@ msgstr ""
 "控制細節的品質。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick button repetition invterval"
-msgstr "右鍵點擊重覆間隔"
+msgstr "搖桿按鈕重覆間隔"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick frustum sensitivity"
-msgstr "滑鼠靈敏度"
+msgstr "搖桿靈敏度"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2833,11 +2822,11 @@ msgstr "伺服器 tick 的長度與相關物件的間隔通常透過網路更新
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between ABM execution cycles"
-msgstr ""
+msgstr "在 ABM 執行循環間的時間長度"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between NodeTimer execution cycles"
-msgstr ""
+msgstr "在 Node 計時器執行循環間的時間長度"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2935,7 +2924,6 @@ msgid "Map directory"
 msgstr "地圖目錄"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -2947,13 +2935,14 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"專用於 Mapgen v6 的地圖生成屬性。\n"
-"當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n"
-"未在旗標字串中指定的旗標將不會自預設值修改。\n"
-"以「no」開頭的旗標字串將會用於明確的停用它們。"
+"專用於 Mapgen Valleys 的地圖生成屬性。\n"
+"'altitude_chill' 讓高海拔處更冷，這可能會導致一些與生物群落相關的問題。\n"
+"'humid_rivers' 修改了河流周圍的濕度，該處的水會傾向形成池子。\n"
+"這可能會干擾經過微秒調整的生物群落。\n"
+"未在旗標字串中指定的旗標不會自預設值修改。\n"
+"以 'no' 開頭的旗標會用於明確地停用它們。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
@@ -2961,13 +2950,12 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"專用於 Mapgen v7 的地圖生成屬性。\n"
-"「ridges」為河流。\n"
+"專用於 Mapgen flat 的地圖生成屬性。\n"
+"可能會有少數的湖泊或是丘陵會在扁平的世界中生成。\n"
 "未在旗標字串中指定的旗標將不會自預設值修改。\n"
 "以「no」開頭的旗標字串將會用於明確的停用它們。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
@@ -2982,7 +2970,6 @@ msgstr ""
 "以「no」開頭的旗標字串將會用於明確的停用它們。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
@@ -3040,9 +3027,8 @@ msgid "Mapgen flat"
 msgstr "Mapgen flat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave width"
-msgstr "Mapgen flat 大型洞穴深度"
+msgstr "Mapgen flat 洞穴寬度"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave1 noise parameters"
@@ -3093,9 +3079,8 @@ msgid "Mapgen fractal"
 msgstr "地圖產生器分形"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal cave width"
-msgstr "Mapgen fractal slice w"
+msgstr "Mapgen 分形洞穴寬度"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave1 noise parameters"
@@ -3162,9 +3147,8 @@ msgid "Mapgen v5"
 msgstr "Mapgen v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave width"
-msgstr "Mapgen flat 大型洞穴深度"
+msgstr "Mapgen v5 洞穴寬度"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave1 noise parameters"
@@ -3251,9 +3235,8 @@ msgid "Mapgen v7"
 msgstr "地圖產生器 v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 cave width"
-msgstr "Mapgen flat 大型洞穴深度"
+msgstr "Mapgen v7 洞穴寬度"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave1 noise parameters"
@@ -3569,9 +3552,8 @@ msgid "Node highlighting"
 msgstr "突顯節點"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "NodeTimer interval"
-msgstr "時間傳送間隔"
+msgstr "NodeTimer 間隔"
 
 #: src/settings_translation_file.cpp
 msgid "Noise parameters for biome API temperature, humidity and biome blend."
@@ -3701,7 +3683,7 @@ msgstr "避免 mod 做出不安全的舉動，像是執行 shell 指令等。"
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
-msgstr ""
+msgstr "有 basic_privs 的玩家可以提升特權"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler data print interval. 0 = disable. Useful for developers."
@@ -3819,14 +3801,12 @@ msgid "Screenshot folder"
 msgstr "螢幕截圖資料夾"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "螢幕截圖資料夾"
+msgstr "螢幕截圖格式"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "螢幕截圖"
+msgstr "螢幕截圖品質"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3834,6 +3814,9 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"螢幕截圖的品質。僅用於 JPEG 格式。\n"
+"1 代表最差的品質，100 代表最佳品質。\n"
+"使用 0 來使用預設品質。"
 
 #: src/settings_translation_file.cpp
 msgid "Security"
@@ -3938,7 +3921,7 @@ msgstr "顯示除錯資訊"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
-msgstr ""
+msgstr "顯示物體選取方塊"
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
@@ -3959,12 +3942,11 @@ msgid "Smooth lighting"
 msgstr "平滑光"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
-"當移動與東張西望時讓攝影機變流暢。\n"
+"當移動與東張西望時讓攝影機變流暢。也稱為觀看或滑鼠流暢。\n"
 "對錄影很有用。"
 
 #: src/settings_translation_file.cpp
@@ -4013,7 +3995,7 @@ msgstr "嚴格協議檢查"
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
-msgstr ""
+msgstr "支援較舊版本的伺服器"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -4076,6 +4058,8 @@ msgid ""
 "The sensitivity of the joystick axes for moving the\n"
 "ingame view frustum around."
 msgstr ""
+"在遊戲中，視野四處移動時的\n"
+"搖桿靈敏度。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4100,11 +4084,12 @@ msgstr ""
 "大小。將值設為 0 以停用此功能。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
-msgstr "當按住滑鼠右鍵時，重覆右鍵點選的間隔以秒計。"
+msgstr ""
+"在重複的事件間以秒計的時間\n"
+"當按住搖桿的組合。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4118,7 +4103,7 @@ msgstr "這個字型將會被用於特定的語言。"
 
 #: src/settings_translation_file.cpp
 msgid "Time in between active block management cycles"
-msgstr ""
+msgstr "在活躍方塊管理循環的時間中間"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4441,6 +4426,10 @@ msgid ""
 "Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
 "Disabling this option will protect your password better."
 msgstr ""
+"是否支援在協議版本 25 前的舊伺服器。\n"
+"若您想要連線到 0.4.12 版或更舊的伺服器就啟用。\n"
+"自 0.4.13 起的伺服器將可以正常運作，0.4.12-dev 版的伺服器可能可以正常運作。\n"
+"停用這個選項可以將您的密碼保護的比較好一點。"
 
 #: src/settings_translation_file.cpp
 msgid "Width component of the initial window size."

From f9d5ea4322cffd493122fd00cbac4405a7ec3050 Mon Sep 17 00:00:00 2001
From: Onyx Steinheim <thevoxelmanonyx@gmail.com>
Date: Wed, 13 Jul 2016 16:31:38 +0000
Subject: [PATCH 161/418] Translated using Weblate (French)

Currently translated at 99.4% (890 of 895 strings)

This is a merger of two commits.
---
 po/fr/minetest.po | 82 ++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 43 deletions(-)

diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index dd3f6d2c3..62a7d84b1 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-07-12 16:57+0000\n"
+"PO-Revision-Date: 2016-07-13 16:45+0000\n"
 "Last-Translator: Onyx Steinheim <thevoxelmanonyx@gmail.com>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/minetest/minetest/"
-"fr/>\n"
+"Language-Team: French "
+"<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -413,7 +413,7 @@ msgstr "Désinstaller le pack de mods"
 
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port"
-msgstr "Adresse / Port :"
+msgstr "Adresse / Port"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -433,7 +433,7 @@ msgstr "Dégâts activés"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr "Supprimer favori :"
+msgstr "Supprimer favori"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
@@ -1304,10 +1304,10 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"(X,Y,Z) décalage de fractale à partir du centre du monde en unités "
-"\"d'échelle\".\n"
-"Utilisé pour déplacer une zone de frai convenable à proximité des basses "
-"terres (0, 0).\n"
+"(X,Y,Z) décalage de fractale à partir du centre du monde en unités \"d'"
+"échelle\".\n"
+"Utilisé pour déplacer une zone de frai convenable dans les basses terres à "
+"proximité de (0, 0).\n"
 "La valeur par défaut est adaptée pour les réglages de Mandelbrot, elle doit "
 "être modifiée pour les réglages de julia.\n"
 "Portée environ -2 à 2. A multiplier par \"l'échelle\" pour le décalage dans "
@@ -1883,7 +1883,7 @@ msgstr "Désactiver l'anti-triche"
 
 #: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Désactive les séquences d'échappement"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1892,6 +1892,10 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"Désactive les séquences d'échappement, ex. tchat en couleurs.\n"
+"Utilisez cette option si vous voulez exécuter un serveur avec des clients "
+"antérieurs à la 0.4.14 et que vous souhaitez désactiver\n"
+"les séquences d'échappement générés par les mods."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
@@ -1919,7 +1923,7 @@ msgstr "Afficher les infos de débogage de la génération de terrain."
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "Activer souris"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
@@ -2105,6 +2109,7 @@ msgstr ""
 "l'onglet multijoueur."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Filler Depth"
 msgstr "Profondeur de remplissage"
 
@@ -2246,7 +2251,6 @@ msgid "Generate normalmaps"
 msgstr "Normal mapping"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -2489,14 +2493,12 @@ msgstr ""
 "Contrôle la quantité de détails fins."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick button repetition invterval"
 msgstr "Intervalle de répétition du clic droit"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick frustum sensitivity"
-msgstr "Sensibilité de la souris"
+msgstr "Sensibilité tronconique du joystick"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2843,7 +2845,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
-msgstr "Touche \"utiliser\" pour monter/descendre"
+msgstr "Touche utilisée pour monter/descendre"
 
 #: src/settings_translation_file.cpp
 msgid "Language"
@@ -2943,7 +2945,7 @@ msgstr "Régularité de la fluidité des liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid loop max"
-msgstr "Itérations maximum pendant la transformation des liquides"
+msgstr "Itérations maximales pendant la transformation des liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid queue purge time"
@@ -2991,7 +2993,6 @@ msgid "Map directory"
 msgstr "Chemin du monde"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -3006,7 +3007,7 @@ msgstr ""
 "Attributs spécifiques au générateur de terrain: Mapgen Valleys.\n"
 "Le paramètre: 'altitude_chill' provoque un refroidissement à des altitudes "
 "élevées, ce qui cause des problèmes dans les biomes.\n"
-"Le paramètre 'humid_river' modifie l'humidité autour des rivières et dans "
+"Le paramètre 'humid_rivers' modifie l'humidité autour des rivières et dans "
 "les zones où l'eau est assez présente,\n"
 "cela peut interférer avec des biomes ajustés délicatement.\n"
 "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
@@ -3016,7 +3017,6 @@ msgstr ""
 "explicite."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
@@ -3024,14 +3024,13 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributs de terrain spécifiques à Mapgen V7.\n"
-"'ridges' sont les rivières.\n"
-"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
+"Attributs de terrain spécifiques à Mapgen flat.\n"
+"Des lacs et des collines occasionnels peuvent être ajoutés au monde plat.\n"
+"Les drapeaux qui ne sont spécifiés dans le champ ne sont pas modifiés par "
 "défaut.\n"
 "Les drapeaux commençant par \"non\" sont désactivés."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
@@ -3041,16 +3040,13 @@ msgid ""
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
 "Attributs spécifiques à Mapgen V6.\n"
-"Quand les terrains neigeux sont activés, les jungles sont activés et les "
-"drapeaux \"jungle\" sont ignorés.\n"
-"Les drapeaux par défaut définis dans le moteur sont: biomeblend, mudflow.\n"
-"La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
+"Quand les terrains neigeux sont activés, les jungles sont activés "
+"automatiquement, les drapeaux \"jungles\" sont ignorés.\n"
 "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
 "défaut.\n"
 "Les drapeaux commençant par \"non\" sont désactivés."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
@@ -3058,10 +3054,10 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Attributs de terrain spécifiques à Mapgen V7.\n"
-"'ridges' sont les rivières.\n"
-"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
-"défaut.\n"
+"Attributs de terrain spécifiques au Mapgen V7.\n"
+"Le drapeau 'des crêtes' contrôle les rivières.\n"
+"Les drapeaux qui ne sont pas spécifiés dans la chaîne de drapeau ne sont pas "
+"modifiés par rapport à la valeur par défaut.\n"
 "Les drapeaux commençant par \"non\" sont désactivés."
 
 #: src/settings_translation_file.cpp
@@ -3463,7 +3459,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of players that can connect simultaneously."
-msgstr "Nombre maximum de joueurs qui peuvent être connectés en même temps."
+msgstr "Nombre maximal de joueurs qui peuvent être connectés en même temps."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of statically stored objects in a block."
@@ -3488,7 +3484,7 @@ msgstr "Nombre maximum total de mapblocks simultanés envoyés"
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
 msgstr ""
-"Délais maximum de téléchargement d'un fichier (ex.: un mod), établi en "
+"Délais maximaux de téléchargement d'un fichier (ex.: un mod), établi en "
 "millisecondes."
 
 #: src/settings_translation_file.cpp
@@ -3664,7 +3660,7 @@ msgstr "Force des normalmaps"
 
 #: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
-msgstr "Nombre de threads"
+msgstr "Nombre de tâches en cours"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3674,11 +3670,11 @@ msgid ""
 "speed greatly\n"
 "at the cost of slightly buggy caves."
 msgstr ""
-"Nombre de threads à utiliser. Laisser ce champ vide, ou augmenter cette "
-"valeur\n"
-"pour utiliser le multi-threading. Sur des systèmes multi-processeurs, cela "
-"va améliorer grandement\n"
-"la génération de terrain au détriment de quelques caves altérées."
+"Nombre de tâches en cours à utiliser. Laisser ce champ vide, ou augmenter "
+"cette valeur\n"
+"pour utiliser le multi-tâches. Sur des systèmes multi-processeurs, cela va "
+"améliorer grandement\n"
+"la génération de terrain au détriment de quelques altérations de grottes."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4051,7 +4047,6 @@ msgid "Smooth lighting"
 msgstr "Lumière douce"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
@@ -4170,6 +4165,8 @@ msgid ""
 "The sensitivity of the joystick axes for moving the\n"
 "ingame view frustum around."
 msgstr ""
+"Sensibilité de la souris pour déplacer la \n"
+"vue en jeu autour du tronc."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4198,7 +4195,6 @@ msgstr ""
 "l'ancienne file d'items. Une valeur de 0 désactive cette fonctionnalité."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."

From 6cd2ccb35b9efe688c704a478d835489167c7a55 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jean-baptiste@holcroft.fr>
Date: Wed, 13 Jul 2016 16:41:45 +0000
Subject: [PATCH 162/418] Translated using Weblate (French)

Currently translated at 99.5% (891 of 895 strings)
---
 po/fr/minetest.po | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index 62a7d84b1..d2d6b159c 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-07-13 16:45+0000\n"
-"Last-Translator: Onyx Steinheim <thevoxelmanonyx@gmail.com>\n"
+"PO-Revision-Date: 2016-07-13 16:41+0000\n"
+"Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
 "Language: fr\n"
@@ -2109,9 +2109,8 @@ msgstr ""
 "l'onglet multijoueur."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filler Depth"
-msgstr "Profondeur de remplissage"
+msgstr "Profondeur du remplissage"
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"

From 9f326ea9c8648d7ff3af662f91912ce67a4172e2 Mon Sep 17 00:00:00 2001
From: lisacvuk <lisacvukhome@gmail.com>
Date: Wed, 13 Jul 2016 09:50:11 +0000
Subject: [PATCH 163/418] Translated using Weblate (Serbian (cyrillic))

Currently translated at 33.2% (298 of 895 strings)
---
 po/sr_Cyrl/minetest.po | 67 ++++++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/po/sr_Cyrl/minetest.po b/po/sr_Cyrl/minetest.po
index 304c9bded..d57463cbe 100644
--- a/po/sr_Cyrl/minetest.po
+++ b/po/sr_Cyrl/minetest.po
@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-06-09 11:11+0000\n"
-"Last-Translator: Лазар Вукановић <gavranvukhome@gmail.com>\n"
-"Language-Team: Serbian (cyrillic) <https://hosted.weblate.org/projects/"
-"minetest/minetest/sr_Cyrl/>\n"
+"PO-Revision-Date: 2016-07-13 09:50+0000\n"
+"Last-Translator: lisacvuk <lisacvukhome@gmail.com>\n"
+"Language-Team: Serbian (cyrillic) "
+"<https://hosted.weblate.org/projects/minetest/minetest/sr_Cyrl/>\n"
 "Language: sr_Cyrl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -499,7 +499,7 @@ msgstr "Почни игру"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
-msgstr ""
+msgstr "2x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "3D Clouds"
@@ -507,11 +507,11 @@ msgstr "3Д Облаци"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
-msgstr ""
+msgstr "4x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "8x"
-msgstr ""
+msgstr "8x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Advanced Settings"
@@ -547,7 +547,7 @@ msgstr "Елегантно лишће"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
-msgstr "Mipmap"
+msgstr "Мипмап"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
@@ -598,9 +598,8 @@ msgid "Particles"
 msgstr "Честице"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Reset singleplayer world"
-msgstr "Да ли сте сигурни да желите да ресетујете ваш свет?"
+msgstr "Ресетуј свет"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -816,6 +815,18 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
+"Подразумеване контроле:\n"
+"Ни један приказан мени:\n"
+"- један тап: копај\n"
+"- дупли тап: постави блок/користи\n"
+"- превуци прстом: гледај около\n"
+"Мени/Инвертар приказан:\n"
+"- дупли тап (изван):\n"
+" -->Искључи\n"
+"- додирни ствари, додирни празно место:\n"
+" --> помери ствари\n"
+"- држи и превлачи, тапни другим прстом:\n"
+" --> пребаци само једну ствар из групе\n"
 
 #: src/game.cpp
 msgid "Exit to Menu"
@@ -831,7 +842,7 @@ msgstr "Дефиниције предмета..."
 
 #: src/game.cpp
 msgid "KiB/s"
-msgstr ""
+msgstr "КиБ/с"
 
 #: src/game.cpp
 msgid "Media..."
@@ -839,7 +850,7 @@ msgstr "Медија..."
 
 #: src/game.cpp
 msgid "MiB/s"
-msgstr ""
+msgstr "МиБ/с"
 
 #: src/game.cpp
 msgid "Node definitions..."
@@ -1005,7 +1016,7 @@ msgstr "Апликације"
 
 #: src/keycode.cpp
 msgid "Attn"
-msgstr ""
+msgstr "Аттн"
 
 #: src/keycode.cpp
 msgid "Back"
@@ -1033,7 +1044,7 @@ msgstr "Конвертуј"
 
 #: src/keycode.cpp
 msgid "CrSel"
-msgstr ""
+msgstr "ЦрСел"
 
 #: src/keycode.cpp
 msgid "Down"
@@ -1041,7 +1052,7 @@ msgstr "Доле"
 
 #: src/keycode.cpp
 msgid "End"
-msgstr ""
+msgstr "Крај"
 
 #: src/keycode.cpp
 msgid "Erase OEF"
@@ -1069,7 +1080,7 @@ msgstr "Помоћ"
 
 #: src/keycode.cpp
 msgid "Home"
-msgstr ""
+msgstr "Кућа"
 
 #: src/keycode.cpp
 msgid "Insert"
@@ -1133,7 +1144,7 @@ msgstr "Не конвертуј"
 
 #: src/keycode.cpp
 msgid "Num Lock"
-msgstr ""
+msgstr "Закључавање нумеричке тастатуре"
 
 #: src/keycode.cpp
 msgid "Numpad *"
@@ -1193,7 +1204,7 @@ msgstr "Нумеричка тастатура 9"
 
 #: src/keycode.cpp
 msgid "OEM Clear"
-msgstr ""
+msgstr "ОЕМ очисти"
 
 #: src/keycode.cpp
 msgid "PA1"
@@ -1217,7 +1228,7 @@ msgstr "Прикажи"
 
 #: src/keycode.cpp
 msgid "Prior"
-msgstr ""
+msgstr "Пре"
 
 #: src/keycode.cpp
 msgid "Return"
@@ -1245,7 +1256,7 @@ msgstr "Десни Windows"
 
 #: src/keycode.cpp
 msgid "Scroll Lock"
-msgstr ""
+msgstr "Закључавање скроловања"
 
 #: src/keycode.cpp
 msgid "Select"
@@ -1257,7 +1268,7 @@ msgstr "Шифт"
 
 #: src/keycode.cpp
 msgid "Sleep"
-msgstr ""
+msgstr "Спавај"
 
 #: src/keycode.cpp
 msgid "Snapshot"
@@ -1265,7 +1276,7 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Space"
-msgstr ""
+msgstr "Простор"
 
 #: src/keycode.cpp
 msgid "Tab"
@@ -1295,6 +1306,12 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X,Y,Z) офсет фрактала од центра света у мерној јединици 'скала'.\n"
+"Користи се за пребацивање стартне позиције што ближе (0, 0).\n"
+"Подразумевани је добар за манделброт сетове, али мора се наместити за јулија "
+"сетове.\n"
+"Даљина је око -2 до 2. Помножити са 'скалом' да би се добио офсет у "
+"блоковима."
 
 #: src/settings_translation_file.cpp
 msgid ""

From bc1fcc4584f19ca0763415f43437e3dae60b2e2c Mon Sep 17 00:00:00 2001
From: Bruno Borges <borgesdossantosbruno@gmail.com>
Date: Thu, 21 Jul 2016 00:15:09 +0000
Subject: [PATCH 164/418] Translated using Weblate (Portuguese)

Currently translated at 64.9% (581 of 895 strings)
---
 po/pt/minetest.po | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/po/pt/minetest.po b/po/pt/minetest.po
index 4755928a1..6ea462a41 100644
--- a/po/pt/minetest.po
+++ b/po/pt/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-04-01 00:21+0000\n"
-"Last-Translator: Fernando Reis <fernando.reis@pt.lu>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/minetest/"
-"minetest/pt/>\n"
+"PO-Revision-Date: 2016-07-21 00:15+0000\n"
+"Last-Translator: Bruno Borges <borgesdossantosbruno@gmail.com>\n"
+"Language-Team: Portuguese "
+"<https://hosted.weblate.org/projects/minetest/minetest/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.6-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -1542,7 +1542,7 @@ msgstr "Ruído para cavernas #2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "Largura da caverna"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
@@ -1733,7 +1733,7 @@ msgstr "Controla a inclinação/altura das colinas."
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
+msgstr "Controla a largura dos túneis, um valor menor cria túneis maiores."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -1898,7 +1898,7 @@ msgstr "Desativar anti-batota"
 
 #: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Desabilitar as sequências de escape"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1907,6 +1907,9 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"Desabilitar as sequências de escape, por exemplo, colorimento de bate-papo.\n"
+"Use isto se você quiser executar um servidor com clientes pre-0.4.14 e para "
+"desabilitar as sequências de escape geradas por modificadores."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"

From 45f8ae9e55c0ba011b0df6015acc035067dccffd Mon Sep 17 00:00:00 2001
From: Bruno Borges <borgesdossantosbruno@gmail.com>
Date: Thu, 21 Jul 2016 17:30:08 +0000
Subject: [PATCH 165/418] Translated using Weblate (Portuguese (Brazil))

Currently translated at 87.8% (786 of 895 strings)

Enhancements
---
 po/pt_BR/minetest.po | 730 +++++++++++++++++++++++++++++--------------
 1 file changed, 493 insertions(+), 237 deletions(-)

diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index edfd03fa0..d605a9e51 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-03-31 13:45+0000\n"
-"Last-Translator: Ian giestas pauli <iangiestaspauli@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
-"minetest/minetest/pt_BR/>\n"
+"PO-Revision-Date: 2016-07-21 17:30+0000\n"
+"Last-Translator: Bruno Borges <borgesdossantosbruno@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) "
+"<https://hosted.weblate.org/projects/minetest/minetest/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.6-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "Ocorreu um erro no script Lua, assim como em um mod:"
+msgstr "Ocorreu um erro no script Lua, assim como em um modificador:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -413,9 +413,8 @@ msgid "Uninstall selected modpack"
 msgstr "Desinstalar o pacote de módulos selecionado"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "Endereço / Porta :"
+msgstr "Endereço / Porta"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -434,19 +433,16 @@ msgid "Damage enabled"
 msgstr "Habilitar dano"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Del. Favorite"
-msgstr "Favoritos:"
+msgstr "Del. Favorito"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Favorite"
-msgstr "Favoritos:"
+msgstr "Favoritos"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "Nome / Senha :"
+msgstr "Nome / Senha"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -539,7 +535,6 @@ msgid "Bilinear Filter"
 msgstr "Filtragem bi-linear"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
 msgstr "Bump mapping"
 
@@ -580,9 +575,8 @@ msgid "Node Highlighting"
 msgstr "Destaque nos Blocos"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Outlining"
-msgstr "Destaque nos Blocos"
+msgstr "Bloco Delineado"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
@@ -591,7 +585,7 @@ msgstr "Nenhum"
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Normal Mapping"
-msgstr "Tone mapping"
+msgstr "Mapeamento Normal"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -606,14 +600,13 @@ msgid "Parallax Occlusion"
 msgstr "Oclusão de paralaxe"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "Habilitar partículas"
+msgstr "Partículas"
 
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Reset singleplayer world"
-msgstr "Você tem certeza que deseja resetar seu mundo?"
+msgstr "Resetar mundo para um jogador"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -628,7 +621,6 @@ msgid "Simple Leaves"
 msgstr "Folhas Simples"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Smooth Lighting"
 msgstr "Iluminação suave"
 
@@ -1314,6 +1306,7 @@ msgid "Zoom"
 msgstr "Zoom"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
 "Used to move a suitable spawn area of low land close to (0, 0).\n"
@@ -1321,6 +1314,12 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X,Y,Z) compensador do fractal do centro do mundo em unidade da 'escala'.\n"
+"Usado para mover uma área adequada de spawn de baixo da terra perto de (0, "
+"0).\n"
+"O padrão é adequado para configurações de mandelbrot, isso precisa ser "
+"editado por configurações de julia.\n"
+"Variam cerca de -2 a 2. Multiplique por \"escala\" para compensação de nodes."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1386,14 +1385,13 @@ msgid "Acceleration in air"
 msgstr "Aceleração no ar"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Management interval"
-msgstr "Limite para blocos ativos"
+msgstr "Intervalo de Gestão de Blocos Ativos"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Active Block Modifier interval"
-msgstr "Limite para blocos ativos"
+msgstr "Distância para blocos ativos"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1494,9 +1492,8 @@ msgid "Basic"
 msgstr "Básico"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic Privileges"
-msgstr "Privilégios por padrão"
+msgstr "Privilégios básicos"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
@@ -1542,7 +1539,7 @@ msgstr "Ruído nas cavernas #2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "Largura da caverna"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
@@ -1734,7 +1731,7 @@ msgstr "Controla o esparsamento/altura das colinas."
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
+msgstr "Controla a largura dos túneis, um valor menor cria túneis mais amplos."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -1898,7 +1895,7 @@ msgstr "Habilitar Anti-Hack"
 
 #: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Desabilitar as seqüências de escape"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1907,6 +1904,9 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"Desabilitar as sequências de escape, por exemplo, colorimento de bate-papo.\n"
+"Use isto se você quiser executar um servidor com clientes pre-0.4.14 e para "
+"desabilitar as sequências de escape geradas por modificadores."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
@@ -1934,7 +1934,7 @@ msgstr "Mostrar informações de depuração do Mapgen."
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "Habilitar Joysticks"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
@@ -2120,7 +2120,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Filler Depth"
-msgstr ""
+msgstr "Profundidade de enchimento"
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
@@ -2188,7 +2188,7 @@ msgstr "Tamanho da fonte"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
-msgstr ""
+msgstr "Formato de screenshots."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
@@ -2257,7 +2257,6 @@ msgid "Generate normalmaps"
 msgstr "Gerar normalmaps"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -2271,10 +2270,10 @@ msgstr ""
 "árvores\n"
 "e grama do pântano, em todos os outros mapgens essa flag controla todas as "
 "decorações.\n"
-"Flags que não  são especificadas na string da flag não são alteradas por "
+"Flags que não são especificadas na string da flag não são alteradas por "
 "padrão.\n"
-"Flags começando com \"no\" (não) são usada para explicitamente desabilitá-"
-"las."
+"Flags começando com \"no\" (não) são usada para explicitamente "
+"desabilitá-las."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
@@ -2334,17 +2333,17 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 "Quão grande área de blocos estão sujeitos ao material do bloco ativo, "
-"indicado em mapas blocos (16 nós).\n"
+"indicado em mapblocks (16 nós).\n"
 "Em blocos ativos objetos são carregados e ABMs são executadas."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
+msgstr "Quantos blocos podem ser enviados simultaneamente para todo o servidor."
 
 #: src/settings_translation_file.cpp
 msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
+msgstr "Quantos blocos podem ser enviados simultaneamente por cliente."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2501,12 +2500,14 @@ msgstr ""
 "Controles da escala de detalhes."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Joystick button repetition invterval"
-msgstr ""
+msgstr "Intervalo de repetição do botão do Joystick"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Joystick frustum sensitivity"
-msgstr ""
+msgstr "Sensibilidade do frustum do Joystick"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2903,11 +2904,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between ABM execution cycles"
-msgstr ""
+msgstr "Período de tempo entre os ciclos de execução de ABMs"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between NodeTimer execution cycles"
-msgstr ""
+msgstr "Período de tempo entre ciclos de execução de NodeTimer"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3126,16 +3127,19 @@ msgid "Mapgen flat cave width"
 msgstr "Threshold dos lagos no Mapgen plano"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen flat cave1 noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do plano cave1 do Mapgen"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen flat cave2 noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do plano cave2 do Mapgen"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen flat filler depth noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do plano da profundidade de preenchimento do mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat flags"
@@ -3162,12 +3166,14 @@ msgid "Mapgen flat lake threshold"
 msgstr "Threshold dos lagos no Mapgen plano"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen flat large cave depth"
-msgstr ""
+msgstr "Profundidade de grande caverna plana do mapgen"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen flat terrain noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de terreno plano do mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal"
@@ -3179,16 +3185,19 @@ msgid "Mapgen fractal cave width"
 msgstr "Componente W da fatia do fractal do Mapgen"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen fractal cave1 noise parameters"
-msgstr ""
+msgstr "Parâmetro noise do fractal do cave1 do mapgen"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen fractal cave2 noise parameters"
-msgstr ""
+msgstr "Parâmetro noise do fractal do cave2 do mapgen"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen fractal filler depth noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do fractal da profundidade de preenchimento do mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal fractal"
@@ -3223,16 +3232,18 @@ msgid "Mapgen fractal scale"
 msgstr "Escala no fractal do Mapgen"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen fractal seabed noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do fractal do leito oceânico do mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal slice w"
 msgstr "Componente W da fatia do fractal do Mapgen"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen heat blend noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de mistura de calor mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
@@ -3248,84 +3259,102 @@ msgid "Mapgen v5 cave width"
 msgstr "Profundidade de cavernas grandes"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 cave1 noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do cave1 do mapgen v5"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 cave2 noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do cave2 do mapgen v5"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 factor noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do fator do mapgen v5"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 filler depth noise parameters"
-msgstr ""
+msgstr "Parâmetros noise da profundidade de preenchimento do mapgen v5"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 height noise parameters"
-msgstr ""
+msgstr "Parâmetros noise da altura do mapgen v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6"
 msgstr "Mapgen versão 6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 apple trees noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de macieiras do mapgen v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach frequency"
-msgstr ""
+msgstr "Frequência de praia do Mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 beach noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de praia do Mapgen"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 biome noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de bioma do mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 cave noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de caverna do mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 desert frequency"
-msgstr ""
+msgstr "frequência de deserto do Mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 flags"
-msgstr ""
+msgstr "Flags do Mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 height select noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de seleção de altura do Mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 humidity noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de umidade do Mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 mud noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de lama do Mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 steepness noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de inclinação do Mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 terrain altitude noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de altitude do terreno do Mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 terrain base noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de base do terreno do Mapgen v6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 trees noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de árvores Mapgen v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7"
@@ -3337,126 +3366,149 @@ msgid "Mapgen v7 cave width"
 msgstr "Profundidade de cavernas grandes"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 cave1 noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do cave1 do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 cave2 noise parameters"
-msgstr ""
+msgstr "Parâmetros noise do cave2 do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 filler depth noise parameters"
-msgstr ""
+msgstr "Parâmetros noise da profundidade de enchimento do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 flags"
-msgstr ""
+msgstr "Flags do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 height select noise parameters"
-msgstr ""
+msgstr "Parâmetros noise da seleção de altura do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 mount height noise parameters"
-msgstr ""
+msgstr "Parâmetros noise da altura de montagem do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 mountain noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de montanha do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 ridge noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de cume do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 ridge water noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de cume de água do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 terrain altitude noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de altitude do terreno do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 terrain base noise parameters"
-msgstr ""
+msgstr "Parâmetros noise da base do terreno do Mapgen v7"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v7 terrain persistation noise parameters"
-msgstr ""
+msgstr "Parâmetros noise de persistencia do terreno do Mapgen v7"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave depth"
-msgstr ""
+msgstr "Profundidade de caverna enorme"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave noise"
-msgstr ""
+msgstr "Deformação de caverna enorme"
 
 #: src/settings_translation_file.cpp
 msgid "Massive caves form here."
-msgstr ""
+msgstr "Forma de cavernas enormes aqui."
 
 #: src/settings_translation_file.cpp
 msgid "Max block generate distance"
-msgstr ""
+msgstr "Distância máxima de geração de bloco"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Max block send distance"
-msgstr ""
+msgstr "Distância máxima de envio de bloco"
 
 #: src/settings_translation_file.cpp
 msgid "Max liquids processed per step."
-msgstr ""
+msgstr "Máximo de líquidos processados por etapa."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Max. clearobjects extra blocks"
-msgstr ""
+msgstr "Max. limpeza de objetos de blocos extra"
 
 #: src/settings_translation_file.cpp
 msgid "Max. packets per iteration"
-msgstr ""
+msgstr "Max. pacotes por iteração"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
-msgstr ""
+msgstr "FPS máximo"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS when game is paused."
-msgstr ""
+msgstr "Máximo FPS quando o jogo é pausado."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
-msgstr ""
+msgstr "Máximo de blocos carregados forçadamente"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum hotbar width"
-msgstr ""
+msgstr "Largura máxima do hotbar"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
-msgstr ""
+msgstr "Número máximo de blocos que podem ser enfileirados para o carregamento."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "Set to blank for an appropriate amount to be chosen automatically."
 msgstr ""
+"Número máximo de blocos para serem enfileirados que estão a ser gerados.\n"
+"Definido em branco para uma quantidade apropriada ser escolhida "
+"automaticamente."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "Set to blank for an appropriate amount to be chosen automatically."
 msgstr ""
+"Número máximo de blocos para ser enfileirado que serão carregados do arquivo."
+"\n"
+"Definido em branco para uma quantidade apropriada ser escolhida "
+"automaticamente."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
-msgstr ""
+msgstr "Número máximo de mapblocks carregados forçadamente."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum number of mapblocks for client to be kept in memory.\n"
 "Set to -1 for unlimited amount."
 msgstr ""
+"Número máximo de mapblocks para o cliente para ser mantido na memória.\n"
+"Definido como -1 para quantidade ilimitada."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3464,40 +3516,47 @@ msgid ""
 "try reducing it, but don't reduce it to a number below double of targeted\n"
 "client number."
 msgstr ""
+"Número máximo de pacotes enviados por etapa de envio, se você tem uma "
+"conexão lenta tente reduzir isso, mas não reduza a um número abaixo do dobro "
+"do número de cliente alvo."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of players that can connect simultaneously."
-msgstr ""
+msgstr "Número máximo de jogadores que podem se conectar simultaneamente."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of statically stored objects in a block."
-msgstr ""
+msgstr "Número máximo de objetos estaticamente armazenados em um bloco."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
 "Useful if there's something to be displayed right or left of hotbar."
 msgstr ""
+"Proporção máxima da janela atual a ser usada para hotbar.\n"
+"Útil se houver algo para ser exibido a direito ou esquerda do hotbar."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneously blocks send per client"
-msgstr ""
+msgstr "Máximo de blocos enviados simultaneamente por cliente"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneously bocks send total"
-msgstr ""
+msgstr "Máximo de blocos enviados simultaneamente totais"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
 msgstr ""
+"Tempo máximo em ms para download de arquivo (por exemplo, um arquivo ZIP de "
+"um modificador) pode tomar."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
-msgstr ""
+msgstr "Limite de usuários"
 
 #: src/settings_translation_file.cpp
 msgid "Maxmimum objects per block"
-msgstr ""
+msgstr "Limite de objetos por bloco"
 
 #: src/settings_translation_file.cpp
 msgid "Menus"
@@ -3505,89 +3564,98 @@ msgstr "Opções para menus"
 
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
-msgstr ""
+msgstr "Cache de malha"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day"
-msgstr ""
+msgstr "Mensagem do dia"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day displayed to players connecting."
-msgstr ""
+msgstr "Mensagem do dia exibida aos jogadores ao conectar."
 
 #: src/settings_translation_file.cpp
 msgid "Method used to highlight selected object."
-msgstr ""
+msgstr "Método usado para destacar o objeto selecionado."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
-msgstr ""
+msgstr "Minimapa"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap key"
-msgstr ""
+msgstr "Tecla do Minimapa"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap scan height"
-msgstr ""
+msgstr "Altura de escaneamento do minimapa"
 
 #: src/settings_translation_file.cpp
 msgid "Minimum texture size for filters"
-msgstr ""
+msgstr "Tamanho mínimo da textura para filtros"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
 msgstr "Mipmapping (filtro)"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mod profiling"
-msgstr ""
+msgstr "criação de perfil do modificador"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
-msgstr ""
+msgstr "URL de detalhes da Modstore"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore download URL"
-msgstr ""
+msgstr "URL de download da Modstore"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore mods list URL"
-msgstr ""
+msgstr "URL da lista de modificadores da Modstore"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Monospace font path"
-msgstr ""
+msgstr "Caminho de fonte monoespaçada"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Monospace font size"
-msgstr ""
+msgstr "Tamanho da fonte monoespaçada"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
-msgstr ""
+msgstr "Sensibilidade do mouse"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity multiplier."
-msgstr ""
+msgstr "Multiplicador de sensibilidade do mouse."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Multiplier for fall bobbing.\n"
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
+"Multiplicador para cair balançando.\n"
+"Por exemplo: 0 para não ver balançando; 1.0 para normal; 2.0 para duplo."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Multiplier for view bobbing.\n"
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
+"Multiplicador para sacudir a exibição.\n"
+"Por exemplo: 0 para não ver balançando; 1.0 para normal; 2.0 para duplo."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Name of map generator to be used when creating a new world.\n"
 "Creating a world in the main menu will override this."
 msgstr ""
+"Nome do gerador de mapa a ser usado ao criar um novo mundo.\n"
+"Criação de um mundo no menu principal irá substituir isso."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3595,61 +3663,73 @@ msgid ""
 "When running a server, clients connecting with this name are admins.\n"
 "When starting from the main menu, this is overridden."
 msgstr ""
+"Nome do jogador.\n"
+"Quando executando um servidor, os clientes com este nome são administradores."
+"\n"
+"Nome definido a partir do menu principal, substitui esse."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Name of the server, to be displayed when players join and in the serverlist."
 msgstr ""
+"Nome do servidor, a ser exibido quando os jogadores abrem a lista de "
+"servidores."
 
 #: src/settings_translation_file.cpp
 msgid "Network"
-msgstr ""
+msgstr "Rede"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Network port to listen (UDP).\n"
 "This value will be overridden when starting from the main menu."
 msgstr ""
+"Porta de rede para receber dados (UDP).\n"
+"Esse valor será substituído se for definido a partir do menu principal."
 
 #: src/settings_translation_file.cpp
 msgid "New users need to input this password."
-msgstr ""
+msgstr "Novos usuários precisam inserir esta senha."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Noclip"
-msgstr ""
+msgstr "Noclip"
 
 #: src/settings_translation_file.cpp
 msgid "Noclip key"
-msgstr ""
+msgstr "Tecla Noclip"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Node highlighting"
-msgstr ""
+msgstr "Realce no bloco"
 
 #: src/settings_translation_file.cpp
 msgid "NodeTimer interval"
-msgstr ""
+msgstr "Intervalo de NodeTimer"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Noise parameters for biome API temperature, humidity and biome blend."
-msgstr ""
+msgstr "Parâmetros noise para a API de mistura de temperatura, umidade e bioma."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Noises"
-msgstr ""
+msgstr "Noises"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps sampling"
-msgstr ""
+msgstr "Amostragem de normalmaps"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps strength"
-msgstr ""
+msgstr "Intensidade de normalmaps"
 
 #: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
-msgstr ""
+msgstr "Número de seguimentos de emersão"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3659,124 +3739,148 @@ msgid ""
 "speed greatly\n"
 "at the cost of slightly buggy caves."
 msgstr ""
+"Número de seguimentos de emersão para usar. Deixe esse campo em branco, ou "
+"aumente esse número\n"
+"para usar vários segmentos. Em sistemas multiprocessadores, isto irá "
+"melhorar muito a velocidade do mapgen\n"
+"à custa de uns poucos bugs nas cavernas."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Number of extra blocks that can be loaded by /clearobjects at once.\n"
 "This is a trade-off between sqlite transaction overhead and\n"
 "memory consumption (4096=100MB, as a rule of thumb)."
 msgstr ""
+"Número de blocos extras que pode ser carregados por /clearobjects ao mesmo "
+"tempo.\n"
+"Esta é uma troca entre sobrecarga de transação do sqlite e consumo de "
+"memória (4096 = 100 MB, como uma regra de ouro)."
 
 #: src/settings_translation_file.cpp
 msgid "Number of parallax occlusion iterations."
-msgstr ""
+msgstr "Número de iterações de oclusão de paralaxe."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
+msgstr "Viés global do efeito de paralaxe oclusão, geralmente de escala/2."
 
 #: src/settings_translation_file.cpp
 msgid "Overall scale of parallax occlusion effect."
-msgstr ""
+msgstr "Escala global do efeito de oclusão de paralaxe."
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion"
-msgstr ""
+msgstr "Oclusão de paralaxe"
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion Scale"
-msgstr ""
+msgstr "Escala de Oclusão de paralaxe"
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion bias"
-msgstr ""
+msgstr "Viés de oclusão de paralaxe"
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion iterations"
-msgstr ""
+msgstr "Iterações de oclusão de paralaxe"
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion mode"
-msgstr ""
+msgstr "Modo de oclusão de paralaxe"
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion strength"
-msgstr ""
+msgstr "Insinsidade de oclusão de paralaxe"
 
 #: src/settings_translation_file.cpp
 msgid "Path to TrueTypeFont or bitmap."
-msgstr ""
+msgstr "Caminho para TrueTypeFont ou bitmap."
 
 #: src/settings_translation_file.cpp
 msgid "Path to save screenshots at."
-msgstr ""
+msgstr "Caminho para onde salvar screenshots."
 
 #: src/settings_translation_file.cpp
 msgid "Path to texture directory. All textures are first searched from here."
 msgstr ""
+"Caminho para o diretório de texturas. Todas as texturas são pesquisadas "
+"primeiro daqui."
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
-msgstr ""
+msgstr "Física"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
 msgstr ""
+"O jogador é capaz de voar sem ser afetado pela gravidade.\n"
+"Isso requer o privilégio \"fly\" no servidor."
 
 #: src/settings_translation_file.cpp
 msgid "Player name"
-msgstr ""
+msgstr "Nome do Jogador"
 
 #: src/settings_translation_file.cpp
 msgid "Player transfer distance"
-msgstr ""
+msgstr "Distância de transferência do jogador"
 
 #: src/settings_translation_file.cpp
 msgid "Player versus Player"
-msgstr ""
+msgstr "Jogador contra Jogador"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Port to connect to (UDP).\n"
 "Note that the port field in the main menu overrides this setting."
 msgstr ""
+"Porta para conectar (UDP).\n"
+"Note que o campo Porta no menu principal substitui essa configuração."
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
-msgstr ""
+msgstr "Impede que mods façam coisas inseguras como executar comandos do shell."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Privileges that players with basic_privs can grant"
-msgstr ""
+msgstr "Privilégios que jogadores com basic_privs podem conceder"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler data print interval. 0 = disable. Useful for developers."
 msgstr ""
+"Intervalo de impressão de dados do profiler. 0 = desabilitado. Útil para os "
+"desenvolvedores."
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
-msgstr ""
+msgstr "Tecla de alternância de Profiler"
 
 #: src/settings_translation_file.cpp
 msgid "Profiling print interval"
-msgstr ""
+msgstr "Intervalo de impressão de perfil"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
 "Values larger than 26 will start to produce sharp cutoffs at cloud area "
 "corners."
 msgstr ""
+"Raio da área de nuvem afirmada em número de 64 nodes de nuvem quadrados.\n"
+"Valores maiores que 26 vão começar a produzir cortes afiados nos cantos de "
+"área de nuvem."
 
 #: src/settings_translation_file.cpp
 msgid "Raises terrain to make valleys around the rivers"
-msgstr ""
+msgstr "Eleva o terreno para fazer vales em torno dos rios"
 
 #: src/settings_translation_file.cpp
 msgid "Random input"
-msgstr ""
+msgstr "Entrada aleatória"
 
 #: src/settings_translation_file.cpp
 msgid "Range select key"
@@ -3784,57 +3888,62 @@ msgstr "Tecla para modo de visão ilimitado"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
-msgstr ""
+msgstr "Mídia remota"
 
 #: src/settings_translation_file.cpp
 msgid "Remote port"
-msgstr ""
+msgstr "Porta remota"
 
 #: src/settings_translation_file.cpp
 msgid "Replaces the default main menu with a custom one."
-msgstr ""
+msgstr "Substitui o menu principal padrão por um personalizado."
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Tecla direita"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Rightclick repetition interval"
-msgstr ""
+msgstr "Intervalo de repetição de clique direito"
 
 #: src/settings_translation_file.cpp
 msgid "River Depth"
-msgstr ""
+msgstr "Profundidade do Rio"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "River Noise"
-msgstr ""
+msgstr "Noise do Rio"
 
 #: src/settings_translation_file.cpp
 msgid "River Size"
-msgstr ""
+msgstr "Tamanho do Rio"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "River noise -- rivers occur close to zero"
-msgstr ""
+msgstr "Noise do rio -- rios ocorrem perto de zero"
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
-msgstr ""
+msgstr "Gravação de reversão"
 
 #: src/settings_translation_file.cpp
 msgid "Round minimap"
-msgstr ""
+msgstr "Minimapa redondo"
 
 #: src/settings_translation_file.cpp
 msgid "Save the map received by the client on disk."
-msgstr ""
+msgstr "Salvar o mapa recebido pelo cliente no disco."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Saving map received from server"
-msgstr ""
+msgstr "Salvamento do mapa recebido do servidor"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Scale gui by a user specified value.\n"
 "Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
@@ -3842,14 +3951,19 @@ msgid ""
 "pixels when scaling down, at the cost of blurring some\n"
 "edge pixels when images are scaled by non-integer sizes."
 msgstr ""
+"Escala de GUI por um valor especificado pelo usuário.\n"
+"Use um filtro nearest-neighbor-anti-alias para escala do GUI.\n"
+"Isso irá suavizar algumas das arestas e misturar pixels \n"
+"quando a escalado baixo, ao custo de borrar alguns pixels de borda \n"
+"quando as imagens são dimensionadas em tamanhos não-inteiros."
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
-msgstr ""
+msgstr "Altura da tela"
 
 #: src/settings_translation_file.cpp
 msgid "Screen width"
-msgstr ""
+msgstr "Largura da tela"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot"
@@ -3857,7 +3971,7 @@ msgstr "Captura de tela"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot folder"
-msgstr ""
+msgstr "Pasta de screenshot"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3875,26 +3989,29 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"Qualidade de imagem. Usado somente para o formato JPEG.\n"
+"1 significa pior qualidade; 100 significa melhor qualidade.\n"
+"Use 0 para qualidade padrão."
 
 #: src/settings_translation_file.cpp
 msgid "Security"
-msgstr ""
+msgstr "Segurança"
 
 #: src/settings_translation_file.cpp
 msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
-msgstr ""
+msgstr "Consulte http://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
-msgstr ""
+msgstr "Cor da borda da caixa de seleção (R, G, B)."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box color"
-msgstr ""
+msgstr "Cor da caixa de seleção"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box width"
-msgstr ""
+msgstr "Largura da caixa de seleção"
 
 #: src/settings_translation_file.cpp
 msgid "Server / Singleplayer"
@@ -3933,24 +4050,32 @@ msgid ""
 "Set the language. Leave empty to use the system language.\n"
 "A restart is required after changing this."
 msgstr ""
+"Defina o idioma. Deixe vazio para usar a linguagem do sistema.\n"
+"Apos mudar isso uma reinicialização é necessária."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving leaves.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Definido como true habilita balanço folhas.\n"
+"Requer sombreadores serem ativados."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Definido como true permite balanço de plantas.\n"
+"Requer sombreadores serem ativados."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving water.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Definido como true permite ondulação da água.\n"
+"Requer sombreadores seres ativados."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3958,32 +4083,38 @@ msgid ""
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
+"Shaders permitem efeitos visuais avançados e podem aumentar a performance em "
+"algumas placas de vídeo.\n"
+"Só funcionam com o backend de vídeo OpenGL."
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr ""
+msgstr "Forma do minimapa. Ativado = redondo, Desativado = quadrado."
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
-msgstr ""
+msgstr "Mostrar informações de depuração"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
-msgstr ""
+msgstr "Mostrar as caixas de seleção entidades"
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
-msgstr ""
+msgstr "Mensagem de desligamento"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 "
 "nodes)."
 msgstr ""
+"Tamanho das parcelas a ser gerada de uma vez pelo mapgen, definido em "
+"mapblocks (16 nodes)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Slope and fill work together to modify the heights"
-msgstr ""
+msgstr "Inclinação e preenchimento trabalham juntos para modificar as alturas"
 
 #: src/settings_translation_file.cpp
 msgid "Smooth lighting"
@@ -3994,14 +4125,17 @@ msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
+"Suaviza o movimento da câmera quando olhando ao redor. Também chamado de "
+"olhar ou suavização do mouse.\n"
+"Útil para gravar vídeos."
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
-msgstr ""
+msgstr "Suaviza a rotação da câmera no modo cinemático. 0 para desativar."
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera. 0 to disable."
-msgstr ""
+msgstr "Suaviza a rotação da câmera. 0 para desativar."
 
 #: src/settings_translation_file.cpp
 msgid "Sneak key"
@@ -4009,57 +4143,72 @@ msgstr "Esgueirar"
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
-msgstr ""
+msgstr "Som"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
 "$filename should be accessible from $remote_media$filename via cURL\n"
 "(obviously, remote_media should end with a slash).\n"
 "Files that are not present will be fetched the usual way."
 msgstr ""
+"Especifica o URL no qual os clientes buscam a mídia ao em vez de usar o UDP."
+"\n"
+"$filename deve ser acessível a partir de $remote_media$filename via cURL ("
+"obviamente, remote_media deve terminar com uma barra \"/\").\n"
+"Arquivos que não estão presentes serão obtidos da maneira usual por UDP."
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
-msgstr ""
+msgstr "Ponto de spawn estático"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of generated normalmaps."
-msgstr ""
+msgstr "Intensidade de normalmaps gerados."
 
 #: src/settings_translation_file.cpp
 msgid "Strength of parallax."
-msgstr ""
+msgstr "Intensidade de paralaxe."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Strict protocol checking"
-msgstr ""
+msgstr "Verificação rígida de protocolo"
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
-msgstr ""
+msgstr "Suporte a servidores mais antigos"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
-msgstr ""
+msgstr "SQLite síncrono"
 
 #: src/settings_translation_file.cpp
 msgid "Terrain Height"
-msgstr ""
+msgstr "Altura do terreno"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Terrain noise threshold for hills.\n"
 "Controls proportion of world area covered by hills.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Limite noise de terreno para colinas.\n"
+"Proporção de controles da área de mundo coberta pelas colinas.\n"
+"Ajuste no sentido 0,0 para uma proporção maior."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Terrain noise threshold for lakes.\n"
 "Controls proportion of world area covered by lakes.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Limite noise de terreno para Lagos.\n"
+"Proporção de controles da área de mundo coberta por lagos.\n"
+"Ajuste no sentido 0,0 para uma proporção maior."
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
@@ -4067,84 +4216,112 @@ msgstr "Pacotes de texturas"
 
 #: src/settings_translation_file.cpp
 msgid "The altitude at which temperature drops by 20C"
-msgstr ""
+msgstr "A altitude na qual temperatura cai para 20C"
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
-msgstr ""
+msgstr "A profundidade de terra ou outro enchimento"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
-msgstr ""
+msgstr "A interface de rede no qual o servidor escuta (aguarda conexão)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The privileges that new users automatically get.\n"
 "See /privs in game for a full list on your server and mod configuration."
 msgstr ""
+"Os privilégios que novos usuários obtém automaticamente.\n"
+"Consulte /privs no jogo para obter uma lista completa na configuração do seu "
+"servidor e dos modificadores."
 
 #: src/settings_translation_file.cpp
 msgid "The rendering back-end for Irrlicht."
-msgstr ""
+msgstr "O processamento back-end para Irrlicht."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The sensitivity of the joystick axes for moving the\n"
 "ingame view frustum around."
 msgstr ""
+"A sensibilidade dos eixos do joystick para movimentar o \n"
+"frustum de exibição no jogo."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
 "Lower is darker, Higher is lighter. The valid range of values for this\n"
 "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
 "set to the nearest valid value."
 msgstr ""
+"A intensidade (escuridão) de sombreamento da oclusão-ambiente no node.\n"
+"Inferior é mais escura, superior é mais clara. O intervalo válido de valores "
+"para esta\n"
+"configuração é 0.25 a 4.0. Se o valor está fora do intervalo ele será \n"
+"definido o valor válido mais próximo."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The time (in seconds) that the liquids queue may grow beyond processing\n"
 "capacity until an attempt is made to decrease its size by dumping old queue\n"
 "items.  A value of 0 disables the functionality."
 msgstr ""
+"O tempo (em segundos) que a fila de líquidos pode crescer além da capacidade "
+"\n"
+"de processamento até que é feita uma tentativa para diminuir o seu tamanho "
+"pelo despejo \n"
+"de antigas filas de itens.  Um valor 0 desativa a funcionalidade."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
+"O tempo em segundos que leva entre eventos repetidos \n"
+"quando pressionar uma combinação de botão no joystick."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
 "right mouse button."
 msgstr ""
+"O tempo em segundos entre repetidos cliques direitos ao segurar o botão "
+"direito do mouse."
 
 #: src/settings_translation_file.cpp
 msgid "This font will be used for certain languages."
-msgstr ""
+msgstr "Esta fonte será usada para determinados idiomas."
 
 #: src/settings_translation_file.cpp
 msgid "Time in between active block management cycles"
-msgstr ""
+msgstr "Tempo entre ciclos de gestão do bloco ativo"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
 "Setting it to -1 disables the feature."
 msgstr ""
+"Tempo em segundos para manter entidade de item (itens caídos/dropados).\n"
+"Definindo-o como -1 desabilita o recurso."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Time send interval"
-msgstr ""
+msgstr "Intervalo de tempo de envio"
 
 #: src/settings_translation_file.cpp
 msgid "Time speed"
-msgstr ""
+msgstr "Velocidade de tempo"
 
 #: src/settings_translation_file.cpp
 msgid "Timeout for client to remove unused map data from memory."
 msgstr ""
+"Tempo de espera para o cliente remover dados de mapa não utilizados da "
+"memória."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4153,14 +4330,18 @@ msgid ""
 "This determines how long they are slowed down after placing or removing a "
 "node."
 msgstr ""
+"Para reduzir o lag, transferências de blocos são desaceleradas quando um "
+"jogador está construindo algo.\n"
+"Isto determina por quanto tempo eles são desacelerados após a colocação ou "
+"remoção de um node."
 
 #: src/settings_translation_file.cpp
 msgid "Toggle camera mode key"
-msgstr ""
+msgstr "Tecla de alternância do modo de câmera"
 
 #: src/settings_translation_file.cpp
 msgid "Tooltip delay"
-msgstr ""
+msgstr "Atraso de dica de ferramenta"
 
 #: src/settings_translation_file.cpp
 msgid "Trilinear filtering"
@@ -4172,38 +4353,43 @@ msgid ""
 "False = 128\n"
 "Useable to make minimap smoother on slower machines."
 msgstr ""
+"True = 256\n"
+"False = 128\n"
+"Útil para suavizar o minimapa em máquinas mais lentas."
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
-msgstr ""
+msgstr "Modificadores confiáveis"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
-msgstr ""
+msgstr "URL para a lista de servidores exibida na guia Multiplayer."
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
-msgstr ""
+msgstr "Distância de transferência do jogador ilimitada"
 
 #: src/settings_translation_file.cpp
 msgid "Unload unused server data"
-msgstr ""
+msgstr "Descarregar os dados do servidor não utilizados"
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
-msgstr ""
+msgstr "Usar nuvens 3D em vez de planas."
 
 #: src/settings_translation_file.cpp
 msgid "Use a cloud animation for the main menu background."
-msgstr ""
+msgstr "Usar uma animação de nuvem para o fundo do menu principal."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Use anisotropic filtering when viewing at textures from an angle."
-msgstr ""
+msgstr "Usar filtragem anisotrópica quando visualizar texturas de um ângulo."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr ""
+msgstr "Usar filtragem bilinear ao dimensionamento de texturas."
 
 #: src/settings_translation_file.cpp
 msgid "Use key"
@@ -4212,88 +4398,103 @@ msgstr "press. uma tecla"
 #: src/settings_translation_file.cpp
 msgid "Use mip mapping to scale textures. May slightly increase performance."
 msgstr ""
+"Use mapeamento MIP para texturas de escala. Pode aumentar ligeiramente o "
+"desempenho."
 
 #: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
-msgstr ""
+msgstr "Use a filtragem trilinear ao dimensionamento de texturas."
 
 #: src/settings_translation_file.cpp
 msgid "Useful for mod developers."
 msgstr "Útil para desenvolvedores de mods."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "V-Sync"
-msgstr ""
+msgstr "V-Sync"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "VBO"
-msgstr ""
+msgstr "VBO"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Depth"
-msgstr ""
+msgstr "Profundidade do vale"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Fill"
-msgstr ""
+msgstr "Preenchimento do vale"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Profile"
-msgstr ""
+msgstr "Perfil do vale"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Slope"
-msgstr ""
+msgstr "Encosta do vale"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Valleys C Flags"
-msgstr ""
+msgstr "Flags C de vales"
 
 #: src/settings_translation_file.cpp
 msgid "Vertical screen synchronization."
-msgstr ""
+msgstr "Sincronização vertical da tela."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
-msgstr ""
+msgstr "Driver de vídeo"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "View bobbing"
-msgstr ""
+msgstr "Visualização de balanço"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "View distance in nodes.\n"
 "Min = 20"
 msgstr ""
+"Distância de visão (em nodes).\n"
+"Min = 20"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "View range decrease key"
-msgstr ""
+msgstr "Tecla de diminuição do intervalo de exibição"
 
 #: src/settings_translation_file.cpp
 msgid "View range increase key"
-msgstr ""
+msgstr "Tecla de aumento do intervalo de exibição"
 
 #: src/settings_translation_file.cpp
 msgid "Viewing range"
-msgstr ""
+msgstr "Intervalo de visualização"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
 msgstr "Volume do som"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "W co-ordinate of the generated 3D slice of a 4D fractal.\n"
 "Determines which 3D slice of the 4D shape is generated.\n"
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Coordenada W da fatia 3D gerada de um fractal 4D.\n"
+"Determina qual fatia 3D da forma 4D é gerada.\n"
+"Não tem efeito sobre fractais 3D.\n"
+"Intervalo de aproximadamente -2 a 2."
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
-msgstr ""
+msgstr "Velocidade de caminhada"
 
 #: src/settings_translation_file.cpp
 msgid "Water Features"
@@ -4301,15 +4502,16 @@ msgstr "Coisas relacionadas a Água"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
-msgstr ""
+msgstr "Nível de água"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
-msgstr ""
+msgstr "Nível de superfície de água do mundo."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Waving Nodes"
-msgstr ""
+msgstr "Nodes de balanço"
 
 #: src/settings_translation_file.cpp
 msgid "Waving leaves"
@@ -4317,40 +4519,50 @@ msgstr "Balanço das árvores"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
-msgstr ""
+msgstr "Balanço das plantas"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water"
-msgstr ""
+msgstr "Balanço da água"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water height"
-msgstr ""
+msgstr "Altura de balanço da água"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water length"
-msgstr ""
+msgstr "Comprimento de balanço da água"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water speed"
-msgstr ""
+msgstr "Velocidade de balanço da água"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "When gui_scaling_filter is true, all GUI images need to be\n"
 "filtered in software, but some images are generated directly\n"
 "to hardware (e.g. render-to-texture for nodes in inventory)."
 msgstr ""
+"Quando gui_scaling_filter é true, todas as imagens de GUI precisam ser\n"
+"filtrado no software, mas algumas imagens são geradas diretamente ao\n"
+"hardware (por exemplo render-to-texture para nodes no inventário)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
 "propery support downloading textures back from hardware."
 msgstr ""
+"Quando gui_scaling_filter_txr2img é true, copie essas imagens\n"
+"de hardware para software para dimensionamento. Quando false,\n"
+"voltará para o velho método de dimensionamento, para drivers de\n"
+"vídeo que não suportem propriedades baixas de texturas voltam do hardware."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
 "can be blurred, so automatically upscale them with nearest-neighbor\n"
@@ -4360,6 +4572,16 @@ msgid ""
 "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
 "enabled."
 msgstr ""
+"Ao usar filtros bilineares/trilinear/anisotrópica, texturas de baixa "
+"resolução\n"
+"podem ficar turva, então automaticamente melhora eles com a interpolação\n"
+"de nearest-neighbor para preservar os pixels nítidos. Isto define o tamanho\n"
+"mínimo da textura para as texturas melhoradas; valores mais altos parecem\n"
+"mais nítidas, mas requerem mais memória. Intensidades de 2 são recomendadas."
+"\n"
+"Essa configuração superior a 1 não pode ter um efeito visível, a menos que a "
+"\n"
+"filtragem bilineares/trilinear/anisotrópica seja habilitada."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4370,48 +4592,75 @@ msgid ""
 "-    Those groups have an offset of -32, -32 nodes from the origin.\n"
 "-    Only groups which are within the map_generation_limit are generated"
 msgstr ""
+"Limite de geração de mapa.\n"
+"Note:\n"
+"-    Limitado a 31000 (valores superiores não têm efeito)\n"
+"-    O gerador funciona em grupos de 80x80x80 cubos (5x5x5 MapBlocks)\n"
+"-    Esses grupos têm um deslocamento de -32, -32 nodes em relação à origem."
+"\n"
+"-    Apenas grupos dentro do limite definido map_gerenation_limit são gerados"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Whether freetype fonts are used, requires freetype support to be compiled in."
 msgstr ""
+"Se forem utilizadas fontes freetype, requer suporte a freetype para ser "
+"compilado."
 
 #: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
+"Se as animações de textura do nodes devem ser dessincronizadas por mapblock."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Whether players are shown to clients without any range limit.\n"
 "Deprecated, use the setting player_transfer_distance instead."
 msgstr ""
+"Se os jogadores são mostrados para os clientes sem qualquer limite de "
+"distância.\n"
+"Caso não desejar, use a configuração player_transfer_distance."
 
 #: src/settings_translation_file.cpp
 msgid "Whether to allow players to damage and kill each other."
-msgstr ""
+msgstr "Se deseja permitir aos jogadores causar dano e matar uns aos outros."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether to ask clients to reconnect after a (Lua) crash.\n"
 "Set this to true if your server is set up to restart automatically."
 msgstr ""
+"Se deseja perguntar aos clientes para reconectarem depois de uma queda (Lua)."
+"\n"
+"Defina como true se o servidor está configurado para reiniciar "
+"automaticamente."
 
 #: src/settings_translation_file.cpp
 msgid "Whether to fog out the end of the visible area."
-msgstr ""
+msgstr "Se for usar névoa no fim da área visível."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether to show the client debug info (has the same effect as hitting F5)."
 msgstr ""
+"Se deseja mostrar informação de depuração ao cliente (tem o mesmo efeito "
+"como teclar F5)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Whether to support older servers before protocol version 25.\n"
 "Enable if you want to connect to 0.4.12 servers and before.\n"
 "Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
 "Disabling this option will protect your password better."
 msgstr ""
+"Se vai apoiar os servidores mais antigos antes de protocolo versão 25.\n"
+"Habilitar se você deseja se conectar a servidores anteriores a 0.4.12.\n"
+"Servidores começando com 0.4.13 vão funcionar, servidores 0.4.12-dev podem "
+"ou não funcionar.\n"
+"Desabilitar esta opção irá proteger sua senha melhor."
 
 #: src/settings_translation_file.cpp
 msgid "Width component of the initial window size."
@@ -4419,33 +4668,40 @@ msgstr "Largura da janela inicial."
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selectionbox's lines around nodes."
-msgstr ""
+msgstr "Largura das linhas do bloco de seleção em torno de nodes."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
+"Diretório de mundo (tudo no mundo está armazenado aqui).\n"
+"Não é necessário se for iniciado a partir do menu principal."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Y of flat ground."
-msgstr ""
+msgstr "Y de terreno plano."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Y of upper limit of large pseudorandom caves."
-msgstr ""
+msgstr "Y de limite superior de grandes números pseudoaleatórios de cavernas."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "cURL file download timeout"
-msgstr ""
+msgstr "Tempo limite de download de arquivo via cURL"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "cURL parallel limit"
-msgstr ""
+msgstr "limite paralelo de cURL"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "cURL timeout"
-msgstr ""
+msgstr "Tempo de cURL"
 
 #~ msgid "No of course not!"
 #~ msgstr "Claro que não!"

From efa2635d5677af133ab49a76f15b04b1312a8712 Mon Sep 17 00:00:00 2001
From: Jakub Mendel <jimikuba@o2.pl>
Date: Fri, 29 Jul 2016 18:03:41 +0000
Subject: [PATCH 166/418] Translated using Weblate (Polish)

Currently translated at 42.4% (380 of 895 strings)
---
 po/pl/minetest.po | 1335 +++++++++++++++++++++++++++++----------------
 1 file changed, 876 insertions(+), 459 deletions(-)

diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index 4b36d0a5f..3d79c542b 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-03-24 19:38+0000\n"
-"Last-Translator: red-001 <red-001@openmailbox.org>\n"
-"Language-Team: Polish <https://hosted.weblate.org/projects/minetest/minetest/"
-"pl/>\n"
+"PO-Revision-Date: 2016-07-29 18:03+0000\n"
+"Last-Translator: Jakub Mendel <jimikuba@o2.pl>\n"
+"Language-Team: Polish "
+"<https://hosted.weblate.org/projects/minetest/minetest/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.6-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "Wystąpił błąd w skrypcie modyfikacji:"
+msgstr "Wystąpił błąd w skrypcie Lua modyfikacji:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -71,7 +71,7 @@ msgstr "Wspieramy tylko protokół w wersji $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr "Wspieramy protokół w wersji od $1 do $2."
+msgstr "Wspieramy protokoły w wersji od $1 do $2."
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -87,11 +87,11 @@ msgstr "Zależy od:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable MP"
-msgstr "Wyłącz MP"
+msgstr "Wyłącz paczkę modów"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable MP"
-msgstr "Włącz MP"
+msgstr "Włącz paczkę modów"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -103,7 +103,7 @@ msgid ""
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
 "Nie można włączyć moda \"$1\" gdyż nazwa zawiera niedozwolone znaki. "
-"Dozwolone są znaki  [a-z0-9_]."
+"Dozwolone są wyłącznie znaki  [a-z0-9_]."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -111,7 +111,7 @@ msgstr "Ukryj Grę"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide mp content"
-msgstr "Ukryj zawartość MP"
+msgstr "Ukryj zawartość paczki modów"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -140,11 +140,11 @@ msgstr "Utwórz"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "Ściągnij podgrę, taką jak minetest_game, z minetest.net"
+msgstr "Pobierz tryb gry (np. minetest_game), z minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr "Ściągninj z minetest.net"
+msgstr "Pobierz z minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -160,11 +160,13 @@ msgstr "Nie podano nazwy świata lub nie wybrano gry"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Seed"
-msgstr "Ziarno"
+msgstr "Ziarno losowości"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The minimal development test is meant for developers."
-msgstr "Ostrzeżenie: Gra minimalna jest przeznaczona dla dewelperów."
+msgstr ""
+"Uwaga: Tryb minimal development test jest stworzony wyłącznie dla "
+"developerów."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -172,7 +174,7 @@ msgstr "Nazwa świata"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no subgames installed."
-msgstr "Nie masz zainstalowanych żadnych podgier."
+msgstr "Nie zainstalowano żadnych trybów gry."
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
@@ -210,7 +212,7 @@ msgstr "\"$1\" nie jest poprawną flagą."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
-msgstr "(Brak opisu ustawienia)"
+msgstr "(Nie podano opisu ustawienia)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
@@ -241,8 +243,8 @@ msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
-"Składnia: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
-"<octaves>, <persistence>"
+"Format: <offset>, <skala>, (<rozpiętośćX>, <rozpiętośćY>, <rozpiętośćZ>), "
+"<ziarno>, <oktawy>, <trwanie>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
@@ -298,7 +300,7 @@ msgid ""
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
 "\n"
-"Instalacja moda: nieznany typ pliku \"$1\" lub archiwum uszkodzone"
+"Instalacja moda: nieznany typ pliku \"$1\" lub uszkodzone archiwum"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Failed to install $1 to $2"
@@ -343,11 +345,11 @@ msgstr "Szukaj"
 
 #: builtin/mainmenu/store.lua
 msgid "Shortname:"
-msgstr "Nazwa świata:"
+msgstr "Skrócona nazwa:"
 
 #: builtin/mainmenu/store.lua
 msgid "Successfully installed:"
-msgstr "Udana instalacja:"
+msgstr "Pomyślnie zainstalowano:"
 
 #: builtin/mainmenu/store.lua
 msgid "Unsorted"
@@ -387,7 +389,7 @@ msgstr "Informacje o modzie:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "No mod description available"
-msgstr "Brak informacji o modzie"
+msgstr "Brak dostępnych informacji o modzie"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Rename"
@@ -403,12 +405,11 @@ msgstr "Usuń zaznaczony modyfikację"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected modpack"
-msgstr "Usuń zaznaczony modpack"
+msgstr "Odinstaluj wybraną paczkę modów"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "Adres / Port :"
+msgstr "Adres / Port"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -427,19 +428,16 @@ msgid "Damage enabled"
 msgstr "Obrażenia włączone"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Del. Favorite"
-msgstr "Ulubione:"
+msgstr "Usuń ulubiony"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Favorite"
-msgstr "Ulubione:"
+msgstr "Ulubione"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "Nazwa gracza / Hasło :"
+msgstr "Nazwa gracza / Hasło"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -524,16 +522,14 @@ msgid "Antialiasing:"
 msgstr "Antyaliasing:"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Are you sure to reset your singleplayer world?"
-msgstr "Pojedynczy gracz"
+msgstr "Jesteś pewny że chcesz zresetować świat singleplayer?"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
 msgstr "Filtrowanie dwuliniowe"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
 msgstr "Mapowanie wypukłości"
 
@@ -570,23 +566,20 @@ msgid "No Mipmap"
 msgstr "Mip-Mappowanie wyłączone"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Highlighting"
-msgstr "Płynne oświetlenie"
+msgstr "Podświetlanie bloku"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Outlining"
-msgstr "Płynne oświetlenie"
+msgstr "Obramowanie bloków"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
 msgstr "Brak"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Normal Mapping"
-msgstr "Mip-Mappowanie"
+msgstr "Mapowanie normalnych"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -601,14 +594,12 @@ msgid "Parallax Occlusion"
 msgstr "Mapowanie paralaksy"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
 msgstr "Włącz Efekty Cząsteczkowe"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Reset singleplayer world"
-msgstr "Pojedynczy gracz"
+msgstr "Resetuj świat pojedynczego gracza"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -632,35 +623,31 @@ msgstr "Teksturowanie:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr ""
+msgstr "Sterownik OpenGL jest wymagany aby włączyć shadery."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-#, fuzzy
 msgid "Tone Mapping"
-msgstr "Mip-Mappowanie"
+msgstr "Tone Mapping"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold (px)"
-msgstr ""
+msgstr "Próg dotyku (px)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
 msgstr "Filtrowanie trójliniowe"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Leaves"
-msgstr "Ozdobne drzewa"
+msgstr "Falujące liście"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Plants"
-msgstr "Ozdobne drzewa"
+msgstr "Falujące rośliny"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Water"
-msgstr "Ozdobne drzewa"
+msgstr "Falująca woda"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Yes"
@@ -704,15 +691,15 @@ msgstr "Przekroczono limit czasu połączenia."
 
 #: src/client.cpp
 msgid "Done!"
-msgstr "Zrobione!"
+msgstr "Gotowe!"
 
 #: src/client.cpp
 msgid "Initializing nodes"
-msgstr "Initializownie nod"
+msgstr "Inicjalizacja elementów"
 
 #: src/client.cpp
 msgid "Initializing nodes..."
-msgstr "Initializowanie nod..."
+msgstr "Inicjalizacja elementów..."
 
 #: src/client.cpp
 msgid "Loading textures..."
@@ -744,11 +731,11 @@ msgstr "Nie wybrano świata ani adresu."
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
-msgstr "Nazwa gracza zbyt długa."
+msgstr "Nazwa gracza jest za długa."
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr "Podana ścieżka do świata nie istnieje: "
+msgstr "Podana ścieżka świata nie istnieje: "
 
 #: src/fontengine.cpp
 msgid "needs_fallback_font"
@@ -972,7 +959,7 @@ msgstr "Skradanie"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle Cinematic"
-msgstr "Włącz/Wyłącz tryb Cinematic"
+msgstr "Przełącz tryb Cinematic"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
@@ -1052,7 +1039,7 @@ msgstr "Control"
 
 #: src/keycode.cpp
 msgid "Convert"
-msgstr "Convert"
+msgstr "Konwertuj"
 
 #: src/keycode.cpp
 msgid "CrSel"
@@ -1081,7 +1068,7 @@ msgstr "ExSel"
 
 #: src/keycode.cpp
 msgid "Execute"
-msgstr "Execute"
+msgstr "Wykonaj"
 
 #: src/keycode.cpp
 msgid "Final"
@@ -1145,7 +1132,7 @@ msgstr "Minus"
 
 #: src/keycode.cpp
 msgid "Mode Change"
-msgstr "Mode Change"
+msgstr "Zmiana Trybu"
 
 #: src/keycode.cpp
 msgid "Next"
@@ -1312,6 +1299,7 @@ msgid "Zoom"
 msgstr "Zoom"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
 "Used to move a suitable spawn area of low land close to (0, 0).\n"
@@ -1319,12 +1307,22 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X, Y, Z) offset fraktalu od centrum świata w jednostkach \"skali\".\n"
+"Używany by przesunąć  odpowiednie miejsce do spawnu niskiego podłoża blisko "
+"punktu (0, 0).\n"
+"Domyślny jest odpowiedni dla zbiorów Mandelbrota, wymaga edycji dla zbiorów "
+"Julii.\n"
+"Zakres w przybliżeniu -2 do 2. Pomnożony przez \"skalę\" dla offsetu na "
+"węzłech."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "0 = parallax occlusion with slope information (faster).\n"
 "1 = relief mapping (slower, more accurate)."
 msgstr ""
+"0 = parallax occlusion z informacją nachylenia (szybsze).\n"
+"1 = relief mapping (wolniejsze, bardziej dokładne)."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -1335,6 +1333,7 @@ msgid "3D mode"
 msgstr "Modele 3D"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -1345,131 +1344,173 @@ msgid ""
 "-    sidebyside: split screen side by side.\n"
 "-    pageflip: quadbuffer based 3d."
 msgstr ""
+"Wsparcie 3D\n"
+"Aktualnie wspierane:\n"
+"-    none: bez wyjścia 3d.\n"
+"-    anaglyph: cyan/magenta kolor 3d.\n"
+"-    interlaced: bazujący na polaryzacji parzystej/nieparzystej linii.\n"
+"-    topbottom: podzielony ekran góra/dół.\n"
+"-    sidebyside: podzielony obok siebie.\n"
+"-    pageflip: bazujący na quadbuffer."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "A chosen map seed for a new map, leave empty for random.\n"
 "Will be overridden when creating a new world in the main menu."
 msgstr ""
+"Wybrane ziarno dla nowej mapy, pozostaw puste dla losowego ziarna.\n"
+"Będzie nadpisane kiedy tworzy się nowy świat w głównym menu."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "A message to be displayed to all clients when the server crashes."
-msgstr ""
+msgstr "Wiadomość wyświetlana wszystkim klientom kiedy serwer zerwie połączenie"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "A message to be displayed to all clients when the server shuts down."
 msgstr ""
+"Wiadomość, która będzie wyświetlona wszystkim klientom kiedy serwer zostanie "
+"wyłączony."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Absolute limit of emerge queues"
-msgstr ""
+msgstr "Bezwzględny limit kolejki"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Acceleration in air"
-msgstr ""
+msgstr "Przyspieszenie w powietrzu"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Active Block Management interval"
-msgstr ""
+msgstr "Interwał zarządzania aktywnym blokiem"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Active Block Modifier interval"
-msgstr ""
+msgstr "Interwał modyfikatora aktywnego bloku"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Active block range"
-msgstr ""
+msgstr "Zasięg aktywnego bloku"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Active object send range"
-msgstr ""
+msgstr "Zasięg wysyłania aktywnego obiektu"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Address to connect to.\n"
 "Leave this blank to start a local server.\n"
 "Note that the address field in the main menu overrides this setting."
 msgstr ""
+"Adres do połączenia.\n"
+"Pozostaw pusty aby utworzyć lokalny serwer.\n"
+"Zauważ że pole adresu w głównym menu nadpisuje te ustawienie."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
+"Ustaw konfiguracje DPI dla twojego ekranu (nie X11/Tylko Android) np. dla "
+"ekranów 4k"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
 "This setting is for the client only and is ignored by the server."
 msgstr ""
+"Ustaw enkodowanie gamma dla tablic światła. Niższe wartości są jaśniejsze.\n"
+"Te ustawienie jest tylko dla klientów i jest ignorowane przez serwer."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
 msgstr "Zaawansowane"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Altitude Chill"
-msgstr ""
+msgstr "Wysokość mrozu"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Always fly and fast"
-msgstr ""
+msgstr "Zawsze lataj oraz poruszaj się szybko"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Amplifies the valleys"
-msgstr ""
+msgstr "Wzmacnia doliny"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anisotropic filtering"
 msgstr "Filtrowanie anizotropowe"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Announce server"
-msgstr ""
+msgstr "Rozgłoś serwer"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Announce to this serverlist.\n"
 "If you want to announce your ipv6 address, use  serverlist_url = v6.servers."
 "minetest.net."
 msgstr ""
+"Zgłoś do tej listy serwerów.\n"
+"Jeśli chcesz zgłosić twój adres ipv6, użyj serverlist_url = "
+"v6.servers.minetest.net"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
-msgstr ""
+msgstr "Przybliżona (X,Y,Z) skala fraktali w węzłach."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Ask to reconnect after crash"
-msgstr ""
+msgstr "Poproś o ponowne połączenie po awarii"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Automaticaly report to the serverlist."
-msgstr ""
+msgstr "Automatycznie zgłoś do listy serwerów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Backward key"
-msgstr "Tył"
-
-#: src/settings_translation_file.cpp
-msgid "Base terrain height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Basic"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Basic Privileges"
-msgstr ""
+msgstr "Klawisz wstecz"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Base terrain height"
+msgstr "Bazowa wysokość terenu"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Basic"
+msgstr "Podstawowy"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Basic Privileges"
+msgstr "Podstawowe uprawnienia"
+
+#: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
 msgstr "Filtrowanie dwuliniowe"
 
@@ -1479,8 +1520,9 @@ msgid "Bind address"
 msgstr "Sprawdzanie adresu..."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr ""
+msgstr "Bity na pixel (aka głębia koloru) w trybie pełnoekranowym."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1492,44 +1534,50 @@ msgid "Bumpmapping"
 msgstr "Mapowanie wypukłości"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Camera smoothing"
-msgstr ""
+msgstr "Wygładzanie kamery"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Camera smoothing in cinematic mode"
-msgstr ""
+msgstr "Wygładzanie kamery w trybie kinowym"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Camera update toggle key"
-msgstr ""
+msgstr "Klawisz przełączania kamery"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Cave noise #1"
-msgstr ""
+msgstr "Szum jaskini #1"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Cave noise #2"
-msgstr ""
+msgstr "Szum jaskini #2"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Cave width"
-msgstr ""
+msgstr "Szerokość jaskini"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Caves and tunnels form at the intersection of the two noises"
-msgstr ""
+msgstr "Jaskinie i tunele tworzą się na przecięciu dwóch szumów"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat key"
-msgstr "Zmień klawisze"
+msgstr "Klawisz czatu"
+
+#: src/settings_translation_file.cpp
+msgid "Chat toggle key"
+msgstr "Klawisz przełączania czatu"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Chat toggle key"
-msgstr "Zmień klawisze"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
 "1 = 4D \"Roundy\" mandelbrot set.\n"
@@ -1551,10 +1599,30 @@ msgid ""
 "17 = 4D \"Mandelbulb\" mandelbrot set.\n"
 "18 = 4D \"Mandelbulb\" julia set."
 msgstr ""
+"Wybór 18 fraktali z 9 formuł.\n"
+"1 = 4D \"Roundy\" zbiór Mandelbrota .\n"
+"2 = 4D \"Roundy\" zbiór Julii.\n"
+"3 = 4D \"Squarry\" zbiór Mandelbrota.\n"
+"4 = 4D \"Squarry\" zbiór Julii.\n"
+"5 = 4D \"Mandy Cousin\" zbiór Mandelbrota.\n"
+"6 = 4D \"Mandy Cousin\" zbiór Julii.\n"
+"7 = 4D \"Variation\" zbiór Mandelbrota.\n"
+"8 = 4D \"Variation\" zbiór Julii.\n"
+"9 = 3D \"Mandelbrot/Mandelbar\" zbiór Mandelbrota.\n"
+"10 = 3D \"Mandelbrot/Mandelbar\" zbiór Julii.\n"
+"11 = 3D \"Christmas Tree\" zbiór Mandelbrota.\n"
+"12 = 3D \"Christmas Tree\" zbiór Julii.\n"
+"13 = 3D \"Mandelbulb\" zbiór Mandelbrota.\n"
+"14 = 3D \"Mandelbulb\" zbiór Julii.\n"
+"15 = 3D \"Cosine Mandelbulb\" zbiór Mandelbrota.\n"
+"16 = 3D \"Cosine Mandelbulb\" zbiór Julii.\n"
+"17 = 4D \"Mandelbulb\" zbiór Mandelbrota.\n"
+"18 = 4D \"Mandelbulb\" zbiór Julii."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Chunk size"
-msgstr ""
+msgstr "Szerokość fragmentu"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1567,96 +1635,103 @@ msgid "Cinematic mode key"
 msgstr "Tryb kreatywny"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Clean transparent textures"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Client and Server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Climbing speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cloud height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cloud radius"
-msgstr ""
+msgstr "Czyste przeźroczyste tekstury"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Client and Server"
+msgstr "Klient i Serwer"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Climbing speed"
+msgstr "Szybkość wspinania"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Cloud height"
+msgstr "Wysokość chmur"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Cloud radius"
+msgstr "Zasięg chmur"
+
+#: src/settings_translation_file.cpp
 msgid "Clouds"
 msgstr "Chmury 3D"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Clouds are a client side effect."
-msgstr ""
+msgstr "Chmury są efektem po stronie klienta."
+
+#: src/settings_translation_file.cpp
+msgid "Clouds in menu"
+msgstr "Chmury w menu"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Clouds in menu"
-msgstr "Menu główne"
-
-#: src/settings_translation_file.cpp
 msgid "Colored fog"
-msgstr ""
+msgstr "Kolorowa mgła"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
+"Lista oddzielona przecinkiem zaufanych modów które mają dostęp\n"
+"do niebezpiecznych funkcji nawet gdy zabezpieczenie modów jest włączone"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"Lista oddzielonych przecinkiem modów które mają pozwolenie na dostęp do\n"
+"API HTTP, które pozwala im wysyłać i pobierać dane do/z internetu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Command key"
-msgstr "Komenda"
+msgstr "Klawisz komend"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Connect glass"
-msgstr "Połącz"
+msgstr "Połączone szkło"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Connect to external media server"
-msgstr "Łączenie z serwerem..."
+msgstr "Łączenie z zewnętrznym serwerem mediów"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Connects glass if supported by node."
-msgstr ""
+msgstr "Połącz szkło jeśli wspierane przez blok"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Console alpha"
-msgstr "Konsola"
+msgstr "Przeźroczystość konsoli"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Console color"
-msgstr "Konsola"
+msgstr "Kolor konsoli"
+
+#: src/settings_translation_file.cpp
+msgid "Console key"
+msgstr "Klawisz konsoli"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Console key"
-msgstr "Konsola"
-
-#: src/settings_translation_file.cpp
 msgid "Continuous forward"
-msgstr ""
+msgstr "Ciągle na przód"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward movement (only used for testing)."
-msgstr ""
+msgstr "Ciągłe poruszanie się na przód (tylko do testowania)."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1664,243 +1739,306 @@ msgid "Controls"
 msgstr "Control"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Controls length of day/night cycle.\n"
 "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
 "unchanged."
 msgstr ""
+"Kontrola długości cyklu dnia i nocy.\n"
+"Przykłady: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = dzień/noc/cokolwiek "
+"zostaje niezmienione."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Controls size of deserts and beaches in Mapgen v6.\n"
 "When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
 msgstr ""
+"Kontrola szerokości pustyni i plaż w generatorze map v6.\n"
+"Kiedy śnieżne biomy są włączone to jest zostanie zignorowane."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Controls steepness/depth of lake depressions."
-msgstr ""
+msgstr "Kontroluje stromość/głębokość depresji jeziora."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Controls steepness/height of hills."
-msgstr ""
+msgstr "Kontroluje stromość/wysokość gór."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
+msgstr "Kontroluje szerokość tuneli, mniejsze wartości tworzą szersze tunele."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Crash message"
-msgstr ""
+msgstr "Wiadomość awarii"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Creates unpredictable lava features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
+"Tworzy nieobliczalne pojawianie się lawy w jaskiniach.\n"
+"Może zwiększyć trudność kopania. Zero wyłącza tę opcję. (0-10)"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Creates unpredictable water features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
+"Tworzy nieobliczalne pojawianie się wody w jaskiniach.\n"
+"Może zwiększyć trudność kopania. Zero wyłącza tę opcję. (0-10)"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Crosshair alpha"
-msgstr ""
+msgstr "Przeźroczystość celownika"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr ""
+msgstr "Kanał alfa celownika (pomiędzy 0 a 255)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Crosshair color"
-msgstr ""
+msgstr "Kolor celownika"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Crosshair color (R,G,B)."
-msgstr ""
+msgstr "Kolor celownika (R,G,B)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Crouch speed"
-msgstr ""
+msgstr "Szybkość podczas kucania"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Damage"
 msgstr "Włącz obrażenia"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Debug info toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Debug log level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dedicated server step"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default acceleration"
-msgstr ""
+msgstr "Klawisz przełączania informacji debugowania"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Default game"
-msgstr "edytuj grę"
+msgid "Debug log level"
+msgstr "Poziom logowania debugowania"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dedicated server step"
+msgstr "Krok serwera dedykowanego"
+
+#: src/settings_translation_file.cpp
+msgid "Default acceleration"
+msgstr "Domyślne przyspieszenie"
+
+#: src/settings_translation_file.cpp
+msgid "Default game"
+msgstr "Domyślna gra"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Default game when creating a new world.\n"
 "This will be overridden when creating a world from the main menu."
 msgstr ""
+"Domyślna gra podczas tworzenia nowego świata.\n"
+"To zostanie nadpisane jeżeli tworzysz świat z menu głównego."
+
+#: src/settings_translation_file.cpp
+msgid "Default password"
+msgstr "Domyślne hasło"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Default password"
-msgstr "Nowe hasło"
-
-#: src/settings_translation_file.cpp
 msgid "Default privileges"
-msgstr ""
+msgstr "Domyślne uprawnienia"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
 "Only has an effect if compiled with cURL."
 msgstr ""
+"Domyślny limit czasu dla cURL, w milisekundach.\n"
+"Ma znaczenie tylko gdy skompilowane z cURL."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Defines sampling step of texture.\n"
 "A higher value results in smoother normal maps."
 msgstr ""
+"Definiuje krok próbkowania tekstury.\n"
+"Wyższa wartość reprezentuje łagodniejszą mapę normalnych."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
+"Definiuje maksymalną odległość przesyłania graczy w blokach (0 = "
+"nieskończoność)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
+msgstr "Opóźnienie wyświetlania dymkmów, w milisekundach."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Deprecated Lua API handling"
-msgstr ""
+msgstr "Wsparcie przestarzałego API Lua"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Depth below which you'll find large caves."
-msgstr ""
+msgstr "Głębokość poniżej znajdziesz duże jaskinie."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Depth below which you'll find massive caves."
-msgstr ""
+msgstr "Głębokość poniżej znajdziesz masywne jaskinie."
 
 #: src/settings_translation_file.cpp
 msgid "Descending speed"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
 msgstr ""
+"Opis serwera, który będzie wyświetlony gdy gracze dołączają oraz na liście "
+"serwerów."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Desynchronize block animation"
-msgstr ""
+msgstr "Odsynchronizuj animację bloków"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
+msgstr "Szczegółowe dane profilowania. Przydatne dla twórców modyfikacji."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Detailed mod profiling"
-msgstr ""
+msgstr "Szczegółowe profilowanie modyfikacji"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Determines terrain shape.\n"
 "The 3 numbers in brackets control the scale of the\n"
 "terrain, the 3 numbers should be identical."
 msgstr ""
+"Determinuje kształt terenu.\n"
+"Trzy liczby w nawiasach kontrolują skalę terenu\n"
+"oraz powinny być identyczne."
+
+#: src/settings_translation_file.cpp
+msgid "Disable anticheat"
+msgstr "Wyłącz anticheat"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Disable anticheat"
-msgstr "Włącz cząstki"
-
-#: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Wyłącza sekwencję ucieczki"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Disable escape sequences, e.g. chat coloring.\n"
 "Use this if you want to run a server with pre-0.4.14 clients and you want to "
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Disallow empty passwords"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Domain name of server, to be displayed in the serverlist."
-msgstr ""
+"Wyłącza sekwencję ucieczki np. kolorowanie czatu.\n"
+"Użyj tego jeśli chcesz uruchomić serwer dla klientów przed 0.4.14 i chcesz "
+"wyłączyć\n"
+"sekwencję ucieczki generowaną przez modyfikacje."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Disallow empty passwords"
+msgstr "Nie zezwalaj na puste hasła"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Domain name of server, to be displayed in the serverlist."
+msgstr "Serwer DNS, wyświetlany na liście serwerów."
+
+#: src/settings_translation_file.cpp
 msgid "Double tap jump for fly"
 msgstr "Wciśnij dwukrotnie \"Skok\" by włączyć tryb latania"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Double-tapping the jump key toggles fly mode."
-msgstr "Wciśnij dwukrotnie \"Skok\" by włączyć tryb latania"
-
-#: src/settings_translation_file.cpp
-msgid "Drop item key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dump the mapgen debug infos."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable Joysticks"
-msgstr ""
+msgstr "Wciśnij dwukrotnie \"Skok\" by włączyć tryb latania."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Drop item key"
+msgstr "Klawisz wyrzucenia przedmiotu"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dump the mapgen debug infos."
+msgstr "Zrzuć informacje debugowania generatora mapy."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Joysticks"
+msgstr "Włącz joystick"
+
+#: src/settings_translation_file.cpp
 msgid "Enable VBO"
-msgstr "Włącz MP"
+msgstr "Włącz VBO"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Enable mod security"
-msgstr ""
+msgstr "Włącz tryb mod security"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Enable players getting damage and dying."
-msgstr ""
+msgstr "Włącz obrażenia i umieranie graczy."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Enable random user input (only used for testing)."
-msgstr ""
+msgstr "Włącz losowe wejście użytkownika (tylko dla testowania)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Enable smooth lighting with simple ambient occlusion.\n"
 "Disable for speed or for different looks."
 msgstr ""
+"Włącz gładkie oświetlenie z prostym efektem ambient occlusion.\n"
+"Wyłącz dla szybkości lub wyglądu."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Enable to disallow old clients from connecting.\n"
 "Older clients are compatible in the sense that they will not crash when "
@@ -1908,69 +2046,97 @@ msgid ""
 "to new servers, but they may not support all new features that you are "
 "expecting."
 msgstr ""
+"Włącz blokadę dla połączenia starych klientów.\n"
+"Starsze klienty mogą być kompatybilne w tym sensie że nie będą się "
+"zawieszać\n"
+"kiedy łączą sę z nowym serwerem, ale mogą nie wspierać wszystkich nowych "
+"spodziewanych funkcjonalności."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
 "Remote servers offer a significantly faster way to download media (e.g. "
 "textures)\n"
 "when connecting to the server."
 msgstr ""
+"Włącza używanie zdalnego serwera mediów (jeżeli dostarczany przez serwer).\n"
+"Zdalny serwer oferuje znacząco szybszy sposób pobierania mediów (np. tekstur)"
+"\n"
+"jeżeli następuje połączenie z serwerem."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Enable/disable running an IPv6 server.  An IPv6 server may be restricted\n"
 "to IPv6 clients, depending on system configuration.\n"
 "Ignored if bind_address is set."
 msgstr ""
+"Przełącza pracę serwera w trybie IPv6. Serwer IPv6 może być ograniczony\n"
+"tylko dla klientów IPv6, w zależności od konfiguracji systemu.\n"
+"Ignorowane jeżeli bind_address jest ustawiony."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Enables animation of inventory items."
-msgstr ""
+msgstr "Włącz animację inwentarza przedmiotów."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
 "texture pack\n"
 "or need to be auto-generated.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Włącza mapowanie wypukłości dla tekstur. Mapy normalnych muszą być dodane w "
+"paczce tekstur\n"
+"lub muszą być automatycznie wygenerowane.\n"
+"Wymaga włączonych shaderów."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Enables caching of facedir rotated meshes."
-msgstr ""
+msgstr "Włącza cachowanie facedir obracanych meshów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enables filmic tone mapping"
-msgstr "Włącz obrażenia"
+msgstr "Włącz filmic tone mapping"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enables minimap."
-msgstr "Włącz obrażenia"
+msgstr "Włącz minimapę."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables on the fly normalmap generation (Emboss effect).\n"
 "Requires bumpmapping to be enabled."
 msgstr ""
+"Włącza generację map normalnych w locie  (efekt płaskorzeźby).\n"
+"Wymaga włączenia mapowania wypukłości."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Enables parallax occlusion mapping.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Włącza mapowanie paralaksy.\n"
+"Wymaga włączenia shaderów."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
 "when set to higher number than 0."
 msgstr ""
+"Eksperymentalna opcja, może powodować widoczne przestrzenie\n"
+"pomiędzy blokami kiedy ustawiona powyżej 0."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "FPS in pause menu"
-msgstr ""
+msgstr "FPS podczas pauzy w menu"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -1981,56 +2147,72 @@ msgid "Fall bobbing"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fallback font"
-msgstr ""
+msgstr "Zastępcza czcionka"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fallback font shadow"
-msgstr ""
+msgstr "Zastępczy cień czcionki"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fallback font shadow alpha"
-msgstr ""
+msgstr "Zastępcza przeźroczystość cienia czcionki"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fallback font size"
-msgstr ""
+msgstr "Zastępczy rozmiar czcionki"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fast key"
-msgstr ""
+msgstr "Klawisz szybkiego poruszania"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fast mode acceleration"
-msgstr ""
+msgstr "Tryb szybkiego przyspieszania"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fast mode speed"
-msgstr ""
+msgstr "Tryb szybkiego poruszania"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fast movement"
-msgstr ""
+msgstr "Szybkie poruszanie"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Fast movement (via use key).\n"
 "This requires the \"fast\" privilege on the server."
 msgstr ""
+"Szybkie poruszanie się (przez klawisz użycia).\n"
+"Wymaga przywileju \"fast\" na serwerze."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Field of view"
-msgstr ""
+msgstr "Pole widzenia"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Field of view in degrees."
-msgstr ""
+msgstr "Pole widzenia w stopniach."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
 "the Multiplayer Tab."
 msgstr ""
+"Plik w kliencie (lista serwerów) który zawiera ulubione ulubione serwery "
+"wyświetlane w zakładce Multiplayer."
 
 #: src/settings_translation_file.cpp
 msgid "Filler Depth"
@@ -2041,80 +2223,100 @@ msgid "Filmic tone mapping"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Filtered textures can blend RGB values with fully-transparent neighbors,\n"
 "which PNG optimizers usually discard, sometimes resulting in a dark or\n"
 "light edge to transparent textures.  Apply this filter to clean that up\n"
 "at texture load time."
 msgstr ""
+"Filtrowanie tekstur może wymieszać wartości RGB piksela z w pełni "
+"przeźroczystymi sąsiadami,\n"
+"które optymalizatory PNG najczęściej odrzucają, co czasem powoduje "
+"ciemniejsze lub jaśniejsze\n"
+"krawędzie w przeźroczystych teksturach. Zastosuj ten filtr aby wyczyścić to "
+"w czasie ładowania tekstur."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filtering"
 msgstr "Filtrowanie anizotropowe"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fixed map seed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fly key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Flying"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fog"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fog toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow alpha"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow alpha (opaqueness, between 0 and 255)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow offset, if 0 then shadow will not be drawn."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Format of screenshots."
-msgstr ""
+msgstr "Stałe ziarno mapy"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Fly key"
+msgstr "Klawisz latania"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Flying"
+msgstr "Latanie"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Fog"
+msgstr "Mgła"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Fog toggle key"
+msgstr "Klawisz przełączania mgły"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Font path"
+msgstr "Ścieżka czcionki"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Font shadow"
+msgstr "Cień czcionki"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Font shadow alpha"
+msgstr "Przeźroczystość cienia czcionki"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Font shadow alpha (opaqueness, between 0 and 255)."
+msgstr "Kanał alfa cienia czcionki (nieprzeźroczystość, od 0 do 255)"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Font shadow offset, if 0 then shadow will not be drawn."
+msgstr "Offset cienia czcionki, jeżeli 0 to cień nie będzie rysowany."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Font size"
+msgstr "Rozmiar czcionki"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Format of screenshots."
+msgstr "Format zrzutu ekranu"
+
+#: src/settings_translation_file.cpp
 msgid "Forward key"
-msgstr "Przód"
+msgstr "Do przodu"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Freetype fonts"
-msgstr ""
+msgstr "Czcionki Freetype"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "From how far blocks are generated for clients, stated in mapblocks (16 "
 "nodes)."
 msgstr ""
+"Od jak daleka bloki są generowane dla klienta, w blokach mapy (16 węzłów)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2127,42 +2329,51 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Full screen"
-msgstr ""
+msgstr "Pełny ekran"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Full screen BPP"
-msgstr ""
+msgstr "Głębia koloru w trybie pełnoekranowym"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Fullscreen mode."
-msgstr ""
+msgstr "Tryb pełnoekranowy."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "GUI scaling"
-msgstr ""
+msgstr "Skalowanie GUI"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "GUI scaling filter"
-msgstr ""
+msgstr "Filtr skalowania GUI"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "GUI scaling filter txr2img"
-msgstr ""
+msgstr "Filtr skalowania GUI txr2img"
 
 #: src/settings_translation_file.cpp
 msgid "Gamma"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "General"
-msgstr ""
+msgstr "Ogólne"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Generate normalmaps"
-msgstr ""
+msgstr "Generuj mapy normalnych"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -2171,51 +2382,72 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Graphics"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Gravity"
-msgstr ""
+"Globalne właściwości generowania map.\n"
+"W generatorze map v6 flaga \"decorations\" kontroluje wszystkie dekoracje\n"
+"z wyjątkiem drzew i trawy dżungli. we wszystkich innych generatorach flaga\n"
+"ta kontroluje wszystkie dekoracje.\n"
+"Flagi, które nie są wymienione w ciągu flagi nie są modyfikowane z "
+"domyślnych.\n"
+"Flagi rozpoczynające się od \"no\" są stosowane aby jawnie ją wyłączyć."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Graphics"
+msgstr "Grafika"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Gravity"
+msgstr "Grawitacja"
+
+#: src/settings_translation_file.cpp
 msgid "HTTP Mods"
 msgstr "Mody"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "HUD toggle key"
-msgstr ""
+msgstr "Klawisz przełączania HUD"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Handling for deprecated lua api calls:\n"
 "-    legacy: (try to) mimic old behaviour (default for release).\n"
 "-    log: mimic and log backtrace of deprecated call (default for debug).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
+"Obsługa przestarzałych wywołań lua api:\n"
+"- legacy: (próbuje) naśladuje stare zachowanie (domyślne dla wydań).\n"
+"- log: naśladuje i loguje przestarzałe wywołania (domyślne dla wersji debug)."
+"\n"
+"- error: przerywa kiedy zostanie użyte przestarzałe api (sugerowane dla "
+"twórców modów)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Height component of the initial window size."
-msgstr ""
+msgstr "Wysokość początkowego rozmiaru okna."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Height on which clouds are appearing."
-msgstr ""
+msgstr "Wysokość na której pojawiają się chmury."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "High-precision FPU"
-msgstr ""
+msgstr "FPU Wysokiej precyzji"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Homepage of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "Główna strona serwera, wyświetlana na liście serwerów."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "How deep to make rivers"
-msgstr ""
+msgstr "Jak głębokie robić rzeki"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2225,289 +2457,409 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "How many blocks are flying in the wire simultaneously for the whole server."
 msgstr ""
+"Jak dużo bloków może jednocześnie być przesyłana przez sieć dla całego "
+"serwera."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
+msgstr "Jak dużo bloków może być przesyłanych jednocześnie na jednego klienta."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
 "Higher value is smoother, but will use more RAM."
 msgstr ""
+"Jak długo serwer będzie czekać do zwolnienia nieużywanych bloków mapy.\n"
+"Wyższa wartość jest łagodniejsza ale używa więcej pamięci RAM."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "How wide to make rivers"
-msgstr ""
+msgstr "Jak szerokie są rzeki"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "IPv6 server"
-msgstr ""
+msgstr "Serwer IPv6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "IPv6 support."
-msgstr ""
+msgstr "Wsparcie IPv6."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If FPS would go higher than this, limit it by sleeping\n"
 "to not waste CPU power for no benefit."
 msgstr ""
+"Jeżeli FPS będzie wyższy niż to, ogranicz go przez usypianie\n"
+"nie marnuj mocy CPU bez znaczących korzyści."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If disabled \"use\" key is used to fly fast if both fly and fast mode are "
 "enabled."
 msgstr ""
+"Jeśli wyłączone to klawisz \"używania\" jest użyty aby latać szybko podczas "
+"latania i przy włączonym trybie szybkiego poruszania."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If enabled together with fly mode, player is able to fly through solid "
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
+"Jeżeli włączone razem z trybem latania, gracz może latać przez solidne bloki."
+"\n"
+"Wymaga przywileju \"noclip\" na serwerze."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
 "and descending."
 msgstr ""
+"Jeżeli włączone, klawisz \"użycia\" zamiast klawiszu \"skradania\" będzie "
+"użyty do schodzenia w dół i opadania."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
 msgstr ""
+"Jeżeli włączone, akcje są nagrywane dla odtwarzania.\n"
+"Ta opcja jest czytana tylko podczas startu serwera."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "If enabled, disable cheat prevention in multiplayer."
-msgstr ""
+msgstr "Jeśli włączone, wyłącza ograniczenie oszustw w trybie multiplayer."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If enabled, invalid world data won't cause the server to shut down.\n"
 "Only enable this if you know what you are doing."
 msgstr ""
+"Jeżeli włączone, nieprawidłowe dane świata nie będą powodować wyłączenia "
+"serwera.\n"
+"Włącz tylko jeżeli wiesz co robisz."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "If enabled, new players cannot join with an empty password."
-msgstr ""
+msgstr "Jeśli włączone, nowi gracze nie mogą dołączyć do gry z pustym hasłem."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If enabled, you can place blocks at the position (feet + eye level) where "
 "you stand.\n"
 "This is helpful when working with nodeboxes in small areas."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "If this is set, players will always (re)spawn at the given position."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ignore world errors"
-msgstr ""
+"Jeżeli włączone, możesz położyć bloki w pozycji gdzie stoisz.\n"
+"Pomocne gdy pracujesz na małych powierzchniach."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "If this is set, players will always (re)spawn at the given position."
+msgstr "Jeśli ustawione, gracze zawsze będą się pojawiać w zadanej pozycji."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Ignore world errors"
+msgstr "Ignoruj błędy świata"
+
+#: src/settings_translation_file.cpp
 msgid "In-Game"
 msgstr "Gra"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "In-game chat console background color (R,G,B)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Interval of saving important changes in the world, stated in seconds."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Interval of sending time of day to clients."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Inventory items animations"
-msgstr ""
+msgstr "Kanał alfa konsoli w grze (od 0 do 255)"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "In-game chat console background color (R,G,B)."
+msgstr "Kolor konsoli czatu w grze (R,G,B)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Interval of saving important changes in the world, stated in seconds."
+msgstr "Interwał zapisywania ważnych zmian w świecie, w sekundach."
+
+#: src/settings_translation_file.cpp
+msgid "Interval of sending time of day to clients."
+msgstr "Interwał wysyłania czasu gry do klientów."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Inventory items animations"
+msgstr "Animacje przedmiotów w ekwipunku"
+
+#: src/settings_translation_file.cpp
 msgid "Inventory key"
 msgstr "Ekwipunek"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Invert mouse"
-msgstr ""
+msgstr "Odwróć mysz"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Invert vertical mouse movement."
-msgstr ""
+msgstr "Odwróć ruch pionowy ruchu myszy."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Item entity TTL"
-msgstr ""
+msgstr "TTL przedmiotu"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Iterations of the recursive function.\n"
 "Controls the amount of fine detail."
 msgstr ""
+"Iteracje funkcji rekursywnych.\n"
+"Kontroluje ilość drobnych szczegółów."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Joystick button repetition invterval"
-msgstr ""
+msgstr "Interwał powtarzania przycisku joysticka"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
 "shape.\n"
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Zbiór Julii tylko: W komponent stałej liczby hiperzespolonej determinującej "
+"kształt Julii.\n"
+"Nie ma efektu dla fraktali 3D.\n"
+"Zakres w przybliżeniu -2 do 2."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Julia set only: X component of hypercomplex constant determining julia "
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Zbiór Julii tylko: X komponent stałej hiperzespolonej liczby determinującej "
+"kształt Julii.\n"
+"Zakres w przybliżeniu -2 do 2."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Julia set only: Y component of hypercomplex constant determining julia "
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Zbiór Julii tylko: Y komponent stałej hiperzespolonej liczby determinującej "
+"kształt Julii.\n"
+"Zakres w przybliżeniu -2 do 2."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Julia set only: Z component of hypercomplex constant determining julia "
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Zbiór Julii tylko: Z komponent stałej hiperzespolonej liczby determinującej "
+"kształt Julii.\n"
+"Zakres w przybliżeniu -2 do 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Jump key"
 msgstr "Skok"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Jumping speed"
-msgstr ""
+msgstr "Szybkość skoku"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for decreasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz zmniejszania zasięgu widzenia.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz wyrzucenia aktualnie wybranego przedmiotu.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for increasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz zwiększania zasięgu widzenia.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for jumping.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz skakania.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for moving fast in fast mode.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz szybkiego poruszania się w trybie \"fast\"\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for moving the player backward.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz poruszania się wstecz.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for moving the player forward.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz poruszania się na przód,\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for moving the player left.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz poruszania się w lewo.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for moving the player right.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz poruszania się w prawo.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for opening the chat console.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz otwierania konsoli czatu.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for opening the chat window to type commands.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz otwierania okna czatu aby wpisać komendę.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for opening the chat window.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz otwierania okna czatu.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for opening the inventory.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz otwierania inwentarza.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for printing debug stacks. Used for development.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz wyświetlania danych debugowania. Przydatne dla deweloperów.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for sneaking.\n"
 "Also used for climbing down and descending in water if aux1_descends is "
@@ -2515,137 +2867,207 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz skradania.\n"
+"Także używany do schodzenia w dół i opadania w wodzie jeżeli aux1_descends "
+"jest wyłączone.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for switching between first- and third-person camera.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania pomiedzy kamerą z pierwszej i trzeciej osoby.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for taking screenshots.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz do zrobienia zrzutu ekranu.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling cinematic mode.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania trybu cinematic.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling display of minimap.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania wyświetlania minimapy.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling fast mode.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania trybu szybkiego.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling flying.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania latania.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling noclip mode.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania trybu noclip.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling the camrea update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania aktualizacji kamery. Przydatne tylko dla deweloperów.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling the display of debug info.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania informacji debugowania.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling the display of the HUD.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania wyświetlania HUD.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling the display of the chat.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania wyświetlania czatu.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling the display of the fog.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania wyświetlania mgły\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling the display of the profiler. Used for development.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania wyświetlania profilera. Przydatne dla deweloperów.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Key for toggling unlimited view range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Klawisz przełączania nieograniczonego pola widzenia.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
+"735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Key use for climbing/descending"
-msgstr ""
+msgstr "Klawisz używany do wspinania"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Language"
-msgstr ""
+msgstr "Język"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Large cave depth"
-msgstr ""
+msgstr "Głębia dużej jaskini"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Lava Features"
-msgstr ""
+msgstr "Funkcjonalności lawy"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Leaves style"
-msgstr ""
+msgstr "Styl liści"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Leaves style:\n"
 "-   Fancy:  all faces visible\n"
 "-   Simple: only outer faces, if defined special_tiles are used\n"
 "-   Opaque: disable transparency"
 msgstr ""
+"Style liści:\n"
+"-   Fancy:  wszystkie ściany widoczne\n"
+"-   Simple: tylko zewnętrzene ściany, jeżeli special_tiles jest użyty\n"
+"-   Opaque: wyłącza przeźroczystość"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Left key"
-msgstr "Lewy Menu"
+msgstr "W lewo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2723,14 +3145,12 @@ msgid "Main menu game manager"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Main menu mod manager"
-msgstr "Menu główne"
+msgstr "Manager modów w głównym menu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Main menu script"
-msgstr "Menu główne"
+msgstr "Skrypt głównego menu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2742,8 +3162,9 @@ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Map directory"
-msgstr ""
+msgstr "Katalog map"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2787,25 +3208,27 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Map generation limit"
-msgstr ""
+msgstr "Limit generacji mapy"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Map save interval"
-msgstr ""
+msgstr "Interwał zapisu mapy"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapblock limit"
-msgstr ""
+msgstr "Limit bloków mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Valleys"
-msgstr "Generator mapy"
+msgstr "Generator mapy Valleys"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome heat noise parameters"
@@ -2820,24 +3243,20 @@ msgid "Mapgen biome humidity noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen debug"
-msgstr "Generator mapy"
+msgstr "Generator mapy debugowanie"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flags"
-msgstr "Generator mapy"
+msgstr "Flagi generatora mapy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat"
-msgstr "Generator mapy"
+msgstr "Generator mapy flat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave width"
-msgstr "Generator mapy"
+msgstr "Generator mapy flat szerokość jaskini"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave1 noise parameters"
@@ -2852,14 +3271,12 @@ msgid "Mapgen flat filler depth noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat flags"
-msgstr "Generator mapy"
+msgstr "Generator mapy flat flagi"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat ground level"
-msgstr "Generator mapy"
+msgstr "Generator mapy flat poziom ziemi"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill steepness"
@@ -2888,14 +3305,12 @@ msgid "Mapgen flat terrain noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal"
-msgstr "Generator mapy"
+msgstr "Generator mapy fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal cave width"
-msgstr "Generator mapy"
+msgstr "Generator mapy fractal szerokość jaskini"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave1 noise parameters"
@@ -2915,9 +3330,8 @@ msgid "Mapgen fractal fractal"
 msgstr "Generator mapy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal iterations"
-msgstr "Generator mapy"
+msgstr "Generator mapy fractal iteracje"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia w"
@@ -2941,9 +3355,8 @@ msgid "Mapgen fractal offset"
 msgstr "Generator mapy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal scale"
-msgstr "Generator mapy"
+msgstr "Generator mapy fractal skala"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal seabed noise parameters"
@@ -2959,19 +3372,16 @@ msgid "Mapgen heat blend noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen name"
-msgstr "Generator mapy"
+msgstr "Nazwa generatora mapy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5"
-msgstr "Generator mapy"
+msgstr "Generator mapy v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave width"
-msgstr "Generator mapy"
+msgstr "Generator mapy v5 szerokość jaskini"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave1 noise parameters"
@@ -2994,9 +3404,8 @@ msgid "Mapgen v5 height noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6"
-msgstr "Generator mapy"
+msgstr "Generator mapy v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 apple trees noise parameters"
@@ -3055,14 +3464,12 @@ msgid "Mapgen v6 trees noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7"
-msgstr "Generator mapy"
+msgstr "Generator mapy v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 cave width"
-msgstr "Generator mapy"
+msgstr "Generator mapy v7 szerokość jaskini"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave1 noise parameters"
@@ -3228,7 +3635,6 @@ msgid "Maxmimum objects per block"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Menus"
 msgstr "Menu"
 
@@ -3249,29 +3655,31 @@ msgid "Method used to highlight selected object."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Minimap"
-msgstr ""
+msgstr "Minimapa"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Minimap scan height"
-msgstr ""
+msgstr "Wysokość skonowania minimapy"
 
 #: src/settings_translation_file.cpp
 msgid "Minimum texture size for filters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mipmapping"
 msgstr "Mip-Mappowanie"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mod profiling"
-msgstr ""
+msgstr "Profilowanie modyfikacji"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
@@ -3286,20 +3694,24 @@ msgid "Modstore mods list URL"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Monospace font path"
-msgstr ""
+msgstr "Ścieżka czcionki typu Monospace"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Monospace font size"
-msgstr ""
+msgstr "Rozmiar czcionki Monospace"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mouse sensitivity"
-msgstr ""
+msgstr "Czułość myszy"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mouse sensitivity multiplier."
-msgstr ""
+msgstr "Mnożnik czułości myszy."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3332,8 +3744,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Network"
-msgstr ""
+msgstr "Sieć"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3354,8 +3767,9 @@ msgid "Noclip key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Node highlighting"
-msgstr ""
+msgstr "Podświetlanie bloków"
 
 #: src/settings_translation_file.cpp
 msgid "NodeTimer interval"
@@ -3366,16 +3780,18 @@ msgid "Noise parameters for biome API temperature, humidity and biome blend."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Noises"
-msgstr ""
+msgstr "Szumy"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps sampling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Normalmaps strength"
-msgstr ""
+msgstr "Siła map normlanych"
 
 #: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
@@ -3398,8 +3814,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Number of parallax occlusion iterations."
-msgstr ""
+msgstr "Liczba iteracji dla parallax occlusion."
 
 #: src/settings_translation_file.cpp
 msgid "Overall bias of parallax occlusion effect, usually scale/2."
@@ -3414,8 +3831,9 @@ msgid "Parallax occlusion"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Parallax occlusion Scale"
-msgstr ""
+msgstr "Skala parallax occlusion"
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion bias"
@@ -3446,8 +3864,9 @@ msgid "Path to texture directory. All textures are first searched from here."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Physics"
-msgstr ""
+msgstr "Fizyka"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3456,16 +3875,18 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Player name"
-msgstr ""
+msgstr "Nazwa gracza"
 
 #: src/settings_translation_file.cpp
 msgid "Player transfer distance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Player versus Player"
-msgstr ""
+msgstr "PvP"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3505,11 +3926,11 @@ msgid "Raises terrain to make valleys around the rivers"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Random input"
-msgstr ""
+msgstr "Losowe wejście"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Range select key"
 msgstr "Zasięg widzenia"
 
@@ -3518,33 +3939,36 @@ msgid "Remote media"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Remote port"
-msgstr ""
+msgstr "Port zdalny"
 
 #: src/settings_translation_file.cpp
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Right key"
-msgstr "Prawy Menu"
+msgstr "W prawo"
 
 #: src/settings_translation_file.cpp
 msgid "Rightclick repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "River Depth"
-msgstr ""
+msgstr "Głębokość rzeki"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "River Noise"
-msgstr ""
+msgstr "Szum rzeki"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "River Size"
-msgstr ""
+msgstr "Rozmiar rzeki"
 
 #: src/settings_translation_file.cpp
 msgid "River noise -- rivers occur close to zero"
@@ -3555,16 +3979,18 @@ msgid "Rollback recording"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Round minimap"
-msgstr ""
+msgstr "Okrągła minimapa"
 
 #: src/settings_translation_file.cpp
 msgid "Save the map received by the client on disk."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Saving map received from server"
-msgstr ""
+msgstr "Zapisz mapę otrzymaną z serwera"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3576,31 +4002,31 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Screen height"
-msgstr ""
+msgstr "Wysokość ekranu"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Screen width"
-msgstr ""
+msgstr "Szerokość ekranu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot"
-msgstr "Snapshot"
+msgstr "Zrzut ekranu"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Screenshot folder"
-msgstr ""
+msgstr "Folder zrzutu ekranu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "Snapshot"
+msgstr "Format zrzutu ekranu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "Snapshot"
+msgstr "Jakość zrzutu ekranu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3610,8 +4036,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Security"
-msgstr ""
+msgstr "Bezpieczeństwo"
 
 #: src/settings_translation_file.cpp
 msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
@@ -3630,44 +4057,36 @@ msgid "Selection box width"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server / Singleplayer"
 msgstr "Pojedynczy gracz"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server URL"
-msgstr "Serwer"
+msgstr "Adres URL serwera"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server address"
-msgstr "Port Serwera"
+msgstr "Adres serwera"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server description"
-msgstr "Port Serwera"
+msgstr "Opis serwera"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server name"
-msgstr "Serwer"
+msgstr "Nazwa serwera"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server port"
 msgstr "Port Serwera"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Serverlist URL"
 msgstr "Lista publicznych serwerów"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Serverlist file"
-msgstr "Lista publicznych serwerów"
+msgstr "Plik listy publicznych serwerów"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3706,7 +4125,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
-msgstr ""
+msgstr "Pokaż informacje debugowania"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
@@ -3727,7 +4146,6 @@ msgid "Slope and fill work together to modify the heights"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Smooth lighting"
 msgstr "Płynne oświetlenie"
 
@@ -3746,13 +4164,13 @@ msgid "Smooths rotation of camera. 0 to disable."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Sneak key"
 msgstr "Skradanie"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Sound"
-msgstr ""
+msgstr "Dźwięk"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3763,8 +4181,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Static spawnpoint"
-msgstr ""
+msgstr "Statyczny punkt spawnu"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of generated normalmaps."
@@ -3805,7 +4224,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Texture path"
 msgstr "Paczki tekstur"
 
@@ -3907,7 +4325,6 @@ msgid "Tooltip delay"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Trilinear filtering"
 msgstr "Filtrowanie trójliniowe"
 
@@ -3951,9 +4368,8 @@ msgid "Use bilinear filtering when scaling textures."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use key"
-msgstr "naciśnij klawisz"
+msgstr "Klawisz użycia"
 
 #: src/settings_translation_file.cpp
 msgid "Use mip mapping to scale textures. May slightly increase performance."
@@ -3964,9 +4380,8 @@ msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Useful for mod developers."
-msgstr "Twórcy"
+msgstr "Przydatne dla twórców modyfikacji."
 
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
@@ -4027,7 +4442,6 @@ msgid "Viewing range"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Volume"
 msgstr "Głośność"
 
@@ -4044,9 +4458,8 @@ msgid "Walking speed"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Water Features"
-msgstr "Tekstury przedmiotów..."
+msgstr "Funkcje wody"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
@@ -4061,9 +4474,8 @@ msgid "Waving Nodes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving leaves"
-msgstr "Ozdobne drzewa"
+msgstr "Falujące liście"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
@@ -4172,29 +4584,34 @@ msgid "Width of the selectionbox's lines around nodes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
+"Katalog świata (wszystko w świecie jest przechowywane tutaj).\n"
+"Nie wymagane jeżeli rozpoczyna się z głównego menu."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Y of flat ground."
-msgstr ""
+msgstr "Y płaskiego podłoża."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Y of upper limit of large pseudorandom caves."
-msgstr ""
+msgstr "Y górnego limitu preudolosowych jaskiń."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "cURL file download timeout"
-msgstr ""
+msgstr "cURL przekroczono limit pobierania pliku"
 
 #: src/settings_translation_file.cpp
 msgid "cURL parallel limit"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "cURL timeout"
 msgstr "Limit czasu cURL"
 

From 03ba583264a75e43f7d3d3e71ae092d69842a0e9 Mon Sep 17 00:00:00 2001
From: Mateusz Mendel <mendelm9@gmail.com>
Date: Fri, 29 Jul 2016 19:02:36 +0000
Subject: [PATCH 167/418] Translated using Weblate (Polish)

Currently translated at 42.4% (380 of 895 strings)
---
 po/pl/minetest.po | 65 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index 3d79c542b..47600b712 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-07-29 18:03+0000\n"
-"Last-Translator: Jakub Mendel <jimikuba@o2.pl>\n"
+"PO-Revision-Date: 2016-07-29 19:02+0000\n"
+"Last-Translator: Mateusz Mendel <mendelm9@gmail.com>\n"
 "Language-Team: Polish "
 "<https://hosted.weblate.org/projects/minetest/minetest/pl/>\n"
 "Language: pl\n"
@@ -1916,8 +1916,9 @@ msgid "Depth below which you'll find massive caves."
 msgstr "Głębokość poniżej znajdziesz masywne jaskinie."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Descending speed"
-msgstr ""
+msgstr "Szybkość opadania"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2319,9 +2320,12 @@ msgstr ""
 "Od jak daleka bloki są generowane dla klienta, w blokach mapy (16 węzłów)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
+"Z jakiej odległości bloki są przesyłane do klientów, zapisane w blokach map("
+"16 jednostek)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2359,8 +2363,9 @@ msgid "GUI scaling filter txr2img"
 msgstr "Filtr skalowania GUI txr2img"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2450,11 +2455,15 @@ msgid "How deep to make rivers"
 msgstr "Jak głębokie robić rzeki"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "How large area of blocks are subject to the active block stuff, stated in "
 "mapblocks (16 nodes).\n"
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
+"Jak duży obszar bloków jest przedmiotem aktywnego bloku, zapisane w blokach "
+"map(16 jednostek).\n"
+"Na aktywnych blokach obiekty są wczytywane i ABMs działa."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3070,18 +3079,23 @@ msgid "Left key"
 msgstr "W lewo"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Length of a server tick and the interval at which objects are generally "
 "updated over network."
 msgstr ""
+"Długość interwału czasowego serwera w trakcie którego obiekty są ogólnie "
+"aktualizowane przez sieć."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Length of time between ABM execution cycles"
-msgstr ""
+msgstr "Długość czasu pomiędzy wykonywanymi cyklami ABM"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Length of time between NodeTimer execution cycles"
-msgstr ""
+msgstr "Długość czasu pomiędzy wykonywanymi cyklami NodeTimer."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3096,12 +3110,14 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Limit of emerge queues on disk"
-msgstr ""
+msgstr "Limit oczekiwań na dysku"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Limit of emerge queues to generate"
-msgstr ""
+msgstr "Limit kolejek oczekujących do wytworzenia"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3113,36 +3129,43 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Liquid fluidity"
-msgstr ""
+msgstr "Płynność cieczy"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Liquid fluidity smoothing"
-msgstr ""
+msgstr "Wygładzanie płynności cieczy"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid loop max"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Liquid queue purge time"
-msgstr ""
+msgstr "Czas kolejki czyszczenia cieczy"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Liquid sink"
-msgstr ""
+msgstr "Zanurzanie cieczy"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Liquid update interval in seconds."
-msgstr ""
+msgstr "Interwał aktualizacji cieczy podany w sekundach"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Liquid update tick"
-msgstr ""
+msgstr "Interwał czasowy aktualizacji cieczy"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Main menu game manager"
-msgstr ""
+msgstr "Menedżer menu głównego"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu mod manager"
@@ -3153,13 +3176,17 @@ msgid "Main menu script"
 msgstr "Skrypt głównego menu"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
+"Ustwa mgłę i kolor nieba zależny od pory dnia(świt/zachód słońca) i pokaż "
+"kierunek"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
-msgstr ""
+msgstr "Sprawia, że DirectX działa z LuaJIT. Wyłącz jeśli występują kłopoty"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3223,8 +3250,9 @@ msgid "Mapblock limit"
 msgstr "Limit bloków mapy"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapblock unload timeout"
-msgstr ""
+msgstr "Przekroczenie czasu wyładowania bloków mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys"
@@ -3239,8 +3267,9 @@ msgid "Mapgen biome humidity blend noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen biome humidity noise parameters"
-msgstr ""
+msgstr "Wilgotność oraz parametry hałasu biomu Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"

From 048ba0d22db4c95de4ae433cba5f9f13806555c0 Mon Sep 17 00:00:00 2001
From: bse666 <bse666@gmail.com>
Date: Tue, 9 Aug 2016 07:40:53 +0000
Subject: [PATCH 168/418] Translated using Weblate (German)

Currently translated at 98.5% (882 of 895 strings)
---
 po/de/minetest.po | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/po/de/minetest.po b/po/de/minetest.po
index 7da4ca4d8..018126f1a 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-05-11 04:34+0000\n"
-"Last-Translator: Wuzzy <almikes@aol.com>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/minetest/minetest/"
-"de/>\n"
+"PO-Revision-Date: 2016-08-09 07:40+0000\n"
+"Last-Translator: bse666 <bse666@gmail.com>\n"
+"Language-Team: German "
+"<https://hosted.weblate.org/projects/minetest/minetest/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -1892,16 +1892,22 @@ msgid "Disable anticheat"
 msgstr "Anti-Cheat deaktivieren"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Escape-Sequenzen deaktivieren"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Disable escape sequences, e.g. chat coloring.\n"
 "Use this if you want to run a server with pre-0.4.14 clients and you want to "
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"Escape-Sequenzen deaktivieren, z.B. Chat Farben.\n"
+"Bei einem Server der pre-0.4.14 Clients bedienen muss, sollte diese Option "
+"deaktiviert werden.\n"
+"Die Escape-Sequenzen werden von Mods generiert."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"

From 7f8703ef7445ba963d067ea48bd88bf5813491e0 Mon Sep 17 00:00:00 2001
From: Thomas Wagner Nielsen <thomas@viawords.com>
Date: Fri, 12 Aug 2016 18:51:18 +0000
Subject: [PATCH 169/418] Translated using Weblate (Danish)

Currently translated at 27.3% (245 of 895 strings)
---
 po/da/minetest.po | 70 ++++++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/po/da/minetest.po b/po/da/minetest.po
index fb33a1e88..df948e6a7 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -1,17 +1,17 @@
-# German translations for minetest-c55 package.
-# Copyright (C) 2011 celeron
-# This file is distributed under the same license as the minetest-c55 package.
-# Frederik Helth <Guides@live.dk>, 2011.
-#
+# German translations for minetest-c55 package.
+# Copyright (C) 2011 celeron
+# This file is distributed under the same license as the minetest-c55 package.
+# Frederik Helth <Guides@live.dk>, 2011.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-05-06 13:58+0000\n"
+"PO-Revision-Date: 2016-08-12 20:43+0200\n"
 "Last-Translator: Thomas Wagner Nielsen <thomas@viawords.com>\n"
-"Language-Team: Danish <https://hosted.weblate.org/projects/minetest/minetest/"
-"da/>\n"
+"Language-Team: Danish "
+"<https://hosted.weblate.org/projects/minetest/minetest/da/>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -916,7 +916,7 @@ msgstr "ok"
 
 #: src/guiFormSpecMenu.cpp
 msgid "Enter "
-msgstr ""
+msgstr " "
 
 #: src/guiFormSpecMenu.cpp
 msgid "Proceed"
@@ -1423,6 +1423,9 @@ msgid ""
 "Leave this blank to start a local server.\n"
 "Note that the address field in the main menu overrides this setting."
 msgstr ""
+"Adressen, der skal forbindes til.\n"
+"Lad dette være tomt for at starte en lokal server.\n"
+"Bemærk, at adressefeltet i hovedmenuen tilsidesætter denne indstilling."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1438,6 +1441,8 @@ msgid ""
 "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
 "This setting is for the client only and is ignored by the server."
 msgstr ""
+" Et mindre tal betyder lysere.\n"
+"Denne indstilling gælder kun for klienten og ignoreres af serveren."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -1502,11 +1507,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
-msgstr ""
+msgstr "Grundlæggende"
 
 #: src/settings_translation_file.cpp
 msgid "Basic Privileges"
-msgstr ""
+msgstr "Grundlæggende privilegier"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1533,7 +1538,7 @@ msgstr "Mip-mapping"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
-msgstr ""
+msgstr "Kameraudjævning"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
@@ -1612,19 +1617,19 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
-msgstr ""
+msgstr "Klient og server"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
-msgstr ""
+msgstr "Klatringshastighed"
 
 #: src/settings_translation_file.cpp
 msgid "Cloud height"
-msgstr ""
+msgstr "Skyhøjde"
 
 #: src/settings_translation_file.cpp
 msgid "Cloud radius"
-msgstr ""
+msgstr "Skyradius"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds"
@@ -1641,7 +1646,7 @@ msgstr "Hovedmenu"
 
 #: src/settings_translation_file.cpp
 msgid "Colored fog"
-msgstr ""
+msgstr "Farvet tåge"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1667,7 +1672,7 @@ msgstr "Forbind"
 
 #: src/settings_translation_file.cpp
 msgid "Connect to external media server"
-msgstr ""
+msgstr "Opret forbindelse til ekstern medieserver"
 
 #: src/settings_translation_file.cpp
 msgid "Connects glass if supported by node."
@@ -1690,11 +1695,11 @@ msgstr "Konsol"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward"
-msgstr ""
+msgstr "Kontinuerlig fremad"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward movement (only used for testing)."
-msgstr ""
+msgstr "Kontinuerlig bevægelse fremad (bruges kun til test)."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1707,6 +1712,9 @@ msgid ""
 "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
 "unchanged."
 msgstr ""
+"Styrer længden af dag-/natcyklussen.\n"
+"Eksempler: 72 = 20 min, 360 = 4 min, 1 = 24 timer, 0 = dag/nat/hvad som "
+"helst forbliver uændret."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1720,21 +1728,21 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/height of hills."
-msgstr ""
+msgstr "Styrer stejlheden/højden af bakkerne."
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
+msgstr "Styrer bredden af tunneller. En lavere værdi giver bredere tunneller."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
-msgstr ""
+msgstr "Nedbrudsbesked"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Creates unpredictable lava features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
-msgstr ""
+msgstr " "
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1764,7 +1772,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
-msgstr ""
+msgstr "DPI"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1785,17 +1793,17 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Default acceleration"
-msgstr ""
+msgstr "Standardacceleration"
 
 #: src/settings_translation_file.cpp
 msgid "Default game"
-msgstr ""
+msgstr "Standard spil"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Default game when creating a new world.\n"
 "This will be overridden when creating a world from the main menu."
-msgstr ""
+msgstr "Standard spil, når du skaber en ny verden.\n"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1804,7 +1812,7 @@ msgstr "Nyt kodeord"
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
-msgstr ""
+msgstr "Standardprivilegier"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1886,7 +1894,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
-msgstr ""
+msgstr "Tillad ikke tomme adgangskoder"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
@@ -1916,7 +1924,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "Aktivér joysticks"
 
 #: src/settings_translation_file.cpp
 #, fuzzy

From 6cf0ab376c9867dec7933e74c3ab063665a8f5e7 Mon Sep 17 00:00:00 2001
From: Rui <rui914t@gmail.com>
Date: Sun, 17 Jul 2016 15:50:36 +0000
Subject: [PATCH 170/418] Translated using Weblate (Japanese)

Currently translated at 50.0% (448 of 895 strings)

This is a merger of two commits.
---
 po/ja/minetest.po | 208 +++++++++++++++++++++++-----------------------
 1 file changed, 106 insertions(+), 102 deletions(-)

diff --git a/po/ja/minetest.po b/po/ja/minetest.po
index 7c63ee0b0..396758624 100644
--- a/po/ja/minetest.po
+++ b/po/ja/minetest.po
@@ -3,20 +3,20 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-05-07 16:10+0000\n"
-"Last-Translator: BreadW <toshiharu.uno@gmail.com>\n"
-"Language-Team: Japanese <https://hosted.weblate.org/projects/minetest/"
-"minetest/ja/>\n"
+"PO-Revision-Date: 2016-08-17 07:33+0000\n"
+"Last-Translator: Rui <rui.minetest@gmail.com>\n"
+"Language-Team: Japanese "
+"<https://hosted.weblate.org/projects/minetest/minetest/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "以下のModのLuaスクリプト内でエラーが発生しました:"
+msgstr "以下のModの、Luaスクリプトでエラーが発生しました:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -44,11 +44,12 @@ msgstr "読み込み中..."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr "プロトコルバージョンが一致していません。 "
+msgstr "プロトコルバージョンが一致しません。 "
 
 #: builtin/mainmenu/common.lua
+#, fuzzy
 msgid "Server enforces protocol version $1. "
-msgstr "サーバのプロトコルバージョンは$1が適用されます。 "
+msgstr "サーバはプロトコルバージョン$1を要求します。 "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
@@ -60,11 +61,11 @@ msgstr "インターネット接続を確認し、公開サーバ一覧を再有
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr "プロトコルバージョンは$1のみサポートしています。"
+msgstr "プロトコルバージョンは$1のみをサポートします。"
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr "プロトコルバージョンは$1から$2までをサポートしています。"
+msgstr "プロトコルバージョンは$1から$2までをサポートします。"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -80,11 +81,11 @@ msgstr "依存Mod:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable MP"
-msgstr "無効化"
+msgstr "Modパックを無効化"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable MP"
-msgstr "有効化"
+msgstr "Modパックを有効化"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -94,9 +95,7 @@ msgstr "全て有効化"
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
-msgstr ""
-"許可されていない文字が使用されているためMod \"$1\"を有効化できませんでした。"
-"文字は[a-z0-9_]のみ使用できます。"
+msgstr "許可されていない文字が使用されているため、Mod「$1」を有効化できませんでした。文字は[a-z0-9_]のみ使用できます。"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -104,7 +103,7 @@ msgstr "ゲームを非表示"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide mp content"
-msgstr "Modパックを非表示"
+msgstr "Modパックの内容を非表示"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -120,12 +119,13 @@ msgid "World:"
 msgstr "ワールド:"
 
 #: builtin/mainmenu/dlg_config_world.lua
+#, fuzzy
 msgid "enabled"
 msgstr "有効化"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr "ワールド名\"$1\"は既に使用されています"
+msgstr "ワールド名「$1」は既に存在します"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -158,7 +158,7 @@ msgstr "Seed値"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The minimal development test is meant for developers."
-msgstr "警告: Minimal development testは開発者用です。"
+msgstr "警告: minimal development testは開発者用です。"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -166,11 +166,11 @@ msgstr "ワールド名"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no subgames installed."
-msgstr "サブゲームがインストールされていません。"
+msgstr "サブゲームをインストールしていません。"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr "本当に\"$1\"を削除してよろしいですか？"
+msgstr "本当に「$1」を削除してよろしいですか？"
 
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
@@ -180,15 +180,15 @@ msgstr "削除"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: failed to delete \"$1\""
-msgstr "Modマネージャー: \"$1\"の削除に失敗しました"
+msgstr "Modマネージャ: 「$1」の削除に失敗しました"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: invalid modpath \"$1\""
-msgstr "Modマネージャー: Mod\"$1\"の場所が不明です"
+msgstr "Modマネージャ: Mod「$1」の場所が不明です"
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr "ワールド\"$1\"を削除しますか？"
+msgstr "ワールド「$1」を削除しますか？"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
 msgid "Accept"
@@ -200,7 +200,7 @@ msgstr "Modパック名を変更:"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "\"$1\" is not a valid flag."
-msgstr "\"$1\"は有効なフラグではありません。"
+msgstr "「$1」は有効なフラグではありません。"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
@@ -231,12 +231,13 @@ msgid "Format is 3 numbers separated by commas and inside brackets."
 msgstr "括弧内に3つの数字をカンマで区切って入力してください。"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+#, fuzzy
 msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
-"書式: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
-"<octaves>, <persistence>"
+"書式: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, <octaves>, "
+"<persistence>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
@@ -247,12 +248,14 @@ msgid "Mods"
 msgstr "Mod"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+#, fuzzy
 msgid "Optionally the lacunarity can be appended with a leading comma."
-msgstr "空隙性の値には、任意でカンマを付けて読みやすくすることができます。"
+msgstr "空隙性の値は、必要に応じ読みやすくカンマを付けることができます。"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+#, fuzzy
 msgid "Please enter a comma seperated list of flags."
-msgstr "フラグ一覧はカンマで区切って入力してください。"
+msgstr "フラグはカンマで区切った一覧で入力してください。"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
@@ -264,7 +267,7 @@ msgstr "有効な数字を入力してください。"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Possible values are: "
-msgstr "使用可能な値: "
+msgstr "可能な値: "
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
@@ -272,7 +275,7 @@ msgstr "初期設定に戻す"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select path"
-msgstr "ファイルの場所を選択"
+msgstr "場所を選択"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
@@ -280,11 +283,11 @@ msgstr "パラメータ名を表示"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be greater than $1."
-msgstr "$1より大きい値でなければいけません。"
+msgstr "値は$1より大きくなければなりません。"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be lower than $1."
-msgstr "$1より小さい値でなければいけません。"
+msgstr "値は$1より小さくなければなりません。"
 
 #: builtin/mainmenu/modmgr.lua
 msgid ""
@@ -292,7 +295,7 @@ msgid ""
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
 "\n"
-"Modインストール: ファイル\"$1\"は非対応の形式か、壊れています"
+"Modインストール: 「$1」は非対応の形式か、壊れたアーカイブです"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Failed to install $1 to $2"
@@ -300,17 +303,15 @@ msgstr "$2へ$1をインストールできませんでした"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: file: \"$1\""
-msgstr "Modインストール: ファイル: \"$1\""
+msgstr "Modインストール: ファイル: 「$1」"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find real modname for: $1"
-msgstr "Modインストール: $1の本来のMod名が不明です"
+msgstr "Modインストール: $1の正しいMod名が不明です"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find suitable foldername for modpack $1"
-msgstr ""
-"Modインストール: Modパック$1に適したフォルダ名を見つけることができませんでし"
-"た"
+msgstr "Modインストール: Modパック$1に適したフォルダ名が不明です"
 
 #: builtin/mainmenu/store.lua
 msgid "Close store"
@@ -318,7 +319,7 @@ msgstr "ストアを閉じる"
 
 #: builtin/mainmenu/store.lua
 msgid "Downloading $1, please wait..."
-msgstr "$1をダウンロードしています。しばらくお待ちください..."
+msgstr "$1をダウンロードしています、しばらくお待ちください..."
 
 #: builtin/mainmenu/store.lua
 msgid "Install"
@@ -354,7 +355,7 @@ msgstr "再インストール"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
-msgstr "活動中の開発協力者"
+msgstr "活動中の貢献者"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
@@ -366,7 +367,7 @@ msgstr "クレジット"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
-msgstr "以前の開発協力者"
+msgstr "以前の貢献者"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
@@ -528,7 +529,7 @@ msgstr "バンプマッピング"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
-msgstr "操作変更"
+msgstr "キー変更"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Connected Glass"
@@ -544,7 +545,7 @@ msgstr "ミップマップ"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
-msgstr "異方性フィルタ"
+msgstr "ミップマップと異方性フィルタ"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No"
@@ -560,11 +561,11 @@ msgstr "ミップマップ無し"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr "ノードのハイライト"
+msgstr "ノードを高輝度表示"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Outlining"
-msgstr "ノードの輪郭線描画"
+msgstr "ノードの輪郭線を描画"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
@@ -588,7 +589,7 @@ msgstr "視差遮蔽マッピング"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
-msgstr "パーティクル有効化"
+msgstr "パーティクル"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Reset singleplayer world"
@@ -616,15 +617,15 @@ msgstr "テクスチャリング:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr "シェーダーを有効にするにはOpenGLを使用する必要があります。"
+msgstr "シェーダーを有効にするにはOpenGLのドライバを使用する必要があります。"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr "ミップマッピング"
+msgstr "トーンマッピング"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold (px)"
-msgstr "タッチのしきい値（ピクセル）"
+msgstr "タッチのしきい値（ピクセル単位）"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
@@ -676,7 +677,7 @@ msgstr "テクスチャパックを選択:"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Texturepacks"
-msgstr "テクスチャ"
+msgstr "テクスチャパック"
 
 #: src/client.cpp
 msgid "Connection timed out."
@@ -744,7 +745,7 @@ msgstr ""
 
 #: src/game.cpp
 msgid "Change Keys"
-msgstr "操作変更"
+msgstr "キー変更"
 
 #: src/game.cpp
 msgid "Change Password"
@@ -760,11 +761,11 @@ msgstr "再開"
 
 #: src/game.cpp
 msgid "Creating client..."
-msgstr "クライアントを起動中..."
+msgstr "クライアントを作成中..."
 
 #: src/game.cpp
 msgid "Creating server..."
-msgstr "サーバを起動中..."
+msgstr "サーバを作成中..."
 
 #: src/game.cpp
 msgid ""
@@ -822,7 +823,7 @@ msgstr ""
 
 #: src/game.cpp
 msgid "Exit to Menu"
-msgstr "タイトル"
+msgstr "タイトルに戻る"
 
 #: src/game.cpp
 msgid "Exit to OS"
@@ -834,7 +835,7 @@ msgstr "アイテムを定義中..."
 
 #: src/game.cpp
 msgid "KiB/s"
-msgstr "KB/秒"
+msgstr "KiB/秒"
 
 #: src/game.cpp
 msgid "Media..."
@@ -842,7 +843,7 @@ msgstr "通信中..."
 
 #: src/game.cpp
 msgid "MiB/s"
-msgstr "MB/秒"
+msgstr "MiB/秒"
 
 #: src/game.cpp
 msgid "Node definitions..."
@@ -866,7 +867,7 @@ msgstr "音量"
 
 #: src/game.cpp
 msgid "You died."
-msgstr "死にました。"
+msgstr "あなたは死にました。"
 
 #: src/game.cpp src/guiFormSpecMenu.cpp
 msgid "ok"
@@ -882,7 +883,7 @@ msgstr "決定"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "\"Use\" = climb down"
-msgstr "「使用」キーで降りる"
+msgstr "「使用」で降りる"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Backward"
@@ -902,7 +903,7 @@ msgstr "コンソール"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr "「ジャンプ」キー二回押しで飛行モード"
+msgstr "「ジャンプ」の二度押しで飛行モードを切り替え"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Drop"
@@ -926,9 +927,7 @@ msgstr "キーが重複しています"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
-msgstr ""
-"操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してく"
-"ださい)"
+msgstr "キー設定です。 (このメニューで失敗する場合は、minetest.confから該当する設定を削除してください)"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Left"
@@ -936,11 +935,11 @@ msgstr "左"
 
 #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Print stacks"
-msgstr "スタックの表示"
+msgstr "スタックの出力"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Range select"
-msgstr "視野範囲変更"
+msgstr "視野の範囲を変更"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Right"
@@ -951,18 +950,22 @@ msgid "Sneak"
 msgstr "スニーク"
 
 #: src/guiKeyChangeMenu.cpp
+#, fuzzy
 msgid "Toggle Cinematic"
 msgstr "映画風カメラ"
 
 #: src/guiKeyChangeMenu.cpp
+#, fuzzy
 msgid "Toggle fast"
 msgstr "高速移動モード"
 
 #: src/guiKeyChangeMenu.cpp
+#, fuzzy
 msgid "Toggle fly"
 msgstr "飛行モード"
 
 #: src/guiKeyChangeMenu.cpp
+#, fuzzy
 msgid "Toggle noclip"
 msgstr "すり抜けモード"
 
@@ -971,6 +974,7 @@ msgid "Use"
 msgstr "使用"
 
 #: src/guiKeyChangeMenu.cpp
+#, fuzzy
 msgid "press key"
 msgstr "キー入力待ち"
 
@@ -1004,27 +1008,27 @@ msgstr "音量: "
 
 #: src/keycode.cpp
 msgid "Apps"
-msgstr "アプリ"
+msgstr "アプリケーション"
 
 #: src/keycode.cpp
 msgid "Attn"
-msgstr ":"
+msgstr "Attn"
 
 #: src/keycode.cpp
 msgid "Back"
-msgstr "戻るキー"
+msgstr "Back"
 
 #: src/keycode.cpp
 msgid "Capital"
-msgstr "Caps Lock"
+msgstr "Capital"
 
 #: src/keycode.cpp
 msgid "Clear"
-msgstr "クリア"
+msgstr "Clear"
 
 #: src/keycode.cpp
 msgid "Comma"
-msgstr ","
+msgstr "カンマ"
 
 #: src/keycode.cpp
 msgid "Control"
@@ -1040,11 +1044,11 @@ msgstr "CrSel"
 
 #: src/keycode.cpp
 msgid "Down"
-msgstr "下"
+msgstr "Down"
 
 #: src/keycode.cpp
 msgid "End"
-msgstr "エンド"
+msgstr "End"
 
 #: src/keycode.cpp
 msgid "Erase OEF"
@@ -1052,7 +1056,7 @@ msgstr "Erase OEF"
 
 #: src/keycode.cpp
 msgid "Escape"
-msgstr "Esc"
+msgstr "Escape"
 
 #: src/keycode.cpp
 msgid "ExSel"
@@ -1060,15 +1064,15 @@ msgstr "ExSel"
 
 #: src/keycode.cpp
 msgid "Execute"
-msgstr "実行キー"
+msgstr "Execute"
 
 #: src/keycode.cpp
 msgid "Final"
-msgstr "Finalキー"
+msgstr "Final"
 
 #: src/keycode.cpp
 msgid "Help"
-msgstr "ヘルプ"
+msgstr "Help"
 
 #: src/keycode.cpp
 msgid "Home"
@@ -1080,7 +1084,7 @@ msgstr "Insert"
 
 #: src/keycode.cpp
 msgid "Junja"
-msgstr "Junjaキー"
+msgstr "Junja"
 
 #: src/keycode.cpp
 msgid "Kana"
@@ -1088,7 +1092,7 @@ msgstr "かな"
 
 #: src/keycode.cpp
 msgid "Kanji"
-msgstr "半角/全角"
+msgstr "漢字"
 
 #: src/keycode.cpp
 msgid "Left Button"
@@ -1100,7 +1104,7 @@ msgstr "左Ctrl"
 
 #: src/keycode.cpp
 msgid "Left Menu"
-msgstr "左メニュー"
+msgstr "左Alt"
 
 #: src/keycode.cpp
 msgid "Left Shift"
@@ -1112,7 +1116,7 @@ msgstr "左Windows"
 
 #: src/keycode.cpp
 msgid "Menu"
-msgstr "メニュー"
+msgstr "Alt"
 
 #: src/keycode.cpp
 msgid "Middle Button"
@@ -1120,7 +1124,7 @@ msgstr "中ボタン"
 
 #: src/keycode.cpp
 msgid "Minus"
-msgstr "-"
+msgstr "マイナス"
 
 #: src/keycode.cpp
 msgid "Mode Change"
@@ -1128,7 +1132,7 @@ msgstr "モード変更"
 
 #: src/keycode.cpp
 msgid "Next"
-msgstr "Page Down"
+msgstr "PageDown"
 
 #: src/keycode.cpp
 msgid "Nonconvert"
@@ -1136,67 +1140,67 @@ msgstr "無変換"
 
 #: src/keycode.cpp
 msgid "Num Lock"
-msgstr "Num Lock"
+msgstr "NumLock"
 
 #: src/keycode.cpp
 msgid "Numpad *"
-msgstr "テンキー *"
+msgstr "数値キーパッド *"
 
 #: src/keycode.cpp
 msgid "Numpad +"
-msgstr "テンキー +"
+msgstr "数値キーパッド +"
 
 #: src/keycode.cpp
 msgid "Numpad -"
-msgstr "テンキー -"
+msgstr "数値キーパッド -"
 
 #: src/keycode.cpp
 msgid "Numpad /"
-msgstr "テンキー /"
+msgstr "数値キーパッド /"
 
 #: src/keycode.cpp
 msgid "Numpad 0"
-msgstr "テンキー 0"
+msgstr "数値キーパッド 0"
 
 #: src/keycode.cpp
 msgid "Numpad 1"
-msgstr "テンキー 1"
+msgstr "数値キーパッド 1"
 
 #: src/keycode.cpp
 msgid "Numpad 2"
-msgstr "テンキー 2"
+msgstr "数値キーパッド 2"
 
 #: src/keycode.cpp
 msgid "Numpad 3"
-msgstr "テンキー 3"
+msgstr "数値キーパッド 3"
 
 #: src/keycode.cpp
 msgid "Numpad 4"
-msgstr "テンキー 4"
+msgstr "数値キーパッド 4"
 
 #: src/keycode.cpp
 msgid "Numpad 5"
-msgstr "テンキー 5"
+msgstr "数値キーパッド 5"
 
 #: src/keycode.cpp
 msgid "Numpad 6"
-msgstr "テンキー 6"
+msgstr "数値キーパッド 6"
 
 #: src/keycode.cpp
 msgid "Numpad 7"
-msgstr "テンキー 7"
+msgstr "数値キーパッド 7"
 
 #: src/keycode.cpp
 msgid "Numpad 8"
-msgstr "テンキー 8"
+msgstr "数値キーパッド 8"
 
 #: src/keycode.cpp
 msgid "Numpad 9"
-msgstr "テンキー 9"
+msgstr "数値キーパッド 9"
 
 #: src/keycode.cpp
 msgid "OEM Clear"
-msgstr "OEMクリア"
+msgstr "OEM Clear"
 
 #: src/keycode.cpp
 msgid "PA1"
@@ -1204,11 +1208,11 @@ msgstr "PA1"
 
 #: src/keycode.cpp
 msgid "Pause"
-msgstr "ポーズ"
+msgstr "Pause"
 
 #: src/keycode.cpp
 msgid "Period"
-msgstr "."
+msgstr "ピリオド"
 
 #: src/keycode.cpp
 msgid "Plus"
@@ -1216,7 +1220,7 @@ msgstr "プラス"
 
 #: src/keycode.cpp
 msgid "Print"
-msgstr "印刷キー"
+msgstr "Print"
 
 #: src/keycode.cpp
 msgid "Prior"
@@ -4074,7 +4078,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "VBO"
-msgstr ""
+msgstr "VBO"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Depth"

From fe497573f6e9507d24803024e2f3d06c016fe106 Mon Sep 17 00:00:00 2001
From: Rui <rui.minetest@gmail.com>
Date: Tue, 30 Aug 2016 04:09:03 +0000
Subject: [PATCH 171/418] Translated using Weblate (Danish)

Currently translated at 30.2% (271 of 895 strings)

Don't end with '\n'.
---
 po/da/minetest.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/da/minetest.po b/po/da/minetest.po
index df948e6a7..9746f6be2 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-08-12 20:43+0200\n"
-"Last-Translator: Thomas Wagner Nielsen <thomas@viawords.com>\n"
+"PO-Revision-Date: 2016-08-30 04:09+0000\n"
+"Last-Translator: Rui <rui.minetest@gmail.com>\n"
 "Language-Team: Danish "
 "<https://hosted.weblate.org/projects/minetest/minetest/da/>\n"
 "Language: da\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -1803,7 +1803,7 @@ msgstr "Standard spil"
 msgid ""
 "Default game when creating a new world.\n"
 "This will be overridden when creating a world from the main menu."
-msgstr "Standard spil, når du skaber en ny verden.\n"
+msgstr "Standard spil, når du skaber en ny verden."
 
 #: src/settings_translation_file.cpp
 #, fuzzy

From 7eacdc7bb8ec8f8b06b5e0b2464af219e623cd56 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Tue, 30 Aug 2016 06:18:37 +0200
Subject: [PATCH 172/418] Run updatepo.sh

---
 po/be/minetest.po      |  208 +++++++--
 po/ca/minetest.po      |  250 +++++++---
 po/cs/minetest.po      |  394 ++++++++++------
 po/da/minetest.po      |  368 ++++++++++-----
 po/de/minetest.po      |  996 ++++++++++++++++++++++-----------------
 po/eo/minetest.po      |  265 ++++++++---
 po/es/minetest.po      |  302 ++++++++----
 po/et/minetest.po      |  423 +++++++++++------
 po/fr/minetest.po      | 1007 +++++++++++++++++++++++-----------------
 po/he/minetest.po      |  214 +++++++--
 po/hu/minetest.po      |  578 ++++++++++++++---------
 po/id/minetest.po      |  323 +++++++++----
 po/it/minetest.po      |  510 +++++++++++++-------
 po/ja/minetest.po      |  325 +++++++++----
 po/jbo/minetest.po     |  225 ++++++---
 po/ko/minetest.po      |  208 +++++++--
 po/ky/minetest.po      |  332 ++++++++-----
 po/lt/minetest.po      |  308 ++++++++----
 po/minetest.pot        |  196 ++++++--
 po/nb/minetest.po      |  250 +++++++---
 po/nl/minetest.po      |  900 ++++++++++++++++++++---------------
 po/pl/minetest.po      |  681 ++++++++++++++++-----------
 po/pt/minetest.po      |  505 ++++++++++++--------
 po/pt_BR/minetest.po   |  716 +++++++++++++++++-----------
 po/ro/minetest.po      |  371 ++++++++++-----
 po/ru/minetest.po      |  628 +++++++++++++++----------
 po/sr_Cyrl/minetest.po |  221 +++++++--
 po/tr/minetest.po      |  297 ++++++++----
 po/uk/minetest.po      |  374 ++++++++++-----
 po/zh_CN/minetest.po   |  477 ++++++++++++-------
 po/zh_TW/minetest.po   |  391 +++++++++++-----
 31 files changed, 8677 insertions(+), 4566 deletions(-)

diff --git a/po/be/minetest.po b/po/be/minetest.po
index 093c23593..25d8bf0af 100644
--- a/po/be/minetest.po
+++ b/po/be/minetest.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2013-11-23 17:37+0100\n"
 "Last-Translator: Selat <LongExampleTestName@gmail.com>\n"
 "Language-Team: Belarusian\n"
@@ -935,6 +935,10 @@ msgstr ""
 msgid "Use"
 msgstr ""
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr ""
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr ""
@@ -1251,10 +1255,6 @@ msgstr ""
 msgid "X Button 2"
 msgstr ""
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1320,6 +1320,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1394,6 +1398,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr ""
@@ -1426,6 +1434,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr ""
@@ -1466,6 +1478,10 @@ msgstr ""
 msgid "Chat toggle key"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Chatcommands"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1539,14 +1555,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1692,6 +1708,10 @@ msgstr ""
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1708,6 +1728,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1738,14 +1762,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1879,6 +1895,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -1939,10 +1963,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2077,6 +2111,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2111,6 +2149,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2138,15 +2185,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2241,6 +2279,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2276,7 +2348,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2441,6 +2513,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2478,7 +2557,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2628,6 +2707,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3046,6 +3140,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3087,6 +3189,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3094,11 +3200,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3109,10 +3215,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr ""
@@ -3153,10 +3255,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3361,12 +3459,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3374,7 +3478,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3408,6 +3512,10 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr ""
@@ -3566,7 +3674,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3681,10 +3789,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3829,10 +3949,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -3959,7 +4075,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
diff --git a/po/ca/minetest.po b/po/ca/minetest.po
index 0d157db06..54451ca68 100644
--- a/po/ca/minetest.po
+++ b/po/ca/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-04-20 13:21+0000\n"
 "Last-Translator: Joan Ciprià Moreno Teodoro <joancipria@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/minetest/"
@@ -989,6 +989,11 @@ msgstr "Activar noclip"
 msgid "Use"
 msgstr "Utilitzar"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+#, fuzzy
+msgid "Zoom"
+msgstr "Zoom"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "Premsa una tecla"
@@ -1310,11 +1315,6 @@ msgstr "X Botó 1"
 msgid "X Button 2"
 msgstr "X Botó 2"
 
-#: src/keycode.cpp
-#, fuzzy
-msgid "Zoom"
-msgstr "Zoom"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1403,6 +1403,11 @@ msgstr "Rang del bloc actiu"
 msgid "Active Block Modifier interval"
 msgstr "Rang del bloc actiu"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Rang del bloc actiu"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Rang del bloc actiu"
@@ -1486,6 +1491,10 @@ msgstr "Preguntar per tornar a connectar després d'una caiguda"
 msgid "Automaticaly report to the serverlist."
 msgstr "Automàticament informar a la llista del servidor."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Tecla de retrocés"
@@ -1519,6 +1528,10 @@ msgstr "Bits per píxel (profunditat de color) en el mode de pantalla completa."
 msgid "Build inside player"
 msgstr "Construir dins el jugador"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Mapat de relleu"
@@ -1559,6 +1572,11 @@ msgstr "Tecla del xat"
 msgid "Chat toggle key"
 msgstr "Tecla alternativa per al xat"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Comandament"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1649,6 +1667,16 @@ msgstr "Núvols en el menú"
 msgid "Colored fog"
 msgstr "Boira de color"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Llista de mods separada per comes que tenen permís per accedir a les APIs "
+"HTTP,\n"
+"les quals els permeten pujar/descarregar informació de/cap a internet."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1659,15 +1687,6 @@ msgstr ""
 "insegures fins i tot quan \"mod security\" està activat (via "
 "request_insecure_environment ())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Llista de mods separada per comes que tenen permís per accedir a les APIs "
-"HTTP,\n"
-"les quals els permeten pujar/descarregar informació de/cap a internet."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Tecla comandament"
@@ -1823,6 +1842,10 @@ msgstr "Contrasenya per defecte"
 msgid "Default privileges"
 msgstr "Privilegis per defecte"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1841,6 +1864,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1871,14 +1898,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2013,6 +2032,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2075,10 +2102,23 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Moviment ràpid (via utilitzar clau).\n"
+"Això requereix el \"privilegi\" ràpid en el servidor."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2213,6 +2253,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2248,6 +2292,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2275,15 +2328,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2378,6 +2422,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2414,7 +2492,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr "Interval de repetició del click dret"
 
 #: src/settings_translation_file.cpp
@@ -2606,6 +2684,17 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla per botar.\n"
+"Veure http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2642,11 +2731,15 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tecla per moure el jugador cap a l'esquerra.\n"
+"Veure http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2793,6 +2886,22 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Rang del bloc actiu"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3215,6 +3324,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3256,6 +3373,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3263,11 +3384,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3278,10 +3399,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr ""
@@ -3322,10 +3439,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3530,12 +3643,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3543,7 +3662,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3577,6 +3696,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Seleccioneu la ruta"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Tecla dreta"
@@ -3735,7 +3859,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3854,10 +3978,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -4007,10 +4143,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4138,7 +4270,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4238,14 +4370,14 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "No, per descomptat que no!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Llista de servidors públics"
+#~ msgid "No!!!"
+#~ msgstr "No!!!"
 
 #~ msgid "Generate Normalmaps"
 #~ msgstr "Generar Mapes Normals"
 
-#~ msgid "No!!!"
-#~ msgstr "No!!!"
+#~ msgid "Public Serverlist"
+#~ msgstr "Llista de servidors públics"
+
+#~ msgid "No of course not!"
+#~ msgstr "No, per descomptat que no!"
diff --git a/po/cs/minetest.po b/po/cs/minetest.po
index 7cb9be505..17a223184 100644
--- a/po/cs/minetest.po
+++ b/po/cs/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-03-04 04:45+0000\n"
 "Last-Translator: Jakub Vaněk <vanek.jakub4@seznam.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -992,6 +992,10 @@ msgstr "Duch"
 msgid "Use"
 msgstr "Použít"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Přiblížení"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "stiskni klávesu"
@@ -1308,10 +1312,6 @@ msgstr "X Tlačítko 1"
 msgid "X Button 2"
 msgstr "X Tlačítko 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Přiblížení"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1389,6 +1389,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1468,6 +1472,10 @@ msgstr "Zeptat se na znovupřipojení po havárii"
 msgid "Automaticaly report to the serverlist."
 msgstr "Automaticky hlásit seznamu serverů."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Vzad"
@@ -1501,6 +1509,10 @@ msgstr "Bitová hloubka (bity na pixel) v celoobrazovkovém režimu."
 msgid "Build inside player"
 msgstr "Stavění uvnitř hráče"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Bump mapování"
@@ -1542,6 +1554,11 @@ msgstr "Klávesa chatu"
 msgid "Chat toggle key"
 msgstr "Klávesa zobrazení chatu"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Příkaz"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1613,6 +1630,12 @@ msgstr "Mraky v menu"
 msgid "Colored fog"
 msgstr "Barevná mlha"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1623,12 +1646,6 @@ msgstr ""
 "funkce ve chvílích, kdy je zapnuto zabezpečení modů (pomocí "
 "request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Příkazová klávesa"
@@ -1777,6 +1794,10 @@ msgstr "Výchozí heslo"
 msgid "Default privileges"
 msgstr "Výchozí práva"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1793,6 +1814,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr "Definuje maximální posun hráče v blocích (0 = bez limitu)."
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Prodleva před zobrazením bublinové nápovědy, uvádějte v milisekundách."
@@ -1825,14 +1850,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr "Detailní profilovací data modů. Užitečné pro vývojáře modů."
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "Detailní profilování modů"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1973,6 +1990,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2035,10 +2060,23 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Turbo režim pohybu (pomocí klávesy použít).\n"
+"Vyžaduje na serveru přidělené právo \"fast\"."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2173,6 +2211,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr "Generovat normálové mapy"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2207,6 +2249,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2234,15 +2285,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2337,6 +2379,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2372,7 +2448,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2537,6 +2613,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2574,7 +2657,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2724,6 +2807,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3146,6 +3244,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3187,6 +3293,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3194,11 +3304,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3209,10 +3319,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Nabídky"
@@ -3253,10 +3359,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mip-mapování"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3462,12 +3564,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3475,7 +3583,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3509,6 +3617,11 @@ msgstr "Vzdálený port"
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Cesta k písmu"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Klávesa doprava"
@@ -3669,7 +3782,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3784,10 +3897,22 @@ msgstr "Cesta k texturám"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3932,10 +4057,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Užitečné pro vývojáře modů."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr "Vertikální synchronizace"
@@ -4062,7 +4183,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4162,111 +4283,120 @@ msgstr "cURL limit paralelních stahování"
 msgid "cURL timeout"
 msgstr "cURL timeout"
 
-#~ msgid "No of course not!"
-#~ msgstr "Jistě že ne!"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Přednačíst inventářové textury"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Seznam veřejných serverů"
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Měřítko aplikované na prvky menu: "
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generovat normálové mapy"
+#~ msgid "Touch free target"
+#~ msgstr "Středový kurzor"
 
-#~ msgid "No!!!"
-#~ msgstr "Ne!!!"
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
 
-#~ msgid "\""
-#~ msgstr "\""
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
 
-#~ msgid "If disabled "
-#~ msgstr "Je-li zakázáno "
+#~ msgid "Downloading"
+#~ msgstr "Stahuji"
 
-#~ msgid "If enabled, "
-#~ msgstr "Je-li povoleno, "
+#~ msgid "Game Name"
+#~ msgstr "Název hry"
 
-#~ msgid "Rendering:"
-#~ msgstr "Renderování:"
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\""
 
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest"
+#~ msgid "GAMES"
+#~ msgstr "HRY"
+
+#~ msgid "Mods:"
+#~ msgstr "Mody:"
+
+#~ msgid "new game"
+#~ msgstr "nová hra"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "UPRAVIT HRU"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Odstranit vybraný mod"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Přidat mod"
+
+#~ msgid "CLIENT"
+#~ msgstr "KLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "MÍSTNÍ SERVER"
+
+#~ msgid "Name"
+#~ msgstr "Jméno"
+
+#~ msgid "Password"
+#~ msgstr "Heslo"
+
+#~ msgid "SETTINGS"
+#~ msgstr "NASTAVENÍ"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Přednačíst textury předmětů"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Konečná voda"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "HRA JEDNOHO HRÁČE"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "BALÍČKY TEXTUR"
+
+#~ msgid "MODS"
+#~ msgstr "MODY"
+
+#~ msgid "Add mod:"
+#~ msgstr "Přidat mod:"
+
+#~ msgid "Local install"
+#~ msgstr "Místní instalace"
 
 #~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
 #~ "Levý klik: Přesunout všechny předměty, Pravý klik: Přesunout jeden předmět"
 
-#~ msgid "Local install"
-#~ msgstr "Místní instalace"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest"
 
-#~ msgid "Add mod:"
-#~ msgstr "Přidat mod:"
+#~ msgid "Rendering:"
+#~ msgstr "Renderování:"
 
-#~ msgid "MODS"
-#~ msgstr "MODY"
+#~ msgid "If enabled, "
+#~ msgstr "Je-li povoleno, "
 
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "BALÍČKY TEXTUR"
+#~ msgid "If disabled "
+#~ msgstr "Je-li zakázáno "
 
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "HRA JEDNOHO HRÁČE"
+#~ msgid "\""
+#~ msgstr "\""
 
-#~ msgid "Finite Liquid"
-#~ msgstr "Konečná voda"
+#~ msgid "No!!!"
+#~ msgstr "Ne!!!"
 
-#~ msgid "Preload item visuals"
-#~ msgstr "Přednačíst textury předmětů"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generovat normálové mapy"
 
-#~ msgid "SETTINGS"
-#~ msgstr "NASTAVENÍ"
+#~ msgid "Public Serverlist"
+#~ msgstr "Seznam veřejných serverů"
 
-#~ msgid "Password"
-#~ msgstr "Heslo"
+#~ msgid "No of course not!"
+#~ msgstr "Jistě že ne!"
 
-#~ msgid "Name"
-#~ msgstr "Jméno"
+#~ msgid "Useful for mod developers."
+#~ msgstr "Užitečné pro vývojáře modů."
 
-#~ msgid "START SERVER"
-#~ msgstr "MÍSTNÍ SERVER"
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Detailní profilování modů"
 
-#~ msgid "CLIENT"
-#~ msgstr "KLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Přidat mod"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Odstranit vybraný mod"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "UPRAVIT HRU"
-
-#~ msgid "new game"
-#~ msgstr "nová hra"
-
-#~ msgid "Mods:"
-#~ msgstr "Mody:"
-
-#~ msgid "GAMES"
-#~ msgstr "HRY"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Název hry"
-
-#~ msgid "Downloading"
-#~ msgstr "Stahuji"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
-
-#~ msgid "Touch free target"
-#~ msgstr "Středový kurzor"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Měřítko aplikované na prvky menu: "
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Přednačíst inventářové textury"
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "Detailní profilovací data modů. Užitečné pro vývojáře modů."
diff --git a/po/da/minetest.po b/po/da/minetest.po
index 9746f6be2..d2d1c4eb5 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -2,16 +2,16 @@
 # Copyright (C) 2011 celeron
 # This file is distributed under the same license as the minetest-c55 package.
 # Frederik Helth <Guides@live.dk>, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-08-30 04:09+0000\n"
 "Last-Translator: Rui <rui.minetest@gmail.com>\n"
-"Language-Team: Danish "
-"<https://hosted.weblate.org/projects/minetest/minetest/da/>\n"
+"Language-Team: Danish <https://hosted.weblate.org/projects/minetest/minetest/"
+"da/>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1015,6 +1015,10 @@ msgstr "Omstil fylde"
 msgid "Use"
 msgstr "Brug"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoom"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "Tryk på en tast"
@@ -1335,10 +1339,6 @@ msgstr "X knap 1"
 msgid "X Button 2"
 msgstr "X knap 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoom"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1409,6 +1409,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1496,6 +1500,10 @@ msgstr "Spørg om at forbinde igen, efter den er gået ned."
 msgid "Automaticaly report to the serverlist."
 msgstr "Rapportér automatisk til serverlisten."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1531,6 +1539,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr "Flerspiller"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Bumpmapping"
@@ -1574,6 +1586,11 @@ msgstr "Skift bindinger"
 msgid "Chat toggle key"
 msgstr "Skift bindinger"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Kommando"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1650,14 +1667,14 @@ msgstr "Farvet tåge"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1814,6 +1831,10 @@ msgstr "Nyt kodeord"
 msgid "Default privileges"
 msgstr "Standardprivilegier"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1830,6 +1851,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1860,14 +1885,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2011,6 +2028,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2071,10 +2096,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2211,6 +2246,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2246,6 +2285,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2273,15 +2321,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2377,6 +2416,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2413,7 +2486,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2579,6 +2652,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2616,7 +2696,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2767,6 +2847,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3191,6 +3286,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3232,6 +3335,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3239,11 +3346,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3254,10 +3361,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Menus"
@@ -3300,10 +3403,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mip-mapping"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3508,12 +3607,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3521,7 +3626,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3556,6 +3661,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Vælg sti"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Right key"
@@ -3719,7 +3829,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3836,10 +3946,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3986,10 +4108,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4117,7 +4235,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4217,47 +4335,54 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "Nej selvfølgelig ikke!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Offentlig serverliste"
-
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Deaktivér alle"
+#~ msgid "Downloading"
+#~ msgstr "Ned"
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "aktiveret"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed"
 
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Spil"
+#~ msgid "is required by:"
+#~ msgstr "er påkrævet af:"
 
-#, fuzzy
-#~ msgid "Password"
-#~ msgstr "Gammelt kodeord"
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguration gemt.  "
 
-#~ msgid "Preload item visuals"
-#~ msgstr "For-indlæs elementernes grafik"
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende.  "
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n"
-#~ "De vil blive aktiveret som standard når du gemmer konfigurationen.  "
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n"
-#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen.  "
+#~ msgid "Show Public"
+#~ msgstr "Vis offentlig"
 
-#~ msgid "Delete map"
-#~ msgstr "Slet mappen"
+#~ msgid "Show Favorites"
+#~ msgstr "Vis favoritter"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server."
+
+#~ msgid "Create world"
+#~ msgstr "Skab verden"
+
+#~ msgid "Address required."
+#~ msgstr "Adresse påkrævet."
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Kan ikke slette verden: ingenting valgt"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Filer som slettes"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Kan ikke skabe verden: ingen spil fundet"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Kan ikke konfigurere verden: ingenting valgt"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Mislykkedes i at slette alle verdenens filer"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4284,51 +4409,44 @@ msgstr ""
 #~ "- ESC: denne menu\n"
 #~ "- T: snak\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Mislykkedes i at slette alle verdenens filer"
+#~ msgid "Delete map"
+#~ msgstr "Slet mappen"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Kan ikke konfigurere verden: ingenting valgt"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n"
+#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen.  "
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Kan ikke skabe verden: ingen spil fundet"
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n"
+#~ "De vil blive aktiveret som standard når du gemmer konfigurationen.  "
 
-#~ msgid "Files to be deleted"
-#~ msgstr "Filer som slettes"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Kan ikke slette verden: ingenting valgt"
-
-#~ msgid "Address required."
-#~ msgstr "Adresse påkrævet."
-
-#~ msgid "Create world"
-#~ msgstr "Skab verden"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Vis favoritter"
-
-#~ msgid "Show Public"
-#~ msgstr "Vis offentlig"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende.  "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguration gemt.  "
-
-#~ msgid "is required by:"
-#~ msgstr "er påkrævet af:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed"
+#~ msgid "Preload item visuals"
+#~ msgstr "For-indlæs elementernes grafik"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Ned"
+#~ msgid "Password"
+#~ msgstr "Gammelt kodeord"
+
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Spil"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "aktiveret"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Deaktivér alle"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Offentlig serverliste"
+
+#~ msgid "No of course not!"
+#~ msgstr "Nej selvfølgelig ikke!"
diff --git a/po/de/minetest.po b/po/de/minetest.po
index 018126f1a..b68f3c894 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-08-09 07:40+0000\n"
 "Last-Translator: bse666 <bse666@gmail.com>\n"
-"Language-Team: German "
-"<https://hosted.weblate.org/projects/minetest/minetest/de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/minetest/minetest/"
+"de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -985,6 +985,10 @@ msgstr "Geistmodus"
 msgid "Use"
 msgstr "Benutzen"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoom"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "Taste drücken"
@@ -1301,10 +1305,6 @@ msgstr "X-Knopf 1"
 msgid "X Button 2"
 msgstr "X-Knopf 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoom"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1395,6 +1395,11 @@ msgstr "Active-Block-Management-Intervall"
 msgid "Active Block Modifier interval"
 msgstr "Active-Block-Modifier-Intervall"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Active-Block-Modifier-Intervall"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Reichweite aktiver Kartenblöcke"
@@ -1477,6 +1482,10 @@ msgstr "Zum Neuverbinden nach Absturz auffordern"
 msgid "Automaticaly report to the serverlist."
 msgstr "Automatisch bei der Serverliste melden."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Rückwärtstaste"
@@ -1509,6 +1518,10 @@ msgstr "Bits pro Pixel (Farbtiefe) im Vollbildmodus."
 msgid "Build inside player"
 msgstr "Innerhalb des Spielers bauen"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Bumpmapping"
@@ -1549,6 +1562,11 @@ msgstr "Chattaste"
 msgid "Chat toggle key"
 msgstr "Taste zum Umschalten des Chatprotokolls"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Befehl"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1639,6 +1657,15 @@ msgstr "Wolken im Menü"
 msgid "Colored fog"
 msgstr "Gefärbter Nebel"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Kommagetrente Liste von Mods, welche auf HTTP-APIs zugreifen dürfen, was\n"
+"es ihnen erlaubt, Daten aus und Daten zum Internet herunter- und hochzuladen."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1650,14 +1677,6 @@ msgstr ""
 "eingeschaltet ist\n"
 "(mit request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Kommagetrente Liste von Mods, welche auf HTTP-APIs zugreifen dürfen, was\n"
-"es ihnen erlaubt, Daten aus und Daten zum Internet herunter- und hochzuladen."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Befehlstaste"
@@ -1815,6 +1834,10 @@ msgstr "Standardpasswort"
 msgid "Default privileges"
 msgstr "Standardprivilegien"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1837,6 +1860,10 @@ msgstr ""
 "Setzt die maximale Distanz, in der die Spieler übertragen werden, in "
 "Kartenblöcken (0 = unbegrenzt)."
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Verzögerung beim Zeigen von Tooltipps, in Millisekunden."
@@ -1869,14 +1896,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr "Blockanimationen desynchronisieren"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr "Detaillierte Mod-Profildaten. Nützlich für Mod-Entwickler."
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "Detailliertes Mod-Profiling"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2046,6 +2065,15 @@ msgstr ""
 "Aktiviert Parralax-Occlusion-Mapping.\n"
 "Hierfür müssen Shader aktiviert sein."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Engine profiling data print interval"
+msgstr "Profiler-Ausgabeintervall"
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2110,10 +2138,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "Gesichtsfeld"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Gesichtsfeld"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Gesichtsfeld in Grad."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Schnelle Bewegung (mittels Benutzen-Taste).\n"
+"Dazu wird das „fast“-Privileg auf dem Server benötigt."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2264,6 +2306,10 @@ msgstr "Allgemein"
 msgid "Generate normalmaps"
 msgstr "Normalmaps generieren"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2318,6 +2364,15 @@ msgstr ""
 "(empfohlen für Mod-\n"
 "  Entwickler)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "Höhenkomponente der anfänglichen Fenstergröße."
@@ -2348,19 +2403,6 @@ msgstr ""
 "In aktiven Blöcken werden Objekte geladen und ABMs ausgeführt.\n"
 "1 Kartenblock = 16×16×16 Blöcke."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-"Wie viele Kartenblöcke gleichzeitig für den gesamten Server auf der Leitung "
-"unterwegs sind."
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-"Wie viele Kartenblöcke gleichzeitig pro Client auf der Leitung unterwegs "
-"sind."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2486,6 +2528,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr "Hintergrundfarbe (R,G,B) der Chat-Konsole im Spiel."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2526,7 +2602,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr "Rechtsklick-Wiederholungsrate"
 
 #: src/settings_translation_file.cpp
@@ -2758,6 +2834,17 @@ msgstr ""
 "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Taste zum Umschalten des Schnellmodus.\n"
+"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2809,8 +2896,9 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -3005,6 +3093,22 @@ msgstr "Flüssigkeitsaktualisierungsintervall in Sekunden."
 msgid "Liquid update tick"
 msgstr "Flüssigkeitsaktualisierungstakt"
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Active-Block-Modifier-Intervall"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr "Hauptmenü-Spiel-Manager"
@@ -3467,6 +3571,16 @@ msgstr "Maximal zwangsgeladene Kartenblöcke"
 msgid "Maximum hotbar width"
 msgstr "Max. Breite der Schnellzugriffsleiste"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr "Maximale Anzahl der Spieler, die sich simultan verbinden können."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "Maximale Anzahl der Kartenblöcke in der Ladewarteschlange."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr "Maximale Anzahl der Kartenblöcke in der Ladewarteschlange."
@@ -3524,6 +3638,11 @@ msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 "Maximale Anzahl der statisch gespeicherten Objekte in einem Kartenblock."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum objects per block"
+msgstr "Maximale Objekte pro Kartenblock"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3534,11 +3653,13 @@ msgstr ""
 "etwas gibt, was links oder rechts von ihr angezeigt werden soll."
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+#, fuzzy
+msgid "Maximum simultaneous block sends per client"
 msgstr "Max. gleichzeitig versendete Kartenblöcke pro Client"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+#, fuzzy
+msgid "Maximum simultaneous block sends total"
 msgstr "Max. gleichzeitig versendete Kartenblöcke"
 
 #: src/settings_translation_file.cpp
@@ -3551,10 +3672,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr "Maximale Benutzerzahl"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr "Maximale Objekte pro Kartenblock"
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Menüs"
@@ -3598,10 +3715,6 @@ msgstr "Minimale Texturengröße für Filter"
 msgid "Mipmapping"
 msgstr "Mip-Mapping"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr "Mod-Profiling"
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr "Modspeicher: Details-URL"
@@ -3845,22 +3958,31 @@ msgstr ""
 "Verhindert, dass Mods unsichere Funktionen, wie das Ausführen von\n"
 "Shell-Kommandos, benutzen können."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+"Profiler-Datenausgabeintervall. 0 = deaktivieren. Nützlich für Entwickler."
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr "Privilegien, die Spieler mit basic_privs gewähren können"
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
-msgstr ""
-"Profiler-Datenausgabeintervall. 0 = deaktivieren. Nützlich für Entwickler."
+#, fuzzy
+msgid "Profiler"
+msgstr "Talprofil"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "Profiler-Umschalten-Taste"
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr "Profiler-Ausgabeintervall"
+#, fuzzy
+msgid "Profiling"
+msgstr "Mod-Profiling"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3896,6 +4018,11 @@ msgstr "Serverport"
 msgid "Replaces the default main menu with a custom one."
 msgstr "Ersetzt das Standardhauptmenü mit einem benutzerdefinierten Hauptmenü."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Schriftpfad"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Rechtstaste"
@@ -4070,8 +4197,9 @@ msgstr ""
 "Dafür müssen Shader aktiviert sein."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -4208,10 +4336,22 @@ msgstr "Texturpfad"
 msgid "The altitude at which temperature drops by 20C"
 msgstr "Die Höhe, ab der die Temperatur um 20 °C fällt"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr "Die Tiefe von Erde oder einem anderem Füller"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Die Netzwerkschnittstelle, auf die der Server lauscht."
@@ -4396,10 +4536,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Trilineare Filterung bei der Skalierung von Texturen benutzen."
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Nützlich für Mod-Entwickler."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr "Vertikale Synchronisation"
@@ -4532,11 +4668,12 @@ msgstr ""
 "die Inventarbilder von Blöcken)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 "Falls gui_scaling_filter_txr2img auf „wahr“ gesetzt ist, werden\n"
 "diese Bilder von der Hardware zur Software für die Skalierung\n"
@@ -4678,106 +4815,307 @@ msgstr "cURL-Parallel-Begrenzung"
 msgid "cURL timeout"
 msgstr "cURL-Zeitüberschreitung"
 
-#~ msgid "No of course not!"
-#~ msgstr "Nein, natürlich nicht!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Öffentliche Serverliste"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normalmaps generieren"
-
-#~ msgid "No!!!"
-#~ msgstr "Nein!!!"
-
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Kartengenerierungsattribute speziell für den Täler-Kartengenerator.\n"
+#~ "Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n"
+#~ "Gelegentlich werden Seen und Hügel zur flachen Welt hinzugefügt.\n"
+#~ "Die von der Engine standardmäßig gesetzten Flags sind: keine.\n"
+#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
 #~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 #~ "werden von der Standardeinstellung unverändert gelassen.\n"
 #~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren.\n"
-#~ "„altitude_chill“ macht höhere Höhen kälter, was zu einigen Biomproblemen "
-#~ "führen könnte.\n"
-#~ "„humid_rivers“ modifiziert die Luftfeuchtigkeit um Flüssen und in "
-#~ "Gebieten, in denen das Wasser sich in Pfützen ansammeln würde.\n"
-#~ "Dies könnte mit fein abgestimmten Biomen zu Konflikten führen."
+#~ "zu deaktivieren."
 
-#, fuzzy
-#~ msgid "\""
-#~ msgstr "”"
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Kartengenerierungsattribute speziell für den Kartengenerator v7.\n"
+#~ "Das „ridges“-Flag steuert die Flüsse.\n"
+#~ "Die von der Engine standardmäßig gesetzten Flags lauten:\n"
+#~ "„mountains, ridges“.\n"
+#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
+#~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
+#~ "werden von der Standardeinstellung unverändert gelassen.\n"
+#~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
+#~ "zu deaktivieren."
 
-#~ msgid "Enable a bit lower water surface, so it doesn't "
-#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht "
+#~ msgid "Item textures..."
+#~ msgstr "Inventarbilder ..."
 
-#~ msgid "If disabled "
-#~ msgstr "Wenn deaktiviert "
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n"
+#~ "nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n"
+#~ "optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n"
+#~ "nicht mit dieser Einstellung funktioniert."
 
-#~ msgid "If enabled, "
-#~ msgstr "Wenn aktiviert, "
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)."
 
-#~ msgid "Rendering:"
-#~ msgstr "Rendering:"
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
+#~ "Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n"
+#~ "Nodes multipliziert."
 
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Neustart nach Ändern des Treibers erforderlich"
+#~ msgid ""
+#~ "Julia set: W value determining the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Julia-Menge: W-Wert, der die 4D-Form festlegt.\n"
+#~ "Weite liegt grob zwischen -2 und 2."
 
-#~ msgid "Downloading"
-#~ msgstr "Lade herunter"
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n"
+#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen"
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n"
+#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
 
-#~ msgid "is required by:"
-#~ msgstr "wird benötigt von:"
+#~ msgid ""
+#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
+#~ "Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n"
+#~ "Versätze in Nodes multipliziert."
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguration gespeichert.  "
+#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+#~ msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes."
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Warnung: Konfiguration nicht konsistent.  "
+#~ msgid ""
+#~ "Mandelbrot set: Iterations of the recursive function.\n"
+#~ "Controls scale of finest detail."
+#~ msgstr ""
+#~ "Mandelbrotmenge: Iterationen der rekursiven Funktion.\n"
+#~ "Steuert die Skalierung mit einem sehr hohem Detailgrad."
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen"
+#~ msgid ""
+#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-"
+#~ "Form.\n"
+#~ "Die Weite liegt grob zwischen -2 und 2."
 
-#~ msgid "Show Public"
-#~ msgstr "Zeige öffentliche"
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen fractal.\n"
+#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with \"no\" are used to explicitly disable them."
+#~ msgstr ""
+#~ "Kartengenerierungsattribute, die speziell für den Fraktale-\n"
+#~ "Kartenerzeuger sind.\n"
+#~ "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n"
+#~ "Mandelbrotmenge aus.\n"
+#~ "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
+#~ "werden von der Standardeinstellung unverändert gelassen.\n"
+#~ "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
+#~ "zu deaktivieren."
 
-#~ msgid "Show Favorites"
-#~ msgstr "Zeige Favoriten"
+#~ msgid "Mapgen fractal mandelbrot iterations"
+#~ msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten."
+#~ msgid "Mapgen fractal mandelbrot offset"
+#~ msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger"
 
-#~ msgid "Create world"
-#~ msgstr "Welt erstellen"
+#~ msgid "Mapgen fractal mandelbrot scale"
+#~ msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger"
 
-#~ msgid "Address required."
-#~ msgstr "Adresse benötigt."
+#~ msgid "Mapgen fractal mandelbrot slice w"
+#~ msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt"
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Höchstabstand über dem Meeresspiegel für den Spieler-\n"
+#~ "startpunkt. Größere Werte führen zu Startpunkten näher an\n"
+#~ "(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n"
+#~ "brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n"
+#~ "Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n"
+#~ "eingegraben ist."
 
-#~ msgid "Files to be deleted"
-#~ msgstr "Zu löschende Dateien"
+#~ msgid ""
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Minimal gewünschte Bildwiederholrate.\n"
+#~ "Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch "
+#~ "angepasst; auch\n"
+#~ "die minimale und maximale Sichtweite werden angepasst."
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden"
+#~ msgid "New style water"
+#~ msgstr "Wasser im neuen Stil"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt"
+#~ msgid ""
+#~ "Pre-generate all item visuals used in the inventory.\n"
+#~ "This increases startup time, but runs smoother in-game.\n"
+#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
+#~ "the inventory."
+#~ msgstr ""
+#~ "Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n"
+#~ "Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel "
+#~ "führen.\n"
+#~ "Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte "
+#~ "im Inventar\n"
+#~ "verursachen kann."
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Texturen vorgenerieren"
+
+#~ msgid ""
+#~ "The allowed adjustment range for the automatic rendering range "
+#~ "adjustment.\n"
+#~ "Set this to be equal to viewing range minimum to disable the auto-"
+#~ "adjustment algorithm."
+#~ msgstr ""
+#~ "Die erlaubte Anpassungsreichweite für die automatische Render-"
+#~ "Reichweitenanpassung.\n"
+#~ "Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um "
+#~ "den automatischen\n"
+#~ "Anpassungsalgorithmus zu deaktivieren."
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Anfängliche Fensterhöhe."
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Vertikaler Startpunktbereich"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Minimale Sichtweite"
+
+#~ msgid "Wanted FPS"
+#~ msgstr "Gewünschte Bildwiederholrate"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: "
+
+#~ msgid "Touch free target"
+#~ msgstr "Berührungsfreies Ziel"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid "Game Name"
+#~ msgstr "Spielname"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren"
+
+#~ msgid "GAMES"
+#~ msgstr "SPIELE"
+
+#~ msgid "Mods:"
+#~ msgstr "Mods:"
+
+#~ msgid "new game"
+#~ msgstr "neues Spiel"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "SPIEL ÄNDERN"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Ausgewählte Mod löschen"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Mod hinzufügen"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "SERVER STARTEN"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "Password"
+#~ msgstr "Passwort"
+
+#~ msgid "SETTINGS"
+#~ msgstr "EINSTELLUNGEN"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Lade Inventarbilder vor"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Endliches Wasser"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "EINZELSPIELER"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "TEXTUREN PAKETE"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "Add mod:"
+#~ msgstr "Modifikation hinzufügen:"
+
+#~ msgid "Local install"
+#~ msgstr "Lokale Install."
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n"
+#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird.  "
+
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Warnung: Einige konfigurierte Mods fehlen.\n"
+#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert "
+#~ "wird.  "
+
+#~ msgid "KEYBINDINGS"
+#~ msgstr "TASTEN EINST."
+
+#~ msgid "Delete map"
+#~ msgstr "Karte löschen"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4803,304 +5141,124 @@ msgstr "cURL-Zeitüberschreitung"
 #~ "- I: Inventar\n"
 #~ "- T: Chat\n"
 
-#~ msgid "Delete map"
-#~ msgstr "Karte löschen"
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden"
 
-#~ msgid "KEYBINDINGS"
-#~ msgstr "TASTEN EINST."
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Zu löschende Dateien"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt"
+
+#~ msgid "Address required."
+#~ msgstr "Adresse benötigt."
+
+#~ msgid "Create world"
+#~ msgstr "Welt erstellen"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Zeige Favoriten"
+
+#~ msgid "Show Public"
+#~ msgstr "Zeige öffentliche"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Warnung: Konfiguration nicht konsistent.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguration gespeichert.  "
+
+#~ msgid "is required by:"
+#~ msgstr "wird benötigt von:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen"
+
+#~ msgid "Downloading"
+#~ msgstr "Lade herunter"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Neustart nach Ändern des Treibers erforderlich"
+
+#~ msgid "Rendering:"
+#~ msgstr "Rendering:"
+
+#~ msgid "If enabled, "
+#~ msgstr "Wenn aktiviert, "
+
+#~ msgid "If disabled "
+#~ msgstr "Wenn deaktiviert "
+
+#~ msgid "Enable a bit lower water surface, so it doesn't "
+#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht "
+
+#, fuzzy
+#~ msgid "\""
+#~ msgstr "”"
 
 #~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Warnung: Einige konfigurierte Mods fehlen.\n"
-#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert "
-#~ "wird.  "
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n"
-#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird.  "
-
-#~ msgid "Local install"
-#~ msgstr "Lokale Install."
-
-#~ msgid "Add mod:"
-#~ msgstr "Modifikation hinzufügen:"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "TEXTUREN PAKETE"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "EINZELSPIELER"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Endliches Wasser"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Lade Inventarbilder vor"
-
-#~ msgid "SETTINGS"
-#~ msgstr "EINSTELLUNGEN"
-
-#~ msgid "Password"
-#~ msgstr "Passwort"
-
-#~ msgid "Name"
-#~ msgstr "Name"
-
-#~ msgid "START SERVER"
-#~ msgstr "SERVER STARTEN"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Mod hinzufügen"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Ausgewählte Mod löschen"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "SPIEL ÄNDERN"
-
-#~ msgid "new game"
-#~ msgstr "neues Spiel"
-
-#~ msgid "Mods:"
-#~ msgstr "Mods:"
-
-#~ msgid "GAMES"
-#~ msgstr "SPIELE"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren"
-
-#~ msgid "Game Name"
-#~ msgstr "Spielname"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
-
-#~ msgid "Touch free target"
-#~ msgstr "Berührungsfreies Ziel"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: "
-
-#~ msgid "Wanted FPS"
-#~ msgstr "Gewünschte Bildwiederholrate"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Minimale Sichtweite"
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Vertikaler Startpunktbereich"
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Anfängliche Fensterhöhe."
-
-#~ msgid ""
-#~ "The allowed adjustment range for the automatic rendering range "
-#~ "adjustment.\n"
-#~ "Set this to be equal to viewing range minimum to disable the auto-"
-#~ "adjustment algorithm."
-#~ msgstr ""
-#~ "Die erlaubte Anpassungsreichweite für die automatische Render-"
-#~ "Reichweitenanpassung.\n"
-#~ "Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um "
-#~ "den automatischen\n"
-#~ "Anpassungsalgorithmus zu deaktivieren."
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Texturen vorgenerieren"
-
-#~ msgid ""
-#~ "Pre-generate all item visuals used in the inventory.\n"
-#~ "This increases startup time, but runs smoother in-game.\n"
-#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
-#~ "the inventory."
-#~ msgstr ""
-#~ "Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n"
-#~ "Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel "
-#~ "führen.\n"
-#~ "Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte "
-#~ "im Inventar\n"
-#~ "verursachen kann."
-
-#~ msgid "New style water"
-#~ msgstr "Wasser im neuen Stil"
-
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Minimal gewünschte Bildwiederholrate.\n"
-#~ "Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch "
-#~ "angepasst; auch\n"
-#~ "die minimale und maximale Sichtweite werden angepasst."
-
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Höchstabstand über dem Meeresspiegel für den Spieler-\n"
-#~ "startpunkt. Größere Werte führen zu Startpunkten näher an\n"
-#~ "(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n"
-#~ "brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n"
-#~ "Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n"
-#~ "eingegraben ist."
-
-#~ msgid "Mapgen fractal mandelbrot slice w"
-#~ msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger"
-
-#~ msgid "Mapgen fractal mandelbrot scale"
-#~ msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger"
-
-#~ msgid "Mapgen fractal mandelbrot offset"
-#~ msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger"
-
-#~ msgid "Mapgen fractal mandelbrot iterations"
-#~ msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger"
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen fractal.\n"
-#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Kartengenerierungsattribute, die speziell für den Fraktale-\n"
-#~ "Kartenerzeuger sind.\n"
-#~ "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n"
-#~ "Mandelbrotmenge aus.\n"
-#~ "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
-#~ "werden von der Standardeinstellung unverändert gelassen.\n"
-#~ "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren."
-
-#~ msgid ""
-#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-"
-#~ "Form.\n"
-#~ "Die Weite liegt grob zwischen -2 und 2."
-
-#~ msgid ""
-#~ "Mandelbrot set: Iterations of the recursive function.\n"
-#~ "Controls scale of finest detail."
-#~ msgstr ""
-#~ "Mandelbrotmenge: Iterationen der rekursiven Funktion.\n"
-#~ "Steuert die Skalierung mit einem sehr hohem Detailgrad."
-
-#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
-#~ msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes."
-
-#~ msgid ""
-#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
-#~ "Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n"
-#~ "Versätze in Nodes multipliziert."
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n"
-#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n"
-#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Julia set: W value determining the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Julia-Menge: W-Wert, der die 4D-Form festlegt.\n"
-#~ "Weite liegt grob zwischen -2 und 2."
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
-#~ "Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n"
-#~ "Nodes multipliziert."
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)."
-
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n"
-#~ "nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n"
-#~ "optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n"
-#~ "nicht mit dieser Einstellung funktioniert."
-
-#~ msgid "Item textures..."
-#~ msgstr "Inventarbilder ..."
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "Kartengenerierungsattribute speziell für den Kartengenerator v7.\n"
-#~ "Das „ridges“-Flag steuert die Flüsse.\n"
-#~ "Die von der Engine standardmäßig gesetzten Flags lauten:\n"
-#~ "„mountains, ridges“.\n"
-#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
+#~ "Kartengenerierungsattribute speziell für den Täler-Kartengenerator.\n"
 #~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 #~ "werden von der Standardeinstellung unverändert gelassen.\n"
 #~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren."
+#~ "zu deaktivieren.\n"
+#~ "„altitude_chill“ macht höhere Höhen kälter, was zu einigen Biomproblemen "
+#~ "führen könnte.\n"
+#~ "„humid_rivers“ modifiziert die Luftfeuchtigkeit um Flüssen und in "
+#~ "Gebieten, in denen das Wasser sich in Pfützen ansammeln würde.\n"
+#~ "Dies könnte mit fein abgestimmten Biomen zu Konflikten führen."
+
+#~ msgid "No!!!"
+#~ msgstr "Nein!!!"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normalmaps generieren"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Öffentliche Serverliste"
+
+#~ msgid "No of course not!"
+#~ msgstr "Nein, natürlich nicht!"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Nützlich für Mod-Entwickler."
+
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr ""
+#~ "Wie viele Kartenblöcke gleichzeitig pro Client auf der Leitung unterwegs "
+#~ "sind."
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
 #~ msgstr ""
-#~ "Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n"
-#~ "Gelegentlich werden Seen und Hügel zur flachen Welt hinzugefügt.\n"
-#~ "Die von der Engine standardmäßig gesetzten Flags sind: keine.\n"
-#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
-#~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
-#~ "werden von der Standardeinstellung unverändert gelassen.\n"
-#~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren."
+#~ "Wie viele Kartenblöcke gleichzeitig für den gesamten Server auf der "
+#~ "Leitung unterwegs sind."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Detailliertes Mod-Profiling"
+
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "Detaillierte Mod-Profildaten. Nützlich für Mod-Entwickler."
diff --git a/po/eo/minetest.po b/po/eo/minetest.po
index fce3627f9..254b686ff 100644
--- a/po/eo/minetest.po
+++ b/po/eo/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-06-04 13:18+0000\n"
 "Last-Translator: Tim <t4im@openmailbox.org>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/minetest/"
@@ -975,6 +975,10 @@ msgstr "Baskuli nekolizian reĝimon"
 msgid "Use"
 msgstr "Uzi"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zomo"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "premi klavon"
@@ -1291,10 +1295,6 @@ msgstr "X-Butono 1"
 msgid "X Button 2"
 msgstr "X-Butono 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zomo"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1360,6 +1360,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1434,6 +1438,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1469,6 +1477,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Protuberancmapado"
@@ -1511,6 +1523,11 @@ msgstr "Ŝanĝi klavojn"
 msgid "Chat toggle key"
 msgstr "Ŝanĝi klavojn"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Komando"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1587,14 +1604,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1744,6 +1761,10 @@ msgstr "Defaŭlta pasvorto"
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1760,6 +1781,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1790,14 +1815,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1938,6 +1955,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -1999,10 +2024,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2141,6 +2176,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr "Generi Normalmapojn"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2176,6 +2215,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2203,15 +2251,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2307,6 +2346,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2343,7 +2416,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2509,6 +2582,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2546,7 +2626,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2697,6 +2777,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3139,6 +3234,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3180,6 +3283,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3187,11 +3294,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3202,10 +3309,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Menus"
@@ -3248,10 +3351,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Protuberancmapado"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3464,12 +3563,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3477,7 +3582,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3512,6 +3617,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Selekto"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Right key"
@@ -3682,7 +3792,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3801,10 +3911,22 @@ msgstr "Teksturaroj"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3951,11 +4073,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Useful for mod developers."
-msgstr "Eksaj kernprogramistoj"
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4088,7 +4205,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4188,39 +4305,43 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "Ne, memkompreneble!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Publika servilolisto"
-
 #, fuzzy
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generi Normalmapojn"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Ŝargi teksturojn…"
 
-#~ msgid "No!!!"
-#~ msgstr "Ne!!!"
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Skala faktoro por menuoj "
 
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Malŝaltu modifaron"
+#~ msgid "Touch free target"
+#~ msgstr "Sentuŝa celo"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon"
+
+#~ msgid "Rendering:"
+#~ msgstr "Bildigo:"
 
 #, fuzzy
 #~ msgid "If enabled, "
 #~ msgstr "ŝaltita"
 
-#~ msgid "Rendering:"
-#~ msgstr "Bildigo:"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Malŝaltu modifaron"
 
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon"
-
-#~ msgid "Touch free target"
-#~ msgstr "Sentuŝa celo"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Skala faktoro por menuoj "
+#~ msgid "No!!!"
+#~ msgstr "Ne!!!"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Ŝargi teksturojn…"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generi Normalmapojn"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Publika servilolisto"
+
+#~ msgid "No of course not!"
+#~ msgstr "Ne, memkompreneble!"
+
+#, fuzzy
+#~ msgid "Useful for mod developers."
+#~ msgstr "Eksaj kernprogramistoj"
diff --git a/po/es/minetest.po b/po/es/minetest.po
index 72779142c..1398377ee 100644
--- a/po/es/minetest.po
+++ b/po/es/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-06-14 21:57+0000\n"
 "Last-Translator: Roberto Mengíbar Fernández <rroobbeerr@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/minetest/"
@@ -987,6 +987,10 @@ msgstr "Activar noclip"
 msgid "Use"
 msgstr "Usar"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoom"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "pulsa una tecla"
@@ -1304,10 +1308,6 @@ msgstr "X Botón 1"
 msgid "X Button 2"
 msgstr "X Botón 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoom"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1394,6 +1394,11 @@ msgstr "Intervalo de administración de bloques activos"
 msgid "Active Block Modifier interval"
 msgstr "Intervalo de modificador de bloques activos"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Intervalo de modificador de bloques activos"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Rango de bloque activo"
@@ -1479,6 +1484,10 @@ msgstr "Preguntar para volver a conectar despues de una caída"
 msgid "Automaticaly report to the serverlist."
 msgstr "Automáticamente informar a la lista del servidor."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Tecla retroceso"
@@ -1513,6 +1522,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr "Construir dentro de jugador"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Mapeado de relieve"
@@ -1553,6 +1566,11 @@ msgstr "Tecla del Chat"
 msgid "Chat toggle key"
 msgstr "Tecla alternativa para el chat"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Comando"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1643,6 +1661,17 @@ msgstr "Nubes en el menú"
 msgid "Colored fog"
 msgstr "Niebla colorida"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Lista separada por comas de los mods a los que se les permite usar las\n"
+"interfaces de HTTP, las cuales permiten cargar y descargar datos desde/"
+"hacia\n"
+"la Internet."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1652,16 +1681,6 @@ msgstr ""
 "inseguras incluso quando securidad de mods está puesto (vía "
 "request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Lista separada por comas de los mods a los que se les permite usar las\n"
-"interfaces de HTTP, las cuales permiten cargar y descargar datos desde/"
-"hacia\n"
-"la Internet."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Tecla comando"
@@ -1817,6 +1836,10 @@ msgstr "Contraseña por defecto"
 msgid "Default privileges"
 msgstr "Privilegios por defecto"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1839,6 +1862,10 @@ msgstr ""
 "Define la distancia máxima de envío de jugadores, en bloques (0 = sin "
 "límite)."
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Demora para mostrar información sobre herramientas, en milisegundos."
@@ -1871,15 +1898,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr "Desincronizar animación de bloques"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-"Datos detallados de perfilación de mod. Útil para desarrolladores de mods."
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "Perfilador detallado de los mods"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2038,6 +2056,14 @@ msgstr ""
 "Habilita mapeado de oclusión de paralaje.\n"
 "Requiere habilitar sombreadores."
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2102,10 +2128,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "Campo visual"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Campo visual"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Campo visual en grados."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Movimiento rápido (por medio de tecla de \"Uso\").\n"
+"Requiere privilegio \"fast\" (rápido) en el servidor."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2253,6 +2293,10 @@ msgstr "General"
 msgid "Generate normalmaps"
 msgstr "Generar mapas normales"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2294,6 +2338,15 @@ msgstr ""
 "- error: Cancela en el uso de llamadas obsoletas (sugerido para los "
 "desarrolladores de Mods)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "Componente de altura del tamaño inicial de la ventana."
@@ -2322,15 +2375,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr "Cantidad de bloques que flotan simultáneamente en todo el servidor."
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr "Cantidad de bloques que flotan simultáneamente por cliente."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2429,6 +2473,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2464,7 +2542,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2629,6 +2707,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2666,7 +2751,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2816,6 +2901,22 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Intervalo de modificador de bloques activos"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3255,6 +3356,15 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "Cantidad de bloques que flotan simultáneamente por cliente."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3296,6 +3406,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3303,11 +3417,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3318,10 +3432,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Menús"
@@ -3363,10 +3473,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mapeado de relieve"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3577,12 +3683,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3590,7 +3702,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3624,6 +3736,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Ruta de fuentes"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Tecla derecha"
@@ -3784,7 +3901,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3901,10 +4018,22 @@ msgstr "Ruta de la textura"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -4049,10 +4178,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Útil para los desarrolladores de mods."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4182,7 +4307,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4282,44 +4407,59 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "Tiempo de espera de cURL"
 
-#~ msgid "No of course not!"
-#~ msgstr "¡No, claro que no!"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Precarga de las texturas del inventario"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista de servidores públicos"
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Factor de escala aplicado a los elementos del menú: "
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generar mapas normales"
+#~ msgid "Touch free target"
+#~ msgstr "Tocar para interactuar"
 
-#~ msgid "No!!!"
-#~ msgstr "¡¡¡No!!!"
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
 
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Desactivar paquete"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Activado"
-
-#~ msgid "Rendering:"
-#~ msgstr "Renderizado:"
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
 
 #~ msgid "Restart minetest for driver change to take effect"
 #~ msgstr ""
 #~ "Reinicia minetest para que los cambios en el controlador tengan efecto"
 
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
+#~ msgid "Rendering:"
+#~ msgstr "Renderizado:"
 
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Activado"
 
-#~ msgid "Touch free target"
-#~ msgstr "Tocar para interactuar"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Desactivar paquete"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Factor de escala aplicado a los elementos del menú: "
+#~ msgid "No!!!"
+#~ msgstr "¡¡¡No!!!"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "Precarga de las texturas del inventario"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generar mapas normales"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista de servidores públicos"
+
+#~ msgid "No of course not!"
+#~ msgstr "¡No, claro que no!"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Útil para los desarrolladores de mods."
+
+#~ msgid ""
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr "Cantidad de bloques que flotan simultáneamente en todo el servidor."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Perfilador detallado de los mods"
+
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr ""
+#~ "Datos detallados de perfilación de mod. Útil para desarrolladores de mods."
diff --git a/po/et/minetest.po b/po/et/minetest.po
index 9973568c5..c17658374 100644
--- a/po/et/minetest.po
+++ b/po/et/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-04-09 13:53+0000\n"
 "Last-Translator: Jan Harald <kuus29@gmail.com>\n"
 "Language-Team: Estonian <https://hosted.weblate.org/projects/minetest/"
@@ -987,6 +987,10 @@ msgstr "Lülita läbi seinte minek sisse"
 msgid "Use"
 msgstr "Tegevus"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Suumi"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "Vajuta nuppu"
@@ -1303,10 +1307,6 @@ msgstr "X Nuppp 1"
 msgid "X Button 2"
 msgstr "X Nupp 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Suumi"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1373,6 +1373,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1448,6 +1452,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1483,6 +1491,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr "Mitmikmäng"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Bumpmapping"
@@ -1526,6 +1538,11 @@ msgstr "Vaheta nuppe"
 msgid "Chat toggle key"
 msgstr "Vaheta nuppe"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Käsklus"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1603,14 +1620,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1765,6 +1782,10 @@ msgstr "Uus parool"
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1781,6 +1802,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1811,14 +1836,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1958,6 +1975,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2018,10 +2043,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2158,6 +2193,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2192,6 +2231,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2219,15 +2267,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2323,6 +2362,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2359,7 +2432,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2525,6 +2598,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2562,7 +2642,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2713,6 +2793,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3155,6 +3250,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3196,6 +3299,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3203,11 +3310,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3218,10 +3325,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Menus"
@@ -3264,10 +3367,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Väga hea kvaliteet"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3472,12 +3571,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3485,7 +3590,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3520,6 +3625,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Vali"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Right key"
@@ -3685,7 +3795,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3803,10 +3913,22 @@ msgstr "Vali graafika:"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3953,11 +4075,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Useful for mod developers."
-msgstr "Põhiline arendaja"
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4086,7 +4203,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4186,67 +4303,56 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Avalikud serverid"
-
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Lülita kõik välja"
+#~ msgid "Downloading"
+#~ msgstr "Alla"
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Sisse lülitatud"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Mäng"
-
-#~ msgid "GAMES"
-#~ msgstr "MÄNGUD"
-
-#~ msgid "new game"
-#~ msgstr "uus mängu"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MUUDA MÄNGU"
-
-#, fuzzy
-#~ msgid "Remove selected mod"
-#~ msgstr "Eemalda valitud muutus"
-
-#, fuzzy
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Lisama muutus"
-
-#~ msgid "Name"
-#~ msgstr "Nimi"
-
-#~ msgid "Password"
-#~ msgstr "Parool"
-
-#~ msgid "SETTINGS"
-#~ msgstr "Seaded"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Lae asjade visuaale"
-
-#, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Löppev vedelik"
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
+#~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
-#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n"
-#~ "Need lülitatakse sisse kohe pärast sätete salvestamist."
+#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut "
+#~ "asja"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n"
-#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon."
+#~ msgid "is required by:"
+#~ msgstr "Seda vajavad:"
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguratsioon salvestatud. "
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Hoiatus: Konfiguratsioon pole kindel."
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti"
+
+#~ msgid "Show Public"
+#~ msgstr "Näita avalikke"
+
+#~ msgid "Show Favorites"
+#~ msgstr "Näita lemmikuid"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit."
+
+#~ msgid "Create world"
+#~ msgstr "Loo maailm"
+
+#~ msgid "Address required."
+#~ msgstr "IP on vajalkik."
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Failid mida kustutada"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4273,53 +4379,68 @@ msgstr ""
 #~ "- ESC: Menüü\n"
 #~ "- T: Jututupa\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Failid mida kustutada"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud"
-
-#~ msgid "Address required."
-#~ msgstr "IP on vajalkik."
-
-#~ msgid "Create world"
-#~ msgstr "Loo maailm"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Näita lemmikuid"
-
-#~ msgid "Show Public"
-#~ msgstr "Näita avalikke"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Hoiatus: Konfiguratsioon pole kindel."
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguratsioon salvestatud. "
-
-#~ msgid "is required by:"
-#~ msgstr "Seda vajavad:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
 #~ msgstr ""
-#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut "
-#~ "asja"
+#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n"
+#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon."
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n"
+#~ "Need lülitatakse sisse kohe pärast sätete salvestamist."
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Alla"
+#~ msgid "Finite Liquid"
+#~ msgstr "Löppev vedelik"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Lae asjade visuaale"
+
+#~ msgid "SETTINGS"
+#~ msgstr "Seaded"
+
+#~ msgid "Password"
+#~ msgstr "Parool"
+
+#~ msgid "Name"
+#~ msgstr "Nimi"
+
+#, fuzzy
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Lisama muutus"
+
+#, fuzzy
+#~ msgid "Remove selected mod"
+#~ msgstr "Eemalda valitud muutus"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MUUDA MÄNGU"
+
+#~ msgid "new game"
+#~ msgstr "uus mängu"
+
+#~ msgid "GAMES"
+#~ msgstr "MÄNGUD"
+
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Mäng"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Sisse lülitatud"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Lülita kõik välja"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Avalikud serverid"
+
+#, fuzzy
+#~ msgid "Useful for mod developers."
+#~ msgstr "Põhiline arendaja"
diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index d2d6b159c..bb4f02255 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-07-13 16:41+0000\n"
 "Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
-"Language-Team: French "
-"<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/minetest/minetest/"
+"fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -976,6 +976,10 @@ msgstr "Mode sans collision"
 msgid "Use"
 msgstr "Utiliser"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoomer"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "appuyez sur une touche"
@@ -1292,10 +1296,6 @@ msgstr "Bouton X 1"
 msgid "X Button 2"
 msgstr "Bouton X 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoomer"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1304,8 +1304,8 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"(X,Y,Z) décalage de fractale à partir du centre du monde en unités \"d'"
-"échelle\".\n"
+"(X,Y,Z) décalage de fractale à partir du centre du monde en unités "
+"\"d'échelle\".\n"
 "Utilisé pour déplacer une zone de frai convenable dans les basses terres à "
 "proximité de (0, 0).\n"
 "La valeur par défaut est adaptée pour les réglages de Mandelbrot, elle doit "
@@ -1384,6 +1384,11 @@ msgstr "intervalle de gestion des blocs actifs"
 msgid "Active Block Modifier interval"
 msgstr "Intervalle du modificateur de bloc actif"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Intervalle du modificateur de bloc actif"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Portée des mapblocks actifs"
@@ -1467,6 +1472,10 @@ msgid "Automaticaly report to the serverlist."
 msgstr ""
 "Déclarer automatiquement votre serveur à la liste des serveurs publics."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Reculer"
@@ -1499,6 +1508,10 @@ msgstr "Bits par pixel (profondeur de couleur) en mode plein-écran."
 msgid "Build inside player"
 msgstr "Placement de bloc à la position du joueur"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Bump mapping"
@@ -1539,6 +1552,11 @@ msgstr "Chatter"
 msgid "Chat toggle key"
 msgstr "Afficher le chat"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Commande"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1629,6 +1647,17 @@ msgstr "Nuages dans le menu"
 msgid "Colored fog"
 msgstr "Brume colorée"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Liste séparée par des virgules des mods de confiance qui sont autorisés à "
+"accéder\n"
+"aux API HTTP, leur permettant d'envoyer et de télécharger des données vers/"
+"depuis Internet."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1639,16 +1668,6 @@ msgstr ""
 "sécurisées même lorsque l'option de sécurisation des mods est activée (via "
 "request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Liste séparée par des virgules des mods de confiance qui sont autorisés à "
-"accéder\n"
-"aux API HTTP, leur permettant d'envoyer et de télécharger des données vers/"
-"depuis Internet."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Commande"
@@ -1806,6 +1825,10 @@ msgstr "Mot de passe par défaut"
 msgid "Default privileges"
 msgstr "Privilèges par défaut"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1828,6 +1851,10 @@ msgstr ""
 "Détermine la distance maximale de transfert du joueur en mapblocks (0 = "
 "illimité)."
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Latence d'apparition des infobulles, établie en millisecondes."
@@ -1858,15 +1885,6 @@ msgstr "Description du serveur affichée sur la liste des serveurs."
 msgid "Desynchronize block animation"
 msgstr "Désynchroniser les textures animées par mapblock"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-"Profil détaillé des données du mod. Utile pour les développeurs de mods."
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "Profil détaillé des mods"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2032,6 +2050,15 @@ msgstr ""
 "Active l'occlusion parallaxe.\n"
 "Nécessite les shaders pour être activé."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Engine profiling data print interval"
+msgstr "Délais d'intervale du profilage"
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2096,10 +2123,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "Champ de vision"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Champ de vision"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Champ de vision en degrés."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Mouvement rapide (via la touche utiliser).\n"
+"Nécessite le privilège \"fast\" sur un serveur."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2249,6 +2290,10 @@ msgstr "Général"
 msgid "Generate normalmaps"
 msgstr "Normal mapping"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2297,6 +2342,15 @@ msgstr ""
 "- error : interruption à l'usage d'un appel obsolète (recommandé pour les "
 "développeurs de mods)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "Résolution verticale de la fenêtre de jeu."
@@ -2327,15 +2381,6 @@ msgstr ""
 "en mapblocks (16^3 blocs).\n"
 "Les mapblocks actifs sont chargés et les ABMs y sont actifs."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr "Nombre maximum de mapblocks simultanés envoyés sur le serveur."
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr "Nombre maximum de mapblocks simultanés envoyés par client."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2453,6 +2498,40 @@ msgstr "Opacité de fond de la console du jeu (entre 0 et 255)."
 msgid "In-game chat console background color (R,G,B)."
 msgstr "Couleur de fond de la console du jeu (R,G,B)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2492,7 +2571,8 @@ msgstr ""
 "Contrôle la quantité de détails fins."
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+#, fuzzy
+msgid "Joystick button repetition interval"
 msgstr "Intervalle de répétition du clic droit"
 
 #: src/settings_translation_file.cpp
@@ -2720,6 +2800,17 @@ msgstr ""
 "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Touche pour passer en mode rapide.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2771,8 +2862,9 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2962,6 +3054,22 @@ msgstr "Intervalle de mise-à-jour des liquides en secondes."
 msgid "Liquid update tick"
 msgstr "Intervalle de mise-à-jour des liquides"
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Intervalle du modificateur de bloc actif"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr "Gestionnaire de jeux du menu"
@@ -3411,6 +3519,16 @@ msgstr "Mapblocks maximum chargés de force"
 msgid "Maximum hotbar width"
 msgstr "Largeur maximale de la barre d'inventaire"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr "Nombre maximal de joueurs qui peuvent être connectés en même temps."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "Nombre maximum de mapblocks qui peuvent être listés pour chargement."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr "Nombre maximum de mapblocks qui peuvent être listés pour chargement."
@@ -3464,6 +3582,11 @@ msgstr "Nombre maximal de joueurs qui peuvent être connectés en même temps."
 msgid "Maximum number of statically stored objects in a block."
 msgstr "Nombre maximum d'objets sauvegardés dans un mapblock (16^3 blocs)."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum objects per block"
+msgstr "Nombre maximum d'objets par mapblock"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3473,11 +3596,13 @@ msgstr ""
 "Utile quand il y a quelque chose à afficher à gauche ou à droite de la barre."
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+#, fuzzy
+msgid "Maximum simultaneous block sends per client"
 msgstr "Nombre maximum de mapblocks simultanés envoyés par client"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+#, fuzzy
+msgid "Maximum simultaneous block sends total"
 msgstr "Nombre maximum total de mapblocks simultanés envoyés"
 
 #: src/settings_translation_file.cpp
@@ -3490,10 +3615,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr "Joueurs maximum"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr "Nombre maximum d'objets par mapblock"
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Menus"
@@ -3534,10 +3655,6 @@ msgstr "Taille minimum des textures à filtrer"
 msgid "Mipmapping"
 msgstr "Mip-mapping"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr "Profilage des mods"
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr "URL des détails du magasin de mods"
@@ -3777,25 +3894,34 @@ msgstr ""
 "système)."
 
 #: src/settings_translation_file.cpp
-msgid "Privileges that players with basic_privs can grant"
-msgstr ""
-"Les privilèges que les joueurs ayant le privilège basic_privs peuvent "
-"accorder"
-
-#: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+#, fuzzy
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
 msgstr ""
 "Délais d’intervalle d'affichage du profilage des données. 0 = "
 "désactivation.\n"
 "Utile pour les développeurs."
 
+#: src/settings_translation_file.cpp
+msgid "Privileges that players with basic_privs can grant"
+msgstr ""
+"Les privilèges que les joueurs ayant le privilège basic_privs peuvent "
+"accorder"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Profiler"
+msgstr "Profil des vallées"
+
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "Profilage"
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr "Délais d'intervale du profilage"
+#, fuzzy
+msgid "Profiling"
+msgstr "Profilage des mods"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3831,6 +3957,11 @@ msgstr "Port distant"
 msgid "Replaces the default main menu with a custom one."
 msgstr "Remplace le menu par défaut par un menu personnalisé."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Chemin du fichier de police"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Droite"
@@ -4005,8 +4136,9 @@ msgstr ""
 "Nécessite les shaders pour être activé."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -4139,10 +4271,22 @@ msgstr "Chemin des textures"
 msgid "The altitude at which temperature drops by 20C"
 msgstr "L'altitude à laquelle la température descend de 20°C"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr "La profondeur de la terre ou autre matériau"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "L'interface réseau que le serveur écoute."
@@ -4319,10 +4463,6 @@ msgstr "Utilisation du mip-mapping. Peut impacter les performances."
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Utilisation du filtrage trilinéaire."
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Utile pour les développeurs de mods."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr "Synchronisation verticale"
@@ -4454,11 +4594,12 @@ msgstr ""
 "par le matériel (ex.: textures des blocs dans l'inventaire)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 "Quand gui_scaling_filter_txr2img est activé, cela copie les images depuis\n"
 "votre matériel vers Minetest pour mise à l'échelle. Si désactivé, retour à "
@@ -4602,132 +4743,268 @@ msgstr "Limite parallèle de cURL"
 msgid "cURL timeout"
 msgstr "Délais d'interruption de cURL"
 
-#~ msgid "No of course not!"
-#~ msgstr "Non, bien sûr que non !"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Liste de serveurs publics"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normal Mapping"
-
-#~ msgid "No!!!"
-#~ msgstr "Non !"
-
-#, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Attributs généraux de la génération de terrain.\n"
-#~ "Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent "
-#~ "leurs valeurs par défaut."
-
-#~ msgid "\""
-#~ msgstr "\""
-
-#~ msgid "Enable a bit lower water surface, so it doesn't "
-#~ msgstr ""
-#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas "
-#~ "le bloc complètement.\n"
-#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux "
-#~ "ne fonctionne pas dessus. "
-
-#~ msgid "If disabled "
-#~ msgstr "Si désactivé "
-
-#~ msgid "If enabled, "
-#~ msgstr "Si activé, "
-
-#~ msgid "Rendering:"
-#~ msgstr "Affichage :"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet"
-
-#~ msgid "Game Name"
-#~ msgstr "Nom du jeu"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\""
-
-#~ msgid "GAMES"
-#~ msgstr "JEUX"
-
-#~ msgid "Mods:"
-#~ msgstr "Mods :"
-
-#~ msgid "new game"
-#~ msgstr "nouveau jeu"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MODIFIER LE JEU"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Supprimer le mod sélectionné"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Ajouter un mod"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "START SERVER"
-#~ msgstr "DÉMARRER LE SERVEUR"
-
-#~ msgid "Name"
-#~ msgstr "Nom"
-
-#~ msgid "Password"
-#~ msgstr "Mot de passe"
-
-#~ msgid "SETTINGS"
-#~ msgstr "PARAMÈTRES"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Précharger les objets"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Liquides limités"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "PARTIE SOLO"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACKS DE TEXTURES"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "Add mod:"
-#~ msgstr "Ajouter un mod :"
-
-#~ msgid "Local install"
-#~ msgstr "Installation locale"
+#~ "Attributs de terrain spécifiques au générateur de carte plate.\n"
+#~ "Lacs et collines peuvent partiellement être ajoutés à un monde plat.\n"
+#~ "Aucun drapeau par défaut défini dans le moteur.\n"
+#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
+#~ "Les drapeaux qui ne sont pas spécifiés dans le champ gardent leurs "
+#~ "valeurs par défaut.\n"
+#~ "Les drapeaux commençant par \"non\" sont désactivés."
 
 #~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Attention : certains mods ne sont pas encore configurés.\n"
-#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. "
+#~ "Attributs spécifiques à Mapgen V7.\n"
+#~ "Le drapeau 'des crêtes' contrôle les rivières.\n"
+#~ "Les drapeaux par défaut définis dans le moteur sont: montagnes, crêtes.\n"
+#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
+#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
+#~ "par défaut.\n"
+#~ "Les drapeaux commençant par \"non\" sont désactivés."
+
+#~ msgid "Item textures..."
+#~ msgstr "Textures d'items..."
 
 #~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
 #~ msgstr ""
-#~ "Attention : certains mods configurés sont introuvables.\n"
-#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. "
+#~ "Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne "
+#~ "submerge pas\n"
+#~ "entièrement le bloc voisin.\n"
+#~ "Cette fonctionnalité est encore expérimentale et la lumière douce "
+#~ "n’apparaît pas à la\n"
+#~ "surface de l'eau."
 
-#~ msgid "Delete map"
-#~ msgstr "Supprimer la carte"
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr ""
+#~ "Active l'éclairage des blocs pointés (et supprime les bordures noires de "
+#~ "sélection)."
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n"
+#~ "La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler "
+#~ "en nombre de blocs."
+
+#~ msgid ""
+#~ "Julia set: W value determining the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Série Julia : valeur W déterminant la forme 4D.\n"
+#~ "La portée est environ entre -2 et 2."
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Touche pour réduire la distance de vue. Modifie la distance de vue "
+#~ "minimale.\n"
+#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Touche pour augmenter la distance de vue. Modifie la distance de vue "
+#~ "minimale.\n"
+#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n"
+#~ "La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler "
+#~ "en nombre de blocs."
+
+#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+#~ msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs."
+
+#~ msgid ""
+#~ "Mandelbrot set: Iterations of the recursive function.\n"
+#~ "Controls scale of finest detail."
+#~ msgstr ""
+#~ "Série Mandelbrot : itérations de la fonction récursive.\n"
+#~ "Contrôle l'échelle du détail le plus subtil."
+
+#~ msgid ""
+#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n"
+#~ "La portée est environ entre -2 et 2."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen fractal.\n"
+#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with \"no\" are used to explicitly disable them."
+#~ msgstr ""
+#~ "Attributs de terrain spécifiques à Mapgen V7.\n"
+#~ "'ridges' sont les rivières.\n"
+#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
+#~ "par défaut.\n"
+#~ "Les drapeaux commençant par \"non\" sont désactivés."
+
+#~ msgid "Mapgen fractal mandelbrot iterations"
+#~ msgstr "Mapgen Mandelbrot : itérations fractales"
+
+#~ msgid "Mapgen fractal mandelbrot offset"
+#~ msgstr "Mapgen Mandelbrot : décalages fractals"
+
+#~ msgid "Mapgen fractal mandelbrot scale"
+#~ msgstr "Mapgen Mandelbrot : échelles fractales"
+
+#~ msgid "Mapgen fractal mandelbrot slice w"
+#~ msgstr "Mapgen Mandelbrot : couche fractale W"
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n"
+#~ "Des valeurs plus grandes aboutissent à des locations plus proches de (x = "
+#~ "0, z = 0).\n"
+#~ "Des valeurs plus petites peut résulter à une location de spawn non-"
+#~ "trouvée, résultant\n"
+#~ "à une location située à (0, 0, 0) probablement enterrée sous le sol."
+
+#~ msgid ""
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Images par seconde (FPS) minimum.\n"
+#~ "Le niveau de rendu est dynamiquement adapté selon ce paramètre et la "
+#~ "distance de vue (minimale et maximale)."
+
+#~ msgid "New style water"
+#~ msgstr "Nouveau style de liquide"
+
+#~ msgid ""
+#~ "Pre-generate all item visuals used in the inventory.\n"
+#~ "This increases startup time, but runs smoother in-game.\n"
+#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
+#~ "the inventory."
+#~ msgstr ""
+#~ "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n"
+#~ "Cela augmente le temps de démarrage, mais rend les inventaires plus "
+#~ "fluides.\n"
+#~ "Les textures générées peuvent facilement déborder votre VRAM, causant des "
+#~ "bugs dans votre inventaire."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Pré-chargement des textures d'inventaire"
+
+#~ msgid ""
+#~ "The allowed adjustment range for the automatic rendering range "
+#~ "adjustment.\n"
+#~ "Set this to be equal to viewing range minimum to disable the auto-"
+#~ "adjustment algorithm."
+#~ msgstr ""
+#~ "Distance d'affichage maximum.\n"
+#~ "Définir cette valeur égale à la distance de vue minimum pour désactiver\n"
+#~ "l'auto-ajustement dynamique de la distance d'affichage."
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Largeur initiale de la fenêtre de jeu."
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Portée verticale du spawn"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Distance de vue minimum"
+
+#~ msgid "Wanted FPS"
+#~ msgstr "FPS minimum"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Taille appliquée aux menus : "
+
+#~ msgid "Downloading"
+#~ msgstr "Téléchargement"
+
+#~ msgid " KB/s"
+#~ msgstr " Ko/s"
+
+#~ msgid " MB/s"
+#~ msgstr " Mo/s"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr ""
+#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet"
+
+#~ msgid "is required by:"
+#~ msgstr "est requis par :"
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Configuration enregistrée. "
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Attention : configuration incorrecte. "
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr ""
+#~ "Impossible de créer le monde : le nom contient des caractères invalides"
+
+#~ msgid "Show Public"
+#~ msgstr "Voir les serveurs publics"
+
+#~ msgid "Show Favorites"
+#~ msgstr "Voir les serveurs favoris"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Laisser l'adresse vide pour lancer un serveur local."
+
+#~ msgid "Create world"
+#~ msgstr "Créer un monde"
+
+#~ msgid "Address required."
+#~ msgstr "Adresse requise."
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Fichiers à supprimer"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Impossible de configurer ce monde : aucune sélection active"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4754,265 +5031,147 @@ msgstr "Délais d'interruption de cURL"
 #~ "- Échap : ce menu\n"
 #~ "- T : discuter\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Impossible de configurer ce monde : aucune sélection active"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Fichiers à supprimer"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné"
-
-#~ msgid "Address required."
-#~ msgstr "Adresse requise."
-
-#~ msgid "Create world"
-#~ msgstr "Créer un monde"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Laisser l'adresse vide pour lancer un serveur local."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Voir les serveurs favoris"
-
-#~ msgid "Show Public"
-#~ msgstr "Voir les serveurs publics"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr ""
-#~ "Impossible de créer le monde : le nom contient des caractères invalides"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Attention : configuration incorrecte. "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Configuration enregistrée. "
-
-#~ msgid "is required by:"
-#~ msgstr "est requis par :"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr ""
-#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet"
-
-#~ msgid " MB/s"
-#~ msgstr " Mo/s"
-
-#~ msgid " KB/s"
-#~ msgstr " Ko/s"
-
-#~ msgid "Downloading"
-#~ msgstr "Téléchargement"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Taille appliquée aux menus : "
-
-#~ msgid "Wanted FPS"
-#~ msgstr "FPS minimum"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Distance de vue minimum"
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Portée verticale du spawn"
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Largeur initiale de la fenêtre de jeu."
+#~ msgid "Delete map"
+#~ msgstr "Supprimer la carte"
 
 #~ msgid ""
-#~ "The allowed adjustment range for the automatic rendering range "
-#~ "adjustment.\n"
-#~ "Set this to be equal to viewing range minimum to disable the auto-"
-#~ "adjustment algorithm."
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
 #~ msgstr ""
-#~ "Distance d'affichage maximum.\n"
-#~ "Définir cette valeur égale à la distance de vue minimum pour désactiver\n"
-#~ "l'auto-ajustement dynamique de la distance d'affichage."
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Pré-chargement des textures d'inventaire"
+#~ "Attention : certains mods configurés sont introuvables.\n"
+#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. "
 
 #~ msgid ""
-#~ "Pre-generate all item visuals used in the inventory.\n"
-#~ "This increases startup time, but runs smoother in-game.\n"
-#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
-#~ "the inventory."
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n"
-#~ "Cela augmente le temps de démarrage, mais rend les inventaires plus "
-#~ "fluides.\n"
-#~ "Les textures générées peuvent facilement déborder votre VRAM, causant des "
-#~ "bugs dans votre inventaire."
+#~ "Attention : certains mods ne sont pas encore configurés.\n"
+#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. "
 
-#~ msgid "New style water"
-#~ msgstr "Nouveau style de liquide"
+#~ msgid "Local install"
+#~ msgstr "Installation locale"
 
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
+#~ msgid "Add mod:"
+#~ msgstr "Ajouter un mod :"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACKS DE TEXTURES"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "PARTIE SOLO"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Liquides limités"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Précharger les objets"
+
+#~ msgid "SETTINGS"
+#~ msgstr "PARAMÈTRES"
+
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "START SERVER"
+#~ msgstr "DÉMARRER LE SERVEUR"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Ajouter un mod"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Supprimer le mod sélectionné"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MODIFIER LE JEU"
+
+#~ msgid "new game"
+#~ msgstr "nouveau jeu"
+
+#~ msgid "Mods:"
+#~ msgstr "Mods :"
+
+#~ msgid "GAMES"
+#~ msgstr "JEUX"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\""
+
+#~ msgid "Game Name"
+#~ msgstr "Nom du jeu"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet"
+
+#~ msgid "Rendering:"
+#~ msgstr "Affichage :"
+
+#~ msgid "If enabled, "
+#~ msgstr "Si activé, "
+
+#~ msgid "If disabled "
+#~ msgstr "Si désactivé "
+
+#~ msgid "Enable a bit lower water surface, so it doesn't "
 #~ msgstr ""
-#~ "Images par seconde (FPS) minimum.\n"
-#~ "Le niveau de rendu est dynamiquement adapté selon ce paramètre et la "
-#~ "distance de vue (minimale et maximale)."
+#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas "
+#~ "le bloc complètement.\n"
+#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux "
+#~ "ne fonctionne pas dessus. "
 
+#~ msgid "\""
+#~ msgstr "\""
+
+#, fuzzy
 #~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n"
-#~ "Des valeurs plus grandes aboutissent à des locations plus proches de (x = "
-#~ "0, z = 0).\n"
-#~ "Des valeurs plus petites peut résulter à une location de spawn non-"
-#~ "trouvée, résultant\n"
-#~ "à une location située à (0, 0, 0) probablement enterrée sous le sol."
-
-#~ msgid "Mapgen fractal mandelbrot slice w"
-#~ msgstr "Mapgen Mandelbrot : couche fractale W"
-
-#~ msgid "Mapgen fractal mandelbrot scale"
-#~ msgstr "Mapgen Mandelbrot : échelles fractales"
-
-#~ msgid "Mapgen fractal mandelbrot offset"
-#~ msgstr "Mapgen Mandelbrot : décalages fractals"
-
-#~ msgid "Mapgen fractal mandelbrot iterations"
-#~ msgstr "Mapgen Mandelbrot : itérations fractales"
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen fractal.\n"
-#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Attributs de terrain spécifiques à Mapgen V7.\n"
-#~ "'ridges' sont les rivières.\n"
-#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
-#~ "par défaut.\n"
-#~ "Les drapeaux commençant par \"non\" sont désactivés."
+#~ "Attributs généraux de la génération de terrain.\n"
+#~ "Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent "
+#~ "leurs valeurs par défaut."
+
+#~ msgid "No!!!"
+#~ msgstr "Non !"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normal Mapping"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Liste de serveurs publics"
+
+#~ msgid "No of course not!"
+#~ msgstr "Non, bien sûr que non !"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Utile pour les développeurs de mods."
+
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "Nombre maximum de mapblocks simultanés envoyés par client."
 
 #~ msgid ""
-#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
-#~ "Range roughly -2 to 2."
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr "Nombre maximum de mapblocks simultanés envoyés sur le serveur."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Profil détaillé des mods"
+
+#~ msgid "Detailed mod profile data. Useful for mod developers."
 #~ msgstr ""
-#~ "Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n"
-#~ "La portée est environ entre -2 et 2."
-
-#~ msgid ""
-#~ "Mandelbrot set: Iterations of the recursive function.\n"
-#~ "Controls scale of finest detail."
-#~ msgstr ""
-#~ "Série Mandelbrot : itérations de la fonction récursive.\n"
-#~ "Contrôle l'échelle du détail le plus subtil."
-
-#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
-#~ msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs."
-
-#~ msgid ""
-#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n"
-#~ "La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler "
-#~ "en nombre de blocs."
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Touche pour augmenter la distance de vue. Modifie la distance de vue "
-#~ "minimale.\n"
-#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Touche pour réduire la distance de vue. Modifie la distance de vue "
-#~ "minimale.\n"
-#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Julia set: W value determining the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Série Julia : valeur W déterminant la forme 4D.\n"
-#~ "La portée est environ entre -2 et 2."
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n"
-#~ "La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler "
-#~ "en nombre de blocs."
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr ""
-#~ "Active l'éclairage des blocs pointés (et supprime les bordures noires de "
-#~ "sélection)."
-
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne "
-#~ "submerge pas\n"
-#~ "entièrement le bloc voisin.\n"
-#~ "Cette fonctionnalité est encore expérimentale et la lumière douce "
-#~ "n’apparaît pas à la\n"
-#~ "surface de l'eau."
-
-#~ msgid "Item textures..."
-#~ msgstr "Textures d'items..."
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "Attributs spécifiques à Mapgen V7.\n"
-#~ "Le drapeau 'des crêtes' contrôle les rivières.\n"
-#~ "Les drapeaux par défaut définis dans le moteur sont: montagnes, crêtes.\n"
-#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
-#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
-#~ "par défaut.\n"
-#~ "Les drapeaux commençant par \"non\" sont désactivés."
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "Attributs de terrain spécifiques au générateur de carte plate.\n"
-#~ "Lacs et collines peuvent partiellement être ajoutés à un monde plat.\n"
-#~ "Aucun drapeau par défaut défini dans le moteur.\n"
-#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
-#~ "Les drapeaux qui ne sont pas spécifiés dans le champ gardent leurs "
-#~ "valeurs par défaut.\n"
-#~ "Les drapeaux commençant par \"non\" sont désactivés."
+#~ "Profil détaillé des données du mod. Utile pour les développeurs de mods."
diff --git a/po/he/minetest.po b/po/he/minetest.po
index 0a10da50d..6e238bbeb 100644
--- a/po/he/minetest.po
+++ b/po/he/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-05-26 21:01+0000\n"
 "Last-Translator: yuval hreman <huckvrni@gmail.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -943,6 +943,10 @@ msgstr ""
 msgid "Use"
 msgstr ""
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr ""
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr ""
@@ -1259,10 +1263,6 @@ msgstr ""
 msgid "X Button 2"
 msgstr ""
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1328,6 +1328,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1402,6 +1406,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr ""
@@ -1434,6 +1442,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr ""
@@ -1474,6 +1486,10 @@ msgstr ""
 msgid "Chat toggle key"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Chatcommands"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1547,14 +1563,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1700,6 +1716,10 @@ msgstr ""
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1716,6 +1736,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1746,14 +1770,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1888,6 +1904,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -1948,10 +1972,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2086,6 +2120,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2121,6 +2159,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2148,15 +2195,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2251,6 +2289,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2286,7 +2358,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2451,6 +2523,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2488,7 +2567,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2638,6 +2717,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3056,6 +3150,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3097,6 +3199,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3104,11 +3210,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3119,10 +3225,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr ""
@@ -3163,10 +3265,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3371,12 +3469,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3384,7 +3488,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3418,6 +3522,10 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr ""
@@ -3576,7 +3684,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3691,10 +3799,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3839,10 +3959,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -3969,7 +4085,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4069,8 +4185,8 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "לא ברור שלא!"
-
 #~ msgid "Public Serverlist"
 #~ msgstr "רשימת שרתים פומבי"
+
+#~ msgid "No of course not!"
+#~ msgstr "לא ברור שלא!"
diff --git a/po/hu/minetest.po b/po/hu/minetest.po
index 7af585181..6534266c0 100644
--- a/po/hu/minetest.po
+++ b/po/hu/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-05-07 03:17+0000\n"
 "Last-Translator: Kisbenedek Márton <martonkisbenedek@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/minetest/"
@@ -980,6 +980,10 @@ msgstr "Váltás noclip-re"
 msgid "Use"
 msgstr "Használat"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Nagyítás"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "Nyomj meg egy gombot"
@@ -1307,10 +1311,6 @@ msgstr "X gomb 1"
 msgid "X Button 2"
 msgstr "X Gomb 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Nagyítás"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1389,6 +1389,11 @@ msgstr "Aktív blokk kezelés időköze"
 msgid "Active Block Modifier interval"
 msgstr "Aktív blokk módosító időköze"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Aktív blokk módosító időköze"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Aktív blokk kiterjedési terület"
@@ -1473,6 +1478,10 @@ msgstr "Összeomlás után újracsatlakozás kérése"
 msgid "Automaticaly report to the serverlist."
 msgstr "Automatikus bejelentés a szerverlistára."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Vissza gomb"
@@ -1506,6 +1515,10 @@ msgstr "Bit/pixel (vagyis színmélység) teljes képernyős módban."
 msgid "Build inside player"
 msgstr "Építés játékos helyére"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Bumpmapping"
@@ -1547,6 +1560,11 @@ msgstr "Csevegés gomb"
 msgid "Chat toggle key"
 msgstr "Csevegés váltás gomb"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Parancs"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1618,6 +1636,16 @@ msgstr "Felhők a menüben"
 msgid "Colored fog"
 msgstr "Színezett köd"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Modok vesszővel elválasztott listája, melyeknek engedélyezett HTTP API-k "
+"elérése, amik\n"
+"lehetővé teszik, hogy feltöltsenek és letöltsenek adatokat a netről/netre."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1628,15 +1656,6 @@ msgstr ""
 "funkcióik még a mod biztonság bekapcsolása esetén is "
 "(request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Modok vesszővel elválasztott listája, melyeknek engedélyezett HTTP API-k "
-"elérése, amik\n"
-"lehetővé teszik, hogy feltöltsenek és letöltsenek adatokat a netről/netre."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Parancs gomb"
@@ -1794,6 +1813,10 @@ msgstr "Alapértelmezett jelszó"
 msgid "Default privileges"
 msgstr "Alap jogosultságok"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1810,6 +1833,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Eszköztippek megjelenítésének késleltetése, ezredmásodpercben megadva."
@@ -1842,14 +1869,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr "Részletes mod profil adat. Mod fejlesztőknek hasznos."
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2000,6 +2019,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2064,10 +2091,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "Látótávolság"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Látótávolság"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Látóterület fokokban."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Gyors mozgás (a használat gombbal).\n"
+"Szükséges hozzá a \"fast\" (gyorsaság) jogosultság a szerveren."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2210,6 +2251,10 @@ msgstr "Általános"
 msgid "Generate normalmaps"
 msgstr "Normálfelületek generálása"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2252,6 +2297,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "A kezdeti ablak méret magasság összetevője."
@@ -2279,15 +2333,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2405,6 +2450,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr "Játékon belüli csevegő konzol hátterének színe (R,G,B)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2442,7 +2521,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr "Jobb kattintás ismétlés időköz"
 
 #: src/settings_translation_file.cpp
@@ -2658,6 +2737,17 @@ msgstr ""
 "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Gomb a gyors (fast) módra váltáshoz.\n"
+"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2709,8 +2799,9 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2883,6 +2974,22 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Aktív blokk módosító időköze"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr "Főmenü játék kezelő"
@@ -3341,6 +3448,16 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr "Maximum hotbar szélesség"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr "Az egy időben csatlakozó játékosok maximális száma."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "Maximum blokkok száma, amik sorban állhatnak betöltésre."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr "Maximum blokkok száma, amik sorban állhatnak betöltésre."
@@ -3388,6 +3505,11 @@ msgstr "Az egy időben csatlakozó játékosok maximális száma."
 msgid "Maximum number of statically stored objects in a block."
 msgstr "Statikusan tárolt objektumok maximális száma egy térképblokkban."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum objects per block"
+msgstr "Maximum objektum térképblokkonként"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3397,11 +3519,13 @@ msgstr ""
 "Hasznos, ha valamit el kell helyezni a hotbar jobb, vagy bal oldalán."
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+#, fuzzy
+msgid "Maximum simultaneous block sends per client"
 msgstr "Az egyidejűleg a kliensenként küldött térképblokkok maximális száma"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+#, fuzzy
+msgid "Maximum simultaneous block sends total"
 msgstr "Egyidejűleg küldött térképblokkok maximális száma összesen"
 
 #: src/settings_translation_file.cpp
@@ -3414,10 +3538,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr "Maximum felhasználók"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr "Maximum objektum térképblokkonként"
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Menük"
@@ -3459,10 +3579,6 @@ msgstr "Minimum textúra méret a szűrőknek"
 msgid "Mipmapping"
 msgstr "Mip-mapping"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr "Mod áruház részletek URL"
@@ -3684,12 +3800,18 @@ msgstr ""
 "Annak megelőzése, hogy a modok nem biztonágos dolgokat futtassanak, pl. "
 "shell parancsok."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr "Jogosultságok, amiket a basic_privs adhat a játékosoknak"
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3697,7 +3819,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3731,6 +3853,11 @@ msgstr "Távoli port"
 msgid "Replaces the default main menu with a custom one."
 msgstr "Az alapértelmezett főmenüt lecseréli egy másikkal."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Betűtípus helye"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Jobb gomb"
@@ -3905,8 +4032,9 @@ msgstr ""
 "A shaderek engedélyezése szükséges hozzá."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -4032,10 +4160,22 @@ msgstr "Textúrák útvonala"
 msgid "The altitude at which temperature drops by 20C"
 msgstr "A magasság, ahol a hőmérséklet 20 fokkal csökken"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -4199,10 +4339,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Trilineáris szűrés a textúrák méretezéséhez."
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Mod fejlesztőknek hasznos."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4331,7 +4467,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4444,17 +4580,170 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "Persze, hogy nem!"
+#~ msgid "Item textures..."
+#~ msgstr "Elem textúrák..."
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Nyilvános szerverlista"
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg "
+#~ "teljesen a blokkot.\n"
+#~ "Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n"
+#~ "így nem működik a víz felszínén."
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normálfelületek generálása"
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr ""
+#~ "Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a "
+#~ "kijelölődobozt)."
 
-#~ msgid "No!!!"
-#~ msgstr "Nem!!!"
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n"
+#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n"
+#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Maximum távolság a vízszinttől, ahol a játékosok újraéledhetnek/"
+#~ "megjelenhetnek csatlakozáskor (spawn).\n"
+#~ "Magasabb értékek közelebb visznek az (x = 0, z = 0)-hoz.\n"
+#~ "Alacsonyabb értékek azt eredményezhetik, hogy nem lesz megfelelő pont a "
+#~ "feléledéshez,\n"
+#~ "(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Minimum kívánt FPS.\n"
+#~ "A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a "
+#~ "látórerület min és max)."
+
+#~ msgid "New style water"
+#~ msgstr "Új stílusú víz"
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Eszköztár textúráinak előtöltése"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Függőleges kezdeti ablak méret."
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Az (újra)éledés függőleges irányú területe"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Minimum látóterület"
+
+#~ msgid "Wanted FPS"
+#~ msgstr "Kívánt FPS"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "A méretarány alkalmazva a menü elemekre: "
+
+#, fuzzy
+#~ msgid "Touch free target"
+#~ msgstr "Touch free target"
+
+#, fuzzy
+#~ msgid "Downloading"
+#~ msgstr "Le"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat"
+
+#~ msgid "is required by:"
+#~ msgstr "kell neki:"
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Beállítások mentve.  "
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Figyelem: A beállítások nem egyformák.  "
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak"
+
+#~ msgid "Show Public"
+#~ msgstr "Publikus mutatása"
+
+#~ msgid "Show Favorites"
+#~ msgstr "Kedvencek mutatása"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts."
+
+#~ msgid "Create world"
+#~ msgstr "Világ létrehozása"
+
+#~ msgid "Address required."
+#~ msgstr "Cím szükséges."
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Nem törölhető a világ: Nincs kiválasztva"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "A fájl törölve lett"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Hiba az összes világ törlése közben"
+
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Végtelen folyadék"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Előretöltött tárgy láthatóság"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Régi jelszó"
+
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Játék"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet"
+
+#~ msgid "Rendering:"
+#~ msgstr "Renderelés:"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Engedélyez"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Csomag letiltás"
 
 #, fuzzy
 #~ msgid ""
@@ -4478,167 +4767,20 @@ msgstr ""
 #~ "water would tend to pool. It may interfere with delicately adjusted "
 #~ "biomes."
 
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Csomag letiltás"
+#~ msgid "No!!!"
+#~ msgstr "Nem!!!"
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Engedélyez"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normálfelületek generálása"
 
-#~ msgid "Rendering:"
-#~ msgstr "Renderelés:"
+#~ msgid "Public Serverlist"
+#~ msgstr "Nyilvános szerverlista"
 
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet"
+#~ msgid "No of course not!"
+#~ msgstr "Persze, hogy nem!"
 
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Játék"
+#~ msgid "Useful for mod developers."
+#~ msgstr "Mod fejlesztőknek hasznos."
 
-#, fuzzy
-#~ msgid "Password"
-#~ msgstr "Régi jelszó"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Előretöltött tárgy láthatóság"
-
-#, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Végtelen folyadék"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Hiba az összes világ törlése közben"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "A fájl törölve lett"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Nem törölhető a világ: Nincs kiválasztva"
-
-#~ msgid "Address required."
-#~ msgstr "Cím szükséges."
-
-#~ msgid "Create world"
-#~ msgstr "Világ létrehozása"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Kedvencek mutatása"
-
-#~ msgid "Show Public"
-#~ msgstr "Publikus mutatása"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Figyelem: A beállítások nem egyformák.  "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Beállítások mentve.  "
-
-#~ msgid "is required by:"
-#~ msgstr "kell neki:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat"
-
-#, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Le"
-
-#, fuzzy
-#~ msgid "Touch free target"
-#~ msgstr "Touch free target"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "A méretarány alkalmazva a menü elemekre: "
-
-#~ msgid "Wanted FPS"
-#~ msgstr "Kívánt FPS"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Minimum látóterület"
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Az (újra)éledés függőleges irányú területe"
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Függőleges kezdeti ablak méret."
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Eszköztár textúráinak előtöltése"
-
-#~ msgid "New style water"
-#~ msgstr "Új stílusú víz"
-
-#, fuzzy
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Minimum kívánt FPS.\n"
-#~ "A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a "
-#~ "látórerület min és max)."
-
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Maximum távolság a vízszinttől, ahol a játékosok újraéledhetnek/"
-#~ "megjelenhetnek csatlakozáskor (spawn).\n"
-#~ "Magasabb értékek közelebb visznek az (x = 0, z = 0)-hoz.\n"
-#~ "Alacsonyabb értékek azt eredményezhetik, hogy nem lesz megfelelő pont a "
-#~ "feléledéshez,\n"
-#~ "(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz."
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n"
-#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n"
-#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr ""
-#~ "Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a "
-#~ "kijelölődobozt)."
-
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg "
-#~ "teljesen a blokkot.\n"
-#~ "Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n"
-#~ "így nem működik a víz felszínén."
-
-#~ msgid "Item textures..."
-#~ msgstr "Elem textúrák..."
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "Részletes mod profil adat. Mod fejlesztőknek hasznos."
diff --git a/po/id/minetest.po b/po/id/minetest.po
index 5571967f5..28f264ebc 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-06-23 16:06+0000\n"
 "Last-Translator: Muhammad Rifqi Priyo Susanto "
 "<muhammadrifqipriyosusanto@gmail.com>\n"
@@ -987,6 +987,10 @@ msgstr "Tembus blok"
 msgid "Use"
 msgstr "Pakai"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoom"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "tekan tombol"
@@ -1303,10 +1307,6 @@ msgstr "Tombol X 1"
 msgid "X Button 2"
 msgstr "Tombol X 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoom"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1387,6 +1387,11 @@ msgstr "Batas blok aktif"
 msgid "Active Block Modifier interval"
 msgstr "Batas blok aktif"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Batas blok aktif"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Jangkauan blok aktif"
@@ -1474,6 +1479,10 @@ msgstr "Minta untuk menyambung ulang setelah crash"
 msgid "Automaticaly report to the serverlist."
 msgstr "Secara otomatis melaporkan ke daftar server."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Tombol mundur"
@@ -1506,6 +1515,10 @@ msgstr "Bit per piksel (alias kedalaman warna) dalam mode layar penuh."
 msgid "Build inside player"
 msgstr "Bangun di dalam pemain"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Bumpmapping"
@@ -1546,6 +1559,11 @@ msgstr "Tombol obrolan"
 msgid "Chat toggle key"
 msgstr "Tombol beralih obrolan"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Perintah"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1636,6 +1654,16 @@ msgstr "Awan dalam menu"
 msgid "Colored fog"
 msgstr "Kabut berwarna"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Daftar yang dipisahkan koma dari mod yang dibolehkan untuk mengakses\n"
+"HTTP API, membolehkan mereka untuk mengunggah dan mengunduh data\n"
+"ke/dari internet."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1645,15 +1673,6 @@ msgstr ""
 "untuk mengakses fungsi yang tidak aman bahkan ketika mod security aktif\n"
 "(melalui request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Daftar yang dipisahkan koma dari mod yang dibolehkan untuk mengakses\n"
-"HTTP API, membolehkan mereka untuk mengunggah dan mengunduh data\n"
-"ke/dari internet."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Tombol perintah"
@@ -1808,6 +1827,10 @@ msgstr "Kata sandi bawaan"
 msgid "Default privileges"
 msgstr "Izin bawaan"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1826,6 +1849,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1858,14 +1885,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2021,6 +2040,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2084,10 +2111,24 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node "
+"padat.\n"
+"Hal ini memerlukan hak istimewa \"noclip\" pada server."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2224,6 +2265,10 @@ msgstr "Umum"
 msgid "Generate normalmaps"
 msgstr "Hasilkan normalmaps"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2258,6 +2303,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2285,15 +2339,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2398,6 +2443,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2433,7 +2512,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2646,6 +2725,17 @@ msgstr ""
 "Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tombol untuk beralih mode cepat.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2697,11 +2787,15 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tombol untuk bergerak ke kiri.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2863,6 +2957,22 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Batas blok aktif"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3296,6 +3406,16 @@ msgstr "Jumlah maksimal blok yang dipaksa muat (forceloaded)"
 msgid "Maximum hotbar width"
 msgstr "Lebar maksimal hotbar"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr "Jumlah maksimal pemain yang dapat terhubung serentak."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "Jumlah maksimal blok yang dapat diantrikan untuk dimuat."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr "Jumlah maksimal blok yang dapat diantrikan untuk dimuat."
@@ -3347,6 +3467,11 @@ msgstr "Jumlah maksimal pemain yang dapat terhubung serentak."
 msgid "Maximum number of statically stored objects in a block."
 msgstr "Jumlah maksimal objek yang disimpan secara statis dalam satu blok."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum objects per block"
+msgstr "Jumlah objek maksimal tiap blok"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3356,11 +3481,13 @@ msgstr ""
 "Berguna jika ada sesuatu yang akan ditampilkan di kanan atau kiri hotbar."
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+#, fuzzy
+msgid "Maximum simultaneous block sends per client"
 msgstr "Jumlah maksimal blok yang dikirim serentak tiap klien"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+#, fuzzy
+msgid "Maximum simultaneous block sends total"
 msgstr "Jumlah maksimal total blok yang dikirim"
 
 #: src/settings_translation_file.cpp
@@ -3372,10 +3499,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr "Jumlah pengguna maksimal"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr "Jumlah objek maksimal tiap blok"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Menus"
@@ -3417,10 +3540,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mipmapping"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3628,12 +3747,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3641,7 +3766,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3675,6 +3800,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Pilih jalur"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Tombol kanan"
@@ -3833,7 +3963,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3951,10 +4081,22 @@ msgstr "Paket Tekstur"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -4099,10 +4241,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Berguna untuk pengembang mod."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4229,7 +4367,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4329,50 +4467,53 @@ msgstr "Batas cURL paralel"
 msgid "cURL timeout"
 msgstr "Batas waktu cURL"
 
-#~ msgid "No of course not!"
-#~ msgstr "Tentu tidak!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Daftar Server Publik"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Hasilkan Normalmaps"
-
-#~ msgid "No!!!"
-#~ msgstr "Tidak!!!"
-
-#~ msgid "\""
-#~ msgstr "\""
-
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Nonaktifkan PM"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Memuat tekstur..."
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Faktor skala yang diatur untuk elemen menu: "
+
+#~ msgid "Touch free target"
+#~ msgstr "Bebas sentuhan"
+
+#~ msgid "Downloading"
+#~ msgstr "Mengunduh"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/detik"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/detik"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih"
+
+#~ msgid "Rendering:"
+#~ msgstr "Rendering:"
 
 #, fuzzy
 #~ msgid "If enabled, "
 #~ msgstr "diaktifkan"
 
-#~ msgid "Rendering:"
-#~ msgstr "Rendering:"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/detik"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/detik"
-
-#~ msgid "Downloading"
-#~ msgstr "Mengunduh"
-
-#~ msgid "Touch free target"
-#~ msgstr "Bebas sentuhan"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Faktor skala yang diatur untuk elemen menu: "
-
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Memuat tekstur..."
+#~ msgid "If disabled "
+#~ msgstr "Nonaktifkan PM"
+
+#~ msgid "\""
+#~ msgstr "\""
+
+#~ msgid "No!!!"
+#~ msgstr "Tidak!!!"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Hasilkan Normalmaps"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Daftar Server Publik"
+
+#~ msgid "No of course not!"
+#~ msgstr "Tentu tidak!"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Berguna untuk pengembang mod."
diff --git a/po/it/minetest.po b/po/it/minetest.po
index 3a94e4200..17d297dda 100644
--- a/po/it/minetest.po
+++ b/po/it/minetest.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Minetest 0.4.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-05-14 13:34+0000\n"
 "Last-Translator: Emon Omen <emon@openmailbox.org>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/minetest/"
@@ -978,6 +978,10 @@ msgstr "Attivare noclip"
 msgid "Use"
 msgstr "Usare"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoom"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "prem. il tasto"
@@ -1294,10 +1298,6 @@ msgstr "Pulsante X 1"
 msgid "X Button 2"
 msgstr "Pulsante X 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoom"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1384,6 +1384,11 @@ msgstr "Intervallo del gestore di blocco attivo"
 msgid "Active Block Modifier interval"
 msgstr "Intervallo del modificatore di blocco attivo"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Intervallo del modificatore di blocco attivo"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Portata del blocco attivo"
@@ -1470,6 +1475,10 @@ msgstr "Chiedere di riconnettersi dopo un crollo"
 msgid "Automaticaly report to the serverlist."
 msgstr "Rapporto automatico all'elenco dei server."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Tasto all'indietro"
@@ -1502,6 +1511,10 @@ msgstr "Bit per pixel (cioè profondità di colore) in modalità schermo intero.
 msgid "Build inside player"
 msgstr "Costruisci nel giocatore"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Bumpmapping"
@@ -1542,6 +1555,11 @@ msgstr "Tasto della messaggistica"
 msgid "Chat toggle key"
 msgstr "Tasto di scelta della messaggistica"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Comando"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1632,6 +1650,16 @@ msgstr "Nuvole nel menu"
 msgid "Colored fog"
 msgstr "Nebbia colorata"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Elenco separato da virgole di mod. a cui è permesso l'accesso alle API "
+"HTTP,\n"
+"che gli permettono di caricare e scaricare dati su/da internet."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1641,15 +1669,6 @@ msgstr ""
 "funzioni non sicure anche quando il valore \"mod security\" è impostato su "
 "\"on\" (utilizzando request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Elenco separato da virgole di mod. a cui è permesso l'accesso alle API "
-"HTTP,\n"
-"che gli permettono di caricare e scaricare dati su/da internet."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Tasto di comando"
@@ -1806,6 +1825,10 @@ msgstr "Password predefinita"
 msgid "Default privileges"
 msgstr "Privilegi predefiniti"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1828,6 +1851,10 @@ msgstr ""
 "Definisce la massima distanza di trasferimento del giocatore espressa in "
 "blocchi (0 = illimitata)."
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Ritardo nella comparsa dei suggerimenti, espresso in millisecondi."
@@ -1860,15 +1887,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr "De-sincronizza l'animazione del blocco"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-"Dati di profilo del mod. dettagliati. Utile per gli sviluppatori di mod."
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "Profilo dettagliato del mod."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2032,6 +2050,15 @@ msgstr ""
 "Abilita la mappatura dell'occlusione di parallasse.\n"
 "Richiede l'attivazione degli shader."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Engine profiling data print interval"
+msgstr "Intervallo di stampa del profilamento"
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2096,10 +2123,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "Campo visivo"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Campo visivo"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Campo visivo in gradi."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Movimento veloce (tramite il tasto usare).\n"
+"Ciò richiede il privilegio \"fast\" sul server."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2250,6 +2291,10 @@ msgstr "Generali"
 msgid "Generate normalmaps"
 msgstr "Generare le normalmap"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2303,6 +2348,15 @@ msgstr ""
 "-   errore: abortire all'uso della chiamata deplorata (suggerita per gli "
 "sviluppatori di mod.)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "Componente dell'altezza della dimensione della finestra iniziale."
@@ -2333,15 +2387,6 @@ msgstr ""
 "espresso in blocchi mappa (16 nodi).\n"
 "Nei blocchi attivi vengono caricati gli oggetti ed eseguiti gli ABM."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr "Quanti blocchi vengono inviati simultaneamente per l'intero server."
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr "Quanti blocchi volano nel cavo simultaneamente per ogni client."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2460,6 +2505,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr "Colore in gioco dello sfondo della console dei messaggi (R,G,B)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2500,7 +2579,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr "Intervallo di ripetizione del click destro"
 
 #: src/settings_translation_file.cpp
@@ -2733,6 +2812,17 @@ msgstr ""
 "Si veda http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tasto per attivare la modalità veloce.\n"
+"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2784,8 +2874,9 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2977,6 +3068,22 @@ msgstr "Intervallo di aggiornamento del liquido in secondi."
 msgid "Liquid update tick"
 msgstr "Scatto di aggiornamento del liquido"
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Intervallo del modificatore di blocco attivo"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr "Menu principale gestore giochi"
@@ -3439,6 +3546,18 @@ msgstr "Numero massimo di blocchi caricati a forza"
 msgid "Maximum hotbar width"
 msgstr "Larghezza massima della barra oggetti"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+"Numero massimo di giocatori che possono connettersi contemporaneamente."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+"Numero massimo di blocchi che possono essere accodati per il caricamento."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3493,6 +3612,11 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr "Numero massimo di oggetti immagazzinati stabilmente in un blocco."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum objects per block"
+msgstr "Oggetti massimi per blocco"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3502,11 +3626,13 @@ msgstr ""
 "Utile se c'è qualcosa da mostrare a destra o sinistra della barra."
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+#, fuzzy
+msgid "Maximum simultaneous block sends per client"
 msgstr "Num. mass. di blocchi inviati contemp. per client"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+#, fuzzy
+msgid "Maximum simultaneous block sends total"
 msgstr "Totale massimo di invio contemporaneo di blocchi"
 
 #: src/settings_translation_file.cpp
@@ -3519,10 +3645,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr "Utenti massimi"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr "Oggetti massimi per blocco"
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Menu"
@@ -3563,10 +3685,6 @@ msgstr "Dimensione minima dell'immagine per i filtri"
 msgid "Mipmapping"
 msgstr "Mipmapping"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr "Creazione del profilo dei mod."
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr "URL dei dettagli del deposito mod."
@@ -3806,23 +3924,32 @@ msgstr ""
 "Impedisce che i mod. facciano cose non sicure come eseguire comandi della "
 "shell."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+"Intervallo di stampa del profilatore. 0 = disabilitato. Utile per gli "
+"sviluppatori."
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr "Privilegi che possono essere assegnati dai giocatori con basic_privs"
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
-msgstr ""
-"Intervallo di stampa del profilatore. 0 = disabilitato. Utile per gli "
-"sviluppatori."
+#, fuzzy
+msgid "Profiler"
+msgstr "Profilo valli"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "Tasto di attivazione del profilatore"
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr "Intervallo di stampa del profilamento"
+#, fuzzy
+msgid "Profiling"
+msgstr "Creazione del profilo dei mod."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3859,6 +3986,11 @@ msgstr "Porta remota"
 msgid "Replaces the default main menu with a custom one."
 msgstr "Sostituisce il menu principale predefinito con uno personalizzato."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Percorso del font"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Tasto destro"
@@ -4033,8 +4165,9 @@ msgstr ""
 "Necessita l'attivazione degli shader."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -4170,10 +4303,22 @@ msgstr "Percorso delle immagini"
 msgid "The altitude at which temperature drops by 20C"
 msgstr "L'altitudine a cui le temperature crollano di 20°C"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr "La profondità della terra o altri riempitori"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "L'interfaccia di rete ascoltata dal server."
@@ -4353,10 +4498,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Usare il filtro trilineare quando si ridimensionano le immagini."
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Utile per gli sviluppatori di mod."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr "Sincronia verticale"
@@ -4489,11 +4630,12 @@ msgstr ""
 "nell'inventario)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 "Quando gui_scaling_filter_txr2img è vero, copia quelle immagini\n"
 "dall'hardware al software per il ridimensionamento. Quando è falso,\n"
@@ -4632,17 +4774,126 @@ msgstr "Limite cURL parallelo"
 msgid "cURL timeout"
 msgstr "Tempo di scadenza cURL"
 
-#~ msgid "No of course not!"
-#~ msgstr "No, certo che no!"
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Attributi di generazione della mappa specifici per Generatore mappa "
+#~ "piatto.\n"
+#~ "Laghi e colline occasionali possono essere aggiunti al mondo piatto.\n"
+#~ "Le impostazioni predefinite impostate nel motore sono: nessuna\n"
+#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
+#~ "motore.\n"
+#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
+#~ "valori predefiniti.\n"
+#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
+#~ "esplicitamente."
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Elenco dei server pubblici"
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Attributi di generazione della mappa specifici per Generatore mappa v. "
+#~ "6.\n"
+#~ "L'impostazione 'ridges' controlla i fiumi.\n"
+#~ "Le impostazioni predefinite impostate nel motore sono: mountains, ridges\n"
+#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
+#~ "motore.\n"
+#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
+#~ "valori predefiniti.\n"
+#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
+#~ "esplicitamente."
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generare normalmap"
+#~ msgid "Item textures..."
+#~ msgstr "Immagini degli oggetti..."
 
-#~ msgid "No!!!"
-#~ msgstr "No!!!"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Precaricamento delle textures dell'inventario"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Distanza minima di visibilità"
+
+#~ msgid "Wanted FPS"
+#~ msgstr "FPS desiderati"
+
+#~ msgid "Local install"
+#~ msgstr "Installazione locale"
+
+#~ msgid "Add mod:"
+#~ msgstr "Aggiungere un modulo:"
+
+#~ msgid "MODS"
+#~ msgstr "MODULI"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACCH. DI IMM."
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "GIOC. SING."
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Liquido limitato"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Precaricare le immagini"
+
+#~ msgid "SETTINGS"
+#~ msgstr "IMPOSTAZIONI"
+
+#~ msgid "Password"
+#~ msgstr "Password"
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "START SERVER"
+#~ msgstr "AVVIO SERVER"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Aggiungere il modulo"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Rimuovere il modulo selezionato"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MODIFICARE IL GIOCO"
+
+#~ msgid "new game"
+#~ msgstr "nuovo gioco"
+
+#~ msgid "Mods:"
+#~ msgstr "Moduli:"
+
+#~ msgid "GAMES"
+#~ msgstr "GIOCHI"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\""
+
+#~ msgid "Game Name"
+#~ msgstr "Nome del gioco"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Riavviare minetest per rendere effettive le modifiche"
+
+#~ msgid "If enabled, "
+#~ msgstr "attivata"
+
+#~ msgid "If disabled "
+#~ msgstr "Disatt. pacch."
 
 #~ msgid ""
 #~ "Map generation attributes specific to Mapgen Valleys.\n"
@@ -4666,123 +4917,32 @@ msgstr "Tempo di scadenza cURL"
 #~ "\"humid_rivers\" modifica l'umidità attorno ai fiumi e nelle aree in cui "
 #~ "l'acqua tenderebbe a stagnare. Potrebbe interferire con biomi"
 
-#~ msgid "If disabled "
-#~ msgstr "Disatt. pacch."
+#~ msgid "No!!!"
+#~ msgstr "No!!!"
 
-#~ msgid "If enabled, "
-#~ msgstr "attivata"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generare normalmap"
 
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Riavviare minetest per rendere effettive le modifiche"
+#~ msgid "Public Serverlist"
+#~ msgstr "Elenco dei server pubblici"
 
-#~ msgid "Game Name"
-#~ msgstr "Nome del gioco"
+#~ msgid "No of course not!"
+#~ msgstr "No, certo che no!"
 
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\""
+#~ msgid "Useful for mod developers."
+#~ msgstr "Utile per gli sviluppatori di mod."
 
-#~ msgid "GAMES"
-#~ msgstr "GIOCHI"
-
-#~ msgid "Mods:"
-#~ msgstr "Moduli:"
-
-#~ msgid "new game"
-#~ msgstr "nuovo gioco"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MODIFICARE IL GIOCO"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Rimuovere il modulo selezionato"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Aggiungere il modulo"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "START SERVER"
-#~ msgstr "AVVIO SERVER"
-
-#~ msgid "Name"
-#~ msgstr "Nome"
-
-#~ msgid "Password"
-#~ msgstr "Password"
-
-#~ msgid "SETTINGS"
-#~ msgstr "IMPOSTAZIONI"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Precaricare le immagini"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Liquido limitato"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "GIOC. SING."
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACCH. DI IMM."
-
-#~ msgid "MODS"
-#~ msgstr "MODULI"
-
-#~ msgid "Add mod:"
-#~ msgstr "Aggiungere un modulo:"
-
-#~ msgid "Local install"
-#~ msgstr "Installazione locale"
-
-#~ msgid "Wanted FPS"
-#~ msgstr "FPS desiderati"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Distanza minima di visibilità"
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Precaricamento delle textures dell'inventario"
-
-#~ msgid "Item textures..."
-#~ msgstr "Immagini degli oggetti..."
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "Quanti blocchi volano nel cavo simultaneamente per ogni client."
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "Attributi di generazione della mappa specifici per Generatore mappa v. "
-#~ "6.\n"
-#~ "L'impostazione 'ridges' controlla i fiumi.\n"
-#~ "Le impostazioni predefinite impostate nel motore sono: mountains, ridges\n"
-#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
-#~ "motore.\n"
-#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
-#~ "valori predefiniti.\n"
-#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
-#~ "esplicitamente."
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr "Quanti blocchi vengono inviati simultaneamente per l'intero server."
 
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Profilo dettagliato del mod."
+
+#~ msgid "Detailed mod profile data. Useful for mod developers."
 #~ msgstr ""
-#~ "Attributi di generazione della mappa specifici per Generatore mappa "
-#~ "piatto.\n"
-#~ "Laghi e colline occasionali possono essere aggiunti al mondo piatto.\n"
-#~ "Le impostazioni predefinite impostate nel motore sono: nessuna\n"
-#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
-#~ "motore.\n"
-#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
-#~ "valori predefiniti.\n"
-#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
-#~ "esplicitamente."
+#~ "Dati di profilo del mod. dettagliati. Utile per gli sviluppatori di mod."
diff --git a/po/ja/minetest.po b/po/ja/minetest.po
index 396758624..a73408c0a 100644
--- a/po/ja/minetest.po
+++ b/po/ja/minetest.po
@@ -2,11 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-08-17 07:33+0000\n"
 "Last-Translator: Rui <rui.minetest@gmail.com>\n"
-"Language-Team: Japanese "
-"<https://hosted.weblate.org/projects/minetest/minetest/ja/>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/minetest/"
+"minetest/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -95,7 +95,9 @@ msgstr "全て有効化"
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
-msgstr "許可されていない文字が使用されているため、Mod「$1」を有効化できませんでした。文字は[a-z0-9_]のみ使用できます。"
+msgstr ""
+"許可されていない文字が使用されているため、Mod「$1」を有効化できませんでした。"
+"文字は[a-z0-9_]のみ使用できます。"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -236,8 +238,8 @@ msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
-"書式: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, <octaves>, "
-"<persistence>"
+"書式: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
+"<octaves>, <persistence>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
@@ -927,7 +929,9 @@ msgstr "キーが重複しています"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
-msgstr "キー設定です。 (このメニューで失敗する場合は、minetest.confから該当する設定を削除してください)"
+msgstr ""
+"キー設定です。 (このメニューで失敗する場合は、minetest.confから該当する設定を"
+"削除してください)"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Left"
@@ -973,6 +977,10 @@ msgstr "すり抜けモード"
 msgid "Use"
 msgstr "使用"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "ズーム"
+
 #: src/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "press key"
@@ -1290,10 +1298,6 @@ msgstr "Xボタン1"
 msgid "X Button 2"
 msgstr "Xボタン2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "ズーム"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1381,6 +1385,11 @@ msgstr "アクティブなブロックの範囲"
 msgid "Active Block Modifier interval"
 msgstr "アクティブなブロックの範囲"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "アクティブなブロックの範囲"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "アクティブなブロックの範囲"
@@ -1471,6 +1480,10 @@ msgstr "クラッシュ後に再接続を促す"
 msgid "Automaticaly report to the serverlist."
 msgstr "自動的にサーバ一覧に報告します。"
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "後キー"
@@ -1506,6 +1519,10 @@ msgstr "フルスクリーンモードでの1ピクセル(色深度)あたりの
 msgid "Build inside player"
 msgstr "プレイヤーの位置に設置"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "バンプマッピング"
@@ -1552,6 +1569,11 @@ msgstr "チャットキー"
 msgid "Chat toggle key"
 msgstr "チャットトグルキー"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "コマンド"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1643,6 +1665,16 @@ msgstr "メニューに雲"
 msgid "Colored fog"
 msgstr "色つきの霧"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"HTTP API（彼らがインターネットに出入りするデータをアップロードして、ダウン"
+"ロードするのを許します）にアクセスしてもよいモッズのコンマseperatedされたリス"
+"ト。"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1653,16 +1685,6 @@ msgstr ""
 "きでも、不安定な機能にアクセスしてもよい信用されたモッズのコンマで区切られた"
 "リスト。"
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"HTTP API（彼らがインターネットに出入りするデータをアップロードして、ダウン"
-"ロードするのを許します）にアクセスしてもよいモッズのコンマseperatedされたリス"
-"ト。"
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "コマンドキー"
@@ -1831,6 +1853,10 @@ msgstr "既定パスワード"
 msgid "Default privileges"
 msgstr "標準権限"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1854,6 +1880,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr "ブロック（0無制限の=）で、最大限のプレーヤー移転距離を定めます。"
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -1891,16 +1921,6 @@ msgstr "サーバの説明です。プレイヤーがサーバ一覧から接続
 msgid "Desynchronize block animation"
 msgstr "ブロックのアニメーションの非同期化"
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr "詳細なModのプロファイルデータです。Mod開発者に便利です。"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Detailed mod profiling"
-msgstr "詳細なModのプロファイル化"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2076,6 +2096,14 @@ msgstr ""
 "視差オクルージョンマッピングを有効にします。\n"
 "シェーダーが有効である必要があります。"
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2153,11 +2181,25 @@ msgstr ""
 msgid "Field of view"
 msgstr "視野"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "視野"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Field of view in degrees."
 msgstr "視野角。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"高速移動 (使用キー)。\n"
+"サーバによる「fast」権限が必要です。"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2309,6 +2351,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr "ノーマルマップの生成"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2343,6 +2389,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2371,15 +2426,6 @@ msgid ""
 msgstr ""
 "Mapblock (16ノード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2474,6 +2520,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2509,7 +2589,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2674,6 +2754,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2711,7 +2798,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2861,6 +2948,22 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "アクティブなブロックの範囲"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3283,6 +3386,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3324,6 +3435,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3331,11 +3446,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3346,10 +3461,6 @@ msgstr "ファイルダウンロード (例: Modのダウンロード)の最大
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "メニュー"
@@ -3390,10 +3501,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "ミップマッピング"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3598,12 +3705,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3611,7 +3724,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3645,6 +3758,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "フォントパス"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "右キー"
@@ -3805,7 +3923,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3920,10 +4038,22 @@ msgstr "テクスチャパス"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -4068,10 +4198,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Mod開発に便利。"
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4198,7 +4324,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4319,42 +4445,53 @@ msgstr "cURLパラレル制限"
 msgid "cURL timeout"
 msgstr "cURLタイムアウト"
 
-#~ msgid "No of course not!"
-#~ msgstr "いいえ！"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "公開サーバ一覧"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "ノーマルマップの生成"
-
-#~ msgid "No!!!"
-#~ msgstr "いいえ！！！"
-
-#~ msgid "If disabled "
-#~ msgstr "無効化の場合 "
-
-#~ msgid "If enabled, "
-#~ msgstr "有効化の場合 "
-
-#~ msgid "Rendering:"
-#~ msgstr "レンダリング:"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "ドライバーを変更するためMinetestを再起動します"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/秒"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/秒"
-
-#~ msgid "Touch free target"
-#~ msgstr "タッチ位置を自由にする"
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "テクスチャ読み込み中..."
 
 #~ msgid "Scaling factor applied to menu elements: "
 #~ msgstr "メニューの大きさとして設定されている数値: "
 
+#~ msgid "Touch free target"
+#~ msgstr "タッチ位置を自由にする"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/秒"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/秒"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "ドライバーを変更するためMinetestを再起動します"
+
+#~ msgid "Rendering:"
+#~ msgstr "レンダリング:"
+
+#~ msgid "If enabled, "
+#~ msgstr "有効化の場合 "
+
+#~ msgid "If disabled "
+#~ msgstr "無効化の場合 "
+
+#~ msgid "No!!!"
+#~ msgstr "いいえ！！！"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "ノーマルマップの生成"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "公開サーバ一覧"
+
+#~ msgid "No of course not!"
+#~ msgstr "いいえ！"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Mod開発に便利。"
+
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "テクスチャ読み込み中..."
+#~ msgid "Detailed mod profiling"
+#~ msgstr "詳細なModのプロファイル化"
+
+#, fuzzy
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "詳細なModのプロファイルデータです。Mod開発者に便利です。"
diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po
index 362917350..0f91987e3 100644
--- a/po/jbo/minetest.po
+++ b/po/jbo/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-05-08 17:39+0000\n"
 "Last-Translator: senpi <saikos@openmailbox.org>\n"
 "Language-Team: Lojban <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -968,6 +968,10 @@ msgstr ""
 msgid "Use"
 msgstr "mu'e pilno"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr ""
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "ko da'ergau le batke"
@@ -1284,10 +1288,6 @@ msgstr "la'o gy.X Button 1.gy."
 msgid "X Button 2"
 msgstr "la'o gy.X Button 2.gy."
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1354,6 +1354,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1428,6 +1432,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1463,6 +1471,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr ""
@@ -1504,6 +1516,11 @@ msgstr "samta'a"
 msgid "Chat toggle key"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "minde"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1581,14 +1598,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1738,6 +1755,10 @@ msgstr "lo cnino lerpoijaspu"
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1754,6 +1775,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1784,14 +1809,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1927,6 +1944,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -1988,10 +2013,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2127,6 +2162,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2161,6 +2200,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2188,15 +2236,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2291,6 +2330,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2327,7 +2400,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2493,6 +2566,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2530,7 +2610,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2681,6 +2761,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3101,6 +3196,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3142,6 +3245,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3149,11 +3256,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3164,10 +3271,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr ""
@@ -3209,10 +3312,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "lo puvrmipmepi"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3417,12 +3516,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3430,7 +3535,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3465,6 +3570,10 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Right key"
@@ -3631,7 +3740,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3748,10 +3857,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3898,10 +4019,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4032,7 +4149,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4132,16 +4249,16 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "nasai go'i"
-
-#~ msgid "No!!!"
-#~ msgstr "nasai go'i"
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr ".i ca'o samymo'i le tengu datnyvei"
 
 #, fuzzy
 #~ msgid "If enabled, "
 #~ msgstr "selpli"
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr ".i ca'o samymo'i le tengu datnyvei"
+#~ msgid "No!!!"
+#~ msgstr "nasai go'i"
+
+#~ msgid "No of course not!"
+#~ msgstr "nasai go'i"
diff --git a/po/ko/minetest.po b/po/ko/minetest.po
index 6981029a2..44b1960a9 100644
--- a/po/ko/minetest.po
+++ b/po/ko/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2015-07-08 23:30+0200\n"
 "Last-Translator: Tae Lim Kook <tkook11@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -939,6 +939,10 @@ msgstr ""
 msgid "Use"
 msgstr ""
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr ""
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr ""
@@ -1255,10 +1259,6 @@ msgstr ""
 msgid "X Button 2"
 msgstr ""
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1324,6 +1324,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1398,6 +1402,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr ""
@@ -1430,6 +1438,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr ""
@@ -1470,6 +1482,10 @@ msgstr ""
 msgid "Chat toggle key"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Chatcommands"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1543,14 +1559,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1696,6 +1712,10 @@ msgstr ""
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1712,6 +1732,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1742,14 +1766,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1883,6 +1899,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -1944,10 +1968,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2082,6 +2116,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2116,6 +2154,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2143,15 +2190,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2246,6 +2284,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2281,7 +2353,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2446,6 +2518,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2483,7 +2562,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2633,6 +2712,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3051,6 +3145,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3092,6 +3194,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3099,11 +3205,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3114,10 +3220,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr ""
@@ -3158,10 +3260,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3366,12 +3464,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3379,7 +3483,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3413,6 +3517,10 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr ""
@@ -3571,7 +3679,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3686,10 +3794,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3834,10 +3954,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -3964,7 +4080,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
diff --git a/po/ky/minetest.po b/po/ky/minetest.po
index ec59e03f5..3933c7fb8 100644
--- a/po/ky/minetest.po
+++ b/po/ky/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2013-06-01 18:09+0200\n"
 "Last-Translator: Chynggyz Jumaliev <translatorky@lavabit.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1010,6 +1010,10 @@ msgstr ""
 msgid "Use"
 msgstr "Колдонуу"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Масштаб"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "баскычты басыңыз"
@@ -1326,10 +1330,6 @@ msgstr ""
 msgid "X Button 2"
 msgstr ""
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Масштаб"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1396,6 +1396,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1471,6 +1475,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1507,6 +1515,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr "Көп кишилик"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Bumpmapping"
@@ -1550,6 +1562,11 @@ msgstr "Баскычтарды өзгөртүү"
 msgid "Chat toggle key"
 msgstr "Баскычтарды өзгөртүү"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Команда"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1627,14 +1644,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1789,6 +1806,10 @@ msgstr "Жаңы сырсөз"
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1805,6 +1826,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1835,14 +1860,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1980,6 +1997,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2040,10 +2065,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2180,6 +2215,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2214,6 +2253,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2241,15 +2289,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2345,6 +2384,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2381,7 +2454,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2547,6 +2620,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2584,7 +2664,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2735,6 +2815,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3155,6 +3250,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3196,6 +3299,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3203,11 +3310,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3218,10 +3325,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Menus"
@@ -3264,10 +3367,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mip-текстуралоо"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3472,12 +3571,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3485,7 +3590,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3519,6 +3624,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Тандоо"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Right key"
@@ -3684,7 +3794,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3801,10 +3911,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3951,10 +4073,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4084,7 +4202,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4185,28 +4303,54 @@ msgid "cURL timeout"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Public Serverlist"
-#~ msgstr "Жалпылык серверлердин тизмеси:"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Жүктөлүүдө..."
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Баарын өчүрүү"
+#~ msgid "Downloading"
+#~ msgstr "Ылдый"
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "күйгүзүлгөн"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу"
 
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Оюн"
+#~ msgid "is required by:"
+#~ msgstr "талап кылынганы:"
 
-#, fuzzy
-#~ msgid "Password"
-#~ msgstr "Эски сырсөз"
+#~ msgid "Configuration saved.  "
+#~ msgstr "Конфигурация сакталды.  "
 
-#, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Чектүү суюктук"
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Эскертүү: Туура эмес конфигурация.  "
+
+#~ msgid "Show Public"
+#~ msgstr "Жалпылыкты көрсөтүү"
+
+#~ msgid "Show Favorites"
+#~ msgstr "Тандалмаларды көрсөтүү"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз."
+
+#~ msgid "Create world"
+#~ msgstr "Дүйнөнү жаратуу"
+
+#~ msgid "Address required."
+#~ msgstr "Дареги талап кылынат."
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Өчүрүлө турган файлдар"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4233,52 +4377,26 @@ msgstr ""
 #~ "- ESC: бул меню\n"
 #~ "- T: маек\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Өчүрүлө турган файлдар"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок"
-
-#~ msgid "Address required."
-#~ msgstr "Дареги талап кылынат."
-
-#~ msgid "Create world"
-#~ msgstr "Дүйнөнү жаратуу"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Тандалмаларды көрсөтүү"
-
-#~ msgid "Show Public"
-#~ msgstr "Жалпылыкты көрсөтүү"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Эскертүү: Туура эмес конфигурация.  "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Конфигурация сакталды.  "
-
-#~ msgid "is required by:"
-#~ msgstr "талап кылынганы:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу"
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Чектүү суюктук"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Ылдый"
+#~ msgid "Password"
+#~ msgstr "Эски сырсөз"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Жүктөлүүдө..."
+#~ msgid "Game Name"
+#~ msgstr "Оюн"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "күйгүзүлгөн"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Баарын өчүрүү"
+
+#, fuzzy
+#~ msgid "Public Serverlist"
+#~ msgstr "Жалпылык серверлердин тизмеси:"
diff --git a/po/lt/minetest.po b/po/lt/minetest.po
index 9d80d7e51..1a347ab34 100644
--- a/po/lt/minetest.po
+++ b/po/lt/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2015-11-19 05:14+0000\n"
 "Last-Translator: Liudas Ališauskas <liudas@akmc.lt>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/minetest/"
@@ -992,6 +992,10 @@ msgstr "Įjungti noclip"
 msgid "Use"
 msgstr "Naudoti"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Pritraukti"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "paspauskite klavišą"
@@ -1308,10 +1312,6 @@ msgstr "X mygtukas 1"
 msgid "X Button 2"
 msgstr "X mygtukas 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Pritraukti"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1378,6 +1378,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1452,6 +1456,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1486,6 +1494,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr ""
@@ -1528,6 +1540,11 @@ msgstr "Nustatyti klavišus"
 msgid "Chat toggle key"
 msgstr "Nustatyti klavišus"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Komanda"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1605,14 +1622,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1766,6 +1783,10 @@ msgstr "Naujas slaptažodis"
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1782,6 +1803,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1812,14 +1837,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1957,6 +1974,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2017,10 +2042,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2156,6 +2191,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2191,6 +2230,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2218,15 +2266,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2322,6 +2361,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2358,7 +2431,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2524,6 +2597,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2561,7 +2641,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2712,6 +2792,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3136,6 +3231,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3177,6 +3280,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3184,11 +3291,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3199,10 +3306,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Menus"
@@ -3244,10 +3347,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3452,12 +3551,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3465,7 +3570,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3499,6 +3604,10 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Right key"
@@ -3666,7 +3775,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3783,10 +3892,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3932,11 +4053,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Useful for mod developers."
-msgstr "Pagrindiniai kūrėjai"
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4064,7 +4180,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4164,66 +4280,70 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "Ne, tikrai ne!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Viešų serverių sąrašas"
-
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Išjungti papildinį"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Įkeliama..."
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "įjungtas"
+#~ msgid "Add mod:"
+#~ msgstr "Pridėti papildinį:"
 
-#~ msgid "Game Name"
-#~ msgstr "Žaidimo pavadinimas"
+#~ msgid "MODS"
+#~ msgstr "PAPILDINIAI"
 
-#~ msgid "GAMES"
-#~ msgstr "ŽAIDIMAI"
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "VIENAS ŽAIDĖJAS"
 
-#~ msgid "Mods:"
-#~ msgstr "Papildiniai:"
+#~ msgid "SETTINGS"
+#~ msgstr "NUSTATYMAI"
 
-#~ msgid "new game"
-#~ msgstr "naujas žaidimas"
+#~ msgid "Password"
+#~ msgstr "Slaptažodis"
+
+#~ msgid "Name"
+#~ msgstr "Vardas"
+
+#~ msgid "START SERVER"
+#~ msgstr "PALEISTI SERVERĮ"
+
+#~ msgid "CLIENT"
+#~ msgstr "ŽAISTI TINKLE"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Pridėti papildinį"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Pašalinti pasirinktą papildinį"
 
 #, fuzzy
 #~ msgid "EDIT GAME"
 #~ msgstr "KEISTI ŽAIDIMĄ"
 
-#~ msgid "Remove selected mod"
-#~ msgstr "Pašalinti pasirinktą papildinį"
+#~ msgid "new game"
+#~ msgstr "naujas žaidimas"
 
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Pridėti papildinį"
+#~ msgid "Mods:"
+#~ msgstr "Papildiniai:"
 
-#~ msgid "CLIENT"
-#~ msgstr "ŽAISTI TINKLE"
+#~ msgid "GAMES"
+#~ msgstr "ŽAIDIMAI"
 
-#~ msgid "START SERVER"
-#~ msgstr "PALEISTI SERVERĮ"
-
-#~ msgid "Name"
-#~ msgstr "Vardas"
-
-#~ msgid "Password"
-#~ msgstr "Slaptažodis"
-
-#~ msgid "SETTINGS"
-#~ msgstr "NUSTATYMAI"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "VIENAS ŽAIDĖJAS"
-
-#~ msgid "MODS"
-#~ msgstr "PAPILDINIAI"
-
-#~ msgid "Add mod:"
-#~ msgstr "Pridėti papildinį:"
+#~ msgid "Game Name"
+#~ msgstr "Žaidimo pavadinimas"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Įkeliama..."
+#~ msgid "If enabled, "
+#~ msgstr "įjungtas"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Išjungti papildinį"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Viešų serverių sąrašas"
+
+#~ msgid "No of course not!"
+#~ msgstr "Ne, tikrai ne!"
+
+#, fuzzy
+#~ msgid "Useful for mod developers."
+#~ msgstr "Pagrindiniai kūrėjai"
diff --git a/po/minetest.pot b/po/minetest.pot
index 0057f76e9..46a74b448 100644
--- a/po/minetest.pot
+++ b/po/minetest.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -941,6 +941,10 @@ msgstr ""
 msgid "Print stacks"
 msgstr ""
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr ""
+
 #: src/guiPasswordChange.cpp
 msgid "Old Password"
 msgstr ""
@@ -1253,10 +1257,6 @@ msgstr ""
 msgid "PA1"
 msgstr ""
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
@@ -1404,7 +1404,7 @@ msgid "Enable Joysticks"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1590,6 +1590,17 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode key"
 msgstr ""
@@ -1673,7 +1684,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -1976,7 +1987,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -2207,6 +2218,16 @@ msgstr ""
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Gamma"
 msgstr ""
@@ -2463,7 +2484,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2728,20 +2749,23 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
+msgid "Maximum number of blocks that are simultaneously sent per client."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3071,30 +3095,6 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Max. clearobjects extra blocks"
 msgstr ""
@@ -3117,7 +3117,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
+msgid "Maximum objects per block"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3941,10 +3941,116 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Profiling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chatcommands"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
 msgstr ""
@@ -4060,3 +4166,13 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index 2d6f3e39c..c3447b08b 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2015-09-20 17:15+0200\n"
 "Last-Translator: Christian Haug <christian@metaboks.org>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
@@ -953,6 +953,10 @@ msgstr ""
 msgid "Use"
 msgstr ""
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr ""
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr ""
@@ -1269,10 +1273,6 @@ msgstr ""
 msgid "X Button 2"
 msgstr ""
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1338,6 +1338,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1412,6 +1416,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr ""
@@ -1444,6 +1452,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr ""
@@ -1484,6 +1496,10 @@ msgstr ""
 msgid "Chat toggle key"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Chatcommands"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1559,14 +1575,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1713,6 +1729,10 @@ msgstr ""
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1729,6 +1749,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1759,14 +1783,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1903,6 +1919,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -1963,10 +1987,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2101,6 +2135,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2135,6 +2173,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2162,15 +2209,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2266,6 +2304,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2301,7 +2373,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2466,6 +2538,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2503,7 +2582,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2653,6 +2732,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3071,6 +3165,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3112,6 +3214,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3119,11 +3225,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3134,10 +3240,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr ""
@@ -3178,10 +3280,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3386,12 +3484,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3399,7 +3503,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3433,6 +3537,10 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr ""
@@ -3591,7 +3699,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3706,10 +3814,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3854,10 +3974,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -3984,7 +4100,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4084,24 +4200,11 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Deaktiver Alle"
+#~ msgid "is required by:"
+#~ msgstr "trengs av:"
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "aktivert"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Spill"
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Advarsel: Noen modifikasjoner er ikke konfigurert enda. \n"
-#~ "De vil bli aktivert som standard når du lagrer konfigurasjonen."
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfigurasjon lagret. "
 
 #~ msgid ""
 #~ "Warning: Some configured mods are missing.\n"
@@ -4110,8 +4213,21 @@ msgstr ""
 #~ "Advarsel: Noen konfigurerte modifikasjoner mangler. \n"
 #~ "Instillingene deres vil bli fjernet når du lagrer konfigurasjonen."
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfigurasjon lagret. "
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Advarsel: Noen modifikasjoner er ikke konfigurert enda. \n"
+#~ "De vil bli aktivert som standard når du lagrer konfigurasjonen."
 
-#~ msgid "is required by:"
-#~ msgstr "trengs av:"
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Spill"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "aktivert"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Deaktiver Alle"
diff --git a/po/nl/minetest.po b/po/nl/minetest.po
index b47d630f5..d33154947 100644
--- a/po/nl/minetest.po
+++ b/po/nl/minetest.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-07-08 10:32+0000\n"
 "Last-Translator: ikmaak <info@ikmaak.nl>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -981,6 +981,10 @@ msgstr "Noclip aan/uit"
 msgid "Use"
 msgstr "Gebruiken"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoomen"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "druk op toets"
@@ -1297,10 +1301,6 @@ msgstr "X knop 1"
 msgid "X Button 2"
 msgstr "X knop 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoomen"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1384,6 +1384,11 @@ msgstr "Bereik waarbinnen blokken actief zijn"
 msgid "Active Block Modifier interval"
 msgstr "Bereik waarbinnen blok wijzigers actief zijn"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Bereik waarbinnen blok wijzigers actief zijn"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Bereik waarbinnen blokken actief zijn"
@@ -1469,6 +1474,10 @@ msgstr "Vraag om de verbinding te herstellen na een server-crash"
 msgid "Automaticaly report to the serverlist."
 msgstr "Meldt de server automatisch aan bij de serverlijst."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Achteruit"
@@ -1501,6 +1510,10 @@ msgstr "Aantal bits per pixel (oftewel: kleurdiepte) in full-screen modus."
 msgid "Build inside player"
 msgstr "Bouwen op de plaats van de speler"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Bumpmapping"
@@ -1541,6 +1554,11 @@ msgstr "Chat-toets"
 msgid "Chat toggle key"
 msgstr "Toets voor tonen/verbergen chat"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Opdracht"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1612,6 +1630,12 @@ msgstr "Wolken in het menu"
 msgid "Colored fog"
 msgstr "Gekleurde mist"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1621,12 +1645,6 @@ msgstr ""
 "mogen gebruiken,\n"
 "zelfs wanneer mod-beveiliging aan staat (via request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Opdracht-toets"
@@ -1779,6 +1797,10 @@ msgstr "Standaardwachtwoord"
 msgid "Default privileges"
 msgstr "Standaardvoorrechten"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1799,6 +1821,10 @@ msgstr ""
 "Maximale afstand (in blokken van 16 nodes) waarbinnen andere spelers "
 "zichtbaar zijn (0 = oneindig ver)."
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Vertraging bij het tonen van tooltips, in milliseconden."
@@ -1831,15 +1857,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr "Textuur-animaties niet synchroniseren"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-"Gedetailleerde profiling-data voor mods. Nuttig voor mod-ontwikkelaars."
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "Gedetailleerde profiling van mods"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1990,6 +2007,15 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Engine profiling data print interval"
+msgstr "Profilergegevens print interval"
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2054,10 +2080,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "Zichthoek"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Zichthoek"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Zichthoek in graden."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Snelle beweging toestaan (met de \"gebruiken\" toets).\n"
+"Het \"fast\" voorrecht is vereist op de server."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2198,6 +2238,10 @@ msgstr "Generiek"
 msgid "Generate normalmaps"
 msgstr "Genereer normaalmappen"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2246,6 +2290,15 @@ msgstr ""
 "-    error: stop de server bij gebruik van een verouderde aanroep "
 "(aanbevolen voor mod ontwikkelaars)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "Vertikale aanvangsgroote van het openingsvenster."
@@ -2277,17 +2330,6 @@ msgstr ""
 "In actieve blokken worden objecten geladen (bijv. dieren die rondlopen) en "
 "ABMs uitgevoerd (bijv. groeien van planten)."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-"Het aantal blokken dat totaal tegelijk onderweg kan zijn, voor de hele "
-"server."
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr "Het aantal blokken dat per cliënt tegelijk onderweg kan zijn."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2405,6 +2447,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr "Chat console achtergrondkleur (R,G,B)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2446,7 +2522,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr "Rechts-klik herhalingsinterval"
 
 #: src/settings_translation_file.cpp
@@ -2676,6 +2752,17 @@ msgstr ""
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Toets om snelle modus aan/uit te schakelen.\n"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2727,8 +2814,9 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2919,6 +3007,22 @@ msgstr "Vloeistof verspreidingssnelheid in seconden."
 msgid "Liquid update tick"
 msgstr "Vloeistof verspreidingssnelheid"
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Bereik waarbinnen blok wijzigers actief zijn"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr "Hoofdmenu spelbeheer"
@@ -3380,6 +3484,16 @@ msgstr "Maximaal aantal geforceerd geladen blokken"
 msgid "Maximum hotbar width"
 msgstr "Maximale breedte van de 'hotbar'"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr "Maximaal aantal spelers dat tegelijk verbonden kan zijn."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "Maximaal aantal blokken in de wachtrij voor laden/genereren."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr "Maximaal aantal blokken in de wachtrij voor laden/genereren."
@@ -3433,6 +3547,11 @@ msgstr "Maximaal aantal spelers dat tegelijk verbonden kan zijn."
 msgid "Maximum number of statically stored objects in a block."
 msgstr "Maximaal aantal objecten per block."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum objects per block"
+msgstr "Maximaal aantal objecten per blok"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -3443,11 +3562,13 @@ msgstr ""
 "Dit is nuttig als er iets links of rechts ervan getoond moet worden."
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+#, fuzzy
+msgid "Maximum simultaneous block sends per client"
 msgstr "Maximaal aantal tegelijk te verzenden blokken per cliënt"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+#, fuzzy
+msgid "Maximum simultaneous block sends total"
 msgstr "Maximaal aantal tegelijk te verzenden blokken (totaal)"
 
 #: src/settings_translation_file.cpp
@@ -3460,10 +3581,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr "Maximaal aantal gebruikers"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr "Maximaal aantal objecten per blok"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Menus"
@@ -3506,10 +3623,6 @@ msgstr "Minimale textuur-grootte voor filters"
 msgid "Mipmapping"
 msgstr "Mip-Mapping"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr "Mod-winkel details URL"
@@ -3753,23 +3866,30 @@ msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 "Voorkom dat mods onveilige commando's uitvoeren, zoals shell commando's."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+"Interval waarmee profiler-gegevens geprint worden. 0 = uitzetten. Dit is "
+"nuttig voor ontwikkelaars."
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
-"Interval waarmee profiler-gegevens geprint worden. 0 = uitzetten. Dit is "
-"nuttig voor ontwikkelaars."
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "Profiler aan/uit toets"
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr "Profilergegevens print interval"
+msgid "Profiling"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3804,6 +3924,11 @@ msgstr "Poort van externe server"
 msgid "Replaces the default main menu with a custom one."
 msgstr "Vervangt het standaard hoofdmenu door een ander."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Font pad"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Toets voor rechts"
@@ -3975,8 +4100,9 @@ msgstr ""
 "Golvend water staat aan indien 'true'Dit vereist dat 'shaders' ook aanstaan."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -4105,10 +4231,22 @@ msgstr "Pad van texturen"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Het netwerk-adres waar de server op verbindingen wacht."
@@ -4278,10 +4416,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Gebruik tri-lineaire filtering om texturen te schalen."
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Nuttig voor mod-ontwikkelaars."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr "V-Sync"
@@ -4417,7 +4551,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4544,121 +4678,239 @@ msgstr "Maximaal parallellisme in cURL"
 msgid "cURL timeout"
 msgstr "cURL timeout"
 
-#~ msgid "No of course not!"
-#~ msgstr "Nee, natuurlijk niet!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Publieke Serverlijst"
-
-#~ msgid "No!!!"
-#~ msgstr "Nee!!!"
-
 #, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Algemene wereldgenerator instellingen.\n"
+#~ "Wereldgenerator instellingen specified voor generator v7.\n"
+#~ "\"ridges\" zijn rivieren.\n"
 #~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 #~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten.\n"
-#~ "'trees' en 'flat' zijn enkel van toepassing in mgv6."
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "MP uitschakelen"
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Wereldgenerator instellingen specified voor generator v6.\n"
+#~ "Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en "
+#~ "wordt de \"jungles\" vlag genegeerd.\n"
+#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
+#~ "waarde.\n"
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+
+#~ msgid "Item textures..."
+#~ msgstr "Voorwerp-texturen..."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n"
+#~ "Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n"
+#~ "wateroppervlakte werkt niet als dit is aangeschakeld."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr "Laat geselecteerde nodes oplichten (schakelt selectie-randen uit)."
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Juliaverzameling: (X,Y,X) afstanden van wereld-centrum.\n"
+#~ "Bereik is ongeveer -2 tot 2. Vermenigvuldig met j_scale voor de afstand "
+#~ "in nodes."
+
+#~ msgid ""
+#~ "Julia set: W value determining the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Juliaverzameling: W-waarde van de 4D vorm.\n"
+#~ "Bereik is ongeveer -2 tot 2."
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Toets voor het verkleinen van de zichtafstand. Dit verandert de minimale "
+#~ "zichtafstand.\n"
+#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Toets voor het vergroten van de zichtafstand. Dit verandert de minimale "
+#~ "zichtafstand.\n"
+#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Mandelbrot verzameling: (X,Y,Z) afstanden vanaf wereld-centrum.\n"
+#~ " Bereik is ongeveer -2 tot 2. Vermenigvuldig met m_scale voor de afstand "
+#~ "in nodes."
+
+#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+#~ msgstr "Mandelbrot verzameling: (X,Y,Z) schaal, in nodes (bij benadering)."
+
+#~ msgid ""
+#~ "Mandelbrot set: Iterations of the recursive function.\n"
+#~ "Controls scale of finest detail."
+#~ msgstr ""
+#~ "Mandelbrot verzameling: Aantal iteraties van de recursieve functie.\n"
+#~ "Bepaalt de schaal van de kleinste details."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen fractal.\n"
+#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with \"no\" are used to explicitly disable them."
+#~ msgstr ""
+#~ "Wereldgeneratie instellingen voor de fractal generator.\n"
+#~ "'julia' selecterd een julia-verzameling in plaats van een mandebrot-"
+#~ "verzameling.\n"
+#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
+#~ "waarde.\n"
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+
+#~ msgid "Mapgen fractal mandelbrot iterations"
+#~ msgstr "Fractal wereldgenerator mandelbrot iteraties"
+
+#~ msgid "Mapgen fractal mandelbrot offset"
+#~ msgstr "Fractal wereldgenerator mandelbrot centrum-afstand"
+
+#~ msgid "Mapgen fractal mandelbrot scale"
+#~ msgstr "Fractal wereldgenerator mandelbrot schaal"
+
+#~ msgid "Mapgen fractal mandelbrot slice w"
+#~ msgstr "Fractal wereldgenerator mandelbrot w-doorsnede"
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Maximum hoogte boven waterniveau waar een speler geboren wordt.\n"
+#~ "Bij hogere waarden zullen de plaatsen dichter bij (x = 0, z = 0) liggen.\n"
+#~ "Bij lagere waarden kan het zijn dat een geschikte plek niet gevonden "
+#~ "wordt,\n"
+#~ "in dat geval wordt de speler geboren op (0, 0, 0), mogelijk onder de "
+#~ "grond."
+
+#~ msgid ""
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Minimaal gewenste FPS.\n"
+#~ "De hoeveelheid gerenderd materiaal wordt aangepast afhankelijk van deze "
+#~ "waarde, en van de min en max zichtafstanden."
+
+#~ msgid "New style water"
+#~ msgstr "Nieuw water"
+
+#~ msgid ""
+#~ "Pre-generate all item visuals used in the inventory.\n"
+#~ "This increases startup time, but runs smoother in-game.\n"
+#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
+#~ "the inventory."
+#~ msgstr ""
+#~ "Genereer beelden van objecten in de rugzak vooraf.\n"
+#~ "De start-tijd wordt hierdoor langer, maar het spel wordt vloeiender.\n"
+#~ "Dit kost veel geheugen op de videokaart. Als die onvoldoende geheugen "
+#~ "heeft kan dit resulteren in vreemde effecten."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Laad rugzak-texturen vooraf"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Aanvangshoogte van het window."
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Vertikaal geboortegebied"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Minimale zichtafstand"
+
+#~ msgid "Wanted FPS"
+#~ msgstr "Gewenste FPS"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Schaal-factor toegepast op menu elementen: "
 
 #, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "ingeschakeld"
+#~ msgid "Downloading"
+#~ msgstr "Downloaden"
 
-#~ msgid "Rendering:"
-#~ msgstr "Rendering:"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Herstart minetest om de driver te activeren"
-
-#~ msgid "Game Name"
-#~ msgstr "Spel"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren"
-
-#~ msgid "GAMES"
-#~ msgstr "SPELLEN"
-
-#~ msgid "Mods:"
-#~ msgstr "Mods:"
-
-#~ msgid "new game"
-#~ msgstr "nieuw spel"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "SPEL AANPASSEN"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Geselecteerde mod verwijderen"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Mod toevoegen"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "START SERVER"
-#~ msgstr "START SERVER"
-
-#~ msgid "Name"
-#~ msgstr "Naam"
-
-#~ msgid "Password"
-#~ msgstr "Wachtwoord"
-
-#~ msgid "SETTINGS"
-#~ msgstr "INSTELLINGEN"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Voorwerpen vooraf laden"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Eindige vloeistoffen"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "SINGLEPLAYER"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "TEXTUREN"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "Add mod:"
-#~ msgstr "Mod toevoegen:"
-
-#~ msgid "Local install"
-#~ msgstr "Plaatselijk installeren"
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
+#~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
-#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n"
-#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie "
-#~ "bewaard. "
+#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "LEt op: Sommige ingestelde mods zijn vermist.\n"
-#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. "
+#~ msgid "is required by:"
+#~ msgstr "is benodigd voor:"
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Instellingen bewaard. "
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Waarschuwing: Instellingen niet consistent. "
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens"
+
+#~ msgid "Show Public"
+#~ msgstr "Publieke server"
+
+#~ msgid "Show Favorites"
+#~ msgstr "Favourieten"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Laat het adres leeg om een lokale server te starten."
+
+#~ msgid "Create world"
+#~ msgstr "Maak wereld aan"
+
+#~ msgid "Address required."
+#~ msgstr "IP-adres nodig."
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Deze bestanden worden verwijderd"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Niet alle bestanden zijn verwijderd"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4685,236 +4937,138 @@ msgstr "cURL timeout"
 #~ "- ESC: Menu\n"
 #~ "- T: Chat\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Niet alle bestanden zijn verwijderd"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Deze bestanden worden verwijderd"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd"
-
-#~ msgid "Address required."
-#~ msgstr "IP-adres nodig."
-
-#~ msgid "Create world"
-#~ msgstr "Maak wereld aan"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Laat het adres leeg om een lokale server te starten."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Favourieten"
-
-#~ msgid "Show Public"
-#~ msgstr "Publieke server"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Waarschuwing: Instellingen niet consistent. "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Instellingen bewaard. "
-
-#~ msgid "is required by:"
-#~ msgstr "is benodigd voor:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
 #~ msgstr ""
-#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item"
+#~ "LEt op: Sommige ingestelde mods zijn vermist.\n"
+#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. "
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n"
+#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie "
+#~ "bewaard. "
+
+#~ msgid "Local install"
+#~ msgstr "Plaatselijk installeren"
+
+#~ msgid "Add mod:"
+#~ msgstr "Mod toevoegen:"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "TEXTUREN"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "SINGLEPLAYER"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Eindige vloeistoffen"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Voorwerpen vooraf laden"
+
+#~ msgid "SETTINGS"
+#~ msgstr "INSTELLINGEN"
+
+#~ msgid "Password"
+#~ msgstr "Wachtwoord"
+
+#~ msgid "Name"
+#~ msgstr "Naam"
+
+#~ msgid "START SERVER"
+#~ msgstr "START SERVER"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Mod toevoegen"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Geselecteerde mod verwijderen"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "SPEL AANPASSEN"
+
+#~ msgid "new game"
+#~ msgstr "nieuw spel"
+
+#~ msgid "Mods:"
+#~ msgstr "Mods:"
+
+#~ msgid "GAMES"
+#~ msgstr "SPELLEN"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren"
+
+#~ msgid "Game Name"
+#~ msgstr "Spel"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Herstart minetest om de driver te activeren"
+
+#~ msgid "Rendering:"
+#~ msgstr "Rendering:"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Downloaden"
+#~ msgid "If enabled, "
+#~ msgstr "ingeschakeld"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Schaal-factor toegepast op menu elementen: "
-
-#~ msgid "Wanted FPS"
-#~ msgstr "Gewenste FPS"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Minimale zichtafstand"
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Vertikaal geboortegebied"
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Aanvangshoogte van het window."
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Laad rugzak-texturen vooraf"
-
-#~ msgid ""
-#~ "Pre-generate all item visuals used in the inventory.\n"
-#~ "This increases startup time, but runs smoother in-game.\n"
-#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
-#~ "the inventory."
-#~ msgstr ""
-#~ "Genereer beelden van objecten in de rugzak vooraf.\n"
-#~ "De start-tijd wordt hierdoor langer, maar het spel wordt vloeiender.\n"
-#~ "Dit kost veel geheugen op de videokaart. Als die onvoldoende geheugen "
-#~ "heeft kan dit resulteren in vreemde effecten."
-
-#~ msgid "New style water"
-#~ msgstr "Nieuw water"
-
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Minimaal gewenste FPS.\n"
-#~ "De hoeveelheid gerenderd materiaal wordt aangepast afhankelijk van deze "
-#~ "waarde, en van de min en max zichtafstanden."
-
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Maximum hoogte boven waterniveau waar een speler geboren wordt.\n"
-#~ "Bij hogere waarden zullen de plaatsen dichter bij (x = 0, z = 0) liggen.\n"
-#~ "Bij lagere waarden kan het zijn dat een geschikte plek niet gevonden "
-#~ "wordt,\n"
-#~ "in dat geval wordt de speler geboren op (0, 0, 0), mogelijk onder de "
-#~ "grond."
-
-#~ msgid "Mapgen fractal mandelbrot slice w"
-#~ msgstr "Fractal wereldgenerator mandelbrot w-doorsnede"
-
-#~ msgid "Mapgen fractal mandelbrot scale"
-#~ msgstr "Fractal wereldgenerator mandelbrot schaal"
-
-#~ msgid "Mapgen fractal mandelbrot offset"
-#~ msgstr "Fractal wereldgenerator mandelbrot centrum-afstand"
-
-#~ msgid "Mapgen fractal mandelbrot iterations"
-#~ msgstr "Fractal wereldgenerator mandelbrot iteraties"
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen fractal.\n"
-#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
-#~ msgstr ""
-#~ "Wereldgeneratie instellingen voor de fractal generator.\n"
-#~ "'julia' selecterd een julia-verzameling in plaats van een mandebrot-"
-#~ "verzameling.\n"
-#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
-#~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
-
-#~ msgid ""
-#~ "Mandelbrot set: Iterations of the recursive function.\n"
-#~ "Controls scale of finest detail."
-#~ msgstr ""
-#~ "Mandelbrot verzameling: Aantal iteraties van de recursieve functie.\n"
-#~ "Bepaalt de schaal van de kleinste details."
-
-#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
-#~ msgstr "Mandelbrot verzameling: (X,Y,Z) schaal, in nodes (bij benadering)."
-
-#~ msgid ""
-#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Mandelbrot verzameling: (X,Y,Z) afstanden vanaf wereld-centrum.\n"
-#~ " Bereik is ongeveer -2 tot 2. Vermenigvuldig met m_scale voor de afstand "
-#~ "in nodes."
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Toets voor het vergroten van de zichtafstand. Dit verandert de minimale "
-#~ "zichtafstand.\n"
-#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Toets voor het verkleinen van de zichtafstand. Dit verandert de minimale "
-#~ "zichtafstand.\n"
-#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Julia set: W value determining the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Juliaverzameling: W-waarde van de 4D vorm.\n"
-#~ "Bereik is ongeveer -2 tot 2."
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Juliaverzameling: (X,Y,X) afstanden van wereld-centrum.\n"
-#~ "Bereik is ongeveer -2 tot 2. Vermenigvuldig met j_scale voor de afstand "
-#~ "in nodes."
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr "Laat geselecteerde nodes oplichten (schakelt selectie-randen uit)."
-
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n"
-#~ "Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n"
-#~ "wateroppervlakte werkt niet als dit is aangeschakeld."
-
-#~ msgid "Item textures..."
-#~ msgstr "Voorwerp-texturen..."
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "MP uitschakelen"
 
 #, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Wereldgenerator instellingen specified voor generator v6.\n"
-#~ "Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en "
-#~ "wordt de \"jungles\" vlag genegeerd.\n"
+#~ "Algemene wereldgenerator instellingen.\n"
 #~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 #~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten.\n"
+#~ "'trees' en 'flat' zijn enkel van toepassing in mgv6."
+
+#~ msgid "No!!!"
+#~ msgstr "Nee!!!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Publieke Serverlijst"
+
+#~ msgid "No of course not!"
+#~ msgstr "Nee, natuurlijk niet!"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Nuttig voor mod-ontwikkelaars."
+
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "Het aantal blokken dat per cliënt tegelijk onderweg kan zijn."
 
-#, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
 #~ msgstr ""
-#~ "Wereldgenerator instellingen specified voor generator v7.\n"
-#~ "\"ridges\" zijn rivieren.\n"
-#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
-#~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+#~ "Het aantal blokken dat totaal tegelijk onderweg kan zijn, voor de hele "
+#~ "server."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Gedetailleerde profiling van mods"
+
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr ""
+#~ "Gedetailleerde profiling-data voor mods. Nuttig voor mod-ontwikkelaars."
diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index 47600b712..42d2fe3d1 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-07-29 19:02+0000\n"
 "Last-Translator: Mateusz Mendel <mendelm9@gmail.com>\n"
-"Language-Team: Polish "
-"<https://hosted.weblate.org/projects/minetest/minetest/pl/>\n"
+"Language-Team: Polish <https://hosted.weblate.org/projects/minetest/minetest/"
+"pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -977,6 +977,10 @@ msgstr "Przełącz tryb noclip"
 msgid "Use"
 msgstr "Użyj"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoom"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "naciśnij klawisz"
@@ -1294,10 +1298,6 @@ msgstr "X Button 1"
 msgid "X Button 2"
 msgstr "X Button 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoom"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1365,7 +1365,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "A message to be displayed to all clients when the server crashes."
-msgstr "Wiadomość wyświetlana wszystkim klientom kiedy serwer zerwie połączenie"
+msgstr ""
+"Wiadomość wyświetlana wszystkim klientom kiedy serwer zerwie połączenie"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1394,6 +1395,11 @@ msgstr "Interwał zarządzania aktywnym blokiem"
 msgid "Active Block Modifier interval"
 msgstr "Interwał modyfikatora aktywnego bloku"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Interwał modyfikatora aktywnego bloku"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Active block range"
@@ -1473,8 +1479,8 @@ msgid ""
 "minetest.net."
 msgstr ""
 "Zgłoś do tej listy serwerów.\n"
-"Jeśli chcesz zgłosić twój adres ipv6, użyj serverlist_url = "
-"v6.servers.minetest.net"
+"Jeśli chcesz zgłosić twój adres ipv6, użyj serverlist_url = v6.servers."
+"minetest.net"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1491,6 +1497,10 @@ msgstr "Poproś o ponowne połączenie po awarii"
 msgid "Automaticaly report to the serverlist."
 msgstr "Automatycznie zgłoś do listy serwerów."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Klawisz wstecz"
@@ -1529,6 +1539,10 @@ msgstr "Bity na pixel (aka głębia koloru) w trybie pełnoekranowym."
 msgid "Build inside player"
 msgstr "Gra wieloosobowa"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Mapowanie wypukłości"
@@ -1576,6 +1590,11 @@ msgstr "Klawisz czatu"
 msgid "Chat toggle key"
 msgstr "Klawisz przełączania czatu"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Komenda"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1677,6 +1696,15 @@ msgstr "Chmury w menu"
 msgid "Colored fog"
 msgstr "Kolorowa mgła"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Lista oddzielonych przecinkiem modów które mają pozwolenie na dostęp do\n"
+"API HTTP, które pozwala im wysyłać i pobierać dane do/z internetu."
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1686,15 +1714,6 @@ msgstr ""
 "Lista oddzielona przecinkiem zaufanych modów które mają dostęp\n"
 "do niebezpiecznych funkcji nawet gdy zabezpieczenie modów jest włączone"
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Lista oddzielonych przecinkiem modów które mają pozwolenie na dostęp do\n"
-"API HTTP, które pozwala im wysyłać i pobierać dane do/z internetu."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Klawisz komend"
@@ -1870,6 +1889,10 @@ msgstr "Domyślne hasło"
 msgid "Default privileges"
 msgstr "Domyślne uprawnienia"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1895,6 +1918,10 @@ msgstr ""
 "Definiuje maksymalną odległość przesyłania graczy w blokach (0 = "
 "nieskończoność)."
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -1934,16 +1961,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr "Odsynchronizuj animację bloków"
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr "Szczegółowe dane profilowania. Przydatne dla twórców modyfikacji."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Detailed mod profiling"
-msgstr "Szczegółowe profilowanie modyfikacji"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2062,8 +2079,8 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 "Włącza używanie zdalnego serwera mediów (jeżeli dostarczany przez serwer).\n"
-"Zdalny serwer oferuje znacząco szybszy sposób pobierania mediów (np. tekstur)"
-"\n"
+"Zdalny serwer oferuje znacząco szybszy sposób pobierania mediów (np. "
+"tekstur)\n"
 "jeżeli następuje połączenie z serwerem."
 
 #: src/settings_translation_file.cpp
@@ -2125,6 +2142,14 @@ msgstr ""
 "Włącza mapowanie paralaksy.\n"
 "Wymaga włączenia shaderów."
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2201,11 +2226,25 @@ msgstr ""
 msgid "Field of view"
 msgstr "Pole widzenia"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Pole widzenia"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Field of view in degrees."
 msgstr "Pole widzenia w stopniach."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Szybkie poruszanie się (przez klawisz użycia).\n"
+"Wymaga przywileju \"fast\" na serwerze."
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2324,8 +2363,8 @@ msgstr ""
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
-"Z jakiej odległości bloki są przesyłane do klientów, zapisane w blokach map("
-"16 jednostek)"
+"Z jakiej odległości bloki są przesyłane do klientów, zapisane w blokach "
+"map(16 jednostek)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2377,6 +2416,10 @@ msgstr "Ogólne"
 msgid "Generate normalmaps"
 msgstr "Generuj mapy normalnych"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2424,11 +2467,20 @@ msgid ""
 msgstr ""
 "Obsługa przestarzałych wywołań lua api:\n"
 "- legacy: (próbuje) naśladuje stare zachowanie (domyślne dla wydań).\n"
-"- log: naśladuje i loguje przestarzałe wywołania (domyślne dla wersji debug)."
-"\n"
+"- log: naśladuje i loguje przestarzałe wywołania (domyślne dla wersji "
+"debug).\n"
 "- error: przerywa kiedy zostanie użyte przestarzałe api (sugerowane dla "
 "twórców modów)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Height component of the initial window size."
@@ -2465,19 +2517,6 @@ msgstr ""
 "map(16 jednostek).\n"
 "Na aktywnych blokach obiekty są wczytywane i ABMs działa."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-"Jak dużo bloków może jednocześnie być przesyłana przez sieć dla całego "
-"serwera."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr "Jak dużo bloków może być przesyłanych jednocześnie na jednego klienta."
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2531,8 +2570,8 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
-"Jeżeli włączone razem z trybem latania, gracz może latać przez solidne bloki."
-"\n"
+"Jeżeli włączone razem z trybem latania, gracz może latać przez solidne "
+"bloki.\n"
 "Wymaga przywileju \"noclip\" na serwerze."
 
 #: src/settings_translation_file.cpp
@@ -2607,6 +2646,40 @@ msgstr "Kanał alfa konsoli w grze (od 0 do 255)"
 msgid "In-game chat console background color (R,G,B)."
 msgstr "Kolor konsoli czatu w grze (R,G,B)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Interval of saving important changes in the world, stated in seconds."
@@ -2651,7 +2724,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr "Interwał powtarzania przycisku joysticka"
 
 #: src/settings_translation_file.cpp
@@ -2721,8 +2794,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz zmniejszania zasięgu widzenia.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2732,8 +2805,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz wyrzucenia aktualnie wybranego przedmiotu.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2743,8 +2816,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz zwiększania zasięgu widzenia.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2754,8 +2827,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz skakania.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2765,8 +2838,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz szybkiego poruszania się w trybie \"fast\"\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2776,8 +2849,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz poruszania się wstecz.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2787,8 +2860,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz poruszania się na przód,\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2798,8 +2871,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz poruszania się w lewo.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2809,8 +2882,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz poruszania się w prawo.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2820,8 +2893,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz otwierania konsoli czatu.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2831,8 +2904,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz otwierania okna czatu aby wpisać komendę.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2842,8 +2915,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz otwierania okna czatu.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2853,8 +2926,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz otwierania inwentarza.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2864,8 +2937,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz wyświetlania danych debugowania. Przydatne dla deweloperów.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2879,8 +2952,8 @@ msgstr ""
 "Klawisz skradania.\n"
 "Także używany do schodzenia w dół i opadania w wodzie jeżeli aux1_descends "
 "jest wyłączone.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2890,8 +2963,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania pomiedzy kamerą z pierwszej i trzeciej osoby.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2901,8 +2974,19 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz do zrobienia zrzutu ekranu.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Klawisz przełączania trybu szybkiego.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2912,8 +2996,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania trybu cinematic.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2923,8 +3007,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania wyświetlania minimapy.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2934,8 +3018,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania trybu szybkiego.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2945,8 +3029,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania latania.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2956,19 +3040,19 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania trybu noclip.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania aktualizacji kamery. Przydatne tylko dla deweloperów.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2978,8 +3062,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania informacji debugowania.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2989,8 +3073,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania wyświetlania HUD.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3000,8 +3084,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania wyświetlania czatu.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3011,8 +3095,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania wyświetlania mgły\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3022,8 +3106,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania wyświetlania profilera. Przydatne dla deweloperów.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3033,8 +3117,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Klawisz przełączania nieograniczonego pola widzenia.\n"
-"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901"
-"735e3da1b0edf72eb3"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3162,6 +3246,22 @@ msgstr "Interwał aktualizacji cieczy podany w sekundach"
 msgid "Liquid update tick"
 msgstr "Interwał czasowy aktualizacji cieczy"
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Interwał modyfikatora aktywnego bloku"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Main menu game manager"
@@ -3596,6 +3696,15 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "Jak dużo bloków może być przesyłanych jednocześnie na jednego klienta."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3637,6 +3746,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3644,11 +3757,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3659,10 +3772,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Menu"
@@ -3705,11 +3814,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mip-Mappowanie"
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Mod profiling"
-msgstr "Profilowanie modyfikacji"
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3927,12 +4031,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3940,8 +4050,9 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr ""
+#, fuzzy
+msgid "Profiling"
+msgstr "Profilowanie modyfikacji"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3976,6 +4087,11 @@ msgstr "Port zdalny"
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Ścieżka czcionki"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "W prawo"
@@ -4143,7 +4259,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -4260,10 +4376,22 @@ msgstr "Paczki tekstur"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -4408,10 +4536,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Przydatne dla twórców modyfikacji."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4538,7 +4662,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4644,101 +4768,60 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "Limit czasu cURL"
 
-#~ msgid "No of course not!"
-#~ msgstr "Oczywiście, że nie!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista publicznych serwerów"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generuj mapy normalnych"
-
-#~ msgid "No!!!"
-#~ msgstr "Nie!!"
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Ładowanie..."
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Wyłącz wszystkie"
+#~ msgid "Downloading"
+#~ msgstr "Ściągnij"
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "włączone"
-
-#~ msgid "Game Name"
-#~ msgstr "Nazwa Gry"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się"
-
-#~ msgid "GAMES"
-#~ msgstr "GRY"
-
-#~ msgid "Mods:"
-#~ msgstr "Mody:"
-
-#~ msgid "new game"
-#~ msgstr "nowa gra"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "EDYTUJ GRĘ"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Usuń zaznaczony mod"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<--Dodaj mod"
-
-#~ msgid "CLIENT"
-#~ msgstr "KLIENT"
-
-#~ msgid "START SERVER"
-#~ msgstr "URUCHOM SERWER"
-
-#~ msgid "Name"
-#~ msgstr "Nazwa"
-
-#~ msgid "Password"
-#~ msgstr "Hasło"
-
-#~ msgid "SETTINGS"
-#~ msgstr "USTAWIENIA"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Ładuj obrazy przedmiotów"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Realistyczne ciecze"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "TRYB JEDNOOSOBOWY"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACZKI TEKSTUR"
-
-#~ msgid "MODS"
-#~ msgstr "MODY"
-
-#, fuzzy
-#~ msgid "Add mod:"
-#~ msgstr "<<--Dodaj mod"
-
-#, fuzzy
-#~ msgid "Local install"
-#~ msgstr "Instaluj"
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
+#~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
-#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n"
-#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację.  "
+#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: "
+#~ "przenieś pojedynczy przedmiot"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n"
-#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację.  "
+#~ msgid "is required by:"
+#~ msgstr "wymagane przez:"
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguracja zapisana.  "
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny.  "
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki"
+
+#~ msgid "Show Public"
+#~ msgstr "Pokaż publiczne"
+
+#~ msgid "Show Favorites"
+#~ msgstr "Pokaż ulubione"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny."
+
+#~ msgid "Create world"
+#~ msgstr "Stwórz świat"
+
+#~ msgid "Address required."
+#~ msgstr "Wymagany adres."
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Nie można skasować świata: nic nie zaznaczono"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Pliki do skasowania"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Nie udało się skasować wszystkich plików świata"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4765,57 +4848,117 @@ msgstr "Limit czasu cURL"
 #~ "- ESC: to menu\n"
 #~ "- T: czat\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Nie udało się skasować wszystkich plików świata"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Pliki do skasowania"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Nie można skasować świata: nic nie zaznaczono"
-
-#~ msgid "Address required."
-#~ msgstr "Wymagany adres."
-
-#~ msgid "Create world"
-#~ msgstr "Stwórz świat"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Pokaż ulubione"
-
-#~ msgid "Show Public"
-#~ msgstr "Pokaż publiczne"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny.  "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguracja zapisana.  "
-
-#~ msgid "is required by:"
-#~ msgstr "wymagane przez:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
 #~ msgstr ""
-#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: "
-#~ "przenieś pojedynczy przedmiot"
+#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n"
+#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację.  "
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n"
+#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację.  "
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Ściągnij"
+#~ msgid "Local install"
+#~ msgstr "Instaluj"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Ładowanie..."
+#~ msgid "Add mod:"
+#~ msgstr "<<--Dodaj mod"
+
+#~ msgid "MODS"
+#~ msgstr "MODY"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACZKI TEKSTUR"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "TRYB JEDNOOSOBOWY"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Realistyczne ciecze"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Ładuj obrazy przedmiotów"
+
+#~ msgid "SETTINGS"
+#~ msgstr "USTAWIENIA"
+
+#~ msgid "Password"
+#~ msgstr "Hasło"
+
+#~ msgid "Name"
+#~ msgstr "Nazwa"
+
+#~ msgid "START SERVER"
+#~ msgstr "URUCHOM SERWER"
+
+#~ msgid "CLIENT"
+#~ msgstr "KLIENT"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<--Dodaj mod"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Usuń zaznaczony mod"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "EDYTUJ GRĘ"
+
+#~ msgid "new game"
+#~ msgstr "nowa gra"
+
+#~ msgid "Mods:"
+#~ msgstr "Mody:"
+
+#~ msgid "GAMES"
+#~ msgstr "GRY"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się"
+
+#~ msgid "Game Name"
+#~ msgstr "Nazwa Gry"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "włączone"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Wyłącz wszystkie"
+
+#~ msgid "No!!!"
+#~ msgstr "Nie!!"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generuj mapy normalnych"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista publicznych serwerów"
+
+#~ msgid "No of course not!"
+#~ msgstr "Oczywiście, że nie!"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Przydatne dla twórców modyfikacji."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr ""
+#~ "Jak dużo bloków może jednocześnie być przesyłana przez sieć dla całego "
+#~ "serwera."
+
+#, fuzzy
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Szczegółowe profilowanie modyfikacji"
+
+#, fuzzy
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "Szczegółowe dane profilowania. Przydatne dla twórców modyfikacji."
diff --git a/po/pt/minetest.po b/po/pt/minetest.po
index 6ea462a41..907746b03 100644
--- a/po/pt/minetest.po
+++ b/po/pt/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-07-21 00:15+0000\n"
 "Last-Translator: Bruno Borges <borgesdossantosbruno@gmail.com>\n"
-"Language-Team: Portuguese "
-"<https://hosted.weblate.org/projects/minetest/minetest/pt/>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/minetest/"
+"minetest/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -988,6 +988,10 @@ msgstr "Ativar/Desativar noclip"
 msgid "Use"
 msgstr "Usar"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoom"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "pressione a tecla"
@@ -1304,10 +1308,6 @@ msgstr "Botão X 1"
 msgid "X Button 2"
 msgstr "Botão X 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoom"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1397,6 +1397,11 @@ msgstr "Distância de ativação de blocos"
 msgid "Active Block Modifier interval"
 msgstr "Distância de ativação de blocos"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Distância de ativação de blocos"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Distância de ativação de blocos"
@@ -1483,6 +1488,10 @@ msgstr "Pedir para reconectar após de bloqueio de sistema"
 msgid "Automaticaly report to the serverlist."
 msgstr "Informar automáticamente a lista de servidores."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Tecla para andar para trás"
@@ -1516,6 +1525,10 @@ msgstr "Bits por pixel (profundidade de cor) no modo de ecrã inteiro."
 msgid "Build inside player"
 msgstr "Construir com o jogador dentro do cubo"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Bump mapping"
@@ -1556,6 +1569,11 @@ msgstr "Tecla de conversação"
 msgid "Chat toggle key"
 msgstr "Tecla mostra/esconde conversação"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Comando"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1646,6 +1664,16 @@ msgstr "Nuvens no menu"
 msgid "Colored fog"
 msgstr "Névoa colorida"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Lista separada por vírgulas de extras que podem usar APIs de requisição "
+"HTTP, \n"
+"que lhes permitem enviar e descarregar dados para/da internet."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1656,15 +1684,6 @@ msgstr ""
 "mesmo quando a segurança de extras está ativada (via "
 "request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Lista separada por vírgulas de extras que podem usar APIs de requisição "
-"HTTP, \n"
-"que lhes permitem enviar e descarregar dados para/da internet."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Tecla de comando"
@@ -1819,6 +1838,10 @@ msgstr "Senha por defeito"
 msgid "Default privileges"
 msgstr "Privilégios por defeito"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1841,6 +1864,10 @@ msgstr ""
 "Define distância máxima de transferência de jogadores em blocos (0 = "
 "ilimitado)."
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Latência de apresentação de dicas de ferramentas, em milissegundos."
@@ -1873,15 +1900,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr "Dessincroniza animação de blocos"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-"Dados de perfil detalhados do extra. Útil para desenvolvedores de extras."
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "Dados de perfil detalhados do extra"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2032,6 +2050,14 @@ msgstr ""
 "Ativa mapeamento de oclusão de paralaxe.\n"
 "Requer sombreadores ativados."
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2094,10 +2120,25 @@ msgstr ""
 msgid "Field of view"
 msgstr "Campo de visão"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Campo de visão"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Campo de visão em graus."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Se ativado com o modo de vôo, o jogador é capaz de voar através de cubos "
+"sólidos.\n"
+"Isto requer o privilégio \"noclip\" no servidor."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2239,6 +2280,10 @@ msgstr "Geral"
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2278,6 +2323,15 @@ msgstr ""
 "-    log: imita e regista no log (por defeito em versão de depuração).\n"
 "-    error: aborta (sugerido para desenvolvedores de extras)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "Altura da janela inicial."
@@ -2307,15 +2361,6 @@ msgstr ""
 "Dimensão da área de blocos mantida ativa, em mapblocks (16^3 cubos).\n"
 "Em blocos ativos objetos são carregados e ABMs são executados."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2416,6 +2461,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr "Côr de fundo da consola de conversação (R,G,B)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2451,7 +2530,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2638,6 +2717,17 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla para ativar/desativar a exibição do mini-mapa.\n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2677,11 +2767,15 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tecla para imprimir pilhas de depuração. Usado para o desenvolvimento.\n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2843,6 +2937,22 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Distância de ativação de blocos"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3266,6 +3376,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3307,6 +3425,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3314,11 +3436,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3329,10 +3451,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Opções para menus"
@@ -3373,10 +3491,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mapeamento MIP"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3581,12 +3695,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3594,7 +3714,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3630,6 +3750,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Caminho para ficheiro fonte"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Tecla para a direita"
@@ -3797,7 +3922,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3913,10 +4038,22 @@ msgstr "Caminho para a pasta de texturas"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -4069,10 +4206,6 @@ msgstr "Usa mapeamento MIP para escalar texturas. Pode melhorar performance."
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Útil para desenvolvedores de extras."
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4204,7 +4337,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4320,103 +4453,58 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "Não, é claro que não!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista de Servidores Públicos"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Gerar Normalmaps"
-
-#~ msgid "No!!!"
-#~ msgstr "Não!!!"
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "A carregar..."
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Desativar Tudo"
+#~ msgid "Downloading"
+#~ msgstr "Descarregar"
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "ativo"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Botão esq: Mover todos os itens  Botão dir: Mover um item"
 
-#~ msgid "Game Name"
-#~ msgstr "Nome do Jogo"
+#~ msgid "is required by:"
+#~ msgstr "é necessário pelo:"
 
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr ""
-#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo "
-#~ "\"$2\""
+#~ msgid "Configuration saved.  "
+#~ msgstr "Configuração gravada.  "
 
-#~ msgid "GAMES"
-#~ msgstr "JOGOS"
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Atenção: Configuração não compatível.  "
 
-#~ msgid "Mods:"
-#~ msgstr "Extras:"
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos"
 
-#~ msgid "new game"
-#~ msgstr "novo jogo"
+#~ msgid "Show Public"
+#~ msgstr "Mostrar Públicos"
 
-#~ msgid "EDIT GAME"
-#~ msgstr "EDITAR JOGO"
+#~ msgid "Show Favorites"
+#~ msgstr "Mostrar Favoritos"
 
-#~ msgid "Remove selected mod"
-#~ msgstr "Remover extra selecionado"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Deixe endereço em branco para iniciar servidor local."
 
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Adicionar extra"
+#~ msgid "Create world"
+#~ msgstr "Criar mundo"
 
-#~ msgid "CLIENT"
-#~ msgstr "CLIENTE"
+#~ msgid "Address required."
+#~ msgstr "Endereço necessário."
 
-#~ msgid "START SERVER"
-#~ msgstr "INICIAR SERVIDOR"
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado"
 
-#~ msgid "Name"
-#~ msgstr "Nome"
+#~ msgid "Files to be deleted"
+#~ msgstr "Ficheiros para eliminar"
 
-#~ msgid "Password"
-#~ msgstr "Senha"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos"
 
-#~ msgid "SETTINGS"
-#~ msgstr "DEFINIÇÕES"
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Não foi possível configurar mundo: Nada seleccionado"
 
-#~ msgid "Preload item visuals"
-#~ msgstr "Pré-carregamento dos itens"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Líquido Finito"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "Um Jogador"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACOTES DE TEXTURAS"
-
-#~ msgid "MODS"
-#~ msgstr "EXTRAS"
-
-#, fuzzy
-#~ msgid "Add mod:"
-#~ msgstr "<<-- Adicionar extra"
-
-#, fuzzy
-#~ msgid "Local install"
-#~ msgstr "Instalar"
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods ainda não estão configurados.\n"
-#~ "Eles vão ser ativados por predefinição quando guardar a configuração.  "
-
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods configurados estão em falta.\n"
-#~ "As suas definições vão ser removidas quando gravar a configuração.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4443,55 +4531,110 @@ msgstr ""
 #~ "- ESC: Este menu\n"
 #~ "- T: Chat\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods configurados estão em falta.\n"
+#~ "As suas definições vão ser removidas quando gravar a configuração.  "
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Não foi possível configurar mundo: Nada seleccionado"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Ficheiros para eliminar"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado"
-
-#~ msgid "Address required."
-#~ msgstr "Endereço necessário."
-
-#~ msgid "Create world"
-#~ msgstr "Criar mundo"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Deixe endereço em branco para iniciar servidor local."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Mostrar Favoritos"
-
-#~ msgid "Show Public"
-#~ msgstr "Mostrar Públicos"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Atenção: Configuração não compatível.  "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Configuração gravada.  "
-
-#~ msgid "is required by:"
-#~ msgstr "é necessário pelo:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Botão esq: Mover todos os itens  Botão dir: Mover um item"
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods ainda não estão configurados.\n"
+#~ "Eles vão ser ativados por predefinição quando guardar a configuração.  "
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Descarregar"
+#~ msgid "Local install"
+#~ msgstr "Instalar"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "A carregar..."
+#~ msgid "Add mod:"
+#~ msgstr "<<-- Adicionar extra"
+
+#~ msgid "MODS"
+#~ msgstr "EXTRAS"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACOTES DE TEXTURAS"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "Um Jogador"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Líquido Finito"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Pré-carregamento dos itens"
+
+#~ msgid "SETTINGS"
+#~ msgstr "DEFINIÇÕES"
+
+#~ msgid "Password"
+#~ msgstr "Senha"
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "START SERVER"
+#~ msgstr "INICIAR SERVIDOR"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENTE"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Adicionar extra"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Remover extra selecionado"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "EDITAR JOGO"
+
+#~ msgid "new game"
+#~ msgstr "novo jogo"
+
+#~ msgid "Mods:"
+#~ msgstr "Extras:"
+
+#~ msgid "GAMES"
+#~ msgstr "JOGOS"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr ""
+#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo "
+#~ "\"$2\""
+
+#~ msgid "Game Name"
+#~ msgstr "Nome do Jogo"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "ativo"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Desativar Tudo"
+
+#~ msgid "No!!!"
+#~ msgstr "Não!!!"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Gerar Normalmaps"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista de Servidores Públicos"
+
+#~ msgid "No of course not!"
+#~ msgstr "Não, é claro que não!"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Útil para desenvolvedores de extras."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Dados de perfil detalhados do extra"
+
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr ""
+#~ "Dados de perfil detalhados do extra. Útil para desenvolvedores de extras."
diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index d605a9e51..4bb839e1b 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-07-21 17:30+0000\n"
 "Last-Translator: Bruno Borges <borgesdossantosbruno@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) "
-"<https://hosted.weblate.org/projects/minetest/minetest/pt_BR/>\n"
+"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
+"minetest/minetest/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -985,6 +985,10 @@ msgstr "Alternar noclip"
 msgid "Use"
 msgstr "Usar"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Zoom"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "press. uma tecla"
@@ -1301,10 +1305,6 @@ msgstr "Botão X 1"
 msgid "X Button 2"
 msgstr "Botão X 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Zoom"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1393,6 +1393,11 @@ msgstr "Intervalo de Gestão de Blocos Ativos"
 msgid "Active Block Modifier interval"
 msgstr "Distância para blocos ativos"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Distância para blocos ativos"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Limite para blocos ativos"
@@ -1478,6 +1483,10 @@ msgstr "Peça para reconectar depois de queda"
 msgid "Automaticaly report to the serverlist."
 msgstr "Informar lista de servidores automaticamente."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Tecla para andar para trás"
@@ -1513,6 +1522,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr "Construir com o jogador dentro do bloco"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Bump mapping"
@@ -1554,6 +1567,11 @@ msgstr "Tecla de Chat"
 msgid "Chat toggle key"
 msgstr "Tecla comutadora de chat"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Comando"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1644,6 +1662,16 @@ msgstr "Nuvens no menu"
 msgid "Colored fog"
 msgstr "Névoa colorida"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Lista de mods, separados por vírgulas, que podem usar APIs de requisição "
+"HTTP, que\n"
+"os permitem enviar e baixar informações para/da internet."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1653,15 +1681,6 @@ msgstr ""
 "inseguras mesmo quando o a opção de Mod Seguro está ativada (via "
 "request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Lista de mods, separados por vírgulas, que podem usar APIs de requisição "
-"HTTP, que\n"
-"os permitem enviar e baixar informações para/da internet."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Tecla de Comando"
@@ -1817,6 +1836,10 @@ msgstr "Senha padrão"
 msgid "Default privileges"
 msgstr "Privilégios por padrão"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1839,6 +1862,10 @@ msgstr ""
 "Define a distância máxima de transferência de jogadores em blocos (0 = "
 "ilimitado)."
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Dicas de ferramenta mostrando atraso. indicado em milissegundos."
@@ -1871,14 +1898,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr "Dessincronizar animação do bloco"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr "Dados detalhados do perfil do mod . Útil para desenvolvedores de mods."
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "Perfilamento detalhado do mod"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -2042,6 +2061,15 @@ msgstr ""
 "Ativar mapeamento de oclusão de paralaxe.\n"
 "Requer shaders a serem ativados."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Engine profiling data print interval"
+msgstr "Intervalo de impressão de perfil"
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2106,10 +2134,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "Campo de visão"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Campo de visão"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Campo de visão em graus."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Movimento rápido (use a tecla).\n"
+"Isso requer o privilegio \"fast\" no servidor."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2256,6 +2298,10 @@ msgstr "Geral"
 msgid "Generate normalmaps"
 msgstr "Gerar normalmaps"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2272,8 +2318,8 @@ msgstr ""
 "decorações.\n"
 "Flags que não são especificadas na string da flag não são alteradas por "
 "padrão.\n"
-"Flags começando com \"no\" (não) são usada para explicitamente "
-"desabilitá-las."
+"Flags começando com \"no\" (não) são usada para explicitamente desabilitá-"
+"las."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
@@ -2306,6 +2352,15 @@ msgstr ""
 "-    error: abortar no uso da chamada reprovada (sugerido para "
 "desenvolvedores de mods)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "Altura da janela inicial."
@@ -2336,15 +2391,6 @@ msgstr ""
 "indicado em mapblocks (16 nós).\n"
 "Em blocos ativos objetos são carregados e ABMs são executadas."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr "Quantos blocos podem ser enviados simultaneamente para todo o servidor."
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr "Quantos blocos podem ser enviados simultaneamente por cliente."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2461,6 +2507,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr "Cor de fundo do Bate-papo no jogo (R,G,B)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2501,7 +2581,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr "Intervalo de repetição do botão do Joystick"
 
 #: src/settings_translation_file.cpp
@@ -2736,6 +2816,17 @@ msgstr ""
 "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla para ativar/desativar o modo rápido.\n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2787,8 +2878,9 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2981,6 +3073,22 @@ msgstr "Intervalo de atualização de líquido em segundos."
 msgid "Liquid update tick"
 msgstr "Período de atualização dos Líquidos"
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Distância para blocos ativos"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr "Menu principal gestor de games"
@@ -3475,9 +3583,21 @@ msgstr "Máximo de blocos carregados forçadamente"
 msgid "Maximum hotbar width"
 msgstr "Largura máxima do hotbar"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr "Número máximo de jogadores que podem se conectar simultaneamente."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+"Número máximo de blocos que podem ser enfileirados para o carregamento."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
-msgstr "Número máximo de blocos que podem ser enfileirados para o carregamento."
+msgstr ""
+"Número máximo de blocos que podem ser enfileirados para o carregamento."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3493,8 +3613,8 @@ msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "Set to blank for an appropriate amount to be chosen automatically."
 msgstr ""
-"Número máximo de blocos para ser enfileirado que serão carregados do arquivo."
-"\n"
+"Número máximo de blocos para ser enfileirado que serão carregados do "
+"arquivo.\n"
 "Definido em branco para uma quantidade apropriada ser escolhida "
 "automaticamente."
 
@@ -3528,6 +3648,11 @@ msgstr "Número máximo de jogadores que podem se conectar simultaneamente."
 msgid "Maximum number of statically stored objects in a block."
 msgstr "Número máximo de objetos estaticamente armazenados em um bloco."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum objects per block"
+msgstr "Limite de objetos por bloco"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3537,11 +3662,13 @@ msgstr ""
 "Útil se houver algo para ser exibido a direito ou esquerda do hotbar."
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+#, fuzzy
+msgid "Maximum simultaneous block sends per client"
 msgstr "Máximo de blocos enviados simultaneamente por cliente"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+#, fuzzy
+msgid "Maximum simultaneous block sends total"
 msgstr "Máximo de blocos enviados simultaneamente totais"
 
 #: src/settings_translation_file.cpp
@@ -3554,10 +3681,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr "Limite de usuários"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr "Limite de objetos por bloco"
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Opções para menus"
@@ -3598,11 +3721,6 @@ msgstr "Tamanho mínimo da textura para filtros"
 msgid "Mipmapping"
 msgstr "Mipmapping (filtro)"
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Mod profiling"
-msgstr "criação de perfil do modificador"
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr "URL de detalhes da Modstore"
@@ -3664,8 +3782,8 @@ msgid ""
 "When starting from the main menu, this is overridden."
 msgstr ""
 "Nome do jogador.\n"
-"Quando executando um servidor, os clientes com este nome são administradores."
-"\n"
+"Quando executando um servidor, os clientes com este nome são "
+"administradores.\n"
 "Nome definido a partir do menu principal, substitui esse."
 
 #: src/settings_translation_file.cpp
@@ -3712,7 +3830,8 @@ msgstr "Intervalo de NodeTimer"
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Noise parameters for biome API temperature, humidity and biome blend."
-msgstr "Parâmetros noise para a API de mistura de temperatura, umidade e bioma."
+msgstr ""
+"Parâmetros noise para a API de mistura de temperatura, umidade e bioma."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3842,7 +3961,17 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
-msgstr "Impede que mods façam coisas inseguras como executar comandos do shell."
+msgstr ""
+"Impede que mods façam coisas inseguras como executar comandos do shell."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+"Intervalo de impressão de dados do profiler. 0 = desabilitado. Útil para os "
+"desenvolvedores."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3850,18 +3979,18 @@ msgid "Privileges that players with basic_privs can grant"
 msgstr "Privilégios que jogadores com basic_privs podem conceder"
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
-msgstr ""
-"Intervalo de impressão de dados do profiler. 0 = desabilitado. Útil para os "
-"desenvolvedores."
+#, fuzzy
+msgid "Profiler"
+msgstr "Perfil do vale"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "Tecla de alternância de Profiler"
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr "Intervalo de impressão de perfil"
+#, fuzzy
+msgid "Profiling"
+msgstr "criação de perfil do modificador"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3898,6 +4027,11 @@ msgstr "Porta remota"
 msgid "Replaces the default main menu with a custom one."
 msgstr "Substitui o menu principal padrão por um personalizado."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Caminho fonte"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Tecla direita"
@@ -4078,8 +4212,9 @@ msgstr ""
 "Requer sombreadores seres ativados."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -4153,10 +4288,10 @@ msgid ""
 "(obviously, remote_media should end with a slash).\n"
 "Files that are not present will be fetched the usual way."
 msgstr ""
-"Especifica o URL no qual os clientes buscam a mídia ao em vez de usar o UDP."
-"\n"
-"$filename deve ser acessível a partir de $remote_media$filename via cURL ("
-"obviamente, remote_media deve terminar com uma barra \"/\").\n"
+"Especifica o URL no qual os clientes buscam a mídia ao em vez de usar o "
+"UDP.\n"
+"$filename deve ser acessível a partir de $remote_media$filename via cURL "
+"(obviamente, remote_media deve terminar com uma barra \"/\").\n"
 "Arquivos que não estão presentes serão obtidos da maneira usual por UDP."
 
 #: src/settings_translation_file.cpp
@@ -4218,10 +4353,22 @@ msgstr "Pacotes de texturas"
 msgid "The altitude at which temperature drops by 20C"
 msgstr "A altitude na qual temperatura cai para 20C"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr "A profundidade de terra ou outro enchimento"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "A interface de rede no qual o servidor escuta (aguarda conexão)."
@@ -4269,8 +4416,8 @@ msgid ""
 "capacity until an attempt is made to decrease its size by dumping old queue\n"
 "items.  A value of 0 disables the functionality."
 msgstr ""
-"O tempo (em segundos) que a fila de líquidos pode crescer além da capacidade "
-"\n"
+"O tempo (em segundos) que a fila de líquidos pode crescer além da "
+"capacidade \n"
 "de processamento até que é feita uma tentativa para diminuir o seu tamanho "
 "pelo despejo \n"
 "de antigas filas de itens.  Um valor 0 desativa a funcionalidade."
@@ -4405,10 +4552,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Use a filtragem trilinear ao dimensionamento de texturas."
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "Útil para desenvolvedores de mods."
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "V-Sync"
@@ -4554,7 +4697,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 "Quando gui_scaling_filter_txr2img é true, copie essas imagens\n"
 "de hardware para software para dimensionamento. Quando false,\n"
@@ -4577,10 +4720,10 @@ msgstr ""
 "podem ficar turva, então automaticamente melhora eles com a interpolação\n"
 "de nearest-neighbor para preservar os pixels nítidos. Isto define o tamanho\n"
 "mínimo da textura para as texturas melhoradas; valores mais altos parecem\n"
-"mais nítidas, mas requerem mais memória. Intensidades de 2 são recomendadas."
-"\n"
-"Essa configuração superior a 1 não pode ter um efeito visível, a menos que a "
-"\n"
+"mais nítidas, mas requerem mais memória. Intensidades de 2 são "
+"recomendadas.\n"
+"Essa configuração superior a 1 não pode ter um efeito visível, a menos que "
+"a \n"
 "filtragem bilineares/trilinear/anisotrópica seja habilitada."
 
 #: src/settings_translation_file.cpp
@@ -4596,8 +4739,8 @@ msgstr ""
 "Note:\n"
 "-    Limitado a 31000 (valores superiores não têm efeito)\n"
 "-    O gerador funciona em grupos de 80x80x80 cubos (5x5x5 MapBlocks)\n"
-"-    Esses grupos têm um deslocamento de -32, -32 nodes em relação à origem."
-"\n"
+"-    Esses grupos têm um deslocamento de -32, -32 nodes em relação à "
+"origem.\n"
 "-    Apenas grupos dentro do limite definido map_gerenation_limit são gerados"
 
 #: src/settings_translation_file.cpp
@@ -4632,8 +4775,8 @@ msgid ""
 "Whether to ask clients to reconnect after a (Lua) crash.\n"
 "Set this to true if your server is set up to restart automatically."
 msgstr ""
-"Se deseja perguntar aos clientes para reconectarem depois de uma queda (Lua)."
-"\n"
+"Se deseja perguntar aos clientes para reconectarem depois de uma queda "
+"(Lua).\n"
 "Defina como true se o servidor está configurado para reiniciar "
 "automaticamente."
 
@@ -4703,121 +4846,138 @@ msgstr "limite paralelo de cURL"
 msgid "cURL timeout"
 msgstr "Tempo de cURL"
 
-#~ msgid "No of course not!"
-#~ msgstr "Claro que não!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista de servidores públicos"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Gerar Normalmaps"
-
-#~ msgid "No!!!"
-#~ msgstr "Não!!!"
-
+#, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Atributos de mapgen específicos para vales (Mapgen Valleys).\n"
+#~ "Atributos de mapgen específicos para Mapgen plano.\n"
+#~ "Alguns lagos e colinas são ocasionalmente adicionados num mundo plano.\n"
 #~ "Flags que não estão especificadas na string de flags não são modificados "
 #~ "a partir do padrão.\n"
 #~ "Flags começando com \"no\" (não) são usadas para desativá-los "
-#~ "explicitamente.\n"
-#~ "\"altitude_chill\" torna terrenos de elevada altitude mais frios, o que "
-#~ "pode causar algumas falhas nos biomas.\n"
-#~ "\"humid_rivers\" modifica a umidade ao redor dos rios e em áreas onde a "
-#~ "água tende a ser represada em poças. Pode interferir em biomas que são "
-#~ "sensíveis a mudanças."
+#~ "explicitamente."
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Desabilitar PMs"
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Atributos para o gerador de mapas específico para o Mapgen v6.\n"
+#~ "Quando biomas de neve estão habilitados, pântanos ficam habilitados e a "
+#~ "flag de pântanos é ignorada.\n"
+#~ "Flags que não são especificadas na string da flag não são modificadas por "
+#~ "padrão.\n"
+#~ "Flags começando com \"no\" (não) são usadas para explicitamente "
+#~ "desabilitá-las."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Habilita recurso permitindo que o nível da água seja um pouco menor, "
+#~ "portando não preenche todo o espaço disponível para bloco.\n"
+#~ "Note que isso não está bem otimizado e que suavização da iluminação na "
+#~ "superfície da água não funciona bem com esse recurso."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr ""
+#~ "Habilitar destaque de bloco selecionado (desabilita o modo de destaque "
+#~ "selectionbox [Padrão])."
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n"
+#~ "Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos "
+#~ "em nós."
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Tecla para diminuir o intervalo de visualização. Modifica o intervalo "
+#~ "mínimo de visualização.\n"
+#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Tecla para aumentar o intervalo de visualização. Modifica o mínimo "
+#~ "intervalo de visualização.\n"
+#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "pré-carregando texturas de inventário"
 
 #, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "habilitado"
+#~ msgid "Downloading"
+#~ msgstr "Baixar"
 
-#~ msgid "Game Name"
-#~ msgstr "Nome do jogo"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item"
 
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\""
+#~ msgid "is required by:"
+#~ msgstr "é necessário para:"
 
-#~ msgid "GAMES"
-#~ msgstr "JOGOS"
+#~ msgid "Configuration saved.  "
+#~ msgstr "A configuração foi salva. "
 
-#~ msgid "Mods:"
-#~ msgstr "Módulos:"
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Atenção: A configuração não está consistente."
 
-#~ msgid "new game"
-#~ msgstr "novo jogo"
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos"
 
-#~ msgid "EDIT GAME"
-#~ msgstr "EDITAR JOGO"
+#~ msgid "Show Public"
+#~ msgstr "Exibir públicos"
 
-#~ msgid "Remove selected mod"
-#~ msgstr "Remover o módulo selecionado"
+#~ msgid "Show Favorites"
+#~ msgstr "Exibir favoritos"
 
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Adicionar módulo"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Deixe o endereço em branco para iniciar um servidor local."
 
-#~ msgid "CLIENT"
-#~ msgstr "CLIENTE"
+#~ msgid "Create world"
+#~ msgstr "Criar o mundo"
 
-#~ msgid "START SERVER"
-#~ msgstr "SERVIDOR"
+#~ msgid "Address required."
+#~ msgstr "É necessário um endereço."
 
-#~ msgid "Name"
-#~ msgstr "Nome"
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado"
 
-#~ msgid "Password"
-#~ msgstr "Senha"
+#~ msgid "Files to be deleted"
+#~ msgstr "Arquivos a serem excluídos"
 
-#~ msgid "SETTINGS"
-#~ msgstr "CONFIGURAÇÕES"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo"
 
-#~ msgid "Preload item visuals"
-#~ msgstr "Precarga de elementos visuais"
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado"
 
-#~ msgid "Finite Liquid"
-#~ msgstr "Líquido finito"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "UM JOGADOR"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "TEXTURAS"
-
-#~ msgid "MODS"
-#~ msgstr "MÓDULOS"
-
-#~ msgid "Add mod:"
-#~ msgstr "Adicionar módulo:"
-
-#~ msgid "Local install"
-#~ msgstr "Instalação local"
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods ainda não foram configurados.\n"
-#~ "E eles serão ativados por padrão, quando você salvar a configuração."
-
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods configurados não foram encontrados.\n"
-#~ "Suas definições serão removidas quando você salvar a configuração."
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Não foi possível excluir todos os arquivos do mundo"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4844,135 +5004,137 @@ msgstr "Tempo de cURL"
 #~ "- ESC: este menu\n"
 #~ "- T: bate-papo\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Não foi possível excluir todos os arquivos do mundo"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods configurados não foram encontrados.\n"
+#~ "Suas definições serão removidas quando você salvar a configuração."
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado"
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods ainda não foram configurados.\n"
+#~ "E eles serão ativados por padrão, quando você salvar a configuração."
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo"
+#~ msgid "Local install"
+#~ msgstr "Instalação local"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "Arquivos a serem excluídos"
+#~ msgid "Add mod:"
+#~ msgstr "Adicionar módulo:"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado"
+#~ msgid "MODS"
+#~ msgstr "MÓDULOS"
 
-#~ msgid "Address required."
-#~ msgstr "É necessário um endereço."
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "TEXTURAS"
 
-#~ msgid "Create world"
-#~ msgstr "Criar o mundo"
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "UM JOGADOR"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Deixe o endereço em branco para iniciar um servidor local."
+#~ msgid "Finite Liquid"
+#~ msgstr "Líquido finito"
 
-#~ msgid "Show Favorites"
-#~ msgstr "Exibir favoritos"
+#~ msgid "Preload item visuals"
+#~ msgstr "Precarga de elementos visuais"
 
-#~ msgid "Show Public"
-#~ msgstr "Exibir públicos"
+#~ msgid "SETTINGS"
+#~ msgstr "CONFIGURAÇÕES"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos"
+#~ msgid "Password"
+#~ msgstr "Senha"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Atenção: A configuração não está consistente."
+#~ msgid "Name"
+#~ msgstr "Nome"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "A configuração foi salva. "
+#~ msgid "START SERVER"
+#~ msgstr "SERVIDOR"
 
-#~ msgid "is required by:"
-#~ msgstr "é necessário para:"
+#~ msgid "CLIENT"
+#~ msgstr "CLIENTE"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item"
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Adicionar módulo"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Remover o módulo selecionado"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "EDITAR JOGO"
+
+#~ msgid "new game"
+#~ msgstr "novo jogo"
+
+#~ msgid "Mods:"
+#~ msgstr "Módulos:"
+
+#~ msgid "GAMES"
+#~ msgstr "JOGOS"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\""
+
+#~ msgid "Game Name"
+#~ msgstr "Nome do jogo"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Baixar"
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "pré-carregando texturas de inventário"
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Tecla para aumentar o intervalo de visualização. Modifica o mínimo "
-#~ "intervalo de visualização.\n"
-#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Tecla para diminuir o intervalo de visualização. Modifica o intervalo "
-#~ "mínimo de visualização.\n"
-#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n"
-#~ "Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos "
-#~ "em nós."
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr ""
-#~ "Habilitar destaque de bloco selecionado (desabilita o modo de destaque "
-#~ "selectionbox [Padrão])."
-
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Habilita recurso permitindo que o nível da água seja um pouco menor, "
-#~ "portando não preenche todo o espaço disponível para bloco.\n"
-#~ "Note que isso não está bem otimizado e que suavização da iluminação na "
-#~ "superfície da água não funciona bem com esse recurso."
+#~ msgid "If enabled, "
+#~ msgstr "habilitado"
 
 #, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Desabilitar PMs"
+
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Atributos para o gerador de mapas específico para o Mapgen v6.\n"
-#~ "Quando biomas de neve estão habilitados, pântanos ficam habilitados e a "
-#~ "flag de pântanos é ignorada.\n"
-#~ "Flags que não são especificadas na string da flag não são modificadas por "
-#~ "padrão.\n"
-#~ "Flags começando com \"no\" (não) são usadas para explicitamente "
-#~ "desabilitá-las."
-
-#, fuzzy
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "Atributos de mapgen específicos para Mapgen plano.\n"
-#~ "Alguns lagos e colinas são ocasionalmente adicionados num mundo plano.\n"
+#~ "Atributos de mapgen específicos para vales (Mapgen Valleys).\n"
 #~ "Flags que não estão especificadas na string de flags não são modificados "
 #~ "a partir do padrão.\n"
 #~ "Flags começando com \"no\" (não) são usadas para desativá-los "
-#~ "explicitamente."
+#~ "explicitamente.\n"
+#~ "\"altitude_chill\" torna terrenos de elevada altitude mais frios, o que "
+#~ "pode causar algumas falhas nos biomas.\n"
+#~ "\"humid_rivers\" modifica a umidade ao redor dos rios e em áreas onde a "
+#~ "água tende a ser represada em poças. Pode interferir em biomas que são "
+#~ "sensíveis a mudanças."
+
+#~ msgid "No!!!"
+#~ msgstr "Não!!!"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Gerar Normalmaps"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista de servidores públicos"
+
+#~ msgid "No of course not!"
+#~ msgstr "Claro que não!"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Útil para desenvolvedores de mods."
+
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "Quantos blocos podem ser enviados simultaneamente por cliente."
+
+#~ msgid ""
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr ""
+#~ "Quantos blocos podem ser enviados simultaneamente para todo o servidor."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Perfilamento detalhado do mod"
+
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr ""
+#~ "Dados detalhados do perfil do mod . Útil para desenvolvedores de mods."
diff --git a/po/ro/minetest.po b/po/ro/minetest.po
index aac35f811..a40633409 100644
--- a/po/ro/minetest.po
+++ b/po/ro/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-03-17 15:28+0000\n"
 "Last-Translator: Lordmusic Player <lordmusicplro1@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/minetest/"
@@ -1009,6 +1009,10 @@ msgstr "Intră pe noclip"
 msgid "Use"
 msgstr "Aleargă"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Mărire"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "apasă o tastă"
@@ -1325,10 +1329,6 @@ msgstr "X Butonul 1"
 msgid "X Button 2"
 msgstr "X Butonul 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Mărire"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1395,6 +1395,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1470,6 +1474,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1505,6 +1513,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Bumpmapping"
@@ -1548,6 +1560,11 @@ msgstr "Modifică tastele"
 msgid "Chat toggle key"
 msgstr "Modifică tastele"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Comandă"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1625,14 +1642,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1788,6 +1805,10 @@ msgstr "Noua parolă"
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1804,6 +1825,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1834,14 +1859,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1982,6 +1999,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2043,10 +2068,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2183,6 +2218,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2218,6 +2257,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2245,15 +2293,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2349,6 +2388,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2385,7 +2458,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2551,6 +2624,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2588,7 +2668,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2739,6 +2819,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3181,6 +3276,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3222,6 +3325,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3229,11 +3336,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3244,10 +3351,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Menus"
@@ -3290,10 +3393,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mip Mapping"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3498,12 +3597,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3511,7 +3616,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3546,6 +3651,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Selectează"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Right key"
@@ -3716,7 +3826,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3834,10 +3944,22 @@ msgstr "Pachete de tetură"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3984,11 +4106,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Useful for mod developers."
-msgstr "Dezvoltatori de bază"
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4118,7 +4235,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4218,88 +4335,92 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "Nu, sigur că nu!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Listă de servere publică"
-
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Dezactivează MP"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "activat"
-
-#~ msgid "Game Name"
-#~ msgstr "Numele jocului"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\""
-
-#~ msgid "GAMES"
-#~ msgstr "JOCURI"
-
-#~ msgid "Mods:"
-#~ msgstr "Moduri:"
-
-#~ msgid "new game"
-#~ msgstr "joc nou"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MODIFICĂ JOCUL"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Șterge modul selectat"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Adaugă modul"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "START SERVER"
-#~ msgstr "DESCHIDE SERVERUL"
-
-#~ msgid "Name"
-#~ msgstr "Nume"
-
-#~ msgid "Password"
-#~ msgstr "Parolă"
-
-#~ msgid "SETTINGS"
-#~ msgstr "SETĂRI"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Pre-încarcă imaginile obiectelor"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Lichid finit"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "SINGLE PLAYER"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACHETE DE TEXTURĂ"
-
-#~ msgid "MODS"
-#~ msgstr "MODURI"
-
-#~ msgid "Add mod:"
-#~ msgstr "Adăugaţi mod:"
-
-#~ msgid "Local install"
-#~ msgstr "Instalare locală"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr ""
-#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Se încarcă..."
 
 #, fuzzy
 #~ msgid "Downloading"
 #~ msgstr "Descarcă"
 
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr ""
+#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect"
+
+#~ msgid "Local install"
+#~ msgstr "Instalare locală"
+
+#~ msgid "Add mod:"
+#~ msgstr "Adăugaţi mod:"
+
+#~ msgid "MODS"
+#~ msgstr "MODURI"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACHETE DE TEXTURĂ"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "SINGLE PLAYER"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Lichid finit"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Pre-încarcă imaginile obiectelor"
+
+#~ msgid "SETTINGS"
+#~ msgstr "SETĂRI"
+
+#~ msgid "Password"
+#~ msgstr "Parolă"
+
+#~ msgid "Name"
+#~ msgstr "Nume"
+
+#~ msgid "START SERVER"
+#~ msgstr "DESCHIDE SERVERUL"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Adaugă modul"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Șterge modul selectat"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MODIFICĂ JOCUL"
+
+#~ msgid "new game"
+#~ msgstr "joc nou"
+
+#~ msgid "Mods:"
+#~ msgstr "Moduri:"
+
+#~ msgid "GAMES"
+#~ msgstr "JOCURI"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\""
+
+#~ msgid "Game Name"
+#~ msgstr "Numele jocului"
+
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Se încarcă..."
+#~ msgid "If enabled, "
+#~ msgstr "activat"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Dezactivează MP"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Listă de servere publică"
+
+#~ msgid "No of course not!"
+#~ msgstr "Nu, sigur că nu!"
+
+#, fuzzy
+#~ msgid "Useful for mod developers."
+#~ msgstr "Dezvoltatori de bază"
diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index 768c65dda..a488c9ce5 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-05-20 15:18+0000\n"
 "Last-Translator: Andrey K. <contact@libnaru.so>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/minetest/"
@@ -992,6 +992,10 @@ msgstr "Включить noclip"
 msgid "Use"
 msgstr "Использовать"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Масштаб"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "нажмите клавишу"
@@ -1308,10 +1312,6 @@ msgstr "Доп. кнопка 1"
 msgid "X Button 2"
 msgstr "Доп. кнопка 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Масштаб"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1393,6 +1393,11 @@ msgstr "Дальность взаимодействия с блоками"
 msgid "Active Block Modifier interval"
 msgstr "Дальность взаимодействия с блоками"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "Дальность взаимодействия с блоками"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "Дальность взаимодействия с блоками"
@@ -1479,6 +1484,10 @@ msgstr "Запрос переподключения после дисконне
 msgid "Automaticaly report to the serverlist."
 msgstr "Автоматически добавлять в список серверов."
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1513,6 +1522,10 @@ msgstr "Биты на пиксель (глубина цвета) в полноэ
 msgid "Build inside player"
 msgstr "Разрешить ставить блоки на месте игрока"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Бампмаппинг"
@@ -1555,6 +1568,11 @@ msgstr "Кнопка чата"
 msgid "Chat toggle key"
 msgstr "Кнопка переключения чата"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Команда"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1626,6 +1644,15 @@ msgstr "Облака в меню"
 msgid "Colored fog"
 msgstr "Цветной туман"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Список доверенных модов, через запятую, которым разрешён доступ к HTTP API,  "
+"что позволяет им отправлять и принимать данные в/из сети Интернет."
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -1636,15 +1663,6 @@ msgstr ""
 "небезопасным функциям, даже в безопасном режиме (с помощью "
 "request_insecure_environment())."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"Список доверенных модов, через запятую, которым разрешён доступ к HTTP API,  "
-"что позволяет им отправлять и принимать данные в/из сети Интернет."
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "Команда"
@@ -1794,6 +1812,10 @@ msgstr "Стандартный пароль"
 msgid "Default privileges"
 msgstr "Стандартные права"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1812,6 +1834,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Задержка показа подсказок, указанная в миллисекундах."
@@ -1846,14 +1872,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr "Рассинхронизировать анимацию блоков"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1990,6 +2008,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2058,10 +2084,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "Поле зрения"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "Поле зрения"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Поле зрения в градусах."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Быстрое перемещение (с использованием клавиши).\n"
+"Это требует привилегию \"fast\" на сервере."
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2200,6 +2240,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr "Генерировать карты нормалей"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2253,6 +2297,15 @@ msgstr ""
 "-    error: прерывание при использовании устаревших вызовов (рекомендовано "
 "для разработчиков модов)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Height component of the initial window size."
@@ -2285,17 +2338,6 @@ msgstr ""
 "mapblocks (16 nodes).↵\n"
 "В активных блоках объекты загружаются и ABMs запускается."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr "Количество блоков, передаваемых одновременно для всего сервера."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr "Количество блоков, передаваемых одновременно для каждого клиента."
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2417,6 +2459,40 @@ msgstr "Прозрачность фона внутриигровой консо
 msgid "In-game chat console background color (R,G,B)."
 msgstr "Цвет фона внутриигровой консоли (R, G, B)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr "Интервал сохранения важных изменений в мире, установленный в секундах."
@@ -2453,7 +2529,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr "Интервал повторного клика правой кнопкой."
 
 #: src/settings_translation_file.cpp
@@ -2672,6 +2748,17 @@ msgstr ""
 "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Клавиша переключения режима быстрого перемещения.\n"
+"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2723,11 +2810,15 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Клавиша движения влево.\n"
+"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2894,6 +2985,22 @@ msgstr "Интервал обновления жидкостей в секунд
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "Дальность взаимодействия с блоками"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3373,6 +3480,15 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr "Максимальная ширина хотбара"
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "Количество блоков, передаваемых одновременно для каждого клиента."
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3414,6 +3530,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3421,11 +3541,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3436,10 +3556,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr "Максимальное количество пользователей"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Меню"
@@ -3483,10 +3599,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mip-текстурирование (Мип-маппинг)"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3708,12 +3820,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3721,7 +3839,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3757,6 +3875,11 @@ msgstr "Удаленный порт"
 msgid "Replaces the default main menu with a custom one."
 msgstr "Заменять главное меню на пользовательское."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Путь к шрифту"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Правая клавиша меню"
@@ -3939,7 +4062,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -4074,10 +4197,22 @@ msgstr "Пакеты текстур"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -4253,11 +4388,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Использовать трилинейную фильтрацию для масштабировании текстур."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Useful for mod developers."
-msgstr "Разработчики в отставке"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "V-Sync"
@@ -4395,7 +4525,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4503,107 +4633,107 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "cURL тайм-аут"
 
-#~ msgid "No of course not!"
-#~ msgstr "Нет, конечно нет!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Список публичных серверов"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Генерировать карты нормалей"
-
-#~ msgid "No!!!"
-#~ msgstr "Нет!"
-
-#~ msgid "\""
-#~ msgstr "\""
-
-#~ msgid "If disabled "
-#~ msgstr "Если выключено "
-
-#~ msgid "If enabled, "
-#~ msgstr "Если включено "
-
-#~ msgid "Rendering:"
-#~ msgstr "Рендеринг:"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Перезапустите Minetest для принятия изменений"
-
-#~ msgid "Game Name"
-#~ msgstr "Название"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\""
-
-#~ msgid "GAMES"
-#~ msgstr "ИГРЫ"
-
-#~ msgid "Mods:"
-#~ msgstr "Моды:"
-
-#~ msgid "new game"
-#~ msgstr "Создать игру"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "РЕДАКТИРОВАНИЕ"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Удалить мод"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Добавить мод"
-
-#~ msgid "CLIENT"
-#~ msgstr "КЛИЕНТ"
-
-#~ msgid "START SERVER"
-#~ msgstr "СЕРВЕР"
-
-#~ msgid "Name"
-#~ msgstr "Имя"
-
-#~ msgid "Password"
-#~ msgstr "Пароль"
-
-#~ msgid "SETTINGS"
-#~ msgstr "НАСТРОЙКИ"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Предзагрузка изображений"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Конечные жидкости"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "ОДИНОЧНАЯ ИГРА"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "ПАКЕТЫ ТЕКСТУР"
-
-#~ msgid "MODS"
-#~ msgstr "МОДЫ"
-
-#~ msgid "Add mod:"
-#~ msgstr "Добавить мод:"
-
-#~ msgid "Local install"
-#~ msgstr "Локальная установка"
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Включите немного более низкую поверхность воды, чтобы она\n"
+#~ "не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n"
+#~ "и мягкое освещение на поверхности воды не работает с этим."
 
 #~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
 #~ msgstr ""
-#~ "Предупреждение: Некоторые моды еще не настроены.\n"
-#~ "Их стандартные настройки будут установлены, когда вы сохраните "
-#~ "конфигурацию.  "
+#~ "Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность "
+#~ "отображения.\n"
+#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
 #~ msgstr ""
-#~ "Предупреждение: Некоторые моды не найдены.\n"
-#~ "Их настройки будут удалены, когда вы сохраните конфигурацию.  "
+#~ "Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность "
+#~ "отображения.\n"
+#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#, fuzzy
+#~ msgid "New style water"
+#~ msgstr "Новый стиль воды"
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Предзагрузка текстур..."
+
+#, fuzzy
+#~ msgid "Viewing range minimum"
+#~ msgstr "Минимальная граница дальности отрисовки."
+
+#, fuzzy
+#~ msgid "Wanted FPS"
+#~ msgstr "Ожидаемый FPS"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Коэффициент масштаба интерфейса: "
+
+#~ msgid "Touch free target"
+#~ msgstr "Свободный выбор цели"
+
+#, fuzzy
+#~ msgid "Downloading"
+#~ msgstr "Загрузить"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет"
+
+#~ msgid "is required by:"
+#~ msgstr "требуется для:"
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Настройки сохранены.  "
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Предупреждение: Неверная конфигурация.  "
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы"
+
+#~ msgid "Show Public"
+#~ msgstr "Публичные"
+
+#~ msgid "Show Favorites"
+#~ msgstr "Избранные"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Оставьте адрес пустым для запуска локального сервера."
+
+#~ msgid "Create world"
+#~ msgstr "Создать мир"
+
+#~ msgid "Address required."
+#~ msgstr "Нужно ввести адрес."
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Невозможно удалить мир: Ничего не выбрано"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Следующие файлы будут удалены"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Невозможно создать мир: Ни одной игры не найдено"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Невозможно настроить мир: ничего не выбрано"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Ошибка при удалении файлов мира"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4630,104 +4760,114 @@ msgstr "cURL тайм-аут"
 #~ "- ESC: это меню\n"
 #~ "- T: чат\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Ошибка при удалении файлов мира"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Невозможно настроить мир: ничего не выбрано"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Невозможно создать мир: Ни одной игры не найдено"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Следующие файлы будут удалены"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Невозможно удалить мир: Ничего не выбрано"
-
-#~ msgid "Address required."
-#~ msgstr "Нужно ввести адрес."
-
-#~ msgid "Create world"
-#~ msgstr "Создать мир"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Оставьте адрес пустым для запуска локального сервера."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Избранные"
-
-#~ msgid "Show Public"
-#~ msgstr "Публичные"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Предупреждение: Неверная конфигурация.  "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Настройки сохранены.  "
-
-#~ msgid "is required by:"
-#~ msgstr "требуется для:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет"
-
-#, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Загрузить"
-
-#~ msgid "Touch free target"
-#~ msgstr "Свободный выбор цели"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Коэффициент масштаба интерфейса: "
-
-#, fuzzy
-#~ msgid "Wanted FPS"
-#~ msgstr "Ожидаемый FPS"
-
-#, fuzzy
-#~ msgid "Viewing range minimum"
-#~ msgstr "Минимальная граница дальности отрисовки."
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Предзагрузка текстур..."
-
-#, fuzzy
-#~ msgid "New style water"
-#~ msgstr "Новый стиль воды"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Предупреждение: Некоторые моды не найдены.\n"
+#~ "Их настройки будут удалены, когда вы сохраните конфигурацию.  "
 
 #~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность "
-#~ "отображения.\n"
-#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ "Предупреждение: Некоторые моды еще не настроены.\n"
+#~ "Их стандартные настройки будут установлены, когда вы сохраните "
+#~ "конфигурацию.  "
 
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность "
-#~ "отображения.\n"
-#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgid "Local install"
+#~ msgstr "Локальная установка"
 
+#~ msgid "Add mod:"
+#~ msgstr "Добавить мод:"
+
+#~ msgid "MODS"
+#~ msgstr "МОДЫ"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "ПАКЕТЫ ТЕКСТУР"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "ОДИНОЧНАЯ ИГРА"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Конечные жидкости"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Предзагрузка изображений"
+
+#~ msgid "SETTINGS"
+#~ msgstr "НАСТРОЙКИ"
+
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#~ msgid "Name"
+#~ msgstr "Имя"
+
+#~ msgid "START SERVER"
+#~ msgstr "СЕРВЕР"
+
+#~ msgid "CLIENT"
+#~ msgstr "КЛИЕНТ"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Добавить мод"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Удалить мод"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "РЕДАКТИРОВАНИЕ"
+
+#~ msgid "new game"
+#~ msgstr "Создать игру"
+
+#~ msgid "Mods:"
+#~ msgstr "Моды:"
+
+#~ msgid "GAMES"
+#~ msgstr "ИГРЫ"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\""
+
+#~ msgid "Game Name"
+#~ msgstr "Название"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Перезапустите Minetest для принятия изменений"
+
+#~ msgid "Rendering:"
+#~ msgstr "Рендеринг:"
+
+#~ msgid "If enabled, "
+#~ msgstr "Если включено "
+
+#~ msgid "If disabled "
+#~ msgstr "Если выключено "
+
+#~ msgid "\""
+#~ msgstr "\""
+
+#~ msgid "No!!!"
+#~ msgstr "Нет!"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Генерировать карты нормалей"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Список публичных серверов"
+
+#~ msgid "No of course not!"
+#~ msgstr "Нет, конечно нет!"
+
+#, fuzzy
+#~ msgid "Useful for mod developers."
+#~ msgstr "Разработчики в отставке"
+
+#, fuzzy
 #~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Включите немного более низкую поверхность воды, чтобы она\n"
-#~ "не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n"
-#~ "и мягкое освещение на поверхности воды не работает с этим."
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr "Количество блоков, передаваемых одновременно для всего сервера."
diff --git a/po/sr_Cyrl/minetest.po b/po/sr_Cyrl/minetest.po
index d57463cbe..eea83a67c 100644
--- a/po/sr_Cyrl/minetest.po
+++ b/po/sr_Cyrl/minetest.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-07-13 09:50+0000\n"
 "Last-Translator: lisacvuk <lisacvukhome@gmail.com>\n"
-"Language-Team: Serbian (cyrillic) "
-"<https://hosted.weblate.org/projects/minetest/minetest/sr_Cyrl/>\n"
+"Language-Team: Serbian (cyrillic) <https://hosted.weblate.org/projects/"
+"minetest/minetest/sr_Cyrl/>\n"
 "Language: sr_Cyrl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.8-dev\n"
 
 #: builtin/fstk/ui.lua
@@ -978,6 +978,10 @@ msgstr "Укључи/искључи пролажење кроз препреке
 msgid "Use"
 msgstr "Коришћење"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Зумирај"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "притисните дугме"
@@ -1294,10 +1298,6 @@ msgstr "X Дугме 1"
 msgid "X Button 2"
 msgstr "X Дугме 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Зумирај"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1369,6 +1369,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1443,6 +1447,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr ""
@@ -1475,6 +1483,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr "Градња унутар играча"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr ""
@@ -1515,6 +1527,11 @@ msgstr ""
 msgid "Chat toggle key"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Команда"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1588,14 +1605,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1741,6 +1758,10 @@ msgstr ""
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1757,6 +1778,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1787,14 +1812,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1928,6 +1945,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -1988,10 +2013,23 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Играч је у могућности д лети без утицаја гравитације.\n"
+"Ово захтева \"fly\" привилегију на серверима."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2126,6 +2164,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2160,6 +2202,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2187,15 +2238,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2292,6 +2334,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2327,7 +2403,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2492,6 +2568,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2529,7 +2612,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2679,6 +2762,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3097,6 +3195,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3138,6 +3244,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3145,11 +3255,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3160,10 +3270,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr ""
@@ -3204,10 +3310,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3414,12 +3516,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3427,7 +3535,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3461,6 +3569,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Одабери локацију"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr ""
@@ -3619,7 +3732,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3734,10 +3847,22 @@ msgstr ""
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3882,10 +4007,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4012,7 +4133,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
diff --git a/po/tr/minetest.po b/po/tr/minetest.po
index 32f03e666..9d7b23e14 100644
--- a/po/tr/minetest.po
+++ b/po/tr/minetest.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2015-10-27 16:46+0200\n"
 "Last-Translator: PilzAdam <PilzAdam@minetest.net>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/minetest/"
@@ -997,6 +997,10 @@ msgstr "Noclip aç/kapa"
 msgid "Use"
 msgstr "Kullan"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "Yakınlaştır"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "tuşa bas"
@@ -1313,10 +1317,6 @@ msgstr "X Button 1"
 msgid "X Button 2"
 msgstr "X Button 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "Yakınlaştır"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1384,6 +1384,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1459,6 +1463,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1495,6 +1503,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Engebeler"
@@ -1537,6 +1549,11 @@ msgstr "Tuşları değiştir"
 msgid "Chat toggle key"
 msgstr "Tuşları değiştir"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Komut"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1614,14 +1631,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1776,6 +1793,10 @@ msgstr "Yeni şifre"
 msgid "Default privileges"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1792,6 +1813,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1822,14 +1847,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1970,6 +1987,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2031,10 +2056,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2174,6 +2209,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr "Normal haritalar oluştur"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2209,6 +2248,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2236,15 +2284,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2340,6 +2379,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2376,7 +2449,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2542,6 +2615,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2579,7 +2659,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2730,6 +2810,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3172,6 +3267,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3213,6 +3316,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3220,11 +3327,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3235,10 +3342,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Menus"
@@ -3281,10 +3384,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mip-Mapping"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3497,12 +3596,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3510,7 +3615,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3545,6 +3650,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Seç"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Right key"
@@ -3715,7 +3825,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3834,10 +3944,22 @@ msgstr "Doku paketi"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3984,11 +4106,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Useful for mod developers."
-msgstr "Ana geliştiriciler"
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4125,7 +4242,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4225,57 +4342,61 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "Elbette hayır!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Çevirimiçi Oyun Listesi"
-
 #, fuzzy
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normal haritalar oluştur"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Dokular yükleniyor..."
 
-#~ msgid "No!!!"
-#~ msgstr "Hayır!!!"
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Ölçeklendirme menülere işlendi:"
 
-#~ msgid "\""
-#~ msgstr "\""
+#~ msgid "Touch free target"
+#~ msgstr "Touch free target"
 
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Paketi Kapat"
+#~ msgid "Downloading"
+#~ msgstr "İndiriliyor"
+
+#~ msgid "please wait..."
+#~ msgstr "lütfen bekleyin..."
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid "Numpad "
+#~ msgstr "Numpad "
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın"
+
+#~ msgid "Rendering:"
+#~ msgstr "Kaplama:"
 
 #, fuzzy
 #~ msgid "If enabled, "
 #~ msgstr "Etkinleştirildi"
 
-#~ msgid "Rendering:"
-#~ msgstr "Kaplama:"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Paketi Kapat"
 
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın"
+#~ msgid "\""
+#~ msgstr "\""
 
-#~ msgid "Numpad "
-#~ msgstr "Numpad "
-
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
-
-#~ msgid "please wait..."
-#~ msgstr "lütfen bekleyin..."
-
-#~ msgid "Downloading"
-#~ msgstr "İndiriliyor"
-
-#~ msgid "Touch free target"
-#~ msgstr "Touch free target"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Ölçeklendirme menülere işlendi:"
+#~ msgid "No!!!"
+#~ msgstr "Hayır!!!"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Dokular yükleniyor..."
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normal haritalar oluştur"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Çevirimiçi Oyun Listesi"
+
+#~ msgid "No of course not!"
+#~ msgstr "Elbette hayır!"
+
+#, fuzzy
+#~ msgid "Useful for mod developers."
+#~ msgstr "Ana geliştiriciler"
diff --git a/po/uk/minetest.po b/po/uk/minetest.po
index 102ccf729..0c30153d7 100644
--- a/po/uk/minetest.po
+++ b/po/uk/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-05-12 01:10+0000\n"
 "Last-Translator: Fixer <artem.brz@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/minetest/"
@@ -984,6 +984,11 @@ msgstr "Переключити режим проходження крізь ст
 msgid "Use"
 msgstr "Використовувати"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+#, fuzzy
+msgid "Zoom"
+msgstr "Збільшити"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "Натисніть клавішу"
@@ -1302,11 +1307,6 @@ msgstr "Додаткова кнопка 1"
 msgid "X Button 2"
 msgstr "Додаткова кнопка 2"
 
-#: src/keycode.cpp
-#, fuzzy
-msgid "Zoom"
-msgstr "Збільшити"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1375,6 +1375,10 @@ msgstr ""
 msgid "Active Block Modifier interval"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr ""
@@ -1449,6 +1453,10 @@ msgstr ""
 msgid "Automaticaly report to the serverlist."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Backward key"
@@ -1482,6 +1490,10 @@ msgstr ""
 msgid "Build inside player"
 msgstr "Будувати в межах гравця"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Бамп-маппінг"
@@ -1523,6 +1535,11 @@ msgstr "Чат"
 msgid "Chat toggle key"
 msgstr "Чат"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "Команда"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1596,14 +1613,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1749,6 +1766,10 @@ msgstr "Стандартний пароль"
 msgid "Default privileges"
 msgstr "Стандартні права"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1765,6 +1786,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr ""
@@ -1795,14 +1820,6 @@ msgstr ""
 msgid "Desynchronize block animation"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1936,6 +1953,14 @@ msgid ""
 "Requires shaders to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -1996,10 +2021,20 @@ msgstr ""
 msgid "Field of view"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2135,6 +2170,10 @@ msgstr ""
 msgid "Generate normalmaps"
 msgstr "Генерувати карти нормалів"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2169,6 +2208,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2196,15 +2244,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2299,6 +2338,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2334,7 +2407,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2499,6 +2572,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2536,7 +2616,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2686,6 +2766,21 @@ msgstr ""
 msgid "Liquid update tick"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr ""
@@ -3104,6 +3199,14 @@ msgstr ""
 msgid "Maximum hotbar width"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3145,6 +3248,10 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3152,11 +3259,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3167,10 +3274,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "Меню"
@@ -3211,10 +3314,6 @@ msgstr ""
 msgid "Mipmapping"
 msgstr "Mіп-текстурування"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr ""
@@ -3419,12 +3518,18 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
+msgid "Profiler"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3432,7 +3537,7 @@ msgid "Profiler toggle key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
+msgid "Profiling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3466,6 +3571,11 @@ msgstr ""
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "Вибрати шлях"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Права клавіша"
@@ -3624,7 +3734,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3739,10 +3849,22 @@ msgstr "Шлях до текстури"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -3887,10 +4009,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr ""
@@ -4018,7 +4136,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4118,96 +4236,96 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No of course not!"
-#~ msgstr "Ні, звісно ні!"
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Завантаження текстур..."
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Список публічних серверів"
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Масштабування елементів меню: "
 
 #, fuzzy
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Генерувати карти нормалей"
-
-#~ msgid "No!!!"
-#~ msgstr "Ні!!!"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Вимкнути багатокористувацьку гру"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Увімкнено"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Гра"
-
-#, fuzzy
-#~ msgid "Password"
-#~ msgstr "Старий Пароль"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Попереднє завантаження зображень"
-
-#, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Кінцеві рідини"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Помилка при видаленні файлів світу"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Неможливо створити світ: Не знайдено жодної гри"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Файлів, що підлягають видаленню"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Неможливо видалити світ: Нічого не вибрано"
-
-#~ msgid "Address required."
-#~ msgstr "Адреса необхідна."
-
-#~ msgid "Create world"
-#~ msgstr "Створити світ"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Залишіть адресу незаповненою для створення локального серверу."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Показати Улюблені"
-
-#~ msgid "Show Public"
-#~ msgstr "Показати Публічні"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Попередження: Помилкова конфігурація.  "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Налаштування Збережено.  "
-
-#~ msgid "is required by:"
-#~ msgstr "необхідний для:"
+#~ msgid "Downloading"
+#~ msgstr "Вниз"
 
 #~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
 #~ "Ліва кнопка миші: Перемістити усі предмети, Права кнопка миші: "
 #~ "Перемістити один предмет"
 
-#, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Вниз"
+#~ msgid "is required by:"
+#~ msgstr "необхідний для:"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Масштабування елементів меню: "
+#~ msgid "Configuration saved.  "
+#~ msgstr "Налаштування Збережено.  "
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Попередження: Помилкова конфігурація.  "
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи"
+
+#~ msgid "Show Public"
+#~ msgstr "Показати Публічні"
+
+#~ msgid "Show Favorites"
+#~ msgstr "Показати Улюблені"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Залишіть адресу незаповненою для створення локального серверу."
+
+#~ msgid "Create world"
+#~ msgstr "Створити світ"
+
+#~ msgid "Address required."
+#~ msgstr "Адреса необхідна."
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Неможливо видалити світ: Нічого не вибрано"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Файлів, що підлягають видаленню"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Неможливо створити світ: Не знайдено жодної гри"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Помилка при видаленні файлів світу"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Завантаження текстур..."
+#~ msgid "Finite Liquid"
+#~ msgstr "Кінцеві рідини"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Попереднє завантаження зображень"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Старий Пароль"
+
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Гра"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Увімкнено"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Вимкнути багатокористувацьку гру"
+
+#~ msgid "No!!!"
+#~ msgstr "Ні!!!"
+
+#, fuzzy
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Генерувати карти нормалей"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Список публічних серверів"
+
+#~ msgid "No of course not!"
+#~ msgstr "Ні, звісно ні!"
diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po
index e2912ca75..446e169fe 100644
--- a/po/zh_CN/minetest.po
+++ b/po/zh_CN/minetest.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-06-11 10:56+0000\n"
 "Last-Translator: arsdragonfly <arsdragonfly@gmail.com>\n"
 "Language-Team: Chinese (China) <https://hosted.weblate.org/projects/minetest/"
@@ -972,6 +972,10 @@ msgstr "切换穿墙模式"
 msgid "Use"
 msgstr "使用"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "缩放"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "按键"
@@ -1288,10 +1292,6 @@ msgstr "X键1"
 msgid "X Button 2"
 msgstr "X键2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "缩放"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1375,6 +1375,11 @@ msgstr "活动区块管理间隔"
 msgid "Active Block Modifier interval"
 msgstr "活动区块修改间隔"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "活动区块修改间隔"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "活动块范围"
@@ -1456,6 +1461,10 @@ msgstr "崩溃后询问重新连接"
 msgid "Automaticaly report to the serverlist."
 msgstr "自动报告到服务器列表。"
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "后退键"
@@ -1488,6 +1497,10 @@ msgstr "全屏模式中的位／像素（又称色彩深度）。"
 msgid "Build inside player"
 msgstr "建立内部玩家"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "凹凸贴图"
@@ -1529,6 +1542,11 @@ msgstr "聊天键"
 msgid "Chat toggle key"
 msgstr "聊天切换键"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "命令"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1619,6 +1637,15 @@ msgstr "主菜单显示云彩"
 msgid "Colored fog"
 msgstr "彩色雾"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"以逗号分隔的 mod 清单，让您可以存取 HTTP API，\n"
+"其可从互联网上传及下载资料。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1627,14 +1654,6 @@ msgstr ""
 "受信任的 Mod 列表，以逗号分隔，其可存取不安全的\n"
 "功能，即便 mod 安全性已启用（经由 request_insecure_environment()）。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"以逗号分隔的 mod 清单，让您可以存取 HTTP API，\n"
-"其可从互联网上传及下载资料。"
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "命令键"
@@ -1789,6 +1808,10 @@ msgstr "默认密码"
 msgid "Default privileges"
 msgstr "默认权限"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1809,6 +1832,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "工具提示显示延迟，按毫秒计算。"
@@ -1839,14 +1866,6 @@ msgstr "服务器描述，将显示在提供给玩家的服务器列表。"
 msgid "Desynchronize block animation"
 msgstr "去同步块动画"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "详细 mod 剖析"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1984,6 +2003,15 @@ msgstr ""
 "启用视差闭塞映射。\n"
 "需要着色器已启用。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Engine profiling data print interval"
+msgstr "剖析印出间隔"
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2046,10 +2074,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "视界"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "视界"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "视界程度。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"快速移动（通过“使用”键）。\n"
+"这需要服务器允许“快速移动”权限。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2186,6 +2228,10 @@ msgstr "常规"
 msgid "Generate normalmaps"
 msgstr "生成常规地图"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2220,6 +2266,15 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr ""
@@ -2247,15 +2302,6 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2350,6 +2396,40 @@ msgstr ""
 msgid "In-game chat console background color (R,G,B)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
@@ -2386,7 +2466,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Joystick button repetition invterval"
+msgid "Joystick button repetition interval"
 msgstr "右击重复间隔"
 
 #: src/settings_translation_file.cpp
@@ -2552,6 +2632,13 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2589,7 +2676,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2739,6 +2826,22 @@ msgstr "液体更新间隔，单位秒。"
 msgid "Liquid update tick"
 msgstr "液体更新单次"
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "活动区块修改间隔"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr "主菜单游戏管理器"
@@ -3161,6 +3264,14 @@ msgstr "最大强制载入块"
 msgid "Maximum hotbar width"
 msgstr "最大快捷栏宽度"
 
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
@@ -3202,6 +3313,11 @@ msgstr ""
 msgid "Maximum number of statically stored objects in a block."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum objects per block"
+msgstr "最大强制载入块"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3209,11 +3325,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+msgid "Maximum simultaneous block sends per client"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+msgid "Maximum simultaneous block sends total"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3224,10 +3340,6 @@ msgstr ""
 msgid "Maximum users"
 msgstr "最大用户"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "菜单"
@@ -3268,10 +3380,6 @@ msgstr "纹理过滤器最小大小"
 msgid "Mipmapping"
 msgstr "Mip 贴图处理"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr "Mod 剖析"
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr "Mod 存储详情 URL"
@@ -3482,21 +3590,29 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
-msgstr ""
+#, fuzzy
+msgid "Profiler"
+msgstr "山谷轮廓"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "剖析器切换键"
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr "剖析印出间隔"
+#, fuzzy
+msgid "Profiling"
+msgstr "Mod 剖析"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3529,6 +3645,11 @@ msgstr "远程端口"
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "字体路径"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "右方向键"
@@ -3689,7 +3810,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -3804,10 +3925,22 @@ msgstr "纹理路径"
 msgid "The altitude at which temperature drops by 20C"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr "泥土深度或其他过滤器"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "服务器监听的网络接口。"
@@ -3952,10 +4085,6 @@ msgstr ""
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "适用 MOD 开发者。"
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr "垂直同步"
@@ -4084,7 +4213,7 @@ msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4188,102 +4317,70 @@ msgstr "cURL 并发限制"
 msgid "cURL timeout"
 msgstr "cURL 超时"
 
-#~ msgid "No of course not!"
-#~ msgstr "当然不！"
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "载入中..."
 
-#~ msgid "Public Serverlist"
-#~ msgstr "公共服务器列表"
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "菜单元素应用缩放因子"
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "生成一般地图"
-
-#~ msgid "No!!!"
-#~ msgstr "不!!!"
+#~ msgid "Touch free target"
+#~ msgstr "自由触摸目标"
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "禁用MOD包"
+#~ msgid "Downloading"
+#~ msgstr "下载中"
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "启用"
+#~ msgid " KB/s"
+#~ msgstr "千字节/秒"
 
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "重启minetest让驱动变化生效"
+#~ msgid " MB/s"
+#~ msgstr "兆字节/秒"
 
-#~ msgid "Game Name"
-#~ msgstr "游戏名"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "左键：移动所有物品，右键：移动单个物品"
 
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”"
+#~ msgid "is required by:"
+#~ msgstr "被需要："
 
-#~ msgid "GAMES"
-#~ msgstr "游戏"
+#~ msgid "Configuration saved.  "
+#~ msgstr "配置已保存。  "
 
-#~ msgid "Mods:"
-#~ msgstr "MODS："
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "警告：配置不一致。  "
 
-#~ msgid "new game"
-#~ msgstr "新建游戏"
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "无法创建世界：名字包含非法字符"
 
-#~ msgid "EDIT GAME"
-#~ msgstr "编辑游戏"
+#~ msgid "Show Public"
+#~ msgstr "显示公共"
 
-#~ msgid "Remove selected mod"
-#~ msgstr "删除选中MOD"
+#~ msgid "Show Favorites"
+#~ msgstr "显示最爱"
 
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- 添加MOD"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "地址栏留空可启动本地服务器。"
 
-#~ msgid "CLIENT"
-#~ msgstr "客户端"
+#~ msgid "Create world"
+#~ msgstr "创造世界"
 
-#~ msgid "START SERVER"
-#~ msgstr "启动服务器"
+#~ msgid "Address required."
+#~ msgstr "需要地址。"
 
-#~ msgid "Name"
-#~ msgstr "名字"
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "无法删除世界：没有选择世界"
 
-#~ msgid "Password"
-#~ msgstr "密码"
+#~ msgid "Files to be deleted"
+#~ msgstr "将被删除的文件"
 
-#~ msgid "SETTINGS"
-#~ msgstr "设置"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "无法创造世界：未找到游戏模式"
 
-#~ msgid "Preload item visuals"
-#~ msgstr "预先加载物品图像"
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "无法配置世界：没有选择世界"
 
-#~ msgid "Finite Liquid"
-#~ msgstr "液体有限延伸"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "单人游戏"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "材质包"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "Add mod:"
-#~ msgstr "添加MOD："
-
-#~ msgid "Local install"
-#~ msgstr "本地安装"
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "警告：一些MOD仍未设定。\n"
-#~ "它们会在你保存配置的时候自动启用。  "
-
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "警告：缺少一些设定了的MOD。\n"
-#~ "它们的设置会在你保存配置的时候被移除。  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "无法删除所有该世界的文件"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4311,67 +4408,105 @@ msgstr "cURL 超时"
 #~ "ESC：菜单\n"
 #~ "T：聊天\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "无法删除所有该世界的文件"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "警告：缺少一些设定了的MOD。\n"
+#~ "它们的设置会在你保存配置的时候被移除。  "
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "无法配置世界：没有选择世界"
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "警告：一些MOD仍未设定。\n"
+#~ "它们会在你保存配置的时候自动启用。  "
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "无法创造世界：未找到游戏模式"
+#~ msgid "Local install"
+#~ msgstr "本地安装"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "将被删除的文件"
+#~ msgid "Add mod:"
+#~ msgstr "添加MOD："
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "无法删除世界：没有选择世界"
+#~ msgid "MODS"
+#~ msgstr "MODS"
 
-#~ msgid "Address required."
-#~ msgstr "需要地址。"
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "材质包"
 
-#~ msgid "Create world"
-#~ msgstr "创造世界"
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "单人游戏"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "地址栏留空可启动本地服务器。"
+#~ msgid "Finite Liquid"
+#~ msgstr "液体有限延伸"
 
-#~ msgid "Show Favorites"
-#~ msgstr "显示最爱"
+#~ msgid "Preload item visuals"
+#~ msgstr "预先加载物品图像"
 
-#~ msgid "Show Public"
-#~ msgstr "显示公共"
+#~ msgid "SETTINGS"
+#~ msgstr "设置"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "无法创建世界：名字包含非法字符"
+#~ msgid "Password"
+#~ msgstr "密码"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "警告：配置不一致。  "
+#~ msgid "Name"
+#~ msgstr "名字"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "配置已保存。  "
+#~ msgid "START SERVER"
+#~ msgstr "启动服务器"
 
-#~ msgid "is required by:"
-#~ msgstr "被需要："
+#~ msgid "CLIENT"
+#~ msgstr "客户端"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "左键：移动所有物品，右键：移动单个物品"
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- 添加MOD"
 
-#~ msgid " MB/s"
-#~ msgstr "兆字节/秒"
+#~ msgid "Remove selected mod"
+#~ msgstr "删除选中MOD"
 
-#~ msgid " KB/s"
-#~ msgstr "千字节/秒"
+#~ msgid "EDIT GAME"
+#~ msgstr "编辑游戏"
+
+#~ msgid "new game"
+#~ msgstr "新建游戏"
+
+#~ msgid "Mods:"
+#~ msgstr "MODS："
+
+#~ msgid "GAMES"
+#~ msgstr "游戏"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”"
+
+#~ msgid "Game Name"
+#~ msgstr "游戏名"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "重启minetest让驱动变化生效"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "下载中"
-
-#~ msgid "Touch free target"
-#~ msgstr "自由触摸目标"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "菜单元素应用缩放因子"
+#~ msgid "If enabled, "
+#~ msgstr "启用"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "载入中..."
+#~ msgid "If disabled "
+#~ msgstr "禁用MOD包"
+
+#~ msgid "No!!!"
+#~ msgstr "不!!!"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "生成一般地图"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "公共服务器列表"
+
+#~ msgid "No of course not!"
+#~ msgstr "当然不！"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "适用 MOD 开发者。"
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "详细 mod 剖析"
diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po
index 3d762ddbb..b078e9d6b 100644
--- a/po/zh_TW/minetest.po
+++ b/po/zh_TW/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-07-13 08:25+0000\n"
 "Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) "
-"<https://hosted.weblate.org/projects/minetest/minetest/zh_TW/>\n"
+"Language-Team: Chinese (Taiwan) <https://hosted.weblate.org/projects/"
+"minetest/minetest/zh_TW/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -970,6 +970,10 @@ msgstr "切換無省略"
 msgid "Use"
 msgstr "使用"
 
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr "縮放"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
 msgstr "按下按鍵"
@@ -1286,10 +1290,6 @@ msgstr "X 按鈕 1"
 msgid "X Button 2"
 msgstr "X 按鈕 2"
 
-#: src/keycode.cpp
-msgid "Zoom"
-msgstr "縮放"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
@@ -1371,6 +1371,11 @@ msgstr "活動區塊管理間隔"
 msgid "Active Block Modifier interval"
 msgstr "活動區塊調整間隔"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Active Block Modifiers"
+msgstr "活動區塊調整間隔"
+
 #: src/settings_translation_file.cpp
 msgid "Active block range"
 msgstr "活動區塊範圍"
@@ -1452,6 +1457,10 @@ msgstr "詢問是否在當機後重新連線"
 msgid "Automaticaly report to the serverlist."
 msgstr "自動回報到伺服器列表。"
 
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "後退鍵"
@@ -1484,6 +1493,10 @@ msgstr "全螢幕模式中的位元／像素（又稱色彩深度）。"
 msgid "Build inside player"
 msgstr "在玩家內構建"
 
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "映射貼圖"
@@ -1524,6 +1537,11 @@ msgstr "聊天按鍵"
 msgid "Chat toggle key"
 msgstr "聊天切換按鍵"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Chatcommands"
+msgstr "指令"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
@@ -1614,6 +1632,15 @@ msgstr "選單中的雲朵"
 msgid "Colored fog"
 msgstr "彩色迷霧"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"以逗號分隔的 mod 清單，讓您可以存取 HTTP API，\n"
+"其可從網際網路上傳及下載資料。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
@@ -1622,14 +1649,6 @@ msgstr ""
 "受信任的 Mod 列表，以逗號分隔，其可存取不安全的\n"
 "功能，即便 mod 安全性是（經由 request_insecure_environment()）。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-"以逗號分隔的 mod 清單，讓您可以存取 HTTP API，\n"
-"其可從網際網路上傳及下載資料。"
-
 #: src/settings_translation_file.cpp
 msgid "Command key"
 msgstr "指令按鍵"
@@ -1783,6 +1802,10 @@ msgstr "預設密碼"
 msgid "Default privileges"
 msgstr "預設特權"
 
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
@@ -1803,6 +1826,10 @@ msgstr ""
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr "定義玩家最大可傳送的距離，以方塊計（0 = 不限制）。"
 
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "顯示工具提示前的延遲，以毫秒計算。"
@@ -1833,14 +1860,6 @@ msgstr "伺服器的描述，會在玩家加入時顯示，也會顯示在伺服
 msgid "Desynchronize block animation"
 msgstr "異步化方塊動畫"
 
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profile data. Useful for mod developers."
-msgstr "詳細的 mod 檔案資料。對 mod 開發者很有用。"
-
-#: src/settings_translation_file.cpp
-msgid "Detailed mod profiling"
-msgstr "詳細的 mod 檔案"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Determines terrain shape.\n"
@@ -1998,6 +2017,15 @@ msgstr ""
 "啟用視差遮蔽貼圖。\n"
 "必須啟用著色器。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Engine profiling data print interval"
+msgstr "分析列印間隔"
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
@@ -2062,10 +2090,24 @@ msgstr ""
 msgid "Field of view"
 msgstr "視野"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Field of view for zoom"
+msgstr "視野"
+
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "以度計算的視野。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"快速移動（透過使用鍵）。\n"
+"這需要伺服器上的「快速」特權。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
@@ -2205,6 +2247,10 @@ msgstr "一般"
 msgid "Generate normalmaps"
 msgstr "生成一般地圖"
 
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
@@ -2248,6 +2294,15 @@ msgstr ""
 "-    紀錄：模仿並記錄已棄用呼叫的反向追蹤（debug 模式預設值）\n"
 "-    錯誤：在使用到棄用的呼叫時中止（建議 mod 開發者使用）。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "初始視窗大小的高度組件。"
@@ -2277,15 +2332,6 @@ msgstr ""
 "活躍的區塊要遵循多大的區域，以地圖區塊（16 個節點）計。\n"
 "活動區塊物件將會被載入，而 ABM 會執行。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"How many blocks are flying in the wire simultaneously for the whole server."
-msgstr "整個伺服器有多少個區塊同時以線性方式飛行。"
-
-#: src/settings_translation_file.cpp
-msgid "How many blocks are flying in the wire simultaneously per client."
-msgstr "每個客戶端有多少個區塊同時以線性方式飛行。"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
@@ -2392,6 +2438,40 @@ msgstr "遊戲內聊天視窗背景 alpha 值（不透明度，介於 0 到 255
 msgid "In-game chat console background color (R,G,B)."
 msgstr "遊戲內聊天視窗背景顏色 (R,G,B)。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr "儲存世界中的重要變更的間隔，以秒計。"
@@ -2429,7 +2509,8 @@ msgstr ""
 "控制細節的品質。"
 
 #: src/settings_translation_file.cpp
-msgid "Joystick button repetition invterval"
+#, fuzzy
+msgid "Joystick button repetition interval"
 msgstr "搖桿按鈕重覆間隔"
 
 #: src/settings_translation_file.cpp
@@ -2658,6 +2739,17 @@ msgstr ""
 "請見 http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"切換快速模式的按鍵。\n"
+"請見 http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Key for toggling cinematic mode.\n"
@@ -2709,8 +2801,9 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Key for toggling the camrea update. Only used for development\n"
+"Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -2898,6 +2991,22 @@ msgstr "液體更新間隔，以秒計。"
 msgid "Liquid update tick"
 msgstr "液體更新 tick"
 
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Loading Block Modifiers"
+msgstr "活動區塊調整間隔"
+
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
 msgstr "主選單遊戲管理員"
@@ -3334,6 +3443,16 @@ msgstr "強制載入區塊的最大值"
 msgid "Maximum hotbar width"
 msgstr "快捷列最大寬度"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr "最大可同時連線的玩家數。"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "可被放進佇列內等待載入的最大區塊數。"
+
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr "可被放進佇列內等待載入的最大區塊數。"
@@ -3384,6 +3503,11 @@ msgstr "最大可同時連線的玩家數。"
 msgid "Maximum number of statically stored objects in a block."
 msgstr "最大靜態儲存於一個區塊中的物件數量。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Maximum objects per block"
+msgstr "每個區塊最大物件數"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
@@ -3393,11 +3517,13 @@ msgstr ""
 "如果有東西要顯示在快捷列左邊或右邊時很有用。"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously blocks send per client"
+#, fuzzy
+msgid "Maximum simultaneous block sends per client"
 msgstr "每個客戶端最大同時傳送區塊數"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum simultaneously bocks send total"
+#, fuzzy
+msgid "Maximum simultaneous block sends total"
 msgstr "總和最大同時傳送區塊數"
 
 #: src/settings_translation_file.cpp
@@ -3408,10 +3534,6 @@ msgstr "檔案下載（例如下載 mod）可花費的最大時間，以毫秒
 msgid "Maximum users"
 msgstr "最多使用者"
 
-#: src/settings_translation_file.cpp
-msgid "Maxmimum objects per block"
-msgstr "每個區塊最大物件數"
-
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr "選單"
@@ -3452,10 +3574,6 @@ msgstr "過濾器的最大材質大小"
 msgid "Mipmapping"
 msgstr "映射貼圖"
 
-#: src/settings_translation_file.cpp
-msgid "Mod profiling"
-msgstr "Mod 分析器"
-
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
 msgstr "Modstore 詳細資訊 URL"
@@ -3681,21 +3799,30 @@ msgstr ""
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr "避免 mod 做出不安全的舉動，像是執行 shell 指令等。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr "分析器資料印出間隔。0 = 停用。對開發者有用。"
+
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr "有 basic_privs 的玩家可以提升特權"
 
 #: src/settings_translation_file.cpp
-msgid "Profiler data print interval. 0 = disable. Useful for developers."
-msgstr "分析器資料印出間隔。0 = 停用。對開發者有用。"
+#, fuzzy
+msgid "Profiler"
+msgstr "山谷分析"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "分析器切換鍵"
 
 #: src/settings_translation_file.cpp
-msgid "Profiling print interval"
-msgstr "分析列印間隔"
+#, fuzzy
+msgid "Profiling"
+msgstr "Mod 分析器"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3730,6 +3857,11 @@ msgstr "遠端埠"
 msgid "Replaces the default main menu with a custom one."
 msgstr "以自訂選單取代預設主選單。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Report path"
+msgstr "字型路徑"
+
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "右鍵"
@@ -3903,8 +4035,9 @@ msgstr ""
 "必須同時啟用著色器。"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Shaders allow advanced visul effects and may increase performance on some "
+"Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
@@ -4033,10 +4166,22 @@ msgstr "材質路徑"
 msgid "The altitude at which temperature drops by 20C"
 msgstr "會降低攝氏 20 度的高度"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
 msgstr "塵土或其他填充物的深度"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "伺服器要監聽的網路介面。"
@@ -4201,10 +4346,6 @@ msgstr "使用多重材質貼圖來縮放材質。可能會稍稍地增加效能
 msgid "Use trilinear filtering when scaling textures."
 msgstr "當縮放材質時使用三線性過濾。"
 
-#: src/settings_translation_file.cpp
-msgid "Useful for mod developers."
-msgstr "對 mod 開發者很有用。"
-
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
 msgstr "垂直同步"
@@ -4336,11 +4477,12 @@ msgstr ""
 "硬體（例如在物品欄中節點的繪圖至材質）。"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
-"propery support downloading textures back from hardware."
+"properly support downloading textures back from hardware."
 msgstr ""
 "當 gui_scaling_filter_txr2img 被設定為真，複製這些圖片\n"
 "從硬體到軟體以供縮放。當為假時，退回\n"
@@ -4467,17 +4609,69 @@ msgstr "cURL 並行限制"
 msgid "cURL timeout"
 msgstr "cURL 逾時"
 
-#~ msgid "No of course not!"
-#~ msgstr "不，絕對不是！"
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "專用於 Mapgen flat 的地圖生成屬性。\n"
+#~ "偶而會在平坦的世界中加入湖泊與山丘。\n"
+#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
+#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "公共伺服器清單"
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "專用於 Mapgen v6 的地圖生成屬性。\n"
+#~ "當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n"
+#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
+#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "生成一般地圖"
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "啟用略低的的水面，所以它就不會完全「填滿」節點。\n"
+#~ "注意，這個功能並未最佳化完成，水面的\n"
+#~ "柔和光功能無法與此功能一同運作。"
 
-#~ msgid "No!!!"
-#~ msgstr "否！！！"
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr "啟用節點選擇突顯（停用選取框）。"
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "預先載入物品欄材質"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "套用在選單元素的縮放係數： "
+
+#~ msgid "Touch free target"
+#~ msgstr "碰觸自由目標"
+
+#~ msgid "If enabled, "
+#~ msgstr "若啟用， "
+
+#~ msgid "If disabled "
+#~ msgstr "若停用 "
+
+#~ msgid "Enable a bit lower water surface, so it doesn't "
+#~ msgstr "啟用較低的水面，所以它不會 "
+
+#~ msgid "\""
+#~ msgstr "\""
 
 #~ msgid ""
 #~ "Map generation attributes specific to Mapgen Valleys.\n"
@@ -4497,66 +4691,31 @@ msgstr "cURL 逾時"
 #~ "「humid_rivers」會修改在河流附近的濕度，在那些區域附近水將會傾向變為一池。"
 #~ "這可能會對微妙調整過的生物群落造成干擾。"
 
-#~ msgid "\""
-#~ msgstr "\""
+#~ msgid "No!!!"
+#~ msgstr "否！！！"
 
-#~ msgid "Enable a bit lower water surface, so it doesn't "
-#~ msgstr "啟用較低的水面，所以它不會 "
+#~ msgid "Generate Normalmaps"
+#~ msgstr "生成一般地圖"
 
-#~ msgid "If disabled "
-#~ msgstr "若停用 "
+#~ msgid "Public Serverlist"
+#~ msgstr "公共伺服器清單"
 
-#~ msgid "If enabled, "
-#~ msgstr "若啟用， "
+#~ msgid "No of course not!"
+#~ msgstr "不，絕對不是！"
 
-#~ msgid "Touch free target"
-#~ msgstr "碰觸自由目標"
+#~ msgid "Useful for mod developers."
+#~ msgstr "對 mod 開發者很有用。"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "套用在選單元素的縮放係數： "
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "預先載入物品欄材質"
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr "啟用節點選擇突顯（停用選取框）。"
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "每個客戶端有多少個區塊同時以線性方式飛行。"
 
 #~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "啟用略低的的水面，所以它就不會完全「填滿」節點。\n"
-#~ "注意，這個功能並未最佳化完成，水面的\n"
-#~ "柔和光功能無法與此功能一同運作。"
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr "整個伺服器有多少個區塊同時以線性方式飛行。"
 
-#, fuzzy
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "專用於 Mapgen v6 的地圖生成屬性。\n"
-#~ "當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n"
-#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
-#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"
+#~ msgid "Detailed mod profiling"
+#~ msgstr "詳細的 mod 檔案"
 
-#, fuzzy
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "專用於 Mapgen flat 的地圖生成屬性。\n"
-#~ "偶而會在平坦的世界中加入湖泊與山丘。\n"
-#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
-#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "詳細的 mod 檔案資料。對 mod 開發者很有用。"

From aa33166386f737f213f1f3005ffd6a6adfd2d97f Mon Sep 17 00:00:00 2001
From: paly2 <plangrognet@laposte.net>
Date: Sun, 10 Jul 2016 15:15:43 +0200
Subject: [PATCH 173/418] Add minetest.unregister_item and
 minetest.register_alias_force

---
 builtin/game/register.lua     | 38 +++++++++++++++++++++++++++++++++++
 doc/lua_api.txt               | 15 +++++++++++++-
 src/itemdef.cpp               | 10 +++++++--
 src/itemdef.h                 |  1 +
 src/nodedef.cpp               | 35 ++++++++++++++++++++++++++++++++
 src/nodedef.h                 |  2 ++
 src/script/lua_api/l_item.cpp | 22 ++++++++++++++++++++
 src/script/lua_api/l_item.h   |  1 +
 8 files changed, 121 insertions(+), 3 deletions(-)

diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index f330491a2..05dc5fef8 100644
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -7,6 +7,9 @@
 local register_item_raw = core.register_item_raw
 core.register_item_raw = nil
 
+local unregister_item_raw = core.unregister_item_raw
+core.unregister_item_raw = nil
+
 local register_alias_raw = core.register_alias_raw
 core.register_alias_raw = nil
 
@@ -172,6 +175,27 @@ function core.register_item(name, itemdef)
 	register_item_raw(itemdef)
 end
 
+function core.unregister_item(name)
+	if not core.registered_items[name] then
+		core.log("warning", "Not unregistering item " ..name..
+			" because it doesn't exist.")
+		return
+	end
+	-- Erase from registered_* table
+	local type = core.registered_items[name].type
+	if type == "node" then
+		core.registered_nodes[name] = nil
+	elseif type == "craft" then
+		core.registered_craftitems[name] = nil
+	elseif type == "tool" then
+		core.registered_tools[name] = nil
+	end
+	core.registered_items[name] = nil
+
+
+	unregister_item_raw(name)
+end
+
 function core.register_node(name, nodedef)
 	nodedef.type = "node"
 	core.register_item(name, nodedef)
@@ -242,6 +266,20 @@ function core.register_alias(name, convert_to)
 	end
 end
 
+function core.register_alias_force(name, convert_to)
+	if forbidden_item_names[name] then
+		error("Unable to register alias: Name is forbidden: " .. name)
+	end
+	if core.registered_items[name] ~= nil then
+		core.unregister_item(name)
+		core.log("info", "Removed item " ..name..
+			" while attempting to force add an alias")
+	end
+	--core.log("Registering alias: " .. name .. " -> " .. convert_to)
+	core.registered_aliases[name] = convert_to
+	register_alias_raw(name, convert_to)
+end
+
 function core.on_craft(itemstack, player, old_craft_list, craft_inv)
 	for _, func in ipairs(core.registered_on_crafts) do
 		itemstack = func(itemstack, player, old_craft_list, craft_inv) or itemstack
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 579fe796e..da9ebb9f1 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -208,11 +208,17 @@ when registering it.
 The `:` prefix can also be used for maintaining backwards compatibility.
 
 ### Aliases
-Aliases can be added by using `minetest.register_alias(name, convert_to)`.
+Aliases can be added by using `minetest.register_alias(name, convert_to)` or
+`minetest.register_alias_force(name, convert_to).
 
 This will make Minetest to convert things called name to things called
 `convert_to`.
 
+The only difference between `minetest.register_alias` and
+`minetest.register_alias_force` is that if an item called `name` exists,
+`minetest.register_alias` will do nothing while
+`minetest.register_alias_force` will unregister it.
+
 This can be used for maintaining backwards compatibility.
 
 This can be also used for setting quick access names for things, e.g. if
@@ -464,6 +470,11 @@ the global `minetest.registered_*` tables.
 * `minetest.register_craftitem(name, item definition)`
     * added to `minetest.registered_items[name]`
 
+* `minetest.unregister_item(name)`
+    * Unregisters the item name from engine, and deletes the entry with key
+    * `name` from `minetest.registered_items` and from the associated item
+    * table according to its nature: minetest.registered_nodes[] etc
+
 * `minetest.register_biome(biome definition)`
     * returns an integer uniquely identifying the registered biome
     * added to `minetest.registered_biome` with the key of `biome.name`
@@ -1883,7 +1894,9 @@ Call these functions only at load time!
 * `minetest.register_node(name, node definition)`
 * `minetest.register_tool(name, item definition)`
 * `minetest.register_craftitem(name, item definition)`
+* `minetest.unregister_item(name)`
 * `minetest.register_alias(name, convert_to)`
+* `minetest.register_alias_force(name, convert_to)`
 * `minetest.register_craft(recipe)`
     * Check recipe table syntax for different types below.
 * `minetest.clear_craft(recipe)`
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index a618ad631..a6c627a03 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -466,11 +466,17 @@ public:
 			infostream<<"ItemDefManager: erased alias "<<def.name
 					<<" because item was defined"<<std::endl;
 	}
+	virtual void unregisterItem(const std::string &name)
+	{
+		verbosestream<<"ItemDefManager: unregistering \""<<name<<"\""<<std::endl;
+
+		delete m_item_definitions[name];
+		m_item_definitions.erase(name);
+	}
 	virtual void registerAlias(const std::string &name,
 			const std::string &convert_to)
 	{
-		if(m_item_definitions.find(name) == m_item_definitions.end())
-		{
+		if (m_item_definitions.find(name) == m_item_definitions.end()) {
 			verbosestream<<"ItemDefManager: setting alias "<<name
 				<<" -> "<<convert_to<<std::endl;
 			m_aliases[name] = convert_to;
diff --git a/src/itemdef.h b/src/itemdef.h
index 805b4aa5d..b14ed41f7 100644
--- a/src/itemdef.h
+++ b/src/itemdef.h
@@ -144,6 +144,7 @@ public:
 	virtual void clear()=0;
 	// Register item definition
 	virtual void registerItem(const ItemDefinition &def)=0;
+	virtual void unregisterItem(const std::string &name)=0;
 	// Set an alias so that items named <name> will load as <convert_to>.
 	// Alias is not set if <name> has already been defined.
 	// Alias will be removed if <name> is defined at a later point of time.
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 646375575..bfb2999bd 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -778,6 +778,7 @@ public:
 	content_t allocateId();
 	virtual content_t set(const std::string &name, const ContentFeatures &def);
 	virtual content_t allocateDummy(const std::string &name);
+	virtual void removeNode(const std::string &name);
 	virtual void updateAliases(IItemDefManager *idef);
 	virtual void applyTextureOverrides(const std::string &override_filepath);
 	virtual void updateTextures(IGameDef *gamedef,
@@ -1072,6 +1073,40 @@ content_t CNodeDefManager::allocateDummy(const std::string &name)
 }
 
 
+void CNodeDefManager::removeNode(const std::string &name)
+{
+	// Pre-condition
+	assert(name != "");
+
+	// Erase name from name ID mapping
+	content_t id = CONTENT_IGNORE;
+	if (m_name_id_mapping.getId(name, id)) {
+		m_name_id_mapping.eraseName(name);
+		m_name_id_mapping_with_aliases.erase(name);
+	}
+
+	// Erase node content from all groups it belongs to
+	for (std::map<std::string, GroupItems>::iterator iter_groups =
+			m_group_to_items.begin();
+			iter_groups != m_group_to_items.end();) {
+		GroupItems &items = iter_groups->second;
+		for (GroupItems::iterator iter_groupitems = items.begin();
+				iter_groupitems != items.end();) {
+			if (iter_groupitems->first == id)
+				items.erase(iter_groupitems++);
+			else
+				iter_groupitems++;
+		}
+
+		// Check if group is empty
+		if (items.size() == 0)
+			m_group_to_items.erase(iter_groups++);
+		else
+			iter_groups++;
+	}
+}
+
+
 void CNodeDefManager::updateAliases(IItemDefManager *idef)
 {
 	std::set<std::string> all = idef->getAll();
diff --git a/src/nodedef.h b/src/nodedef.h
index f17c53727..80396f992 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -384,6 +384,8 @@ public:
 			const ContentFeatures &def)=0;
 	// If returns CONTENT_IGNORE, could not allocate id
 	virtual content_t allocateDummy(const std::string &name)=0;
+	// Remove a node
+	virtual void removeNode(const std::string &name)=0;
 
 	/*
 		Update item alias mapping.
diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index 5381cba76..ff0baea14 100644
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -525,6 +525,27 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 	return 0; /* number of results */
 }
 
+// unregister_item(name)
+int ModApiItemMod::l_unregister_item_raw(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	std::string name = luaL_checkstring(L, 1);
+
+	IWritableItemDefManager *idef =
+			getServer(L)->getWritableItemDefManager();
+
+	// Unregister the node
+	if (idef->get(name).type == ITEM_NODE) {
+		IWritableNodeDefManager *ndef =
+			getServer(L)->getWritableNodeDefManager();
+		ndef->removeNode(name);
+	}
+
+	idef->unregisterItem(name);
+
+	return 0; /* number of results */
+}
+
 // register_alias_raw(name, convert_to_name)
 int ModApiItemMod::l_register_alias_raw(lua_State *L)
 {
@@ -570,6 +591,7 @@ int ModApiItemMod::l_get_name_from_content_id(lua_State *L)
 void ModApiItemMod::Initialize(lua_State *L, int top)
 {
 	API_FCT(register_item_raw);
+	API_FCT(unregister_item_raw);
 	API_FCT(register_alias_raw);
 	API_FCT(get_content_id);
 	API_FCT(get_name_from_content_id);
diff --git a/src/script/lua_api/l_item.h b/src/script/lua_api/l_item.h
index 0f9e4ba9b..be919b701 100644
--- a/src/script/lua_api/l_item.h
+++ b/src/script/lua_api/l_item.h
@@ -135,6 +135,7 @@ public:
 class ModApiItemMod : public ModApiBase {
 private:
 	static int l_register_item_raw(lua_State *L);
+	static int l_unregister_item_raw(lua_State *L);
 	static int l_register_alias_raw(lua_State *L);
 	static int l_get_content_id(lua_State *L);
 	static int l_get_name_from_content_id(lua_State *L);

From 2de8c22a9971153d594b2bb4736eb293753f1212 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Tue, 6 Sep 2016 19:13:52 +0200
Subject: [PATCH 174/418] Make getStackMax return the correct maximal stack
 size

---
 src/inventory.h                 | 5 ++---
 src/itemdef.h                   | 2 +-
 src/script/common/c_content.cpp | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/inventory.h b/src/inventory.h
index a690eb5ae..7d7e58d61 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -80,15 +80,14 @@ struct ItemStack
 	// Maximum size of a stack
 	u16 getStackMax(IItemDefManager *itemdef) const
 	{
-		s16 max = itemdef->get(name).stack_max;
-		return (max >= 0) ? max : 0;
+		return itemdef->get(name).stack_max;
 	}
 
 	// Number of items that can be added to this stack
 	u16 freeSpace(IItemDefManager *itemdef) const
 	{
 		u16 max = getStackMax(itemdef);
-		if(count > max)
+		if (count >= max)
 			return 0;
 		return max - count;
 	}
diff --git a/src/itemdef.h b/src/itemdef.h
index b14ed41f7..dcb98e8a9 100644
--- a/src/itemdef.h
+++ b/src/itemdef.h
@@ -61,7 +61,7 @@ struct ItemDefinition
 	/*
 		Item stack and interaction properties
 	*/
-	s16 stack_max;
+	u16 stack_max;
 	bool usable;
 	bool liquids_pointable;
 	// May be NULL. If non-NULL, deleted by destructor
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index c664101ea..19873abc5 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -65,9 +65,8 @@ ItemDefinition read_item_definition(lua_State* L,int index,
 	}
 	lua_pop(L, 1);
 
-	def.stack_max = getintfield_default(L, index, "stack_max", def.stack_max);
-	if(def.stack_max == 0)
-		def.stack_max = 1;
+	int stack_max = getintfield_default(L, index, "stack_max", def.stack_max);
+	def.stack_max = rangelim(stack_max, 1, U16_MAX);
 
 	lua_getfield(L, index, "on_use");
 	def.usable = lua_isfunction(L, -1);

From c0cd7aa351fc59a6f699c6f945673f02f02e8c32 Mon Sep 17 00:00:00 2001
From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Fri, 9 Sep 2016 07:03:36 +0200
Subject: [PATCH 175/418] Anticheat: Use the physics_override modifiers aswell

---
 src/content_sao.cpp | 82 ++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 937363b76..1e7e788e9 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1326,52 +1326,52 @@ std::string PlayerSAO::getPropertyPacket()
 
 bool PlayerSAO::checkMovementCheat()
 {
-	bool cheated = false;
-	if(isAttached() || m_is_singleplayer ||
-			g_settings->getBool("disable_anticheat"))
-	{
+	if (isAttached() || m_is_singleplayer ||
+			g_settings->getBool("disable_anticheat")) {
 		m_last_good_position = m_player->getPosition();
+		return false;
 	}
-	else
-	{
-		/*
-			Check player movements
 
-			NOTE: Actually the server should handle player physics like the
-			client does and compare player's position to what is calculated
-			on our side. This is required when eg. players fly due to an
-			explosion. Altough a node-based alternative might be possible
-			too, and much more lightweight.
-		*/
+	bool cheated = false;
+	/*
+		Check player movements
 
-		float player_max_speed = 0;
-		if(m_privs.count("fast") != 0){
-			// Fast speed
-			player_max_speed = m_player->movement_speed_fast;
-		} else {
-			// Normal speed
-			player_max_speed = m_player->movement_speed_walk;
-		}
-		// Tolerance. With the lag pool we shouldn't need it.
-		//player_max_speed *= 2.5;
-		//player_max_speed_up *= 2.5;
+		NOTE: Actually the server should handle player physics like the
+		client does and compare player's position to what is calculated
+		on our side. This is required when eg. players fly due to an
+		explosion. Altough a node-based alternative might be possible
+		too, and much more lightweight.
+	*/
 
-		v3f diff = (m_player->getPosition() - m_last_good_position);
-		float d_vert = diff.Y;
-		diff.Y = 0;
-		float d_horiz = diff.getLength();
-		float required_time = d_horiz/player_max_speed;
-		if(d_vert > 0 && d_vert/player_max_speed > required_time)
-			required_time = d_vert/player_max_speed;
-		if(m_move_pool.grab(required_time)){
-			m_last_good_position = m_player->getPosition();
-		} else {
-			actionstream<<"Player "<<m_player->getName()
-					<<" moved too fast; resetting position"
-					<<std::endl;
-			m_player->setPosition(m_last_good_position);
-			cheated = true;
-		}
+	float player_max_speed = 0;
+
+	if (m_privs.count("fast") != 0) {
+		// Fast speed
+		player_max_speed = m_player->movement_speed_fast * m_physics_override_speed;
+	} else {
+		// Normal speed
+		player_max_speed = m_player->movement_speed_walk * m_physics_override_speed;
+	}
+	// Tolerance. The lag pool does this a bit.
+	//player_max_speed *= 2.5;
+
+	v3f diff = (m_player->getPosition() - m_last_good_position);
+	float d_vert = diff.Y;
+	diff.Y = 0;
+	float d_horiz = diff.getLength();
+	float required_time = d_horiz / player_max_speed;
+
+	if (d_vert > 0 && d_vert / player_max_speed > required_time)
+		required_time = d_vert / player_max_speed; // Moving upwards
+
+	if (m_move_pool.grab(required_time)) {
+		m_last_good_position = m_player->getPosition();
+	} else {
+		actionstream << "Player " << m_player->getName()
+				<< " moved too fast; resetting position"
+				<< std::endl;
+		m_player->setPosition(m_last_good_position);
+		cheated = true;
 	}
 	return cheated;
 }

From 403dada85a1e75859573a26ed54a72caa693da91 Mon Sep 17 00:00:00 2001
From: James Stevenson <everamzah@users.noreply.github.com>
Date: Fri, 9 Sep 2016 11:47:13 -0400
Subject: [PATCH 176/418] Return nil on empty get_area() (#4508)

---
 doc/lua_api.txt                    | 1 +
 src/script/lua_api/l_areastore.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index da9ebb9f1..c4bc06695 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2886,6 +2886,7 @@ chosen for you.
 #### Methods
 * `get_area(id, include_borders, include_data)`: returns the area with the id `id`.
   (optional) Boolean values `include_borders` and `include_data` control what's copied.
+  Returns nil if specified area id does not exist.
 * `get_areas_for_pos(pos, include_borders, include_data)`: returns all areas that contain
   the position `pos`. (optional) Boolean values `include_borders` and `include_data` control
   what's copied.
diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp
index 20e7875c7..0912e2ab0 100644
--- a/src/script/lua_api/l_areastore.cpp
+++ b/src/script/lua_api/l_areastore.cpp
@@ -111,6 +111,9 @@ int LuaAreaStore::l_get_area(lua_State *L)
 	const Area *res;
 
 	res = ast->getArea(id);
+	if (!res)
+		return 0;
+
 	push_area(L, res, include_borders, include_data);
 
 	return 1;

From af4b63ff21ef03bb21ebbc023b84f1e54c172008 Mon Sep 17 00:00:00 2001
From: raymoo <uguu@installgentoo.com>
Date: Thu, 8 Sep 2016 11:42:08 -0700
Subject: [PATCH 177/418] fix missing parameters in some mentions of entity
 callbacks

---
 doc/lua_api.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index c4bc06695..1da45ad66 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3329,13 +3329,15 @@ Registered entities
     * It has the member `.object`, which is an `ObjectRef` pointing to the object
     * The original prototype stuff is visible directly via a metatable
 * Callbacks:
-    * `on_activate(self, staticdata)`
+    * `on_activate(self, staticdata, dtime_s)`
         * Called when the object is instantiated.
+        * `dtime_s` is the time passed since the object was unloaded, which can
+          be used for updating the entity state.
     * `on_step(self, dtime)`
         * Called on every server tick, after movement and collision processing.
           `dtime` is usually 0.1 seconds, as per the `dedicated_server_step` setting
           `in minetest.conf`.
-    * `on_punch(self, puncher, time_from_last_punch, tool_capabilities, dir`
+    * `on_punch(self, puncher, time_from_last_punch, tool_capabilities, dir)`
         * Called when somebody punches the object.
         * Note that you probably want to handle most punches using the
           automatic armor group system.
@@ -3463,7 +3465,7 @@ Definition tables
 
         on_activate = function(self, staticdata, dtime_s),
         on_step = function(self, dtime),
-        on_punch = function(self, hitter),
+        on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir),
         on_rightclick = function(self, clicker),
         get_staticdata = function(self),
     --  ^ Called sometimes; the string returned is passed to on_activate when

From d83bcf2c50af3fec37ac8d202064bd2ad92a6d8e Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar+github@foo-projects.org>
Date: Mon, 12 Sep 2016 16:04:13 -0700
Subject: [PATCH 178/418] Plantlike meshoptions: fix degrotate. (#4512)

This snuck in with the meshoptions patch and accidentally kills
degrotate plants. Thanks to @hybriddog for finding this.
---
 src/content_mapblock.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index b86b97822..173649aee 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -1138,7 +1138,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 				u8 p2mesh = 0;
 				if (f.param_type_2 == CPT2_DEGROTATE)
 					rotate_degree = n.param2 * 2;
-				else if (f.param_type_2 != CPT2_MESHOPTIONS) {
+				if (f.param_type_2 != CPT2_MESHOPTIONS) {
 					if (j == 0) {
 						for (u16 i = 0; i < 4; i++)
 							vertices[i].Pos.rotateXZBy(46 + rotate_degree);

From 9dd22aebc7443f1bd678a649a97f504a3b816906 Mon Sep 17 00:00:00 2001
From: Eric Mountain <eric.stephen.mountain@gmail.com>
Date: Wed, 14 Sep 2016 05:05:21 +0200
Subject: [PATCH 179/418] Fix "unknown CMake command "check_library_exists"
 (#4517)

Adds CMakeLists.txt include to fix this issue:

$ cmake . -DBUILD_SERVER=TRUE -DBUILD_CLIENT=FALSE \
   -DCMAKE_BUILD_TYPE=Release -DENABLE_CURL=TRUE -DENABLE_CURSES=FALSE \
   -DENABLE_FREETYPE=TRUE -DENABLE_GETTEXT=FALSE \
   -DENABLE_POSTGRESQL=FALSE -DENABLE_SOUND=FALSE -DENABLE_LUAJIT=TRUE \
   -DIRRLICHT_SOURCE_DIR=$HOME/irrlicht-1.8.4 -LH
...
CMake Error at src/CMakeLists.txt:339 (check_library_exists):
  Unknown CMake command "check_library_exists".
...
---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bcd7a5984..608437f3a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.6)
 project(minetest)
 
 INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckLibraryExists)
 
 # Add custom SemiDebug build mode
 set(CMAKE_CXX_FLAGS_SEMIDEBUG "-O1 -g -Wall -Wabi" CACHE STRING

From b77cee146b0029d377f1028b942857d062bc1374 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sat, 3 Sep 2016 17:53:15 +0200
Subject: [PATCH 180/418] Allow escaping of texture names when passed as an
 argument to a modifier

---
 doc/lua_api.txt     | 14 ++++++++--
 src/client/tile.cpp | 65 ++++++++++++++++++++++++++++++---------------
 2 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 1da45ad66..74d4b90d5 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -263,7 +263,17 @@ Textures can be grouped together by enclosing them in `(` and `)`.
 Example: `cobble.png^(thing1.png^thing2.png)`
 
 A texture for `thing1.png^thing2.png` is created and the resulting
-texture is overlaid over `cobble.png`.
+texture is overlaid on top of `cobble.png`.
+
+### Escaping
+Modifiers that accept texture names (e.g. `[combine`) accept escaping to allow
+passing complex texture names as arguments. Escaping is done with backslash and
+is required for `^` and `:`.
+
+Example: `cobble.png^[lowpart:50:color.png\^[mask\:trans.png`
+
+The lower 50 percent of `color.png^[mask:trans.png` are overlaid
+on top of `cobble.png`.
 
 ### Advanced texture modifiers
 
@@ -351,7 +361,7 @@ Example:
     default_stone.png^[transformFXR90
 
 #### `[inventorycube{<top>{<left>{<right>`
-`^` is replaced by `&` in texture names.
+Escaping does not apply here and `^` is replaced by `&` in texture names instead.
 
 Create an inventory cube texture using the side textures.
 
diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index 3b5d2a3ae..67d5d8d1a 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -948,11 +948,10 @@ video::ITexture* TextureSource::generateTextureFromMesh(
 
 video::IImage* TextureSource::generateImage(const std::string &name)
 {
-	/*
-		Get the base image
-	*/
+	// Get the base image
 
 	const char separator = '^';
+	const char escape = '\\';
 	const char paren_open = '(';
 	const char paren_close = ')';
 
@@ -960,7 +959,9 @@ video::IImage* TextureSource::generateImage(const std::string &name)
 	s32 last_separator_pos = -1;
 	u8 paren_bal = 0;
 	for (s32 i = name.size() - 1; i >= 0; i--) {
-		switch(name[i]) {
+		if (i > 0 && name[i-1] == escape)
+			continue;
+		switch (name[i]) {
 		case separator:
 			if (paren_bal == 0) {
 				last_separator_pos = i;
@@ -1028,10 +1029,12 @@ video::IImage* TextureSource::generateImage(const std::string &name)
 			return NULL;
 		}
 		core::dimension2d<u32> dim = tmp->getDimension();
-		if (!baseimg)
-			baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
-		blit_with_alpha(tmp, baseimg, v2s32(0, 0), v2s32(0, 0), dim);
-		tmp->drop();
+		if (baseimg) {
+			blit_with_alpha(tmp, baseimg, v2s32(0, 0), v2s32(0, 0), dim);
+			tmp->drop();
+		} else {
+			baseimg = tmp;
+		}
 	} else if (!generateImagePart(last_part_of_name, baseimg)) {
 		// Generate image according to part of name
 		errorstream << "generateImage(): "
@@ -1099,9 +1102,27 @@ video::IImage * Align2Npot2(video::IImage * image,
 
 #endif
 
+static std::string unescape_string(const std::string &str, const char esc = '\\')
+{
+	std::string out;
+	size_t pos = 0, cpos;
+	out.reserve(str.size());
+	while (1) {
+		cpos = str.find_first_of(esc, pos);
+		if (cpos == std::string::npos) {
+			out += str.substr(pos);
+			break;
+		}
+		out += str.substr(pos, cpos - pos) + str[cpos + 1];
+		pos = cpos + 2;
+	}
+	return out;
+}
+
 bool TextureSource::generateImagePart(std::string part_of_name,
 		video::IImage *& baseimg)
 {
+	const char escape = '\\'; // same as in generateImage()
 	video::IVideoDriver* driver = m_device->getVideoDriver();
 	sanity_check(driver);
 
@@ -1251,7 +1272,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 		}
 		/*
 			[combine:WxH:X,Y=filename:X,Y=filename2
-			Creates a bigger texture from an amount of smaller ones
+			Creates a bigger texture from any amount of smaller ones
 		*/
 		else if (str_starts_with(part_of_name, "[combine"))
 		{
@@ -1259,7 +1280,6 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			sf.next(":");
 			u32 w0 = stoi(sf.next("x"));
 			u32 h0 = stoi(sf.next(":"));
-			//infostream<<"combined w="<<w0<<" h="<<h0<<std::endl;
 			core::dimension2d<u32> dim(w0,h0);
 			if (baseimg == NULL) {
 				baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
@@ -1268,11 +1288,11 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			while (sf.at_end() == false) {
 				u32 x = stoi(sf.next(","));
 				u32 y = stoi(sf.next("="));
-				std::string filename = sf.next(":");
+				std::string filename = unescape_string(sf.next_esc(":", escape), escape);
 				infostream<<"Adding \""<<filename
 						<<"\" to combined ("<<x<<","<<y<<")"
 						<<std::endl;
-				video::IImage *img = m_sourcecache.getOrLoad(filename, m_device);
+				video::IImage *img = generateImage(filename);
 				if (img) {
 					core::dimension2d<u32> dim = img->getDimension();
 					infostream<<"Size "<<dim.Width
@@ -1295,7 +1315,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			}
 		}
 		/*
-			"[brighten"
+			[brighten
 		*/
 		else if (str_starts_with(part_of_name, "[brighten"))
 		{
@@ -1309,7 +1329,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			brighten(baseimg);
 		}
 		/*
-			"[noalpha"
+			[noalpha
 			Make image completely opaque.
 			Used for the leaves texture when in old leaves mode, so
 			that the transparent parts don't look completely black
@@ -1336,7 +1356,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			}
 		}
 		/*
-			"[makealpha:R,G,B"
+			[makealpha:R,G,B
 			Convert one color to transparent.
 		*/
 		else if (str_starts_with(part_of_name, "[makealpha:"))
@@ -1375,7 +1395,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			}
 		}
 		/*
-			"[transformN"
+			[transformN
 			Rotates and/or flips the image.
 
 			N can be a number (between 0 and 7) or a transform name.
@@ -1543,12 +1563,11 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			Strfnd sf(part_of_name);
 			sf.next(":");
 			u32 percent = stoi(sf.next(":"));
-			std::string filename = sf.next(":");
-			//infostream<<"power part "<<percent<<"%% of "<<filename<<std::endl;
+			std::string filename = unescape_string(sf.next_esc(":", escape), escape);
 
 			if (baseimg == NULL)
 				baseimg = driver->createImage(video::ECF_A8R8G8B8, v2u32(16,16));
-			video::IImage *img = m_sourcecache.getOrLoad(filename, m_device);
+			video::IImage *img = generateImage(filename);
 			if (img)
 			{
 				core::dimension2d<u32> dim = img->getDimension();
@@ -1628,9 +1647,9 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			}
 			Strfnd sf(part_of_name);
 			sf.next(":");
-			std::string filename = sf.next(":");
+			std::string filename = unescape_string(sf.next_esc(":", escape), escape);
 
-			video::IImage *img = m_sourcecache.getOrLoad(filename, m_device);
+			video::IImage *img = generateImage(filename);
 			if (img) {
 				apply_mask(img, baseimg, v2s32(0, 0), v2s32(0, 0),
 						img->getDimension());
@@ -1673,6 +1692,10 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 
 			apply_colorize(baseimg, v2u32(0, 0), baseimg->getDimension(), color, ratio, keep_alpha);
 		}
+		/*
+			[applyfiltersformesh
+			Internal modifier
+		*/
 		else if (str_starts_with(part_of_name, "[applyfiltersformesh"))
 		{
 			// Apply the "clean transparent" filter, if configured.

From b88595050f3af5ccac06aac331ead4ebdcb9deb9 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 11 Sep 2016 23:34:43 +0100
Subject: [PATCH 181/418] Decorations: Generalise 'spawn by' to be used by all
 decoration types

In lua_api.txt, make clear that 'place on' and 'spawn by' can be lists.
---
 doc/lua_api.txt                 |  16 ++---
 src/mg_decoration.cpp           | 123 ++++++++++++++++----------------
 src/mg_decoration.h             |   9 ++-
 src/script/lua_api/l_mapgen.cpp |  21 +++---
 4 files changed, 82 insertions(+), 87 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 74d4b90d5..aa4f129f0 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3909,7 +3909,7 @@ The Biome API is still in an experimental phase and subject to change.
     {
         deco_type = "simple", -- See "Decoration types"
         place_on = "default:dirt_with_grass",
-    --  ^ Node that decoration can be placed on
+    --  ^ Node (or list of nodes) that the decoration can be placed on
         sidelen = 8,
     --  ^ Size of divisions made in the chunk being generated.
     --  ^ If the chunk size is not evenly divisible by sidelen, sidelen is made equal to the chunk size.
@@ -3928,6 +3928,13 @@ The Biome API is still in an experimental phase and subject to change.
     -- ^ Minimum and maximum `y` positions these decorations can be generated at.
     -- ^ This parameter refers to the `y` position of the decoration base, so
     --   the actual maximum height would be `height_max + size.Y`.
+        spawn_by = "default:water",
+    --  ^ Node (or list of nodes) that the decoration only spawns next to.
+    --  ^ Checks two horizontal planes of neighbouring nodes (including diagonal neighbours),
+    --  ^ one plane at Y = surface and one plane at Y = surface = + 1.
+        num_spawn_by = 1,
+    --  ^ Number of spawn_by nodes that must be surrounding the decoration position to occur.
+    --  ^ If absent or -1, decorations occur next to any nodes.
         flags = "liquid_surface, force_placement",
     --  ^ Flags for all decoration types.
     --  ^ "liquid_surface": Instead of placement on the highest solid surface
@@ -3945,13 +3952,6 @@ The Biome API is still in an experimental phase and subject to change.
         height_max = 0,
     --      ^ Number of nodes the decoration can be at maximum.
     --  ^ If absent, the parameter 'height' is used as a constant.
-        spawn_by = "default:water",
-    --  ^ Node that the decoration only spawns next to.
-    --  ^ The neighbours checked are the 8 nodes horizontally surrounding the lowest node of the
-    --  ^ decoration, and the 8 nodes horizontally surrounding the ground node below the decoration.
-        num_spawn_by = 1,
-    --  ^ Number of spawn_by nodes that must be surrounding the decoration position to occur.
-    --  ^ If absent or -1, decorations occur next to any nodes.
 
         ----- Schematic-type parameters
         schematic = "foobar.mts",
diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index 127915b51..92483abc3 100644
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -26,12 +26,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 
 FlagDesc flagdesc_deco[] = {
-	{"place_center_x", DECO_PLACE_CENTER_X},
-	{"place_center_y", DECO_PLACE_CENTER_Y},
-	{"place_center_z", DECO_PLACE_CENTER_Z},
+	{"place_center_x",  DECO_PLACE_CENTER_X},
+	{"place_center_y",  DECO_PLACE_CENTER_Y},
+	{"place_center_z",  DECO_PLACE_CENTER_Z},
 	{"force_placement", DECO_FORCE_PLACEMENT},
-	{"liquid_surface", DECO_LIQUID_SURFACE},
-	{NULL,             0}
+	{"liquid_surface",  DECO_LIQUID_SURFACE},
+	{NULL,              0}
 };
 
 
@@ -82,6 +82,56 @@ Decoration::~Decoration()
 void Decoration::resolveNodeNames()
 {
 	getIdsFromNrBacklog(&c_place_on);
+	getIdsFromNrBacklog(&c_spawnby);
+}
+
+
+bool Decoration::canPlaceDecoration(MMVManip *vm, v3s16 p)
+{
+	// Check if the decoration can be placed on this node
+	u32 vi = vm->m_area.index(p);
+	if (!CONTAINS(c_place_on, vm->m_data[vi].getContent()))
+		return false;
+
+	// Don't continue if there are no spawnby constraints
+	if (nspawnby == -1)
+		return true;
+
+	int nneighs = 0;
+	static const v3s16 dirs[16] = {
+		v3s16( 0, 0,  1),
+		v3s16( 0, 0, -1),
+		v3s16( 1, 0,  0),
+		v3s16(-1, 0,  0),
+		v3s16( 1, 0,  1),
+		v3s16(-1, 0,  1),
+		v3s16(-1, 0, -1),
+		v3s16( 1, 0, -1),
+
+		v3s16( 0, 1,  1),
+		v3s16( 0, 1, -1),
+		v3s16( 1, 1,  0),
+		v3s16(-1, 1,  0),
+		v3s16( 1, 1,  1),
+		v3s16(-1, 1,  1),
+		v3s16(-1, 1, -1),
+		v3s16( 1, 1, -1)
+	};
+
+	// Check these 16 neighbouring nodes for enough spawnby nodes
+	for (size_t i = 0; i != ARRLEN(dirs); i++) {
+		u32 index = vm->m_area.index(p + dirs[i]);
+		if (!vm->m_area.contains(index))
+			continue;
+
+		if (CONTAINS(c_spawnby, vm->m_data[index].getContent()))
+			nneighs++;
+	}
+
+	if (nneighs < nspawnby)
+		return false;
+
+	return true;
 }
 
 
@@ -236,66 +286,15 @@ void DecoSimple::resolveNodeNames()
 {
 	Decoration::resolveNodeNames();
 	getIdsFromNrBacklog(&c_decos);
-	getIdsFromNrBacklog(&c_spawnby);
-}
-
-
-bool DecoSimple::canPlaceDecoration(MMVManip *vm, v3s16 p)
-{
-	// Don't bother if there aren't any decorations to place
-	if (c_decos.size() == 0)
-		return false;
-
-	u32 vi = vm->m_area.index(p);
-
-	// Check if the decoration can be placed on this node
-	if (!CONTAINS(c_place_on, vm->m_data[vi].getContent()))
-		return false;
-
-	// Don't continue if there are no spawnby constraints
-	if (nspawnby == -1)
-		return true;
-
-	int nneighs = 0;
-	v3s16 dirs[16] = {
-		v3s16( 0, 0,  1),
-		v3s16( 0, 0, -1),
-		v3s16( 1, 0,  0),
-		v3s16(-1, 0,  0),
-		v3s16( 1, 0,  1),
-		v3s16(-1, 0,  1),
-		v3s16(-1, 0, -1),
-		v3s16( 1, 0, -1),
-
-		v3s16( 0, 1,  1),
-		v3s16( 0, 1, -1),
-		v3s16( 1, 1,  0),
-		v3s16(-1, 1,  0),
-		v3s16( 1, 1,  1),
-		v3s16(-1, 1,  1),
-		v3s16(-1, 1, -1),
-		v3s16( 1, 1, -1)
-	};
-
-	// Check a Moore neighborhood if there are enough spawnby nodes
-	for (size_t i = 0; i != ARRLEN(dirs); i++) {
-		u32 index = vm->m_area.index(p + dirs[i]);
-		if (!vm->m_area.contains(index))
-			continue;
-
-		if (CONTAINS(c_spawnby, vm->m_data[index].getContent()))
-			nneighs++;
-	}
-
-	if (nneighs < nspawnby)
-		return false;
-
-	return true;
 }
 
 
 size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
 {
+	// Don't bother if there aren't any decorations to place
+	if (c_decos.size() == 0)
+		return 0;
+
 	if (!canPlaceDecoration(vm, p))
 		return 0;
 
@@ -345,9 +344,7 @@ size_t DecoSchematic::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
 	if (schematic == NULL)
 		return 0;
 
-	u32 vi = vm->m_area.index(p);
-	content_t c = vm->m_data[vi].getContent();
-	if (!CONTAINS(c_place_on, c))
+	if (!canPlaceDecoration(vm, p))
 		return 0;
 
 	if (flags & DECO_PLACE_CENTER_X)
diff --git a/src/mg_decoration.h b/src/mg_decoration.h
index da98fd482..be0ba44d7 100644
--- a/src/mg_decoration.h
+++ b/src/mg_decoration.h
@@ -68,6 +68,7 @@ public:
 
 	virtual void resolveNodeNames();
 
+	bool canPlaceDecoration(MMVManip *vm, v3s16 p);
 	size_t placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
 	//size_t placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
 
@@ -82,6 +83,8 @@ public:
 	s16 y_max;
 	float fill_ratio;
 	NoiseParams np;
+	std::vector<content_t> c_spawnby;
+	s16 nspawnby;
 
 	UNORDERED_SET<u8> biomes;
 	//std::list<CutoffData> cutoffs;
@@ -90,17 +93,13 @@ public:
 
 class DecoSimple : public Decoration {
 public:
+	virtual void resolveNodeNames();
 	virtual size_t generate(MMVManip *vm, PcgRandom *pr, v3s16 p);
-	bool canPlaceDecoration(MMVManip *vm, v3s16 p);
 	virtual int getHeight();
 
-	virtual void resolveNodeNames();
-
 	std::vector<content_t> c_decos;
-	std::vector<content_t> c_spawnby;
 	s16 deco_height;
 	s16 deco_height_max;
-	s16 nspawnby;
 };
 
 class DecoSchematic : public Decoration {
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 9f28231eb..a176f4f52 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -902,6 +902,7 @@ int ModApiMapgen::l_register_decoration(lua_State *L)
 	deco->fill_ratio = getfloatfield_default(L, index, "fill_ratio", 0.02);
 	deco->y_min      = getintfield_default(L, index, "y_min", -31000);
 	deco->y_max      = getintfield_default(L, index, "y_max", 31000);
+	deco->nspawnby   = getintfield_default(L, index, "num_spawn_by", -1);
 	deco->sidelen    = getintfield_default(L, index, "sidelen", 8);
 	if (deco->sidelen <= 0) {
 		errorstream << "register_decoration: sidelen must be "
@@ -929,6 +930,14 @@ int ModApiMapgen::l_register_decoration(lua_State *L)
 		errorstream << "register_decoration: couldn't get all biomes " << std::endl;
 	lua_pop(L, 1);
 
+	//// Get node name(s) to 'spawn by'
+	size_t nnames = getstringlistfield(L, index, "spawn_by", &deco->m_nodenames);
+	deco->m_nnlistsizes.push_back(nnames);
+	if (nnames == 0 && deco->nspawnby != -1) {
+		errorstream << "register_decoration: no spawn_by nodes defined,"
+			" but num_spawn_by specified" << std::endl;
+	}
+
 	//// Handle decoration type-specific parameters
 	bool success = false;
 	switch (decotype) {
@@ -962,12 +971,10 @@ int ModApiMapgen::l_register_decoration(lua_State *L)
 
 bool read_deco_simple(lua_State *L, DecoSimple *deco)
 {
-	size_t nnames;
 	int index = 1;
 
 	deco->deco_height     = getintfield_default(L, index, "height", 1);
 	deco->deco_height_max = getintfield_default(L, index, "height_max", 0);
-	deco->nspawnby        = getintfield_default(L, index, "num_spawn_by", -1);
 
 	if (deco->deco_height <= 0) {
 		errorstream << "register_decoration: simple decoration height"
@@ -975,7 +982,7 @@ bool read_deco_simple(lua_State *L, DecoSimple *deco)
 		return false;
 	}
 
-	nnames = getstringlistfield(L, index, "decoration", &deco->m_nodenames);
+	size_t nnames = getstringlistfield(L, index, "decoration", &deco->m_nodenames);
 	deco->m_nnlistsizes.push_back(nnames);
 	if (nnames == 0) {
 		errorstream << "register_decoration: no decoration nodes "
@@ -983,14 +990,6 @@ bool read_deco_simple(lua_State *L, DecoSimple *deco)
 		return false;
 	}
 
-	nnames = getstringlistfield(L, index, "spawn_by", &deco->m_nodenames);
-	deco->m_nnlistsizes.push_back(nnames);
-	if (nnames == 0 && deco->nspawnby != -1) {
-		errorstream << "register_decoration: no spawn_by nodes defined,"
-			" but num_spawn_by specified" << std::endl;
-		return false;
-	}
-
 	return true;
 }
 

From 6e30dd05f40a97106752d724d176443b184eaf27 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Sat, 9 Jan 2016 17:07:46 -0500
Subject: [PATCH 182/418] Collision: Improve performance by combining 6 vectors
 into 1 using a struct

---
 src/collision.cpp | 122 ++++++++++++++++++++++------------------------
 1 file changed, 58 insertions(+), 64 deletions(-)

diff --git a/src/collision.cpp b/src/collision.cpp
index 74c0c25c3..6d22c0798 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -34,6 +34,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 //#define COLL_ZERO 0.032 // broken unit tests
 #define COLL_ZERO 0
 
+
+struct NearbyCollisionInfo {
+	NearbyCollisionInfo(bool is_ul, bool is_obj, int bouncy,
+			const v3s16 &pos, const aabb3f &box) :
+		is_unloaded(is_ul),
+		is_step_up(false),
+		is_object(is_obj),
+		bouncy(bouncy),
+		position(pos),
+		box(box)
+	{}
+
+	bool is_unloaded;
+	bool is_step_up;
+	bool is_object;
+	int bouncy;
+	v3s16 position;
+	aabb3f box;
+};
+
+
 // Helper function:
 // Checks for collision of a moving aabbox with a static aabbox
 // Returns -1 if no collision, 0 if X collision, 1 if Y collision, 2 if Z collision
@@ -160,7 +181,7 @@ int axisAlignedCollision(
 // Helper function:
 // Checks if moving the movingbox up by the given distance would hit a ceiling.
 bool wouldCollideWithCeiling(
-		const std::vector<aabb3f> &staticboxes,
+		const std::vector<NearbyCollisionInfo> &cinfo,
 		const aabb3f &movingbox,
 		f32 y_increase, f32 d)
 {
@@ -168,12 +189,10 @@ bool wouldCollideWithCeiling(
 
 	assert(y_increase >= 0);	// pre-condition
 
-	for(std::vector<aabb3f>::const_iterator
-			i = staticboxes.begin();
-			i != staticboxes.end(); ++i)
-	{
-		const aabb3f& staticbox = *i;
-		if((movingbox.MaxEdge.Y - d <= staticbox.MinEdge.Y) &&
+	for (std::vector<NearbyCollisionInfo>::const_iterator it = cinfo.begin();
+			it != cinfo.end(); ++it) {
+		const aabb3f &staticbox = it->box;
+		if ((movingbox.MaxEdge.Y - d <= staticbox.MinEdge.Y) &&
 				(movingbox.MaxEdge.Y + y_increase > staticbox.MinEdge.Y) &&
 				(movingbox.MinEdge.X < staticbox.MaxEdge.X) &&
 				(movingbox.MaxEdge.X > staticbox.MinEdge.X) &&
@@ -234,12 +253,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 	/*
 		Collect node boxes in movement range
 	*/
-	std::vector<aabb3f> cboxes;
-	std::vector<bool> is_unloaded;
-	std::vector<bool> is_step_up;
-	std::vector<bool> is_object;
-	std::vector<int> bouncy_values;
-	std::vector<v3s16> node_positions;
+	std::vector<NearbyCollisionInfo> cinfo;
 	{
 	//TimeTaker tt2("collisionMoveSimple collect boxes");
 	ScopeProfiler sp(g_profiler, "collisionMoveSimple collect boxes avg", SPT_AVG);
@@ -310,23 +324,13 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 				aabb3f box = *i;
 				box.MinEdge += v3f(x, y, z)*BS;
 				box.MaxEdge += v3f(x, y, z)*BS;
-				cboxes.push_back(box);
-				is_unloaded.push_back(false);
-				is_step_up.push_back(false);
-				bouncy_values.push_back(n_bouncy_value);
-				node_positions.push_back(p);
-				is_object.push_back(false);
+				cinfo.push_back(NearbyCollisionInfo(false,
+					false, n_bouncy_value, p, box));
 			}
-		}
-		else {
+		} else {
 			// Collide with unloaded nodes
 			aabb3f box = getNodeBox(p, BS);
-			cboxes.push_back(box);
-			is_unloaded.push_back(true);
-			is_step_up.push_back(false);
-			bouncy_values.push_back(0);
-			node_positions.push_back(p);
-			is_object.push_back(false);
+			cinfo.push_back(NearbyCollisionInfo(true, false, 0, p, box));
 		}
 	}
 
@@ -344,7 +348,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 		ScopeProfiler sp(g_profiler, "collisionMoveSimple objects avg", SPT_AVG);
 		//TimeTaker tt3("collisionMoveSimple collect object boxes");
 
-		/* add object boxes to cboxes */
+		/* add object boxes to cinfo */
 
 		std::vector<ActiveObject*> objects;
 #ifndef SERVER
@@ -384,23 +388,12 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 				aabb3f object_collisionbox;
 				if (object->getCollisionBox(&object_collisionbox) &&
 						object->collideWithObjects()) {
-					cboxes.push_back(object_collisionbox);
-					is_unloaded.push_back(false);
-					is_step_up.push_back(false);
-					bouncy_values.push_back(0);
-					node_positions.push_back(v3s16(0,0,0));
-					is_object.push_back(true);
+					cinfo.push_back(NearbyCollisionInfo(false, true, 0, v3s16(), object_collisionbox));
 				}
 			}
 		}
 	} //tt3
 
-	assert(cboxes.size() == is_unloaded.size());    // post-condition
-	assert(cboxes.size() == is_step_up.size());     // post-condition
-	assert(cboxes.size() == bouncy_values.size());  // post-condition
-	assert(cboxes.size() == node_positions.size()); // post-condition
-	assert(cboxes.size() == is_object.size());      // post-condition
-
 	/*
 		Collision detection
 	*/
@@ -440,15 +433,16 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 		/*
 			Go through every nodebox, find nearest collision
 		*/
-		for (u32 boxindex = 0; boxindex < cboxes.size(); boxindex++) {
+		for (u32 boxindex = 0; boxindex < cinfo.size(); boxindex++) {
+			NearbyCollisionInfo box_info = cinfo[boxindex];
 			// Ignore if already stepped up this nodebox.
-			if(is_step_up[boxindex])
+			if (box_info.is_step_up)
 				continue;
 
 			// Find nearest collision of the two boxes (raytracing-like)
 			f32 dtime_tmp;
-			int collided = axisAlignedCollision(
-					cboxes[boxindex], movingbox, *speed_f, d, &dtime_tmp);
+			int collided = axisAlignedCollision(box_info.box,
+					movingbox, *speed_f, d, &dtime_tmp);
 
 			if (collided == -1 || dtime_tmp >= nearest_dtime)
 				continue;
@@ -464,19 +458,19 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 			dtime = 0;  // Set to 0 to avoid "infinite" loop due to small FP numbers
 		} else {
 			// Otherwise, a collision occurred.
-
-			const aabb3f& cbox = cboxes[nearest_boxindex];
+			NearbyCollisionInfo &nearest_info = cinfo[nearest_boxindex];
+			const aabb3f& cbox = nearest_info.box;
 			// Check for stairs.
 			bool step_up = (nearest_collided != 1) && // must not be Y direction
 					(movingbox.MinEdge.Y < cbox.MaxEdge.Y) &&
 					(movingbox.MinEdge.Y + stepheight > cbox.MaxEdge.Y) &&
-					(!wouldCollideWithCeiling(cboxes, movingbox,
+					(!wouldCollideWithCeiling(cinfo, movingbox,
 							cbox.MaxEdge.Y - movingbox.MinEdge.Y,
 							d));
 
 			// Get bounce multiplier
-			bool bouncy = (bouncy_values[nearest_boxindex] >= 1);
-			float bounce = -(float)bouncy_values[nearest_boxindex] / 100.0;
+			bool bouncy = (nearest_info.bouncy >= 1);
+			float bounce = -(float)nearest_info.bouncy / 100.0;
 
 			// Move to the point of collision and reduce dtime by nearest_dtime
 			if (nearest_dtime < 0) {
@@ -495,39 +489,38 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 			}
 
 			bool is_collision = true;
-			if (is_unloaded[nearest_boxindex])
+			if (nearest_info.is_unloaded)
 				is_collision = false;
 
 			CollisionInfo info;
-			if (is_object[nearest_boxindex])
+			if (nearest_info.is_object)
 				info.type = COLLISION_OBJECT;
 			else
 				info.type = COLLISION_NODE;
 
-			info.node_p = node_positions[nearest_boxindex];
+			info.node_p = nearest_info.position;
 			info.bouncy = bouncy;
 			info.old_speed = *speed_f;
 
 			// Set the speed component that caused the collision to zero
 			if (step_up) {
 				// Special case: Handle stairs
-				is_step_up[nearest_boxindex] = true;
+				nearest_info.is_step_up = true;
 				is_collision = false;
-			} else if(nearest_collided == 0) { // X
+			} else if (nearest_collided == 0) { // X
 				if (fabs(speed_f->X) > BS * 3)
 					speed_f->X *= bounce;
 				else
 					speed_f->X = 0;
 				result.collides = true;
 				result.collides_xz = true;
-			}
-			else if(nearest_collided == 1) { // Y
-				if (fabs(speed_f->Y) > BS * 3)
+			} else if (nearest_collided == 1) { // Y
+				if(fabs(speed_f->Y) > BS * 3)
 					speed_f->Y *= bounce;
 				else
 					speed_f->Y = 0;
 				result.collides = true;
-			} else if(nearest_collided == 2) { // Z
+			} else if (nearest_collided == 2) { // Z
 				if (fabs(speed_f->Z) > BS * 3)
 					speed_f->Z *= bounce;
 				else
@@ -552,8 +545,9 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 	aabb3f box = box_0;
 	box.MinEdge += *pos_f;
 	box.MaxEdge += *pos_f;
-	for (u32 boxindex = 0; boxindex < cboxes.size(); boxindex++) {
-		const aabb3f& cbox = cboxes[boxindex];
+	for (u32 boxindex = 0; boxindex < cinfo.size(); boxindex++) {
+		NearbyCollisionInfo &box_info = cinfo[boxindex];
+		const aabb3f &cbox = box_info.box;
 
 		/*
 			See if the object is touching ground.
@@ -567,8 +561,8 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 		if (cbox.MaxEdge.X - d > box.MinEdge.X && cbox.MinEdge.X + d < box.MaxEdge.X &&
 				cbox.MaxEdge.Z - d > box.MinEdge.Z &&
 				cbox.MinEdge.Z + d < box.MaxEdge.Z) {
-			if (is_step_up[boxindex]) {
-				pos_f->Y += (cbox.MaxEdge.Y - box.MinEdge.Y);
+			if (box_info.is_step_up) {
+				pos_f->Y += cbox.MaxEdge.Y - box.MinEdge.Y;
 				box = box_0;
 				box.MinEdge += *pos_f;
 				box.MaxEdge += *pos_f;
@@ -576,9 +570,9 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 			if (fabs(cbox.MaxEdge.Y - box.MinEdge.Y) < 0.15 * BS) {
 				result.touching_ground = true;
 
-				if (is_object[boxindex])
+				if (box_info.is_object)
 					result.standing_on_object = true;
-				if (is_unloaded[boxindex])
+				if (box_info.is_unloaded)
 					result.standing_on_unloaded = true;
 			}
 		}

From 1475c1b1c8bb1a2a2812d485d3590e1f817f7c7b Mon Sep 17 00:00:00 2001
From: Thomas--S <Thomas--S@users.noreply.github.com>
Date: Fri, 12 Aug 2016 17:56:31 +0200
Subject: [PATCH 183/418] Add an [invert:<mode> texture modifier

Inverts the given channels of the base image.
Mode may contain the characters "r", "g", "b", "a".
Only the channels that are mentioned in the mode string will be inverted.
---
 doc/lua_api.txt     |  9 +++++++++
 src/client/tile.cpp | 43 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index aa4f129f0..41e7c00eb 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -318,6 +318,15 @@ Example:
 
     default_sandstone.png^[opacity:127
 
+#### `[invert:<mode>`
+Inverts the given channels of the base image.
+Mode may contain the characters "r", "g", "b", "a".
+Only the channels that are mentioned in the mode string will be inverted.
+
+Example:
+
+	default_apple.png^[invert:rgb
+
 #### `[brighten`
 Brightens the texture.
 
diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index 67d5d8d1a..8f0c39465 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -1783,9 +1783,48 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			for (u32 y = 0; y < dim.Height; y++)
 			for (u32 x = 0; x < dim.Width; x++)
 			{
-				video::SColor c = baseimg->getPixel(x,y);
+				video::SColor c = baseimg->getPixel(x, y);
 				c.setAlpha(floor((c.getAlpha() * ratio) / 255 + 0.5));
-				baseimg->setPixel(x,y,c);
+				baseimg->setPixel(x, y, c);
+			}
+		}
+		/*
+			[invert:mode
+			Inverts the given channels of the base image.
+			Mode may contain the characters "r", "g", "b", "a".
+			Only the channels that are mentioned in the mode string
+			will be inverted.
+		*/
+		else if (str_starts_with(part_of_name, "[invert:")) {
+			if (baseimg == NULL) {
+				errorstream << "generateImagePart(): baseimg == NULL "
+						<< "for part_of_name=\"" << part_of_name
+						<< "\", cancelling." << std::endl;
+				return false;
+			}
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+
+			std::string mode = sf.next("");
+			u32 mask = 0;
+			if (mode.find("a") != std::string::npos)
+				mask |= 0xff000000UL;
+			if (mode.find("r") != std::string::npos)
+				mask |= 0x00ff0000UL;
+			if (mode.find("g") != std::string::npos)
+				mask |= 0x0000ff00UL;
+			if (mode.find("b") != std::string::npos)
+				mask |= 0x000000ffUL;
+
+			core::dimension2d<u32> dim = baseimg->getDimension();
+
+			for (u32 y = 0; y < dim.Height; y++)
+			for (u32 x = 0; x < dim.Width; x++)
+			{
+				video::SColor c = baseimg->getPixel(x, y);
+				c.color ^= mask;	
+				baseimg->setPixel(x, y, c);
 			}
 		}
 		else

From 297546af3d3b5b3a07a61ade041ad7c26e9a531d Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 11 Sep 2016 22:48:04 +0100
Subject: [PATCH 184/418] Lua_api.txt: Add note of maximum value for node
 'light_source'

Maximum is 14.
A value of 15 (reserved for direct sunlight) causes a lighting bug.
---
 doc/lua_api.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 41e7c00eb..b6e6520b2 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3664,7 +3664,7 @@ Definition tables
         ^ Don't forget to use "leveled" type nodebox. ]]
         liquid_range = 8, -- number of flowing nodes around source (max. 8)
         drowning = 0, -- Player will take this amount of damage if no bubbles are left
-        light_source = 0, -- Amount of light emitted by node
+        light_source = 0, -- Amount of light emitted by node (max. 14)
         damage_per_second = 0, -- If player is inside node, this damage is caused
         node_box = {type="regular"}, -- See "Node boxes"
         connects_to = nodenames, --[[

From 3aefa5d3ceaaa9299f42cc10921dec65fa53c5e0 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Thu, 15 Sep 2016 22:40:19 +0100
Subject: [PATCH 185/418] Register.lua: Throw error if node 'light_source' >
 core.LIGHT_MAX

Add 'core.LIGHT_MAX = 14' to builtin/game/constants.lua with the intention
to replace misplaced 'default.LIGHT_MAX = 14' in Minetest Game.
Add comment in light.h requiring the constant be changed in both places.
Add lighting bug warning to note in lua_api.txt.
There are hundreds of mod uses of 15 which causes a lighting bug.
---
 builtin/game/constants.lua | 5 +++++
 builtin/game/register.lua  | 3 +++
 doc/lua_api.txt            | 5 ++++-
 src/light.h                | 6 ++++--
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/builtin/game/constants.lua b/builtin/game/constants.lua
index 56fca9289..50c515b24 100644
--- a/builtin/game/constants.lua
+++ b/builtin/game/constants.lua
@@ -19,4 +19,9 @@ core.EMERGE_FROM_DISK   = 3
 core.EMERGE_GENERATED   = 4
 
 -- constants.h
+-- Size of mapblocks in nodes
 core.MAP_BLOCKSIZE = 16
+
+-- light.h
+-- Maximum value for node 'light_source' parameter
+core.LIGHT_MAX = 14
diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index 05dc5fef8..d3f6b3df8 100644
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -127,6 +127,9 @@ function core.register_item(name, itemdef)
 				fixed = {-1/8, -1/2, -1/8, 1/8, 1/2, 1/8},
 			}
 		end
+		if itemdef.light_source and itemdef.light_source > core.LIGHT_MAX then
+			error("Unable to register node: 'light_source' exceeds maximum: " .. name)
+		end
 		setmetatable(itemdef, {__index = core.nodedef_default})
 		core.registered_nodes[itemdef.name] = itemdef
 	elseif itemdef.type == "craft" then
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index b6e6520b2..6f69360c8 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3664,7 +3664,10 @@ Definition tables
         ^ Don't forget to use "leveled" type nodebox. ]]
         liquid_range = 8, -- number of flowing nodes around source (max. 8)
         drowning = 0, -- Player will take this amount of damage if no bubbles are left
-        light_source = 0, -- Amount of light emitted by node (max. 14)
+        light_source = 0, --[[
+        ^ Amount of light emitted by node.
+        ^ To set the maximum (currently 14), use the value 'minetest.LIGHT_MAX'.
+        ^ A value outside the range 0 to minetest.LIGHT_MAX causes undefined behavior.]]
         damage_per_second = 0, -- If player is inside node, this damage is caused
         node_box = {type="regular"}, -- See "Node boxes"
         connects_to = nodenames, --[[
diff --git a/src/light.h b/src/light.h
index f49be4518..984e6d7c2 100644
--- a/src/light.h
+++ b/src/light.h
@@ -27,8 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 // This directly sets the range of light.
-// Actually this is not the real maximum, and this is not the
-// brightest. The brightest is LIGHT_SUN.
+// Actually this is not the real maximum, and this is not the brightest, the
+// brightest is LIGHT_SUN.
+// If changed, this constant as defined in builtin/game/constants.lua must
+// also be changed.
 #define LIGHT_MAX 14
 // Light is stored as 4 bits, thus 15 is the maximum.
 // This brightness is reserved for sunlight

From abb6fba24f346c931bc83cc875f8756c2467c469 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 19 Sep 2016 12:11:31 +0200
Subject: [PATCH 186/418] Fix a typo and use proper deprecation notification
 system

Fix a typo pointed out by @thecow275.

Also, use the deprecated notification system which respects the
deprecated_lua_api_handling setting.
---
 builtin/mainmenu/tab_texturepacks.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/mainmenu/tab_texturepacks.lua b/builtin/mainmenu/tab_texturepacks.lua
index 4614a2974..4638beaa1 100644
--- a/builtin/mainmenu/tab_texturepacks.lua
+++ b/builtin/mainmenu/tab_texturepacks.lua
@@ -73,7 +73,7 @@ local function get_formspec(tabview, name, tabdata)
 	if not file_exists(infofile) then
 		infofile = current_texture_path .. DIR_DELIM .. "info.txt"
 		if file_exists(infofile) then
-			core.log("info.txt is depreciated. description.txt should be used instead.")
+			core.log("deprecated", "info.txt is deprecated. description.txt should be used instead.")
 		end
 	end
 

From 679c8de63ffb7119f2b99b00883bc959f5917da4 Mon Sep 17 00:00:00 2001
From: James Stevenson <everamzah@gmail.com>
Date: Thu, 15 Sep 2016 11:53:17 -0400
Subject: [PATCH 187/418] Increase default font size by 1

---
 builtin/settingtypes.txt | 4 ++--
 minetest.conf.example    | 4 ++--
 src/constants.h          | 2 +-
 src/defaultsettings.cpp  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 4622a7217..15fab0f30 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -561,13 +561,13 @@ freetype (Freetype fonts) bool true
 #    Path to TrueTypeFont or bitmap.
 font_path (Font path) path fonts/liberationsans.ttf
 
-font_size (Font size) int 15
+font_size (Font size) int 16
 
 #    Font shadow offset, if 0 then shadow will not be drawn.
 font_shadow (Font shadow) int 1
 
 #    Font shadow alpha (opaqueness, between 0 and 255).
-font_shadow_alpha (Font shadow alpha) int 128 0 255
+font_shadow_alpha (Font shadow alpha) int 127 0 255
 
 mono_font_path (Monospace font path) path fonts/liberationmono.ttf
 
diff --git a/minetest.conf.example b/minetest.conf.example
index 3d9b77306..bedc8c579 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -655,7 +655,7 @@
 # font_path = fonts/liberationsans.ttf
 
 #    type: int
-# font_size = 15
+# font_size = 16
 
 #    Font shadow offset, if 0 then shadow will not be drawn.
 #    type: int
@@ -663,7 +663,7 @@
 
 #    Font shadow alpha (opaqueness, between 0 and 255).
 #    type: int min: 0 max: 255
-# font_shadow_alpha = 128
+# font_shadow_alpha = 127
 
 #    type: path
 # mono_font_path = fonts/liberationmono.ttf
diff --git a/src/constants.h b/src/constants.h
index b606fc4fa..55ae9daf3 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -112,7 +112,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #if defined(_WIN32)
 	#define TTF_DEFAULT_FONT_SIZE   (18)
 #else
-	#define TTF_DEFAULT_FONT_SIZE	(15)
+	#define TTF_DEFAULT_FONT_SIZE	(16)
 #endif
 #define DEFAULT_FONT_SIZE       (10)
 
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 7c6f7ef3d..4520bac2f 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -213,7 +213,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("freetype", "true");
 	settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf"));
 	settings->setDefault("font_shadow", "1");
-	settings->setDefault("font_shadow_alpha", "128");
+	settings->setDefault("font_shadow_alpha", "127");
 	settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "liberationmono.ttf"));
 	settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
 

From 5091cb5ecdac39a49bce2317d7054d69ed43f2c1 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 21 Sep 2016 04:25:10 +0100
Subject: [PATCH 188/418] Builtin: Change error to warning for light_source >
 14

---
 builtin/game/register.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index d3f6b3df8..90f095e9f 100644
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -128,7 +128,9 @@ function core.register_item(name, itemdef)
 			}
 		end
 		if itemdef.light_source and itemdef.light_source > core.LIGHT_MAX then
-			error("Unable to register node: 'light_source' exceeds maximum: " .. name)
+			itemdef.light_source = core.LIGHT_MAX
+			core.log("warning", "Node 'light_source' value exceeds maximum," ..
+				" limiting to maximum: " ..name)
 		end
 		setmetatable(itemdef, {__index = core.nodedef_default})
 		core.registered_nodes[itemdef.name] = itemdef

From 3a57e525009ade2aa039b0bab33e4b10eda36bf4 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Mon, 19 Sep 2016 20:06:39 +0200
Subject: [PATCH 189/418] Do not serialize empty NodeMetadata

This commit fixes #4516, though note that this will gradually fix MapBlocks
as they are used/modified and thus re-serialized.
---
 src/nodemetadata.cpp | 23 ++++++++++++++++++++---
 src/nodemetadata.h   |  3 +++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 126889ecf..0801a028b 100644
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -74,6 +74,11 @@ void NodeMetadata::clear()
 	m_inventory->clear();
 }
 
+bool NodeMetadata::empty() const
+{
+	return m_stringvars.size() == 0 && m_inventory->getLists().size() == 0;
+}
+
 /*
 	NodeMetadataList
 */
@@ -84,14 +89,13 @@ void NodeMetadataList::serialize(std::ostream &os) const
 		Version 0 is a placeholder for "nothing to see here; go away."
 	*/
 
-	if(m_data.empty()){
+	u16 count = countNonEmpty();
+	if (count == 0) {
 		writeU8(os, 0); // version
 		return;
 	}
 
 	writeU8(os, 1); // version
-
-	u16 count = m_data.size();
 	writeU16(os, count);
 
 	for(std::map<v3s16, NodeMetadata*>::const_iterator
@@ -100,6 +104,8 @@ void NodeMetadataList::serialize(std::ostream &os) const
 	{
 		v3s16 p = i->first;
 		NodeMetadata *data = i->second;
+		if (data->empty())
+			continue;
 
 		u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X;
 		writeU16(os, p16);
@@ -200,6 +206,17 @@ void NodeMetadataList::clear()
 	m_data.clear();
 }
 
+int NodeMetadataList::countNonEmpty() const
+{
+	int n = 0;
+	std::map<v3s16, NodeMetadata*>::const_iterator it;
+	for (it = m_data.begin(); it != m_data.end(); ++it) {
+		if (!it->second->empty())
+			n++;
+	}
+	return n;
+}
+
 std::string NodeMetadata::getString(const std::string &name,
 	unsigned short recursion) const
 {
diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index 8d1298212..da1bf595d 100644
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -47,6 +47,7 @@ public:
 	void deSerialize(std::istream &is);
 
 	void clear();
+	bool empty() const;
 
 	// Generic key/value store
 	std::string getString(const std::string &name, unsigned short recursion = 0) const;
@@ -94,6 +95,8 @@ public:
 	void clear();
 
 private:
+	int countNonEmpty() const;
+
 	std::map<v3s16, NodeMetadata *> m_data;
 };
 

From af4c2107e0e893077deaec7b068b2e4e3e6932c6 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 20 Sep 2016 21:40:05 +0200
Subject: [PATCH 190/418] Don't use ZLIB_WINAPI if the required DLL is not
 provided to CMake

This allows you to use an stdcall zlib (zlib1.dll instead of zlibwapi.dll)
when building Minetest for win32.
---
 src/CMakeLists.txt    | 13 ++++++++++---
 src/serialization.cpp |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 608437f3a..ef40bf8fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -293,9 +293,10 @@ if(WIN32)
 	set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../zlib/zlib-1.2.5"
 			CACHE PATH "Zlib include directory")
 	set(ZLIB_LIBRARIES "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.lib"
-			CACHE FILEPATH "Path to zlibwapi.lib")
+			CACHE FILEPATH "Path to zlib library (usually zlibwapi.lib)")
 	set(ZLIB_DLL "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.dll"
-			CACHE FILEPATH "Path to zlibwapi.dll (for installation)")
+			CACHE FILEPATH "Path to zlib DLL (for installation)")
+	set(ZLIBWAPI_DLL "" CACHE FILEPATH "Path to zlibwapi DLL")
 	set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
 			CACHE PATH "irrlicht dir")
 	if(USE_FREETYPE)
@@ -723,8 +724,14 @@ else()
 		set(OTHER_FLAGS "${OTHER_FLAGS} -Wsign-compare")
 	endif()
 
+	if(NOT ZLIBWAPI_DLL AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+		set(OTHER_FLAGS "${OTHER_FLAGS} -DWIN32_NO_ZLIB_WINAPI")
+		message(WARNING "Defaulting to cdecl for zlib on win32 because ZLIBWAPI_DLL"
+			" isn't set, ensure that ZLIBWAPI_DLL is set if you want stdcall.")
+	endif()
+
 	if(MINGW)
-		set(OTHER_FLAGS "-mthreads -fexceptions")
+		set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
 	endif()
 
 	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -ffast-math -Wall -pipe -funroll-loops")
diff --git a/src/serialization.cpp b/src/serialization.cpp
index 79f66fcae..d30e83726 100644
--- a/src/serialization.cpp
+++ b/src/serialization.cpp
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 
 #include "util/serialize.h"
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(WIN32_NO_ZLIB_WINAPI)
 	#define ZLIB_WINAPI
 #endif
 #include "zlib.h"

From 9fa562f8880c6c447d265fe181986075b640223a Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 20 Sep 2016 21:50:42 +0200
Subject: [PATCH 191/418] Update library versions in buildbot

The libraries updated in this commit were built with a set of scripts:
	https://gist.github.com/sfan5/780c24313c164d34634e18677683b9a3
Building new library versions or just using a different MinGW version
is now way easier. This means Windows builds no longer need to use
ancient library versions just because nobody knows how to build them.
---
 util/buildbot/buildwin32.sh | 65 +++++++++++++++++--------------------
 util/buildbot/buildwin64.sh | 50 ++++++++++++++--------------
 2 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index a1132a90a..27c7e556f 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -13,15 +13,15 @@ packagedir=$builddir/packages
 libdir=$builddir/libs
 
 toolchain_file=$dir/toolchain_mingw.cmake
-irrlicht_version=1.8.1
-ogg_version=1.2.1
-vorbis_version=1.3.3
-curl_version=7.38.0
+irrlicht_version=1.8.4
+ogg_version=1.3.2
+vorbis_version=1.3.5
+curl_version=7.50.3
 gettext_version=0.14.4
-freetype_version=2.3.5
-sqlite3_version=3.8.7.4
+freetype_version=2.7
+sqlite3_version=3.14.2
 luajit_version=2.0.1
-leveldb_version=1.15
+leveldb_version=1.18
 zlib_version=1.2.8
 
 mkdir -p $packagedir
@@ -34,44 +34,38 @@ cd $builddir
 	-c -O $packagedir/irrlicht-$irrlicht_version.zip
 [ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip \
 	-c -O $packagedir/zlib-$zlib_version.zip
-[ -e $packagedir/libogg-$ogg_version-dev.7z ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-dev.7z \
-	-c -O $packagedir/libogg-$ogg_version-dev.7z
-[ -e $packagedir/libogg-$ogg_version-dll.7z ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-dll.7z \
-	-c -O $packagedir/libogg-$ogg_version-dll.7z
-[ -e $packagedir/libvorbis-$vorbis_version-dev.7z ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-dev.7z \
-	-c -O $packagedir/libvorbis-$vorbis_version-dev.7z
-[ -e $packagedir/libvorbis-$vorbis_version-dll.7z ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-dll.7z \
-	-c -O $packagedir/libvorbis-$vorbis_version-dll.7z
-[ -e $packagedir/libcurl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/libcurl-$curl_version-win32.zip \
-	-c -O $packagedir/libcurl-$curl_version.zip
+[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip \
+	-c -O $packagedir/libogg-$ogg_version.zip
+[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip \
+	-c -O $packagedir/libvorbis-$vorbis_version.zip
+[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip \
+	-c -O $packagedir/curl-$curl_version.zip
 [ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version.zip \
 	-c -O $packagedir/gettext-$gettext_version.zip
-[ -e $packagedir/libfreetype-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/libfreetype-$freetype_version-win32.zip \
-	-c -O $packagedir/libfreetype-$freetype_version.zip
+[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip \
+	-c -O $packagedir/freetype2-$freetype_version.zip
 [ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip \
 	-c -O $packagedir/sqlite3-$sqlite3_version.zip
 [ -e $packagedir/luajit-$luajit_version-static-win32.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-static-win32.zip \
 	-c -O $packagedir/luajit-$luajit_version-static-win32.zip
-[ -e $packagedir/libleveldb-$leveldb_version-win32.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \
-	-c -O $packagedir/libleveldb-$leveldb_version-win32.zip
+[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \
+	-c -O $packagedir/libleveldb-$leveldb_version.zip
 [ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped.zip \
 	-c -O $packagedir/openal_stripped.zip
 
 # Extract stuff
 cd $libdir
-[ -d irrlicht-$irrlicht_version ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip
+[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
 [ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
-[ -d libogg/include ] || 7z x -y -olibogg $packagedir/libogg-$ogg_version-dev.7z
-[ -d libogg/bin ] || 7z x -y -olibogg $packagedir/libogg-$ogg_version-dll.7z
-[ -d libvorbis/include ] || 7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dev.7z
-[ -d libvorbis/bin ] || 7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dll.7z
-[ -d libcurl ] || unzip -o $packagedir/libcurl-$curl_version.zip -d libcurl
+[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
+[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
+[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl
 [ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
-[ -d freetype ] || unzip -o $packagedir/libfreetype-$freetype_version.zip -d freetype
+[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
 [ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
 [ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
 [ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version-static-win32.zip -d luajit
-[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version-win32.zip -d leveldb
+[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
 
 # Get minetest
 cd $builddir
@@ -107,14 +101,13 @@ cmake .. \
 	-DENABLE_FREETYPE=1 \
 	-DENABLE_LEVELDB=1 \
 	\
-	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht-$irrlicht_version/include \
-	-DIRRLICHT_LIBRARY=$libdir/irrlicht-$irrlicht_version/lib/Win32-gcc/libIrrlicht.dll.a \
-	-DIRRLICHT_DLL=$libdir/irrlicht-$irrlicht_version/bin/Win32-gcc/Irrlicht.dll \
+	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include \
+	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/Win32-gcc/libIrrlicht.dll.a \
+	-DIRRLICHT_DLL=$libdir/irrlicht/bin/Win32-gcc/Irrlicht.dll \
 	\
 	-DZLIB_INCLUDE_DIR=$libdir/zlib/include \
-	-DZLIB_LIBRARIES=$libdir/zlib/lib/zlibwapi.dll.a \
+	-DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
 	-DZLIB_DLL=$libdir/zlib/bin/zlib1.dll \
-	-DZLIBWAPI_DLL=$libdir/zlib/bin/zlibwapi.dll \
 	\
 	-DLUA_INCLUDE_DIR=$libdir/luajit/include \
 	-DLUA_LIBRARY=$libdir/luajit/libluajit.a \
@@ -145,9 +138,9 @@ cmake .. \
 	-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \
 	\
 	-DFREETYPE_INCLUDE_DIR_freetype2=$libdir/freetype/include/freetype2 \
-	-DFREETYPE_INCLUDE_DIR_ft2build=$libdir/freetype/include \
+	-DFREETYPE_INCLUDE_DIR_ft2build=$libdir/freetype/include/freetype2 \
 	-DFREETYPE_LIBRARY=$libdir/freetype/lib/libfreetype.dll.a \
-	-DFREETYPE_DLL=$libdir/freetype/bin/freetype6.dll \
+	-DFREETYPE_DLL=$libdir/freetype/bin/libfreetype-6.dll \
 	\
 	-DSQLITE3_INCLUDE_DIR=$libdir/sqlite3/include \
 	-DSQLITE3_LIBRARY=$libdir/sqlite3/lib/libsqlite3.dll.a \
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 897f15ea8..3e4079a12 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -13,15 +13,15 @@ packagedir=$builddir/packages
 libdir=$builddir/libs
 
 toolchain_file=$dir/toolchain_mingw64.cmake
-irrlicht_version=1.8.1
-ogg_version=1.3.1
-vorbis_version=1.3.4
-curl_version=7.38.0
+irrlicht_version=1.8.4
+ogg_version=1.3.2
+vorbis_version=1.3.5
+curl_version=7.50.3
 gettext_version=0.18.2
-freetype_version=2.5.3
-sqlite3_version=3.8.7.4
+freetype_version=2.7
+sqlite3_version=3.14.2
 luajit_version=2.0.3
-leveldb_version=1.15
+leveldb_version=1.18
 zlib_version=1.2.8
 
 mkdir -p $packagedir
@@ -38,12 +38,12 @@ cd $builddir
 	-c -O $packagedir/libogg-$ogg_version.zip
 [ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip \
 	-c -O $packagedir/libvorbis-$vorbis_version.zip
-[ -e $packagedir/libcurl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/libcurl-$curl_version-win64.zip \
-	-c -O $packagedir/libcurl-$curl_version.zip
+[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip \
+	-c -O $packagedir/curl-$curl_version.zip
 [ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip \
 	-c -O $packagedir/gettext-$gettext_version.zip
-[ -e $packagedir/freetype-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/libfreetype-$freetype_version-win64.zip \
-	-c -O $packagedir/freetype-$freetype_version.zip
+[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip \
+	-c -O $packagedir/freetype2-$freetype_version.zip
 [ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip \
 	-c -O $packagedir/sqlite3-$sqlite3_version.zip
 [ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-static-win64.zip \
@@ -56,13 +56,13 @@ cd $builddir
 
 # Extract stuff
 cd $libdir
-[ -d irrlicht-$irrlicht_version ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip
+[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
 [ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
 [ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
 [ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
-[ -d libcurl ] || unzip -o $packagedir/libcurl-$curl_version.zip -d libcurl
+[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl
 [ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
-[ -d freetype ] || unzip -o $packagedir/freetype-$freetype_version.zip -d freetype
+[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
 [ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
 [ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
 [ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
@@ -102,9 +102,9 @@ cmake .. \
 	-DENABLE_FREETYPE=1 \
 	-DENABLE_LEVELDB=1 \
 	\
-	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht-$irrlicht_version/include \
-	-DIRRLICHT_LIBRARY=$libdir/irrlicht-$irrlicht_version/lib/Win64-gcc/libIrrlicht.dll.a \
-	-DIRRLICHT_DLL=$libdir/irrlicht-$irrlicht_version/bin/Win64-gcc/Irrlicht.dll \
+	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include \
+	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/Win64-gcc/libIrrlicht.dll.a \
+	-DIRRLICHT_DLL=$libdir/irrlicht/bin/Win64-gcc/Irrlicht.dll \
 	\
 	-DZLIB_INCLUDE_DIR=$libdir/zlib/include \
 	-DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
@@ -131,6 +131,13 @@ cmake .. \
 	-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
 	-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
 	\
+	-DCUSTOM_GETTEXT_PATH=$libdir/gettext \
+	-DGETTEXT_MSGFMT=`which msgfmt` \
+	-DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \
+	-DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv-2.dll \
+	-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
+	-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \
+	\
 	-DFREETYPE_INCLUDE_DIR_freetype2=$libdir/freetype/include/freetype2 \
 	-DFREETYPE_INCLUDE_DIR_ft2build=$libdir/freetype/include/freetype2 \
 	-DFREETYPE_LIBRARY=$libdir/freetype/lib/libfreetype.dll.a \
@@ -142,14 +149,7 @@ cmake .. \
 	\
 	-DLEVELDB_INCLUDE_DIR=$libdir/leveldb/include \
 	-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
-	-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll \
-	\
-	-DCUSTOM_GETTEXT_PATH=$libdir/gettext \
-	-DGETTEXT_MSGFMT=`which msgfmt` \
-	-DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \
-	-DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv-2.dll \
-	-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
-	-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a
+	-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll
 
 make package -j2
 

From cd2c8ade2d86f709d9a82b7ad86284cc3e9ce8c3 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Fri, 23 Sep 2016 17:01:49 +0100
Subject: [PATCH 192/418] Conf.example: Re-add deleted noise parameter
 documentation

Re-add documentation of noise parameter formats.
Re-add 'mgv5_np_ground' noise parameters in group format.
Both these were deleted through auto-generation of conf.example.
Add note to builtin/mainmenu/dlg_settings_advanced.lua that this
documentation must be preserved.
---
 builtin/mainmenu/dlg_settings_advanced.lua |  9 +++++-
 minetest.conf.example                      | 33 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua
index 68b5fd4ef..06def72a3 100644
--- a/builtin/mainmenu/dlg_settings_advanced.lua
+++ b/builtin/mainmenu/dlg_settings_advanced.lua
@@ -659,5 +659,12 @@ function create_adv_settings_dlg()
 				return dlg
 end
 
--- generate minetest.conf.example and settings_translation_file.cpp:
+-- Generate minetest.conf.example and settings_translation_file.cpp
+
+-- *** Please note ***
+-- There is text in minetest.conf.example that will not be generated from
+-- settingtypes.txt but must be preserved:
+-- The documentation of mapgen noise parameter formats (title plus 16 lines)
+-- Noise parameter 'mgv5_np_ground' in group format (13 lines)
+
 --assert(loadfile(core.get_mainmenu_path()..DIR_DELIM.."generate_from_settingtypes.lua"))(parse_config_file(true, false))
diff --git a/minetest.conf.example b/minetest.conf.example
index bedc8c579..9c8015625 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1099,6 +1099,25 @@
 #    type: int
 # num_emerge_threads = 1
 
+#### Noise parameters and formats
+
+#    Noise parameters can be specified as a set of positional values, for example:
+#    Offset, scale, (spread factors), seed offset, number of octaves, persistence, lacunarity
+# mgv6_np_terrain_base = -4, 20, (250, 250, 250), 82341, 5, 0.6, 2.0
+#    Or the group format can be used instead, for example:
+# mgv6_np_terrain_base = {
+#    offset      = -4,
+#    scale       = 20,
+#    spread      = (250, 250, 250),
+#    seed        = 82341,
+#    octaves     = 5,
+#    persistence = 0.6,
+#    lacunarity  = 2.0,
+#    flags       = "defaults"
+# }
+#    Only the group format supports noise flags which are needed for eased noise.
+#    Mgv5 uses eased noise for np_ground so this is shown in group format below.
+
 #    Noise parameters for biome API temperature, humidity and biome blend.
 #    type: noise_params
 # mg_biome_np_heat = 50, 50, (750, 750, 750), 5349, 3, 0.5, 2.0
@@ -1133,6 +1152,20 @@
 #    type: noise_params
 # mgv5_np_cave2 = 0, 12, (50, 50, 50), 10325, 4, 0.5, 2.0
 
+#    Noise parameters in group format, unsupported by advanced settings
+#    menu but settable in minetest.conf.
+#    See documentation of noise parameter formats above.
+# mgv5_np_ground = {
+#    offset      = 0,
+#    scale       = 40,
+#    spread      = (80, 80, 80),
+#    seed        = 983240,
+#    octaves     = 4,
+#    persistence = 0.55,
+#    lacunarity  = 2.0,
+#    flags       = "eased"
+# }
+
 #### Mapgen v6
 
 #    Map generation attributes specific to Mapgen v6.

From c3e1ab859e310f60c0462428d3c991b5218c98d2 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Wed, 21 Sep 2016 23:40:19 +0200
Subject: [PATCH 193/418] Rewrite keycode.cpp (Keycode handling & names)

---
 src/keycode.cpp | 555 +++++++++++++++++++++++++-----------------------
 src/keycode.h   |   2 -
 2 files changed, 286 insertions(+), 271 deletions(-)

diff --git a/src/keycode.cpp b/src/keycode.cpp
index 990dee339..48d010cf4 100644
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "debug.h"
 #include "util/hex.h"
+#include "util/string.h"
 
 class UnknownKeycode : public BaseException
 {
@@ -31,321 +32,335 @@ public:
 		BaseException(s) {};
 };
 
-#define CHECKKEY(x){if(strcmp(name, #x)==0) return irr::x;}
+struct table_key {
+	const char *Name;
+	irr::EKEY_CODE Key;
+	wchar_t Char; // L'\0' means no character assigned
+	const char *LangName; // NULL means it doesn't have a human description
+};
 
-irr::EKEY_CODE keyname_to_keycode(const char *name)
+#define DEFINEKEY1(x, lang) /* Irrlicht key without character */ \
+	{ #x, irr::x, L'\0', lang },
+#define DEFINEKEY2(x, ch, lang) /* Irrlicht key with character */ \
+	{ #x, irr::x, ch, lang },
+#define DEFINEKEY3(ch) /* single Irrlicht key (e.g. KEY_KEY_X) */ \
+	{ "KEY_KEY_" TOSTRING(ch), irr::KEY_KEY_ ## ch, (wchar_t) *TOSTRING(ch), TOSTRING(ch) },
+#define DEFINEKEY4(ch) /* single Irrlicht function key (e.g. KEY_F3) */ \
+	{ "KEY_F" TOSTRING(ch), irr::KEY_F ## ch, L'\0', "F" TOSTRING(ch) },
+#define DEFINEKEY5(ch) /* key without Irrlicht keycode */ \
+	{ ch, irr::KEY_KEY_CODES_COUNT, (wchar_t) *ch, ch },
+
+#define N_(text) text
+
+static const struct table_key table[] = {
+	// Keys that can be reliably mapped between Char and Key
+	DEFINEKEY3(0)
+	DEFINEKEY3(1)
+	DEFINEKEY3(2)
+	DEFINEKEY3(3)
+	DEFINEKEY3(4)
+	DEFINEKEY3(5)
+	DEFINEKEY3(6)
+	DEFINEKEY3(7)
+	DEFINEKEY3(8)
+	DEFINEKEY3(9)
+	DEFINEKEY3(A)
+	DEFINEKEY3(B)
+	DEFINEKEY3(C)
+	DEFINEKEY3(D)
+	DEFINEKEY3(E)
+	DEFINEKEY3(F)
+	DEFINEKEY3(G)
+	DEFINEKEY3(H)
+	DEFINEKEY3(I)
+	DEFINEKEY3(J)
+	DEFINEKEY3(K)
+	DEFINEKEY3(L)
+	DEFINEKEY3(M)
+	DEFINEKEY3(N)
+	DEFINEKEY3(O)
+	DEFINEKEY3(P)
+	DEFINEKEY3(Q)
+	DEFINEKEY3(R)
+	DEFINEKEY3(S)
+	DEFINEKEY3(T)
+	DEFINEKEY3(U)
+	DEFINEKEY3(V)
+	DEFINEKEY3(W)
+	DEFINEKEY3(X)
+	DEFINEKEY3(Y)
+	DEFINEKEY3(Z)
+	DEFINEKEY2(KEY_PLUS, L'+', "+")
+	DEFINEKEY2(KEY_COMMA, L',', ",")
+	DEFINEKEY2(KEY_MINUS, L'-', "-")
+	DEFINEKEY2(KEY_PERIOD, L'.', ".")
+
+	// Keys without a Char
+	DEFINEKEY1(KEY_LBUTTON, N_("Left Button"))
+	DEFINEKEY1(KEY_RBUTTON, N_("Right Button"))
+	DEFINEKEY1(KEY_CANCEL, N_("Cancel"))
+	DEFINEKEY1(KEY_MBUTTON, N_("Middle Button"))
+	DEFINEKEY1(KEY_XBUTTON1, N_("X Button 1"))
+	DEFINEKEY1(KEY_XBUTTON2, N_("X Button 2"))
+	DEFINEKEY1(KEY_BACK, N_("Back"))
+	DEFINEKEY1(KEY_TAB, N_("Tab"))
+	DEFINEKEY1(KEY_CLEAR, N_("Clear"))
+	DEFINEKEY1(KEY_RETURN, N_("Return"))
+	DEFINEKEY1(KEY_SHIFT, N_("Shift"))
+	DEFINEKEY1(KEY_CONTROL, N_("Control"))
+	DEFINEKEY1(KEY_MENU, N_("Menu"))
+	DEFINEKEY1(KEY_PAUSE, N_("Pause"))
+	DEFINEKEY1(KEY_CAPITAL, N_("Caps Lock"))
+	DEFINEKEY1(KEY_SPACE, N_("Space"))
+	DEFINEKEY1(KEY_PRIOR, N_("Prior"))
+	DEFINEKEY1(KEY_NEXT, N_("Next"))
+	DEFINEKEY1(KEY_END, N_("End"))
+	DEFINEKEY1(KEY_HOME, N_("Home"))
+	DEFINEKEY1(KEY_LEFT, N_("Left"))
+	DEFINEKEY1(KEY_UP, N_("Up"))
+	DEFINEKEY1(KEY_RIGHT, N_("Right"))
+	DEFINEKEY1(KEY_DOWN, N_("Down"))
+	DEFINEKEY1(KEY_SELECT, N_("Select"))
+	DEFINEKEY1(KEY_PRINT, N_("Print"))
+	DEFINEKEY1(KEY_EXECUT, N_("Execute"))
+	DEFINEKEY1(KEY_SNAPSHOT, N_("Snapshot"))
+	DEFINEKEY1(KEY_INSERT, N_("Insert"))
+	DEFINEKEY1(KEY_DELETE, N_("Delete"))
+	DEFINEKEY1(KEY_HELP, N_("Help"))
+	DEFINEKEY1(KEY_LWIN, N_("Left Windows"))
+	DEFINEKEY1(KEY_RWIN, N_("Right Windows"))
+	DEFINEKEY1(KEY_NUMPAD0, N_("Numpad 0")) // These are not assigned to a char
+	DEFINEKEY1(KEY_NUMPAD1, N_("Numpad 1")) // to prevent interference with KEY_KEY_[0-9].
+	DEFINEKEY1(KEY_NUMPAD2, N_("Numpad 2"))
+	DEFINEKEY1(KEY_NUMPAD3, N_("Numpad 3"))
+	DEFINEKEY1(KEY_NUMPAD4, N_("Numpad 4"))
+	DEFINEKEY1(KEY_NUMPAD5, N_("Numpad 5"))
+	DEFINEKEY1(KEY_NUMPAD6, N_("Numpad 6"))
+	DEFINEKEY1(KEY_NUMPAD7, N_("Numpad 7"))
+	DEFINEKEY1(KEY_NUMPAD8, N_("Numpad 8"))
+	DEFINEKEY1(KEY_NUMPAD9, N_("Numpad 9"))
+	DEFINEKEY1(KEY_MULTIPLY, N_("Numpad *"))
+	DEFINEKEY1(KEY_ADD, N_("Numpad +"))
+	DEFINEKEY1(KEY_SEPARATOR, N_("Numpad ."))
+	DEFINEKEY1(KEY_SUBTRACT, N_("Numpad -"))
+	DEFINEKEY1(KEY_DECIMAL, NULL)
+	DEFINEKEY1(KEY_DIVIDE, N_("Numpad /"))
+	DEFINEKEY4(1)
+	DEFINEKEY4(2)
+	DEFINEKEY4(3)
+	DEFINEKEY4(4)
+	DEFINEKEY4(5)
+	DEFINEKEY4(6)
+	DEFINEKEY4(7)
+	DEFINEKEY4(8)
+	DEFINEKEY4(9)
+	DEFINEKEY4(10)
+	DEFINEKEY4(11)
+	DEFINEKEY4(12)
+	DEFINEKEY4(13)
+	DEFINEKEY4(14)
+	DEFINEKEY4(15)
+	DEFINEKEY4(16)
+	DEFINEKEY4(17)
+	DEFINEKEY4(18)
+	DEFINEKEY4(19)
+	DEFINEKEY4(20)
+	DEFINEKEY4(21)
+	DEFINEKEY4(22)
+	DEFINEKEY4(23)
+	DEFINEKEY4(24)
+	DEFINEKEY1(KEY_NUMLOCK, N_("Num Lock"))
+	DEFINEKEY1(KEY_SCROLL, N_("Scroll Lock"))
+	DEFINEKEY1(KEY_LSHIFT, N_("Left Shift"))
+	DEFINEKEY1(KEY_RSHIFT, N_("Right Shift"))
+	DEFINEKEY1(KEY_LCONTROL, N_("Left Control"))
+	DEFINEKEY1(KEY_RCONTROL, N_("Right Control"))
+	DEFINEKEY1(KEY_LMENU, N_("Left Menu"))
+	DEFINEKEY1(KEY_RMENU, N_("Right Menu"))
+
+	// Rare/weird keys
+	DEFINEKEY1(KEY_KANA, "Kana")
+	DEFINEKEY1(KEY_HANGUEL, "Hangul")
+	DEFINEKEY1(KEY_HANGUL, "Hangul")
+	DEFINEKEY1(KEY_JUNJA, "Junja")
+	DEFINEKEY1(KEY_FINAL, "Final")
+	DEFINEKEY1(KEY_KANJI, "Kanji")
+	DEFINEKEY1(KEY_HANJA, "Hanja")
+	DEFINEKEY1(KEY_ESCAPE, N_("IME Escape"))
+	DEFINEKEY1(KEY_CONVERT, N_("IME Convert"))
+	DEFINEKEY1(KEY_NONCONVERT, N_("IME Nonconvert"))
+	DEFINEKEY1(KEY_ACCEPT, N_("IME Accept"))
+	DEFINEKEY1(KEY_MODECHANGE, N_("IME Mode Change"))
+	DEFINEKEY1(KEY_APPS, N_("Apps"))
+	DEFINEKEY1(KEY_SLEEP, N_("Sleep"))
+#if !(IRRLICHT_VERSION_MAJOR <= 1 && IRRLICHT_VERSION_MINOR <= 7 && IRRLICHT_VERSION_REVISION < 3)
+	DEFINEKEY1(KEY_OEM_1, "OEM 1") // KEY_OEM_[0-9] and KEY_OEM_102 are assigned to multiple
+	DEFINEKEY1(KEY_OEM_2, "OEM 2") // different chars (on different platforms too) and thus w/o char
+	DEFINEKEY1(KEY_OEM_3, "OEM 3")
+	DEFINEKEY1(KEY_OEM_4, "OEM 4")
+	DEFINEKEY1(KEY_OEM_5, "OEM 5")
+	DEFINEKEY1(KEY_OEM_6, "OEM 6")
+	DEFINEKEY1(KEY_OEM_7, "OEM 7")
+	DEFINEKEY1(KEY_OEM_8, "OEM 8")
+	DEFINEKEY1(KEY_OEM_AX, "OEM AX")
+	DEFINEKEY1(KEY_OEM_102, "OEM 102")
+#endif
+	DEFINEKEY1(KEY_ATTN, "Attn")
+	DEFINEKEY1(KEY_CRSEL, "CrSel")
+	DEFINEKEY1(KEY_EXSEL, "ExSel")
+	DEFINEKEY1(KEY_EREOF, N_("Erase EOF"))
+	DEFINEKEY1(KEY_PLAY, N_("Play"))
+	DEFINEKEY1(KEY_ZOOM, N_("Zoom"))
+	DEFINEKEY1(KEY_PA1, "PA1")
+	DEFINEKEY1(KEY_OEM_CLEAR, N_("OEM Clear"))
+
+	// Keys without Irrlicht keycode
+	DEFINEKEY5("!")
+	DEFINEKEY5("\"")
+	DEFINEKEY5("#")
+	DEFINEKEY5("$")
+	DEFINEKEY5("%")
+	DEFINEKEY5("&")
+	DEFINEKEY5("'")
+	DEFINEKEY5("(")
+	DEFINEKEY5(")")
+	DEFINEKEY5("*")
+	DEFINEKEY5("/")
+	DEFINEKEY5(":")
+	DEFINEKEY5(";")
+	DEFINEKEY5("<")
+	DEFINEKEY5("=")
+	DEFINEKEY5(">")
+	DEFINEKEY5("?")
+	DEFINEKEY5("@")
+	DEFINEKEY5("[")
+	DEFINEKEY5("\\")
+	DEFINEKEY5("]")
+	DEFINEKEY5("^")
+	DEFINEKEY5("_")
+};
+
+#undef N_
+
+#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+struct table_key lookup_keyname(const char *name)
 {
-	CHECKKEY(KEY_LBUTTON)
-	CHECKKEY(KEY_RBUTTON)
-	CHECKKEY(KEY_CANCEL)
-	CHECKKEY(KEY_MBUTTON)
-	CHECKKEY(KEY_XBUTTON1)
-	CHECKKEY(KEY_XBUTTON2)
-	CHECKKEY(KEY_BACK)
-	CHECKKEY(KEY_TAB)
-	CHECKKEY(KEY_CLEAR)
-	CHECKKEY(KEY_RETURN)
-	CHECKKEY(KEY_SHIFT)
-	CHECKKEY(KEY_CONTROL)
-	CHECKKEY(KEY_MENU)
-	CHECKKEY(KEY_PAUSE)
-	CHECKKEY(KEY_CAPITAL)
-	CHECKKEY(KEY_KANA)
-	CHECKKEY(KEY_HANGUEL)
-	CHECKKEY(KEY_HANGUL)
-	CHECKKEY(KEY_JUNJA)
-	CHECKKEY(KEY_FINAL)
-	CHECKKEY(KEY_HANJA)
-	CHECKKEY(KEY_KANJI)
-	CHECKKEY(KEY_ESCAPE)
-	CHECKKEY(KEY_CONVERT)
-	CHECKKEY(KEY_NONCONVERT)
-	CHECKKEY(KEY_ACCEPT)
-	CHECKKEY(KEY_MODECHANGE)
-	CHECKKEY(KEY_SPACE)
-	CHECKKEY(KEY_PRIOR)
-	CHECKKEY(KEY_NEXT)
-	CHECKKEY(KEY_END)
-	CHECKKEY(KEY_HOME)
-	CHECKKEY(KEY_LEFT)
-	CHECKKEY(KEY_UP)
-	CHECKKEY(KEY_RIGHT)
-	CHECKKEY(KEY_DOWN)
-	CHECKKEY(KEY_SELECT)
-	CHECKKEY(KEY_PRINT)
-	CHECKKEY(KEY_EXECUT)
-	CHECKKEY(KEY_SNAPSHOT)
-	CHECKKEY(KEY_INSERT)
-	CHECKKEY(KEY_DELETE)
-	CHECKKEY(KEY_HELP)
-	CHECKKEY(KEY_KEY_0)
-	CHECKKEY(KEY_KEY_1)
-	CHECKKEY(KEY_KEY_2)
-	CHECKKEY(KEY_KEY_3)
-	CHECKKEY(KEY_KEY_4)
-	CHECKKEY(KEY_KEY_5)
-	CHECKKEY(KEY_KEY_6)
-	CHECKKEY(KEY_KEY_7)
-	CHECKKEY(KEY_KEY_8)
-	CHECKKEY(KEY_KEY_9)
-	CHECKKEY(KEY_KEY_A)
-	CHECKKEY(KEY_KEY_B)
-	CHECKKEY(KEY_KEY_C)
-	CHECKKEY(KEY_KEY_D)
-	CHECKKEY(KEY_KEY_E)
-	CHECKKEY(KEY_KEY_F)
-	CHECKKEY(KEY_KEY_G)
-	CHECKKEY(KEY_KEY_H)
-	CHECKKEY(KEY_KEY_I)
-	CHECKKEY(KEY_KEY_J)
-	CHECKKEY(KEY_KEY_K)
-	CHECKKEY(KEY_KEY_L)
-	CHECKKEY(KEY_KEY_M)
-	CHECKKEY(KEY_KEY_N)
-	CHECKKEY(KEY_KEY_O)
-	CHECKKEY(KEY_KEY_P)
-	CHECKKEY(KEY_KEY_Q)
-	CHECKKEY(KEY_KEY_R)
-	CHECKKEY(KEY_KEY_S)
-	CHECKKEY(KEY_KEY_T)
-	CHECKKEY(KEY_KEY_U)
-	CHECKKEY(KEY_KEY_V)
-	CHECKKEY(KEY_KEY_W)
-	CHECKKEY(KEY_KEY_X)
-	CHECKKEY(KEY_KEY_Y)
-	CHECKKEY(KEY_KEY_Z)
-	CHECKKEY(KEY_LWIN)
-	CHECKKEY(KEY_RWIN)
-	CHECKKEY(KEY_APPS)
-	CHECKKEY(KEY_SLEEP)
-	CHECKKEY(KEY_NUMPAD0)
-	CHECKKEY(KEY_NUMPAD1)
-	CHECKKEY(KEY_NUMPAD2)
-	CHECKKEY(KEY_NUMPAD3)
-	CHECKKEY(KEY_NUMPAD4)
-	CHECKKEY(KEY_NUMPAD5)
-	CHECKKEY(KEY_NUMPAD6)
-	CHECKKEY(KEY_NUMPAD7)
-	CHECKKEY(KEY_NUMPAD8)
-	CHECKKEY(KEY_NUMPAD9)
-	CHECKKEY(KEY_MULTIPLY)
-	CHECKKEY(KEY_ADD)
-	CHECKKEY(KEY_SEPARATOR)
-	CHECKKEY(KEY_SUBTRACT)
-	CHECKKEY(KEY_DECIMAL)
-	CHECKKEY(KEY_DIVIDE)
-	CHECKKEY(KEY_F1)
-	CHECKKEY(KEY_F2)
-	CHECKKEY(KEY_F3)
-	CHECKKEY(KEY_F4)
-	CHECKKEY(KEY_F5)
-	CHECKKEY(KEY_F6)
-	CHECKKEY(KEY_F7)
-	CHECKKEY(KEY_F8)
-	CHECKKEY(KEY_F9)
-	CHECKKEY(KEY_F10)
-	CHECKKEY(KEY_F11)
-	CHECKKEY(KEY_F12)
-	CHECKKEY(KEY_F13)
-	CHECKKEY(KEY_F14)
-	CHECKKEY(KEY_F15)
-	CHECKKEY(KEY_F16)
-	CHECKKEY(KEY_F17)
-	CHECKKEY(KEY_F18)
-	CHECKKEY(KEY_F19)
-	CHECKKEY(KEY_F20)
-	CHECKKEY(KEY_F21)
-	CHECKKEY(KEY_F22)
-	CHECKKEY(KEY_F23)
-	CHECKKEY(KEY_F24)
-	CHECKKEY(KEY_NUMLOCK)
-	CHECKKEY(KEY_SCROLL)
-	CHECKKEY(KEY_LSHIFT)
-	CHECKKEY(KEY_RSHIFT)
-	CHECKKEY(KEY_LCONTROL)
-	CHECKKEY(KEY_RCONTROL)
-	CHECKKEY(KEY_LMENU)
-	CHECKKEY(KEY_RMENU)
-	CHECKKEY(KEY_PLUS)
-	CHECKKEY(KEY_COMMA)
-	CHECKKEY(KEY_MINUS)
-	CHECKKEY(KEY_PERIOD)
-	CHECKKEY(KEY_ATTN)
-	CHECKKEY(KEY_CRSEL)
-	CHECKKEY(KEY_EXSEL)
-	CHECKKEY(KEY_EREOF)
-	CHECKKEY(KEY_PLAY)
-	CHECKKEY(KEY_ZOOM)
-	CHECKKEY(KEY_PA1)
-	CHECKKEY(KEY_OEM_CLEAR)
+	for (u16 i = 0; i < ARRAYSIZE(table); i++) {
+		if (strcmp(table[i].Name, name) == 0)
+			return table[i];
+	}
 
 	throw UnknownKeycode(name);
 }
 
-static const char *KeyNames[] =
-{ "-", "KEY_LBUTTON", "KEY_RBUTTON", "KEY_CANCEL", "KEY_MBUTTON", "KEY_XBUTTON1",
-		"KEY_XBUTTON2", "-", "KEY_BACK", "KEY_TAB", "-", "-", "KEY_CLEAR", "KEY_RETURN", "-",
-		"-", "KEY_SHIFT", "KEY_CONTROL", "KEY_MENU", "KEY_PAUSE", "KEY_CAPITAL", "KEY_KANA", "-",
-		"KEY_JUNJA", "KEY_FINAL", "KEY_KANJI", "-", "KEY_ESCAPE", "KEY_CONVERT", "KEY_NONCONVERT",
-		"KEY_ACCEPT", "KEY_MODECHANGE", "KEY_SPACE", "KEY_PRIOR", "KEY_NEXT", "KEY_END",
-		"KEY_HOME", "KEY_LEFT", "KEY_UP", "KEY_RIGHT", "KEY_DOWN", "KEY_SELECT", "KEY_PRINT",
-		"KEY_EXECUTE", "KEY_SNAPSHOT", "KEY_INSERT", "KEY_DELETE", "KEY_HELP", "KEY_KEY_0",
-		"KEY_KEY_1", "KEY_KEY_2", "KEY_KEY_3", "KEY_KEY_4", "KEY_KEY_5",
-		"KEY_KEY_6", "KEY_KEY_7", "KEY_KEY_8", "KEY_KEY_9", "-", "-", "-", "-",
-		"-", "-", "-", "KEY_KEY_A", "KEY_KEY_B", "KEY_KEY_C", "KEY_KEY_D",
-		"KEY_KEY_E", "KEY_KEY_F", "KEY_KEY_G", "KEY_KEY_H", "KEY_KEY_I",
-		"KEY_KEY_J", "KEY_KEY_K", "KEY_KEY_L", "KEY_KEY_M", "KEY_KEY_N",
-		"KEY_KEY_O", "KEY_KEY_P", "KEY_KEY_Q", "KEY_KEY_R", "KEY_KEY_S",
-		"KEY_KEY_T", "KEY_KEY_U", "KEY_KEY_V", "KEY_KEY_W", "KEY_KEY_X",
-		"KEY_KEY_Y", "KEY_KEY_Z", "KEY_LWIN", "KEY_RWIN", "KEY_APPS", "-",
-		"KEY_SLEEP", "KEY_NUMPAD0", "KEY_NUMPAD1", "KEY_NUMPAD2", "KEY_NUMPAD3",
-		"KEY_NUMPAD4", "KEY_NUMPAD5", "KEY_NUMPAD6", "KEY_NUMPAD7",
-		"KEY_NUMPAD8", "KEY_NUMPAD9", "KEY_MULTIPLY", "KEY_ADD", "KEY_SEPERATOR",
-		"KEY_SUBTRACT", "KEY_DECIMAL", "KEY_DIVIDE", "KEY_F1", "KEY_F2", "KEY_F3",
-		"KEY_F4", "KEY_F5", "KEY_F6", "KEY_F7", "KEY_F8", "KEY_F9", "KEY_F10",
-		"KEY_F11", "KEY_F12", "KEY_F13", "KEY_F14", "KEY_F15", "KEY_F16",
-		"KEY_F17", "KEY_F18", "KEY_F19", "KEY_F20", "KEY_F21", "KEY_F22",
-		"KEY_F23", "KEY_F24", "-", "-", "-", "-", "-", "-", "-", "-",
-		"KEY_NUMLOCK", "KEY_SCROLL", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-		"-", "-", "-", "-", "-", "KEY_LSHIFT", "KEY_RSHIFT", "KEY_LCONTROL",
-		"KEY_RCONTROL", "KEY_LMENU", "KEY_RMENU", "-", "-", "-", "-", "-",
-		"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-		"-", "-", "KEY_PLUS", "KEY_COMMA", "KEY_MINUS", "KEY_PERIOD", "-", "-", "-", "-", "-",
-		"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-		"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-		"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-		"-", "-", "-", "-", "-", "-", "-", "-", "KEY_ATTN", "KEY_CRSEL", "KEY_EXSEL",
-		"KEY_EREOF", "KEY_PLAY", "KEY_ZOOM", "KEY_PA1", "KEY_OEM_CLEAR", "-" };
+struct table_key lookup_keykey(irr::EKEY_CODE key)
+{
+	for (u16 i = 0; i < ARRAYSIZE(table); i++) {
+		if (table[i].Key == key)
+			return table[i];
+	}
 
-#define N_(text) text
+	std::ostringstream os;
+	os << "<Keycode " << (int) key << ">";
+	throw UnknownKeycode(os.str().c_str());
+}
 
-static const char *KeyNamesLang[] =
-	{ "-", N_("Left Button"), N_("Right Button"), N_("Cancel"), N_("Middle Button"), N_("X Button 1"),
-			N_("X Button 2"), "-", N_("Back"), N_("Tab"), "-", "-", N_("Clear"), N_("Return"), "-",
-			"-", N_("Shift"), N_("Control"), N_("Menu"), N_("Pause"), N_("Capital"), N_("Kana"), "-",
-			N_("Junja"), N_("Final"), N_("Kanji"), "-", N_("Escape"), N_("Convert"), N_("Nonconvert"),
-			N_("Accept"), N_("Mode Change"), N_("Space"), N_("Prior"), N_("Next"), N_("End"), N_("Home"),
-			N_("Left"), N_("Up"), N_("Right"), N_("Down"), N_("Select"), N_("Print"), N_("Execute"),
-			N_("Snapshot"), N_("Insert"), N_("Delete"), N_("Help"), "0", "1", "2", "3", "4", "5",
-			"6", "7", "8", "9", "-", "-", "-", "-", "-", "-", "-", "A", "B", "C",
-			"D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q",
-			"R", "S", "T", "U", "V", "W", "X", "Y", "Z", N_("Left Windows"),
-			N_("Right Windows"), N_("Apps"), "-", N_("Sleep"), N_("Numpad 0"), N_("Numpad 1"),
-			N_("Numpad 2"), N_("Numpad 3"), N_("Numpad 4"), N_("Numpad 5"), N_("Numpad 6"), N_("Numpad 7"),
-			N_("Numpad 8"), N_("Numpad 9"), N_("Numpad *"), N_("Numpad +"), N_("Numpad /"), N_("Numpad -"),
-			"Numpad .", "Numpad /", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8",
-			"F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18",
-			"F19", "F20", "F21", "F22", "F23", "F24", "-", "-", "-", "-", "-", "-",
-			"-", "-", N_("Num Lock"), N_("Scroll Lock"), "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", N_("Left Shift"), N_("Right Shift"),
-			N_("Left Control"), N_("Right Control"), N_("Left Menu"), N_("Right Menu"), "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", N_("Plus"), N_("Comma"), N_("Minus"), N_("Period"), "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", N_("Attn"), N_("CrSel"),
-			N_("ExSel"), N_("Erase OEF"), N_("Play"), N_("Zoom"), N_("PA1"), N_("OEM Clear"), "-" };
+struct table_key lookup_keychar(wchar_t Char)
+{
+	for (u16 i = 0; i < ARRAYSIZE(table); i++) {
+		if (table[i].Char == Char)
+			return table[i];
+	}
 
-#undef N_
+	std::ostringstream os;
+	os << "<Char " << hex_encode((char*) &Char, sizeof(wchar_t)) << ">";
+	throw UnknownKeycode(os.str().c_str());
+}
 
 KeyPress::KeyPress() :
 	Key(irr::KEY_KEY_CODES_COUNT),
-	Char(L'\0')
+	Char(L'\0'),
+	m_name("")
 {}
 
 KeyPress::KeyPress(const char *name)
 {
-	if (name[0] == 0) {
+	if (strlen(name) == 0) {
 		Key = irr::KEY_KEY_CODES_COUNT;
 		Char = L'\0';
+		m_name = "";
 		return;
-	} else if (strlen(name) > 4) {
+	} else if (strlen(name) <= 4) {
+		// Lookup by resulting character
+		int chars_read = mbtowc(&Char, name, 1);
+		FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
 		try {
-			Key = keyname_to_keycode(name);
-			m_name = name;
-			if (strlen(name) > 8 && strncmp(name, "KEY_KEY_", 8) == 0) {
-				int chars_read = mbtowc(&Char, name + 8, 1);
-
-				FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
-			} else
-				Char = L'\0';
+			struct table_key k = lookup_keychar(Char);
+			m_name = k.Name;
+			Key = k.Key;
 			return;
 		} catch (UnknownKeycode &e) {};
 	} else {
-		// see if we can set it up as a KEY_KEY_something
-		m_name = "KEY_KEY_";
-		m_name += name;
+		// Lookup by name
+		m_name = name;
 		try {
-			Key = keyname_to_keycode(m_name.c_str());
-			int chars_read = mbtowc(&Char, name, 1);
-
-			FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
+			struct table_key k = lookup_keyname(name);
+			Key = k.Key;
+			Char = k.Char;
 			return;
 		} catch (UnknownKeycode &e) {};
 	}
 
-	// it's not a (known) key, just take the first char and use that
-
+	// It's not a known key, complain and try to do something
 	Key = irr::KEY_KEY_CODES_COUNT;
-
-	int mbtowc_ret = mbtowc(&Char, name, 1);
-	FATAL_ERROR_IF(mbtowc_ret != 1, "Unexpected multibyte character");
-	m_name = name[0];
+	int chars_read = mbtowc(&Char, name, 1);
+	FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
+	m_name = "";
+	warningstream << "KeyPress: Unknown key '" << name << "', falling back to first char.";
 }
 
 KeyPress::KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character)
 {
-	Key = in.Key;
+	if (prefer_character)
+		Key = irr::KEY_KEY_CODES_COUNT;
+	else
+		Key = in.Key;
 	Char = in.Char;
 
-	if(prefer_character){
-		m_name.resize(MB_CUR_MAX+1, '\0');
-		int written = wctomb(&m_name[0], Char);
-		if(written > 0){
-			infostream<<"KeyPress: Preferring character for "<<m_name<<std::endl;
-			Key = irr::KEY_KEY_CODES_COUNT;
-			return;
-		}
-	}
-
-	if (valid_kcode(Key)) {
-		m_name = KeyNames[Key];
-	} else {
-		m_name.resize(MB_CUR_MAX+1, '\0');
-		int written = wctomb(&m_name[0], Char);
-		if(written < 0){
-			std::string hexstr = hex_encode((const char*)&Char, sizeof(Char));
-			errorstream<<"KeyPress: Unexpected multibyte character "<<hexstr<<std::endl;
-		}
-	}
+	try {
+		if (valid_kcode(Key))
+			m_name = lookup_keykey(Key).Name;
+		else
+			m_name = lookup_keychar(Char).Name;
+	} catch (UnknownKeycode &e) {
+		m_name = "";
+	};
 }
 
 const char *KeyPress::sym() const
 {
-	if (Key && Key < irr::KEY_KEY_CODES_COUNT)
-		return KeyNames[Key];
-	else {
-		return m_name.c_str();
-	}
+	return m_name.c_str();
 }
 
 const char *KeyPress::name() const
 {
-	if (Key && Key < irr::KEY_KEY_CODES_COUNT)
-		return KeyNamesLang[Key];
-	else {
-		return m_name.c_str();
-	}
+	if (m_name == "")
+		return "";
+	const char *ret;
+	if (valid_kcode(Key))
+		ret = lookup_keykey(Key).LangName;
+	else
+		ret = lookup_keychar(Char).LangName;
+	return ret ? ret : "<Unnamed key>";
 }
 
 const KeyPress EscapeKey("KEY_ESCAPE");
 const KeyPress CancelKey("KEY_CANCEL");
 const KeyPress NumberKey[] = {
-	KeyPress("KEY_KEY_0"), KeyPress("KEY_KEY_1"), KeyPress("KEY_KEY_2"),
-	KeyPress("KEY_KEY_3"), KeyPress("KEY_KEY_4"), KeyPress("KEY_KEY_5"),
-	KeyPress("KEY_KEY_6"), KeyPress("KEY_KEY_7"), KeyPress("KEY_KEY_8"),
-	KeyPress("KEY_KEY_9")};
+	KeyPress("0"), KeyPress("1"), KeyPress("2"), KeyPress("3"), KeyPress("4"),
+	KeyPress("5"), KeyPress("6"), KeyPress("7"), KeyPress("8"), KeyPress("9")
+};
 
 /*
 	Key config
@@ -360,8 +375,10 @@ KeyPress getKeySetting(const char *settingname)
 	n = g_key_setting_cache.find(settingname);
 	if(n != g_key_setting_cache.end())
 		return n->second;
-	g_key_setting_cache[settingname] = g_settings->get(settingname).c_str();
-	return g_key_setting_cache.find(settingname)->second;
+
+	KeyPress k(g_settings->get(settingname).c_str());
+	g_key_setting_cache[settingname] = k;
+	return k;
 }
 
 void clearKeyCache()
diff --git a/src/keycode.h b/src/keycode.h
index 459a85a46..4d66cf7b5 100644
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -44,8 +44,6 @@ public:
 
 	const char *sym() const;
 	const char *name() const;
-
-	std::string debug() const;
 protected:
 	static bool valid_kcode(irr::EKEY_CODE k)
 	{

From cc0b3c1cd14f036d6336ae0fb2329fd245b6b4b4 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 22 Sep 2016 15:23:54 +0200
Subject: [PATCH 194/418] Add keycode.cpp unittests

---
 src/unittest/CMakeLists.txt   |   1 +
 src/unittest/test_keycode.cpp | 129 ++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 src/unittest/test_keycode.cpp

diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
index 34de99e12..c7c95772f 100644
--- a/src/unittest/CMakeLists.txt
+++ b/src/unittest/CMakeLists.txt
@@ -6,6 +6,7 @@ set (UNITTEST_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/test_connection.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_filepath.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_inventory.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_keycode.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_map_settings_manager.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_mapnode.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_nodedef.cpp
diff --git a/src/unittest/test_keycode.cpp b/src/unittest/test_keycode.cpp
new file mode 100644
index 000000000..dd3d75a5b
--- /dev/null
+++ b/src/unittest/test_keycode.cpp
@@ -0,0 +1,129 @@
+/*
+Minetest
+Copyright (C) 2016 sfan5 <sfan5@live.de>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "test.h"
+
+#include <string>
+#include "exceptions.h"
+#include "keycode.h"
+
+class TestKeycode : public TestBase {
+public:
+	TestKeycode() { TestManager::registerTestModule(this); }
+	const char *getName() { return "TestKeycode"; }
+
+	void runTests(IGameDef *gamedef);
+
+	void testCreateFromString();
+	void testCreateFromSKeyInput();
+	void testCompare();
+};
+
+static TestKeycode g_test_instance;
+
+void TestKeycode::runTests(IGameDef *gamedef)
+{
+	TEST(testCreateFromString);
+	TEST(testCreateFromSKeyInput);
+	TEST(testCompare);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+#define UASSERTEQ_STR(one, two) UASSERT(strcmp(one, two) == 0)
+
+void TestKeycode::testCreateFromString()
+{
+	KeyPress k;
+
+	// Character key, from char
+	k = KeyPress("R");
+	UASSERTEQ_STR(k.sym(), "KEY_KEY_R");
+	UASSERTCMP(int, >, strlen(k.name()), 0); // should have human description
+
+	// Character key, from identifier
+	k = KeyPress("KEY_KEY_B");
+	UASSERTEQ_STR(k.sym(), "KEY_KEY_B");
+	UASSERTCMP(int, >, strlen(k.name()), 0);
+
+	// Non-Character key, from identifier
+	k = KeyPress("KEY_UP");
+	UASSERTEQ_STR(k.sym(), "KEY_UP");
+	UASSERTCMP(int, >, strlen(k.name()), 0);
+
+	k = KeyPress("KEY_F6");
+	UASSERTEQ_STR(k.sym(), "KEY_F6");
+	UASSERTCMP(int, >, strlen(k.name()), 0);
+
+	// Irrlicht-unknown key, from char
+	k = KeyPress("/");
+	UASSERTEQ_STR(k.sym(), "/");
+	UASSERTCMP(int, >, strlen(k.name()), 0);
+}
+
+void TestKeycode::testCreateFromSKeyInput()
+{
+	KeyPress k;
+	irr::SEvent::SKeyInput in;
+
+	// Character key
+	in.Key = irr::KEY_KEY_3;
+	in.Char = L'3';
+	k = KeyPress(in);
+	UASSERTEQ_STR(k.sym(), "KEY_KEY_3");
+
+	// Non-Character key
+	in.Key = irr::KEY_RSHIFT;
+	in.Char = L'\0';
+	k = KeyPress(in);
+	UASSERTEQ_STR(k.sym(), "KEY_RSHIFT");
+
+	// Irrlicht-unknown key
+	in.Key = irr::KEY_KEY_CODES_COUNT;
+	in.Char = L'?';
+	k = KeyPress(in);
+	UASSERTEQ_STR(k.sym(), "?");
+
+	// prefer_character mode
+	in.Key = irr::KEY_COMMA;
+	in.Char = L'G';
+	k = KeyPress(in, true);
+	UASSERTEQ_STR(k.sym(), "KEY_KEY_G");
+}
+
+void TestKeycode::testCompare()
+{
+	// Basic comparison
+	UASSERT(KeyPress("5") == KeyPress("KEY_KEY_5"));
+	UASSERT(!(KeyPress("5") == KeyPress("KEY_NUMPAD_5")));
+
+	// Matching char suffices
+	// note: This is a real-world example, Irrlicht maps XK_equal to irr::KEY_PLUS on Linux
+	irr::SEvent::SKeyInput in;
+	in.Key = irr::KEY_PLUS;
+	in.Char = L'=';
+	UASSERT(KeyPress("=") == KeyPress(in));
+
+	// Matching keycode suffices
+	irr::SEvent::SKeyInput in2;
+	in.Key = in2.Key = irr::KEY_OEM_CLEAR;
+	in.Char = L'\0';
+	in2.Char = L';';
+	UASSERT(KeyPress(in) == KeyPress(in2));
+}

From 45a9145a4bd44a677c77687880d0b0acb7e6b421 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 29 Sep 2016 16:20:05 +0200
Subject: [PATCH 195/418] Only include keycode unittests in client build (fixes
 #4559)

---
 src/CMakeLists.txt          | 1 +
 src/unittest/CMakeLists.txt | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ef40bf8fc..753291cba 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -538,6 +538,7 @@ set(client_SRCS
 	sky.cpp
 	wieldmesh.cpp
 	${client_SCRIPT_SRCS}
+	${UNITTEST_CLIENT_SRCS}
 )
 list(SORT client_SRCS)
 
diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
index c7c95772f..e0978aa72 100644
--- a/src/unittest/CMakeLists.txt
+++ b/src/unittest/CMakeLists.txt
@@ -6,7 +6,6 @@ set (UNITTEST_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/test_connection.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_filepath.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_inventory.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/test_keycode.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_map_settings_manager.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_mapnode.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_nodedef.cpp
@@ -24,3 +23,7 @@ set (UNITTEST_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/test_voxelalgorithms.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_voxelmanipulator.cpp
 	PARENT_SCOPE)
+
+set (UNITTEST_CLIENT_SRCS
+	${CMAKE_CURRENT_SOURCE_DIR}/test_keycode.cpp
+	PARENT_SCOPE)

From 33a606c034a6dfea4a011b6d69077455bbb56746 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 30 Sep 2016 14:30:37 +0200
Subject: [PATCH 196/418] Fix android build

Fixes #4493.
---
 src/porting.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/porting.cpp b/src/porting.cpp
index ae9114ac8..f0337b610 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -613,10 +613,11 @@ void setXorgClassHint(const video::SExposedVideoData &video_data,
 
 bool setXorgWindowIcon(IrrlichtDevice *device)
 {
-#if RUN_IN_PLACE
+#ifdef XORG_USED
+#	if RUN_IN_PLACE
 	return setXorgWindowIconFromPath(device,
 			path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
-#else
+#	else
 	// We have semi-support for reading in-place data if we are
 	// compiled with RUN_IN_PLACE. Don't break with this and
 	// also try the path_share location.
@@ -625,6 +626,8 @@ bool setXorgWindowIcon(IrrlichtDevice *device)
 			ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") ||
 		setXorgWindowIconFromPath(device,
 			path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
+#	endif
+	return false;
 #endif
 }
 

From 56ea77ea96b62059c03ba53c15da56c72ea7e140 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Mon, 26 Sep 2016 23:21:33 +0100
Subject: [PATCH 197/418] Mgv7: Avoid mid-air spawn on disabled mountain
 terrain, optimise function

'getSpawnLevelAtPoint()' did not account for disabled mountains, it
was possible to be spawned in mid-air where a mountain surface would
have been.

Avoid check for river area if rivers are disabled.
---
 src/mapgen_v7.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index d14fdb97a..86f559af3 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -154,17 +154,27 @@ int MapgenV7::getSpawnLevelAtPoint(v2s16 p)
 	// Base terrain calculation
 	s16 y = baseTerrainLevelAtPoint(p.X, p.Y);
 
-	// Ridge/river terrain calculation
-	float width = 0.2;
-	float uwatern = NoisePerlin2D(&noise_ridge_uwater->np, p.X, p.Y, seed) * 2;
-	// if inside a river this is an unsuitable spawn point
-	if (fabs(uwatern) <= width)
-		return MAX_MAP_GENERATION_LIMIT;
+	// If enabled, check if inside a river
+	if (spflags & MGV7_RIDGES) {
+		float width = 0.2;
+		float uwatern = NoisePerlin2D(&noise_ridge_uwater->np, p.X, p.Y, seed) * 2;
+		if (fabs(uwatern) <= width)
+			return MAX_MAP_GENERATION_LIMIT;  // Unsuitable spawn point
+	}
+
+	// If mountains are disabled, terrain level is base terrain level
+	// Avoids spawn on non-existant mountain terrain
+	if (!(spflags & MGV7_MOUNTAINS)) {
+		if (y <= water_level || y > water_level + 16)
+			return MAX_MAP_GENERATION_LIMIT;  // Unsuitable spawn point
+		else
+			return y;
+	}
 
 	// Mountain terrain calculation
 	int iters = 128;
 	while (iters--) {
-		if (!getMountainTerrainAtPoint(p.X, y + 1, p.Y)) {  // Air, y is ground level
+		if (!getMountainTerrainAtPoint(p.X, y + 1, p.Y)) {  // If air above
 			if (y <= water_level || y > water_level + 16)
 				return MAX_MAP_GENERATION_LIMIT;  // Unsuitable spawn point
 			else
@@ -173,7 +183,7 @@ int MapgenV7::getSpawnLevelAtPoint(v2s16 p)
 		y++;
 	}
 
-	// Unsuitable spawn point, no ground surface found
+	// Unsuitable spawn point, no mountain surface found
 	return MAX_MAP_GENERATION_LIMIT;
 }
 

From c0e56c6011fa6252a33894c560f8a16445466b8b Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Wed, 28 Sep 2016 03:00:37 +0200
Subject: [PATCH 198/418] Update default controls in README.txt

---
 README.txt | 60 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/README.txt b/README.txt
index 4b2f50b5a..15684300e 100644
--- a/README.txt
+++ b/README.txt
@@ -27,39 +27,47 @@ This game is not finished
 - Don't expect it to work as well as a finished game will.
 - Please report any bugs. When doing that, debug.txt is useful.
 
-Default Controls
+Default controls
 -----------------
-- WASD: move
-- Space: jump/climb
-- Shift: sneak/go down
-- Q: drop itemstack (+ SHIFT for single item)
-- I: inventory
-- Mouse: turn/look
-- Mouse left: dig/punch
-- Mouse right: place/use
-- Mouse wheel: select item
-- T: chat
-- 1-8: select item
+- Move mouse: Look around
+- W, A, S, D: Move
+- Space: Jump/move up
+- Shift: Sneak/move down
+- Q: Drop itemstack
+- Shift + Q: Drop single item
+- Left mouse button: Dig/punch/take item
+- Right mouse button: Place/use
+- Shift + right mouse button: Build (without using)
+- I: Inventory menu
+- Mouse wheel: Select item
+- 0-9: Select item
+- Z: Zoom (needs zoom privilege)
+- T: Chat
+- /: Commad
 
-- Esc: pause menu (pauses only singleplayer game)
-- R: Enable/Disable full range view
+- Esc: Pause menu/abort/exit (pauses only singleplayer game)
+- R: Enable/disable full range view
 - +: Increase view range
 - -: Decrease view range
-- K: Enable/Disable fly (needs fly privilege)
-- J: Enable/Disable fast (needs fast privilege)
-- H: Enable/Disable noclip (needs noclip privilege)
+- K: Enable/disable fly mode (needs fly privilege)
+- J: Enable/disable fast mode (needs fast privilege)
+- H: Enable/disable noclip mode (needs noclip privilege)
 
-- F1:  Hide/Show HUD
-- F2:  Hide/Show Chat
-- F3:  Disable/Enable Fog
-- F4:  Disable/Enable Camera update (Mapblocks are not updated anymore when disabled)
-- F5:  Toogle through debug info screens
-- F6:  Toogle through output data
-- F7:  Toggle through camera modes
-- F10: Show/Hide console
+- F1:  Hide/show HUD
+- F2:  Hide/show chat
+- F3:  Disable/enable fog
+- F4:  Disable/enable camera update (Mapblocks are not updated anymore when disabled, disabled in release builds)
+- F5:  Cycle through debug info screens
+- F6:  Cycle through profiler info screens
+- F7:  Cycle through camera modes
+- F8:  Toggle cinematic mode
+- F9:  Cycle through minimap modes
+- Shift + F9: Change minimap orientation
+- F10: Show/hide console
 - F12: Take screenshot
+- P: Write stack traces into debug.txt
 
-- Settable in the configuration file, see the section below.
+Most controls are settable in the configuration file, see the section below.
 
 Paths
 ------

From 3a95054db5c44a3fea6a27d5633f668539e67870 Mon Sep 17 00:00:00 2001
From: Rui <Rui-Minetest@users.noreply.github.com>
Date: Sat, 1 Oct 2016 23:16:50 +0900
Subject: [PATCH 199/418] Fix typo in core.after (#4560)

---
 builtin/game/misc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index d7164812a..1333a75ba 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -38,7 +38,7 @@ core.register_globalstep(function(dtime)
 end)
 
 function core.after(after, func, ...)
-	assert(tonumber(time) and type(func) == "function",
+	assert(tonumber(after) and type(func) == "function",
 			"Invalid core.after invocation")
 	jobs[#jobs + 1] = {
 		func = func,

From eb0e9d5661e28cdd4f59b96f7ab269fbf67bdc34 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sun, 2 Oct 2016 15:44:53 +0200
Subject: [PATCH 200/418] Allow nothing to be selected from formspec parameters

---
 src/guiTable.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/guiTable.cpp b/src/guiTable.cpp
index 3cc95ce4f..6b33b8266 100644
--- a/src/guiTable.cpp
+++ b/src/guiTable.cpp
@@ -565,10 +565,8 @@ void GUITable::setSelected(s32 index)
 	--index; // Switch from 1-based indexing to 0-based indexing
 
 	s32 rowcount = m_rows.size();
-	if (rowcount == 0) {
+	if (rowcount == 0 || index < 0) {
 		return;
-	} else if (index < 0) {
-		index = 0;
 	} else if (index >= rowcount) {
 		index = rowcount - 1;
 	}

From 077b6cfa21fe323434e704bb7a81870ff689c433 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Thu, 7 Jul 2016 21:10:15 +0100
Subject: [PATCH 201/418] Formspec: Add container[] and container_end[]
 elements

---
 doc/lua_api.txt         |   9 +++
 src/guiFormSpecMenu.cpp | 118 +++++++++++++++++++++++++++-------------
 src/guiFormSpecMenu.h   |  17 ++++--
 3 files changed, 99 insertions(+), 45 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 6f69360c8..e0e984c0f 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1469,6 +1469,15 @@ examples.
 * `fixed_size`: `true`/`false` (optional)
 * deprecated: `invsize[<W>,<H>;]`
 
+#### `container[<X>,<Y>]`
+* Start of a container block, moves all physical elements in the container by (X, Y)
+* Must have matching container_end
+* Containers can be nested, in which case the offsets are added
+  (child containers are relative to parent containers)
+
+#### `container_end[]`
+* End of a container, following elements are no longer relative to this container
+
 #### `list[<inventory location>;<list name>;<X>,<Y>;<W>,<H>;]`
 * Show an inventory list
 
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 084a53c9d..714e71a5a 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -279,6 +279,32 @@ void GUIFormSpecMenu::parseSize(parserData* data,std::string element)
 	errorstream<< "Invalid size element (" << parts.size() << "): '" << element << "'"  << std::endl;
 }
 
+void GUIFormSpecMenu::parseContainer(parserData* data, std::string element)
+{
+	std::vector<std::string> parts = split(element, ',');
+
+	if (parts.size() >= 2) {
+		if (parts[1].find(';') != std::string::npos)
+			parts[1] = parts[1].substr(0, parts[1].find(';'));
+
+		container_stack.push(pos_offset);
+		pos_offset.X += MYMAX(0, stof(parts[0]));
+		pos_offset.Y += MYMAX(0, stof(parts[1]));
+		return;
+	}
+	errorstream<< "Invalid container start element (" << parts.size() << "): '" << element << "'"  << std::endl;
+}
+
+void GUIFormSpecMenu::parseContainerEnd(parserData* data)
+{
+	if (container_stack.empty()) {
+		errorstream<< "Invalid container end element, no matching container start element"  << std::endl;
+	} else {
+		pos_offset = container_stack.top();
+		container_stack.pop();
+	}
+}
+
 void GUIFormSpecMenu::parseList(parserData* data,std::string element)
 {
 	if (m_gamedef == 0) {
@@ -309,7 +335,7 @@ void GUIFormSpecMenu::parseList(parserData* data,std::string element)
 		else
 			loc.deSerialize(location);
 
-		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner;
+		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y;
 
@@ -386,7 +412,7 @@ void GUIFormSpecMenu::parseCheckbox(parserData* data,std::string element)
 
 		MY_CHECKPOS("checkbox",0);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float) spacing.X;
 		pos.Y += stof(v_pos[1]) * (float) spacing.Y;
 
@@ -437,7 +463,7 @@ void GUIFormSpecMenu::parseScrollBar(parserData* data, std::string element)
 
 		MY_CHECKPOS("scrollbar",0);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float) spacing.X;
 		pos.Y += stof(v_pos[1]) * (float) spacing.Y;
 
@@ -495,10 +521,10 @@ void GUIFormSpecMenu::parseImage(parserData* data,std::string element)
 		std::vector<std::string> v_geom = split(parts[1],',');
 		std::string name = unescape_string(parts[2]);
 
-		MY_CHECKPOS("image",0);
-		MY_CHECKGEOM("image",1);
+		MY_CHECKPOS("image", 0);
+		MY_CHECKGEOM("image", 1);
 
-		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner;
+		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float) spacing.X;
 		pos.Y += stof(v_pos[1]) * (float) spacing.Y;
 
@@ -506,23 +532,21 @@ void GUIFormSpecMenu::parseImage(parserData* data,std::string element)
 		geom.X = stof(v_geom[0]) * (float)imgsize.X;
 		geom.Y = stof(v_geom[1]) * (float)imgsize.Y;
 
-		if(!data->explicit_size)
+		if (!data->explicit_size)
 			warningstream<<"invalid use of image without a size[] element"<<std::endl;
 		m_images.push_back(ImageDrawSpec(name, pos, geom));
 		return;
-	}
-
-	if (parts.size() == 2) {
+	} else if (parts.size() == 2) {
 		std::vector<std::string> v_pos = split(parts[0],',');
 		std::string name = unescape_string(parts[1]);
 
-		MY_CHECKPOS("image",0);
+		MY_CHECKPOS("image", 0);
 
-		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner;
+		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float) spacing.X;
 		pos.Y += stof(v_pos[1]) * (float) spacing.Y;
 
-		if(!data->explicit_size)
+		if (!data->explicit_size)
 			warningstream<<"invalid use of image without a size[] element"<<std::endl;
 		m_images.push_back(ImageDrawSpec(name, pos));
 		return;
@@ -544,7 +568,7 @@ void GUIFormSpecMenu::parseItemImage(parserData* data,std::string element)
 		MY_CHECKPOS("itemimage",0);
 		MY_CHECKGEOM("itemimage",1);
 
-		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner;
+		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float) spacing.X;
 		pos.Y += stof(v_pos[1]) * (float) spacing.Y;
 
@@ -576,7 +600,7 @@ void GUIFormSpecMenu::parseButton(parserData* data,std::string element,
 		MY_CHECKPOS("button",0);
 		MY_CHECKGEOM("button",1);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y;
 
@@ -629,9 +653,9 @@ void GUIFormSpecMenu::parseBackground(parserData* data,std::string element)
 		MY_CHECKPOS("background",0);
 		MY_CHECKGEOM("background",1);
 
-		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner;
-		pos.X += stof(v_pos[0]) * (float)spacing.X - ((float)spacing.X-(float)imgsize.X)/2;
-		pos.Y += stof(v_pos[1]) * (float)spacing.Y - ((float)spacing.Y-(float)imgsize.Y)/2;
+		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner + pos_offset * spacing;
+		pos.X += stof(v_pos[0]) * (float)spacing.X - ((float)spacing.X - (float)imgsize.X)/2;
+		pos.Y += stof(v_pos[1]) * (float)spacing.Y - ((float)spacing.Y - (float)imgsize.Y)/2;
 
 		v2s32 geom;
 		geom.X = stof(v_geom[0]) * (float)spacing.X;
@@ -705,7 +729,7 @@ void GUIFormSpecMenu::parseTable(parserData* data,std::string element)
 		MY_CHECKPOS("table",0);
 		MY_CHECKGEOM("table",1);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y;
 
@@ -776,7 +800,7 @@ void GUIFormSpecMenu::parseTextList(parserData* data,std::string element)
 		MY_CHECKPOS("textlist",0);
 		MY_CHECKGEOM("textlist",1);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y;
 
@@ -841,7 +865,7 @@ void GUIFormSpecMenu::parseDropDown(parserData* data,std::string element)
 
 		MY_CHECKPOS("dropdown",0);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y;
 
@@ -905,7 +929,7 @@ void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element)
 		MY_CHECKPOS("pwdfield",0);
 		MY_CHECKGEOM("pwdfield",1);
 
-		v2s32 pos;
+		v2s32 pos = pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y;
 
@@ -975,7 +999,7 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data,
 	if(data->explicit_size)
 		warningstream<<"invalid use of unpositioned \"field\" in inventory"<<std::endl;
 
-	v2s32 pos = padding + AbsoluteRect.UpperLeftCorner;
+	v2s32 pos = padding + AbsoluteRect.UpperLeftCorner + pos_offset * spacing;
 	pos.Y = ((m_fields.size()+2)*60);
 	v2s32 size = DesiredRect.getSize();
 
@@ -1058,9 +1082,9 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,
 	MY_CHECKPOS(type,0);
 	MY_CHECKGEOM(type,1);
 
-	v2s32 pos;
-	pos.X = stof(v_pos[0]) * (float) spacing.X;
-	pos.Y = stof(v_pos[1]) * (float) spacing.Y;
+	v2s32 pos = pos_offset * spacing;
+	pos.X += stof(v_pos[0]) * (float) spacing.X;
+	pos.Y += stof(v_pos[1]) * (float) spacing.Y;
 
 	v2s32 geom;
 
@@ -1185,7 +1209,7 @@ void GUIFormSpecMenu::parseLabel(parserData* data,std::string element)
 
 		MY_CHECKPOS("label",0);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += (stof(v_pos[1]) + 7.0/30.0) * (float)spacing.Y;
 
@@ -1242,7 +1266,7 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element)
 
 		MY_CHECKPOS("vertlabel",1);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y;
 
@@ -1296,7 +1320,7 @@ void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element,
 		MY_CHECKPOS("imagebutton",0);
 		MY_CHECKGEOM("imagebutton",1);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y;
 		v2s32 geom;
@@ -1401,7 +1425,7 @@ void GUIFormSpecMenu::parseTabHeader(parserData* data,std::string element)
 
 		spec.ftype = f_TabHeader;
 
-		v2s32 pos(0,0);
+		v2s32 pos = pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y - m_btn_height * 2;
 		v2s32 geom;
@@ -1466,7 +1490,7 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element)
 		MY_CHECKPOS("itemimagebutton",0);
 		MY_CHECKGEOM("itemimagebutton",1);
 
-		v2s32 pos = padding;
+		v2s32 pos = padding + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float)spacing.X;
 		pos.Y += stof(v_pos[1]) * (float)spacing.Y;
 		v2s32 geom;
@@ -1504,7 +1528,7 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element)
 		rect+=data->basepos-padding;
 		spec.rect=rect;
 		m_fields.push_back(spec);
-		pos = padding + AbsoluteRect.UpperLeftCorner;
+		pos = padding + AbsoluteRect.UpperLeftCorner + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float) spacing.X;
 		pos.Y += stof(v_pos[1]) * (float) spacing.Y;
 		m_itemimages.push_back(ImageDrawSpec("", item_name, e, pos, geom));
@@ -1527,7 +1551,7 @@ void GUIFormSpecMenu::parseBox(parserData* data,std::string element)
 		MY_CHECKPOS("box",0);
 		MY_CHECKGEOM("box",1);
 
-		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner;
+		v2s32 pos = padding + AbsoluteRect.UpperLeftCorner + pos_offset * spacing;
 		pos.X += stof(v_pos[0]) * (float) spacing.X;
 		pos.Y += stof(v_pos[1]) * (float) spacing.Y;
 
@@ -1689,8 +1713,18 @@ void GUIFormSpecMenu::parseElement(parserData* data, std::string element)
 	std::string type = trim(parts[0]);
 	std::string description = trim(parts[1]);
 
+	if (type == "container") {
+		parseContainer(data, description);
+		return;
+	}
+
+	if (type == "container_end") {
+		parseContainerEnd(data);
+		return;
+	}
+
 	if (type == "list") {
-		parseList(data,description);
+		parseList(data, description);
 		return;
 	}
 
@@ -1700,22 +1734,22 @@ void GUIFormSpecMenu::parseElement(parserData* data, std::string element)
 	}
 
 	if (type == "checkbox") {
-		parseCheckbox(data,description);
+		parseCheckbox(data, description);
 		return;
 	}
 
 	if (type == "image") {
-		parseImage(data,description);
+		parseImage(data, description);
 		return;
 	}
 
 	if (type == "item_image") {
-		parseItemImage(data,description);
+		parseItemImage(data, description);
 		return;
 	}
 
-	if ((type == "button") || (type == "button_exit")) {
-		parseButton(data,description,type);
+	if (type == "button" || type == "button_exit") {
+		parseButton(data, description, type);
 		return;
 	}
 
@@ -2036,10 +2070,16 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 	gui::IGUIFont *old_font = skin->getFont();
 	skin->setFont(m_font);
 
+	pos_offset = v2s32();
 	for (; i< elements.size(); i++) {
 		parseElement(&mydata, elements[i]);
 	}
 
+	if (!container_stack.empty()) {
+		errorstream << "Invalid formspec string: container was never closed!"
+			<< std::endl;
+	}
+
 	// If there are fields without explicit size[], add a "Proceed"
 	// button and adjust size to fit all the fields.
 	if (m_fields.size() && !mydata.explicit_size) {
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index dbcbf126a..21054b725 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GUIINVENTORYMENU_HEADER
 
 #include <utility>
+#include <stack>
 
 #include "irrlichttypes_extrabloated.h"
 #include "inventory.h"
@@ -380,6 +381,8 @@ protected:
 	v2s32 spacing;
 	v2s32 imgsize;
 	v2s32 offset;
+	v2s32 pos_offset;
+	std::stack<v2s32> container_stack;
 
 	irr::IrrlichtDevice* m_device;
 	InventoryManager *m_invmgr;
@@ -472,13 +475,15 @@ private:
 	fs_key_pendig current_keys_pending;
 	std::string current_field_enter_pending;
 
-	void parseElement(parserData* data,std::string element);
+	void parseElement(parserData* data, std::string element);
 
-	void parseSize(parserData* data,std::string element);
-	void parseList(parserData* data,std::string element);
-	void parseListRing(parserData* data,std::string element);
-	void parseCheckbox(parserData* data,std::string element);
-	void parseImage(parserData* data,std::string element);
+	void parseSize(parserData* data, std::string element);
+	void parseContainer(parserData* data, std::string element);
+	void parseContainerEnd(parserData* data);
+	void parseList(parserData* data, std::string element);
+	void parseListRing(parserData* data, std::string element);
+	void parseCheckbox(parserData* data, std::string element);
+	void parseImage(parserData* data, std::string element);
 	void parseItemImage(parserData* data,std::string element);
 	void parseButton(parserData* data,std::string element,std::string typ);
 	void parseBackground(parserData* data,std::string element);

From 2516c516bc018e2ff58c7d07c5f2ee8fd5f67167 Mon Sep 17 00:00:00 2001
From: raymoo <uguu@installgentoo.com>
Date: Fri, 2 Sep 2016 21:37:51 -0700
Subject: [PATCH 202/418] Forceloading: Transient forceloads

Adds a flag to forceload_block which lets you turn off persistence for
that forceload.
---
 builtin/game/forceloading.lua | 39 +++++++++++++++++++++++++++--------
 doc/lua_api.txt               | 10 ++++++---
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/builtin/game/forceloading.lua b/builtin/game/forceloading.lua
index 468572e6e..8a05de36c 100644
--- a/builtin/game/forceloading.lua
+++ b/builtin/game/forceloading.lua
@@ -5,6 +5,7 @@ core.forceload_block = nil
 core.forceload_free_block = nil
 
 local blocks_forceloaded
+local blocks_temploaded = {}
 local total_forceloaded = 0
 
 local BLOCKSIZE = core.MAP_BLOCKSIZE
@@ -15,32 +16,52 @@ local function get_blockpos(pos)
 		z = math.floor(pos.z/BLOCKSIZE)}
 end
 
-function core.forceload_block(pos)
+-- When we create/free a forceload, it's either transient or persistent. We want
+-- to add to/remove from the table that corresponds to the type of forceload, but
+-- we also need the other table because whether we forceload a block depends on
+-- both tables.
+-- This function returns the "primary" table we are adding to/removing from, and
+-- the other table.
+local function get_relevant_tables(transient)
+	if transient then
+		return blocks_temploaded, blocks_forceloaded
+	else
+		return blocks_forceloaded, blocks_temploaded
+	end
+end
+
+function core.forceload_block(pos, transient)
 	local blockpos = get_blockpos(pos)
 	local hash = core.hash_node_position(blockpos)
-	if blocks_forceloaded[hash] ~= nil then
-		blocks_forceloaded[hash] = blocks_forceloaded[hash] + 1
+	local relevant_table, other_table = get_relevant_tables(transient)
+	if relevant_table[hash] ~= nil then
+		relevant_table[hash] = relevant_table[hash] + 1
 		return true
+	elseif other_table[hash] ~= nil then
+		relevant_table[hash] = 1
 	else
 		if total_forceloaded >= (tonumber(core.setting_get("max_forceloaded_blocks")) or 16) then
 			return false
 		end
 		total_forceloaded = total_forceloaded+1
-		blocks_forceloaded[hash] = 1
+		relevant_table[hash] = 1
 		forceload_block(blockpos)
 		return true
 	end
 end
 
-function core.forceload_free_block(pos)
+function core.forceload_free_block(pos, transient)
 	local blockpos = get_blockpos(pos)
 	local hash = core.hash_node_position(blockpos)
-	if blocks_forceloaded[hash] == nil then return end
-	if blocks_forceloaded[hash] > 1 then
-		blocks_forceloaded[hash] = blocks_forceloaded[hash] - 1
+	local relevant_table, other_table = get_relevant_tables(transient)
+	if relevant_table[hash] == nil then return end
+	if relevant_table[hash] > 1 then
+		relevant_table[hash] = relevant_table[hash] - 1
+	elseif other_table[hash] ~= nil then
+		relevant_table[hash] = nil
 	else
 		total_forceloaded = total_forceloaded-1
-		blocks_forceloaded[hash] = nil
+		relevant_table[hash] = nil
 		forceload_free_block(blockpos)
 	end
 end
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index e0e984c0f..c82027148 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2622,13 +2622,17 @@ These functions return the leftover itemstack.
        the creative mode setting, and checks for "sneak" to set the `invert_wall`
        parameter.
 
-* `minetest.forceload_block(pos)`
+* `minetest.forceload_block(pos[, transient])`
     * forceloads the position `pos`.
     * returns `true` if area could be forceloaded
-    * Please note that forceloaded areas are saved when the server restarts.
+    * If `transient` is `false` or absent, the forceload will be persistent
+      (saved between server runs). If `true`, the forceload will be transient
+      (not saved between server runs).
 
-* `minetest.forceload_free_block(pos)`
+* `minetest.forceload_free_block(pos[, transient])`
     * stops forceloading the position `pos`
+    * If `transient` is `false` or absent, frees a persistent forceload.
+      If `true`, frees a transient forceload.
 
 * `minetest.request_insecure_environment()`: returns an environment containing
   insecure functions if the calling mod has been listed as trusted in the

From 89dbc0a25d4e38d706f0fd3d604d4ac5ce57d240 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 2 Oct 2016 22:04:47 +0100
Subject: [PATCH 203/418] Builtin/falling: Add fallback vector in case of nil
 'wallmounted to dir'

The fallback vector is in case 'wallmounted to dir' is nil due
to voxelmanip placing a wallmounted node without resetting a
pre-existing param2 value that is out-of-range for wallmounted.
The fallback vector corresponds to param2 = 0.
---
 builtin/game/falling.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index fa7ff24bc..4b16a0586 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -130,7 +130,11 @@ function check_attached_node(p, n)
 	local def = core.registered_nodes[n.name]
 	local d = {x = 0, y = 0, z = 0}
 	if def.paramtype2 == "wallmounted" then
-		d = core.wallmounted_to_dir(n.param2)
+		-- The fallback vector here is in case 'wallmounted to dir' is nil due
+		-- to voxelmanip placing a wallmounted node without resetting a
+		-- pre-existing param2 value that is out-of-range for wallmounted.
+		-- The fallback vector corresponds to param2 = 0.
+		d = core.wallmounted_to_dir(n.param2) or {x = 0, y = 1, z = 0}
 	else
 		d.y = -1
 	end

From fcfa418c4cb5c3490413dd345e5e4b998cb7a4c3 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 3 Oct 2016 15:55:15 +0200
Subject: [PATCH 204/418] Fix build/warning on non X11 platforms

---
 src/porting.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/porting.cpp b/src/porting.cpp
index f0337b610..023f0cca7 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -627,6 +627,7 @@ bool setXorgWindowIcon(IrrlichtDevice *device)
 		setXorgWindowIconFromPath(device,
 			path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
 #	endif
+#else
 	return false;
 #endif
 }

From 61e112b43b5b9aec3791110b27db0f4f6ab8a85f Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 25 Sep 2016 22:03:35 +0100
Subject: [PATCH 205/418] Textures: New 'smoke puff' texture from TNT mod

---
 README.txt                        |   3 +++
 textures/base/pack/smoke_puff.png | Bin 1233 -> 202 bytes
 2 files changed, 3 insertions(+)

diff --git a/README.txt b/README.txt
index 15684300e..5d4d15263 100644
--- a/README.txt
+++ b/README.txt
@@ -411,6 +411,9 @@ Authors of media files
 Everything not listed in here:
 Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
 
+ShadowNinja:
+  textures/base/pack/smoke_puff.png
+
 Paramat:
   textures/base/pack/menu_header.png
 
diff --git a/textures/base/pack/smoke_puff.png b/textures/base/pack/smoke_puff.png
index 8824a731c28ea42ea4adf4692effaa3a3022b8aa..488b50fe958d33fa4cd50fa383a4685db045def5 100644
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^Fw4`$F~s6@a>4>ti^@+=>QiQE7$hEQ`G3RY@DXvHh=$u6+S=Ge
zd|6pp|9|XU+`ubsmaui^1PiVPOaAGbFCN{<CZU+VxZ8Nb<D4}co!0<GBu^BY?fOyB
r!CK<n@s;o19)}awE{tmy_OdbXXmRHIH8BVRZDsIu^>bP0l+XkK@H9k*

literal 1233
zcmV;?1TOoDP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg000D-Nkl<ZcwTkW
z?{8Iw0f6C$BS+}j83nI5$Zd=4=9ajXvRS~n+8awLNLDF7rbxk-gvlDV;uu4VBC-ez
zu)zi!Fe=cLf-<loTb*_YV<@7N2n$&WREC6*g_(uKWMf-ma+dh%e%bREykB000&pF9
zRj2F6q<$541+xZzaO(CW|0Z0bbnAxRZXf^$0m!0K#~t)c;B*l{*Qjvl`r&*2JMauR
zxaMu5zl9(I0xf832RQLs*R-I4rlFi4Pi7yzqaZv_`kmt+U8#qZ9`8{Nw$9TBaBE=w
zT;9KZ*Vp3G-gNX8UYScYNFj&DG6|p|AYJTnmfmIe_T=Nu=f;vccd-<R@09}7b<79a
zGn>|eOI1g2JA5$nBa`EGGR6SWs|4Fm9tbOFn^lzuEKX(DHEx=o+7tXdXgd4Zn#cAN
z#TQ2{Z6LbKJt&Q)$4}GsqNIK5+99V__k^z}dNH={5l|d_A1JE_EE*l$44;K7B|udv
z(K6%Qoe3db6fNYv62O*VFaY8z-Z&1>ITi9tIQ9_nbR^+M2s5`{uO9)~7~1Y3(+P+U
z*}x~qVa^o5x64)oy(<Zx%w)K@glPWJZs@L}`lWYwfS`QOzX)<rHoxI11v<}jb}A5;
zTs{tFLS}*5;6bU*aAiC{-0?vTZ$Ao9afi(wqO7=jB$9t-@(J+A^qCWzcES4-h^JD`
z;!1+wMDx3odDC*88_Nm4IQtlX9?YMzS2Lu(HLnR$b1VweZ2Ypt7?FM$@jiA=zO+M0
zJQ;$k(aPYyrkI|(V0`p2cm#+hK~)jq3NYS{5(fZUYM^!ao5OJm*qZ>+5Y}w&A4WC{
z#NUXDuT94XNp{tZ6<xXhpRBo}!1XNz2UayGgs$gOzsODikST|AqX7sHLpXHx3LtI`
zcXMq<c&{zAeIZ&Fj5G1wy40wiYFnhot@yRC1MrVp$hE@xHPHnC41y0A#>Jc-Xgcs#
zBVi4euB<po`fmS6JU*&`=;@m^E0*7ya_G*ciMa<ajo{>&H)f!(0@A<V-tls6Di44J
zh=2Uy;YrJIJ^v_^envbC;%P|a`;aDm0%#5V2f`#+Mdjd|KLj*l1embx8Pd&wu(IVa
z@bPm|ZTQ4rAAqm~;LSu*@q+KdxmUv1fb7A{=ko&zMj!hW3p_w>$iTL^SUa5k5+9{a
zA(IE-a*_M@R-q0UbELI01v`^;Gr?2je+Oj?A-WOGglK74zwS2R58tEeSrz*6=>_mY
zx+ZF&BI(!$xseL=<lkz1xhZa=V-IKN&Y9&UK%IH$8@p;*)VTNg^b^3o4X}R^F#Aq=
z@9!T<w4ADIz`Ri@1;Sy>E(S0Ya)UGztOK&UcP>;QL=JpjP!|H-N%p4%Ayjk_4fk6<
zNid9!-=zP^++|pfIh@29y`oaUee^uW{^rHC5Wg5D^u6Odhl-9YhcJM(Ac7E;a1|%O
zSBcAm8E~Z)s2fD^DxUXvv|u@4KkT$sU=zAz8gethFT;`H#9J5sp4dhE4T5Gp(u>RC
vFA52z0I@<u!`H6@XzwJzDS-$rA{_NUFo;d?d}6v!00000NkvXXu0mjf8AwLj


From 1079aeaa13a94c67c1e0a0bd1c461e14841a1eec Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Mon, 3 Oct 2016 00:56:17 +0100
Subject: [PATCH 206/418] Mapblock_mesh_generate_special: Improve performance

Remove uses of std::map.
Make sure we use ContentFeatures reference not value.
Original commit by gregorycu.
---
 src/content_mapblock.cpp | 51 ++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 173649aee..8ce0f1e0a 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -172,6 +172,15 @@ static inline void getNeighborConnectingFace(v3s16 p, INodeDefManager *nodedef,
 		*neighbors |= v;
 }
 
+// For use in mapblock_mesh_generate_special
+// X,Y,Z of position must be -1,0,1
+// This expression is a simplification of
+// 3 * 3 * (pos.X + 1) + 3 * (pos.Y + 1) + (pos.Z + 1)
+static inline int NeighborToIndex(const v3s16 &pos)
+{
+	return 9 * pos.X + 3 * pos.Y + pos.Z + 13;
+}
+
 /*
 	TODO: Fix alpha blending for special nodes
 	Currently only the last element rendered is blended correct
@@ -401,9 +410,14 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 
 			// Neighbor liquid levels (key = relative position)
 			// Includes current node
-			std::map<v3s16, f32> neighbor_levels;
-			std::map<v3s16, content_t> neighbor_contents;
-			std::map<v3s16, u8> neighbor_flags;
+
+			struct NeighborData {
+				f32 level;
+				content_t content;
+				u8 flags;
+			};
+			NeighborData neighbor_data_matrix[27];
+
 			const u8 neighborflag_top_is_same_liquid = 0x01;
 			v3s16 neighbor_dirs[9] = {
 				v3s16(0,0,0),
@@ -449,9 +463,12 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 						flags |= neighborflag_top_is_same_liquid;
 				}
 
-				neighbor_levels[neighbor_dirs[i]] = level;
-				neighbor_contents[neighbor_dirs[i]] = content;
-				neighbor_flags[neighbor_dirs[i]] = flags;
+				NeighborData &neighbor_data =
+					neighbor_data_matrix[NeighborToIndex(neighbor_dirs[i])];
+
+				neighbor_data.level = level;
+				neighbor_data.content = content;
+				neighbor_data.flags = flags;
 			}
 
 			// Corner heights (average between four liquids)
@@ -472,10 +489,12 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 				for(u32 j=0; j<4; j++)
 				{
 					v3s16 neighbordir = cornerdir - halfdirs[j];
-					content_t content = neighbor_contents[neighbordir];
+
+					NeighborData &neighbor_data =
+						neighbor_data_matrix[NeighborToIndex(neighbordir)];
+					content_t content = neighbor_data.content;
 					// If top is liquid, draw starting from top of node
-					if(neighbor_flags[neighbordir] &
-							neighborflag_top_is_same_liquid)
+					if (neighbor_data.flags & neighborflag_top_is_same_liquid)
 					{
 						cornerlevel = 0.5*BS;
 						valid_count = 1;
@@ -491,7 +510,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 					// Flowing liquid has level information
 					else if(content == c_flowing)
 					{
-						cornerlevel += neighbor_levels[neighbordir];
+						cornerlevel += neighbor_data.level;
 						valid_count++;
 					}
 					else if(content == CONTENT_AIR)
@@ -526,15 +545,17 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 			{
 				v3s16 dir = side_dirs[i];
 
+				NeighborData& neighbor_data =
+					neighbor_data_matrix[NeighborToIndex(dir)];
 				/*
 					If our topside is liquid and neighbor's topside
 					is liquid, don't draw side face
 				*/
-				if(top_is_same_liquid &&
-						neighbor_flags[dir] & neighborflag_top_is_same_liquid)
+				if (top_is_same_liquid &&
+						neighbor_data.flags & neighborflag_top_is_same_liquid)
 					continue;
 
-				content_t neighbor_content = neighbor_contents[dir];
+				content_t neighbor_content = neighbor_data.content;
 				const ContentFeatures &n_feat = nodedef->get(neighbor_content);
 
 				// Don't draw face if neighbor is blocking the view
@@ -1506,8 +1527,8 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 						continue;
 					MapNode n_xy = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x + xz, y + y0, z));
 					MapNode n_zy = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x, y + y0, z + xz));
-					ContentFeatures def_xy = nodedef->get(n_xy);
-					ContentFeatures def_zy = nodedef->get(n_zy);
+					const ContentFeatures &def_xy = nodedef->get(n_xy);
+					const ContentFeatures &def_zy = nodedef->get(n_zy);
 
 					// Check if current node would connect with the rail
 					is_rail_x[index] = ((def_xy.drawtype == NDT_RAILLIKE

From d4c76258e37337ea585cf24d8e05b50a30fa307d Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Tue, 4 Oct 2016 18:17:12 +0200
Subject: [PATCH 207/418] Chat: new settings to prevent spam

Added the following chat coreside features
* Chat messages length limit
* Message rate limiting
* Message rate kicking

Note:
* handleChat now takes RemotePlayer pointer instead of u16 to remove useless
  lookups
---
 builtin/settingtypes.txt            |  9 +++++
 minetest.conf.example               | 14 +++++++-
 src/defaultsettings.cpp             |  3 ++
 src/network/serverpackethandler.cpp | 10 +++---
 src/player.cpp                      | 56 ++++++++++++++++++++++++++++-
 src/player.h                        | 16 ++++++++-
 src/server.cpp                      | 25 +++++++++++--
 src/server.h                        |  3 +-
 8 files changed, 125 insertions(+), 11 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 15fab0f30..95cc826a0 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -774,6 +774,15 @@ time_speed (Time speed) int 72
 #    Interval of saving important changes in the world, stated in seconds.
 server_map_save_interval (Map save interval) float 5.3
 
+#    Set the maximum character length of a chat message sent by clients.
+# chat_message_max_size int 500
+
+#    Limit a single player to send X messages per 10 seconds.
+# chat_message_limit_per_10sec float 10.0
+
+#    Kick player if send more than X messages per 10 seconds.
+# chat_message_limit_trigger_kick int 50
+
 [**Physics]
 
 movement_acceleration_default (Default acceleration) float 3
diff --git a/minetest.conf.example b/minetest.conf.example
index 9c8015625..b1b202786 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -933,6 +933,18 @@
 #    type: float
 # server_map_save_interval = 5.3
 
+#    Set the maximum character length of a chat message sent by clients. (0 to disable)
+#    type: integer
+# chat_message_max_size = 500
+
+#    Limit a single player to send X messages per 10 seconds. (0 to disable)
+#    type: float
+# chat_message_limit_per_10sec = 8.0
+
+#    Kick player if send more than X messages per 10 seconds. (0 to disable)
+#    type: integer
+# chat_message_limit_trigger_kick = 50
+
 ### Physics
 
 #    type: float
@@ -1523,7 +1535,7 @@
 # profiler.default_report_format = txt
 
 #    The file path relative to your worldpath in which profiles will be saved to.
-#    
+#
 #    type: string
 # profiler.report_path = ""
 
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 4520bac2f..00c233a42 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -285,6 +285,9 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("server_unload_unused_data_timeout", "29");
 	settings->setDefault("max_objects_per_block", "49");
 	settings->setDefault("server_map_save_interval", "5.3");
+	settings->setDefault("chat_message_max_size", "500");
+	settings->setDefault("chat_message_limit_per_10sec", "8.0");
+	settings->setDefault("chat_message_limit_trigger_kick", "50");
 	settings->setDefault("sqlite_synchronous", "2");
 	settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
 	settings->setDefault("dedicated_server_step", "0.1");
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 1bcb78a8a..a8bfd9068 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1065,7 +1065,7 @@ void Server::handleCommand_ChatMessage(NetworkPacket* pkt)
 	std::wstring wname = narrow_to_wide(name);
 
 	std::wstring answer_to_sender = handleChat(name, wname, message,
-		true, pkt->getPeerId());
+		true, dynamic_cast<RemotePlayer *>(player));
 	if (!answer_to_sender.empty()) {
 		// Send the answer to sender
 		SendChatMessage(pkt->getPeerId(), answer_to_sender);
@@ -1656,16 +1656,16 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 		}
 
 	} // action == 4
-	
+
 	/*
 		5: rightclick air
 	*/
 	else if (action == 5) {
 		ItemStack item = playersao->getWieldedItem();
-		
-		actionstream << player->getName() << " activates " 
+
+		actionstream << player->getName() << " activates "
 				<< item.name << std::endl;
-		
+
 		if (m_script->item_OnSecondaryUse(
 				item, playersao)) {
 			if( playersao->setWieldedItem(item)) {
diff --git a/src/player.cpp b/src/player.cpp
index 5949712a5..fd72d63b6 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -227,10 +227,25 @@ void Player::clearHud()
 	}
 }
 
+// static config cache for remoteplayer
+bool RemotePlayer::m_setting_cache_loaded = false;
+float RemotePlayer::m_setting_chat_message_limit_per_10sec = 0.0f;
+u16 RemotePlayer::m_setting_chat_message_limit_trigger_kick = 0;
+
 RemotePlayer::RemotePlayer(IGameDef *gamedef, const char *name):
 	Player(gamedef, name),
-	m_sao(NULL)
+	m_sao(NULL),
+	m_last_chat_message_sent(time(NULL)),
+	m_chat_message_allowance(5.0f),
+	m_message_rate_overhead(0)
 {
+	if (!RemotePlayer::m_setting_cache_loaded) {
+		RemotePlayer::m_setting_chat_message_limit_per_10sec =
+				g_settings->getFloat("chat_message_limit_per_10sec");
+		RemotePlayer::m_setting_chat_message_limit_trigger_kick =
+				g_settings->getU16("chat_message_limit_trigger_kick");
+		RemotePlayer::m_setting_cache_loaded = true;
+	}
 	movement_acceleration_default   = g_settings->getFloat("movement_acceleration_default")   * BS;
 	movement_acceleration_air       = g_settings->getFloat("movement_acceleration_air")       * BS;
 	movement_acceleration_fast      = g_settings->getFloat("movement_acceleration_fast")      * BS;
@@ -304,3 +319,42 @@ void RemotePlayer::setPosition(const v3f &position)
 		m_sao->setBasePosition(position);
 }
 
+const RemotePlayerChatResult RemotePlayer::canSendChatMessage()
+{
+	// Rate limit messages
+	u32 now = time(NULL);
+	float time_passed = now - m_last_chat_message_sent;
+	m_last_chat_message_sent = now;
+
+	// If this feature is disabled
+	if (m_setting_chat_message_limit_per_10sec <= 0.0) {
+		return RPLAYER_CHATRESULT_OK;
+	}
+
+	m_chat_message_allowance += time_passed * (m_setting_chat_message_limit_per_10sec / 8.0f);
+	if (m_chat_message_allowance > m_setting_chat_message_limit_per_10sec) {
+		m_chat_message_allowance = m_setting_chat_message_limit_per_10sec;
+	}
+
+	if (m_chat_message_allowance < 1.0f) {
+		infostream << "Player " << m_name
+				<< " chat limited due to excessive message amount." << std::endl;
+
+		// Kick player if flooding is too intensive
+		m_message_rate_overhead++;
+		if (m_message_rate_overhead > RemotePlayer::m_setting_chat_message_limit_trigger_kick) {
+			return RPLAYER_CHATRESULT_KICK;
+		}
+
+		return RPLAYER_CHATRESULT_FLOODING;
+	}
+
+	// Reinit message overhead
+	if (m_message_rate_overhead > 0) {
+		m_message_rate_overhead = 0;
+	}
+
+	m_chat_message_allowance -= 1.0f;
+	return RPLAYER_CHATRESULT_OK;
+}
+
diff --git a/src/player.h b/src/player.h
index eab00bb04..f38effa9d 100644
--- a/src/player.h
+++ b/src/player.h
@@ -439,7 +439,11 @@ private:
 	Mutex m_mutex;
 };
 
-
+enum RemotePlayerChatResult {
+	RPLAYER_CHATRESULT_OK,
+	RPLAYER_CHATRESULT_FLOODING,
+	RPLAYER_CHATRESULT_KICK,
+};
 /*
 	Player on the server
 */
@@ -457,8 +461,18 @@ public:
 	{ m_sao = sao; }
 	void setPosition(const v3f &position);
 
+	const RemotePlayerChatResult canSendChatMessage();
+
 private:
 	PlayerSAO *m_sao;
+
+	static bool m_setting_cache_loaded;
+	static float m_setting_chat_message_limit_per_10sec;
+	static u16 m_setting_chat_message_limit_trigger_kick;
+
+	u32 m_last_chat_message_sent;
+	float m_chat_message_allowance;
+	u16 m_message_rate_overhead;
 };
 
 #endif
diff --git a/src/server.cpp b/src/server.cpp
index fb241f179..c615aee13 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -358,6 +358,7 @@ Server::Server(
 	add_legacy_abms(m_env, m_nodedef);
 
 	m_liquid_transform_every = g_settings->getFloat("liquid_update");
+	m_max_chatmessage_length = g_settings->getU16("chat_message_max_size");
 }
 
 Server::~Server()
@@ -2734,8 +2735,7 @@ void Server::handleChatInterfaceEvent(ChatEvent *evt)
 }
 
 std::wstring Server::handleChat(const std::string &name, const std::wstring &wname,
-	const std::wstring &wmessage, bool check_shout_priv,
-	u16 peer_id_to_avoid_sending)
+	const std::wstring &wmessage, bool check_shout_priv, RemotePlayer *player)
 {
 	// If something goes wrong, this player is to blame
 	RollbackScopeActor rollback_scope(m_rollback,
@@ -2753,6 +2753,26 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 	if (ate)
 		return L"";
 
+	switch (player->canSendChatMessage()) {
+		case RPLAYER_CHATRESULT_FLOODING: {
+			std::wstringstream ws;
+			ws << L"You cannot send more messages. You are limited to "
+			   << g_settings->getFloat("chat_message_limit_per_10sec")
+			   << " messages per 10 seconds.";
+			return ws.str();
+		}
+		case RPLAYER_CHATRESULT_KICK:
+			DenyAccess_Legacy(player->peer_id, L"You have been kicked due to message flooding.");
+			return L"";
+		case RPLAYER_CHATRESULT_OK: break;
+		default: FATAL_ERROR("Unhandled chat filtering result found.");
+	}
+
+	if (m_max_chatmessage_length > 0 && wmessage.length() > m_max_chatmessage_length) {
+		return L"Your message exceed the maximum chat message limit set on the server. "
+			"It was refused. Send a shorter message";
+	}
+
 	// Commands are implemented in Lua, so only catch invalid
 	// commands that were not "eaten" and send an error back
 	if (wmessage[0] == L'/') {
@@ -2787,6 +2807,7 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 
 		std::vector<u16> clients = m_clients.getClientIDs();
 
+		u16 peer_id_to_avoid_sending = (player ? player->peer_id : PEER_ID_INEXISTENT);
 		for (u16 i = 0; i < clients.size(); i++) {
 			u16 cid = clients[i];
 			if (cid != peer_id_to_avoid_sending)
diff --git a/src/server.h b/src/server.h
index 7ee15a463..3ad894b38 100644
--- a/src/server.h
+++ b/src/server.h
@@ -487,7 +487,7 @@ private:
 	std::wstring handleChat(const std::string &name, const std::wstring &wname,
 		const std::wstring &wmessage,
 		bool check_shout_priv = false,
-		u16 peer_id_to_avoid_sending = PEER_ID_INEXISTENT);
+		RemotePlayer *player = NULL);
 	void handleAdminChat(const ChatEventChat *evt);
 
 	v3f findSpawnPos();
@@ -522,6 +522,7 @@ private:
 	// If true, do not allow multiple players and hide some multiplayer
 	// functionality
 	bool m_simple_singleplayer_mode;
+	u16 m_max_chatmessage_length;
 
 	// Thread can set; step() will throw as ServerError
 	MutexedVariable<std::string> m_async_fatal_error;

From 5f084cd98d7b3326b51320455364337539710efd Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Wed, 5 Oct 2016 00:13:10 +0200
Subject: [PATCH 208/418] Make some maps unordered to improve performance *
 This permit to improve performance on C++11 builds * use some existing
 typedefs in tools maps * minor code style changes

---
 src/script/common/c_content.cpp | 18 ++++++++----------
 src/settings.h                  |  4 ++--
 src/sound_openal.cpp            | 26 +++++++++++---------------
 src/tool.cpp                    | 23 +++++++++++------------
 src/tool.h                      | 15 ++++++---------
 5 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 19873abc5..6fb9080bc 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -829,20 +829,18 @@ void push_tool_capabilities(lua_State *L,
 		// Create groupcaps table
 		lua_newtable(L);
 		// For each groupcap
-		for(std::map<std::string, ToolGroupCap>::const_iterator
-				i = toolcap.groupcaps.begin(); i != toolcap.groupcaps.end(); i++){
+		for (ToolGCMap::const_iterator i = toolcap.groupcaps.begin();
+			i != toolcap.groupcaps.end(); i++) {
 			// Create groupcap table
 			lua_newtable(L);
 			const std::string &name = i->first;
 			const ToolGroupCap &groupcap = i->second;
 			// Create subtable "times"
 			lua_newtable(L);
-			for(std::map<int, float>::const_iterator
-					i = groupcap.times.begin(); i != groupcap.times.end(); i++){
-				int rating = i->first;
-				float time = i->second;
-				lua_pushinteger(L, rating);
-				lua_pushnumber(L, time);
+			for (UNORDERED_MAP<int, float>::const_iterator
+					i = groupcap.times.begin(); i != groupcap.times.end(); i++) {
+				lua_pushinteger(L, i->first);
+				lua_pushnumber(L, i->second);
 				lua_settable(L, -3);
 			}
 			// Set subtable "times"
@@ -858,8 +856,8 @@ void push_tool_capabilities(lua_State *L,
 		//Create damage_groups table
 		lua_newtable(L);
 		// For each damage group
-		for(std::map<std::string, s16>::const_iterator
-				i = toolcap.damageGroups.begin(); i != toolcap.damageGroups.end(); i++){
+		for (DamageGroup::const_iterator i = toolcap.damageGroups.begin();
+			i != toolcap.damageGroups.end(); i++) {
 			// Create damage group table
 			lua_pushinteger(L, i->second);
 			lua_setfield(L, -2, i->first.c_str());
diff --git a/src/settings.h b/src/settings.h
index 0af861a58..c6c044779 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/string.h"
 #include "threading/mutex.h"
 #include <string>
-#include <map>
+#include "util/cpp11_container.h"
 #include <list>
 #include <set>
 
@@ -45,7 +45,7 @@ typedef std::vector<
 	>
 > SettingsCallbackList;
 
-typedef std::map<std::string, SettingsCallbackList> SettingsCallbackMap;
+typedef UNORDERED_MAP<std::string, SettingsCallbackList> SettingsCallbackMap;
 
 enum ValueType {
 	VALUETYPE_STRING,
diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index 1832a0c77..317667f52 100644
--- a/src/sound_openal.cpp
+++ b/src/sound_openal.cpp
@@ -41,9 +41,9 @@ with this program; ifnot, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "util/numeric.h" // myrand()
 #include "porting.h"
-#include <map>
 #include <vector>
 #include <fstream>
+#include "util/cpp11_container.h"
 
 #define BUFFER_SIZE 30000
 
@@ -271,8 +271,8 @@ private:
 	ALCdevice *m_device;
 	ALCcontext *m_context;
 	int m_next_id;
-	std::map<std::string, std::vector<SoundBuffer*> > m_buffers;
-	std::map<int, PlayingSound*> m_sounds_playing;
+	UNORDERED_MAP<std::string, std::vector<SoundBuffer*> > m_buffers;
+	UNORDERED_MAP<int, PlayingSound*> m_sounds_playing;
 	v3f m_listener_pos;
 public:
 	bool m_is_initialized;
@@ -337,7 +337,7 @@ public:
 		alcCloseDevice(m_device);
 		m_device = NULL;
 
-		for (std::map<std::string, std::vector<SoundBuffer*> >::iterator i = m_buffers.begin();
+		for (UNORDERED_MAP<std::string, std::vector<SoundBuffer*> >::iterator i = m_buffers.begin();
 				i != m_buffers.end(); ++i) {
 			for (std::vector<SoundBuffer*>::iterator iter = (*i).second.begin();
 					iter != (*i).second.end(); ++iter) {
@@ -351,7 +351,7 @@ public:
 
 	void addBuffer(const std::string &name, SoundBuffer *buf)
 	{
-		std::map<std::string, std::vector<SoundBuffer*> >::iterator i =
+		UNORDERED_MAP<std::string, std::vector<SoundBuffer*> >::iterator i =
 				m_buffers.find(name);
 		if(i != m_buffers.end()){
 			i->second.push_back(buf);
@@ -365,7 +365,7 @@ public:
 
 	SoundBuffer* getBuffer(const std::string &name)
 	{
-		std::map<std::string, std::vector<SoundBuffer*> >::iterator i =
+		UNORDERED_MAP<std::string, std::vector<SoundBuffer*> >::iterator i =
 				m_buffers.find(name);
 		if(i == m_buffers.end())
 			return NULL;
@@ -443,8 +443,7 @@ public:
 
 	void deleteSound(int id)
 	{
-		std::map<int, PlayingSound*>::iterator i =
-				m_sounds_playing.find(id);
+		UNORDERED_MAP<int, PlayingSound*>::iterator i = m_sounds_playing.find(id);
 		if(i == m_sounds_playing.end())
 			return;
 		PlayingSound *sound = i->second;
@@ -484,10 +483,8 @@ public:
 				<<m_sounds_playing.size()<<" playing sounds, "
 				<<m_buffers.size()<<" sound names loaded"<<std::endl;
 		std::set<int> del_list;
-		for(std::map<int, PlayingSound*>::iterator
-				i = m_sounds_playing.begin();
-				i != m_sounds_playing.end(); ++i)
-		{
+		for(UNORDERED_MAP<int, PlayingSound*>::iterator i = m_sounds_playing.begin();
+				i != m_sounds_playing.end(); ++i) {
 			int id = i->first;
 			PlayingSound *sound = i->second;
 			// If not playing, remove it
@@ -583,9 +580,8 @@ public:
 	}
 	void updateSoundPosition(int id, v3f pos)
 	{
-		std::map<int, PlayingSound*>::iterator i =
-				m_sounds_playing.find(id);
-		if(i == m_sounds_playing.end())
+		UNORDERED_MAP<int, PlayingSound*>::iterator i = m_sounds_playing.find(id);
+		if (i == m_sounds_playing.end())
 			return;
 		PlayingSound *sound = i->second;
 
diff --git a/src/tool.cpp b/src/tool.cpp
index 54b9f15f4..20b71fb31 100644
--- a/src/tool.cpp
+++ b/src/tool.cpp
@@ -34,24 +34,23 @@ void ToolCapabilities::serialize(std::ostream &os, u16 protocol_version) const
 	writeF1000(os, full_punch_interval);
 	writeS16(os, max_drop_level);
 	writeU32(os, groupcaps.size());
-	for(std::map<std::string, ToolGroupCap>::const_iterator
-			i = groupcaps.begin(); i != groupcaps.end(); ++i){
+	for (ToolGCMap::const_iterator i = groupcaps.begin(); i != groupcaps.end(); ++i) {
 		const std::string *name = &i->first;
 		const ToolGroupCap *cap = &i->second;
 		os<<serializeString(*name);
 		writeS16(os, cap->uses);
 		writeS16(os, cap->maxlevel);
 		writeU32(os, cap->times.size());
-		for(std::map<int, float>::const_iterator
-				i = cap->times.begin(); i != cap->times.end(); ++i){
+		for (UNORDERED_MAP<int, float>::const_iterator
+				i = cap->times.begin(); i != cap->times.end(); ++i) {
 			writeS16(os, i->first);
 			writeF1000(os, i->second);
 		}
 	}
 	if(protocol_version > 17){
 		writeU32(os, damageGroups.size());
-		for(std::map<std::string, s16>::const_iterator
-				i = damageGroups.begin(); i != damageGroups.end(); ++i){
+		for (DamageGroup::const_iterator i = damageGroups.begin();
+			 	i != damageGroups.end(); ++i) {
 			os<<serializeString(i->first);
 			writeS16(os, i->second);
 		}
@@ -106,7 +105,7 @@ DigParams getDigParams(const ItemGroupList &groups,
 	default:
 		break;
 	}
-	
+
 	// Values to be returned (with a bit of conversion)
 	bool result_diggable = false;
 	float result_time = 0.0;
@@ -115,8 +114,8 @@ DigParams getDigParams(const ItemGroupList &groups,
 
 	int level = itemgroup_get(groups, "level");
 	//infostream<<"level="<<level<<std::endl;
-	for(std::map<std::string, ToolGroupCap>::const_iterator
-			i = tp->groupcaps.begin(); i != tp->groupcaps.end(); ++i){
+	for (ToolGCMap::const_iterator i = tp->groupcaps.begin();
+		 	i != tp->groupcaps.end(); ++i) {
 		const std::string &name = i->first;
 		//infostream<<"group="<<name<<std::endl;
 		const ToolGroupCap &cap = i->second;
@@ -163,8 +162,8 @@ HitParams getHitParams(const ItemGroupList &armor_groups,
 	s16 damage = 0;
 	float full_punch_interval = tp->full_punch_interval;
 
-	for(std::map<std::string, s16>::const_iterator
-			i = tp->damageGroups.begin(); i != tp->damageGroups.end(); ++i){
+	for (DamageGroup::const_iterator i = tp->damageGroups.begin();
+			i != tp->damageGroups.end(); ++i) {
 		s16 armor = itemgroup_get(armor_groups, i->first);
 		damage += i->second * rangelim(time_from_last_punch / full_punch_interval, 0.0, 1.0)
 				* armor / 100.0;
@@ -197,7 +196,7 @@ PunchDamageResult getPunchDamage(
 				do_hit = false;
 		}
 	}
-	
+
 	PunchDamageResult result;
 	if(do_hit)
 	{
diff --git a/src/tool.h b/src/tool.h
index 509561a16..ebba5b749 100644
--- a/src/tool.h
+++ b/src/tool.h
@@ -23,12 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes.h"
 #include <string>
 #include <iostream>
-#include <map>
+#include "util/cpp11_container.h"
 #include "itemgroup.h"
 
 struct ToolGroupCap
 {
-	std::map<int, float> times;
+	UNORDERED_MAP<int, float> times;
 	int maxlevel;
 	int uses;
 
@@ -39,8 +39,8 @@ struct ToolGroupCap
 
 	bool getTime(int rating, float *time) const
 	{
-		std::map<int, float>::const_iterator i = times.find(rating);
-		if(i == times.end()){
+		UNORDERED_MAP<int, float>::const_iterator i = times.find(rating);
+		if (i == times.end()) {
 			*time = 0;
 			return false;
 		}
@@ -50,22 +50,19 @@ struct ToolGroupCap
 };
 
 
-// CLANG SUCKS DONKEY BALLS
-typedef std::map<std::string, struct ToolGroupCap> ToolGCMap;
-typedef std::map<std::string, s16> DamageGroup;
+typedef UNORDERED_MAP<std::string, struct ToolGroupCap> ToolGCMap;
+typedef UNORDERED_MAP<std::string, s16> DamageGroup;
 
 struct ToolCapabilities
 {
 	float full_punch_interval;
 	int max_drop_level;
-	// CLANG SUCKS DONKEY BALLS
 	ToolGCMap groupcaps;
 	DamageGroup damageGroups;
 
 	ToolCapabilities(
 			float full_punch_interval_=1.4,
 			int max_drop_level_=1,
-			// CLANG SUCKS DONKEY BALLS
 			ToolGCMap groupcaps_=ToolGCMap(),
 			DamageGroup damageGroups_=DamageGroup()
 	):

From 613797a3048907275ceebe29582b9fc2761b1f25 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Wed, 5 Oct 2016 09:03:55 +0200
Subject: [PATCH 209/418] Replace various std::map with UNORDERED_MAP + various
 cleanups

This is part 2 for 5f084cd98d7b3326b51320455364337539710efd

Other improvements:

* Use the defined ItemGroupList when used
* make Client::checkPrivilege const
* inline some trivial functions
* Add ActiveObjectMap typedef
* Add SettingsEntries typedef
---
 src/client.cpp                  |  4 +--
 src/client.h                    |  6 ++--
 src/clientiface.cpp             | 55 +++++++++++-------------------
 src/clientiface.h               |  7 ++--
 src/content_cao.cpp             |  6 ++--
 src/content_cao.h               |  2 +-
 src/emerge.cpp                  |  6 ++--
 src/emerge.h                    |  2 +-
 src/environment.cpp             | 60 +++++++++++----------------------
 src/environment.h               |  8 +++--
 src/game.cpp                    |  9 +++--
 src/itemdef.cpp                 |  4 +--
 src/itemgroup.h                 |  6 ++--
 src/mapsector.cpp               | 28 ++++-----------
 src/mapsector.h                 |  4 +--
 src/mg_schematic.cpp            |  4 +--
 src/script/common/c_content.cpp |  8 ++---
 src/script/common/c_content.h   |  6 ++--
 src/script/common/c_converter.h |  4 +--
 src/script/lua_api/l_util.cpp   |  4 +--
 src/server.cpp                  | 12 +++----
 src/settings.cpp                | 26 +++++++-------
 src/settings.h                  |  6 ++--
 23 files changed, 110 insertions(+), 167 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 483b22caa..a599e21dc 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -303,7 +303,7 @@ Client::~Client()
 	delete m_inventory_from_server;
 
 	// Delete detached inventories
-	for (std::map<std::string, Inventory*>::iterator
+	for (UNORDERED_MAP<std::string, Inventory*>::iterator
 			i = m_detached_inventories.begin();
 			i != m_detached_inventories.end(); ++i) {
 		delete i->second;
@@ -1437,7 +1437,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
 	break;
 	case InventoryLocation::DETACHED:
 	{
-		if(m_detached_inventories.count(loc.name) == 0)
+		if (m_detached_inventories.count(loc.name) == 0)
 			return NULL;
 		return m_detached_inventories[loc.name];
 	}
diff --git a/src/client.h b/src/client.h
index b479062a0..fb479068f 100644
--- a/src/client.h
+++ b/src/client.h
@@ -462,7 +462,7 @@ public:
 	u16 getHP();
 	u16 getBreath();
 
-	bool checkPrivilege(const std::string &priv)
+	bool checkPrivilege(const std::string &priv) const
 	{ return (m_privileges.count(priv) != 0); }
 
 	bool getChatMessage(std::wstring &message);
@@ -670,11 +670,11 @@ private:
 	std::map<int, u16> m_sounds_to_objects;
 
 	// Privileges
-	std::set<std::string> m_privileges;
+	UNORDERED_SET<std::string> m_privileges;
 
 	// Detached inventories
 	// key = name
-	std::map<std::string, Inventory*> m_detached_inventories;
+	UNORDERED_MAP<std::string, Inventory*> m_detached_inventories;
 
 	// Storage for mesh data for creating multiple instances of the same mesh
 	StringMap m_mesh_data;
diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index a3a17d435..e7ad39579 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -605,11 +605,8 @@ ClientInterface::~ClientInterface()
 	{
 		MutexAutoLock clientslock(m_clients_mutex);
 
-		for(std::map<u16, RemoteClient*>::iterator
-			i = m_clients.begin();
-			i != m_clients.end(); ++i)
-		{
-
+		for (UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
+			i != m_clients.end(); ++i) {
 			// Delete client
 			delete i->second;
 		}
@@ -621,10 +618,8 @@ std::vector<u16> ClientInterface::getClientIDs(ClientState min_state)
 	std::vector<u16> reply;
 	MutexAutoLock clientslock(m_clients_mutex);
 
-	for(std::map<u16, RemoteClient*>::iterator
-		i = m_clients.begin();
-		i != m_clients.end(); ++i)
-	{
+	for(UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
+		i != m_clients.end(); ++i) {
 		if (i->second->getState() >= min_state)
 			reply.push_back(i->second->peer_id);
 	}
@@ -691,8 +686,7 @@ void ClientInterface::sendToAll(u16 channelnum,
 		NetworkPacket* pkt, bool reliable)
 {
 	MutexAutoLock clientslock(m_clients_mutex);
-	for(std::map<u16, RemoteClient*>::iterator
-		i = m_clients.begin();
+	for(UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
 		i != m_clients.end(); ++i) {
 		RemoteClient *client = i->second;
 
@@ -705,11 +699,10 @@ void ClientInterface::sendToAll(u16 channelnum,
 RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min)
 {
 	MutexAutoLock clientslock(m_clients_mutex);
-	std::map<u16, RemoteClient*>::iterator n;
-	n = m_clients.find(peer_id);
+	UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
 	// The client may not exist; clients are immediately removed if their
 	// access is denied, and this event occurs later then.
-	if(n == m_clients.end())
+	if (n == m_clients.end())
 		return NULL;
 
 	if (n->second->getState() >= state_min)
@@ -720,11 +713,10 @@ RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min)
 
 RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState state_min)
 {
-	std::map<u16, RemoteClient*>::iterator n;
-	n = m_clients.find(peer_id);
+	UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
 	// The client may not exist; clients are immediately removed if their
 	// access is denied, and this event occurs later then.
-	if(n == m_clients.end())
+	if (n == m_clients.end())
 		return NULL;
 
 	if (n->second->getState() >= state_min)
@@ -736,11 +728,10 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState stat
 ClientState ClientInterface::getClientState(u16 peer_id)
 {
 	MutexAutoLock clientslock(m_clients_mutex);
-	std::map<u16, RemoteClient*>::iterator n;
-	n = m_clients.find(peer_id);
+	UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
 	// The client may not exist; clients are immediately removed if their
 	// access is denied, and this event occurs later then.
-	if(n == m_clients.end())
+	if (n == m_clients.end())
 		return CS_Invalid;
 
 	return n->second->getState();
@@ -749,11 +740,10 @@ ClientState ClientInterface::getClientState(u16 peer_id)
 void ClientInterface::setPlayerName(u16 peer_id,std::string name)
 {
 	MutexAutoLock clientslock(m_clients_mutex);
-	std::map<u16, RemoteClient*>::iterator n;
-	n = m_clients.find(peer_id);
+	UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
 	// The client may not exist; clients are immediately removed if their
 	// access is denied, and this event occurs later then.
-	if(n != m_clients.end())
+	if (n != m_clients.end())
 		n->second->setName(name);
 }
 
@@ -762,11 +752,10 @@ void ClientInterface::DeleteClient(u16 peer_id)
 	MutexAutoLock conlock(m_clients_mutex);
 
 	// Error check
-	std::map<u16, RemoteClient*>::iterator n;
-	n = m_clients.find(peer_id);
+	UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
 	// The client may not exist; clients are immediately removed if their
 	// access is denied, and this event occurs later then.
-	if(n == m_clients.end())
+	if (n == m_clients.end())
 		return;
 
 	/*
@@ -797,10 +786,9 @@ void ClientInterface::CreateClient(u16 peer_id)
 	MutexAutoLock conlock(m_clients_mutex);
 
 	// Error check
-	std::map<u16, RemoteClient*>::iterator n;
-	n = m_clients.find(peer_id);
+	UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
 	// The client shouldn't already exist
-	if(n != m_clients.end()) return;
+	if (n != m_clients.end()) return;
 
 	// Create client
 	RemoteClient *client = new RemoteClient();
@@ -814,8 +802,7 @@ void ClientInterface::event(u16 peer_id, ClientStateEvent event)
 		MutexAutoLock clientlock(m_clients_mutex);
 
 		// Error check
-		std::map<u16, RemoteClient*>::iterator n;
-		n = m_clients.find(peer_id);
+		UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
 
 		// No client to deliver event
 		if (n == m_clients.end())
@@ -836,8 +823,7 @@ u16 ClientInterface::getProtocolVersion(u16 peer_id)
 	MutexAutoLock conlock(m_clients_mutex);
 
 	// Error check
-	std::map<u16, RemoteClient*>::iterator n;
-	n = m_clients.find(peer_id);
+	UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
 
 	// No client to get version
 	if (n == m_clients.end())
@@ -851,8 +837,7 @@ void ClientInterface::setClientVersion(u16 peer_id, u8 major, u8 minor, u8 patch
 	MutexAutoLock conlock(m_clients_mutex);
 
 	// Error check
-	std::map<u16, RemoteClient*>::iterator n;
-	n = m_clients.find(peer_id);
+	UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
 
 	// No client to set versions
 	if (n == m_clients.end())
diff --git a/src/clientiface.h b/src/clientiface.h
index c09942909..8985ef71f 100644
--- a/src/clientiface.h
+++ b/src/clientiface.h
@@ -25,10 +25,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"             // for SER_FMT_VER_INVALID
 #include "threading/mutex.h"
 #include "network/networkpacket.h"
+#include "util/cpp11_container.h"
 
 #include <list>
 #include <vector>
-#include <map>
 #include <set>
 
 class MapBlock;
@@ -502,8 +502,7 @@ protected:
 	void lock() { m_clients_mutex.lock(); }
 	void unlock() { m_clients_mutex.unlock(); }
 
-	std::map<u16, RemoteClient*>& getClientList()
-		{ return m_clients; }
+	UNORDERED_MAP<u16, RemoteClient*>& getClientList() { return m_clients; }
 
 private:
 	/* update internal player list */
@@ -513,7 +512,7 @@ private:
 	con::Connection* m_con;
 	Mutex m_clients_mutex;
 	// Connected clients (behind the con mutex)
-	std::map<u16, RemoteClient*> m_clients;
+	UNORDERED_MAP<u16, RemoteClient*> m_clients;
 	std::vector<std::string> m_clients_names; //for announcing masterserver
 
 	// Environment
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index f414b2b9b..609422f26 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1505,10 +1505,8 @@ void GenericCAO::updateBonePosition()
 		return;
 
 	m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
-	for(std::map<std::string,
-			core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin();
-			ii != m_bone_position.end(); ++ii)
-	{
+	for(UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+			ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
 		std::string bone_name = (*ii).first;
 		v3f bone_pos = (*ii).second.X;
 		v3f bone_rot = (*ii).second.Y;
diff --git a/src/content_cao.h b/src/content_cao.h
index bf99fd3ba..cf14a1e18 100644
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -90,7 +90,7 @@ private:
 	int m_animation_speed;
 	int m_animation_blend;
 	bool m_animation_loop;
-	std::map<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name
+	UNORDERED_MAP<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name
 	std::string m_attachment_bone;
 	v3f m_attachment_position;
 	v3f m_attachment_rotation;
diff --git a/src/emerge.cpp b/src/emerge.cpp
index daf42f5e2..bdb5e0729 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -369,12 +369,10 @@ bool EmergeManager::pushBlockEmergeData(
 }
 
 
-bool EmergeManager::popBlockEmergeData(
-	v3s16 pos,
-	BlockEmergeData *bedata)
+bool EmergeManager::popBlockEmergeData(v3s16 pos, BlockEmergeData *bedata)
 {
 	std::map<v3s16, BlockEmergeData>::iterator it;
-	std::map<u16, u16>::iterator it2;
+	UNORDERED_MAP<u16, u16>::iterator it2;
 
 	it = m_blocks_enqueued.find(pos);
 	if (it == m_blocks_enqueued.end())
diff --git a/src/emerge.h b/src/emerge.h
index cf0677145..71ad97da3 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -156,7 +156,7 @@ private:
 
 	Mutex m_queue_mutex;
 	std::map<v3s16, BlockEmergeData> m_blocks_enqueued;
-	std::map<u16, u16> m_peer_queue_count;
+	UNORDERED_MAP<u16, u16> m_peer_queue_count;
 
 	u16 m_qlimit_total;
 	u16 m_qlimit_diskonly;
diff --git a/src/environment.cpp b/src/environment.cpp
index eea264699..34b3c34f4 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1124,14 +1124,12 @@ bool ServerEnvironment::swapNode(v3s16 p, const MapNode &n)
 
 void ServerEnvironment::getObjectsInsideRadius(std::vector<u16> &objects, v3f pos, float radius)
 {
-	for(std::map<u16, ServerActiveObject*>::iterator
-			i = m_active_objects.begin();
-			i != m_active_objects.end(); ++i)
-	{
+	for (ActiveObjectMap::iterator i = m_active_objects.begin();
+			i != m_active_objects.end(); ++i) {
 		ServerActiveObject* obj = i->second;
 		u16 id = i->first;
 		v3f objectpos = obj->getBasePosition();
-		if(objectpos.getDistanceFrom(pos) > radius)
+		if (objectpos.getDistanceFrom(pos) > radius)
 			continue;
 		objects.push_back(id);
 	}
@@ -1142,8 +1140,7 @@ void ServerEnvironment::clearObjects(ClearObjectsMode mode)
 	infostream << "ServerEnvironment::clearObjects(): "
 		<< "Removing all active objects" << std::endl;
 	std::vector<u16> objects_to_remove;
-	for (std::map<u16, ServerActiveObject*>::iterator
-			i = m_active_objects.begin();
+	for (ActiveObjectMap::iterator i = m_active_objects.begin();
 			i != m_active_objects.end(); ++i) {
 		ServerActiveObject* obj = i->second;
 		if (obj->getType() == ACTIVEOBJECT_TYPE_PLAYER)
@@ -1518,10 +1515,8 @@ void ServerEnvironment::step(float dtime)
 			send_recommended = true;
 		}
 
-		for(std::map<u16, ServerActiveObject*>::iterator
-				i = m_active_objects.begin();
-				i != m_active_objects.end(); ++i)
-		{
+		for(ActiveObjectMap::iterator i = m_active_objects.begin();
+				i != m_active_objects.end(); ++i) {
 			ServerActiveObject* obj = i->second;
 			// Don't step if is to be removed or stored statically
 			if(obj->m_removed || obj->m_pending_deactivation)
@@ -1554,7 +1549,7 @@ void ServerEnvironment::step(float dtime)
 		Manage particle spawner expiration
 	*/
 	if (m_particle_management_interval.step(dtime, 1.0)) {
-		for (std::map<u32, float>::iterator i = m_particle_spawners.begin();
+		for (UNORDERED_MAP<u32, float>::iterator i = m_particle_spawners.begin();
 				i != m_particle_spawners.end(); ) {
 			//non expiring spawners
 			if (i->second == PARTICLE_SPAWNER_NO_EXPIRY) {
@@ -1579,8 +1574,7 @@ u32 ServerEnvironment::addParticleSpawner(float exptime)
 	u32 id = 0;
 	for (;;) { // look for unused particlespawner id
 		id++;
-		std::map<u32, float>::iterator f;
-		f = m_particle_spawners.find(id);
+		UNORDERED_MAP<u32, float>::iterator f = m_particle_spawners.find(id);
 		if (f == m_particle_spawners.end()) {
 			m_particle_spawners[id] = time;
 			break;
@@ -1589,31 +1583,21 @@ u32 ServerEnvironment::addParticleSpawner(float exptime)
 	return id;
 }
 
-void ServerEnvironment::deleteParticleSpawner(u32 id)
-{
-	m_particle_spawners.erase(id);
-}
-
 ServerActiveObject* ServerEnvironment::getActiveObject(u16 id)
 {
-	std::map<u16, ServerActiveObject*>::iterator n;
-	n = m_active_objects.find(id);
-	if(n == m_active_objects.end())
-		return NULL;
-	return n->second;
+	ActiveObjectMap::iterator n = m_active_objects.find(id);
+	return (n != m_active_objects.end() ? n->second : NULL);
 }
 
-bool isFreeServerActiveObjectId(u16 id,
-		std::map<u16, ServerActiveObject*> &objects)
+bool isFreeServerActiveObjectId(u16 id, ActiveObjectMap &objects)
 {
-	if(id == 0)
+	if (id == 0)
 		return false;
 
 	return objects.find(id) == objects.end();
 }
 
-u16 getFreeServerActiveObjectId(
-		std::map<u16, ServerActiveObject*> &objects)
+u16 getFreeServerActiveObjectId(ActiveObjectMap &objects)
 {
 	//try to reuse id's as late as possible
 	static u16 last_used_id = 0;
@@ -1659,8 +1643,7 @@ void ServerEnvironment::getAddedActiveObjects(Player *player, s16 radius,
 		- discard objects that are found in current_objects.
 		- add remaining objects to added_objects
 	*/
-	for(std::map<u16, ServerActiveObject*>::iterator
-			i = m_active_objects.begin();
+	for(ActiveObjectMap::iterator i = m_active_objects.begin();
 			i != m_active_objects.end(); ++i) {
 		u16 id = i->first;
 
@@ -1756,8 +1739,7 @@ void ServerEnvironment::setStaticForActiveObjectsInBlock(
 			so_it = block->m_static_objects.m_active.begin();
 			so_it != block->m_static_objects.m_active.end(); ++so_it) {
 		// Get the ServerActiveObject counterpart to this StaticObject
-		std::map<u16, ServerActiveObject *>::iterator ao_it;
-		ao_it = m_active_objects.find(so_it->first);
+		ActiveObjectMap::iterator ao_it = m_active_objects.find(so_it->first);
 		if (ao_it == m_active_objects.end()) {
 			// If this ever happens, there must be some kind of nasty bug.
 			errorstream << "ServerEnvironment::setStaticForObjectsInBlock(): "
@@ -1806,8 +1788,8 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
 		verbosestream<<"ServerEnvironment::addActiveObjectRaw(): "
 				<<"supplied with id "<<object->getId()<<std::endl;
 	}
-	if(isFreeServerActiveObjectId(object->getId(), m_active_objects) == false)
-	{
+
+	if(!isFreeServerActiveObjectId(object->getId(), m_active_objects)) {
 		errorstream<<"ServerEnvironment::addActiveObjectRaw(): "
 				<<"id is not free ("<<object->getId()<<")"<<std::endl;
 		if(object->environmentDeletes())
@@ -1875,8 +1857,7 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
 void ServerEnvironment::removeRemovedObjects()
 {
 	std::vector<u16> objects_to_remove;
-	for(std::map<u16, ServerActiveObject*>::iterator
-			i = m_active_objects.begin();
+	for(ActiveObjectMap::iterator i = m_active_objects.begin();
 			i != m_active_objects.end(); ++i) {
 		u16 id = i->first;
 		ServerActiveObject* obj = i->second;
@@ -1894,7 +1875,7 @@ void ServerEnvironment::removeRemovedObjects()
 			We will delete objects that are marked as removed or thatare
 			waiting for deletion after deactivation
 		*/
-		if(obj->m_removed == false && obj->m_pending_deactivation == false)
+		if (!obj->m_removed && !obj->m_pending_deactivation)
 			continue;
 
 		/*
@@ -2094,8 +2075,7 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
 void ServerEnvironment::deactivateFarObjects(bool force_delete)
 {
 	std::vector<u16> objects_to_remove;
-	for(std::map<u16, ServerActiveObject*>::iterator
-			i = m_active_objects.begin();
+	for(ActiveObjectMap::iterator i = m_active_objects.begin();
 			i != m_active_objects.end(); ++i) {
 		ServerActiveObject* obj = i->second;
 		assert(obj);
diff --git a/src/environment.h b/src/environment.h
index c6786faed..1ba7b196f 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -300,6 +300,8 @@ enum ClearObjectsMode {
 	This is not thread-safe. Server uses an environment mutex.
 */
 
+typedef UNORDERED_MAP<u16, ServerActiveObject *> ActiveObjectMap;
+
 class ServerEnvironment : public Environment
 {
 public:
@@ -338,7 +340,7 @@ public:
 	void loadDefaultMeta();
 
 	u32 addParticleSpawner(float exptime);
-	void deleteParticleSpawner(u32 id);
+	void deleteParticleSpawner(u32 id) { m_particle_spawners.erase(id); }
 
 	/*
 		External ActiveObject interface
@@ -491,7 +493,7 @@ private:
 	// World path
 	const std::string m_path_world;
 	// Active object list
-	std::map<u16, ServerActiveObject*> m_active_objects;
+	ActiveObjectMap m_active_objects;
 	// Outgoing network message buffer for active objects
 	std::queue<ActiveObjectMessage> m_active_object_messages;
 	// Some timers
@@ -522,7 +524,7 @@ private:
 
 	// Particles
 	IntervalLimiter m_particle_management_interval;
-	std::map<u32, float> m_particle_spawners;
+	UNORDERED_MAP<u32, float> m_particle_spawners;
 };
 
 #ifndef SERVER
diff --git a/src/game.cpp b/src/game.cpp
index 5a3b10879..22d9ffef6 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -605,7 +605,7 @@ public:
 	void draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
 		  gui::IGUIFont *font) const
 	{
-		std::map<std::string, Meta> m_meta;
+		UNORDERED_MAP<std::string, Meta> m_meta;
 
 		for (std::deque<Piece>::const_iterator k = m_log.begin();
 				k != m_log.end(); ++k) {
@@ -615,8 +615,7 @@ public:
 					i != piece.values.end(); ++i) {
 				const std::string &id = i->first;
 				const float &value = i->second;
-				std::map<std::string, Meta>::iterator j =
-					m_meta.find(id);
+				UNORDERED_MAP<std::string, Meta>::iterator j = m_meta.find(id);
 
 				if (j == m_meta.end()) {
 					m_meta[id] = Meta(value);
@@ -643,7 +642,7 @@ public:
 			sizeof(usable_colors) / sizeof(*usable_colors);
 		u32 next_color_i = 0;
 
-		for (std::map<std::string, Meta>::iterator i = m_meta.begin();
+		for (UNORDERED_MAP<std::string, Meta>::iterator i = m_meta.begin();
 				i != m_meta.end(); ++i) {
 			Meta &meta = i->second;
 			video::SColor color(255, 200, 200, 200);
@@ -659,7 +658,7 @@ public:
 		s32 textx2 = textx + 200 - 15;
 		s32 meta_i = 0;
 
-		for (std::map<std::string, Meta>::const_iterator i = m_meta.begin();
+		for (UNORDERED_MAP<std::string, Meta>::const_iterator i = m_meta.begin();
 				i != m_meta.end(); ++i) {
 			const std::string &id = i->first;
 			const Meta &meta = i->second;
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index a6c627a03..1aa6331dc 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -146,9 +146,9 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
 	}
 	os<<serializeString(tool_capabilities_s);
 	writeU16(os, groups.size());
-	for(std::map<std::string, int>::const_iterator
+	for (ItemGroupList::const_iterator
 			i = groups.begin(); i != groups.end(); ++i){
-		os<<serializeString(i->first);
+		os << serializeString(i->first);
 		writeS16(os, i->second);
 	}
 	os<<serializeString(node_placement_prediction);
diff --git a/src/itemgroup.h b/src/itemgroup.h
index f6ae86736..f91ccc221 100644
--- a/src/itemgroup.h
+++ b/src/itemgroup.h
@@ -21,14 +21,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define ITEMGROUP_HEADER
 
 #include <string>
-#include <map>
+#include "util/cpp11_container.h"
 
-typedef std::map<std::string, int> ItemGroupList;
+typedef UNORDERED_MAP<std::string, int> ItemGroupList;
 
 static inline int itemgroup_get(const ItemGroupList &groups,
 		const std::string &name)
 {
-	std::map<std::string, int>::const_iterator i = groups.find(name);
+	ItemGroupList::const_iterator i = groups.find(name);
 	if(i == groups.end())
 		return 0;
 	return i->second;
diff --git a/src/mapsector.cpp b/src/mapsector.cpp
index 1588a5962..410689f5e 100644
--- a/src/mapsector.cpp
+++ b/src/mapsector.cpp
@@ -42,9 +42,8 @@ void MapSector::deleteBlocks()
 	m_block_cache = NULL;
 
 	// Delete all
-	for(std::map<s16, MapBlock*>::iterator i = m_blocks.begin();
-		i != m_blocks.end(); ++i)
-	{
+	for (UNORDERED_MAP<s16, MapBlock*>::iterator i = m_blocks.begin();
+		 	i != m_blocks.end(); ++i) {
 		delete i->second;
 	}
 
@@ -56,20 +55,13 @@ MapBlock * MapSector::getBlockBuffered(s16 y)
 {
 	MapBlock *block;
 
-	if(m_block_cache != NULL && y == m_block_cache_y){
+	if (m_block_cache != NULL && y == m_block_cache_y) {
 		return m_block_cache;
 	}
 
 	// If block doesn't exist, return NULL
-	std::map<s16, MapBlock*>::iterator n = m_blocks.find(y);
-	if(n == m_blocks.end())
-	{
-		block = NULL;
-	}
-	// If block exists, return it
-	else{
-		block = n->second;
-	}
+	UNORDERED_MAP<s16, MapBlock*>::iterator n = m_blocks.find(y);
+	block = (n != m_blocks.end() ? n->second : NULL);
 
 	// Cache the last result
 	m_block_cache_y = y;
@@ -135,18 +127,12 @@ void MapSector::deleteBlock(MapBlock *block)
 
 void MapSector::getBlocks(MapBlockVect &dest)
 {
-	for(std::map<s16, MapBlock*>::iterator bi = m_blocks.begin();
-		bi != m_blocks.end(); ++bi)
-	{
+	for (UNORDERED_MAP<s16, MapBlock*>::iterator bi = m_blocks.begin();
+		bi != m_blocks.end(); ++bi) {
 		dest.push_back(bi->second);
 	}
 }
 
-bool MapSector::empty()
-{
-	return m_blocks.empty();
-}
-
 /*
 	ServerMapSector
 */
diff --git a/src/mapsector.h b/src/mapsector.h
index 4c1ce86a3..c3bff3575 100644
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -63,7 +63,7 @@ public:
 
 	void getBlocks(MapBlockVect &dest);
 
-	bool empty();
+	bool empty() const { return m_blocks.empty(); }
 
 	// Always false at the moment, because sector contains no metadata.
 	bool differs_from_disk;
@@ -71,7 +71,7 @@ public:
 protected:
 
 	// The pile of MapBlocks
-	std::map<s16, MapBlock*> m_blocks;
+	UNORDERED_MAP<s16, MapBlock*> m_blocks;
 
 	Map *m_parent;
 	// Position on parent (in MapBlock widths)
diff --git a/src/mg_schematic.cpp b/src/mg_schematic.cpp
index 0b95fa267..e028215dc 100644
--- a/src/mg_schematic.cpp
+++ b/src/mg_schematic.cpp
@@ -564,14 +564,14 @@ void Schematic::applyProbabilities(v3s16 p0,
 void generate_nodelist_and_update_ids(MapNode *nodes, size_t nodecount,
 	std::vector<std::string> *usednodes, INodeDefManager *ndef)
 {
-	std::map<content_t, content_t> nodeidmap;
+	UNORDERED_MAP<content_t, content_t> nodeidmap;
 	content_t numids = 0;
 
 	for (size_t i = 0; i != nodecount; i++) {
 		content_t id;
 		content_t c = nodes[i].getContent();
 
-		std::map<content_t, content_t>::const_iterator it = nodeidmap.find(c);
+		UNORDERED_MAP<content_t, content_t>::const_iterator it = nodeidmap.find(c);
 		if (it == nodeidmap.end()) {
 			id = numids;
 			numids++;
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 6fb9080bc..f20a65903 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -1063,8 +1063,7 @@ void push_flags_string(lua_State *L, FlagDesc *flagdesc, u32 flags, u32 flagmask
 /******************************************************************************/
 
 /******************************************************************************/
-void read_groups(lua_State *L, int index,
-		std::map<std::string, int> &result)
+void read_groups(lua_State *L, int index, ItemGroupList &result)
 {
 	if (!lua_istable(L,index))
 		return;
@@ -1083,11 +1082,10 @@ void read_groups(lua_State *L, int index,
 }
 
 /******************************************************************************/
-void push_groups(lua_State *L, const std::map<std::string, int> &groups)
+void push_groups(lua_State *L, const ItemGroupList &groups)
 {
 	lua_newtable(L);
-	std::map<std::string, int>::const_iterator it;
-	for (it = groups.begin(); it != groups.end(); ++it) {
+	for (ItemGroupList::const_iterator it = groups.begin(); it != groups.end(); ++it) {
 		lua_pushnumber(L, it->second);
 		lua_setfield(L, -2, it->first.c_str());
 	}
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index 46416ad8e..2a2228b6d 100644
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -33,11 +33,11 @@ extern "C" {
 }
 
 #include <iostream>
-#include <map>
 #include <vector>
 
 #include "irrlichttypes_bloated.h"
 #include "util/string.h"
+#include "itemgroup.h"
 
 namespace Json { class Value; }
 
@@ -106,10 +106,10 @@ void               pushnode                  (lua_State *L, const MapNode &n,
 NodeBox            read_nodebox              (lua_State *L, int index);
 
 void               read_groups               (lua_State *L, int index,
-                                              std::map<std::string, int> &result);
+                                              ItemGroupList &result);
 
 void               push_groups               (lua_State *L,
-                                              const std::map<std::string, int> &groups);
+                                              const ItemGroupList &groups);
 
 //TODO rename to "read_enum_field"
 int                getenumfield              (lua_State *L, int table,
diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h
index eefac0ed7..a5fbee765 100644
--- a/src/script/common/c_converter.h
+++ b/src/script/common/c_converter.h
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define C_CONVERTER_H_
 
 #include <vector>
-#include <map>
+#include "util/cpp11_container.h"
 
 #include "irrlichttypes_bloated.h"
 #include "common/c_types.h"
@@ -60,7 +60,7 @@ bool               getintfield(lua_State *L, int table,
 bool               getintfield(lua_State *L, int table,
                              const char *fieldname, u32 &result);
 void               read_groups(lua_State *L, int index,
-                             std::map<std::string, int> &result);
+                             UNORDERED_MAP<std::string, int> &result);
 bool               getboolfield(lua_State *L, int table,
                              const char *fieldname, bool &result);
 bool               getfloatfield(lua_State *L, int table,
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index 13c0d702f..fa2d15b03 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -220,7 +220,7 @@ int ModApiUtil::l_write_json(lua_State *L)
 int ModApiUtil::l_get_dig_params(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	std::map<std::string, int> groups;
+	ItemGroupList groups;
 	read_groups(L, 1, groups);
 	ToolCapabilities tp = read_tool_capabilities(L, 2);
 	if(lua_isnoneornil(L, 3))
@@ -235,7 +235,7 @@ int ModApiUtil::l_get_dig_params(lua_State *L)
 int ModApiUtil::l_get_hit_params(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	std::map<std::string, int> groups;
+	UNORDERED_MAP<std::string, int> groups;
 	read_groups(L, 1, groups);
 	ToolCapabilities tp = read_tool_capabilities(L, 2);
 	if(lua_isnoneornil(L, 3))
diff --git a/src/server.cpp b/src/server.cpp
index c615aee13..5b67b321a 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -669,7 +669,7 @@ void Server::AsyncRunStep(bool initial_step)
 		MutexAutoLock envlock(m_env_mutex);
 
 		m_clients.lock();
-		std::map<u16, RemoteClient*> clients = m_clients.getClientList();
+		UNORDERED_MAP<u16, RemoteClient*> clients = m_clients.getClientList();
 		ScopeProfiler sp(g_profiler, "Server: checking added and deleted objs");
 
 		// Radius inside which objects are active
@@ -685,8 +685,7 @@ void Server::AsyncRunStep(bool initial_step)
 		if (player_radius == 0 && is_transfer_limited)
 			player_radius = radius;
 
-		for (std::map<u16, RemoteClient*>::iterator
-			i = clients.begin();
+		for (UNORDERED_MAP<u16, RemoteClient*>::iterator i = clients.begin();
 			i != clients.end(); ++i) {
 			RemoteClient *client = i->second;
 
@@ -696,7 +695,7 @@ void Server::AsyncRunStep(bool initial_step)
 				continue;
 
 			Player *player = m_env->getPlayer(client->peer_id);
-			if(player == NULL) {
+			if (player == NULL) {
 				// This can happen if the client timeouts somehow
 				/*warningstream<<FUNCTION_NAME<<": Client "
 						<<client->peer_id
@@ -817,10 +816,9 @@ void Server::AsyncRunStep(bool initial_step)
 		}
 
 		m_clients.lock();
-		std::map<u16, RemoteClient*> clients = m_clients.getClientList();
+		UNORDERED_MAP<u16, RemoteClient*> clients = m_clients.getClientList();
 		// Route data to every client
-		for (std::map<u16, RemoteClient*>::iterator
-			i = clients.begin();
+		for (UNORDERED_MAP<u16, RemoteClient*>::iterator i = clients.begin();
 			i != clients.end(); ++i) {
 			RemoteClient *client = i->second;
 			std::string reliable_data;
diff --git a/src/settings.cpp b/src/settings.cpp
index 91ea9c58b..c4c3c9073 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -196,9 +196,8 @@ void Settings::writeLines(std::ostream &os, u32 tab_depth) const
 {
 	MutexAutoLock lock(m_mutex);
 
-	for (std::map<std::string, SettingsEntry>::const_iterator
-			it = m_settings.begin();
-			it != m_settings.end(); ++it)
+	for (SettingEntries::const_iterator it = m_settings.begin();
+		 	it != m_settings.end(); ++it)
 		printEntry(os, it->first, it->second, tab_depth);
 }
 
@@ -231,7 +230,7 @@ void Settings::printEntry(std::ostream &os, const std::string &name,
 bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
 	const std::string &end, u32 tab_depth)
 {
-	std::map<std::string, SettingsEntry>::const_iterator it;
+	SettingEntries::const_iterator it;
 	std::set<std::string> present_entries;
 	std::string line, name, value;
 	bool was_modified = false;
@@ -381,7 +380,7 @@ const SettingsEntry &Settings::getEntry(const std::string &name) const
 {
 	MutexAutoLock lock(m_mutex);
 
-	std::map<std::string, SettingsEntry>::const_iterator n;
+	SettingEntries::const_iterator n;
 	if ((n = m_settings.find(name)) == m_settings.end()) {
 		if ((n = m_defaults.find(name)) == m_defaults.end())
 			throw SettingNotFoundException("Setting [" + name + "] not found.");
@@ -572,9 +571,8 @@ bool Settings::exists(const std::string &name) const
 std::vector<std::string> Settings::getNames() const
 {
 	std::vector<std::string> names;
-	for (std::map<std::string, SettingsEntry>::const_iterator
-			i = m_settings.begin();
-			i != m_settings.end(); ++i) {
+	for (SettingEntries::const_iterator i = m_settings.begin();
+		 	i != m_settings.end(); ++i) {
 		names.push_back(i->first);
 	}
 	return names;
@@ -880,7 +878,7 @@ bool Settings::remove(const std::string &name)
 {
 	MutexAutoLock lock(m_mutex);
 
-	std::map<std::string, SettingsEntry>::iterator it = m_settings.find(name);
+	SettingEntries::iterator it = m_settings.find(name);
 	if (it != m_settings.end()) {
 		delete it->second.group;
 		m_settings.erase(it);
@@ -912,7 +910,6 @@ void Settings::updateValue(const Settings &other, const std::string &name)
 
 	try {
 		std::string val = other.get(name);
-
 		m_settings[name] = val;
 	} catch (SettingNotFoundException &e) {
 	}
@@ -968,8 +965,9 @@ void Settings::updateNoLock(const Settings &other)
 
 void Settings::clearNoLock()
 {
-	std::map<std::string, SettingsEntry>::const_iterator it;
-	for (it = m_settings.begin(); it != m_settings.end(); ++it)
+
+	for (SettingEntries::const_iterator it = m_settings.begin();
+			it != m_settings.end(); ++it)
 		delete it->second.group;
 	m_settings.clear();
 
@@ -978,8 +976,8 @@ void Settings::clearNoLock()
 
 void Settings::clearDefaultsNoLock()
 {
-	std::map<std::string, SettingsEntry>::const_iterator it;
-	for (it = m_defaults.begin(); it != m_defaults.end(); ++it)
+	for (SettingEntries::const_iterator it = m_defaults.begin();
+			it != m_defaults.end(); ++it)
 		delete it->second.group;
 	m_defaults.clear();
 }
diff --git a/src/settings.h b/src/settings.h
index c6c044779..b19733514 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -98,6 +98,8 @@ struct SettingsEntry {
 	bool is_group;
 };
 
+typedef UNORDERED_MAP<std::string, SettingsEntry> SettingEntries;
+
 class Settings {
 public:
 	Settings() {}
@@ -231,8 +233,8 @@ private:
 
 	void doCallbacks(const std::string &name) const;
 
-	std::map<std::string, SettingsEntry> m_settings;
-	std::map<std::string, SettingsEntry> m_defaults;
+	SettingEntries m_settings;
+	SettingEntries m_defaults;
 
 	SettingsCallbackMap m_callbacks;
 

From 7fab86a49dd569f24804eb7396843e61095e3854 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Wed, 5 Oct 2016 20:58:05 +0200
Subject: [PATCH 210/418] Compilation fix

---
 src/content_cao.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 609422f26..a141690f6 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -566,7 +566,7 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env):
 		m_animation_speed(15),
 		m_animation_blend(0),
 		m_animation_loop(true),
-		m_bone_position(std::map<std::string, core::vector2d<v3f> >()),
+		m_bone_position(UNORDERED_MAP<std::string, core::vector2d<v3f> >()),
 		m_attachment_bone(""),
 		m_attachment_position(v3f(0,0,0)),
 		m_attachment_rotation(v3f(0,0,0)),

From 61d1751dfff71d8fd433c6c84bd39db1672a3ee6 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Wed, 5 Oct 2016 22:17:22 +0200
Subject: [PATCH 211/418] Travis: build matrix improvements + CPP11 build

---
 .travis.yml                     | 36 +++++++++++++++++----------------
 src/unittest/test_settings.cpp  |  7 +++++--
 src/unittest/test_threading.cpp |  1 +
 util/travis/before_install.sh   | 10 +--------
 util/travis/script.sh           |  4 ++++
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9d1600818..534479efb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,4 @@
 language: cpp
-compiler:
-  - gcc
-  - clang
-os:
-  - osx
-  - linux
-env:
-  - PLATFORM=Win32
-  - PLATFORM=Win64
-  - PLATFORM=Unix
 before_install: ./util/travis/before_install.sh
 script: ./util/travis/script.sh
 sudo: required
@@ -16,14 +6,26 @@ notifications:
   email: false
 matrix:
   fast_finish: true
-  exclude:
+  include:
     - env: PLATFORM=Win32
-      compiler: clang
+      compiler: gcc
+      os: linux
     - env: PLATFORM=Win64
+      compiler: gcc
+      os: linux
+    - env: PLATFORM=Unix COMPILER=clang
       compiler: clang
-    - env: PLATFORM=Win32
-      os: osx
-    - env: PLATFORM=Win64
-      os: osx
-    - compiler: gcc
       os: osx
+    - env: PLATFORM=Unix COMPILER=g++
+      compiler: gcc
+      os: linux
+    - env: PLATFORM=Unix COMPILER=clang
+      compiler: clang
+      os: linux
+    - env: PLATFORM=Unix COMPILER=g++-6
+      compiler: gcc
+      os: linux
+addons:
+  apt:
+    sources: &sources
+      - ubuntu-toolchain-r-test
diff --git a/src/unittest/test_settings.cpp b/src/unittest/test_settings.cpp
index a82d734f0..733c7e92a 100644
--- a/src/unittest/test_settings.cpp
+++ b/src/unittest/test_settings.cpp
@@ -32,7 +32,7 @@ public:
 	void testAllSettings();
 
 	static const char *config_text_before;
-	static const char *config_text_after;
+	static const std::string config_text_after;
 };
 
 static TestSettings g_test_instance;
@@ -69,7 +69,7 @@ const char *TestSettings::config_text_before =
 	"np_terrain = 5, 40, (250, 250, 250), 12341, 5, 0.7, 2.4\n"
 	"zoop = true";
 
-const char *TestSettings::config_text_after =
+const std::string TestSettings::config_text_after =
 	"leet = 1337\n"
 	"leetleet = 13371337\n"
 	"leetleet_neg = -13371337\n"
@@ -197,7 +197,10 @@ void TestSettings::testAllSettings()
 	UASSERT(s.updateConfigObject(is, os, "", 0) == true);
 	//printf(">>>> expected config:\n%s\n", TEST_CONFIG_TEXT_AFTER);
 	//printf(">>>> actual config:\n%s\n", os.str().c_str());
+#if __cplusplus < 201103L
+	// This test only works in older C++ versions than C++11 because we use unordered_map
 	UASSERT(os.str() == config_text_after);
+#endif
 	} catch (SettingNotFoundException &e) {
 		UASSERT(!"Setting not found!");
 	}
diff --git a/src/unittest/test_threading.cpp b/src/unittest/test_threading.cpp
index 224e123df..cdbf9674e 100644
--- a/src/unittest/test_threading.cpp
+++ b/src/unittest/test_threading.cpp
@@ -163,6 +163,7 @@ private:
 void TestThreading::testAtomicSemaphoreThread()
 {
 	Atomic<u32> val;
+	val = 0;
 	Semaphore trigger;
 	static const u8 num_threads = 4;
 
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index 70037389b..a2eb37803 100755
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -1,16 +1,8 @@
 #!/bin/bash -e
 
 if [[ $TRAVIS_OS_NAME == "linux" ]]; then
-	if [[ $CC == "clang" ]]; then
-		export PATH="/usr/bin/:$PATH"
-		sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'
-		sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183
-		sudo apt-get update
-		sudo apt-get install llvm-3.1
-		sudo apt-get install clang
-	fi
 	sudo apt-get update
-	sudo apt-get install p7zip-full
+	sudo apt-get install p7zip-full $COMPILER
 fi
 
 if [[ $PLATFORM == "Unix" ]]; then
diff --git a/util/travis/script.sh b/util/travis/script.sh
index 870954ebb..4f37d8f5a 100755
--- a/util/travis/script.sh
+++ b/util/travis/script.sh
@@ -4,6 +4,10 @@ if [[ $PLATFORM == "Unix" ]]; then
 	mkdir -p travisbuild
 	cd travisbuild || exit 1
 	CMAKE_FLAGS=''
+	if [[ $COMPILER == "g++-6" ]]; then
+		export CC=gcc-6
+		export CXX=g++-6
+	fi
 	# Clang builds with FreeType fail on Travis
 	if [[ $CC == "clang" ]]; then
 		CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE'

From de83c29ba0a517630b361ffdbebd1a1f0b5eed4e Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Thu, 6 Oct 2016 03:32:52 +0200
Subject: [PATCH 212/418] Fix crash regression when chatting in the ncurses
 console

Fixes #4579, a regression introduced by commit

d4c76258e37337ea585cf24d8e05b50a30fa307d "Chat: new settings to prevent spam"
---
 src/server.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/server.cpp b/src/server.cpp
index 5b67b321a..a8494f76e 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2751,19 +2751,21 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 	if (ate)
 		return L"";
 
-	switch (player->canSendChatMessage()) {
-		case RPLAYER_CHATRESULT_FLOODING: {
-			std::wstringstream ws;
-			ws << L"You cannot send more messages. You are limited to "
-			   << g_settings->getFloat("chat_message_limit_per_10sec")
-			   << " messages per 10 seconds.";
-			return ws.str();
+	if (player) {
+		switch (player->canSendChatMessage()) {
+			case RPLAYER_CHATRESULT_FLOODING: {
+				std::wstringstream ws;
+				ws << L"You cannot send more messages. You are limited to "
+				<< g_settings->getFloat("chat_message_limit_per_10sec")
+				<< " messages per 10 seconds.";
+				return ws.str();
+			}
+			case RPLAYER_CHATRESULT_KICK:
+				DenyAccess_Legacy(player->peer_id, L"You have been kicked due to message flooding.");
+				return L"";
+			case RPLAYER_CHATRESULT_OK: break;
+			default: FATAL_ERROR("Unhandled chat filtering result found.");
 		}
-		case RPLAYER_CHATRESULT_KICK:
-			DenyAccess_Legacy(player->peer_id, L"You have been kicked due to message flooding.");
-			return L"";
-		case RPLAYER_CHATRESULT_OK: break;
-		default: FATAL_ERROR("Unhandled chat filtering result found.");
 	}
 
 	if (m_max_chatmessage_length > 0 && wmessage.length() > m_max_chatmessage_length) {

From 009a9f1c6e8115abbcdf2ccbcf10c240417b07da Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Thu, 6 Oct 2016 07:48:49 +0200
Subject: [PATCH 213/418] Fix macosx build by disabling postgresql upgrade

---
 util/travis/before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index a2eb37803..d25614edb 100755
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -17,7 +17,7 @@ if [[ $PLATFORM == "Unix" ]]; then
 	else
 		brew update
 		brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit
-		brew upgrade postgresql
+		#brew upgrade postgresql
 	fi
 elif [[ $PLATFORM == "Win32" ]]; then
 	wget http://minetest.kitsunemimi.pw/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z

From 997fc59c7e29a4d2b3f19df9972f3a7d4ac894e3 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Thu, 6 Oct 2016 10:12:14 +0200
Subject: [PATCH 214/418] Use relative position for nametags

---
 src/camera.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/camera.cpp b/src/camera.cpp
index 4feab1fe5..b86f218fe 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -552,7 +552,7 @@ void Camera::drawNametags()
 			// shadow can remain.
 			continue;
 		}
-		v3f pos = nametag->parent_node->getPosition() + v3f(0.0, 1.1 * BS, 0.0);
+		v3f pos = nametag->parent_node->getAbsolutePosition() + v3f(0.0, 1.1 * BS, 0.0);
 		f32 transformed_pos[4] = { pos.X, pos.Y, pos.Z, 1.0f };
 		trans.multiplyWith1x4Matrix(transformed_pos);
 		if (transformed_pos[3] > 0) {

From 667975fe3adee935a3f4d2b1a421a295771c664d Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Thu, 6 Oct 2016 08:48:20 +0200
Subject: [PATCH 215/418] Use more unordered_maps to improve performance in
 c++11 builds

---
 src/client.cpp                      |  9 +++------
 src/client.h                        |  6 +++---
 src/clientobject.cpp                | 10 ++++------
 src/clientobject.h                  |  3 ++-
 src/content_cao.cpp                 |  2 +-
 src/network/clientpackethandler.cpp |  4 +---
 src/script/lua_api/l_mapgen.cpp     |  4 ++--
 src/server.cpp                      |  8 ++++----
 src/util/string.h                   |  3 ++-
 9 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index a599e21dc..63653998a 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -623,10 +623,8 @@ void Client::step(float dtime)
 		Update positions of sounds attached to objects
 	*/
 	{
-		for(std::map<int, u16>::iterator
-				i = m_sounds_to_objects.begin();
-				i != m_sounds_to_objects.end(); ++i)
-		{
+		for(UNORDERED_MAP<int, u16>::iterator i = m_sounds_to_objects.begin();
+				i != m_sounds_to_objects.end(); ++i) {
 			int client_id = i->first;
 			u16 object_id = i->second;
 			ClientActiveObject *cao = m_env.getActiveObject(object_id);
@@ -645,8 +643,7 @@ void Client::step(float dtime)
 		m_removed_sounds_check_timer = 0;
 		// Find removed sounds and clear references to them
 		std::vector<s32> removed_server_ids;
-		for(std::map<s32, int>::iterator
-				i = m_sounds_server_to_client.begin();
+		for(UNORDERED_MAP<s32, int>::iterator i = m_sounds_server_to_client.begin();
 				i != m_sounds_server_to_client.end();) {
 			s32 server_id = i->first;
 			int client_id = i->second;
diff --git a/src/client.h b/src/client.h
index fb479068f..a71c1dcbc 100644
--- a/src/client.h
+++ b/src/client.h
@@ -663,11 +663,11 @@ private:
 	// Sounds
 	float m_removed_sounds_check_timer;
 	// Mapping from server sound ids to our sound ids
-	std::map<s32, int> m_sounds_server_to_client;
+	UNORDERED_MAP<s32, int> m_sounds_server_to_client;
 	// And the other way!
-	std::map<int, s32> m_sounds_client_to_server;
+	UNORDERED_MAP<int, s32> m_sounds_client_to_server;
 	// And relations to objects
-	std::map<int, u16> m_sounds_to_objects;
+	UNORDERED_MAP<int, u16> m_sounds_to_objects;
 
 	// Privileges
 	UNORDERED_SET<std::string> m_privileges;
diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index a11757ea6..ff3f47187 100644
--- a/src/clientobject.cpp
+++ b/src/clientobject.cpp
@@ -43,12 +43,11 @@ ClientActiveObject* ClientActiveObject::create(ActiveObjectType type,
 		IGameDef *gamedef, ClientEnvironment *env)
 {
 	// Find factory function
-	std::map<u16, Factory>::iterator n;
-	n = m_types.find(type);
+	UNORDERED_MAP<u16, Factory>::iterator n = m_types.find(type);
 	if(n == m_types.end()) {
 		// If factory is not found, just return.
-		warningstream<<"ClientActiveObject: No factory for type="
-				<<(int)type<<std::endl;
+		warningstream << "ClientActiveObject: No factory for type="
+				<< (int)type << std::endl;
 		return NULL;
 	}
 
@@ -59,8 +58,7 @@ ClientActiveObject* ClientActiveObject::create(ActiveObjectType type,
 
 void ClientActiveObject::registerType(u16 type, Factory f)
 {
-	std::map<u16, Factory>::iterator n;
-	n = m_types.find(type);
+	UNORDERED_MAP<u16, Factory>::iterator n = m_types.find(type);
 	if(n != m_types.end())
 		return;
 	m_types[type] = f;
diff --git a/src/clientobject.h b/src/clientobject.h
index 3cc7c2391..c4e1a634b 100644
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "activeobject.h"
 #include <map>
+#include "util/cpp11_container.h"
 
 /*
 
@@ -103,7 +104,7 @@ protected:
 	ClientEnvironment *m_env;
 private:
 	// Used for creating objects based on type
-	static std::map<u16, Factory> m_types;
+	static UNORDERED_MAP<u16, Factory> m_types;
 };
 
 struct DistanceSortedActiveObject
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index a141690f6..33dae6822 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -51,7 +51,7 @@ struct ToolCapabilities;
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
-std::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
+UNORDERED_MAP<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
 
 SmoothTranslator::SmoothTranslator():
 	vect_old(0,0,0),
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 48c573da5..6d42edd7d 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -812,9 +812,7 @@ void Client::handleCommand_StopSound(NetworkPacket* pkt)
 
 	*pkt >> server_id;
 
-	std::map<s32, int>::iterator i =
-		m_sounds_server_to_client.find(server_id);
-
+	UNORDERED_MAP<s32, int>::iterator i = m_sounds_server_to_client.find(server_id);
 	if (i != m_sounds_server_to_client.end()) {
 		int client_id = i->second;
 		m_sound->stopSound(client_id);
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index a176f4f52..da8e71cdc 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -244,7 +244,7 @@ bool read_schematic_def(lua_State *L, int index,
 	schem->schemdata = new MapNode[numnodes];
 
 	size_t names_base = names->size();
-	std::map<std::string, content_t> name_id_map;
+	UNORDERED_MAP<std::string, content_t> name_id_map;
 
 	u32 i = 0;
 	for (lua_pushnil(L); lua_next(L, -2); i++, lua_pop(L, 1)) {
@@ -266,7 +266,7 @@ bool read_schematic_def(lua_State *L, int index,
 		u8 param2 = getintfield_default(L, -1, "param2", 0);
 
 		//// Find or add new nodename-to-ID mapping
-		std::map<std::string, content_t>::iterator it = name_id_map.find(name);
+		UNORDERED_MAP<std::string, content_t>::iterator it = name_id_map.find(name);
 		content_t name_index;
 		if (it != name_id_map.end()) {
 			name_index = it->second;
diff --git a/src/server.cpp b/src/server.cpp
index a8494f76e..e9983ba11 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -794,7 +794,7 @@ void Server::AsyncRunStep(bool initial_step)
 
 		// Key = object id
 		// Value = data sent by object
-		std::map<u16, std::vector<ActiveObjectMessage>* > buffered_messages;
+		UNORDERED_MAP<u16, std::vector<ActiveObjectMessage>* > buffered_messages;
 
 		// Get active object messages from environment
 		for(;;) {
@@ -803,7 +803,7 @@ void Server::AsyncRunStep(bool initial_step)
 				break;
 
 			std::vector<ActiveObjectMessage>* message_list = NULL;
-			std::map<u16, std::vector<ActiveObjectMessage>* >::iterator n;
+			UNORDERED_MAP<u16, std::vector<ActiveObjectMessage>* >::iterator n;
 			n = buffered_messages.find(aom.id);
 			if (n == buffered_messages.end()) {
 				message_list = new std::vector<ActiveObjectMessage>;
@@ -824,7 +824,7 @@ void Server::AsyncRunStep(bool initial_step)
 			std::string reliable_data;
 			std::string unreliable_data;
 			// Go through all objects in message buffer
-			for (std::map<u16, std::vector<ActiveObjectMessage>* >::iterator
+			for (UNORDERED_MAP<u16, std::vector<ActiveObjectMessage>* >::iterator
 					j = buffered_messages.begin();
 					j != buffered_messages.end(); ++j) {
 				// If object is not known by client, skip it
@@ -868,7 +868,7 @@ void Server::AsyncRunStep(bool initial_step)
 		m_clients.unlock();
 
 		// Clear buffered_messages
-		for(std::map<u16, std::vector<ActiveObjectMessage>* >::iterator
+		for(UNORDERED_MAP<u16, std::vector<ActiveObjectMessage>* >::iterator
 				i = buffered_messages.begin();
 				i != buffered_messages.end(); ++i) {
 			delete i->second;
diff --git a/src/util/string.h b/src/util/string.h
index 724543a36..572c37150 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define UTIL_STRING_HEADER
 
 #include "irrlichttypes_bloated.h"
+#include "cpp11_container.h"
 #include <stdlib.h>
 #include <string>
 #include <cstring>
@@ -54,7 +55,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	(((unsigned char)(x) < 0xe0) ? 2 :     \
 	(((unsigned char)(x) < 0xf0) ? 3 : 4))
 
-typedef std::map<std::string, std::string> StringMap;
+typedef UNORDERED_MAP<std::string, std::string> StringMap;
 
 struct FlagDesc {
 	const char *name;

From b66a5d2f8842cc84ae44257dc0ead255e5b0538f Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Thu, 6 Oct 2016 13:49:40 +0200
Subject: [PATCH 216/418] Fix narrow string compiling issue on MSVC2010

---
 src/server.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server.cpp b/src/server.cpp
index e9983ba11..639e6462a 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2757,7 +2757,7 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 				std::wstringstream ws;
 				ws << L"You cannot send more messages. You are limited to "
 				<< g_settings->getFloat("chat_message_limit_per_10sec")
-				<< " messages per 10 seconds.";
+				<< L" messages per 10 seconds.";
 				return ws.str();
 			}
 			case RPLAYER_CHATRESULT_KICK:
@@ -2770,7 +2770,7 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 
 	if (m_max_chatmessage_length > 0 && wmessage.length() > m_max_chatmessage_length) {
 		return L"Your message exceed the maximum chat message limit set on the server. "
-			"It was refused. Send a shorter message";
+			L"It was refused. Send a shorter message";
 	}
 
 	// Commands are implemented in Lua, so only catch invalid

From 155288ee981c70f505526347cb2bcda4df1c8e6b Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Thu, 6 Oct 2016 19:20:12 +0200
Subject: [PATCH 217/418] use unordered containers where possible (patch 4 on
 X)

Also remove some unused parameters/functions
---
 src/content_sao.cpp                 | 28 ++++++++++++++--------
 src/content_sao.h                   |  5 ++--
 src/guiFormSpecMenu.h               |  4 +---
 src/map.h                           |  1 +
 src/mapblock_mesh.cpp               | 24 ++++++++-----------
 src/mapblock_mesh.h                 | 15 ++++++------
 src/network/serverpackethandler.cpp |  4 +---
 src/script/cpp_api/s_async.cpp      |  3 ++-
 src/script/cpp_api/s_async.h        |  2 +-
 src/server.cpp                      | 21 +++++++---------
 src/server.h                        | 16 +++++--------
 src/util/numeric.cpp                |  2 +-
 src/util/numeric.h                  | 37 ++---------------------------
 13 files changed, 63 insertions(+), 99 deletions(-)

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 1e7e788e9..895c26044 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -347,8 +347,10 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 
 	if(m_bone_position_sent == false){
 		m_bone_position_sent = true;
-		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
-			std::string str = gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y);
+		for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+				ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
+			std::string str = gob_cmd_update_bone_position((*ii).first,
+					(*ii).second.X, (*ii).second.Y);
 			// create message and add to list
 			ActiveObjectMessage aom(getId(), true, str);
 			m_messages_out.push(aom);
@@ -383,8 +385,10 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 		os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
 		os<<serializeLongString(gob_cmd_update_animation(
 			m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
-		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
-			os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
+		for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+				ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
+			os << serializeLongString(gob_cmd_update_bone_position((*ii).first,
+					(*ii).second.X, (*ii).second.Y)); // m_bone_position.size
 		}
 		os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
 	}
@@ -862,7 +866,8 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 		os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
 		os<<serializeLongString(gob_cmd_update_animation(
 			m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
-		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
+		for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+				ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
 			os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
 		}
 		os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
@@ -1007,19 +1012,22 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		m_messages_out.push(aom);
 	}
 
-	if(m_bone_position_sent == false){
+	if (!m_bone_position_sent) {
 		m_bone_position_sent = true;
-		for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
-			std::string str = gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y);
+		for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+				ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
+			std::string str = gob_cmd_update_bone_position((*ii).first,
+					(*ii).second.X, (*ii).second.Y);
 			// create message and add to list
 			ActiveObjectMessage aom(getId(), true, str);
 			m_messages_out.push(aom);
 		}
 	}
 
-	if(m_attachment_sent == false){
+	if (!m_attachment_sent){
 		m_attachment_sent = true;
-		std::string str = gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation);
+		std::string str = gob_cmd_update_attachment(m_attachment_parent_id,
+				m_attachment_bone, m_attachment_position, m_attachment_rotation);
 		// create message and add to list
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push(aom);
diff --git a/src/content_sao.h b/src/content_sao.h
index 44d40d332..ccae90b77 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -112,7 +112,7 @@ private:
 	bool m_animation_loop;
 	bool m_animation_sent;
 
-	std::map<std::string, core::vector2d<v3f> > m_bone_position;
+	UNORDERED_MAP<std::string, core::vector2d<v3f> > m_bone_position;
 	bool m_bone_position_sent;
 
 	int m_attachment_parent_id;
@@ -321,7 +321,8 @@ private:
 	bool m_animation_loop;
 	bool m_animation_sent;
 
-	std::map<std::string, core::vector2d<v3f> > m_bone_position; // Stores position and rotation for each bone name
+	// Stores position and rotation for each bone name
+	UNORDERED_MAP<std::string, core::vector2d<v3f> > m_bone_position;
 	bool m_bone_position_sent;
 
 	int m_attachment_parent_id;
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 21054b725..153720975 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -409,8 +409,6 @@ protected:
 	std::vector<std::pair<FieldSpec, std::vector<std::string> > > m_dropdowns;
 
 	ItemSpec *m_selected_item;
-	f32 m_timer1;
-	f32 m_timer2;
 	u32 m_selected_amount;
 	bool m_selected_dragging;
 
@@ -462,7 +460,7 @@ private:
 		GUITable::TableOptions table_options;
 		GUITable::TableColumns table_columns;
 		// used to restore table selection/scroll/treeview state
-		std::map<std::string, GUITable::DynamicData> table_dyndata;
+		UNORDERED_MAP<std::string, GUITable::DynamicData> table_dyndata;
 	} parserData;
 
 	typedef struct {
diff --git a/src/map.h b/src/map.h
index 13775fde1..c73fa92bf 100644
--- a/src/map.h
+++ b/src/map.h
@@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "voxel.h"
 #include "modifiedstate.h"
 #include "util/container.h"
+#include "util/cpp11_container.h"
 #include "nodetimer.h"
 #include "map_settings_manager.h"
 
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index a11fb5887..00f83e7ab 100644
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -1033,7 +1033,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 	m_enable_shaders = data->m_use_shaders;
 	m_use_tangent_vertices = data->m_use_tangent_vertices;
 	m_enable_vbo = g_settings->getBool("enable_vbo");
-	
+
 	if (g_settings->getBool("enable_minimap")) {
 		m_minimap_mapblock = new MinimapMapblock;
 		m_minimap_mapblock->getMinimapNodes(
@@ -1298,10 +1298,8 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
 	// Cracks
 	if(crack != m_last_crack)
 	{
-		for(std::map<u32, std::string>::iterator
-				i = m_crack_materials.begin();
-				i != m_crack_materials.end(); ++i)
-		{
+		for (UNORDERED_MAP<u32, std::string>::iterator i = m_crack_materials.begin();
+				i != m_crack_materials.end(); ++i) {
 			scene::IMeshBuffer *buf = m_mesh->getMeshBuffer(i->first);
 			std::string basename = i->second;
 
@@ -1315,9 +1313,9 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
 
 			// If the current material is also animated,
 			// update animation info
-			std::map<u32, TileSpec>::iterator anim_iter =
-				m_animation_tiles.find(i->first);
-			if(anim_iter != m_animation_tiles.end()){
+			UNORDERED_MAP<u32, TileSpec>::iterator anim_iter =
+					m_animation_tiles.find(i->first);
+			if (anim_iter != m_animation_tiles.end()){
 				TileSpec &tile = anim_iter->second;
 				tile.texture = new_texture;
 				tile.texture_id = new_texture_id;
@@ -1330,10 +1328,8 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
 	}
 
 	// Texture animation
-	for(std::map<u32, TileSpec>::iterator
-			i = m_animation_tiles.begin();
-			i != m_animation_tiles.end(); ++i)
-	{
+	for (UNORDERED_MAP<u32, TileSpec>::iterator i = m_animation_tiles.begin();
+			i != m_animation_tiles.end(); ++i) {
 		const TileSpec &tile = i->second;
 		// Figure out current frame
 		int frameoffset = m_animation_frame_offsets[i->first];
@@ -1443,7 +1439,7 @@ void MeshCollector::append(const TileSpec &tile,
 				vertices[i].Color, vertices[i].TCoords);
 			p->vertices.push_back(vert);
 		}
-	} 
+	}
 
 	for (u32 i = 0; i < numIndices; i++) {
 		u32 j = indices[i] + vertex_count;
@@ -1499,7 +1495,7 @@ void MeshCollector::append(const TileSpec &tile,
 				vertices[i].Normal, c, vertices[i].TCoords);
 			p->vertices.push_back(vert);
 		}
-	} 
+	}
 
 	for (u32 i = 0; i < numIndices; i++) {
 		u32 j = indices[i] + vertex_count;
diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index f89fbe669..8376468da 100644
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "client/tile.h"
 #include "voxel.h"
+#include "util/cpp11_container.h"
 #include <map>
 
 class IGameDef;
@@ -121,7 +122,7 @@ public:
 		if(m_animation_force_timer > 0)
 			m_animation_force_timer--;
 	}
-	
+
 	void updateCameraOffset(v3s16 camera_offset);
 
 private:
@@ -144,20 +145,20 @@ private:
 	// Last crack value passed to animate()
 	int m_last_crack;
 	// Maps mesh buffer (i.e. material) indices to base texture names
-	std::map<u32, std::string> m_crack_materials;
+	UNORDERED_MAP<u32, std::string> m_crack_materials;
 
 	// Animation info: texture animationi
 	// Maps meshbuffers to TileSpecs
-	std::map<u32, TileSpec> m_animation_tiles;
-	std::map<u32, int> m_animation_frames; // last animation frame
-	std::map<u32, int> m_animation_frame_offsets;
-	
+	UNORDERED_MAP<u32, TileSpec> m_animation_tiles;
+	UNORDERED_MAP<u32, int> m_animation_frames; // last animation frame
+	UNORDERED_MAP<u32, int> m_animation_frame_offsets;
+
 	// Animation info: day/night transitions
 	// Last daynight_ratio value passed to animate()
 	u32 m_last_daynight_ratio;
 	// For each meshbuffer, maps vertex indices to (day,night) pairs
 	std::map<u32, std::map<u32, std::pair<u8, u8> > > m_daynight_diffs;
-	
+
 	// Camera offset info -> do we have to translate the mesh?
 	v3s16 m_camera_offset;
 };
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index a8bfd9068..f9061cc4f 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1693,9 +1693,7 @@ void Server::handleCommand_RemovedSounds(NetworkPacket* pkt)
 
 		*pkt >> id;
 
-		std::map<s32, ServerPlayingSound>::iterator i =
-			m_playing_sounds.find(id);
-
+		UNORDERED_MAP<s32, ServerPlayingSound>::iterator i = m_playing_sounds.find(id);
 		if (i == m_playing_sounds.end())
 			continue;
 
diff --git a/src/script/cpp_api/s_async.cpp b/src/script/cpp_api/s_async.cpp
index 9bf3fcf49..1fb84fab6 100644
--- a/src/script/cpp_api/s_async.cpp
+++ b/src/script/cpp_api/s_async.cpp
@@ -81,6 +81,7 @@ bool AsyncEngine::registerFunction(const char* name, lua_CFunction func)
 	if (initDone) {
 		return false;
 	}
+
 	functionList[name] = func;
 	return true;
 }
@@ -203,7 +204,7 @@ void AsyncEngine::pushFinishedJobs(lua_State* L) {
 /******************************************************************************/
 void AsyncEngine::prepareEnvironment(lua_State* L, int top)
 {
-	for (std::map<std::string, lua_CFunction>::iterator it = functionList.begin();
+	for (UNORDERED_MAP<std::string, lua_CFunction>::iterator it = functionList.begin();
 			it != functionList.end(); it++) {
 		lua_pushstring(L, it->first.c_str());
 		lua_pushcfunction(L, it->second);
diff --git a/src/script/cpp_api/s_async.h b/src/script/cpp_api/s_async.h
index 8d612d58c..016381e5f 100644
--- a/src/script/cpp_api/s_async.h
+++ b/src/script/cpp_api/s_async.h
@@ -132,7 +132,7 @@ private:
 	bool initDone;
 
 	// Internal store for registred functions
-	std::map<std::string, lua_CFunction> functionList;
+	UNORDERED_MAP<std::string, lua_CFunction> functionList;
 
 	// Internal counter to create job IDs
 	unsigned int jobIdCounter;
diff --git a/src/server.cpp b/src/server.cpp
index 639e6462a..2dd070b1a 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -868,7 +868,7 @@ void Server::AsyncRunStep(bool initial_step)
 		m_clients.unlock();
 
 		// Clear buffered_messages
-		for(UNORDERED_MAP<u16, std::vector<ActiveObjectMessage>* >::iterator
+		for (UNORDERED_MAP<u16, std::vector<ActiveObjectMessage>* >::iterator
 				i = buffered_messages.begin();
 				i != buffered_messages.end(); ++i) {
 			delete i->second;
@@ -2016,16 +2016,15 @@ s32 Server::playSound(const SimpleSoundSpec &spec,
 void Server::stopSound(s32 handle)
 {
 	// Get sound reference
-	std::map<s32, ServerPlayingSound>::iterator i =
-			m_playing_sounds.find(handle);
-	if(i == m_playing_sounds.end())
+	UNORDERED_MAP<s32, ServerPlayingSound>::iterator i = m_playing_sounds.find(handle);
+	if (i == m_playing_sounds.end())
 		return;
 	ServerPlayingSound &psound = i->second;
 
 	NetworkPacket pkt(TOCLIENT_STOP_SOUND, 4);
 	pkt << handle;
 
-	for(std::set<u16>::iterator i = psound.clients.begin();
+	for (UNORDERED_SET<u16>::iterator i = psound.clients.begin();
 			i != psound.clients.end(); ++i) {
 		// Send as reliable
 		m_clients.send(*i, 0, &pkt, true);
@@ -2322,7 +2321,7 @@ void Server::sendMediaAnnouncement(u16 peer_id)
 	NetworkPacket pkt(TOCLIENT_ANNOUNCE_MEDIA, 0, peer_id);
 	pkt << (u16) m_media.size();
 
-	for (std::map<std::string, MediaInfo>::iterator i = m_media.begin();
+	for (UNORDERED_MAP<std::string, MediaInfo>::iterator i = m_media.begin();
 			i != m_media.end(); ++i) {
 		pkt << i->first << i->second.sha1_digest;
 	}
@@ -2367,7 +2366,7 @@ void Server::sendRequestedMedia(u16 peer_id,
 			i != tosend.end(); ++i) {
 		const std::string &name = *i;
 
-		if(m_media.find(name) == m_media.end()) {
+		if (m_media.find(name) == m_media.end()) {
 			errorstream<<"Server::sendRequestedMedia(): Client asked for "
 					<<"unknown file \""<<(name)<<"\""<<std::endl;
 			continue;
@@ -2628,13 +2627,11 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 		/*
 			Clear references to playing sounds
 		*/
-		for(std::map<s32, ServerPlayingSound>::iterator
-				i = m_playing_sounds.begin();
-				i != m_playing_sounds.end();)
-		{
+		for (UNORDERED_MAP<s32, ServerPlayingSound>::iterator
+				 i = m_playing_sounds.begin(); i != m_playing_sounds.end();) {
 			ServerPlayingSound &psound = i->second;
 			psound.clients.erase(peer_id);
-			if(psound.clients.empty())
+			if (psound.clients.empty())
 				m_playing_sounds.erase(i++);
 			else
 				++i;
diff --git a/src/server.h b/src/server.h
index 3ad894b38..34427a71a 100644
--- a/src/server.h
+++ b/src/server.h
@@ -157,7 +157,7 @@ struct ServerSoundParams
 struct ServerPlayingSound
 {
 	ServerSoundParams params;
-	std::set<u16> clients; // peer ids
+	UNORDERED_SET<u16> clients; // peer ids
 };
 
 class Server : public con::PeerHandler, public MapEventReceiver,
@@ -243,11 +243,9 @@ public:
 	std::wstring getStatusString();
 
 	// read shutdown state
-	inline bool getShutdownRequested()
-			{ return m_shutdown_requested; }
+	inline bool getShutdownRequested() const { return m_shutdown_requested; }
 
 	// request server to shutdown
-	inline void requestShutdown() { m_shutdown_requested = true; }
 	void requestShutdown(const std::string &msg, bool reconnect)
 	{
 		m_shutdown_requested = true;
@@ -323,8 +321,7 @@ public:
 	const ModSpec* getModSpec(const std::string &modname) const;
 	void getModNames(std::vector<std::string> &modlist);
 	std::string getBuiltinLuaPath();
-	inline std::string getWorldPath() const
-			{ return m_path_world; }
+	inline std::string getWorldPath() const { return m_path_world; }
 
 	inline bool isSingleplayer()
 			{ return m_simple_singleplayer_mode; }
@@ -356,8 +353,7 @@ public:
 	bool setSky(Player *player, const video::SColor &bgcolor,
 			const std::string &type, const std::vector<std::string> &params);
 
-	bool overrideDayNightRatio(Player *player, bool do_override,
-			float brightness);
+	bool overrideDayNightRatio(Player *player, bool do_override, float brightness);
 
 	/* con::PeerHandler implementation. */
 	void peerAdded(con::Peer *peer);
@@ -654,12 +650,12 @@ private:
 	u16 m_ignore_map_edit_events_peer_id;
 
 	// media files known to server
-	std::map<std::string,MediaInfo> m_media;
+	UNORDERED_MAP<std::string, MediaInfo> m_media;
 
 	/*
 		Sounds
 	*/
-	std::map<s32, ServerPlayingSound> m_playing_sounds;
+	UNORDERED_MAP<s32, ServerPlayingSound> m_playing_sounds;
 	s32 m_next_sound_id;
 
 	/*
diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp
index 42ebd9022..6a7bfcac9 100644
--- a/src/util/numeric.cpp
+++ b/src/util/numeric.cpp
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string.h>
 #include <iostream>
 
-std::map<u16, std::vector<v3s16> > FacePositionCache::m_cache;
+UNORDERED_MAP<u16, std::vector<v3s16> > FacePositionCache::m_cache;
 Mutex FacePositionCache::m_cache_mutex;
 // Calculate the borders of a "d-radius" cube
 // TODO: Make it work without mutex and data races, probably thread-local
diff --git a/src/util/numeric.h b/src/util/numeric.h
index 615327864..4cdc254c3 100644
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -26,8 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "../irr_v3d.h"
 #include "../irr_aabb3d.h"
 #include "../threading/mutex.h"
+#include "cpp11_container.h"
 #include <list>
-#include <map>
 #include <vector>
 
 
@@ -41,26 +41,10 @@ public:
 	static std::vector<v3s16> getFacePositions(u16 d);
 private:
 	static void generateFacePosition(u16 d);
-	static std::map<u16, std::vector<v3s16> > m_cache;
+	static UNORDERED_MAP<u16, std::vector<v3s16> > m_cache;
 	static Mutex m_cache_mutex;
 };
 
-class IndentationRaiser
-{
-public:
-	IndentationRaiser(u16 *indentation)
-	{
-		m_indentation = indentation;
-		(*m_indentation)++;
-	}
-	~IndentationRaiser()
-	{
-		(*m_indentation)--;
-	}
-private:
-	u16 *m_indentation;
-};
-
 inline s16 getContainerPos(s16 p, s16 d)
 {
 	return (p>=0 ? p : p-d+1) / d;
@@ -149,23 +133,6 @@ inline bool isInArea(v3s16 p, v3s16 d)
 #define rangelim(d, min, max) ((d) < (min) ? (min) : ((d)>(max)?(max):(d)))
 #define myfloor(x) ((x) > 0.0 ? (int)(x) : (int)(x) - 1)
 
-inline v3s16 arealim(v3s16 p, s16 d)
-{
-	if(p.X < 0)
-		p.X = 0;
-	if(p.Y < 0)
-		p.Y = 0;
-	if(p.Z < 0)
-		p.Z = 0;
-	if(p.X > d-1)
-		p.X = d-1;
-	if(p.Y > d-1)
-		p.Y = d-1;
-	if(p.Z > d-1)
-		p.Z = d-1;
-	return p;
-}
-
 // The naive swap performs better than the xor version
 #define SWAP(t, x, y) do { \
 	t temp = x;            \

From 0a16e53b40d347db7dcd04cb694d0f8f2ed1a5a7 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 6 Oct 2016 21:13:04 +0200
Subject: [PATCH 218/418] Fix C++11 Windows build of threading code

	The initial problem was that mutex_auto_lock.h tries to use std::unique_lock<std::mutex>
	despite mutex.h not using C++11's std::mutex on Windows. The problem here is the mismatch
	between C++11 usage conditions of the two headers. This commit moves the decision logic
	to threads.h and makes sure mutex.h, mutex_auto_lock.h and event.h all use the same features.
---
 src/threading/event.cpp         | 16 ++++++++--------
 src/threading/event.h           | 17 ++++++-----------
 src/threading/mutex.cpp         | 19 +++++++++----------
 src/threading/mutex.h           | 15 ++++++++-------
 src/threading/mutex_auto_lock.h |  4 +++-
 src/threading/thread.cpp        | 20 ++++++++++----------
 src/threading/thread.h          | 13 ++++---------
 src/threads.h                   | 18 +++++++++++++++++-
 8 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/src/threading/event.cpp b/src/threading/event.cpp
index 165f9d83f..0d5928f10 100644
--- a/src/threading/event.cpp
+++ b/src/threading/event.cpp
@@ -27,8 +27,8 @@ DEALINGS IN THE SOFTWARE.
 
 Event::Event()
 {
-#if __cplusplus < 201103L
-#	ifdef _WIN32
+#ifndef USE_CPP11_MUTEX
+#	if USE_WIN_MUTEX
 	event = CreateEvent(NULL, false, false, NULL);
 #	else
 	pthread_cond_init(&cv, NULL);
@@ -38,10 +38,10 @@ Event::Event()
 #endif
 }
 
-#if __cplusplus < 201103L
+#ifndef USE_CPP11_MUTEX
 Event::~Event()
 {
-#ifdef _WIN32
+#if USE_WIN_MUTEX
 	CloseHandle(event);
 #else
 	pthread_cond_destroy(&cv);
@@ -53,13 +53,13 @@ Event::~Event()
 
 void Event::wait()
 {
-#if __cplusplus >= 201103L
+#if USE_CPP11_MUTEX
 	MutexAutoLock lock(mutex);
 	while (!notified) {
 		cv.wait(lock);
 	}
 	notified = false;
-#elif defined(_WIN32)
+#elif USE_WIN_MUTEX
 	WaitForSingleObject(event, INFINITE);
 #else
 	pthread_mutex_lock(&mutex);
@@ -74,11 +74,11 @@ void Event::wait()
 
 void Event::signal()
 {
-#if __cplusplus >= 201103L
+#if USE_CPP11_MUTEX
 	MutexAutoLock lock(mutex);
 	notified = true;
 	cv.notify_one();
-#elif defined(_WIN32)
+#elif USE_WIN_MUTEX
 	SetEvent(event);
 #else
 	pthread_mutex_lock(&mutex);
diff --git a/src/threading/event.h b/src/threading/event.h
index dd5164576..26cb8997a 100644
--- a/src/threading/event.h
+++ b/src/threading/event.h
@@ -26,17 +26,12 @@ DEALINGS IN THE SOFTWARE.
 #ifndef THREADING_EVENT_H
 #define THREADING_EVENT_H
 
-#if __cplusplus >= 201103L
+#include "threads.h"
+
+#if USE_CPP11_MUTEX
 	#include <condition_variable>
 	#include "threading/mutex.h"
 	#include "threading/mutex_auto_lock.h"
-#elif defined(_WIN32)
-	#ifndef WIN32_LEAN_AND_MEAN
-		#define WIN32_LEAN_AND_MEAN
-	#endif
-	#include <windows.h>
-#else
-	#include <pthread.h>
 #endif
 
 
@@ -49,18 +44,18 @@ DEALINGS IN THE SOFTWARE.
 class Event {
 public:
 	Event();
-#if __cplusplus < 201103L
+#ifndef USE_CPP11_MUTEX
 	~Event();
 #endif
 	void wait();
 	void signal();
 
 private:
-#if __cplusplus >= 201103L
+#if USE_CPP11_MUTEX
 	std::condition_variable cv;
 	Mutex mutex;
 	bool notified;
-#elif defined(_WIN32)
+#elif USE_WIN_MUTEX
 	HANDLE event;
 #else
 	pthread_cond_t cv;
diff --git a/src/threading/mutex.cpp b/src/threading/mutex.cpp
index f2b07bec3..0908b5d37 100644
--- a/src/threading/mutex.cpp
+++ b/src/threading/mutex.cpp
@@ -23,14 +23,13 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-// Windows std::mutex is much slower than the critical section API
-#if __cplusplus < 201103L || defined(_WIN32)
+#include "threads.h"
+
+#ifndef USE_CPP11_MUTEX
 
 #include "threading/mutex.h"
 
-#ifndef _WIN32
-	#include <cassert>
-#endif
+#include <cassert>
 
 #define UNUSED(expr) do { (void)(expr); } while (0)
 
@@ -47,7 +46,7 @@ Mutex::Mutex(bool recursive)
 
 void Mutex::init_mutex(bool recursive)
 {
-#ifdef _WIN32
+#if USE_WIN_MUTEX
 	// Windows critical sections are recursive by default
 	UNUSED(recursive);
 
@@ -69,7 +68,7 @@ void Mutex::init_mutex(bool recursive)
 
 Mutex::~Mutex()
 {
-#ifdef _WIN32
+#if USE_WIN_MUTEX
 	DeleteCriticalSection(&mutex);
 #else
 	int ret = pthread_mutex_destroy(&mutex);
@@ -80,7 +79,7 @@ Mutex::~Mutex()
 
 void Mutex::lock()
 {
-#ifdef _WIN32
+#if USE_WIN_MUTEX
 	EnterCriticalSection(&mutex);
 #else
 	int ret = pthread_mutex_lock(&mutex);
@@ -91,7 +90,7 @@ void Mutex::lock()
 
 void Mutex::unlock()
 {
-#ifdef _WIN32
+#if USE_WIN_MUTEX
 	LeaveCriticalSection(&mutex);
 #else
 	int ret = pthread_mutex_unlock(&mutex);
@@ -104,5 +103,5 @@ RecursiveMutex::RecursiveMutex()
 	: Mutex(true)
 {}
 
-#endif
+#endif // C++11
 
diff --git a/src/threading/mutex.h b/src/threading/mutex.h
index dadbd050c..fb5c029fc 100644
--- a/src/threading/mutex.h
+++ b/src/threading/mutex.h
@@ -26,14 +26,15 @@ DEALINGS IN THE SOFTWARE.
 #ifndef THREADING_MUTEX_H
 #define THREADING_MUTEX_H
 
-// Windows std::mutex is much slower than the critical section API
-#if __cplusplus >= 201103L && !defined(_WIN32)
+#include "threads.h"
+
+#if USE_CPP11_MUTEX
 	#include <mutex>
 	using Mutex = std::mutex;
 	using RecursiveMutex = std::recursive_mutex;
 #else
 
-#ifdef _WIN32
+#if USE_WIN_MUTEX
 	#ifndef _WIN32_WINNT
 		#define _WIN32_WINNT 0x0501
 	#endif
@@ -41,7 +42,7 @@ DEALINGS IN THE SOFTWARE.
 		#define WIN32_LEAN_AND_MEAN
 	#endif
 	#include <windows.h>
-#else // pthread
+#else
 	#include <pthread.h>
 #endif
 
@@ -59,9 +60,9 @@ protected:
 	Mutex(bool recursive);
 	void init_mutex(bool recursive);
 private:
-#ifdef _WIN32
+#if USE_WIN_MUTEX
 	CRITICAL_SECTION mutex;
-#else // pthread
+#else
 	pthread_mutex_t mutex;
 #endif
 
@@ -76,6 +77,6 @@ public:
 	DISABLE_CLASS_COPY(RecursiveMutex);
 };
 
-#endif  // C++11
+#endif // C++11
 
 #endif
diff --git a/src/threading/mutex_auto_lock.h b/src/threading/mutex_auto_lock.h
index 25caf7e14..d79c68a93 100644
--- a/src/threading/mutex_auto_lock.h
+++ b/src/threading/mutex_auto_lock.h
@@ -26,7 +26,9 @@ DEALINGS IN THE SOFTWARE.
 #ifndef THREADING_MUTEX_AUTO_LOCK_H
 #define THREADING_MUTEX_AUTO_LOCK_H
 
-#if __cplusplus >= 201103L
+#include "threads.h"
+
+#if USE_CPP11_MUTEX
 	#include <mutex>
 	using MutexAutoLock = std::unique_lock<std::mutex>;
 	using RecursiveMutexAutoLock = std::unique_lock<std::recursive_mutex>;
diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp
index 0cd536795..fbe4ba1f3 100644
--- a/src/threading/thread.cpp
+++ b/src/threading/thread.cpp
@@ -198,7 +198,7 @@ bool Thread::kill()
 
 	m_running = false;
 
-#ifdef _WIN32
+#if USE_WIN_THREADS
 	TerminateThread(m_thread_handle, 0);
 	CloseHandle(m_thread_handle);
 #else
@@ -310,10 +310,16 @@ void Thread::setName(const std::string &name)
 
 unsigned int Thread::getNumberOfProcessors()
 {
-#if __cplusplus >= 201103L
+#if USE_CPP11_THREADS
 
 	return std::thread::hardware_concurrency();
 
+#elif USE_WIN_THREADS
+
+	SYSTEM_INFO sysinfo;
+	GetSystemInfo(&sysinfo);
+	return sysinfo.dwNumberOfProcessors;
+
 #elif defined(_SC_NPROCESSORS_ONLN)
 
 	return sysconf(_SC_NPROCESSORS_ONLN);
@@ -335,12 +341,6 @@ unsigned int Thread::getNumberOfProcessors()
 
 	return get_nprocs();
 
-#elif defined(_WIN32)
-
-	SYSTEM_INFO sysinfo;
-	GetSystemInfo(&sysinfo);
-	return sysinfo.dwNumberOfProcessors;
-
 #elif defined(PTW32_VERSION) || defined(__hpux)
 
 	return pthread_num_processors_np();
@@ -359,7 +359,7 @@ bool Thread::bindToProcessor(unsigned int proc_number)
 
 	return false;
 
-#elif defined(_WIN32)
+#elif USE_WIN_THREADS
 
 	return SetThreadAffinityMask(getThreadHandle(), 1 << proc_number);
 
@@ -407,7 +407,7 @@ bool Thread::bindToProcessor(unsigned int proc_number)
 
 bool Thread::setPriority(int prio)
 {
-#if defined(_WIN32)
+#if USE_WIN_THREADS
 
 	return SetThreadPriority(getThreadHandle(), prio);
 
diff --git a/src/threading/thread.h b/src/threading/thread.h
index de800ecb7..14a0e13ab 100644
--- a/src/threading/thread.h
+++ b/src/threading/thread.h
@@ -32,9 +32,6 @@ DEALINGS IN THE SOFTWARE.
 #include "threads.h"
 
 #include <string>
-#if USE_CPP11_THREADS
-	#include <thread> // for std::thread
-#endif
 #ifdef _AIX
 	#include <sys/thread.h> // for tid_t
 #endif
@@ -157,9 +154,11 @@ private:
 	Atomic<bool> m_running;
 	Mutex m_mutex;
 
-#ifndef USE_CPP11_THREADS
+#if USE_CPP11_THREADS
+	std::thread *m_thread_obj;
+#else
 	threadhandle_t m_thread_handle;
-#   if _WIN32
+#   if USE_WIN_THREADS
         threadid_t m_thread_id;
 #   endif
 #endif
@@ -172,10 +171,6 @@ private:
 	tid_t m_kernel_thread_id;
 #endif
 
-#if USE_CPP11_THREADS
-	std::thread *m_thread_obj;
-#endif
-
 	DISABLE_CLASS_COPY(Thread);
 };
 
diff --git a/src/threads.h b/src/threads.h
index d4306f631..ce98593cd 100644
--- a/src/threads.h
+++ b/src/threads.h
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define THREADS_HEADER
 
 //
-// Determine which threading API we will use
+// Determine which threading APIs we will use
 //
 #if __cplusplus >= 201103L
 	#define USE_CPP11_THREADS 1
@@ -31,11 +31,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#define USE_POSIX_THREADS 1
 #endif
 
+#if defined(_WIN32)
+	// Prefer critical section API because std::mutex is much slower on Windows
+	#define USE_WIN_MUTEX 1
+#elif __cplusplus >= 201103L
+	#define USE_CPP11_MUTEX 1
+#else
+	#define USE_POSIX_MUTEX 1
+#endif
+
 ///////////////
 
 
 #if USE_CPP11_THREADS
 	#include <thread>
+#elif USE_POSIX_THREADS
+	#include <pthread.h>
+#else
+	#ifndef WIN32_LEAN_AND_MEAN
+		#define WIN32_LEAN_AND_MEAN
+	#endif
+	#include <windows.h>
 #endif
 
 #include "threading/mutex.h"

From d4a2e23793d2260f263396480b6552a37c8ebf6b Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Sun, 17 Jul 2016 22:26:23 +0200
Subject: [PATCH 219/418] Textures: Ignore unknown node in override.txt

---
 src/nodedef.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index bfb2999bd..fa2e621f2 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -1144,13 +1144,8 @@ void CNodeDefManager::applyTextureOverrides(const std::string &override_filepath
 		}
 
 		content_t id;
-		if (!getId(splitted[0], id)) {
-			infostream << override_filepath
-				<< ":" << line_c << " Could not apply texture override \""
-				<< line << "\": Unknown node \""
-				<< splitted[0] << "\"" << std::endl;
-			continue;
-		}
+		if (!getId(splitted[0], id))
+			continue; // Ignore unknown node
 
 		ContentFeatures &nodedef = m_content_features[id];
 

From 0264e38bff12a3c6b81231ac1f6cd281179df744 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Thu, 6 Oct 2016 23:03:55 +0100
Subject: [PATCH 220/418] Lua_api.txt: Add biome and nodeupdate documentation

Add missing documentation for 'register_biome' and
'clear_registered_biomes'.
Add documentation for 'nodeupdate_single'. 'nodeupdate'
is not yet documented due to a bug it causes.
---
 doc/lua_api.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index c82027148..74469e535 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1935,13 +1935,14 @@ Call these functions only at load time!
     * Warning! The type field ("shaped","cooking" or any other) will be ignored if the recipe
       contains output. Erasing is then done independently from the crafting method.
 * `minetest.register_ore(ore definition)`
+* `minetest.register_biome(biome definition)`
 * `minetest.register_decoration(decoration definition)`
 * `minetest.override_item(name, redefinition)`
     * Overrides fields of an item registered with register_node/tool/craftitem.
     * Note: Item must already be defined, (opt)depend on the mod defining it.
     * Example: `minetest.override_item("default:mese", {light_source=LIGHT_MAX})`
-
 * `minetest.clear_registered_ores()`
+* `minetest.clear_registered_biomes()`
 * `minetest.clear_registered_decorations()`
 
 ### Global callback registration functions
@@ -2270,6 +2271,11 @@ and `minetest.auth_reload` call the authetification handler.
     * increase level of leveled node by level, default `level` equals `1`
     * if `totallevel > maxlevel`, returns rest (`total-max`)
     * can be negative for decreasing
+* `nodeupdate_single(pos)`
+    * causes an unsupported `group:falling_node` node to fall and causes an
+      unattached `group:attached_node` node to fall.
+    * does not spread these updates to neighbours
+    * a helper function, not officially part of the API, but useful
 
 ### Inventory
 `minetest.get_inventory(location)`: returns an `InvRef`

From 8bcd10b872bc88c6f474913d6efb8d53c50c5ae1 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 8 Oct 2016 10:38:04 +0200
Subject: [PATCH 221/418] Player/LocalPlayer/RemotePlayer inheritance cleanup
 (part 1 on X)

* LocalPlayer take ownership of maxHudId as it's the only caller
* RemotePlayer take ownership of day night ratio as it's the only user
* Pass getPlayerControl as const reference to prevent object copy on each call (perf improvement in ObjectRef::l_get_player_control call)
* getPlayerSAO is now only RemotePlayer call
* get/setHotbarItemCount is now RemotePlayer owned
* Server: Use RemotePlayer instead of Player object on concerned call to properly fix the object type
* PlayerSAO now uses RemotePlayer instead of Player because it's only server side
* ObjectRef::getplayer also returns RemotePlayer as it's linked with PlayerSAO
---
 src/content_sao.cpp                 |  7 ++--
 src/content_sao.h                   | 14 ++-----
 src/game.cpp                        |  2 +-
 src/localplayer.h                   |  2 +
 src/network/clientpackethandler.cpp |  6 +--
 src/network/serverpackethandler.cpp | 31 +++++++++++----
 src/player.h                        | 62 +++++++++++------------------
 src/script/lua_api/l_env.cpp        |  4 +-
 src/script/lua_api/l_object.cpp     | 16 ++++----
 src/script/lua_api/l_object.h       |  3 +-
 src/server.cpp                      | 52 +++++++++++-------------
 src/server.h                        | 13 +++---
 12 files changed, 103 insertions(+), 109 deletions(-)

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 895c26044..2317cbdfe 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -751,7 +751,7 @@ bool LuaEntitySAO::collideWithObjects(){
 
 // No prototype, PlayerSAO does not need to be deserialized
 
-PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
+PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_,
 		const std::set<std::string> &privs, bool is_singleplayer):
 	ServerActiveObject(env_, v3f(0,0,0)),
 	m_player(player_),
@@ -833,11 +833,10 @@ void PlayerSAO::addedToEnvironment(u32 dtime_s)
 void PlayerSAO::removingFromEnvironment()
 {
 	ServerActiveObject::removingFromEnvironment();
-	if(m_player->getPlayerSAO() == this)
-	{
+	if (m_player->getPlayerSAO() == this) {
 		m_player->setPlayerSAO(NULL);
 		m_player->peer_id = 0;
-		m_env->savePlayer((RemotePlayer*)m_player);
+		m_env->savePlayer(m_player);
 		m_env->removePlayer(m_player);
 	}
 }
diff --git a/src/content_sao.h b/src/content_sao.h
index ccae90b77..c97db4922 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -160,7 +160,7 @@ public:
 class PlayerSAO : public ServerActiveObject
 {
 public:
-	PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
+	PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_,
 			const std::set<std::string> &privs, bool is_singleplayer);
 	~PlayerSAO();
 	ActiveObjectType getType() const
@@ -231,14 +231,8 @@ public:
 
 	void disconnected();
 
-	Player* getPlayer()
-	{
-		return m_player;
-	}
-	u16 getPeerID() const
-	{
-		return m_peer_id;
-	}
+	RemotePlayer* getPlayer() { return m_player; }
+	u16 getPeerID() const { return m_peer_id; }
 
 	// Cheat prevention
 
@@ -291,7 +285,7 @@ public:
 private:
 	std::string getPropertyPacket();
 
-	Player *m_player;
+	RemotePlayer *m_player;
 	u16 m_peer_id;
 	Inventory *m_inventory;
 	s16 m_damage;
diff --git a/src/game.cpp b/src/game.cpp
index 22d9ffef6..5bb08e27a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2851,7 +2851,7 @@ void Game::processItemSelection(u16 *new_playeritem)
 
 	s32 wheel = input->getMouseWheel();
 	u16 max_item = MYMIN(PLAYER_INVENTORY_SIZE - 1,
-		                 player->hud_hotbar_itemcount - 1);
+		    player->hud_hotbar_itemcount - 1);
 
 	s32 dir = wheel;
 
diff --git a/src/localplayer.h b/src/localplayer.h
index 3ae0c4e51..8897adc5e 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -80,6 +80,8 @@ public:
 		m_cao = toset;
 	}
 
+	u32 maxHudId() const { return hud.size(); }
+
 private:
 	void accelerateHorizontal(const v3f &target_speed, const f32 max_increase);
 	void accelerateVertical(const v3f &target_speed, const f32 max_increase);
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 6d42edd7d..35e350f20 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -1122,7 +1122,7 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt)
 
 	*pkt >> param >> value;
 
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
 	if (param == HUD_PARAM_HOTBAR_ITEMCOUNT && value.size() == 4) {
@@ -1131,10 +1131,10 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt)
 			player->hud_hotbar_itemcount = hotbar_itemcount;
 	}
 	else if (param == HUD_PARAM_HOTBAR_IMAGE) {
-		((LocalPlayer *) player)->hotbar_image = value;
+		player->hotbar_image = value;
 	}
 	else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) {
-		((LocalPlayer *) player)->hotbar_selected_image = value;
+		player->hotbar_selected_image = value;
 	}
 }
 
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index f9061cc4f..3fba7f720 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -800,7 +800,8 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
 	pitch = modulo360f(pitch);
 	yaw = modulo360f(yaw);
 
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player =
+		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -879,7 +880,9 @@ void Server::handleCommand_DeletedBlocks(NetworkPacket* pkt)
 
 void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
 {
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player =
+		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -1078,7 +1081,9 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
 
 	*pkt >> damage;
 
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player =
+		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -1112,7 +1117,9 @@ void Server::handleCommand_Breath(NetworkPacket* pkt)
 
 	*pkt >> breath;
 
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player =
+		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -1224,7 +1231,9 @@ void Server::handleCommand_PlayerItem(NetworkPacket* pkt)
 	if (pkt->getSize() < 2)
 		return;
 
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player =
+		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -1299,7 +1308,9 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 	verbosestream << "TOSERVER_INTERACT: action=" << (int)action << ", item="
 			<< item_i << ", pointed=" << pointed.dump() << std::endl;
 
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player =
+		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -1719,7 +1730,9 @@ void Server::handleCommand_NodeMetaFields(NetworkPacket* pkt)
 		fields[fieldname] = pkt->readLongString();
 	}
 
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player =
+		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -1769,7 +1782,9 @@ void Server::handleCommand_InventoryFields(NetworkPacket* pkt)
 		fields[fieldname] = pkt->readLongString();
 	}
 
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player =
+		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
diff --git a/src/player.h b/src/player.h
index f38effa9d..fbd88fc71 100644
--- a/src/player.h
+++ b/src/player.h
@@ -233,16 +233,6 @@ public:
 		return size;
 	}
 
-	void setHotbarItemcount(s32 hotbar_itemcount)
-	{
-		hud_hotbar_itemcount = hotbar_itemcount;
-	}
-
-	s32 getHotbarItemcount()
-	{
-		return hud_hotbar_itemcount;
-	}
-
 	void setHotbarImage(const std::string &name)
 	{
 		hud_hotbar_image = name;
@@ -278,18 +268,6 @@ public:
 		*params = m_sky_params;
 	}
 
-	void overrideDayNightRatio(bool do_override, float ratio)
-	{
-		m_day_night_ratio_do_override = do_override;
-		m_day_night_ratio = ratio;
-	}
-
-	void getDayNightRatio(bool *do_override, float *ratio)
-	{
-		*do_override = m_day_night_ratio_do_override;
-		*ratio = m_day_night_ratio;
-	}
-
 	void setLocalAnimations(v2s32 frames[4], float frame_speed)
 	{
 		for (int i = 0; i < 4; i++)
@@ -309,11 +287,6 @@ public:
 		return false;
 	}
 
-	virtual PlayerSAO *getPlayerSAO()
-	{
-		return NULL;
-	}
-
 	virtual void setPlayerSAO(PlayerSAO *sao)
 	{
 		FATAL_ERROR("FIXME");
@@ -335,7 +308,7 @@ public:
 	void setModified(const bool x)
 	{
 		m_dirty = x;
-		if (x == false)
+		if (!x)
 			inventory.setModified(x);
 	}
 
@@ -391,10 +364,7 @@ public:
 	std::string inventory_formspec;
 
 	PlayerControl control;
-	PlayerControl getPlayerControl()
-	{
-		return control;
-	}
+	const PlayerControl& getPlayerControl() { return control; }
 
 	u32 keyPressed;
 
@@ -403,9 +373,6 @@ public:
 	u32         addHud(HudElement* hud);
 	HudElement* removeHud(u32 id);
 	void        clearHud();
-	u32         maxHudId() {
-		return hud.size();
-	}
 
 	u32 hud_flags;
 	s32 hud_hotbar_itemcount;
@@ -429,9 +396,6 @@ protected:
 	std::string m_sky_type;
 	video::SColor m_sky_bgcolor;
 	std::vector<std::string> m_sky_params;
-
-	bool m_day_night_ratio_do_override;
-	float m_day_night_ratio;
 private:
 	// Protect some critical areas
 	// hud for example can be modified by EmergeThread
@@ -463,6 +427,25 @@ public:
 
 	const RemotePlayerChatResult canSendChatMessage();
 
+	void setHotbarItemcount(s32 hotbar_itemcount)
+	{
+		hud_hotbar_itemcount = hotbar_itemcount;
+	}
+
+	s32 getHotbarItemcount() const { return hud_hotbar_itemcount; }
+
+	void overrideDayNightRatio(bool do_override, float ratio)
+	{
+		m_day_night_ratio_do_override = do_override;
+		m_day_night_ratio = ratio;
+	}
+
+	void getDayNightRatio(bool *do_override, float *ratio)
+	{
+		*do_override = m_day_night_ratio_do_override;
+		*ratio = m_day_night_ratio;
+	}
+
 private:
 	PlayerSAO *m_sao;
 
@@ -473,6 +456,9 @@ private:
 	u32 m_last_chat_message_sent;
 	float m_chat_message_allowance;
 	u16 m_message_rate_overhead;
+
+	bool m_day_night_ratio_do_override;
+	float m_day_night_ratio;
 };
 
 #endif
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index ebdea09e4..f6ea23e95 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -494,8 +494,8 @@ int ModApiEnvMod::l_get_player_by_name(lua_State *L)
 
 	// Do it
 	const char *name = luaL_checkstring(L, 1);
-	Player *player = env->getPlayer(name);
-	if(player == NULL){
+	RemotePlayer *player = dynamic_cast<RemotePlayer *>(env->getPlayer(name));
+	if (player == NULL){
 		lua_pushnil(L);
 		return 1;
 	}
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index befae4253..4e1a1c159 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -107,7 +107,7 @@ PlayerSAO* ObjectRef::getplayersao(ObjectRef *ref)
 	return (PlayerSAO*)obj;
 }
 
-Player* ObjectRef::getplayer(ObjectRef *ref)
+RemotePlayer* ObjectRef::getplayer(ObjectRef *ref)
 {
 	PlayerSAO *playersao = getplayersao(ref);
 	if (playersao == NULL)
@@ -1212,8 +1212,8 @@ int ObjectRef::l_get_player_control(lua_State *L)
 		lua_pushlstring(L, "", 0);
 		return 1;
 	}
-	// Do it
-	PlayerControl control = player->getPlayerControl();
+
+	const PlayerControl &control = player->getPlayerControl();
 	lua_newtable(L);
 	lua_pushboolean(L, control.up);
 	lua_setfield(L, -2, "up");
@@ -1467,7 +1467,7 @@ int ObjectRef::l_hud_set_flags(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1519,7 +1519,7 @@ int ObjectRef::l_hud_set_hotbar_itemcount(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1537,7 +1537,7 @@ int ObjectRef::l_hud_get_hotbar_itemcount(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1677,7 +1677,7 @@ int ObjectRef::l_override_day_night_ratio(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1700,7 +1700,7 @@ int ObjectRef::l_get_day_night_ratio(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
diff --git a/src/script/lua_api/l_object.h b/src/script/lua_api/l_object.h
index a37d29535..a7ac9dff9 100644
--- a/src/script/lua_api/l_object.h
+++ b/src/script/lua_api/l_object.h
@@ -27,6 +27,7 @@ class ServerActiveObject;
 class LuaEntitySAO;
 class PlayerSAO;
 class Player;
+class RemotePlayer;
 
 /*
 	ObjectRef
@@ -47,7 +48,7 @@ private:
 
 	static PlayerSAO* getplayersao(ObjectRef *ref);
 
-	static Player* getplayer(ObjectRef *ref);
+	static RemotePlayer* getplayer(ObjectRef *ref);
 
 	// Exported functions
 
diff --git a/src/server.cpp b/src/server.cpp
index 2dd070b1a..11ffba343 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1256,7 +1256,7 @@ Inventory* Server::getInventory(const InventoryLocation &loc)
 		break;
 	case InventoryLocation::PLAYER:
 	{
-		Player *player = m_env->getPlayer(loc.name.c_str());
+		RemotePlayer *player = dynamic_cast<RemotePlayer *>(m_env->getPlayer(loc.name.c_str()));
 		if(!player)
 			return NULL;
 		PlayerSAO *playersao = player->getPlayerSAO();
@@ -1296,9 +1296,12 @@ void Server::setInventoryModified(const InventoryLocation &loc, bool playerSend)
 		if (!playerSend)
 			return;
 
-		Player *player = m_env->getPlayer(loc.name.c_str());
-		if(!player)
+		RemotePlayer *player =
+			dynamic_cast<RemotePlayer *>(m_env->getPlayer(loc.name.c_str()));
+
+		if (!player)
 			return;
+
 		PlayerSAO *playersao = player->getPlayerSAO();
 		if(!playersao)
 			return;
@@ -2637,19 +2640,16 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 				++i;
 		}
 
-		Player *player = m_env->getPlayer(peer_id);
+		RemotePlayer *player = dynamic_cast<RemotePlayer *>(m_env->getPlayer(peer_id));
 
 		/* Run scripts and remove from environment */
-		{
-			if(player != NULL)
-			{
-				PlayerSAO *playersao = player->getPlayerSAO();
-				assert(playersao);
+		if(player != NULL) {
+			PlayerSAO *playersao = player->getPlayerSAO();
+			assert(playersao);
 
-				m_script->on_leaveplayer(playersao, reason == CDR_TIMEOUT);
+			m_script->on_leaveplayer(playersao, reason == CDR_TIMEOUT);
 
-				playersao->disconnected();
-			}
+			playersao->disconnected();
 		}
 
 		/*
@@ -2691,7 +2691,7 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 		SendChatMessage(PEER_ID_INEXISTENT,message);
 }
 
-void Server::UpdateCrafting(Player* player)
+void Server::UpdateCrafting(RemotePlayer* player)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -2701,7 +2701,8 @@ void Server::UpdateCrafting(Player* player)
 	loc.setPlayer(player->getName());
 	std::vector<ItemStack> output_replacements;
 	getCraftingResult(&player->inventory, preview, output_replacements, false, this);
-	m_env->getScriptIface()->item_CraftPredict(preview, player->getPlayerSAO(), (&player->inventory)->getList("craft"), loc);
+	m_env->getScriptIface()->item_CraftPredict(preview, player->getPlayerSAO(),
+			(&player->inventory)->getList("craft"), loc);
 
 	// Put the new preview in
 	InventoryList *plist = player->inventory.getList("craftpreview");
@@ -2851,8 +2852,8 @@ std::string Server::getPlayerName(u16 peer_id)
 
 PlayerSAO* Server::getPlayerSAO(u16 peer_id)
 {
-	Player *player = m_env->getPlayer(peer_id);
-	if(player == NULL)
+	RemotePlayer *player = dynamic_cast<RemotePlayer *>(m_env->getPlayer(peer_id));
+	if (player == NULL)
 		return NULL;
 	return player->getPlayerSAO();
 }
@@ -2917,8 +2918,9 @@ void Server::reportPrivsModified(const std::string &name)
 			reportPrivsModified(player->getName());
 		}
 	} else {
-		Player *player = m_env->getPlayer(name.c_str());
-		if(!player)
+		RemotePlayer *player =
+			dynamic_cast<RemotePlayer *>(m_env->getPlayer(name.c_str()));
+		if (!player)
 			return;
 		SendPlayerPrivileges(player->peer_id);
 		PlayerSAO *sao = player->getPlayerSAO();
@@ -3025,7 +3027,7 @@ bool Server::hudChange(Player *player, u32 id, HudElementStat stat, void *data)
 	return true;
 }
 
-bool Server::hudSetFlags(Player *player, u32 flags, u32 mask)
+bool Server::hudSetFlags(RemotePlayer *player, u32 flags, u32 mask)
 {
 	if (!player)
 		return false;
@@ -3043,10 +3045,11 @@ bool Server::hudSetFlags(Player *player, u32 flags, u32 mask)
 	return true;
 }
 
-bool Server::hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount)
+bool Server::hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount)
 {
 	if (!player)
 		return false;
+
 	if (hotbar_itemcount <= 0 || hotbar_itemcount > HUD_HOTBAR_ITEMCOUNT_MAX)
 		return false;
 
@@ -3057,13 +3060,6 @@ bool Server::hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount)
 	return true;
 }
 
-s32 Server::hudGetHotbarItemcount(Player *player)
-{
-	if (!player)
-		return 0;
-	return player->getHotbarItemcount();
-}
-
 void Server::hudSetHotbarImage(Player *player, std::string name)
 {
 	if (!player)
@@ -3130,7 +3126,7 @@ bool Server::setSky(Player *player, const video::SColor &bgcolor,
 	return true;
 }
 
-bool Server::overrideDayNightRatio(Player *player, bool do_override,
+bool Server::overrideDayNightRatio(RemotePlayer *player, bool do_override,
 	float ratio)
 {
 	if (!player)
diff --git a/src/server.h b/src/server.h
index 34427a71a..331a91a52 100644
--- a/src/server.h
+++ b/src/server.h
@@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "chat_interface.h"
 #include "clientiface.h"
+#include "player.h"
 #include "network/networkpacket.h"
 #include <string>
 #include <list>
@@ -48,7 +49,6 @@ class IWritableCraftDefManager;
 class BanManager;
 class EventManager;
 class Inventory;
-class Player;
 class PlayerSAO;
 class IRollbackManager;
 struct RollbackAction;
@@ -336,9 +336,10 @@ public:
 	u32 hudAdd(Player *player, HudElement *element);
 	bool hudRemove(Player *player, u32 id);
 	bool hudChange(Player *player, u32 id, HudElementStat stat, void *value);
-	bool hudSetFlags(Player *player, u32 flags, u32 mask);
-	bool hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount);
-	s32 hudGetHotbarItemcount(Player *player);
+	bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask);
+	bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);
+	s32 hudGetHotbarItemcount(RemotePlayer *player) const
+			{ return player->getHotbarItemcount(); }
 	void hudSetHotbarImage(Player *player, std::string name);
 	std::string hudGetHotbarImage(Player *player);
 	void hudSetHotbarSelectedImage(Player *player, std::string name);
@@ -353,7 +354,7 @@ public:
 	bool setSky(Player *player, const video::SColor &bgcolor,
 			const std::string &type, const std::vector<std::string> &params);
 
-	bool overrideDayNightRatio(Player *player, bool do_override, float brightness);
+	bool overrideDayNightRatio(RemotePlayer *player, bool do_override, float brightness);
 
 	/* con::PeerHandler implementation. */
 	void peerAdded(con::Peer *peer);
@@ -475,7 +476,7 @@ private:
 	void DiePlayer(u16 peer_id);
 	void RespawnPlayer(u16 peer_id);
 	void DeleteClient(u16 peer_id, ClientDeletionReason reason);
-	void UpdateCrafting(Player *player);
+	void UpdateCrafting(RemotePlayer *player);
 
 	void handleChatInterfaceEvent(ChatEvent *evt);
 

From 09cefc3dfd76ac629bfc0777635fc5ac47b25ab0 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 8 Oct 2016 11:25:46 +0200
Subject: [PATCH 222/418] Remove some unused attributes/class functions in
 server.cpp/h

---
 src/server.cpp |  8 --------
 src/server.h   | 28 ----------------------------
 2 files changed, 36 deletions(-)

diff --git a/src/server.cpp b/src/server.cpp
index 11ffba343..540d23b9d 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -184,9 +184,7 @@ Server::Server(
 {
 	m_liquid_transform_timer = 0.0;
 	m_liquid_transform_every = 1.0;
-	m_print_info_timer = 0.0;
 	m_masterserver_timer = 0.0;
-	m_objectdata_timer = 0.0;
 	m_emergethread_trigger_timer = 0.0;
 	m_savemap_timer = 0.0;
 
@@ -3211,12 +3209,6 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
 	SendDeleteParticleSpawner(peer_id, id);
 }
 
-void Server::deleteParticleSpawnerAll(u32 id)
-{
-	m_env->deleteParticleSpawner(id);
-	SendDeleteParticleSpawner(PEER_ID_INEXISTENT, id);
-}
-
 Inventory* Server::createDetachedInventory(const std::string &name)
 {
 	if(m_detached_inventories.count(name) > 0){
diff --git a/src/server.h b/src/server.h
index 331a91a52..555aab692 100644
--- a/src/server.h
+++ b/src/server.h
@@ -64,31 +64,6 @@ enum ClientDeletionReason {
 	CDR_DENY
 };
 
-class MapEditEventIgnorer
-{
-public:
-	MapEditEventIgnorer(bool *flag):
-		m_flag(flag)
-	{
-		if(*m_flag == false)
-			*m_flag = true;
-		else
-			m_flag = NULL;
-	}
-
-	~MapEditEventIgnorer()
-	{
-		if(m_flag)
-		{
-			assert(*m_flag);
-			*m_flag = false;
-		}
-	}
-
-private:
-	bool *m_flag;
-};
-
 class MapEditEventAreaIgnorer
 {
 public:
@@ -287,7 +262,6 @@ public:
 		const std::string &playername);
 
 	void deleteParticleSpawner(const std::string &playername, u32 id);
-	void deleteParticleSpawnerAll(u32 id);
 
 	// Creates or resets inventory
 	Inventory* createDetachedInventory(const std::string &name);
@@ -527,9 +501,7 @@ private:
 	// Some timers
 	float m_liquid_transform_timer;
 	float m_liquid_transform_every;
-	float m_print_info_timer;
 	float m_masterserver_timer;
-	float m_objectdata_timer;
 	float m_emergethread_trigger_timer;
 	float m_savemap_timer;
 	IntervalLimiter m_map_timer_and_unload_interval;

From 9978d0796fa61eabb235d715a56ad6e5396d2e1e Mon Sep 17 00:00:00 2001
From: HybridDog <ovvv@web.de>
Date: Sat, 8 Oct 2016 14:42:17 +0200
Subject: [PATCH 223/418] VoxelArea: faster iter function (#4490)

---
 builtin/game/voxelarea.lua | 51 +++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/builtin/game/voxelarea.lua b/builtin/game/voxelarea.lua
index 6d926c940..724761414 100644
--- a/builtin/game/voxelarea.lua
+++ b/builtin/game/voxelarea.lua
@@ -50,7 +50,7 @@ end
 function VoxelArea:position(i)
 	local p = {}
 	local MinEdge = self.MinEdge
- 
+
 	i = i - 1
 
 	p.z = math.floor(i / self.zstride) + MinEdge.z
@@ -84,23 +84,46 @@ end
 
 function VoxelArea:iter(minx, miny, minz, maxx, maxy, maxz)
 	local i = self:index(minx, miny, minz) - 1
-	local last = self:index(maxx, maxy, maxz)
-	local ystride = self.ystride
-	local zstride = self.zstride
-	local yoff = (last+1) % ystride
-	local zoff = (last+1) % zstride
-	local ystridediff = (i - last) % ystride
-	local zstridediff = (i - last) % zstride
+	local xrange = maxx - minx + 1
+	local nextaction = i + 1 + xrange
+
+	local y = 0
+	local yrange = maxy - miny + 1
+	local yreqstride = self.ystride - xrange
+
+	local z = 0
+	local zrange = maxz - minz + 1
+	local multistride = self.zstride - ((yrange - 1) * self.ystride + xrange)
+
 	return function()
+		-- continue i until it needs to jump
 		i = i + 1
-		if i % zstride == zoff then
-			i = i + zstridediff
-		elseif i % ystride == yoff then
-			i = i + ystridediff
-		end
-		if i <= last then
+		if i ~= nextaction then
 			return i
 		end
+
+		-- continue y until maxy is exceeded
+		y = y + 1
+		if y ~= yrange then
+			-- set i to index(minx, miny + y, minz + z) - 1
+			i = i + yreqstride
+			nextaction = i + xrange
+			return i
+		end
+
+		-- continue z until maxz is exceeded
+		z = z + 1
+		if z == zrange then
+			-- cuboid finished, return nil
+			return
+		end
+
+		-- set i to index(minx, miny, minz + z) - 1
+		i = i + multistride
+
+		y = 0
+		nextaction = i + xrange
+		return i
 	end
 end
 

From ad163ee5c3f7d6ca31e0add052fb76466a9bfcc8 Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Sat, 8 Oct 2016 16:51:25 +0400
Subject: [PATCH 224/418] Prevent attached models from disappearing during
 parent reload (#4128)

---
 src/content_cao.cpp             | 41 ++++++++++++++++++---------------
 src/content_sao.cpp             | 20 ++++++++++++----
 src/content_sao.h               |  8 +++----
 src/genericobject.cpp           | 12 ++++++++++
 src/genericobject.h             |  5 +++-
 src/script/lua_api/l_object.cpp |  4 ++--
 src/serverobject.h              |  4 ++--
 7 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 33dae6822..207a630d7 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1567,8 +1567,7 @@ void GenericCAO::processMessage(const std::string &data)
 	std::istringstream is(data, std::ios::binary);
 	// command
 	u8 cmd = readU8(is);
-	if(cmd == GENERIC_CMD_SET_PROPERTIES)
-	{
+	if (cmd == GENERIC_CMD_SET_PROPERTIES) {
 		m_prop = gob_read_set_properties(is);
 
 		m_selection_box = m_prop.collisionbox;
@@ -1587,9 +1586,7 @@ void GenericCAO::processMessage(const std::string &data)
 			m_prop.nametag = m_name;
 
 		expireVisuals();
-	}
-	else if(cmd == GENERIC_CMD_UPDATE_POSITION)
-	{
+	} else if (cmd == GENERIC_CMD_UPDATE_POSITION) {
 		// Not sent by the server if this object is an attachment.
 		// We might however get here if the server notices the object being detached before the client.
 		m_position = readV3F1000(is);
@@ -1619,12 +1616,10 @@ void GenericCAO::processMessage(const std::string &data)
 			pos_translator.init(m_position);
 		}
 		updateNodePos();
-	}
-	else if(cmd == GENERIC_CMD_SET_TEXTURE_MOD) {
+	} else if (cmd == GENERIC_CMD_SET_TEXTURE_MOD) {
 		std::string mod = deSerializeString(is);
 		updateTextures(mod);
-	}
-	else if(cmd == GENERIC_CMD_SET_SPRITE) {
+	} else if (cmd == GENERIC_CMD_SET_SPRITE) {
 		v2s16 p = readV2S16(is);
 		int num_frames = readU16(is);
 		float framelength = readF1000(is);
@@ -1636,8 +1631,7 @@ void GenericCAO::processMessage(const std::string &data)
 		m_tx_select_horiz_by_yawpitch = select_horiz_by_yawpitch;
 
 		updateTexturePos();
-	}
-	else if(cmd == GENERIC_CMD_SET_PHYSICS_OVERRIDE) {
+	} else if (cmd == GENERIC_CMD_SET_PHYSICS_OVERRIDE) {
 		float override_speed = readF1000(is);
 		float override_jump = readF1000(is);
 		float override_gravity = readF1000(is);
@@ -1655,8 +1649,7 @@ void GenericCAO::processMessage(const std::string &data)
 			player->physics_override_sneak = sneak;
 			player->physics_override_sneak_glitch = sneak_glitch;
 		}
-	}
-	else if(cmd == GENERIC_CMD_SET_ANIMATION) {
+	} else if (cmd == GENERIC_CMD_SET_ANIMATION) {
 		// TODO: change frames send as v2s32 value
 		v2f range = readV2F1000(is);
 		if (!m_is_local_player) {
@@ -1690,8 +1683,7 @@ void GenericCAO::processMessage(const std::string &data)
 					updateAnimation();
 			}
 		}
-	}
-	else if(cmd == GENERIC_CMD_SET_BONE_POSITION) {
+	} else if (cmd == GENERIC_CMD_SET_BONE_POSITION) {
 		std::string bone = deSerializeString(is);
 		v3f position = readV3F1000(is);
 		v3f rotation = readV3F1000(is);
@@ -1724,8 +1716,7 @@ void GenericCAO::processMessage(const std::string &data)
 		}
 
 		updateAttachments();
-	}
-	else if(cmd == GENERIC_CMD_PUNCHED) {
+	} else if (cmd == GENERIC_CMD_PUNCHED) {
 		/*s16 damage =*/ readS16(is);
 		s16 result_hp = readS16(is);
 
@@ -1753,8 +1744,7 @@ void GenericCAO::processMessage(const std::string &data)
 				updateTextures("^[brighten");
 			}
 		}
-	}
-	else if(cmd == GENERIC_CMD_UPDATE_ARMOR_GROUPS) {
+	} else if (cmd == GENERIC_CMD_UPDATE_ARMOR_GROUPS) {
 		m_armor_groups.clear();
 		int armor_groups_size = readU16(is);
 		for(int i=0; i<armor_groups_size; i++)
@@ -1770,6 +1760,19 @@ void GenericCAO::processMessage(const std::string &data)
 		if (m_nametag != NULL) {
 			m_nametag->nametag_color = m_prop.nametag_color;
 		}
+	} else if (cmd == GENERIC_CMD_SPAWN_INFANT) {
+		u16 child_id = readU16(is);
+		u8 type = readU8(is);
+
+		if (GenericCAO *childobj = m_env->getGenericCAO(child_id)) {
+			childobj->initialize(deSerializeLongString(is));
+		} else {
+			m_env->addActiveObject(child_id, type, deSerializeLongString(is));
+		}
+	} else {
+		warningstream << FUNCTION_NAME
+			<< ": unknown command or outdated client \""
+			<< cmd << std::endl;
 	}
 }
 
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 2317cbdfe..1664f5993 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -380,7 +380,7 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 		writeF1000(os, m_yaw);
 		writeS16(os, m_hp);
 
-		writeU8(os, 4 + m_bone_position.size()); // number of messages stuffed in here
+		writeU8(os, 4 + m_bone_position.size() + m_attachment_child_ids.size()); // number of messages stuffed in here
 		os<<serializeLongString(getPropertyPacket()); // message 1
 		os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
 		os<<serializeLongString(gob_cmd_update_animation(
@@ -391,6 +391,12 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 					(*ii).second.X, (*ii).second.Y)); // m_bone_position.size
 		}
 		os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
+		for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin(); 
+				(ii != m_attachment_child_ids.end()); ++ii) {
+			if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
+				os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
+			}
+		}
 	}
 	else
 	{
@@ -618,7 +624,7 @@ void LuaEntitySAO::removeAttachmentChild(int child_id)
 	m_attachment_child_ids.erase(child_id);
 }
 
-std::set<int> LuaEntitySAO::getAttachmentChildIds()
+UNORDERED_SET<int> LuaEntitySAO::getAttachmentChildIds()
 {
 	return m_attachment_child_ids;
 }
@@ -860,7 +866,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 		writeF1000(os, m_player->getYaw());
 		writeS16(os, getHP());
 
-		writeU8(os, 6 + m_bone_position.size()); // number of messages stuffed in here
+		writeU8(os, 6 + m_bone_position.size() + m_attachment_child_ids.size()); // number of messages stuffed in here
 		os<<serializeLongString(getPropertyPacket()); // message 1
 		os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
 		os<<serializeLongString(gob_cmd_update_animation(
@@ -874,6 +880,12 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 				m_physics_override_jump, m_physics_override_gravity, m_physics_override_sneak,
 				m_physics_override_sneak_glitch)); // 5
 		os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6 (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
+		for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin(); 
+				ii != m_attachment_child_ids.end(); ++ii) {
+			if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
+				os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
+			}
+		}
 	}
 	else
 	{
@@ -1266,7 +1278,7 @@ void PlayerSAO::removeAttachmentChild(int child_id)
 	m_attachment_child_ids.erase(child_id);
 }
 
-std::set<int> PlayerSAO::getAttachmentChildIds()
+UNORDERED_SET<int> PlayerSAO::getAttachmentChildIds()
 {
 	return m_attachment_child_ids;
 }
diff --git a/src/content_sao.h b/src/content_sao.h
index c97db4922..341ebb5da 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -67,7 +67,7 @@ public:
 	void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation);
 	void addAttachmentChild(int child_id);
 	void removeAttachmentChild(int child_id);
-	std::set<int> getAttachmentChildIds();
+	UNORDERED_SET<int> getAttachmentChildIds();
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 	/* LuaEntitySAO-specific */
@@ -116,7 +116,7 @@ private:
 	bool m_bone_position_sent;
 
 	int m_attachment_parent_id;
-	std::set<int> m_attachment_child_ids;
+	UNORDERED_SET<int> m_attachment_child_ids;
 	std::string m_attachment_bone;
 	v3f m_attachment_position;
 	v3f m_attachment_rotation;
@@ -210,7 +210,7 @@ public:
 	void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation);
 	void addAttachmentChild(int child_id);
 	void removeAttachmentChild(int child_id);
-	std::set<int> getAttachmentChildIds();
+	UNORDERED_SET<int> getAttachmentChildIds();
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 
@@ -320,7 +320,7 @@ private:
 	bool m_bone_position_sent;
 
 	int m_attachment_parent_id;
-	std::set<int> m_attachment_child_ids;
+	UNORDERED_SET<int> m_attachment_child_ids;
 	std::string m_attachment_bone;
 	v3f m_attachment_position;
 	v3f m_attachment_rotation;
diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 368cae1ff..c4660cf44 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -182,3 +182,15 @@ std::string gob_cmd_update_nametag_attributes(video::SColor color)
 	writeARGB8(os, color);
 	return os.str();
 }
+
+std::string gob_cmd_update_infant(u16 id, u8 type, std::string client_initialization_data)
+{
+	std::ostringstream os(std::ios::binary);
+	// command 
+	writeU8(os, GENERIC_CMD_SPAWN_INFANT);
+	// parameters
+	writeU16(os, id);
+	writeU8(os, type);
+	os<<serializeLongString(client_initialization_data);
+	return os.str();
+}
diff --git a/src/genericobject.h b/src/genericobject.h
index b92570831..48e71db75 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -35,7 +35,8 @@ enum GenericCMD {
 	GENERIC_CMD_SET_BONE_POSITION,
 	GENERIC_CMD_ATTACH_TO,
 	GENERIC_CMD_SET_PHYSICS_OVERRIDE,
-	GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES
+	GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES,
+	GENERIC_CMD_SPAWN_INFANT
 };
 
 #include "object_properties.h"
@@ -77,5 +78,7 @@ std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f posit
 
 std::string gob_cmd_update_nametag_attributes(video::SColor color);
 
+std::string gob_cmd_update_infant(u16 id, u8 type, std::string client_initialization_data);
+
 #endif
 
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 4e1a1c159..34e175ad0 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -137,8 +137,8 @@ int ObjectRef::l_remove(lua_State *L)
 	if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
 		return 0;
 
-	std::set<int> child_ids = co->getAttachmentChildIds();
-	std::set<int>::iterator it;
+	UNORDERED_SET<int> child_ids = co->getAttachmentChildIds();
+	UNORDERED_SET<int>::iterator it;
 	for (it = child_ids.begin(); it != child_ids.end(); ++it) {
 		ServerActiveObject *child = env->getActiveObject(*it);
 		child->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0));
diff --git a/src/serverobject.h b/src/serverobject.h
index 597eb63a8..9f8d5403c 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -167,8 +167,8 @@ public:
 	{}
 	virtual void removeAttachmentChild(int child_id)
 	{}
-	virtual std::set<int> getAttachmentChildIds()
-	{ return std::set<int>(); }
+	virtual UNORDERED_SET<int> getAttachmentChildIds()
+	{ return UNORDERED_SET<int>(); }
 	virtual ObjectProperties* accessObjectProperties()
 	{ return NULL; }
 	virtual void notifyObjectPropertiesModified()

From 3de9ae4e6054bb420bea8ad5621a0b76552a3621 Mon Sep 17 00:00:00 2001
From: gregorycu <gregory.currie@gmail.com>
Date: Sat, 8 Oct 2016 23:58:47 +1100
Subject: [PATCH 225/418] Ensure std::unordered_ will be used on supported MSVC
 compilers

---
 src/util/cpp11_container.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/util/cpp11_container.h b/src/util/cpp11_container.h
index f839be19a..7ac2fc371 100644
--- a/src/util/cpp11_container.h
+++ b/src/util/cpp11_container.h
@@ -21,6 +21,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MT_CPP11CONTAINER_HEADER
 
 #if __cplusplus >= 201103L
+#define USE_UNORDERED_CONTAINERS
+#endif
+
+#if _MSC_VER >= 1800
+#define USE_UNORDERED_CONTAINERS
+#endif
+
+#ifdef USE_UNORDERED_CONTAINERS
 	#include <unordered_map>
 	#include <unordered_set>
 	#define UNORDERED_MAP std::unordered_map

From 9393e4a0a8e32905d32a9dc58131218aee318686 Mon Sep 17 00:00:00 2001
From: gregorycu <gregory.currie@gmail.com>
Date: Sun, 9 Oct 2016 00:08:35 +1100
Subject: [PATCH 226/418] Speed up emerge thread by using unordered map in a
 few places. Looking at 25% speedup in Emerge thread on Just Test.

---
 src/nodedef.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index fa2e621f2..39ea1a60e 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -810,12 +810,12 @@ private:
 	// item aliases too. Updated by updateAliases()
 	// Note: Not serialized.
 
-	std::map<std::string, content_t> m_name_id_mapping_with_aliases;
+	UNORDERED_MAP<std::string, content_t> m_name_id_mapping_with_aliases;
 
 	// A mapping from groups to a list of content_ts (and their levels)
 	// that belong to it.  Necessary for a direct lookup in getIds().
 	// Note: Not serialized.
-	std::map<std::string, GroupItems> m_group_to_items;
+	UNORDERED_MAP<std::string, GroupItems> m_group_to_items;
 
 	// Next possibly free id
 	content_t m_next_id;
@@ -938,7 +938,7 @@ inline const ContentFeatures& CNodeDefManager::get(const MapNode &n) const
 
 bool CNodeDefManager::getId(const std::string &name, content_t &result) const
 {
-	std::map<std::string, content_t>::const_iterator
+	UNORDERED_MAP<std::string, content_t>::const_iterator
 		i = m_name_id_mapping_with_aliases.find(name);
 	if(i == m_name_id_mapping_with_aliases.end())
 		return false;
@@ -968,7 +968,7 @@ bool CNodeDefManager::getIds(const std::string &name,
 	}
 	std::string group = name.substr(6);
 
-	std::map<std::string, GroupItems>::const_iterator
+	UNORDERED_MAP<std::string, GroupItems>::const_iterator
 		i = m_group_to_items.find(group);
 	if (i == m_group_to_items.end())
 		return true;
@@ -1050,7 +1050,7 @@ content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &d
 		i != def.groups.end(); ++i) {
 		std::string group_name = i->first;
 
-		std::map<std::string, GroupItems>::iterator
+		UNORDERED_MAP<std::string, GroupItems>::iterator
 			j = m_group_to_items.find(group_name);
 		if (j == m_group_to_items.end()) {
 			m_group_to_items[group_name].push_back(
@@ -1086,7 +1086,7 @@ void CNodeDefManager::removeNode(const std::string &name)
 	}
 
 	// Erase node content from all groups it belongs to
-	for (std::map<std::string, GroupItems>::iterator iter_groups =
+	for (UNORDERED_MAP<std::string, GroupItems>::iterator iter_groups =
 			m_group_to_items.begin();
 			iter_groups != m_group_to_items.end();) {
 		GroupItems &items = iter_groups->second;

From 656faf7373587bc59b47986a28dbd2fce4c45474 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 8 Oct 2016 12:21:41 +0200
Subject: [PATCH 227/418] Player/LocalPlayer/RemotePlayer inheritance cleanup
 (part 2 on X)

* Server/Client Environments now have an helper to cast Player object in the right type to use it
* Server: use RemotePlayer everywhere and remove previous added casts
* Client: use LocalPlayer where needed
* Environment: remove unused functions (getPlayers(), getRandomConnectedPlayer(), getNearestConnectedPlayer())
---
 src/client.cpp                      |  2 +-
 src/environment.cpp                 | 84 +++++++----------------------
 src/environment.h                   | 18 +++----
 src/network/serverpackethandler.cpp | 24 +++------
 src/script/lua_api/l_inventory.cpp  |  2 +-
 src/script/lua_api/l_inventory.h    |  9 +---
 src/script/lua_api/l_object.cpp     | 20 +++----
 src/script/lua_api/l_object.h       |  1 -
 src/script/lua_api/l_server.cpp     | 21 ++++----
 src/server.cpp                      | 26 ++++-----
 src/server.h                        | 21 ++++----
 src/serverobject.h                  | 25 +++++----
 12 files changed, 97 insertions(+), 156 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 63653998a..392dabde6 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1418,7 +1418,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
 	break;
 	case InventoryLocation::PLAYER:
 	{
-		Player *player = m_env.getPlayer(loc.name.c_str());
+		LocalPlayer *player = m_env.getPlayer(loc.name.c_str());
 		if(!player)
 			return NULL;
 		return &player->inventory;
diff --git a/src/environment.cpp b/src/environment.cpp
index 34b3c34f4..d30b70527 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -127,65 +127,6 @@ Player * Environment::getPlayer(const char *name)
 	return NULL;
 }
 
-Player * Environment::getRandomConnectedPlayer()
-{
-	std::vector<Player*> connected_players = getPlayers(true);
-	u32 chosen_one = myrand() % connected_players.size();
-	u32 j = 0;
-	for(std::vector<Player*>::iterator
-			i = connected_players.begin();
-			i != connected_players.end(); ++i) {
-		if(j == chosen_one) {
-			Player *player = *i;
-			return player;
-		}
-		j++;
-	}
-	return NULL;
-}
-
-Player * Environment::getNearestConnectedPlayer(v3f pos)
-{
-	std::vector<Player*> connected_players = getPlayers(true);
-	f32 nearest_d = 0;
-	Player *nearest_player = NULL;
-	for(std::vector<Player*>::iterator
-			i = connected_players.begin();
-			i != connected_players.end(); ++i) {
-		Player *player = *i;
-		f32 d = player->getPosition().getDistanceFrom(pos);
-		if(d < nearest_d || nearest_player == NULL) {
-			nearest_d = d;
-			nearest_player = player;
-		}
-	}
-	return nearest_player;
-}
-
-std::vector<Player*> Environment::getPlayers()
-{
-	return m_players;
-}
-
-std::vector<Player*> Environment::getPlayers(bool ignore_disconnected)
-{
-	std::vector<Player*> newlist;
-	for(std::vector<Player*>::iterator
-			i = m_players.begin();
-			i != m_players.end(); ++i) {
-		Player *player = *i;
-
-		if(ignore_disconnected) {
-			// Ignore disconnected players
-			if(player->peer_id == 0)
-				continue;
-		}
-
-		newlist.push_back(player);
-	}
-	return newlist;
-}
-
 u32 Environment::getDayNightRatio()
 {
 	MutexAutoLock lock(this->m_time_lock);
@@ -199,11 +140,6 @@ void Environment::setTimeOfDaySpeed(float speed)
 	m_time_of_day_speed = speed;
 }
 
-float Environment::getTimeOfDaySpeed()
-{
-	return m_time_of_day_speed;
-}
-
 void Environment::setDayNightRatioOverride(bool enable, u32 value)
 {
 	MutexAutoLock lock(this->m_time_lock);
@@ -625,6 +561,16 @@ ServerMap & ServerEnvironment::getServerMap()
 	return *m_map;
 }
 
+RemotePlayer *ServerEnvironment::getPlayer(const u16 peer_id)
+{
+	return dynamic_cast<RemotePlayer *>(Environment::getPlayer(peer_id));
+}
+
+RemotePlayer *ServerEnvironment::getPlayer(const char* name)
+{
+	return dynamic_cast<RemotePlayer *>(Environment::getPlayer(name));
+}
+
 bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize, v3s16 *p)
 {
 	float distance = pos1.getDistanceFrom(pos2);
@@ -2349,6 +2295,16 @@ ClientMap & ClientEnvironment::getClientMap()
 	return *m_map;
 }
 
+LocalPlayer *ClientEnvironment::getPlayer(const u16 peer_id)
+{
+	return dynamic_cast<LocalPlayer *>(Environment::getPlayer(peer_id));
+}
+
+LocalPlayer *ClientEnvironment::getPlayer(const char* name)
+{
+	return dynamic_cast<LocalPlayer *>(Environment::getPlayer(name));
+}
+
 void ClientEnvironment::addPlayer(Player *player)
 {
 	DSTACK(FUNCTION_NAME);
diff --git a/src/environment.h b/src/environment.h
index 1ba7b196f..66d9c19c0 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -74,12 +74,6 @@ public:
 
 	virtual void addPlayer(Player *player);
 	void removePlayer(Player *player);
-	Player * getPlayer(u16 peer_id);
-	Player * getPlayer(const char *name);
-	Player * getRandomConnectedPlayer();
-	Player * getNearestConnectedPlayer(v3f pos);
-	std::vector<Player*> getPlayers();
-	std::vector<Player*> getPlayers(bool ignore_disconnected);
 
 	u32 getDayNightRatio();
 
@@ -91,7 +85,6 @@ public:
 	void stepTimeOfDay(float dtime);
 
 	void setTimeOfDaySpeed(float speed);
-	float getTimeOfDaySpeed();
 
 	void setDayNightRatioOverride(bool enable, u32 value);
 
@@ -101,6 +94,9 @@ public:
 	u32 m_added_objects;
 
 protected:
+	Player * getPlayer(u16 peer_id);
+	Player * getPlayer(const char *name);
+
 	// peer_ids in here should be unique, except that there may be many 0s
 	std::vector<Player*> m_players;
 
@@ -440,6 +436,8 @@ public:
 	void setStaticForActiveObjectsInBlock(v3s16 blockpos,
 		bool static_exists, v3s16 static_block=v3s16(0,0,0));
 
+	RemotePlayer *getPlayer(const u16 peer_id);
+	RemotePlayer *getPlayer(const char* name);
 private:
 
 	/*
@@ -640,8 +638,10 @@ public:
 	{ m_player_names.remove(name); }
 	void updateCameraOffset(v3s16 camera_offset)
 	{ m_camera_offset = camera_offset; }
-	v3s16 getCameraOffset()
-	{ return m_camera_offset; }
+	v3s16 getCameraOffset() const { return m_camera_offset; }
+
+	LocalPlayer *getPlayer(const u16 peer_id);
+	LocalPlayer *getPlayer(const char* name);
 
 private:
 	ClientMap *m_map;
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 3fba7f720..6ef768295 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -800,8 +800,7 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
 	pitch = modulo360f(pitch);
 	yaw = modulo360f(yaw);
 
-	RemotePlayer *player =
-		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -880,8 +879,7 @@ void Server::handleCommand_DeletedBlocks(NetworkPacket* pkt)
 
 void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
 {
-	RemotePlayer *player =
-		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
@@ -1081,8 +1079,7 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
 
 	*pkt >> damage;
 
-	RemotePlayer *player =
-		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
@@ -1117,8 +1114,7 @@ void Server::handleCommand_Breath(NetworkPacket* pkt)
 
 	*pkt >> breath;
 
-	RemotePlayer *player =
-		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
@@ -1231,8 +1227,7 @@ void Server::handleCommand_PlayerItem(NetworkPacket* pkt)
 	if (pkt->getSize() < 2)
 		return;
 
-	RemotePlayer *player =
-		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
@@ -1308,8 +1303,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 	verbosestream << "TOSERVER_INTERACT: action=" << (int)action << ", item="
 			<< item_i << ", pointed=" << pointed.dump() << std::endl;
 
-	RemotePlayer *player =
-		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
@@ -1730,8 +1724,7 @@ void Server::handleCommand_NodeMetaFields(NetworkPacket* pkt)
 		fields[fieldname] = pkt->readLongString();
 	}
 
-	RemotePlayer *player =
-		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
@@ -1782,8 +1775,7 @@ void Server::handleCommand_InventoryFields(NetworkPacket* pkt)
 		fields[fieldname] = pkt->readLongString();
 	}
 
-	RemotePlayer *player =
-		dynamic_cast<RemotePlayer *>(m_env->getPlayer(pkt->getPeerId()));
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
diff --git a/src/script/lua_api/l_inventory.cpp b/src/script/lua_api/l_inventory.cpp
index de9f9374a..110e68d23 100644
--- a/src/script/lua_api/l_inventory.cpp
+++ b/src/script/lua_api/l_inventory.cpp
@@ -420,7 +420,7 @@ void InvRef::create(lua_State *L, const InventoryLocation &loc)
 	luaL_getmetatable(L, className);
 	lua_setmetatable(L, -2);
 }
-void InvRef::createPlayer(lua_State *L, Player *player)
+void InvRef::createPlayer(lua_State *L, RemotePlayer *player)
 {
 	NO_MAP_LOCK_REQUIRED;
 	InventoryLocation loc;
diff --git a/src/script/lua_api/l_inventory.h b/src/script/lua_api/l_inventory.h
index 2d4b29d0c..cc5333965 100644
--- a/src/script/lua_api/l_inventory.h
+++ b/src/script/lua_api/l_inventory.h
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include "inventorymanager.h"
 
-class Player;
+class RemotePlayer;
 
 /*
 	InvRef
@@ -112,7 +112,7 @@ public:
 	// Creates an InvRef and leaves it on top of stack
 	// Not callable from Lua; all references are created on the C side.
 	static void create(lua_State *L, const InventoryLocation &loc);
-	static void createPlayer(lua_State *L, Player *player);
+	static void createPlayer(lua_State *L, RemotePlayer *player);
 	static void createNodeMeta(lua_State *L, v3s16 p);
 	static void Register(lua_State *L);
 };
@@ -123,11 +123,6 @@ private:
 
 	static int l_get_inventory(lua_State *L);
 
-	static void inventory_set_list_from_lua(Inventory *inv, const char *name,
-			lua_State *L, int tableindex, int forcesize);
-	static void inventory_get_list_to_lua(Inventory *inv, const char *name,
-			lua_State *L);
-
 public:
 	static void Initialize(lua_State *L, int top);
 };
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 34e175ad0..b58d8e6cd 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -508,7 +508,7 @@ int ObjectRef::l_set_local_animation(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 	// Do it
@@ -554,7 +554,7 @@ int ObjectRef::l_set_eye_offset(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 	// Do it
@@ -1256,7 +1256,7 @@ int ObjectRef::l_hud_add(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1319,7 +1319,7 @@ int ObjectRef::l_hud_remove(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1339,7 +1339,7 @@ int ObjectRef::l_hud_change(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1552,7 +1552,7 @@ int ObjectRef::l_hud_set_hotbar_image(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1567,7 +1567,7 @@ int ObjectRef::l_hud_get_hotbar_image(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1581,7 +1581,7 @@ int ObjectRef::l_hud_set_hotbar_selected_image(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1596,7 +1596,7 @@ int ObjectRef::l_hud_get_hotbar_selected_image(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1610,7 +1610,7 @@ int ObjectRef::l_set_sky(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
diff --git a/src/script/lua_api/l_object.h b/src/script/lua_api/l_object.h
index a7ac9dff9..dfc1b49d2 100644
--- a/src/script/lua_api/l_object.h
+++ b/src/script/lua_api/l_object.h
@@ -26,7 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class ServerActiveObject;
 class LuaEntitySAO;
 class PlayerSAO;
-class Player;
 class RemotePlayer;
 
 /*
diff --git a/src/script/lua_api/l_server.cpp b/src/script/lua_api/l_server.cpp
index 59d3f5c70..95e5da07f 100644
--- a/src/script/lua_api/l_server.cpp
+++ b/src/script/lua_api/l_server.cpp
@@ -106,7 +106,7 @@ int ModApiServer::l_get_player_ip(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	const char * name = luaL_checkstring(L, 1);
-	Player *player = getEnv(L)->getPlayer(name);
+	RemotePlayer *player = dynamic_cast<ServerEnvironment *>(getEnv(L))->getPlayer(name);
 	if(player == NULL)
 	{
 		lua_pushnil(L); // no such player
@@ -133,9 +133,8 @@ int ModApiServer::l_get_player_information(lua_State *L)
 
 	NO_MAP_LOCK_REQUIRED;
 	const char * name = luaL_checkstring(L, 1);
-	Player *player = getEnv(L)->getPlayer(name);
-	if(player == NULL)
-	{
+	RemotePlayer *player = dynamic_cast<ServerEnvironment *>(getEnv(L))->getPlayer(name);
+	if (player == NULL) {
 		lua_pushnil(L); // no such player
 		return 1;
 	}
@@ -278,15 +277,15 @@ int ModApiServer::l_ban_player(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	const char * name = luaL_checkstring(L, 1);
-	Player *player = getEnv(L)->getPlayer(name);
-	if(player == NULL)
-	{
+	RemotePlayer *player = dynamic_cast<ServerEnvironment *>(getEnv(L))->getPlayer(name);
+	if (player == NULL) {
 		lua_pushboolean(L, false); // no such player
 		return 1;
 	}
 	try
 	{
-		Address addr = getServer(L)->getPeerAddress(getEnv(L)->getPlayer(name)->peer_id);
+		Address addr = getServer(L)->getPeerAddress(
+			dynamic_cast<ServerEnvironment *>(getEnv(L))->getPlayer(name)->peer_id);
 		std::string ip_str = addr.serializeString();
 		getServer(L)->setIpBanned(ip_str, name);
 	}
@@ -314,9 +313,9 @@ int ModApiServer::l_kick_player(lua_State *L)
 	{
 		message = "Kicked.";
 	}
-	Player *player = getEnv(L)->getPlayer(name);
-	if (player == NULL)
-	{
+
+	RemotePlayer *player = dynamic_cast<ServerEnvironment *>(getEnv(L))->getPlayer(name);
+	if (player == NULL) {
 		lua_pushboolean(L, false); // No such player
 		return 1;
 	}
diff --git a/src/server.cpp b/src/server.cpp
index 540d23b9d..dee8a3d70 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2638,7 +2638,7 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 				++i;
 		}
 
-		RemotePlayer *player = dynamic_cast<RemotePlayer *>(m_env->getPlayer(peer_id));
+		RemotePlayer *player = m_env->getPlayer(peer_id);
 
 		/* Run scripts and remove from environment */
 		if(player != NULL) {
@@ -2850,7 +2850,7 @@ std::string Server::getPlayerName(u16 peer_id)
 
 PlayerSAO* Server::getPlayerSAO(u16 peer_id)
 {
-	RemotePlayer *player = dynamic_cast<RemotePlayer *>(m_env->getPlayer(peer_id));
+	RemotePlayer *player = m_env->getPlayer(peer_id);
 	if (player == NULL)
 		return NULL;
 	return player->getPlayerSAO();
@@ -2989,7 +2989,7 @@ bool Server::showFormspec(const char *playername, const std::string &formspec,
 	return true;
 }
 
-u32 Server::hudAdd(Player *player, HudElement *form)
+u32 Server::hudAdd(RemotePlayer *player, HudElement *form)
 {
 	if (!player)
 		return -1;
@@ -3001,7 +3001,7 @@ u32 Server::hudAdd(Player *player, HudElement *form)
 	return id;
 }
 
-bool Server::hudRemove(Player *player, u32 id) {
+bool Server::hudRemove(RemotePlayer *player, u32 id) {
 	if (!player)
 		return false;
 
@@ -3016,7 +3016,7 @@ bool Server::hudRemove(Player *player, u32 id) {
 	return true;
 }
 
-bool Server::hudChange(Player *player, u32 id, HudElementStat stat, void *data)
+bool Server::hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *data)
 {
 	if (!player)
 		return false;
@@ -3058,7 +3058,7 @@ bool Server::hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount)
 	return true;
 }
 
-void Server::hudSetHotbarImage(Player *player, std::string name)
+void Server::hudSetHotbarImage(RemotePlayer *player, std::string name)
 {
 	if (!player)
 		return;
@@ -3067,14 +3067,14 @@ void Server::hudSetHotbarImage(Player *player, std::string name)
 	SendHUDSetParam(player->peer_id, HUD_PARAM_HOTBAR_IMAGE, name);
 }
 
-std::string Server::hudGetHotbarImage(Player *player)
+std::string Server::hudGetHotbarImage(RemotePlayer *player)
 {
 	if (!player)
 		return "";
 	return player->getHotbarImage();
 }
 
-void Server::hudSetHotbarSelectedImage(Player *player, std::string name)
+void Server::hudSetHotbarSelectedImage(RemotePlayer *player, std::string name)
 {
 	if (!player)
 		return;
@@ -3083,7 +3083,7 @@ void Server::hudSetHotbarSelectedImage(Player *player, std::string name)
 	SendHUDSetParam(player->peer_id, HUD_PARAM_HOTBAR_SELECTED_IMAGE, name);
 }
 
-std::string Server::hudGetHotbarSelectedImage(Player *player)
+std::string Server::hudGetHotbarSelectedImage(RemotePlayer *player)
 {
 	if (!player)
 		return "";
@@ -3091,8 +3091,8 @@ std::string Server::hudGetHotbarSelectedImage(Player *player)
 	return player->getHotbarSelectedImage();
 }
 
-bool Server::setLocalPlayerAnimations(Player *player,
-	v2s32 animation_frames[4], f32 frame_speed)
+bool Server::setLocalPlayerAnimations(RemotePlayer *player,
+		v2s32 animation_frames[4], f32 frame_speed)
 {
 	if (!player)
 		return false;
@@ -3102,7 +3102,7 @@ bool Server::setLocalPlayerAnimations(Player *player,
 	return true;
 }
 
-bool Server::setPlayerEyeOffset(Player *player, v3f first, v3f third)
+bool Server::setPlayerEyeOffset(RemotePlayer *player, v3f first, v3f third)
 {
 	if (!player)
 		return false;
@@ -3113,7 +3113,7 @@ bool Server::setPlayerEyeOffset(Player *player, v3f first, v3f third)
 	return true;
 }
 
-bool Server::setSky(Player *player, const video::SColor &bgcolor,
+bool Server::setSky(RemotePlayer *player, const video::SColor &bgcolor,
 	const std::string &type, const std::vector<std::string> &params)
 {
 	if (!player)
diff --git a/src/server.h b/src/server.h
index 555aab692..8eb1afc9f 100644
--- a/src/server.h
+++ b/src/server.h
@@ -307,25 +307,26 @@ public:
 	Map & getMap() { return m_env->getMap(); }
 	ServerEnvironment & getEnv() { return *m_env; }
 
-	u32 hudAdd(Player *player, HudElement *element);
-	bool hudRemove(Player *player, u32 id);
-	bool hudChange(Player *player, u32 id, HudElementStat stat, void *value);
+	u32 hudAdd(RemotePlayer *player, HudElement *element);
+	bool hudRemove(RemotePlayer *player, u32 id);
+	bool hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *value);
 	bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask);
 	bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);
 	s32 hudGetHotbarItemcount(RemotePlayer *player) const
 			{ return player->getHotbarItemcount(); }
-	void hudSetHotbarImage(Player *player, std::string name);
-	std::string hudGetHotbarImage(Player *player);
-	void hudSetHotbarSelectedImage(Player *player, std::string name);
-	std::string hudGetHotbarSelectedImage(Player *player);
+	void hudSetHotbarImage(RemotePlayer *player, std::string name);
+	std::string hudGetHotbarImage(RemotePlayer *player);
+	void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);
+	std::string hudGetHotbarSelectedImage(RemotePlayer *player);
 
 	inline Address getPeerAddress(u16 peer_id)
 			{ return m_con.GetPeerAddress(peer_id); }
 
-	bool setLocalPlayerAnimations(Player *player, v2s32 animation_frames[4], f32 frame_speed);
-	bool setPlayerEyeOffset(Player *player, v3f first, v3f third);
+	bool setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4],
+			f32 frame_speed);
+	bool setPlayerEyeOffset(RemotePlayer *player, v3f first, v3f third);
 
-	bool setSky(Player *player, const video::SColor &bgcolor,
+	bool setSky(RemotePlayer *player, const video::SColor &bgcolor,
 			const std::string &type, const std::vector<std::string> &params);
 
 	bool overrideDayNightRatio(RemotePlayer *player, bool do_override, float brightness);
diff --git a/src/serverobject.h b/src/serverobject.h
index 9f8d5403c..cfe2b6bcc 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -44,7 +44,6 @@ Some planning
 
 class ServerEnvironment;
 struct ItemStack;
-class Player;
 struct ToolCapabilities;
 struct ObjectProperties;
 
@@ -69,23 +68,23 @@ public:
 	// environment
 	virtual bool environmentDeletes() const
 	{ return true; }
-	
+
 	// Create a certain type of ServerActiveObject
 	static ServerActiveObject* create(ActiveObjectType type,
 			ServerEnvironment *env, u16 id, v3f pos,
 			const std::string &data);
-	
+
 	/*
 		Some simple getters/setters
 	*/
 	v3f getBasePosition(){ return m_base_position; }
 	void setBasePosition(v3f pos){ m_base_position = pos; }
 	ServerEnvironment* getEnv(){ return m_env; }
-	
+
 	/*
 		Some more dynamic interface
 	*/
-	
+
 	virtual void setPos(v3f pos)
 		{ setBasePosition(pos); }
 	// continuous: if true, object does not stop immediately at pos
@@ -96,7 +95,7 @@ public:
 	virtual float getMinimumSavedMovement();
 
 	virtual std::string getDescription(){return "SAO";}
-	
+
 	/*
 		Step object in time.
 		Messages added to messages are sent to client over network.
@@ -108,13 +107,13 @@ public:
 			packet.
 	*/
 	virtual void step(float dtime, bool send_recommended){}
-	
+
 	/*
 		The return value of this is passed to the client-side object
 		when it is created
 	*/
 	virtual std::string getClientInitializationData(u16 protocol_version){return "";}
-	
+
 	/*
 		The return value of this is passed to the server-side object
 		when it is created (converted from static to active - actually
@@ -131,7 +130,7 @@ public:
 	*/
 	virtual bool isStaticAllowed() const
 	{return true;}
-	
+
 	// Returns tool wear
 	virtual int punch(v3f dir,
 			const ToolCapabilities *toolcap=NULL,
@@ -207,7 +206,7 @@ public:
 		- This can be set to true by anything else too.
 	*/
 	bool m_removed;
-	
+
 	/*
 		This is set to true when an object should be removed from the active
 		object list but couldn't be removed because the id has to be
@@ -218,7 +217,7 @@ public:
 		list.
 	*/
 	bool m_pending_deactivation;
-	
+
 	/*
 		Whether the object's static data has been stored to a block
 	*/
@@ -228,12 +227,12 @@ public:
 		a copy of the static data resides.
 	*/
 	v3s16 m_static_block;
-	
+
 	/*
 		Queue of messages to be sent to the client
 	*/
 	std::queue<ActiveObjectMessage> m_messages_out;
-	
+
 protected:
 	// Used for creating objects based on type
 	typedef ServerActiveObject* (*Factory)

From 0baea8c25cb04bcbeca5ae532a00d877628f6b06 Mon Sep 17 00:00:00 2001
From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Sat, 8 Oct 2016 16:25:34 +0200
Subject: [PATCH 228/418] Ensure std::unordered_ be used on MSVC 2010 too
 (#4600)

---
 src/util/cpp11_container.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/cpp11_container.h b/src/util/cpp11_container.h
index 7ac2fc371..88317c9c4 100644
--- a/src/util/cpp11_container.h
+++ b/src/util/cpp11_container.h
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define USE_UNORDERED_CONTAINERS
 #endif
 
-#if _MSC_VER >= 1800
+#if _MSC_VER >= 1600
 #define USE_UNORDERED_CONTAINERS
 #endif
 

From 067766eec213918b6cb5b2533d0c78eceb3949ec Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Mon, 3 Oct 2016 00:30:33 +0100
Subject: [PATCH 229/418] Fix backwards compatibility issue introduced by
 close_on_enter

---
 doc/lua_api.txt         | 20 +++++++++++---------
 src/guiFormSpecMenu.cpp | 42 ++++++++++++++++++++++++++++++++++-------
 src/guiFormSpecMenu.h   |  4 ++--
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 74469e535..6bdcd4fe4 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1542,7 +1542,7 @@ examples.
 * If `true` the background is clipped to formspec size
   (`x` and `y` are used as offset values, `w` and `h` are ignored)
 
-#### `pwdfield[<X>,<Y>;<W>,<H>;<name>;<label>;<close_on_enter>]`
+#### `pwdfield[<X>,<Y>;<W>,<H>;<name>;<label>]`
 * Textual password style field; will be sent to server when a button is clicked
 * When enter is pressed in field, fields.key_enter_field will be sent with the name
   of this field.
@@ -1552,10 +1552,9 @@ examples.
 * Position and size units are inventory slots
 * `name` is the name of the field as returned in fields to `on_receive_fields`
 * `label`, if not blank, will be text printed on the top left above the field
-* `close_on_enter` (optional) is whether the form should accept and close when enter is
-  pressed in this field. Defaults to true.
+* See field_close_on_enter to stop enter closing the formspec
 
-#### `field[<X>,<Y>;<W>,<H>;<name>;<label>;<default>;<close_on_enter>]`
+#### `field[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]`
 * Textual field; will be sent to server when a button is clicked
 * When enter is pressed in field, fields.key_enter_field will be sent with the name
   of this field.
@@ -1569,18 +1568,21 @@ examples.
     * `default` may contain variable references such as `${text}'` which
       will fill the value from the metadata value `text`
     * **Note**: no extra text or more than a single variable is supported ATM.
-* `close_on_enter` (optional) is whether the form should accept and close when enter is
-  pressed in this field. Defaults to true.
+* See field_close_on_enter to stop enter closing the formspec
 
-#### `field[<name>;<label>;<default>;<close_on_enter>]`
+#### `field[<name>;<label>;<default>]`
 * As above, but without position/size units
 * When enter is pressed in field, fields.key_enter_field will be sent with the name
   of this field.
 * Special field for creating simple forms, such as sign text input
 * Must be used without a `size[]` element
 * A "Proceed" button will be added automatically
-* `close_on_enter` (optional) is whether the form should accept and close when enter is
-  pressed in this field. Defaults to true.
+* See field_close_on_enter to stop enter closing the formspec
+
+#### `field_close_on_enter[<name>;<close_on_enter>]`
+* <name> is the name of the field
+* if <close_on_enter> is false, pressing enter in the field will submit the form but not close it
+* defaults to true when not specified (ie: no tag for a field)
 
 #### `textarea[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]`
 * Same as fields above, but with multi-line input
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 714e71a5a..73388114b 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -914,6 +914,16 @@ void GUIFormSpecMenu::parseDropDown(parserData* data,std::string element)
 				<< element << "'"  << std::endl;
 }
 
+void GUIFormSpecMenu::parseFieldCloseOnEnter(parserData *data,
+		const std::string &element)
+{
+	std::vector<std::string> parts = split(element,';');
+	if (parts.size() == 2 ||
+			(parts.size() > 2 && m_formspec_version > FORMSPEC_API_VERSION)) {
+		field_close_on_enter[parts[0]] = is_yes(parts[1]);
+	}
+}
+
 void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element)
 {
 	std::vector<std::string> parts = split(element,';');
@@ -977,8 +987,11 @@ void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element)
 		evt.KeyInput.PressedDown = true;
 		e->OnEvent(evt);
 
-		if (parts.size() >= 5 && !is_yes(parts[4])) {
-			spec.close_on_enter = false;
+		if (parts.size() >= 5) {
+			// TODO: remove after 2016-11-03
+			warningstream << "pwdfield: use field_close_on_enter[name, enabled]" <<
+					" instead of the 5th param" << std::endl;
+			field_close_on_enter[name] = is_yes(parts[4]);
 		}
 
 		m_fields.push_back(spec);
@@ -1062,8 +1075,11 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data,
 		}
 	}
 
-	if (parts.size() >= 4 && !is_yes(parts[3])) {
-		spec.close_on_enter = false;
+	if (parts.size() >= 4) {
+		// TODO: remove after 2016-11-03
+		warningstream << "field/simple: use field_close_on_enter[name, enabled]" <<
+				" instead of the 4th param" << std::endl;
+		field_close_on_enter[name] = is_yes(parts[3]);
 	}
 
 	m_fields.push_back(spec);
@@ -1171,8 +1187,11 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,
 		}
 	}
 
-	if (parts.size() >= 6 && !is_yes(parts[5])) {
-		spec.close_on_enter = false;
+	if (parts.size() >= 6) {
+		// TODO: remove after 2016-11-03
+		warningstream << "field/textarea: use field_close_on_enter[name, enabled]" <<
+				" instead of the 6th param" << std::endl;
+		field_close_on_enter[name] = is_yes(parts[5]);
 	}
 
 	m_fields.push_back(spec);
@@ -1783,6 +1802,11 @@ void GUIFormSpecMenu::parseElement(parserData* data, std::string element)
 		return;
 	}
 
+	if (type == "field_close_on_enter") {
+		parseFieldCloseOnEnter(data, description);
+		return;
+	}
+
 	if (type == "pwdfield") {
 		parsePwdField(data,description);
 		return;
@@ -3689,7 +3713,11 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 					if (s.ftype == f_Unknown &&
 							s.fid == event.GUIEvent.Caller->getID()) {
 						current_field_enter_pending = s.fname;
-						close_on_enter = s.close_on_enter;
+						UNORDERED_MAP<std::string, bool>::const_iterator it =
+							field_close_on_enter.find(s.fname);
+						if (it != field_close_on_enter.end())
+							close_on_enter = (*it).second;
+
 						break;
 					}
 				}
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 153720975..95df11e6a 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -212,7 +212,6 @@ class GUIFormSpecMenu : public GUIModalMenu
 			flabel(label),
 			fid(id),
 			send(false),
-			close_on_enter(false),
 			ftype(f_Unknown),
 			is_exit(false)
 		{
@@ -224,7 +223,6 @@ class GUIFormSpecMenu : public GUIModalMenu
 		std::wstring fdefault;
 		int fid;
 		bool send;
-		bool close_on_enter; // used by text fields
 		FormspecFieldType ftype;
 		bool is_exit;
 		core::rect<s32> rect;
@@ -400,6 +398,7 @@ protected:
 	std::vector<ImageDrawSpec> m_images;
 	std::vector<ImageDrawSpec> m_itemimages;
 	std::vector<BoxDrawSpec> m_boxes;
+	UNORDERED_MAP<std::string, bool> field_close_on_enter;
 	std::vector<FieldSpec> m_fields;
 	std::vector<StaticTextSpec> m_static_texts;
 	std::vector<std::pair<FieldSpec,GUITable*> > m_tables;
@@ -490,6 +489,7 @@ private:
 	void parseTable(parserData* data,std::string element);
 	void parseTextList(parserData* data,std::string element);
 	void parseDropDown(parserData* data,std::string element);
+	void parseFieldCloseOnEnter(parserData *data, const std::string &element);
 	void parsePwdField(parserData* data,std::string element);
 	void parseField(parserData* data,std::string element,std::string type);
 	void parseSimpleField(parserData* data,std::vector<std::string> &parts);

From fd5a130b86c08f0b3190c3d81affd4869c139fb7 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 8 Oct 2016 16:31:22 +0200
Subject: [PATCH 230/418] More code cleanup (UNORDERED +
 RemotePlayer/LocalPlayer)

* ClientEnvironment now uses UNORDERED MAP for active objects
* Use RemotePlayer and LocalPlayer everywhere it's possible
* Minor code style fixes
* Drop Client::getBreath() unused function
---
 src/client.cpp                      |  21 ++----
 src/client.h                        |   1 -
 src/clientiface.cpp                 |  13 ++--
 src/content_cao.cpp                 |   7 +-
 src/environment.cpp                 | 105 ++++++++++++----------------
 src/environment.h                   |  12 ++--
 src/network/clientpackethandler.cpp |  18 ++---
 src/network/serverpackethandler.cpp |   6 +-
 src/script/lua_api/l_object.cpp     |  36 +++++-----
 src/server.cpp                      |  57 +++++++--------
 10 files changed, 124 insertions(+), 152 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 392dabde6..cd010e592 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -383,7 +383,7 @@ void Client::step(float dtime)
 		if(counter <= 0.0) {
 			counter = 2.0;
 
-			Player *myplayer = m_env.getLocalPlayer();
+			LocalPlayer *myplayer = m_env.getLocalPlayer();
 			FATAL_ERROR_IF(myplayer == NULL, "Local player not found in environment.");
 
 			u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
@@ -613,7 +613,7 @@ void Client::step(float dtime)
 		{
 			// Do this every <interval> seconds after TOCLIENT_INVENTORY
 			// Reset the locally changed inventory to the authoritative inventory
-			Player *player = m_env.getLocalPlayer();
+			LocalPlayer *player = m_env.getLocalPlayer();
 			player->inventory = *m_inventory_from_server;
 			m_inventory_updated = true;
 		}
@@ -1191,7 +1191,7 @@ void Client::sendChatMessage(const std::wstring &message)
 void Client::sendChangePassword(const std::string &oldpassword,
         const std::string &newpassword)
 {
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	if (player == NULL)
 		return;
 
@@ -1317,7 +1317,7 @@ void Client::sendPlayerPos()
 
 void Client::sendPlayerItem(u16 item)
 {
-	Player *myplayer = m_env.getLocalPlayer();
+	LocalPlayer *myplayer = m_env.getLocalPlayer();
 	if(myplayer == NULL)
 		return;
 
@@ -1398,7 +1398,7 @@ bool Client::getLocalInventoryUpdated()
 // Copies the inventory of the local player to parameter
 void Client::getLocalInventory(Inventory &dst)
 {
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 	dst = player->inventory;
 }
@@ -1411,7 +1411,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
 	break;
 	case InventoryLocation::CURRENT_PLAYER:
 	{
-		Player *player = m_env.getLocalPlayer();
+		LocalPlayer *player = m_env.getLocalPlayer();
 		assert(player != NULL);
 		return &player->inventory;
 	}
@@ -1537,18 +1537,11 @@ void Client::setCrack(int level, v3s16 pos)
 
 u16 Client::getHP()
 {
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 	return player->hp;
 }
 
-u16 Client::getBreath()
-{
-	Player *player = m_env.getLocalPlayer();
-	assert(player != NULL);
-	return player->getBreath();
-}
-
 bool Client::getChatMessage(std::wstring &message)
 {
 	if(m_chat_queue.size() == 0)
diff --git a/src/client.h b/src/client.h
index a71c1dcbc..72baac2d2 100644
--- a/src/client.h
+++ b/src/client.h
@@ -460,7 +460,6 @@ public:
 	void setCrack(int level, v3s16 pos);
 
 	u16 getHP();
-	u16 getBreath();
 
 	bool checkPrivilege(const std::string &priv) const
 	{ return (m_privileges.count(priv) != 0); }
diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index e7ad39579..e55c07cb6 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -77,9 +77,9 @@ void RemoteClient::GetNextBlocks (
 	if(m_nothing_to_send_pause_timer >= 0)
 		return;
 
-	Player *player = env->getPlayer(peer_id);
+	RemotePlayer *player = env->getPlayer(peer_id);
 	// This can happen sometimes; clients and players are not in perfect sync.
-	if(player == NULL)
+	if (player == NULL)
 		return;
 
 	// Won't send anything if already sending
@@ -645,8 +645,7 @@ void ClientInterface::step(float dtime)
 
 void ClientInterface::UpdatePlayerList()
 {
-	if (m_env != NULL)
-		{
+	if (m_env != NULL) {
 		std::vector<u16> clients = getClientIDs();
 		m_clients_names.clear();
 
@@ -654,10 +653,8 @@ void ClientInterface::UpdatePlayerList()
 		if(!clients.empty())
 			infostream<<"Players:"<<std::endl;
 
-		for(std::vector<u16>::iterator
-			i = clients.begin();
-			i != clients.end(); ++i) {
-			Player *player = m_env->getPlayer(*i);
+		for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
+			RemotePlayer *player = m_env->getPlayer(*i);
 
 			if (player == NULL)
 				continue;
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 207a630d7..a53768149 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -655,12 +655,11 @@ void GenericCAO::initialize(const std::string &data)
 
 	if(m_is_player)
 	{
-		Player *player = m_env->getPlayer(m_name.c_str());
-		if(player && player->isLocal())
-		{
+		LocalPlayer *player = m_env->getPlayer(m_name.c_str());
+		if (player && player->isLocal()) {
 			m_is_local_player = true;
 			m_is_visible = false;
-			LocalPlayer* localplayer = dynamic_cast<LocalPlayer*>(player);
+			LocalPlayer* localplayer = player;
 
 			assert( localplayer != NULL );
 			localplayer->setCAO(this);
diff --git a/src/environment.cpp b/src/environment.cpp
index d30b70527..bc246f66c 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -105,20 +105,20 @@ void Environment::removePlayer(Player* player)
 	}
 }
 
-Player * Environment::getPlayer(u16 peer_id)
+Player *Environment::getPlayer(u16 peer_id)
 {
-	for(std::vector<Player*>::iterator i = m_players.begin();
+	for (std::vector<Player*>::iterator i = m_players.begin();
 			i != m_players.end(); ++i) {
 		Player *player = *i;
-		if(player->peer_id == peer_id)
+		if (player->peer_id == peer_id)
 			return player;
 	}
 	return NULL;
 }
 
-Player * Environment::getPlayer(const char *name)
+Player *Environment::getPlayer(const char *name)
 {
-	for(std::vector<Player*>::iterator i = m_players.begin();
+	for (std::vector<Player*>::iterator i = m_players.begin();
 			i != m_players.end(); ++i) {
 		Player *player = *i;
 		if(strcmp(player->getName(), name) == 0)
@@ -602,11 +602,9 @@ void ServerEnvironment::kickAllPlayers(AccessDeniedCode reason,
 		const std::string &str_reason, bool reconnect)
 {
 	for (std::vector<Player*>::iterator it = m_players.begin();
-			it != m_players.end();
-			++it) {
+			it != m_players.end(); ++it) {
 		((Server*)m_gamedef)->DenyAccessVerCompliant((*it)->peer_id,
-			(*it)->protocol_version, (AccessDeniedCode)reason,
-			str_reason, reconnect);
+			(*it)->protocol_version, reason, str_reason, reconnect);
 	}
 }
 
@@ -633,14 +631,14 @@ void ServerEnvironment::savePlayer(RemotePlayer *player)
 	player->save(players_path);
 }
 
-Player *ServerEnvironment::loadPlayer(const std::string &playername)
+RemotePlayer *ServerEnvironment::loadPlayer(const std::string &playername)
 {
 	bool newplayer = false;
 	bool found = false;
 	std::string players_path = m_path_world + DIR_DELIM "players" DIR_DELIM;
 	std::string path = players_path + playername;
 
-	RemotePlayer *player = static_cast<RemotePlayer *>(getPlayer(playername.c_str()));
+	RemotePlayer *player = getPlayer(playername.c_str());
 	if (!player) {
 		player = new RemotePlayer(m_gamedef, "");
 		newplayer = true;
@@ -1254,10 +1252,10 @@ void ServerEnvironment::step(float dtime)
 	*/
 	{
 		ScopeProfiler sp(g_profiler, "SEnv: handle players avg", SPT_AVG);
-		for(std::vector<Player*>::iterator i = m_players.begin();
-				i != m_players.end(); ++i)
-		{
-			Player *player = *i;
+		for (std::vector<Player*>::iterator i = m_players.begin();
+				i != m_players.end(); ++i) {
+			RemotePlayer *player = dynamic_cast<RemotePlayer *>(*i);
+			assert(player);
 
 			// Ignore disconnected players
 			if(player->peer_id == 0)
@@ -1277,12 +1275,12 @@ void ServerEnvironment::step(float dtime)
 			Get player block positions
 		*/
 		std::vector<v3s16> players_blockpos;
-		for(std::vector<Player*>::iterator
-				i = m_players.begin();
+		for (std::vector<Player*>::iterator i = m_players.begin();
 				i != m_players.end(); ++i) {
-			Player *player = *i;
+			RemotePlayer *player = dynamic_cast<RemotePlayer *>(*i);
+			assert(player);
 			// Ignore disconnected players
-			if(player->peer_id == 0)
+			if (player->peer_id == 0)
 				continue;
 
 			v3s16 blockpos = getNodeBlockPos(
@@ -1381,8 +1379,7 @@ void ServerEnvironment::step(float dtime)
 				block->m_node_timers.step((float)dtime);
 			if (!elapsed_timers.empty()) {
 				MapNode n;
-				for (std::vector<NodeTimer>::iterator
-						i = elapsed_timers.begin();
+				for (std::vector<NodeTimer>::iterator i = elapsed_timers.begin();
 						i != elapsed_timers.end(); ++i) {
 					n = block->getNodeNoEx(i->position);
 					p = i->position + block->getPosRelative();
@@ -1571,7 +1568,7 @@ u16 ServerEnvironment::addActiveObject(ServerActiveObject *object)
 	Finds out what new objects have been added to
 	inside a radius around a position
 */
-void ServerEnvironment::getAddedActiveObjects(Player *player, s16 radius,
+void ServerEnvironment::getAddedActiveObjects(RemotePlayer *player, s16 radius,
 		s16 player_radius,
 		std::set<u16> &current_objects,
 		std::queue<u16> &added_objects)
@@ -1624,7 +1621,7 @@ void ServerEnvironment::getAddedActiveObjects(Player *player, s16 radius,
 	Finds out what objects have been removed from
 	inside a radius around a position
 */
-void ServerEnvironment::getRemovedActiveObjects(Player *player, s16 radius,
+void ServerEnvironment::getRemovedActiveObjects(RemotePlayer *player, s16 radius,
 		s16 player_radius,
 		std::set<u16> &current_objects,
 		std::queue<u16> &removed_objects)
@@ -2269,10 +2266,8 @@ ClientEnvironment::ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr,
 ClientEnvironment::~ClientEnvironment()
 {
 	// delete active objects
-	for(std::map<u16, ClientActiveObject*>::iterator
-			i = m_active_objects.begin();
-			i != m_active_objects.end(); ++i)
-	{
+	for (UNORDERED_MAP<u16, ClientActiveObject*>::iterator i = m_active_objects.begin();
+			i != m_active_objects.end(); ++i) {
 		delete i->second;
 	}
 
@@ -2312,18 +2307,18 @@ void ClientEnvironment::addPlayer(Player *player)
 		It is a failure if player is local and there already is a local
 		player
 	*/
-	FATAL_ERROR_IF(player->isLocal() == true && getLocalPlayer() != NULL,
-		"Player is local but there is already a local player");
+	FATAL_ERROR_IF(player->isLocal() && getLocalPlayer() != NULL,
+				   "Player is local but there is already a local player");
 
 	Environment::addPlayer(player);
 }
 
-LocalPlayer * ClientEnvironment::getLocalPlayer()
+LocalPlayer *ClientEnvironment::getLocalPlayer()
 {
 	for(std::vector<Player*>::iterator i = m_players.begin();
 			i != m_players.end(); ++i) {
 		Player *player = *i;
-		if(player->isLocal())
+		if (player->isLocal())
 			return (LocalPlayer*)player;
 	}
 	return NULL;
@@ -2407,11 +2402,11 @@ void ClientEnvironment::step(float dtime)
 
 		{
 			// Apply physics
-			if(free_move == false && is_climbing == false)
+			if(!free_move && !is_climbing)
 			{
 				// Gravity
 				v3f speed = lplayer->getSpeed();
-				if(lplayer->in_liquid == false)
+				if(!lplayer->in_liquid)
 					speed.Y -= lplayer->movement_gravity * lplayer->physics_override_gravity * dtime_part * 2;
 
 				// Liquid floating / sinking
@@ -2566,14 +2561,15 @@ void ClientEnvironment::step(float dtime)
 	/*
 		Stuff that can be done in an arbitarily large dtime
 	*/
-	for(std::vector<Player*>::iterator i = m_players.begin();
+	for (std::vector<Player*>::iterator i = m_players.begin();
 			i != m_players.end(); ++i) {
-		Player *player = *i;
+		LocalPlayer *player = dynamic_cast<LocalPlayer *>(*i);
+		assert(player);
 
 		/*
 			Handle non-local players
 		*/
-		if(player->isLocal() == false) {
+		if (!player->isLocal()) {
 			// Move
 			player->move(dtime, this, 100*BS);
 
@@ -2604,10 +2600,8 @@ void ClientEnvironment::step(float dtime)
 
 	g_profiler->avg("CEnv: num of objects", m_active_objects.size());
 	bool update_lighting = m_active_object_light_update_interval.step(dtime, 0.21);
-	for(std::map<u16, ClientActiveObject*>::iterator
-			i = m_active_objects.begin();
-			i != m_active_objects.end(); ++i)
-	{
+	for (UNORDERED_MAP<u16, ClientActiveObject*>::iterator i = m_active_objects.begin();
+			i != m_active_objects.end(); ++i) {
 		ClientActiveObject* obj = i->second;
 		// Step object
 		obj->step(dtime, this);
@@ -2666,15 +2660,14 @@ GenericCAO* ClientEnvironment::getGenericCAO(u16 id)
 
 ClientActiveObject* ClientEnvironment::getActiveObject(u16 id)
 {
-	std::map<u16, ClientActiveObject*>::iterator n;
-	n = m_active_objects.find(id);
-	if(n == m_active_objects.end())
+	UNORDERED_MAP<u16, ClientActiveObject*>::iterator n = m_active_objects.find(id);
+	if (n == m_active_objects.end())
 		return NULL;
 	return n->second;
 }
 
-bool isFreeClientActiveObjectId(u16 id,
-		std::map<u16, ClientActiveObject*> &objects)
+bool isFreeClientActiveObjectId(const u16 id,
+	UNORDERED_MAP<u16, ClientActiveObject*> &objects)
 {
 	if(id == 0)
 		return false;
@@ -2682,19 +2675,17 @@ bool isFreeClientActiveObjectId(u16 id,
 	return objects.find(id) == objects.end();
 }
 
-u16 getFreeClientActiveObjectId(
-		std::map<u16, ClientActiveObject*> &objects)
+u16 getFreeClientActiveObjectId(UNORDERED_MAP<u16, ClientActiveObject*> &objects)
 {
 	//try to reuse id's as late as possible
 	static u16 last_used_id = 0;
 	u16 startid = last_used_id;
-	for(;;)
-	{
+	for(;;) {
 		last_used_id ++;
-		if(isFreeClientActiveObjectId(last_used_id, objects))
+		if (isFreeClientActiveObjectId(last_used_id, objects))
 			return last_used_id;
 
-		if(last_used_id == startid)
+		if (last_used_id == startid)
 			return 0;
 	}
 }
@@ -2714,8 +2705,7 @@ u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
 		}
 		object->setId(new_id);
 	}
-	if(isFreeClientActiveObjectId(object->getId(), m_active_objects) == false)
-	{
+	if(!isFreeClientActiveObjectId(object->getId(), m_active_objects)) {
 		infostream<<"ClientEnvironment::addActiveObject(): "
 				<<"id is not free ("<<object->getId()<<")"<<std::endl;
 		delete object;
@@ -2779,8 +2769,7 @@ void ClientEnvironment::removeActiveObject(u16 id)
 	verbosestream<<"ClientEnvironment::removeActiveObject(): "
 			<<"id="<<id<<std::endl;
 	ClientActiveObject* obj = getActiveObject(id);
-	if(obj == NULL)
-	{
+	if (obj == NULL) {
 		infostream<<"ClientEnvironment::removeActiveObject(): "
 				<<"id="<<id<<" not found"<<std::endl;
 		return;
@@ -2848,10 +2837,8 @@ void ClientEnvironment::updateLocalPlayerBreath(u16 breath)
 void ClientEnvironment::getActiveObjects(v3f origin, f32 max_d,
 		std::vector<DistanceSortedActiveObject> &dest)
 {
-	for(std::map<u16, ClientActiveObject*>::iterator
-			i = m_active_objects.begin();
-			i != m_active_objects.end(); ++i)
-	{
+	for (UNORDERED_MAP<u16, ClientActiveObject*>::iterator i = m_active_objects.begin();
+			i != m_active_objects.end(); ++i) {
 		ClientActiveObject* obj = i->second;
 
 		f32 d = (obj->getPosition() - origin).getLength();
diff --git a/src/environment.h b/src/environment.h
index 66d9c19c0..99066c367 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -94,8 +94,8 @@ public:
 	u32 m_added_objects;
 
 protected:
-	Player * getPlayer(u16 peer_id);
-	Player * getPlayer(const char *name);
+	Player *getPlayer(u16 peer_id);
+	Player *getPlayer(const char *name);
 
 	// peer_ids in here should be unique, except that there may be many 0s
 	std::vector<Player*> m_players;
@@ -324,7 +324,7 @@ public:
 	// Save players
 	void saveLoadedPlayers();
 	void savePlayer(RemotePlayer *player);
-	Player *loadPlayer(const std::string &playername);
+	RemotePlayer *loadPlayer(const std::string &playername);
 
 	/*
 		Save and load time of day and game timer
@@ -368,7 +368,7 @@ public:
 		Find out what new objects have been added to
 		inside a radius around a position
 	*/
-	void getAddedActiveObjects(Player *player, s16 radius,
+	void getAddedActiveObjects(RemotePlayer *player, s16 radius,
 			s16 player_radius,
 			std::set<u16> &current_objects,
 			std::queue<u16> &added_objects);
@@ -377,7 +377,7 @@ public:
 		Find out what new objects have been removed from
 		inside a radius around a position
 	*/
-	void getRemovedActiveObjects(Player* player, s16 radius,
+	void getRemovedActiveObjects(RemotePlayer* player, s16 radius,
 			s16 player_radius,
 			std::set<u16> &current_objects,
 			std::queue<u16> &removed_objects);
@@ -649,7 +649,7 @@ private:
 	ITextureSource *m_texturesource;
 	IGameDef *m_gamedef;
 	IrrlichtDevice *m_irr;
-	std::map<u16, ClientActiveObject*> m_active_objects;
+	UNORDERED_MAP<u16, ClientActiveObject*> m_active_objects;
 	std::vector<ClientSimpleObject*> m_simple_objects;
 	std::queue<ClientEnvEvent> m_client_event_queue;
 	IntervalLimiter m_active_object_light_update_interval;
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 35e350f20..b39356e92 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -110,7 +110,7 @@ void Client::handleCommand_AuthAccept(NetworkPacket* pkt)
 	playerpos -= v3f(0, BS / 2, 0);
 
 	// Set player position
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 	player->setPosition(playerpos);
 
@@ -176,7 +176,7 @@ void Client::handleCommand_InitLegacy(NetworkPacket* pkt)
 
 
 	// Set player position
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 	player->setPosition(playerpos_f);
 
@@ -333,7 +333,7 @@ void Client::handleCommand_Inventory(NetworkPacket* pkt)
 	std::string datastring(pkt->getString(0), pkt->getSize());
 	std::istringstream is(datastring, std::ios_base::binary);
 
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
 	player->inventory.deSerialize(is);
@@ -486,7 +486,7 @@ void Client::handleCommand_ActiveObjectMessages(NetworkPacket* pkt)
 
 void Client::handleCommand_Movement(NetworkPacket* pkt)
 {
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
 	float mad, maa, maf, msw, mscr, msf, mscl, msj, lf, lfs, ls, g;
@@ -511,7 +511,7 @@ void Client::handleCommand_Movement(NetworkPacket* pkt)
 void Client::handleCommand_HP(NetworkPacket* pkt)
 {
 
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
 	u8 oldhp   = player->hp;
@@ -532,7 +532,7 @@ void Client::handleCommand_HP(NetworkPacket* pkt)
 
 void Client::handleCommand_Breath(NetworkPacket* pkt)
 {
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
 	u16 breath;
@@ -544,7 +544,7 @@ void Client::handleCommand_Breath(NetworkPacket* pkt)
 
 void Client::handleCommand_MovePlayer(NetworkPacket* pkt)
 {
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
 	v3f pos;
@@ -840,7 +840,7 @@ void Client::handleCommand_Privileges(NetworkPacket* pkt)
 
 void Client::handleCommand_InventoryFormSpec(NetworkPacket* pkt)
 {
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
 	// Store formspec in LocalPlayer
@@ -1098,7 +1098,7 @@ void Client::handleCommand_HudSetFlags(NetworkPacket* pkt)
 
 	*pkt >> flags >> mask;
 
-	Player *player = m_env.getLocalPlayer();
+	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
 	bool was_minimap_visible = player->hud_flags & HUD_FLAG_MINIMAP_VISIBLE;
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 6ef768295..554025747 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1052,7 +1052,7 @@ void Server::handleCommand_ChatMessage(NetworkPacket* pkt)
 		message += (wchar_t)tmp_wchar;
 	}
 
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -1179,7 +1179,7 @@ void Server::handleCommand_Password(NetworkPacket* pkt)
 		newpwd += c;
 	}
 
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
@@ -1255,7 +1255,7 @@ void Server::handleCommand_PlayerItem(NetworkPacket* pkt)
 
 void Server::handleCommand_Respawn(NetworkPacket* pkt)
 {
-	Player *player = m_env->getPlayer(pkt->getPeerId());
+	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
 				"No player for peer_id=" << pkt->getPeerId()
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index b58d8e6cd..74b33da37 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -533,7 +533,7 @@ int ObjectRef::l_get_local_animation(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -584,7 +584,7 @@ int ObjectRef::l_get_eye_offset(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 	// Do it
@@ -762,7 +762,7 @@ int ObjectRef::l_is_player(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	lua_pushboolean(L, (player != NULL));
 	return 1;
 }
@@ -973,7 +973,7 @@ int ObjectRef::l_is_player_connected(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	lua_pushboolean(L, (player != NULL && player->peer_id != 0));
 	return 1;
 }
@@ -983,7 +983,7 @@ int ObjectRef::l_get_player_name(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) {
 		lua_pushlstring(L, "", 0);
 		return 1;
@@ -998,7 +998,7 @@ int ObjectRef::l_get_player_velocity(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) {
 		lua_pushnil(L);
 		return 1;
@@ -1013,7 +1013,7 @@ int ObjectRef::l_get_look_dir(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) return 0;
 	// Do it
 	float pitch = player->getRadPitchDep();
@@ -1033,7 +1033,7 @@ int ObjectRef::l_get_look_pitch(lua_State *L)
 		"Deprecated call to get_look_pitch, use get_look_vertical instead");
 
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) return 0;
 	// Do it
 	lua_pushnumber(L, player->getRadPitchDep());
@@ -1050,7 +1050,7 @@ int ObjectRef::l_get_look_yaw(lua_State *L)
 		"Deprecated call to get_look_yaw, use get_look_horizontal instead");
 
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) return 0;
 	// Do it
 	lua_pushnumber(L, player->getRadYawDep());
@@ -1062,7 +1062,7 @@ int ObjectRef::l_get_look_vertical(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) return 0;
 	// Do it
 	lua_pushnumber(L, player->getRadPitch());
@@ -1074,7 +1074,7 @@ int ObjectRef::l_get_look_horizontal(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) return 0;
 	// Do it
 	lua_pushnumber(L, player->getRadYaw());
@@ -1179,7 +1179,7 @@ int ObjectRef::l_set_inventory_formspec(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) return 0;
 	std::string formspec = luaL_checkstring(L, 2);
 
@@ -1194,7 +1194,7 @@ int ObjectRef::l_get_inventory_formspec(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) return 0;
 
 	std::string formspec = player->inventory_formspec;
@@ -1207,7 +1207,7 @@ int ObjectRef::l_get_player_control(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) {
 		lua_pushlstring(L, "", 0);
 		return 1;
@@ -1241,7 +1241,7 @@ int ObjectRef::l_get_player_control_bits(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL) {
 		lua_pushlstring(L, "", 0);
 		return 1;
@@ -1416,7 +1416,7 @@ int ObjectRef::l_hud_get(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1493,7 +1493,7 @@ int ObjectRef::l_hud_get_flags(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 
@@ -1649,7 +1649,7 @@ int ObjectRef::l_get_sky(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	Player *player = getplayer(ref);
+	RemotePlayer *player = getplayer(ref);
 	if (player == NULL)
 		return 0;
 	video::SColor bgcolor(255, 255, 255, 255);
diff --git a/src/server.cpp b/src/server.cpp
index dee8a3d70..67dbe1545 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -692,7 +692,7 @@ void Server::AsyncRunStep(bool initial_step)
 			if (client->getState() < CS_DefinitionsSent)
 				continue;
 
-			Player *player = m_env->getPlayer(client->peer_id);
+			RemotePlayer *player = m_env->getPlayer(client->peer_id);
 			if (player == NULL) {
 				// This can happen if the client timeouts somehow
 				/*warningstream<<FUNCTION_NAME<<": Client "
@@ -1857,7 +1857,7 @@ void Server::SendPlayerBreath(u16 peer_id)
 void Server::SendMovePlayer(u16 peer_id)
 {
 	DSTACK(FUNCTION_NAME);
-	Player *player = m_env->getPlayer(peer_id);
+	RemotePlayer *player = m_env->getPlayer(peer_id);
 	assert(player);
 
 	NetworkPacket pkt(TOCLIENT_MOVE_PLAYER, sizeof(v3f) + sizeof(f32) * 2, peer_id);
@@ -1896,7 +1896,7 @@ void Server::SendEyeOffset(u16 peer_id, v3f first, v3f third)
 }
 void Server::SendPlayerPrivileges(u16 peer_id)
 {
-	Player *player = m_env->getPlayer(peer_id);
+	RemotePlayer *player = m_env->getPlayer(peer_id);
 	assert(player);
 	if(player->peer_id == PEER_ID_INEXISTENT)
 		return;
@@ -1917,7 +1917,7 @@ void Server::SendPlayerPrivileges(u16 peer_id)
 
 void Server::SendPlayerInventoryFormspec(u16 peer_id)
 {
-	Player *player = m_env->getPlayer(peer_id);
+	RemotePlayer *player = m_env->getPlayer(peer_id);
 	assert(player);
 	if(player->peer_id == PEER_ID_INEXISTENT)
 		return;
@@ -1962,7 +1962,7 @@ s32 Server::playSound(const SimpleSoundSpec &spec,
 	std::vector<u16> dst_clients;
 	if(params.to_player != "")
 	{
-		Player *player = m_env->getPlayer(params.to_player.c_str());
+		RemotePlayer *player = m_env->getPlayer(params.to_player.c_str());
 		if(!player){
 			infostream<<"Server::playSound: Player \""<<params.to_player
 					<<"\" not found"<<std::endl;
@@ -1978,13 +1978,12 @@ s32 Server::playSound(const SimpleSoundSpec &spec,
 	else {
 		std::vector<u16> clients = m_clients.getClientIDs();
 
-		for(std::vector<u16>::iterator
-				i = clients.begin(); i != clients.end(); ++i) {
-			Player *player = m_env->getPlayer(*i);
-			if(!player)
+		for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
+			RemotePlayer *player = m_env->getPlayer(*i);
+			if (!player)
 				continue;
 
-			if(pos_exists) {
+			if (pos_exists) {
 				if(player->getPosition().getDistanceFrom(pos) >
 						params.max_hear_distance)
 					continue;
@@ -2048,7 +2047,7 @@ void Server::sendRemoveNode(v3s16 p, u16 ignore_id,
 		i != clients.end(); ++i) {
 		if (far_players) {
 			// Get player
-			if(Player *player = m_env->getPlayer(*i)) {
+			if (RemotePlayer *player = m_env->getPlayer(*i)) {
 				// If player is far away, only set modified blocks not sent
 				v3f player_pos = player->getPosition();
 				if(player_pos.getDistanceFrom(p_f) > maxd) {
@@ -2076,7 +2075,7 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
 
 		if(far_players) {
 			// Get player
-			if(Player *player = m_env->getPlayer(*i)) {
+			if (RemotePlayer *player = m_env->getPlayer(*i)) {
 				// If player is far away, only set modified blocks not sent
 				v3f player_pos = player->getPosition();
 				if(player_pos.getDistanceFrom(p_f) > maxd) {
@@ -2661,8 +2660,8 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 				for(std::vector<u16>::iterator i = clients.begin();
 					i != clients.end(); ++i) {
 					// Get player
-					Player *player = m_env->getPlayer(*i);
-					if(!player)
+					RemotePlayer *player = m_env->getPlayer(*i);
+					if (!player)
 						continue;
 
 					// Get name of player
@@ -2842,8 +2841,8 @@ RemoteClient* Server::getClientNoEx(u16 peer_id, ClientState state_min)
 
 std::string Server::getPlayerName(u16 peer_id)
 {
-	Player *player = m_env->getPlayer(peer_id);
-	if(player == NULL)
+	RemotePlayer *player = m_env->getPlayer(peer_id);
+	if (player == NULL)
 		return "[id="+itos(peer_id)+"]";
 	return player->getName();
 }
@@ -2870,13 +2869,12 @@ std::wstring Server::getStatusString()
 	bool first = true;
 	os<<L", clients={";
 	std::vector<u16> clients = m_clients.getClientIDs();
-	for(std::vector<u16>::iterator i = clients.begin();
-		i != clients.end(); ++i) {
+	for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
 		// Get player
-		Player *player = m_env->getPlayer(*i);
+		RemotePlayer *player = m_env->getPlayer(*i);
 		// Get name of player
 		std::wstring name = L"unknown";
-		if(player != NULL)
+		if (player != NULL)
 			name = narrow_to_wide(player->getName());
 		// Add name to information string
 		if(!first)
@@ -2912,12 +2910,11 @@ void Server::reportPrivsModified(const std::string &name)
 		std::vector<u16> clients = m_clients.getClientIDs();
 		for(std::vector<u16>::iterator i = clients.begin();
 				i != clients.end(); ++i) {
-			Player *player = m_env->getPlayer(*i);
+			RemotePlayer *player = m_env->getPlayer(*i);
 			reportPrivsModified(player->getName());
 		}
 	} else {
-		RemotePlayer *player =
-			dynamic_cast<RemotePlayer *>(m_env->getPlayer(name.c_str()));
+		RemotePlayer *player = m_env->getPlayer(name.c_str());
 		if (!player)
 			return;
 		SendPlayerPrivileges(player->peer_id);
@@ -2932,8 +2929,8 @@ void Server::reportPrivsModified(const std::string &name)
 
 void Server::reportInventoryFormspecModified(const std::string &name)
 {
-	Player *player = m_env->getPlayer(name.c_str());
-	if(!player)
+	RemotePlayer *player = m_env->getPlayer(name.c_str());
+	if (!player)
 		return;
 	SendPlayerInventoryFormspec(player->peer_id);
 }
@@ -2963,7 +2960,7 @@ void Server::notifyPlayer(const char *name, const std::wstring &msg)
 		m_admin_chat->outgoing_queue.push_back(new ChatEventChat("", msg));
 	}
 
-	Player *player = m_env->getPlayer(name);
+	RemotePlayer *player = m_env->getPlayer(name);
 	if (!player) {
 		return;
 	}
@@ -2981,7 +2978,7 @@ bool Server::showFormspec(const char *playername, const std::string &formspec,
 	if (!m_env)
 		return false;
 
-	Player *player = m_env->getPlayer(playername);
+	RemotePlayer *player = m_env->getPlayer(playername);
 	if (!player)
 		return false;
 
@@ -3152,7 +3149,7 @@ void Server::spawnParticle(const std::string &playername, v3f pos,
 
 	u16 peer_id = PEER_ID_INEXISTENT;
 	if (playername != "") {
-		Player* player = m_env->getPlayer(playername.c_str());
+		RemotePlayer* player = m_env->getPlayer(playername.c_str());
 		if (!player)
 			return;
 		peer_id = player->peer_id;
@@ -3176,7 +3173,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 
 	u16 peer_id = PEER_ID_INEXISTENT;
 	if (playername != "") {
-		Player* player = m_env->getPlayer(playername.c_str());
+		RemotePlayer* player = m_env->getPlayer(playername.c_str());
 		if (!player)
 			return -1;
 		peer_id = player->peer_id;
@@ -3199,7 +3196,7 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
 
 	u16 peer_id = PEER_ID_INEXISTENT;
 	if (playername != "") {
-		Player* player = m_env->getPlayer(playername.c_str());
+		RemotePlayer* player = m_env->getPlayer(playername.c_str());
 		if (!player)
 			return;
 		peer_id = player->peer_id;

From edba6e50d9c9c0a7120c251bed36a87b51f4c826 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 8 Oct 2016 16:42:09 +0200
Subject: [PATCH 231/418] Optimize ClientIface::getPlayerNames(): return const
 ref instead a copy of all names

---
 src/clientiface.cpp | 6 ------
 src/clientiface.h   | 2 +-
 src/server.cpp      | 6 +++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index e55c07cb6..fbfc16770 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -627,12 +627,6 @@ std::vector<u16> ClientInterface::getClientIDs(ClientState min_state)
 	return reply;
 }
 
-std::vector<std::string> ClientInterface::getPlayerNames()
-{
-	return m_clients_names;
-}
-
-
 void ClientInterface::step(float dtime)
 {
 	m_print_info_timer += dtime;
diff --git a/src/clientiface.h b/src/clientiface.h
index 8985ef71f..551d71bbe 100644
--- a/src/clientiface.h
+++ b/src/clientiface.h
@@ -453,7 +453,7 @@ public:
 	std::vector<u16> getClientIDs(ClientState min_state=CS_Active);
 
 	/* get list of client player names */
-	std::vector<std::string> getPlayerNames();
+	const std::vector<std::string> &getPlayerNames() const { return m_clients_names; }
 
 	/* send message to client */
 	void send(u16 peer_id, u8 channelnum, NetworkPacket* pkt, bool reliable);
diff --git a/src/server.cpp b/src/server.cpp
index 67dbe1545..edd97e225 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1123,11 +1123,11 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
 		Print out action
 	*/
 	{
-		std::vector<std::string> names = m_clients.getPlayerNames();
+		const std::vector<std::string> &names = m_clients.getPlayerNames();
 
-		actionstream<<player->getName() <<" joins game. List of players: ";
+		actionstream << player->getName() << " joins game. List of players: ";
 
-		for (std::vector<std::string>::iterator i = names.begin();
+		for (std::vector<std::string>::const_iterator i = names.begin();
 				i != names.end(); ++i) {
 			actionstream << *i << " ";
 		}

From 7bbd716426bf989bf071e2322a9b797cc5f78acb Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 8 Oct 2016 17:56:38 +0200
Subject: [PATCH 232/418] RemotePlayer/LocalPlayer Player base class proper
 separation (code cleanup) (patch 3 of X)

* remove IGameDef from Player class, only LocalPlayer has it now
* move many attributes/functions only used by LocalPlayer from Player to LocalPlayer
* move many attributes/functions only used by RemotePlayer from Player to RemotePlayer
* make some functions const
* hudGetHotbarSelectedImage now returns const ref
* RemotePlayer getHotbarSelectedImage now returns const ref
* various code style fixes
---
 src/environment.cpp             |  22 +--
 src/environment.h               |   2 +-
 src/localplayer.cpp             |  24 ++-
 src/localplayer.h               |  24 ++-
 src/player.cpp                  | 176 ++++++++++-----------
 src/player.h                    | 270 +++++++++++++-------------------
 src/script/lua_api/l_object.cpp |   2 +-
 src/server.cpp                  |  22 +--
 src/server.h                    |   5 +-
 9 files changed, 255 insertions(+), 292 deletions(-)

diff --git a/src/environment.cpp b/src/environment.cpp
index bc246f66c..514aa918a 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -603,8 +603,9 @@ void ServerEnvironment::kickAllPlayers(AccessDeniedCode reason,
 {
 	for (std::vector<Player*>::iterator it = m_players.begin();
 			it != m_players.end(); ++it) {
-		((Server*)m_gamedef)->DenyAccessVerCompliant((*it)->peer_id,
-			(*it)->protocol_version, reason, str_reason, reconnect);
+		RemotePlayer *player = dynamic_cast<RemotePlayer *>(*it);
+		((Server*)m_gamedef)->DenyAccessVerCompliant(player->peer_id,
+				player->protocol_version, reason, str_reason, reconnect);
 	}
 }
 
@@ -618,7 +619,7 @@ void ServerEnvironment::saveLoadedPlayers()
 			++it) {
 		RemotePlayer *player = static_cast<RemotePlayer*>(*it);
 		if (player->checkModified()) {
-			player->save(players_path);
+			player->save(players_path, m_gamedef);
 		}
 	}
 }
@@ -628,7 +629,7 @@ void ServerEnvironment::savePlayer(RemotePlayer *player)
 	std::string players_path = m_path_world + DIR_DELIM "players";
 	fs::CreateDir(players_path);
 
-	player->save(players_path);
+	player->save(players_path, m_gamedef);
 }
 
 RemotePlayer *ServerEnvironment::loadPlayer(const std::string &playername)
@@ -640,7 +641,7 @@ RemotePlayer *ServerEnvironment::loadPlayer(const std::string &playername)
 
 	RemotePlayer *player = getPlayer(playername.c_str());
 	if (!player) {
-		player = new RemotePlayer(m_gamedef, "");
+		player = new RemotePlayer("", m_gamedef->idef());
 		newplayer = true;
 	}
 
@@ -2300,15 +2301,14 @@ LocalPlayer *ClientEnvironment::getPlayer(const char* name)
 	return dynamic_cast<LocalPlayer *>(Environment::getPlayer(name));
 }
 
-void ClientEnvironment::addPlayer(Player *player)
+void ClientEnvironment::addPlayer(LocalPlayer *player)
 {
 	DSTACK(FUNCTION_NAME);
 	/*
-		It is a failure if player is local and there already is a local
-		player
+		It is a failure if already is a local player
 	*/
-	FATAL_ERROR_IF(player->isLocal() && getLocalPlayer() != NULL,
-				   "Player is local but there is already a local player");
+	FATAL_ERROR_IF(getLocalPlayer() != NULL,
+			"Player is local but there is already a local player");
 
 	Environment::addPlayer(player);
 }
@@ -2563,7 +2563,7 @@ void ClientEnvironment::step(float dtime)
 	*/
 	for (std::vector<Player*>::iterator i = m_players.begin();
 			i != m_players.end(); ++i) {
-		LocalPlayer *player = dynamic_cast<LocalPlayer *>(*i);
+		Player *player = *i;
 		assert(player);
 
 		/*
diff --git a/src/environment.h b/src/environment.h
index 99066c367..7ed38ad5d 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -579,7 +579,7 @@ public:
 
 	void step(f32 dtime);
 
-	virtual void addPlayer(Player *player);
+	virtual void addPlayer(LocalPlayer *player);
 	LocalPlayer * getLocalPlayer();
 
 	/*
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 732ca8acf..bc242a59d 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -26,16 +26,29 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "environment.h"
 #include "map.h"
-#include "util/numeric.h"
+#include "client.h"
 
 /*
 	LocalPlayer
 */
 
-LocalPlayer::LocalPlayer(IGameDef *gamedef, const char *name):
-	Player(gamedef, name),
+LocalPlayer::LocalPlayer(Client *gamedef, const char *name):
+	Player(name, gamedef->idef()),
 	parent(0),
+	got_teleported(false),
 	isAttached(false),
+	touching_ground(false),
+	in_liquid(false),
+	in_liquid_stable(false),
+	liquid_viscosity(0),
+	is_climbing(false),
+	swimming_vertical(false),
+	// Movement overrides are multipliers and must be 1 by default
+	physics_override_speed(1.0f),
+	physics_override_jump(1.0f),
+	physics_override_gravity(1.0f),
+	physics_override_sneak(true),
+	physics_override_sneak_glitch(true),
 	overridePosition(v3f(0,0,0)),
 	last_position(v3f(0,0,0)),
 	last_speed(v3f(0,0,0)),
@@ -47,6 +60,8 @@ LocalPlayer::LocalPlayer(IGameDef *gamedef, const char *name):
 	hotbar_image(""),
 	hotbar_selected_image(""),
 	light_color(255,255,255,255),
+	hurt_tilt_timer(0.0f),
+	hurt_tilt_strength(0.0f),
 	m_sneak_node(32767,32767,32767),
 	m_sneak_node_exists(false),
 	m_need_to_get_new_sneak_node(true),
@@ -54,7 +69,8 @@ LocalPlayer::LocalPlayer(IGameDef *gamedef, const char *name):
 	m_old_node_below(32767,32767,32767),
 	m_old_node_below_type("air"),
 	m_can_jump(false),
-	m_cao(NULL)
+	m_cao(NULL),
+	m_gamedef(gamedef)
 {
 	// Initialize hp to 0, so that no hearts will be shown if server
 	// doesn't support health points
diff --git a/src/localplayer.h b/src/localplayer.h
index 8897adc5e..182b51d4d 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -21,8 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define LOCALPLAYER_HEADER
 
 #include "player.h"
+#include "environment.h"
 #include <list>
 
+class Client;
 class Environment;
 class GenericCAO;
 class ClientActiveObject;
@@ -32,7 +34,7 @@ enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM};  // no local
 class LocalPlayer : public Player
 {
 public:
-	LocalPlayer(IGameDef *gamedef, const char *name);
+	LocalPlayer(Client *gamedef, const char *name);
 	virtual ~LocalPlayer();
 
 	bool isLocal() const
@@ -42,7 +44,23 @@ public:
 
 	ClientActiveObject *parent;
 
+	bool got_teleported;
 	bool isAttached;
+	bool touching_ground;
+	// This oscillates so that the player jumps a bit above the surface
+	bool in_liquid;
+	// This is more stable and defines the maximum speed of the player
+	bool in_liquid_stable;
+	// Gets the viscosity of water to calculate friction
+	u8 liquid_viscosity;
+	bool is_climbing;
+	bool swimming_vertical;
+
+	float physics_override_speed;
+	float physics_override_jump;
+	float physics_override_gravity;
+	bool physics_override_sneak;
+	bool physics_override_sneak_glitch;
 
 	v3f overridePosition;
 
@@ -71,6 +89,9 @@ public:
 
 	video::SColor light_color;
 
+	float hurt_tilt_timer;
+	float hurt_tilt_strength;
+
 	GenericCAO* getCAO() const {
 		return m_cao;
 	}
@@ -102,6 +123,7 @@ private:
 	bool m_can_jump;
 
 	GenericCAO* m_cao;
+	Client *m_gamedef;
 };
 
 #endif
diff --git a/src/player.cpp b/src/player.cpp
index fd72d63b6..c0d367134 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -32,31 +32,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"  // strlcpy
 
 
-Player::Player(IGameDef *gamedef, const char *name):
-	got_teleported(false),
-	touching_ground(false),
-	in_liquid(false),
-	in_liquid_stable(false),
-	liquid_viscosity(0),
-	is_climbing(false),
-	swimming_vertical(false),
+Player::Player(const char *name, IItemDefManager *idef):
 	camera_barely_in_ceiling(false),
-	inventory(gamedef->idef()),
+	inventory(idef),
 	hp(PLAYER_MAX_HP),
-	hurt_tilt_timer(0),
-	hurt_tilt_strength(0),
-	protocol_version(0),
 	peer_id(PEER_ID_INEXISTENT),
 	keyPressed(0),
 // protected
-	m_gamedef(gamedef),
 	m_breath(PLAYER_MAX_BREATH),
 	m_pitch(0),
 	m_yaw(0),
 	m_speed(0,0,0),
 	m_position(0,0,0),
-	m_collisionbox(-BS*0.30,0.0,-BS*0.30,BS*0.30,BS*1.75,BS*0.30),
-	m_dirty(false)
+	m_collisionbox(-BS*0.30,0.0,-BS*0.30,BS*0.30,BS*1.75,BS*0.30)
 {
 	strlcpy(m_name, name, PLAYERNAME_SIZE);
 
@@ -92,13 +80,6 @@ Player::Player(IGameDef *gamedef, const char *name):
 	movement_gravity                = 9.81 * BS;
 	local_animation_speed           = 0.0;
 
-	// Movement overrides are multipliers and must be 1 by default
-	physics_override_speed        = 1;
-	physics_override_jump         = 1;
-	physics_override_gravity      = 1;
-	physics_override_sneak        = true;
-	physics_override_sneak_glitch = true;
-
 	hud_flags =
 		HUD_FLAG_HOTBAR_VISIBLE    | HUD_FLAG_HEALTHBAR_VISIBLE |
 		HUD_FLAG_CROSSHAIR_VISIBLE | HUD_FLAG_WIELDITEM_VISIBLE |
@@ -117,70 +98,6 @@ v3s16 Player::getLightPosition() const
 	return floatToInt(m_position + v3f(0,BS+BS/2,0), BS);
 }
 
-void Player::serialize(std::ostream &os)
-{
-	// Utilize a Settings object for storing values
-	Settings args;
-	args.setS32("version", 1);
-	args.set("name", m_name);
-	//args.set("password", m_password);
-	args.setFloat("pitch", m_pitch);
-	args.setFloat("yaw", m_yaw);
-	args.setV3F("position", m_position);
-	args.setS32("hp", hp);
-	args.setS32("breath", m_breath);
-
-	args.writeLines(os);
-
-	os<<"PlayerArgsEnd\n";
-
-	inventory.serialize(os);
-}
-
-void Player::deSerialize(std::istream &is, std::string playername)
-{
-	Settings args;
-
-	if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
-		throw SerializationError("PlayerArgsEnd of player " +
-				playername + " not found!");
-	}
-
-	m_dirty = true;
-	//args.getS32("version"); // Version field value not used
-	std::string name = args.get("name");
-	strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
-	setPitch(args.getFloat("pitch"));
-	setYaw(args.getFloat("yaw"));
-	setPosition(args.getV3F("position"));
-	try{
-		hp = args.getS32("hp");
-	}catch(SettingNotFoundException &e) {
-		hp = PLAYER_MAX_HP;
-	}
-	try{
-		m_breath = args.getS32("breath");
-	}catch(SettingNotFoundException &e) {
-		m_breath = PLAYER_MAX_BREATH;
-	}
-
-	inventory.deSerialize(is);
-
-	if(inventory.getList("craftpreview") == NULL) {
-		// Convert players without craftpreview
-		inventory.addList("craftpreview", 1);
-
-		bool craftresult_is_preview = true;
-		if(args.exists("craftresult_is_preview"))
-			craftresult_is_preview = args.getBool("craftresult_is_preview");
-		if(craftresult_is_preview)
-		{
-			// Clear craftresult
-			inventory.getList("craftresult")->changeItem(0, ItemStack());
-		}
-	}
-}
-
 u32 Player::addHud(HudElement *toadd)
 {
 	MutexAutoLock lock(m_mutex);
@@ -227,17 +144,24 @@ void Player::clearHud()
 	}
 }
 
+/*
+	RemotePlayer
+*/
 // static config cache for remoteplayer
 bool RemotePlayer::m_setting_cache_loaded = false;
 float RemotePlayer::m_setting_chat_message_limit_per_10sec = 0.0f;
 u16 RemotePlayer::m_setting_chat_message_limit_trigger_kick = 0;
 
-RemotePlayer::RemotePlayer(IGameDef *gamedef, const char *name):
-	Player(gamedef, name),
+RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
+	Player(name, idef),
+	protocol_version(0),
 	m_sao(NULL),
+	m_dirty(false),
 	m_last_chat_message_sent(time(NULL)),
 	m_chat_message_allowance(5.0f),
-	m_message_rate_overhead(0)
+	m_message_rate_overhead(0),
+	hud_hotbar_image(""),
+	hud_hotbar_selected_image("")
 {
 	if (!RemotePlayer::m_setting_cache_loaded) {
 		RemotePlayer::m_setting_chat_message_limit_per_10sec =
@@ -260,7 +184,7 @@ RemotePlayer::RemotePlayer(IGameDef *gamedef, const char *name):
 	movement_gravity                = g_settings->getFloat("movement_gravity")                * BS;
 }
 
-void RemotePlayer::save(std::string savedir)
+void RemotePlayer::save(std::string savedir, IGameDef *gamedef)
 {
 	/*
 	 * We have to open all possible player files in the players directory
@@ -269,7 +193,7 @@ void RemotePlayer::save(std::string savedir)
 	 */
 
 	// A player to deserialize files into to check their names
-	RemotePlayer testplayer(m_gamedef, "");
+	RemotePlayer testplayer("", gamedef->idef());
 
 	savedir += DIR_DELIM;
 	std::string path = savedir + m_name;
@@ -309,11 +233,75 @@ void RemotePlayer::save(std::string savedir)
 	return;
 }
 
-/*
-	RemotePlayer
-*/
+void RemotePlayer::deSerialize(std::istream &is, const std::string &playername)
+{
+	Settings args;
+
+	if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
+		throw SerializationError("PlayerArgsEnd of player " +
+								 playername + " not found!");
+	}
+
+	m_dirty = true;
+	//args.getS32("version"); // Version field value not used
+	std::string name = args.get("name");
+	strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
+	setPitch(args.getFloat("pitch"));
+	setYaw(args.getFloat("yaw"));
+	setPosition(args.getV3F("position"));
+	try{
+		hp = args.getS32("hp");
+	}catch(SettingNotFoundException &e) {
+		hp = PLAYER_MAX_HP;
+	}
+	try{
+		m_breath = args.getS32("breath");
+	}catch(SettingNotFoundException &e) {
+		m_breath = PLAYER_MAX_BREATH;
+	}
+
+	inventory.deSerialize(is);
+
+	if(inventory.getList("craftpreview") == NULL) {
+		// Convert players without craftpreview
+		inventory.addList("craftpreview", 1);
+
+		bool craftresult_is_preview = true;
+		if(args.exists("craftresult_is_preview"))
+			craftresult_is_preview = args.getBool("craftresult_is_preview");
+		if(craftresult_is_preview)
+		{
+			// Clear craftresult
+			inventory.getList("craftresult")->changeItem(0, ItemStack());
+		}
+	}
+}
+
+void RemotePlayer::serialize(std::ostream &os)
+{
+	// Utilize a Settings object for storing values
+	Settings args;
+	args.setS32("version", 1);
+	args.set("name", m_name);
+	//args.set("password", m_password);
+	args.setFloat("pitch", m_pitch);
+	args.setFloat("yaw", m_yaw);
+	args.setV3F("position", m_position);
+	args.setS32("hp", hp);
+	args.setS32("breath", m_breath);
+
+	args.writeLines(os);
+
+	os<<"PlayerArgsEnd\n";
+
+	inventory.serialize(os);
+}
+
 void RemotePlayer::setPosition(const v3f &position)
 {
+	if (position != m_position)
+		m_dirty = true;
+
 	Player::setPosition(position);
 	if(m_sao)
 		m_sao->setBasePosition(position);
diff --git a/src/player.h b/src/player.h
index fbd88fc71..1980a86a3 100644
--- a/src/player.h
+++ b/src/player.h
@@ -112,7 +112,7 @@ class Player
 {
 public:
 
-	Player(IGameDef *gamedef, const char *name);
+	Player(const char *name, IItemDefManager *idef);
 	virtual ~Player() = 0;
 
 	virtual void move(f32 dtime, Environment *env, f32 pos_max_d)
@@ -151,80 +151,32 @@ public:
 
 	virtual void setPosition(const v3f &position)
 	{
-		if (position != m_position)
-			m_dirty = true;
 		m_position = position;
 	}
 
-	void setPitch(f32 pitch)
+	virtual void setPitch(f32 pitch)
 	{
-		if (pitch != m_pitch)
-			m_dirty = true;
 		m_pitch = pitch;
 	}
 
 	virtual void setYaw(f32 yaw)
 	{
-		if (yaw != m_yaw)
-			m_dirty = true;
 		m_yaw = yaw;
 	}
 
-	f32 getPitch()
-	{
-		return m_pitch;
-	}
+	f32 getPitch() const { return m_pitch; }
+	f32 getYaw() const { return m_yaw; }
+	u16 getBreath() const { return m_breath; }
 
-	f32 getYaw()
-	{
-		return m_yaw;
-	}
+	virtual void setBreath(u16 breath) { m_breath = breath; }
 
-	u16 getBreath()
-	{
-		return m_breath;
-	}
+	f32 getRadPitch() const { return m_pitch * core::DEGTORAD; }
+	f32 getRadYaw() const { return m_yaw * core::DEGTORAD; }
+	const char *getName() const { return m_name; }
+	aabb3f getCollisionbox() const { return m_collisionbox; }
 
-	virtual void setBreath(u16 breath)
+	u32 getFreeHudID()
 	{
-		if (breath != m_breath)
-			m_dirty = true;
-		m_breath = breath;
-	}
-
-	// Deprecated
-	f32 getRadPitchDep()
-	{
-		return -1.0 * m_pitch * core::DEGTORAD;
-	}
-
-	// Deprecated
-	f32 getRadYawDep()
-	{
-		return (m_yaw + 90.) * core::DEGTORAD;
-	}
-
-	f32 getRadPitch()
-	{
-		return m_pitch * core::DEGTORAD;
-	}
-
-	f32 getRadYaw()
-	{
-		return m_yaw * core::DEGTORAD;
-	}
-
-	const char *getName() const
-	{
-		return m_name;
-	}
-
-	aabb3f getCollisionbox()
-	{
-		return m_collisionbox;
-	}
-
-	u32 getFreeHudID() {
 		size_t size = hud.size();
 		for (size_t i = 0; i != size; i++) {
 			if (!hud[i])
@@ -233,41 +185,6 @@ public:
 		return size;
 	}
 
-	void setHotbarImage(const std::string &name)
-	{
-		hud_hotbar_image = name;
-	}
-
-	std::string getHotbarImage()
-	{
-		return hud_hotbar_image;
-	}
-
-	void setHotbarSelectedImage(const std::string &name)
-	{
-		hud_hotbar_selected_image = name;
-	}
-
-	std::string getHotbarSelectedImage() {
-		return hud_hotbar_selected_image;
-	}
-
-	void setSky(const video::SColor &bgcolor, const std::string &type,
-		const std::vector<std::string> &params)
-	{
-		m_sky_bgcolor = bgcolor;
-		m_sky_type = type;
-		m_sky_params = params;
-	}
-
-	void getSky(video::SColor *bgcolor, std::string *type,
-		std::vector<std::string> *params)
-	{
-		*bgcolor = m_sky_bgcolor;
-		*type = m_sky_type;
-		*params = m_sky_params;
-	}
-
 	void setLocalAnimations(v2s32 frames[4], float frame_speed)
 	{
 		for (int i = 0; i < 4; i++)
@@ -282,49 +199,8 @@ public:
 		*frame_speed = local_animation_speed;
 	}
 
-	virtual bool isLocal() const
-	{
-		return false;
-	}
+	virtual bool isLocal() const { return false; }
 
-	virtual void setPlayerSAO(PlayerSAO *sao)
-	{
-		FATAL_ERROR("FIXME");
-	}
-
-	/*
-		serialize() writes a bunch of text that can contain
-		any characters except a '\0', and such an ending that
-		deSerialize stops reading exactly at the right point.
-	*/
-	void serialize(std::ostream &os);
-	void deSerialize(std::istream &is, std::string playername);
-
-	bool checkModified() const
-	{
-		return m_dirty || inventory.checkModified();
-	}
-
-	void setModified(const bool x)
-	{
-		m_dirty = x;
-		if (!x)
-			inventory.setModified(x);
-	}
-
-	// Use a function, if isDead can be defined by other conditions
-	bool isDead() { return hp == 0; }
-
-	bool got_teleported;
-	bool touching_ground;
-	// This oscillates so that the player jumps a bit above the surface
-	bool in_liquid;
-	// This is more stable and defines the maximum speed of the player
-	bool in_liquid_stable;
-	// Gets the viscosity of water to calculate friction
-	u8 liquid_viscosity;
-	bool is_climbing;
-	bool swimming_vertical;
 	bool camera_barely_in_ceiling;
 	v3f eye_offset_first;
 	v3f eye_offset_third;
@@ -344,21 +220,11 @@ public:
 	f32 movement_liquid_sink;
 	f32 movement_gravity;
 
-	float physics_override_speed;
-	float physics_override_jump;
-	float physics_override_gravity;
-	bool physics_override_sneak;
-	bool physics_override_sneak_glitch;
-
 	v2s32 local_animations[4];
 	float local_animation_speed;
 
 	u16 hp;
 
-	float hurt_tilt_timer;
-	float hurt_tilt_strength;
-
-	u16 protocol_version;
 	u16 peer_id;
 
 	std::string inventory_formspec;
@@ -368,7 +234,6 @@ public:
 
 	u32 keyPressed;
 
-
 	HudElement* getHud(u32 id);
 	u32         addHud(HudElement* hud);
 	HudElement* removeHud(u32 id);
@@ -376,11 +241,7 @@ public:
 
 	u32 hud_flags;
 	s32 hud_hotbar_itemcount;
-	std::string hud_hotbar_image;
-	std::string hud_hotbar_selected_image;
 protected:
-	IGameDef *m_gamedef;
-
 	char m_name[PLAYERNAME_SIZE];
 	u16 m_breath;
 	f32 m_pitch;
@@ -389,13 +250,7 @@ protected:
 	v3f m_position;
 	aabb3f m_collisionbox;
 
-	bool m_dirty;
-
 	std::vector<HudElement *> hud;
-
-	std::string m_sky_type;
-	video::SColor m_sky_bgcolor;
-	std::vector<std::string> m_sky_params;
 private:
 	// Protect some critical areas
 	// hud for example can be modified by EmergeThread
@@ -414,15 +269,14 @@ enum RemotePlayerChatResult {
 class RemotePlayer : public Player
 {
 public:
-	RemotePlayer(IGameDef *gamedef, const char *name);
+	RemotePlayer(const char *name, IItemDefManager *idef);
 	virtual ~RemotePlayer() {}
 
-	void save(std::string savedir);
+	void save(std::string savedir, IGameDef *gamedef);
+	void deSerialize(std::istream &is, const std::string &playername);
 
-	PlayerSAO *getPlayerSAO()
-	{ return m_sao; }
-	void setPlayerSAO(PlayerSAO *sao)
-	{ m_sao = sao; }
+	PlayerSAO *getPlayerSAO() { return m_sao; }
+	void setPlayerSAO(PlayerSAO *sao) { m_sao = sao; }
 	void setPosition(const v3f &position);
 
 	const RemotePlayerChatResult canSendChatMessage();
@@ -446,8 +300,92 @@ public:
 		*ratio = m_day_night_ratio;
 	}
 
+	// Use a function, if isDead can be defined by other conditions
+	bool isDead() const { return hp == 0; }
+
+	void setHotbarImage(const std::string &name)
+	{
+		hud_hotbar_image = name;
+	}
+
+	std::string getHotbarImage() const
+	{
+		return hud_hotbar_image;
+	}
+
+	void setHotbarSelectedImage(const std::string &name)
+	{
+		hud_hotbar_selected_image = name;
+	}
+
+	const std::string &getHotbarSelectedImage() const
+	{
+		return hud_hotbar_selected_image;
+	}
+
+	// Deprecated
+	f32 getRadPitchDep() const { return -1.0 * m_pitch * core::DEGTORAD; }
+
+	// Deprecated
+	f32 getRadYawDep() const { return (m_yaw + 90.) * core::DEGTORAD; }
+
+	void setSky(const video::SColor &bgcolor, const std::string &type,
+				const std::vector<std::string> &params)
+	{
+		m_sky_bgcolor = bgcolor;
+		m_sky_type = type;
+		m_sky_params = params;
+	}
+
+	void getSky(video::SColor *bgcolor, std::string *type,
+				std::vector<std::string> *params)
+	{
+		*bgcolor = m_sky_bgcolor;
+		*type = m_sky_type;
+		*params = m_sky_params;
+	}
+
+	bool checkModified() const { return m_dirty || inventory.checkModified(); }
+
+	void setModified(const bool x)
+	{
+		m_dirty = x;
+		if (!x)
+			inventory.setModified(x);
+	}
+
+	virtual void setBreath(u16 breath)
+	{
+		if (breath != m_breath)
+			m_dirty = true;
+		Player::setBreath(breath);
+	}
+
+	virtual void setPitch(f32 pitch)
+	{
+		if (pitch != m_pitch)
+			m_dirty = true;
+		Player::setPitch(pitch);
+	}
+
+	virtual void setYaw(f32 yaw)
+	{
+		if (yaw != m_yaw)
+			m_dirty = true;
+		Player::setYaw(yaw);
+	}
+
+	u16 protocol_version;
 private:
+	/*
+		serialize() writes a bunch of text that can contain
+		any characters except a '\0', and such an ending that
+		deSerialize stops reading exactly at the right point.
+	*/
+	void serialize(std::ostream &os);
+
 	PlayerSAO *m_sao;
+	bool m_dirty;
 
 	static bool m_setting_cache_loaded;
 	static float m_setting_chat_message_limit_per_10sec;
@@ -459,6 +397,12 @@ private:
 
 	bool m_day_night_ratio_do_override;
 	float m_day_night_ratio;
+	std::string hud_hotbar_image;
+	std::string hud_hotbar_selected_image;
+
+	std::string m_sky_type;
+	video::SColor m_sky_bgcolor;
+	std::vector<std::string> m_sky_params;
 };
 
 #endif
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 74b33da37..a1f83919c 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -1600,7 +1600,7 @@ int ObjectRef::l_hud_get_hotbar_selected_image(lua_State *L)
 	if (player == NULL)
 		return 0;
 
-	std::string name = getServer(L)->hudGetHotbarSelectedImage(player);
+	const std::string &name = getServer(L)->hudGetHotbarSelectedImage(player);
 	lua_pushlstring(L, name.c_str(), name.size());
 	return 1;
 }
diff --git a/src/server.cpp b/src/server.cpp
index edd97e225..71e71f43e 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1108,7 +1108,7 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
 	SendPlayerBreath(peer_id);
 
 	// Show death screen if necessary
-	if(player->isDead())
+	if (player->isDead())
 		SendDeathscreen(peer_id, false, v3f(0,0,0));
 
 	// Note things in chat if not in simple singleplayer mode
@@ -3080,14 +3080,6 @@ void Server::hudSetHotbarSelectedImage(RemotePlayer *player, std::string name)
 	SendHUDSetParam(player->peer_id, HUD_PARAM_HOTBAR_SELECTED_IMAGE, name);
 }
 
-std::string Server::hudGetHotbarSelectedImage(RemotePlayer *player)
-{
-	if (!player)
-		return "";
-
-	return player->getHotbarSelectedImage();
-}
-
 bool Server::setLocalPlayerAnimations(RemotePlayer *player,
 		v2s32 animation_frames[4], f32 frame_speed)
 {
@@ -3408,11 +3400,10 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
 	/*
 		Try to get an existing player
 	*/
-	RemotePlayer *player = static_cast<RemotePlayer*>(m_env->getPlayer(name));
+	RemotePlayer *player = m_env->getPlayer(name);
 
 	// If player is already connected, cancel
-	if(player != NULL && player->peer_id != 0)
-	{
+	if (player != NULL && player->peer_id != 0) {
 		infostream<<"emergePlayer(): Player already connected"<<std::endl;
 		return NULL;
 	}
@@ -3420,8 +3411,7 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
 	/*
 		If player with the wanted peer_id already exists, cancel.
 	*/
-	if(m_env->getPlayer(peer_id) != NULL)
-	{
+	if (m_env->getPlayer(peer_id) != NULL) {
 		infostream<<"emergePlayer(): Player with wrong name but same"
 				" peer_id already exists"<<std::endl;
 		return NULL;
@@ -3429,13 +3419,13 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
 
 	// Load player if it isn't already loaded
 	if (!player) {
-		player = static_cast<RemotePlayer*>(m_env->loadPlayer(name));
+		player = m_env->loadPlayer(name);
 	}
 
 	// Create player if it doesn't exist
 	if (!player) {
 		newplayer = true;
-		player = new RemotePlayer(this, name);
+		player = new RemotePlayer(name, this->idef());
 		// Set player position
 		infostream<<"Server: Finding spawn place for player \""
 				<<name<<"\""<<std::endl;
diff --git a/src/server.h b/src/server.h
index 8eb1afc9f..fc4758c5f 100644
--- a/src/server.h
+++ b/src/server.h
@@ -317,7 +317,10 @@ public:
 	void hudSetHotbarImage(RemotePlayer *player, std::string name);
 	std::string hudGetHotbarImage(RemotePlayer *player);
 	void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);
-	std::string hudGetHotbarSelectedImage(RemotePlayer *player);
+	const std::string &hudGetHotbarSelectedImage(RemotePlayer *player) const
+	{
+		return player->getHotbarSelectedImage();
+	}
 
 	inline Address getPeerAddress(u16 peer_id)
 			{ return m_con.GetPeerAddress(peer_id); }

From 569b89b36fff058390cb90458da4285552a9c97e Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 8 Oct 2016 19:08:23 +0200
Subject: [PATCH 233/418] Move RemotePlayer code to its own cpp/header

---
 src/CMakeLists.txt              |   1 +
 src/clientiface.cpp             |   2 +-
 src/content_sao.cpp             |   6 +-
 src/content_sao.h               |   5 +-
 src/environment.cpp             |   2 +-
 src/environment.h               |   2 +-
 src/localplayer.h               |   1 +
 src/player.cpp                  | 206 ----------------------------
 src/player.h                    | 149 ---------------------
 src/remoteplayer.cpp            | 230 ++++++++++++++++++++++++++++++++
 src/remoteplayer.h              | 175 ++++++++++++++++++++++++
 src/script/lua_api/l_object.cpp |   2 +-
 src/script/lua_api/l_object.h   |   2 +-
 src/server.cpp                  |   8 +-
 src/server.h                    |   2 +-
 15 files changed, 423 insertions(+), 370 deletions(-)
 create mode 100644 src/remoteplayer.cpp
 create mode 100644 src/remoteplayer.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 753291cba..8e3ae95ab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -445,6 +445,7 @@ set(common_SRCS
 	porting.cpp
 	profiler.cpp
 	quicktune.cpp
+	remoteplayer.cpp
 	rollback.cpp
 	rollback_interface.cpp
 	serialization.cpp
diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index fbfc16770..d78cf1c53 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientiface.h"
 #include "util/numeric.h"
 #include "util/mathconstants.h"
-#include "player.h"
+#include "remoteplayer.h"
 #include "settings.h"
 #include "mapblock.h"
 #include "network/connection.h"
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 1664f5993..5d3ed38bc 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h" // For compressZlib
 #include "tool.h" // For ToolCapabilities
 #include "gamedef.h"
-#include "player.h"
+#include "remoteplayer.h"
 #include "server.h"
 #include "scripting_game.h"
 #include "genericobject.h"
@@ -391,7 +391,7 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 					(*ii).second.X, (*ii).second.Y)); // m_bone_position.size
 		}
 		os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
-		for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin(); 
+		for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin();
 				(ii != m_attachment_child_ids.end()); ++ii) {
 			if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
 				os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
@@ -880,7 +880,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 				m_physics_override_jump, m_physics_override_gravity, m_physics_override_sneak,
 				m_physics_override_sneak_glitch)); // 5
 		os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6 (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
-		for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin(); 
+		for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin();
 				ii != m_attachment_child_ids.end(); ++ii) {
 			if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
 				os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
diff --git a/src/content_sao.h b/src/content_sao.h
index 341ebb5da..76a3a37da 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "serverobject.h"
 #include "itemgroup.h"
-#include "player.h"
 #include "object_properties.h"
 
 /*
@@ -157,6 +156,8 @@ public:
 	}
 };
 
+class RemotePlayer;
+
 class PlayerSAO : public ServerActiveObject
 {
 public:
@@ -231,7 +232,7 @@ public:
 
 	void disconnected();
 
-	RemotePlayer* getPlayer() { return m_player; }
+	RemotePlayer *getPlayer() { return m_player; }
 	u16 getPeerID() const { return m_peer_id; }
 
 	// Cheat prevention
diff --git a/src/environment.cpp b/src/environment.cpp
index 514aa918a..ff43ac516 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -2705,7 +2705,7 @@ u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
 		}
 		object->setId(new_id);
 	}
-	if(!isFreeClientActiveObjectId(object->getId(), m_active_objects)) {
+	if (!isFreeClientActiveObjectId(object->getId(), m_active_objects)) {
 		infostream<<"ClientEnvironment::addActiveObject(): "
 				<<"id is not free ("<<object->getId()<<")"<<std::endl;
 		delete object;
diff --git a/src/environment.h b/src/environment.h
index 7ed38ad5d..f19708ad7 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -377,7 +377,7 @@ public:
 		Find out what new objects have been removed from
 		inside a radius around a position
 	*/
-	void getRemovedActiveObjects(RemotePlayer* player, s16 radius,
+	void getRemovedActiveObjects(RemotePlayer *player, s16 radius,
 			s16 player_radius,
 			std::set<u16> &current_objects,
 			std::queue<u16> &removed_objects);
diff --git a/src/localplayer.h b/src/localplayer.h
index 182b51d4d..9d43128aa 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -28,6 +28,7 @@ class Client;
 class Environment;
 class GenericCAO;
 class ClientActiveObject;
+class IGameDef;
 
 enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM};  // no local animation, walking, digging, both
 
diff --git a/src/player.cpp b/src/player.cpp
index c0d367134..fa82a79f4 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -19,15 +19,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "player.h"
 
-#include <fstream>
 #include "threading/mutex_auto_lock.h"
 #include "util/numeric.h"
 #include "hud.h"
 #include "constants.h"
 #include "gamedef.h"
 #include "settings.h"
-#include "content_sao.h"
-#include "filesys.h"
 #include "log.h"
 #include "porting.h"  // strlcpy
 
@@ -143,206 +140,3 @@ void Player::clearHud()
 		hud.pop_back();
 	}
 }
-
-/*
-	RemotePlayer
-*/
-// static config cache for remoteplayer
-bool RemotePlayer::m_setting_cache_loaded = false;
-float RemotePlayer::m_setting_chat_message_limit_per_10sec = 0.0f;
-u16 RemotePlayer::m_setting_chat_message_limit_trigger_kick = 0;
-
-RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
-	Player(name, idef),
-	protocol_version(0),
-	m_sao(NULL),
-	m_dirty(false),
-	m_last_chat_message_sent(time(NULL)),
-	m_chat_message_allowance(5.0f),
-	m_message_rate_overhead(0),
-	hud_hotbar_image(""),
-	hud_hotbar_selected_image("")
-{
-	if (!RemotePlayer::m_setting_cache_loaded) {
-		RemotePlayer::m_setting_chat_message_limit_per_10sec =
-				g_settings->getFloat("chat_message_limit_per_10sec");
-		RemotePlayer::m_setting_chat_message_limit_trigger_kick =
-				g_settings->getU16("chat_message_limit_trigger_kick");
-		RemotePlayer::m_setting_cache_loaded = true;
-	}
-	movement_acceleration_default   = g_settings->getFloat("movement_acceleration_default")   * BS;
-	movement_acceleration_air       = g_settings->getFloat("movement_acceleration_air")       * BS;
-	movement_acceleration_fast      = g_settings->getFloat("movement_acceleration_fast")      * BS;
-	movement_speed_walk             = g_settings->getFloat("movement_speed_walk")             * BS;
-	movement_speed_crouch           = g_settings->getFloat("movement_speed_crouch")           * BS;
-	movement_speed_fast             = g_settings->getFloat("movement_speed_fast")             * BS;
-	movement_speed_climb            = g_settings->getFloat("movement_speed_climb")            * BS;
-	movement_speed_jump             = g_settings->getFloat("movement_speed_jump")             * BS;
-	movement_liquid_fluidity        = g_settings->getFloat("movement_liquid_fluidity")        * BS;
-	movement_liquid_fluidity_smooth = g_settings->getFloat("movement_liquid_fluidity_smooth") * BS;
-	movement_liquid_sink            = g_settings->getFloat("movement_liquid_sink")            * BS;
-	movement_gravity                = g_settings->getFloat("movement_gravity")                * BS;
-}
-
-void RemotePlayer::save(std::string savedir, IGameDef *gamedef)
-{
-	/*
-	 * We have to open all possible player files in the players directory
-	 * and check their player names because some file systems are not
-	 * case-sensitive and player names are case-sensitive.
-	 */
-
-	// A player to deserialize files into to check their names
-	RemotePlayer testplayer("", gamedef->idef());
-
-	savedir += DIR_DELIM;
-	std::string path = savedir + m_name;
-	for (u32 i = 0; i < PLAYER_FILE_ALTERNATE_TRIES; i++) {
-		if (!fs::PathExists(path)) {
-			// Open file and serialize
-			std::ostringstream ss(std::ios_base::binary);
-			serialize(ss);
-			if (!fs::safeWriteToFile(path, ss.str())) {
-				infostream << "Failed to write " << path << std::endl;
-			}
-			setModified(false);
-			return;
-		}
-		// Open file and deserialize
-		std::ifstream is(path.c_str(), std::ios_base::binary);
-		if (!is.good()) {
-			infostream << "Failed to open " << path << std::endl;
-			return;
-		}
-		testplayer.deSerialize(is, path);
-		is.close();
-		if (strcmp(testplayer.getName(), m_name) == 0) {
-			// Open file and serialize
-			std::ostringstream ss(std::ios_base::binary);
-			serialize(ss);
-			if (!fs::safeWriteToFile(path, ss.str())) {
-				infostream << "Failed to write " << path << std::endl;
-			}
-			setModified(false);
-			return;
-		}
-		path = savedir + m_name + itos(i);
-	}
-
-	infostream << "Didn't find free file for player " << m_name << std::endl;
-	return;
-}
-
-void RemotePlayer::deSerialize(std::istream &is, const std::string &playername)
-{
-	Settings args;
-
-	if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
-		throw SerializationError("PlayerArgsEnd of player " +
-								 playername + " not found!");
-	}
-
-	m_dirty = true;
-	//args.getS32("version"); // Version field value not used
-	std::string name = args.get("name");
-	strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
-	setPitch(args.getFloat("pitch"));
-	setYaw(args.getFloat("yaw"));
-	setPosition(args.getV3F("position"));
-	try{
-		hp = args.getS32("hp");
-	}catch(SettingNotFoundException &e) {
-		hp = PLAYER_MAX_HP;
-	}
-	try{
-		m_breath = args.getS32("breath");
-	}catch(SettingNotFoundException &e) {
-		m_breath = PLAYER_MAX_BREATH;
-	}
-
-	inventory.deSerialize(is);
-
-	if(inventory.getList("craftpreview") == NULL) {
-		// Convert players without craftpreview
-		inventory.addList("craftpreview", 1);
-
-		bool craftresult_is_preview = true;
-		if(args.exists("craftresult_is_preview"))
-			craftresult_is_preview = args.getBool("craftresult_is_preview");
-		if(craftresult_is_preview)
-		{
-			// Clear craftresult
-			inventory.getList("craftresult")->changeItem(0, ItemStack());
-		}
-	}
-}
-
-void RemotePlayer::serialize(std::ostream &os)
-{
-	// Utilize a Settings object for storing values
-	Settings args;
-	args.setS32("version", 1);
-	args.set("name", m_name);
-	//args.set("password", m_password);
-	args.setFloat("pitch", m_pitch);
-	args.setFloat("yaw", m_yaw);
-	args.setV3F("position", m_position);
-	args.setS32("hp", hp);
-	args.setS32("breath", m_breath);
-
-	args.writeLines(os);
-
-	os<<"PlayerArgsEnd\n";
-
-	inventory.serialize(os);
-}
-
-void RemotePlayer::setPosition(const v3f &position)
-{
-	if (position != m_position)
-		m_dirty = true;
-
-	Player::setPosition(position);
-	if(m_sao)
-		m_sao->setBasePosition(position);
-}
-
-const RemotePlayerChatResult RemotePlayer::canSendChatMessage()
-{
-	// Rate limit messages
-	u32 now = time(NULL);
-	float time_passed = now - m_last_chat_message_sent;
-	m_last_chat_message_sent = now;
-
-	// If this feature is disabled
-	if (m_setting_chat_message_limit_per_10sec <= 0.0) {
-		return RPLAYER_CHATRESULT_OK;
-	}
-
-	m_chat_message_allowance += time_passed * (m_setting_chat_message_limit_per_10sec / 8.0f);
-	if (m_chat_message_allowance > m_setting_chat_message_limit_per_10sec) {
-		m_chat_message_allowance = m_setting_chat_message_limit_per_10sec;
-	}
-
-	if (m_chat_message_allowance < 1.0f) {
-		infostream << "Player " << m_name
-				<< " chat limited due to excessive message amount." << std::endl;
-
-		// Kick player if flooding is too intensive
-		m_message_rate_overhead++;
-		if (m_message_rate_overhead > RemotePlayer::m_setting_chat_message_limit_trigger_kick) {
-			return RPLAYER_CHATRESULT_KICK;
-		}
-
-		return RPLAYER_CHATRESULT_FLOODING;
-	}
-
-	// Reinit message overhead
-	if (m_message_rate_overhead > 0) {
-		m_message_rate_overhead = 0;
-	}
-
-	m_chat_message_allowance -= 1.0f;
-	return RPLAYER_CHATRESULT_OK;
-}
-
diff --git a/src/player.h b/src/player.h
index 1980a86a3..3c945b100 100644
--- a/src/player.h
+++ b/src/player.h
@@ -99,9 +99,7 @@ struct PlayerControl
 };
 
 class Map;
-class IGameDef;
 struct CollisionInfo;
-class PlayerSAO;
 struct HudElement;
 class Environment;
 
@@ -258,152 +256,5 @@ private:
 	Mutex m_mutex;
 };
 
-enum RemotePlayerChatResult {
-	RPLAYER_CHATRESULT_OK,
-	RPLAYER_CHATRESULT_FLOODING,
-	RPLAYER_CHATRESULT_KICK,
-};
-/*
-	Player on the server
-*/
-class RemotePlayer : public Player
-{
-public:
-	RemotePlayer(const char *name, IItemDefManager *idef);
-	virtual ~RemotePlayer() {}
-
-	void save(std::string savedir, IGameDef *gamedef);
-	void deSerialize(std::istream &is, const std::string &playername);
-
-	PlayerSAO *getPlayerSAO() { return m_sao; }
-	void setPlayerSAO(PlayerSAO *sao) { m_sao = sao; }
-	void setPosition(const v3f &position);
-
-	const RemotePlayerChatResult canSendChatMessage();
-
-	void setHotbarItemcount(s32 hotbar_itemcount)
-	{
-		hud_hotbar_itemcount = hotbar_itemcount;
-	}
-
-	s32 getHotbarItemcount() const { return hud_hotbar_itemcount; }
-
-	void overrideDayNightRatio(bool do_override, float ratio)
-	{
-		m_day_night_ratio_do_override = do_override;
-		m_day_night_ratio = ratio;
-	}
-
-	void getDayNightRatio(bool *do_override, float *ratio)
-	{
-		*do_override = m_day_night_ratio_do_override;
-		*ratio = m_day_night_ratio;
-	}
-
-	// Use a function, if isDead can be defined by other conditions
-	bool isDead() const { return hp == 0; }
-
-	void setHotbarImage(const std::string &name)
-	{
-		hud_hotbar_image = name;
-	}
-
-	std::string getHotbarImage() const
-	{
-		return hud_hotbar_image;
-	}
-
-	void setHotbarSelectedImage(const std::string &name)
-	{
-		hud_hotbar_selected_image = name;
-	}
-
-	const std::string &getHotbarSelectedImage() const
-	{
-		return hud_hotbar_selected_image;
-	}
-
-	// Deprecated
-	f32 getRadPitchDep() const { return -1.0 * m_pitch * core::DEGTORAD; }
-
-	// Deprecated
-	f32 getRadYawDep() const { return (m_yaw + 90.) * core::DEGTORAD; }
-
-	void setSky(const video::SColor &bgcolor, const std::string &type,
-				const std::vector<std::string> &params)
-	{
-		m_sky_bgcolor = bgcolor;
-		m_sky_type = type;
-		m_sky_params = params;
-	}
-
-	void getSky(video::SColor *bgcolor, std::string *type,
-				std::vector<std::string> *params)
-	{
-		*bgcolor = m_sky_bgcolor;
-		*type = m_sky_type;
-		*params = m_sky_params;
-	}
-
-	bool checkModified() const { return m_dirty || inventory.checkModified(); }
-
-	void setModified(const bool x)
-	{
-		m_dirty = x;
-		if (!x)
-			inventory.setModified(x);
-	}
-
-	virtual void setBreath(u16 breath)
-	{
-		if (breath != m_breath)
-			m_dirty = true;
-		Player::setBreath(breath);
-	}
-
-	virtual void setPitch(f32 pitch)
-	{
-		if (pitch != m_pitch)
-			m_dirty = true;
-		Player::setPitch(pitch);
-	}
-
-	virtual void setYaw(f32 yaw)
-	{
-		if (yaw != m_yaw)
-			m_dirty = true;
-		Player::setYaw(yaw);
-	}
-
-	u16 protocol_version;
-private:
-	/*
-		serialize() writes a bunch of text that can contain
-		any characters except a '\0', and such an ending that
-		deSerialize stops reading exactly at the right point.
-	*/
-	void serialize(std::ostream &os);
-
-	PlayerSAO *m_sao;
-	bool m_dirty;
-
-	static bool m_setting_cache_loaded;
-	static float m_setting_chat_message_limit_per_10sec;
-	static u16 m_setting_chat_message_limit_trigger_kick;
-
-	u32 m_last_chat_message_sent;
-	float m_chat_message_allowance;
-	u16 m_message_rate_overhead;
-
-	bool m_day_night_ratio_do_override;
-	float m_day_night_ratio;
-	std::string hud_hotbar_image;
-	std::string hud_hotbar_selected_image;
-
-	std::string m_sky_type;
-	video::SColor m_sky_bgcolor;
-	std::vector<std::string> m_sky_params;
-};
-
 #endif
 
diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp
new file mode 100644
index 000000000..f64d1d690
--- /dev/null
+++ b/src/remoteplayer.cpp
@@ -0,0 +1,230 @@
+/*
+Minetest
+Copyright (C) 2010-2016 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2014-2016 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "remoteplayer.h"
+#include "content_sao.h"
+#include "filesys.h"
+#include "gamedef.h"
+#include "porting.h"  // strlcpy
+#include "settings.h"
+
+
+/*
+	RemotePlayer
+*/
+// static config cache for remoteplayer
+bool RemotePlayer::m_setting_cache_loaded = false;
+float RemotePlayer::m_setting_chat_message_limit_per_10sec = 0.0f;
+u16 RemotePlayer::m_setting_chat_message_limit_trigger_kick = 0;
+
+RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
+	Player(name, idef),
+	protocol_version(0),
+	m_sao(NULL),
+	m_dirty(false),
+	m_last_chat_message_sent(time(NULL)),
+	m_chat_message_allowance(5.0f),
+	m_message_rate_overhead(0),
+	hud_hotbar_image(""),
+	hud_hotbar_selected_image("")
+{
+	if (!RemotePlayer::m_setting_cache_loaded) {
+		RemotePlayer::m_setting_chat_message_limit_per_10sec =
+			g_settings->getFloat("chat_message_limit_per_10sec");
+		RemotePlayer::m_setting_chat_message_limit_trigger_kick =
+			g_settings->getU16("chat_message_limit_trigger_kick");
+		RemotePlayer::m_setting_cache_loaded = true;
+	}
+	movement_acceleration_default   = g_settings->getFloat("movement_acceleration_default")   * BS;
+	movement_acceleration_air       = g_settings->getFloat("movement_acceleration_air")       * BS;
+	movement_acceleration_fast      = g_settings->getFloat("movement_acceleration_fast")      * BS;
+	movement_speed_walk             = g_settings->getFloat("movement_speed_walk")             * BS;
+	movement_speed_crouch           = g_settings->getFloat("movement_speed_crouch")           * BS;
+	movement_speed_fast             = g_settings->getFloat("movement_speed_fast")             * BS;
+	movement_speed_climb            = g_settings->getFloat("movement_speed_climb")            * BS;
+	movement_speed_jump             = g_settings->getFloat("movement_speed_jump")             * BS;
+	movement_liquid_fluidity        = g_settings->getFloat("movement_liquid_fluidity")        * BS;
+	movement_liquid_fluidity_smooth = g_settings->getFloat("movement_liquid_fluidity_smooth") * BS;
+	movement_liquid_sink            = g_settings->getFloat("movement_liquid_sink")            * BS;
+	movement_gravity                = g_settings->getFloat("movement_gravity")                * BS;
+}
+
+void RemotePlayer::save(std::string savedir, IGameDef *gamedef)
+{
+	/*
+	 * We have to open all possible player files in the players directory
+	 * and check their player names because some file systems are not
+	 * case-sensitive and player names are case-sensitive.
+	 */
+
+	// A player to deserialize files into to check their names
+	RemotePlayer testplayer("", gamedef->idef());
+
+	savedir += DIR_DELIM;
+	std::string path = savedir + m_name;
+	for (u32 i = 0; i < PLAYER_FILE_ALTERNATE_TRIES; i++) {
+		if (!fs::PathExists(path)) {
+			// Open file and serialize
+			std::ostringstream ss(std::ios_base::binary);
+			serialize(ss);
+			if (!fs::safeWriteToFile(path, ss.str())) {
+				infostream << "Failed to write " << path << std::endl;
+			}
+			setModified(false);
+			return;
+		}
+		// Open file and deserialize
+		std::ifstream is(path.c_str(), std::ios_base::binary);
+		if (!is.good()) {
+			infostream << "Failed to open " << path << std::endl;
+			return;
+		}
+		testplayer.deSerialize(is, path);
+		is.close();
+		if (strcmp(testplayer.getName(), m_name) == 0) {
+			// Open file and serialize
+			std::ostringstream ss(std::ios_base::binary);
+			serialize(ss);
+			if (!fs::safeWriteToFile(path, ss.str())) {
+				infostream << "Failed to write " << path << std::endl;
+			}
+			setModified(false);
+			return;
+		}
+		path = savedir + m_name + itos(i);
+	}
+
+	infostream << "Didn't find free file for player " << m_name << std::endl;
+	return;
+}
+
+void RemotePlayer::deSerialize(std::istream &is, const std::string &playername)
+{
+	Settings args;
+
+	if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
+		throw SerializationError("PlayerArgsEnd of player " +
+								 playername + " not found!");
+	}
+
+	m_dirty = true;
+	//args.getS32("version"); // Version field value not used
+	std::string name = args.get("name");
+	strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
+	setPitch(args.getFloat("pitch"));
+	setYaw(args.getFloat("yaw"));
+	setPosition(args.getV3F("position"));
+	try {
+		hp = args.getS32("hp");
+	} catch(SettingNotFoundException &e) {
+		hp = PLAYER_MAX_HP;
+	}
+
+	try {
+		m_breath = args.getS32("breath");
+	} catch(SettingNotFoundException &e) {
+		m_breath = PLAYER_MAX_BREATH;
+	}
+
+	inventory.deSerialize(is);
+
+	if(inventory.getList("craftpreview") == NULL) {
+		// Convert players without craftpreview
+		inventory.addList("craftpreview", 1);
+
+		bool craftresult_is_preview = true;
+		if(args.exists("craftresult_is_preview"))
+			craftresult_is_preview = args.getBool("craftresult_is_preview");
+		if(craftresult_is_preview)
+		{
+			// Clear craftresult
+			inventory.getList("craftresult")->changeItem(0, ItemStack());
+		}
+	}
+}
+
+void RemotePlayer::serialize(std::ostream &os)
+{
+	// Utilize a Settings object for storing values
+	Settings args;
+	args.setS32("version", 1);
+	args.set("name", m_name);
+	//args.set("password", m_password);
+	args.setFloat("pitch", m_pitch);
+	args.setFloat("yaw", m_yaw);
+	args.setV3F("position", m_position);
+	args.setS32("hp", hp);
+	args.setS32("breath", m_breath);
+
+	args.writeLines(os);
+
+	os<<"PlayerArgsEnd\n";
+
+	inventory.serialize(os);
+}
+
+void RemotePlayer::setPosition(const v3f &position)
+{
+	if (position != m_position)
+		m_dirty = true;
+
+	Player::setPosition(position);
+	if(m_sao)
+		m_sao->setBasePosition(position);
+}
+
+const RemotePlayerChatResult RemotePlayer::canSendChatMessage()
+{
+	// Rate limit messages
+	u32 now = time(NULL);
+	float time_passed = now - m_last_chat_message_sent;
+	m_last_chat_message_sent = now;
+
+	// If this feature is disabled
+	if (m_setting_chat_message_limit_per_10sec <= 0.0) {
+		return RPLAYER_CHATRESULT_OK;
+	}
+
+	m_chat_message_allowance += time_passed * (m_setting_chat_message_limit_per_10sec / 8.0f);
+	if (m_chat_message_allowance > m_setting_chat_message_limit_per_10sec) {
+		m_chat_message_allowance = m_setting_chat_message_limit_per_10sec;
+	}
+
+	if (m_chat_message_allowance < 1.0f) {
+		infostream << "Player " << m_name
+				<< " chat limited due to excessive message amount." << std::endl;
+
+		// Kick player if flooding is too intensive
+		m_message_rate_overhead++;
+		if (m_message_rate_overhead > RemotePlayer::m_setting_chat_message_limit_trigger_kick) {
+			return RPLAYER_CHATRESULT_KICK;
+		}
+
+		return RPLAYER_CHATRESULT_FLOODING;
+	}
+
+	// Reinit message overhead
+	if (m_message_rate_overhead > 0) {
+		m_message_rate_overhead = 0;
+	}
+
+	m_chat_message_allowance -= 1.0f;
+	return RPLAYER_CHATRESULT_OK;
+}
diff --git a/src/remoteplayer.h b/src/remoteplayer.h
new file mode 100644
index 000000000..f6c70b0e9
--- /dev/null
+++ b/src/remoteplayer.h
@@ -0,0 +1,175 @@
+/*
+Minetest
+Copyright (C) 2010-2016 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2014-2016 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef REMOTEPLAYER_HEADER
+#define REMOTEPLAYER_HEADER
+
+#include "player.h"
+
+class PlayerSAO;
+
+enum RemotePlayerChatResult {
+	RPLAYER_CHATRESULT_OK,
+	RPLAYER_CHATRESULT_FLOODING,
+	RPLAYER_CHATRESULT_KICK,
+};
+/*
+	Player on the server
+*/
+class RemotePlayer : public Player
+{
+public:
+	RemotePlayer(const char *name, IItemDefManager *idef);
+	virtual ~RemotePlayer() {}
+
+	void save(std::string savedir, IGameDef *gamedef);
+	void deSerialize(std::istream &is, const std::string &playername);
+
+	PlayerSAO *getPlayerSAO() { return m_sao; }
+	void setPlayerSAO(PlayerSAO *sao) { m_sao = sao; }
+	void setPosition(const v3f &position);
+
+	const RemotePlayerChatResult canSendChatMessage();
+
+	void setHotbarItemcount(s32 hotbar_itemcount)
+	{
+		hud_hotbar_itemcount = hotbar_itemcount;
+	}
+
+	s32 getHotbarItemcount() const { return hud_hotbar_itemcount; }
+
+	void overrideDayNightRatio(bool do_override, float ratio)
+	{
+		m_day_night_ratio_do_override = do_override;
+		m_day_night_ratio = ratio;
+	}
+
+	void getDayNightRatio(bool *do_override, float *ratio)
+	{
+		*do_override = m_day_night_ratio_do_override;
+		*ratio = m_day_night_ratio;
+	}
+
+	// Use a function, if isDead can be defined by other conditions
+	bool isDead() const { return hp == 0; }
+
+	void setHotbarImage(const std::string &name)
+	{
+		hud_hotbar_image = name;
+	}
+
+	std::string getHotbarImage() const
+	{
+		return hud_hotbar_image;
+	}
+
+	void setHotbarSelectedImage(const std::string &name)
+	{
+		hud_hotbar_selected_image = name;
+	}
+
+	const std::string &getHotbarSelectedImage() const
+	{
+		return hud_hotbar_selected_image;
+	}
+
+	// Deprecated
+	f32 getRadPitchDep() const { return -1.0 * m_pitch * core::DEGTORAD; }
+
+	// Deprecated
+	f32 getRadYawDep() const { return (m_yaw + 90.) * core::DEGTORAD; }
+
+	void setSky(const video::SColor &bgcolor, const std::string &type,
+				const std::vector<std::string> &params)
+	{
+		m_sky_bgcolor = bgcolor;
+		m_sky_type = type;
+		m_sky_params = params;
+	}
+
+	void getSky(video::SColor *bgcolor, std::string *type,
+				std::vector<std::string> *params)
+	{
+		*bgcolor = m_sky_bgcolor;
+		*type = m_sky_type;
+		*params = m_sky_params;
+	}
+
+	bool checkModified() const { return m_dirty || inventory.checkModified(); }
+
+	void setModified(const bool x)
+	{
+		m_dirty = x;
+		if (!x)
+			inventory.setModified(x);
+	}
+
+	virtual void setBreath(u16 breath)
+	{
+		if (breath != m_breath)
+			m_dirty = true;
+		Player::setBreath(breath);
+	}
+
+	virtual void setPitch(f32 pitch)
+	{
+		if (pitch != m_pitch)
+			m_dirty = true;
+		Player::setPitch(pitch);
+	}
+
+	virtual void setYaw(f32 yaw)
+	{
+		if (yaw != m_yaw)
+			m_dirty = true;
+		Player::setYaw(yaw);
+	}
+
+	u16 protocol_version;
+private:
+	/*
+		serialize() writes a bunch of text that can contain
+		any characters except a '\0', and such an ending that
+		deSerialize stops reading exactly at the right point.
+	*/
+	void serialize(std::ostream &os);
+
+	PlayerSAO *m_sao;
+	bool m_dirty;
+
+	static bool m_setting_cache_loaded;
+	static float m_setting_chat_message_limit_per_10sec;
+	static u16 m_setting_chat_message_limit_trigger_kick;
+
+	u32 m_last_chat_message_sent;
+	float m_chat_message_allowance;
+	u16 m_message_rate_overhead;
+
+	bool m_day_night_ratio_do_override;
+	float m_day_night_ratio;
+	std::string hud_hotbar_image;
+	std::string hud_hotbar_selected_image;
+
+	std::string m_sky_type;
+	video::SColor m_sky_bgcolor;
+	std::vector<std::string> m_sky_params;
+};
+
+#endif
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index a1f83919c..bb352e429 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -107,7 +107,7 @@ PlayerSAO* ObjectRef::getplayersao(ObjectRef *ref)
 	return (PlayerSAO*)obj;
 }
 
-RemotePlayer* ObjectRef::getplayer(ObjectRef *ref)
+RemotePlayer *ObjectRef::getplayer(ObjectRef *ref)
 {
 	PlayerSAO *playersao = getplayersao(ref);
 	if (playersao == NULL)
diff --git a/src/script/lua_api/l_object.h b/src/script/lua_api/l_object.h
index dfc1b49d2..09f10e417 100644
--- a/src/script/lua_api/l_object.h
+++ b/src/script/lua_api/l_object.h
@@ -47,7 +47,7 @@ private:
 
 	static PlayerSAO* getplayersao(ObjectRef *ref);
 
-	static RemotePlayer* getplayer(ObjectRef *ref);
+	static RemotePlayer *getplayer(ObjectRef *ref);
 
 	// Exported functions
 
diff --git a/src/server.cpp b/src/server.cpp
index 71e71f43e..a93c143c7 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2688,7 +2688,7 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 		SendChatMessage(PEER_ID_INEXISTENT,message);
 }
 
-void Server::UpdateCrafting(RemotePlayer* player)
+void Server::UpdateCrafting(RemotePlayer *player)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -3141,7 +3141,7 @@ void Server::spawnParticle(const std::string &playername, v3f pos,
 
 	u16 peer_id = PEER_ID_INEXISTENT;
 	if (playername != "") {
-		RemotePlayer* player = m_env->getPlayer(playername.c_str());
+		RemotePlayer *player = m_env->getPlayer(playername.c_str());
 		if (!player)
 			return;
 		peer_id = player->peer_id;
@@ -3165,7 +3165,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 
 	u16 peer_id = PEER_ID_INEXISTENT;
 	if (playername != "") {
-		RemotePlayer* player = m_env->getPlayer(playername.c_str());
+		RemotePlayer *player = m_env->getPlayer(playername.c_str());
 		if (!player)
 			return -1;
 		peer_id = player->peer_id;
@@ -3188,7 +3188,7 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
 
 	u16 peer_id = PEER_ID_INEXISTENT;
 	if (playername != "") {
-		RemotePlayer* player = m_env->getPlayer(playername.c_str());
+		RemotePlayer *player = m_env->getPlayer(playername.c_str());
 		if (!player)
 			return;
 		peer_id = player->peer_id;
diff --git a/src/server.h b/src/server.h
index fc4758c5f..6ee61a0eb 100644
--- a/src/server.h
+++ b/src/server.h
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "chat_interface.h"
 #include "clientiface.h"
-#include "player.h"
+#include "remoteplayer.h"
 #include "network/networkpacket.h"
 #include <string>
 #include <list>

From b3fc133442724cc2785d0c7e2beea2d782d8a087 Mon Sep 17 00:00:00 2001
From: Rui <rui.minetest@gmail.com>
Date: Sun, 9 Oct 2016 17:27:14 +0900
Subject: [PATCH 234/418] Remove unused parameter of GUIVolumeChange

---
 src/game.cpp            |  2 +-
 src/guiVolumeChange.cpp | 82 ++++++++++++++++++-----------------------
 src/guiVolumeChange.h   |  3 +-
 3 files changed, 37 insertions(+), 50 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 5bb08e27a..4f89aa680 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2571,7 +2571,7 @@ inline bool Game::handleCallbacks()
 
 	if (g_gamecallback->changevolume_requested) {
 		(new GUIVolumeChange(guienv, guiroot, -1,
-				     &g_menumgr, client))->drop();
+				     &g_menumgr))->drop();
 		g_gamecallback->changevolume_requested = false;
 	}
 
diff --git a/src/guiVolumeChange.cpp b/src/guiVolumeChange.cpp
index c8e257f7f..8425bc04f 100644
--- a/src/guiVolumeChange.cpp
+++ b/src/guiVolumeChange.cpp
@@ -37,8 +37,7 @@ const int ID_soundSlider = 266;
 
 GUIVolumeChange::GUIVolumeChange(gui::IGUIEnvironment* env,
 		gui::IGUIElement* parent, s32 id,
-		IMenuManager *menumgr,
-		Client* client
+		IMenuManager *menumgr
 ):
 	GUIModalMenu(env, parent, id, menumgr)
 {
@@ -51,26 +50,17 @@ GUIVolumeChange::~GUIVolumeChange()
 
 void GUIVolumeChange::removeChildren()
 {
-	{
-		gui::IGUIElement *e = getElementFromId(ID_soundText1);
-		if(e != NULL)
-			e->remove();
-	}
-	{
-		gui::IGUIElement *e = getElementFromId(ID_soundText2);
-		if(e != NULL)
-			e->remove();
-	}
-	{
-		gui::IGUIElement *e = getElementFromId(ID_soundExitButton);
-		if(e != NULL)
-			e->remove();
-	}
-	{
-		gui::IGUIElement *e = getElementFromId(ID_soundSlider);
-		if(e != NULL)
-			e->remove();
-	}
+	if (gui::IGUIElement *e = getElementFromId(ID_soundText1))
+		e->remove();
+
+	if (gui::IGUIElement *e = getElementFromId(ID_soundText2))
+		e->remove();
+
+	if (gui::IGUIElement *e = getElementFromId(ID_soundExitButton))
+		e->remove();
+
+	if (gui::IGUIElement *e = getElementFromId(ID_soundSlider))
+		e->remove();
 }
 
 void GUIVolumeChange::regenerateGui(v2u32 screensize)
@@ -95,7 +85,7 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
 
 	v2s32 size = rect.getSize();
 	v2s32 topleft_client(40, 0);
-	int volume=(int)(g_settings->getFloat("sound_volume")*100);
+	int volume = (int)(g_settings->getFloat("sound_volume")*100);
 	/*
 		Add stuff
 	*/
@@ -137,45 +127,43 @@ void GUIVolumeChange::drawMenu()
 	if (!skin)
 		return;
 	video::IVideoDriver* driver = Environment->getVideoDriver();
-	video::SColor bgcolor(140,0,0,0);
+	video::SColor bgcolor(140, 0, 0, 0);
 	driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect);
 	gui::IGUIElement::draw();
 }
 
 bool GUIVolumeChange::OnEvent(const SEvent& event)
 {
-	if(event.EventType==EET_KEY_INPUT_EVENT)
-	{
-		if(event.KeyInput.Key==KEY_ESCAPE && event.KeyInput.PressedDown)
-		{
+	if (event.EventType == EET_KEY_INPUT_EVENT) {
+		if (event.KeyInput.Key == KEY_ESCAPE && event.KeyInput.PressedDown) {
 			quitMenu();
 			return true;
 		}
-		if(event.KeyInput.Key==KEY_RETURN && event.KeyInput.PressedDown)
-		{
+
+		if (event.KeyInput.Key == KEY_RETURN && event.KeyInput.PressedDown) {
 			quitMenu();
 			return true;
 		}
 	}
-	if(event.GUIEvent.EventType==gui::EGET_BUTTON_CLICKED)
-		{
-			if (event.GUIEvent.Caller->getID() == ID_soundExitButton)
-				{
-					quitMenu();
-					return true;
-				}
+
+	if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) {
+		if (event.GUIEvent.Caller->getID() == ID_soundExitButton) {
+			quitMenu();
+			return true;
 		}
-	if(event.GUIEvent.EventType==gui::EGET_SCROLL_BAR_CHANGED)
-		{
-		if (event.GUIEvent.Caller->getID() == ID_soundSlider)
-			{
-				s32 pos = ((gui::IGUIScrollBar*)event.GUIEvent.Caller)->getPos();
-				g_settings->setFloat("sound_volume",(float)pos/100);
-				gui::IGUIElement *e = getElementFromId(ID_soundText2);
-				e->setText( core::stringw(pos).c_str() );
-				return true;
-			}
+	}
+
+	if (event.GUIEvent.EventType == gui::EGET_SCROLL_BAR_CHANGED) {
+		if (event.GUIEvent.Caller->getID() == ID_soundSlider) {
+			s32 pos = ((gui::IGUIScrollBar*)event.GUIEvent.Caller)->getPos();
+			g_settings->setFloat("sound_volume", (float)pos/100);
+
+			gui::IGUIElement *e = getElementFromId(ID_soundText2);
+			e->setText(core::stringw(pos).c_str());
+			return true;
 		}
+	}
+
 	return Parent ? Parent->OnEvent(event) : false;
 }
 
diff --git a/src/guiVolumeChange.h b/src/guiVolumeChange.h
index 9f8199fa8..98731c673 100644
--- a/src/guiVolumeChange.h
+++ b/src/guiVolumeChange.h
@@ -30,8 +30,7 @@ class GUIVolumeChange : public GUIModalMenu
 public:
 	GUIVolumeChange(gui::IGUIEnvironment* env,
 			gui::IGUIElement* parent, s32 id,
-			IMenuManager *menumgr,
-			Client* client);
+			IMenuManager *menumgr);
 	~GUIVolumeChange();
 	
 	void removeChildren();

From 70f104be076321330a0827010704761a040d8ec7 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 8 Oct 2016 23:13:38 +0200
Subject: [PATCH 235/418] Environment cleanup

* Move client list to ServerEnvironment and use RemotePlayer members instead of Player
* ClientEnvironment only use setLocalPlayer to specify the current player
* Remove ClientEnvironment dead code on player list (in fact other players are CAO not Player objects)
* Drop LocalPlayer::getPlayer(xxx) functions which aren't used.
* Improve a little bit performance by using const ref list for ClientEnvironment::getPlayerNames() & Client::getConnectedPlayerNames()
* Drop isLocal() function from (Local)Player which is not needed anymore because of previous changes

This change permits to cleanup shared client list which is very old code.
ClientEnvironment doesn't use player list anymore, it only contains the local player, as addPlayer is only called from Client constructor client side.
Clients are only CAO on client side, this cleanup permit to remove confusion about player list.
---
 src/client.cpp      |  14 ++--
 src/client.h        |   5 +-
 src/content_cao.cpp |   8 +--
 src/environment.cpp | 165 ++++++++++++++++----------------------------
 src/environment.h   |  32 +++------
 src/localplayer.h   |   5 --
 src/player.h        |  16 -----
 src/remoteplayer.h  |  14 ++++
 8 files changed, 97 insertions(+), 162 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index cd010e592..62bd274aa 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -257,7 +257,7 @@ Client::Client(
 	m_localdb(NULL)
 {
 	// Add local player
-	m_env.addPlayer(new LocalPlayer(this, playername));
+	m_env.setLocalPlayer(new LocalPlayer(this, playername));
 
 	m_mapper = new Mapper(device, this);
 	m_cache_save_interval = g_settings->getU16("server_map_save_interval");
@@ -1418,8 +1418,9 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
 	break;
 	case InventoryLocation::PLAYER:
 	{
-		LocalPlayer *player = m_env.getPlayer(loc.name.c_str());
-		if(!player)
+		// Check if we are working with local player inventory
+		LocalPlayer *player = m_env.getLocalPlayer();
+		if (!player || strcmp(player->getName(), loc.name.c_str()) != 0)
 			return NULL;
 		return &player->inventory;
 	}
@@ -1500,11 +1501,6 @@ ClientActiveObject * Client::getSelectedActiveObject(
 	return NULL;
 }
 
-std::list<std::string> Client::getConnectedPlayerNames()
-{
-	return m_env.getPlayerNames();
-}
-
 float Client::getAnimationTime()
 {
 	return m_animation_time;
@@ -1664,7 +1660,7 @@ void Client::addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server, bool ur
 ClientEvent Client::getClientEvent()
 {
 	ClientEvent event;
-	if(m_client_event_queue.size() == 0) {
+	if (m_client_event_queue.empty()) {
 		event.type = CE_NONE;
 	}
 	else {
diff --git a/src/client.h b/src/client.h
index 72baac2d2..6d24c0b1d 100644
--- a/src/client.h
+++ b/src/client.h
@@ -452,7 +452,10 @@ public:
 			core::line3d<f32> shootline_on_map
 	);
 
-	std::list<std::string> getConnectedPlayerNames();
+	const std::list<std::string> &getConnectedPlayerNames()
+	{
+		return m_env.getPlayerNames();
+	}
 
 	float getAnimationTime();
 
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index a53768149..00e17f328 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -653,10 +653,10 @@ void GenericCAO::initialize(const std::string &data)
 	pos_translator.init(m_position);
 	updateNodePos();
 
-	if(m_is_player)
-	{
-		LocalPlayer *player = m_env->getPlayer(m_name.c_str());
-		if (player && player->isLocal()) {
+	if (m_is_player) {
+		// Check if it's the current player
+		LocalPlayer *player = m_env->getLocalPlayer();
+		if (player && strcmp(player->getName(), m_name.c_str()) == 0) {
 			m_is_local_player = true;
 			m_is_visible = false;
 			LocalPlayer* localplayer = player;
diff --git a/src/environment.cpp b/src/environment.cpp
index ff43ac516..ceaa01d7a 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -69,62 +69,6 @@ Environment::Environment():
 
 Environment::~Environment()
 {
-	// Deallocate players
-	for(std::vector<Player*>::iterator i = m_players.begin();
-			i != m_players.end(); ++i) {
-		delete (*i);
-	}
-}
-
-void Environment::addPlayer(Player *player)
-{
-	DSTACK(FUNCTION_NAME);
-	/*
-		Check that peer_ids are unique.
-		Also check that names are unique.
-		Exception: there can be multiple players with peer_id=0
-	*/
-	// If peer id is non-zero, it has to be unique.
-	if(player->peer_id != 0)
-		FATAL_ERROR_IF(getPlayer(player->peer_id) != NULL, "Peer id not unique");
-	// Name has to be unique.
-	FATAL_ERROR_IF(getPlayer(player->getName()) != NULL, "Player name not unique");
-	// Add.
-	m_players.push_back(player);
-}
-
-void Environment::removePlayer(Player* player)
-{
-	for (std::vector<Player*>::iterator it = m_players.begin();
-			it != m_players.end(); ++it) {
-		if ((*it) == player) {
-			delete *it;
-			m_players.erase(it);
-			return;
-		}
-	}
-}
-
-Player *Environment::getPlayer(u16 peer_id)
-{
-	for (std::vector<Player*>::iterator i = m_players.begin();
-			i != m_players.end(); ++i) {
-		Player *player = *i;
-		if (player->peer_id == peer_id)
-			return player;
-	}
-	return NULL;
-}
-
-Player *Environment::getPlayer(const char *name)
-{
-	for (std::vector<Player*>::iterator i = m_players.begin();
-			i != m_players.end(); ++i) {
-		Player *player = *i;
-		if(strcmp(player->getName(), name) == 0)
-			return player;
-	}
-	return NULL;
 }
 
 u32 Environment::getDayNightRatio()
@@ -545,10 +489,16 @@ ServerEnvironment::~ServerEnvironment()
 	m_map->drop();
 
 	// Delete ActiveBlockModifiers
-	for(std::vector<ABMWithState>::iterator
+	for (std::vector<ABMWithState>::iterator
 			i = m_abms.begin(); i != m_abms.end(); ++i){
 		delete i->abm;
 	}
+
+	// Deallocate players
+	for (std::vector<RemotePlayer *>::iterator i = m_players.begin();
+			i != m_players.end(); ++i) {
+		delete (*i);
+	}
 }
 
 Map & ServerEnvironment::getMap()
@@ -563,12 +513,53 @@ ServerMap & ServerEnvironment::getServerMap()
 
 RemotePlayer *ServerEnvironment::getPlayer(const u16 peer_id)
 {
-	return dynamic_cast<RemotePlayer *>(Environment::getPlayer(peer_id));
+	for (std::vector<RemotePlayer *>::iterator i = m_players.begin();
+			i != m_players.end(); ++i) {
+		RemotePlayer *player = *i;
+		if (player->peer_id == peer_id)
+			return player;
+	}
+	return NULL;
 }
 
 RemotePlayer *ServerEnvironment::getPlayer(const char* name)
 {
-	return dynamic_cast<RemotePlayer *>(Environment::getPlayer(name));
+	for (std::vector<RemotePlayer *>::iterator i = m_players.begin();
+			i != m_players.end(); ++i) {
+		RemotePlayer *player = *i;
+		if (strcmp(player->getName(), name) == 0)
+			return player;
+	}
+	return NULL;
+}
+
+void ServerEnvironment::addPlayer(RemotePlayer *player)
+{
+	DSTACK(FUNCTION_NAME);
+	/*
+		Check that peer_ids are unique.
+		Also check that names are unique.
+		Exception: there can be multiple players with peer_id=0
+	*/
+	// If peer id is non-zero, it has to be unique.
+	if (player->peer_id != 0)
+		FATAL_ERROR_IF(getPlayer(player->peer_id) != NULL, "Peer id not unique");
+	// Name has to be unique.
+	FATAL_ERROR_IF(getPlayer(player->getName()) != NULL, "Player name not unique");
+	// Add.
+	m_players.push_back(player);
+}
+
+void ServerEnvironment::removePlayer(RemotePlayer *player)
+{
+	for (std::vector<RemotePlayer *>::iterator it = m_players.begin();
+			it != m_players.end(); ++it) {
+		if ((*it) == player) {
+			delete *it;
+			m_players.erase(it);
+			return;
+		}
+	}
 }
 
 bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize, v3s16 *p)
@@ -601,7 +592,7 @@ bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize, v3s16
 void ServerEnvironment::kickAllPlayers(AccessDeniedCode reason,
 		const std::string &str_reason, bool reconnect)
 {
-	for (std::vector<Player*>::iterator it = m_players.begin();
+	for (std::vector<RemotePlayer *>::iterator it = m_players.begin();
 			it != m_players.end(); ++it) {
 		RemotePlayer *player = dynamic_cast<RemotePlayer *>(*it);
 		((Server*)m_gamedef)->DenyAccessVerCompliant(player->peer_id,
@@ -614,7 +605,7 @@ void ServerEnvironment::saveLoadedPlayers()
 	std::string players_path = m_path_world + DIR_DELIM "players";
 	fs::CreateDir(players_path);
 
-	for (std::vector<Player*>::iterator it = m_players.begin();
+	for (std::vector<RemotePlayer *>::iterator it = m_players.begin();
 			it != m_players.end();
 			++it) {
 		RemotePlayer *player = static_cast<RemotePlayer*>(*it);
@@ -1253,7 +1244,7 @@ void ServerEnvironment::step(float dtime)
 	*/
 	{
 		ScopeProfiler sp(g_profiler, "SEnv: handle players avg", SPT_AVG);
-		for (std::vector<Player*>::iterator i = m_players.begin();
+		for (std::vector<RemotePlayer *>::iterator i = m_players.begin();
 				i != m_players.end(); ++i) {
 			RemotePlayer *player = dynamic_cast<RemotePlayer *>(*i);
 			assert(player);
@@ -1276,7 +1267,7 @@ void ServerEnvironment::step(float dtime)
 			Get player block positions
 		*/
 		std::vector<v3s16> players_blockpos;
-		for (std::vector<Player*>::iterator i = m_players.begin();
+		for (std::vector<RemotePlayer *>::iterator i = m_players.begin();
 				i != m_players.end(); ++i) {
 			RemotePlayer *player = dynamic_cast<RemotePlayer *>(*i);
 			assert(player);
@@ -2255,6 +2246,7 @@ ClientEnvironment::ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr,
 		ITextureSource *texturesource, IGameDef *gamedef,
 		IrrlichtDevice *irr):
 	m_map(map),
+	m_local_player(NULL),
 	m_smgr(smgr),
 	m_texturesource(texturesource),
 	m_gamedef(gamedef),
@@ -2291,37 +2283,16 @@ ClientMap & ClientEnvironment::getClientMap()
 	return *m_map;
 }
 
-LocalPlayer *ClientEnvironment::getPlayer(const u16 peer_id)
-{
-	return dynamic_cast<LocalPlayer *>(Environment::getPlayer(peer_id));
-}
-
-LocalPlayer *ClientEnvironment::getPlayer(const char* name)
-{
-	return dynamic_cast<LocalPlayer *>(Environment::getPlayer(name));
-}
-
-void ClientEnvironment::addPlayer(LocalPlayer *player)
+void ClientEnvironment::setLocalPlayer(LocalPlayer *player)
 {
 	DSTACK(FUNCTION_NAME);
 	/*
 		It is a failure if already is a local player
 	*/
-	FATAL_ERROR_IF(getLocalPlayer() != NULL,
-			"Player is local but there is already a local player");
+	FATAL_ERROR_IF(m_local_player != NULL,
+			"Local player already allocated");
 
-	Environment::addPlayer(player);
-}
-
-LocalPlayer *ClientEnvironment::getLocalPlayer()
-{
-	for(std::vector<Player*>::iterator i = m_players.begin();
-			i != m_players.end(); ++i) {
-		Player *player = *i;
-		if (player->isLocal())
-			return (LocalPlayer*)player;
-	}
-	return NULL;
+	m_local_player = player;
 }
 
 void ClientEnvironment::step(float dtime)
@@ -2558,24 +2529,6 @@ void ClientEnvironment::step(float dtime)
 		}
 	}
 
-	/*
-		Stuff that can be done in an arbitarily large dtime
-	*/
-	for (std::vector<Player*>::iterator i = m_players.begin();
-			i != m_players.end(); ++i) {
-		Player *player = *i;
-		assert(player);
-
-		/*
-			Handle non-local players
-		*/
-		if (!player->isLocal()) {
-			// Move
-			player->move(dtime, this, 100*BS);
-
-		}
-	}
-
 	// Update lighting on local player (used for wield item)
 	u32 day_night_ratio = getDayNightRatio();
 	{
diff --git a/src/environment.h b/src/environment.h
index f19708ad7..83ad69562 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -72,9 +72,6 @@ public:
 
 	virtual Map & getMap() = 0;
 
-	virtual void addPlayer(Player *player);
-	void removePlayer(Player *player);
-
 	u32 getDayNightRatio();
 
 	// 0-23999
@@ -94,12 +91,6 @@ public:
 	u32 m_added_objects;
 
 protected:
-	Player *getPlayer(u16 peer_id);
-	Player *getPlayer(const char *name);
-
-	// peer_ids in here should be unique, except that there may be many 0s
-	std::vector<Player*> m_players;
-
 	GenericAtomic<float> m_time_of_day_speed;
 
 	/*
@@ -325,6 +316,8 @@ public:
 	void saveLoadedPlayers();
 	void savePlayer(RemotePlayer *player);
 	RemotePlayer *loadPlayer(const std::string &playername);
+	void addPlayer(RemotePlayer *player);
+	void removePlayer(RemotePlayer *player);
 
 	/*
 		Save and load time of day and game timer
@@ -520,6 +513,9 @@ private:
 	// Can raise to high values like 15s with eg. map generation mods.
 	float m_max_lag_estimate;
 
+	// peer_ids in here should be unique, except that there may be many 0s
+	std::vector<RemotePlayer*> m_players;
+
 	// Particles
 	IntervalLimiter m_particle_management_interval;
 	UNORDERED_MAP<u32, float> m_particle_spawners;
@@ -579,8 +575,8 @@ public:
 
 	void step(f32 dtime);
 
-	virtual void addPlayer(LocalPlayer *player);
-	LocalPlayer * getLocalPlayer();
+	virtual void setLocalPlayer(LocalPlayer *player);
+	LocalPlayer *getLocalPlayer() { return m_local_player; }
 
 	/*
 		ClientSimpleObjects
@@ -630,21 +626,15 @@ public:
 
 	u16 attachement_parent_ids[USHRT_MAX + 1];
 
-	std::list<std::string> getPlayerNames()
-	{ return m_player_names; }
-	void addPlayerName(std::string name)
-	{ m_player_names.push_back(name); }
-	void removePlayerName(std::string name)
-	{ m_player_names.remove(name); }
+	const std::list<std::string> &getPlayerNames() { return m_player_names; }
+	void addPlayerName(const std::string &name) { m_player_names.push_back(name); }
+	void removePlayerName(const std::string &name) { m_player_names.remove(name); }
 	void updateCameraOffset(v3s16 camera_offset)
 	{ m_camera_offset = camera_offset; }
 	v3s16 getCameraOffset() const { return m_camera_offset; }
-
-	LocalPlayer *getPlayer(const u16 peer_id);
-	LocalPlayer *getPlayer(const char* name);
-
 private:
 	ClientMap *m_map;
+	LocalPlayer *m_local_player;
 	scene::ISceneManager *m_smgr;
 	ITextureSource *m_texturesource;
 	IGameDef *m_gamedef;
diff --git a/src/localplayer.h b/src/localplayer.h
index 9d43128aa..eb727d7e3 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -38,11 +38,6 @@ public:
 	LocalPlayer(Client *gamedef, const char *name);
 	virtual ~LocalPlayer();
 
-	bool isLocal() const
-	{
-		return true;
-	}
-
 	ClientActiveObject *parent;
 
 	bool got_teleported;
diff --git a/src/player.h b/src/player.h
index 3c945b100..6ac5dfe65 100644
--- a/src/player.h
+++ b/src/player.h
@@ -183,22 +183,6 @@ public:
 		return size;
 	}
 
-	void setLocalAnimations(v2s32 frames[4], float frame_speed)
-	{
-		for (int i = 0; i < 4; i++)
-			local_animations[i] = frames[i];
-		local_animation_speed = frame_speed;
-	}
-
-	void getLocalAnimations(v2s32 *frames, float *frame_speed)
-	{
-		for (int i = 0; i < 4; i++)
-			frames[i] = local_animations[i];
-		*frame_speed = local_animation_speed;
-	}
-
-	virtual bool isLocal() const { return false; }
-
 	bool camera_barely_in_ceiling;
 	v3f eye_offset_first;
 	v3f eye_offset_third;
diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index f6c70b0e9..1b1a90de3 100644
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -142,6 +142,20 @@ public:
 		Player::setYaw(yaw);
 	}
 
+	void setLocalAnimations(v2s32 frames[4], float frame_speed)
+	{
+		for (int i = 0; i < 4; i++)
+			local_animations[i] = frames[i];
+		local_animation_speed = frame_speed;
+	}
+
+	void getLocalAnimations(v2s32 *frames, float *frame_speed)
+	{
+		for (int i = 0; i < 4; i++)
+			frames[i] = local_animations[i];
+		*frame_speed = local_animation_speed;
+	}
+
 	u16 protocol_version;
 private:
 	/*

From 1b450861f01eef98c7d4f7810724d6bec7423a7c Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 9 Oct 2016 16:31:43 +0200
Subject: [PATCH 236/418] A little cleanup since previous commit

---
 src/content_cao.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 00e17f328..a8e03d670 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -659,10 +659,7 @@ void GenericCAO::initialize(const std::string &data)
 		if (player && strcmp(player->getName(), m_name.c_str()) == 0) {
 			m_is_local_player = true;
 			m_is_visible = false;
-			LocalPlayer* localplayer = player;
-
-			assert( localplayer != NULL );
-			localplayer->setCAO(this);
+			player->setCAO(this);
 		}
 		m_env->addPlayerName(m_name.c_str());
 	}

From a4a9ee94f3aff59fcb9e8f8e31409843564ef6fb Mon Sep 17 00:00:00 2001
From: Rogier <rogier777@gmail.com>
Date: Sun, 9 Oct 2016 17:57:18 +0200
Subject: [PATCH 237/418] Disable cmake message concerning WIN32 on non-windows
 systems

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8e3ae95ab..3eda27953 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -726,7 +726,7 @@ else()
 		set(OTHER_FLAGS "${OTHER_FLAGS} -Wsign-compare")
 	endif()
 
-	if(NOT ZLIBWAPI_DLL AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+	if(WIN32 AND NOT ZLIBWAPI_DLL AND CMAKE_SIZEOF_VOID_P EQUAL 4)
 		set(OTHER_FLAGS "${OTHER_FLAGS} -DWIN32_NO_ZLIB_WINAPI")
 		message(WARNING "Defaulting to cdecl for zlib on win32 because ZLIBWAPI_DLL"
 			" isn't set, ensure that ZLIBWAPI_DLL is set if you want stdcall.")

From b6569f1c699e8bd3dfef50c64272fdb035b43b6c Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Sun, 9 Oct 2016 10:53:13 +0200
Subject: [PATCH 238/418] Add missing languages to the settings

---
 builtin/settingtypes.txt | 2 +-
 minetest.conf.example    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 95cc826a0..0a6c21a46 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -1225,7 +1225,7 @@ name (Player name) string
 
 #    Set the language. Leave empty to use the system language.
 #    A restart is required after changing this.
-language (Language) enum   ,be,cs,da,de,eo,es,et,fr,hu,id,it,ja,jbo,ko,ky,lt,nb,nl,pl,pt,pt_BR,ro,ru,tr,uk,zh_CN,zh_TW
+language (Language) enum   ,be,ca,cs,da,de,en,eo,es,et,fr,he,hu,id,it,ja,jbo,ko,ky,lt,nb,nl,pl,pt,pt_BR,ro,ru,sr_Cyrl,tr,uk,zh_CN,zh_TW
 
 #    Level of logging to be written to debug.txt:
 #    -    <nothing> (no logging)
diff --git a/minetest.conf.example b/minetest.conf.example
index b1b202786..465e1d069 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1588,7 +1588,7 @@
 
 #    Set the language. Leave empty to use the system language.
 #    A restart is required after changing this.
-#    type: enum values: , be, cs, da, de, eo, es, et, fr, hu, id, it, ja, jbo, ko, ky, lt, nb, nl, pl, pt, pt_BR, ro, ru, tr, uk, zh_CN, zh_TW
+#    type: enum values: , be, ca, cs, da, de, en, eo, es, et, fr, he, hu, id, it, ja, jbo, ko, ky, lt, nb, nl, pl, pt, pt_BR, ro, ru, sr_Cyrl, tr, uk, zh_CN, zh_TW
 # language =
 
 #    Level of logging to be written to debug.txt:

From 4f684b589d8227c525d877b8a695736d561ea4d5 Mon Sep 17 00:00:00 2001
From: red-001 <red-001@openmailbox.org>
Date: Tue, 11 Oct 2016 18:11:38 +0100
Subject: [PATCH 239/418] Add a button for disabling all mods to world config.
 (#3900)

---
 builtin/mainmenu/dlg_config_world.lua | 37 ++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua
index eb0319ba0..6e6224c92 100644
--- a/builtin/mainmenu/dlg_config_world.lua
+++ b/builtin/mainmenu/dlg_config_world.lua
@@ -16,6 +16,9 @@
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 --------------------------------------------------------------------------------
+
+local enabled_all = false 
+
 local function modname_valid(name)
 	return not name:find("[^a-z0-9_]")
 end
@@ -80,11 +83,15 @@ local function get_formspec(data)
 			end
 		end
 	end
-
-	retval = retval ..
-		"button[8.75,0.125;2.5,0.5;btn_all_mods;" .. fgettext("Enable all") .. "]" ..
-		"textlist[5.5,0.75;5.75,5.25;world_config_modlist;"
-
+	if enabled_all then 
+		retval = retval ..
+			"button[8.75,0.125;2.5,0.5;btn_disable_all_mods;" .. fgettext("Disable all") .. "]" ..
+			"textlist[5.5,0.75;5.75,5.25;world_config_modlist;"
+	else
+		retval = retval ..
+			"button[8.75,0.125;2.5,0.5;btn_enable_all_mods;" .. fgettext("Enable all") .. "]" ..
+			"textlist[5.5,0.75;5.75,5.25;world_config_modlist;"
+	end
 	retval = retval .. modmgr.render_modlist(data.list)
 	retval = retval .. ";" .. data.selected_mod .."]"
 
@@ -229,15 +236,27 @@ local function handle_buttons(this, fields)
 		return true
 	end
 
-	if fields["btn_all_mods"] then
+	if fields.btn_enable_all_mods then
 		local list = this.data.list:get_raw_list()
 
-		for i=1,#list,1 do
-			if list[i].typ ~= "game_mod" and
-				not list[i].is_modpack then
+		for i = 1, #list do
+			if list[i].typ ~= "game_mod" and not list[i].is_modpack then
 				list[i].enabled = true
 			end
 		end
+		enabled_all = true
+		return true
+	end
+	
+	if fields.btn_disable_all_mods then
+		local list = this.data.list:get_raw_list()
+
+		for i = 1, #list do
+			if list[i].typ ~= "game_mod" and not list[i].is_modpack then
+				list[i].enabled = false
+			end
+		end
+		enabled_all = false
 		return true
 	end
 

From 0b27a70b294590d7fb2bb25bf2d207a719ce8d98 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Wed, 12 Oct 2016 18:39:35 +0200
Subject: [PATCH 240/418] Don't use unordered maps for ProfilerGraph (fixes
 flickering)

---
 src/game.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 4f89aa680..b85f6d98d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -605,7 +605,9 @@ public:
 	void draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
 		  gui::IGUIFont *font) const
 	{
-		UNORDERED_MAP<std::string, Meta> m_meta;
+		// Do *not* use UNORDERED_MAP here as the order needs
+		// to be the same for each call to prevent flickering
+		std::map<std::string, Meta> m_meta;
 
 		for (std::deque<Piece>::const_iterator k = m_log.begin();
 				k != m_log.end(); ++k) {
@@ -615,7 +617,7 @@ public:
 					i != piece.values.end(); ++i) {
 				const std::string &id = i->first;
 				const float &value = i->second;
-				UNORDERED_MAP<std::string, Meta>::iterator j = m_meta.find(id);
+				std::map<std::string, Meta>::iterator j = m_meta.find(id);
 
 				if (j == m_meta.end()) {
 					m_meta[id] = Meta(value);
@@ -642,7 +644,7 @@ public:
 			sizeof(usable_colors) / sizeof(*usable_colors);
 		u32 next_color_i = 0;
 
-		for (UNORDERED_MAP<std::string, Meta>::iterator i = m_meta.begin();
+		for (std::map<std::string, Meta>::iterator i = m_meta.begin();
 				i != m_meta.end(); ++i) {
 			Meta &meta = i->second;
 			video::SColor color(255, 200, 200, 200);
@@ -658,7 +660,7 @@ public:
 		s32 textx2 = textx + 200 - 15;
 		s32 meta_i = 0;
 
-		for (UNORDERED_MAP<std::string, Meta>::const_iterator i = m_meta.begin();
+		for (std::map<std::string, Meta>::const_iterator i = m_meta.begin();
 				i != m_meta.end(); ++i) {
 			const std::string &id = i->first;
 			const Meta &meta = i->second;

From c9e7a27eeb628be78a835abadf8afe1177eb90c5 Mon Sep 17 00:00:00 2001
From: raymoo <uguu@installgentoo.com>
Date: Thu, 4 Aug 2016 13:09:21 -0700
Subject: [PATCH 241/418] Attached particle spawners

---
 doc/lua_api.txt                     |  2 +
 src/client.h                        |  1 +
 src/content_sao.cpp                 | 10 +++-
 src/environment.cpp                 | 24 +++++++++
 src/environment.h                   |  4 +-
 src/network/clientpackethandler.cpp |  3 ++
 src/particles.cpp                   | 79 +++++++++++++++++++----------
 src/particles.h                     |  3 +-
 src/script/lua_api/l_particles.cpp  | 11 ++++
 src/server.cpp                      | 17 +++++--
 src/server.h                        |  2 +
 src/serverobject.cpp                |  1 -
 src/serverobject.h                  | 10 ++++
 13 files changed, 131 insertions(+), 36 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 6bdcd4fe4..a1d598e7d 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -4120,6 +4120,8 @@ The Biome API is still in an experimental phase and subject to change.
         collision_removal = false,
     --  ^ collision_removal: if true then particle is removed when it collides,
     --  ^ requires collisiondetection = true to have any effect
+        attached = ObjectRef,
+    --  ^ attached: if defined, makes particle positions relative to this object.
         vertical = false,
     --  ^ vertical: if true faces player using y axis only
         texture = "image.png",
diff --git a/src/client.h b/src/client.h
index 6d24c0b1d..9f5bda059 100644
--- a/src/client.h
+++ b/src/client.h
@@ -201,6 +201,7 @@ struct ClientEvent
 			f32 maxsize;
 			bool collisiondetection;
 			bool collision_removal;
+			u16 attached_id;
 			bool vertical;
 			std::string *texture;
 			u32 id;
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 5d3ed38bc..375a43c90 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -156,6 +156,11 @@ LuaEntitySAO::~LuaEntitySAO()
 	if(m_registered){
 		m_env->getScriptIface()->luaentity_Remove(m_id);
 	}
+
+	for (UNORDERED_SET<u32>::iterator it = m_attached_particle_spawners.begin();
+		it != m_attached_particle_spawners.end(); ++it) {
+		m_env->deleteParticleSpawner(*it, false);
+	}
 }
 
 void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
@@ -817,7 +822,6 @@ PlayerSAO::~PlayerSAO()
 {
 	if(m_inventory != &m_player->inventory)
 		delete m_inventory;
-
 }
 
 std::string PlayerSAO::getDescription()
@@ -844,6 +848,10 @@ void PlayerSAO::removingFromEnvironment()
 		m_player->peer_id = 0;
 		m_env->savePlayer(m_player);
 		m_env->removePlayer(m_player);
+		for (UNORDERED_SET<u32>::iterator it = m_attached_particle_spawners.begin();
+			it != m_attached_particle_spawners.end(); ++it) {
+			m_env->deleteParticleSpawner(*it, false);
+		}
 	}
 }
 
diff --git a/src/environment.cpp b/src/environment.cpp
index ceaa01d7a..ceaf40d89 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1518,6 +1518,30 @@ u32 ServerEnvironment::addParticleSpawner(float exptime)
 	return id;
 }
 
+u32 ServerEnvironment::addParticleSpawner(float exptime, u16 attached_id)
+{
+	u32 id = addParticleSpawner(exptime);
+	m_particle_spawner_attachments[id] = attached_id;
+	if (ServerActiveObject *obj = getActiveObject(attached_id)) {
+		obj->attachParticleSpawner(id);
+	}
+	return id;
+}
+
+void ServerEnvironment::deleteParticleSpawner(u32 id, bool remove_from_object)
+{
+	m_particle_spawners.erase(id);
+	UNORDERED_MAP<u32, u16>::iterator it = m_particle_spawner_attachments.find(id);
+	if (it != m_particle_spawner_attachments.end()) {
+		u16 obj_id = (*it).second;
+		ServerActiveObject *sao = getActiveObject(obj_id);
+		if (sao != NULL && remove_from_object) {
+			sao->detachParticleSpawner(id);
+		}
+		m_particle_spawner_attachments.erase(id);
+	}
+}
+
 ServerActiveObject* ServerEnvironment::getActiveObject(u16 id)
 {
 	ActiveObjectMap::iterator n = m_active_objects.find(id);
diff --git a/src/environment.h b/src/environment.h
index 83ad69562..3f3c1cf2c 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -329,7 +329,8 @@ public:
 	void loadDefaultMeta();
 
 	u32 addParticleSpawner(float exptime);
-	void deleteParticleSpawner(u32 id) { m_particle_spawners.erase(id); }
+	u32 addParticleSpawner(float exptime, u16 attached_id);
+	void deleteParticleSpawner(u32 id, bool remove_from_object = true);
 
 	/*
 		External ActiveObject interface
@@ -519,6 +520,7 @@ private:
 	// Particles
 	IntervalLimiter m_particle_management_interval;
 	UNORDERED_MAP<u32, float> m_particle_spawners;
+	UNORDERED_MAP<u32, u16> m_particle_spawner_attachments;
 };
 
 #ifndef SERVER
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index b39356e92..090741f9f 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -944,9 +944,11 @@ void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt)
 
 	bool vertical = false;
 	bool collision_removal = false;
+	u16 attached_id = 0;
 	try {
 		*pkt >> vertical;
 		*pkt >> collision_removal;
+		*pkt >> attached_id;
 
 	} catch (...) {}
 
@@ -966,6 +968,7 @@ void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt)
 	event.add_particlespawner.maxsize            = maxsize;
 	event.add_particlespawner.collisiondetection = collisiondetection;
 	event.add_particlespawner.collision_removal  = collision_removal;
+	event.add_particlespawner.attached_id        = attached_id;
 	event.add_particlespawner.vertical           = vertical;
 	event.add_particlespawner.texture            = new std::string(texture);
 	event.add_particlespawner.id                 = id;
diff --git a/src/particles.cpp b/src/particles.cpp
index ccca691d1..2efee6ada 100644
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -213,7 +213,7 @@ ParticleSpawner::ParticleSpawner(IGameDef* gamedef, scene::ISceneManager *smgr,
 	u16 amount, float time,
 	v3f minpos, v3f maxpos, v3f minvel, v3f maxvel, v3f minacc, v3f maxacc,
 	float minexptime, float maxexptime, float minsize, float maxsize,
-	bool collisiondetection, bool collision_removal, bool vertical,
+	bool collisiondetection, bool collision_removal, u16 attached_id, bool vertical,
 	video::ITexture *texture, u32 id, ParticleManager *p_manager) :
 	m_particlemanager(p_manager)
 {
@@ -234,6 +234,7 @@ ParticleSpawner::ParticleSpawner(IGameDef* gamedef, scene::ISceneManager *smgr,
 	m_maxsize = maxsize;
 	m_collisiondetection = collisiondetection;
 	m_collision_removal = collision_removal;
+	m_attached_id = attached_id;
 	m_vertical = vertical;
 	m_texture = texture;
 	m_time = 0;
@@ -251,6 +252,15 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 {
 	m_time += dtime;
 
+	bool unloaded = false;
+	v3f attached_offset = v3f(0,0,0);
+	if (m_attached_id != 0) {
+		if (ClientActiveObject *attached = env->getActiveObject(m_attached_id))
+			attached_offset = attached->getPosition() / BS;
+		else
+			unloaded = true;
+	}
+
 	if (m_spawntime != 0) // Spawner exists for a predefined timespan
 	{
 		for(std::vector<float>::iterator i = m_spawntimes.begin();
@@ -260,33 +270,41 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 			{
 				m_amount--;
 
-				v3f pos = random_v3f(m_minpos, m_maxpos);
-				v3f vel = random_v3f(m_minvel, m_maxvel);
-				v3f acc = random_v3f(m_minacc, m_maxacc);
-				float exptime = rand()/(float)RAND_MAX
-						*(m_maxexptime-m_minexptime)
-						+m_minexptime;
-				float size = rand()/(float)RAND_MAX
-						*(m_maxsize-m_minsize)
-						+m_minsize;
+				// Pretend to, but don't actually spawn a
+				// particle if it is attached to an unloaded
+				// object.
+				if (!unloaded) {
+					v3f pos = random_v3f(m_minpos, m_maxpos)
+							+ attached_offset;
+					v3f vel = random_v3f(m_minvel, m_maxvel);
+					v3f acc = random_v3f(m_minacc, m_maxacc);
+					// Make relative to offest
+					pos += attached_offset;
+					float exptime = rand()/(float)RAND_MAX
+							*(m_maxexptime-m_minexptime)
+							+m_minexptime;
+					float size = rand()/(float)RAND_MAX
+							*(m_maxsize-m_minsize)
+							+m_minsize;
 
-				Particle* toadd = new Particle(
-					m_gamedef,
-					m_smgr,
-					m_player,
-					env,
-					pos,
-					vel,
-					acc,
-					exptime,
-					size,
-					m_collisiondetection,
-					m_collision_removal,
-					m_vertical,
-					m_texture,
-					v2f(0.0, 0.0),
-					v2f(1.0, 1.0));
-				m_particlemanager->addParticle(toadd);
+					Particle* toadd = new Particle(
+						m_gamedef,
+						m_smgr,
+						m_player,
+						env,
+						pos,
+						vel,
+						acc,
+						exptime,
+						size,
+						m_collisiondetection,
+						m_collision_removal,
+						m_vertical,
+						m_texture,
+						v2f(0.0, 0.0),
+						v2f(1.0, 1.0));
+					m_particlemanager->addParticle(toadd);
+				}
 				i = m_spawntimes.erase(i);
 			}
 			else
@@ -297,11 +315,15 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 	}
 	else // Spawner exists for an infinity timespan, spawn on a per-second base
 	{
+		// Skip this step if attached to an unloaded object
+		if (unloaded)
+			return;
 		for (int i = 0; i <= m_amount; i++)
 		{
 			if (rand()/(float)RAND_MAX < dtime)
 			{
-				v3f pos = random_v3f(m_minpos, m_maxpos);
+				v3f pos = random_v3f(m_minpos, m_maxpos)
+						+ attached_offset;
 				v3f vel = random_v3f(m_minvel, m_maxvel);
 				v3f acc = random_v3f(m_minacc, m_maxacc);
 				float exptime = rand()/(float)RAND_MAX
@@ -453,6 +475,7 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 					event->add_particlespawner.maxsize,
 					event->add_particlespawner.collisiondetection,
 					event->add_particlespawner.collision_removal,
+					event->add_particlespawner.attached_id,
 					event->add_particlespawner.vertical,
 					texture,
 					event->add_particlespawner.id,
diff --git a/src/particles.h b/src/particles.h
index bc3ca53b7..eb8c6665d 100644
--- a/src/particles.h
+++ b/src/particles.h
@@ -119,6 +119,7 @@ class ParticleSpawner
 		float minsize, float maxsize,
 		bool collisiondetection,
 		bool collision_removal,
+		u16 attached_id,
 		bool vertical,
 		video::ITexture *texture,
 		u32 id,
@@ -154,7 +155,7 @@ class ParticleSpawner
 	bool m_collisiondetection;
 	bool m_collision_removal;
 	bool m_vertical;
-
+	u16 m_attached_id;
 };
 
 /**
diff --git a/src/script/lua_api/l_particles.cpp b/src/script/lua_api/l_particles.cpp
index 263e35407..667ac7272 100644
--- a/src/script/lua_api/l_particles.cpp
+++ b/src/script/lua_api/l_particles.cpp
@@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "lua_api/l_particles.h"
+#include "lua_api/l_object.h"
 #include "lua_api/l_internal.h"
 #include "common/c_converter.h"
 #include "server.h"
@@ -138,6 +139,7 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 	      time= minexptime= maxexptime= minsize= maxsize= 1;
 	bool collisiondetection, vertical, collision_removal;
 	     collisiondetection = vertical = collision_removal = false;
+	ServerActiveObject *attached = NULL;
 	std::string texture = "";
 	std::string playername = "";
 
@@ -198,6 +200,14 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 			"collisiondetection", collisiondetection);
 		collision_removal = getboolfield_default(L, 1,
 			"collision_removal", collision_removal);
+
+		lua_getfield(L, 1, "attached");
+		if (!lua_isnil(L, -1)) {
+			ObjectRef *ref = ObjectRef::checkobject(L, -1);
+			lua_pop(L, 1);
+			attached = ObjectRef::getobject(ref);
+		}
+
 		vertical = getboolfield_default(L, 1, "vertical", vertical);
 		texture = getstringfield_default(L, 1, "texture", "");
 		playername = getstringfield_default(L, 1, "playername", "");
@@ -211,6 +221,7 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 			minsize, maxsize,
 			collisiondetection,
 			collision_removal,
+			attached,
 			vertical,
 			texture, playername);
 	lua_pushnumber(L, id);
diff --git a/src/server.cpp b/src/server.cpp
index a93c143c7..e67f37d56 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1678,7 +1678,7 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
 void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3f minpos, v3f maxpos,
 	v3f minvel, v3f maxvel, v3f minacc, v3f maxacc, float minexptime, float maxexptime,
 	float minsize, float maxsize, bool collisiondetection, bool collision_removal,
-	bool vertical, const std::string &texture, u32 id)
+	u16 attached_id, bool vertical, const std::string &texture, u32 id)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -1692,6 +1692,7 @@ void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3
 
 	pkt << id << vertical;
 	pkt << collision_removal;
+	pkt << attached_id;
 
 	if (peer_id != PEER_ID_INEXISTENT) {
 		Send(&pkt);
@@ -3156,7 +3157,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 	v3f minpos, v3f maxpos, v3f minvel, v3f maxvel, v3f minacc, v3f maxacc,
 	float minexptime, float maxexptime, float minsize, float maxsize,
 	bool collisiondetection, bool collision_removal,
-	bool vertical, const std::string &texture,
+	ServerActiveObject *attached, bool vertical, const std::string &texture,
 	const std::string &playername)
 {
 	// m_env will be NULL if the server is initializing
@@ -3171,11 +3172,19 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 		peer_id = player->peer_id;
 	}
 
-	u32 id = m_env->addParticleSpawner(spawntime);
+	u16 attached_id = attached ? attached->getId() : 0;
+
+	u32 id;
+	if (attached_id == 0)
+		id = m_env->addParticleSpawner(spawntime);
+	else
+		id = m_env->addParticleSpawner(spawntime, attached_id);
+
 	SendAddParticleSpawner(peer_id, amount, spawntime,
 		minpos, maxpos, minvel, maxvel, minacc, maxacc,
 		minexptime, maxexptime, minsize, maxsize,
-		collisiondetection, collision_removal, vertical, texture, id);
+		collisiondetection, collision_removal, attached_id, vertical,
+		texture, id);
 
 	return id;
 }
diff --git a/src/server.h b/src/server.h
index 6ee61a0eb..5fc2a9133 100644
--- a/src/server.h
+++ b/src/server.h
@@ -258,6 +258,7 @@ public:
 		float minexptime, float maxexptime,
 		float minsize, float maxsize,
 		bool collisiondetection, bool collision_removal,
+		ServerActiveObject *attached,
 		bool vertical, const std::string &texture,
 		const std::string &playername);
 
@@ -434,6 +435,7 @@ private:
 		float minexptime, float maxexptime,
 		float minsize, float maxsize,
 		bool collisiondetection, bool collision_removal,
+		u16 attached_id,
 		bool vertical, const std::string &texture, u32 id);
 
 	void SendDeleteParticleSpawner(u16 peer_id, u32 id);
diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 236d7e8dc..191247829 100644
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -98,4 +98,3 @@ bool ServerActiveObject::setWieldedItem(const ItemStack &item)
 	}
 	return false;
 }
-
diff --git a/src/serverobject.h b/src/serverobject.h
index cfe2b6bcc..63650e3be 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -188,6 +188,15 @@ public:
 	{ return 0; }
 	virtual ItemStack getWieldedItem() const;
 	virtual bool setWieldedItem(const ItemStack &item);
+	inline void attachParticleSpawner(u32 id)
+	{
+		m_attached_particle_spawners.insert(id);
+	}
+	inline void detachParticleSpawner(u32 id)
+	{
+		m_attached_particle_spawners.erase(id);
+	}
+
 
 	/*
 		Number of players which know about this object. Object won't be
@@ -242,6 +251,7 @@ protected:
 
 	ServerEnvironment *m_env;
 	v3f m_base_position;
+	UNORDERED_SET<u32> m_attached_particle_spawners;
 
 private:
 	// Used for creating objects based on type

From 0ad40fd484f57ab5d0536f9aaa892997f8aa9bd2 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Wed, 12 Oct 2016 13:38:53 -0700
Subject: [PATCH 242/418] Use range-based fog instead of z-plane based.

---
 client/shaders/nodes_shader/opengl_fragment.glsl         | 4 ++--
 client/shaders/water_surface_shader/opengl_fragment.glsl | 4 ++--
 client/shaders/wielded_shader/opengl_fragment.glsl       | 2 +-
 src/game.cpp                                             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index 6862842a7..654b1396d 100644
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -197,13 +197,13 @@ void main(void)
 #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT
 	float alpha = gl_Color.a;
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
+		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
 		alpha = mix(alpha, 0.0, d);
 	}
 	col = vec4(col.rgb, alpha);
 #else
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
+		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
 		col = mix(col, skyBgColor, d);
 	}
 	col = vec4(col.rgb, base.a);
diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
index 1fa669541..1aa721f83 100644
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -153,13 +153,13 @@ vec4 base = texture2D(baseTexture, uv).rgba;
 #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
 	float alpha = gl_Color.a;
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
+		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
 		alpha = mix(alpha, 0.0, d);
 	}
 	col = vec4(col.rgb, alpha);
 #else
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
+		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
 		col = mix(col, skyBgColor, d);
 	}
 	col = vec4(col.rgb, base.a);
diff --git a/client/shaders/wielded_shader/opengl_fragment.glsl b/client/shaders/wielded_shader/opengl_fragment.glsl
index 75dd1b674..afb8cc32d 100644
--- a/client/shaders/wielded_shader/opengl_fragment.glsl
+++ b/client/shaders/wielded_shader/opengl_fragment.glsl
@@ -107,7 +107,7 @@ void main(void)
 	vec4 col = vec4(color.rgb, base.a);
 	col *= gl_Color;
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
+		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
 		col = mix(col, skyBgColor, d);
 	}
 	gl_FragColor = vec4(col.rgb, base.a);
diff --git a/src/game.cpp b/src/game.cpp
index b85f6d98d..ed2673c71 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -4168,7 +4168,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats,
 				runData->fog_range * 1.0,
 				0.01,
 				false, // pixel fog
-				false // range fog
+				true // range fog
 		);
 	} else {
 		driver->setFog(

From a468acce2ccd0197aa662fa592dba7dfe3e46f96 Mon Sep 17 00:00:00 2001
From: tenplus1 <tenplus1@users.noreply.github.com>
Date: Mon, 10 Oct 2016 18:37:21 +0100
Subject: [PATCH 243/418] Builtin/../falling.lua: Code optimisation

---
 builtin/game/falling.lua | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 4b16a0586..5244ee782 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -41,7 +41,7 @@ core.register_entity(":__builtin:falling_node", {
 	end,
 
 	on_step = function(self, dtime)
-		 -- Set gravity
+		-- Set gravity
 		local acceleration = self.object:getacceleration()
 		if not vector.equals(acceleration, {x = 0, y = -10, z = 0}) then
 			self.object:setacceleration({x = 0, y = -10, z = 0})
@@ -52,10 +52,9 @@ core.register_entity(":__builtin:falling_node", {
 		local bcn = core.get_node(bcp)
 		local bcd = core.registered_nodes[bcn.name]
 		-- Note: walkable is in the node definition, not in item groups
-		if not bcd or
-				(bcd.walkable or
+		if not bcd or bcd.walkable or
 				(core.get_item_group(self.node.name, "float") ~= 0 and
-				bcd.liquidtype ~= "none")) then
+				bcd.liquidtype ~= "none") then
 			if bcd and bcd.leveled and
 					bcn.name == self.node.name then
 				local addlevel = self.node.level
@@ -75,20 +74,20 @@ core.register_entity(":__builtin:falling_node", {
 			local np = {x = bcp.x, y = bcp.y + 1, z = bcp.z}
 			-- Check what's here
 			local n2 = core.get_node(np)
+			local nd = core.registered_nodes[n2.name]
 			-- If it's not air or liquid, remove node and replace it with
 			-- it's drops
-			if n2.name ~= "air" and (not core.registered_nodes[n2.name] or
-					core.registered_nodes[n2.name].liquidtype == "none") then
+			if n2.name ~= "air" and (not nd or nd.liquidtype == "none") then
 				core.remove_node(np)
-				if core.registered_nodes[n2.name].buildable_to == false then
+				if nd.buildable_to == false then
 					-- Add dropped items
 					local drops = core.get_node_drops(n2.name, "")
-					for _, dropped_item in ipairs(drops) do
+					for _, dropped_item in pairs(drops) do
 						core.add_item(np, dropped_item)
 					end
 				end
 				-- Run script hook
-				for _, callback in ipairs(core.registered_on_dignodes) do
+				for _, callback in pairs(core.registered_on_dignodes) do
 					callback(np, n2)
 				end
 			end
@@ -116,7 +115,7 @@ end
 function drop_attached_node(p)
 	local nn = core.get_node(p).name
 	core.remove_node(p)
-	for _, item in ipairs(core.get_node_drops(nn, "")) do
+	for _, item in pairs(core.get_node_drops(nn, "")) do
 		local pos = {
 			x = p.x + math.random()/2 - 0.25,
 			y = p.y + math.random()/2 - 0.25,
@@ -156,14 +155,15 @@ function nodeupdate_single(p)
 	if core.get_item_group(n.name, "falling_node") ~= 0 then
 		local p_bottom = {x = p.x, y = p.y - 1, z = p.z}
 		local n_bottom = core.get_node(p_bottom)
+		local d_bottom = core.registered_nodes[n_bottom.name]
 		-- Note: walkable is in the node definition, not in item groups
-		if core.registered_nodes[n_bottom.name] and
+		if d_bottom and
 				(core.get_item_group(n.name, "float") == 0 or
-					core.registered_nodes[n_bottom.name].liquidtype == "none") and
-				(n.name ~= n_bottom.name or (core.registered_nodes[n_bottom.name].leveled and
+					d_bottom.liquidtype == "none") and
+				(n.name ~= n_bottom.name or (d_bottom.leveled and
 					core.get_node_level(p_bottom) < core.get_node_max_level(p_bottom))) and
-				(not core.registered_nodes[n_bottom.name].walkable or
-					core.registered_nodes[n_bottom.name].buildable_to) then
+				(not d_bottom.walkable or
+					d_bottom.buildable_to) then
 			n.level = core.get_node_level(p)
 			core.remove_node(p)
 			spawn_falling_node(p, n)

From 9a3129da5e39e3495a038c9da94586247365fa8b Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Fri, 14 Oct 2016 13:08:59 +0200
Subject: [PATCH 244/418] Make documentation about
 ItemStack:set_{name,count,wear} clearer

	These methods do not actually fail but instead clear the item stack
	and return false if a value like e.g. "" is passed.
---
 doc/lua_api.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index a1d598e7d..8cb3f72bd 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2966,13 +2966,11 @@ an itemstring, a table or `nil`.
 #### Methods
 * `is_empty()`: Returns `true` if stack is empty.
 * `get_name()`: Returns item name (e.g. `"default:stone"`).
-* `set_name(item_name)`: Returns boolean success.
-  Clears item on failure.
+* `set_name(item_name)`: Returns boolean whether item was cleared
 * `get_count()`: Returns number of items on the stack.
-* `set_count(count)`
+* `set_count(count)`: Returns boolean whether item was cleared
 * `get_wear()`: Returns tool wear (`0`-`65535`), `0` for non-tools.
-* `set_wear(wear)`: Returns boolean success.
-  Clears item on failure.
+* `set_wear(wear)`: Returns boolean whether item was cleared
 * `get_metadata()`: Returns metadata (a string attached to an item stack).
 * `set_metadata(metadata)`: Returns true.
 * `clear()`: removes all items from the stack, making it empty.

From adad6e0a1c2bb6cd5e56db26d660fa9342cf0d0e Mon Sep 17 00:00:00 2001
From: Tim <t4im@users.noreply.github.com>
Date: Sat, 15 Oct 2016 17:59:23 +0200
Subject: [PATCH 245/418] Travis: Only trigger a compile, when C/C++ related
 files were touched (#4284)

---
 util/travis/before_install.sh | 4 ++++
 util/travis/common.sh         | 8 ++++++++
 util/travis/script.sh         | 3 +++
 3 files changed, 15 insertions(+)
 create mode 100644 util/travis/common.sh

diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index d25614edb..891371984 100755
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -1,4 +1,8 @@
 #!/bin/bash -e
+echo "Preparing for $TRAVIS_COMMIT_RANGE"
+. util/travis/common.sh
+
+needs_compile || exit 0
 
 if [[ $TRAVIS_OS_NAME == "linux" ]]; then
 	sudo apt-get update
diff --git a/util/travis/common.sh b/util/travis/common.sh
new file mode 100644
index 000000000..16c7db324
--- /dev/null
+++ b/util/travis/common.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+# Relative to git-repository root:
+TRIGGER_COMPILE_PATHS="src/|CMakeLists.txt|cmake/Modules/|util/travis/|util/buildbot/"
+
+needs_compile() {
+	git diff --name-only $TRAVIS_COMMIT_RANGE | egrep -q "^($TRIGGER_COMPILE_PATHS)"
+}
diff --git a/util/travis/script.sh b/util/travis/script.sh
index 4f37d8f5a..1bafb26cd 100755
--- a/util/travis/script.sh
+++ b/util/travis/script.sh
@@ -1,4 +1,7 @@
 #!/bin/bash -e
+. util/travis/common.sh
+
+needs_compile || exit 0
 
 if [[ $PLATFORM == "Unix" ]]; then
 	mkdir -p travisbuild

From 4b17105dc45976e399dab68f85b3030fa27f0ae2 Mon Sep 17 00:00:00 2001
From: Rogier <rogier777@gmail.com>
Date: Mon, 25 Jul 2016 18:39:29 +0200
Subject: [PATCH 246/418] Emergeblocks: Fix occasional crash

Modification of the emergeblocks internal state was not protected
by a lock, causing a race condition.
This can be reproduced by repeatedly running emergeblocks for an
already-generated section of the map (with multiple emerge threads).
---
 src/script/cpp_api/s_env.cpp | 4 +++-
 src/script/lua_api/l_env.cpp | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp
index 82d0d4f0e..913d8539d 100644
--- a/src/script/cpp_api/s_env.cpp
+++ b/src/script/cpp_api/s_env.cpp
@@ -212,11 +212,13 @@ void ScriptApiEnv::on_emerge_area_completion(
 {
 	Server *server = getServer();
 
+	// This function should be executed with envlock held.
+	// The caller (LuaEmergeAreaCallback in src/script/lua_api/l_env.cpp)
+	// should have obtained the lock.
 	// Note that the order of these locks is important!  Envlock must *ALWAYS*
 	// be acquired before attempting to acquire scriptlock, or else ServerThread
 	// will try to acquire scriptlock after it already owns envlock, thus
 	// deadlocking EmergeThread and ServerThread
-	MutexAutoLock envlock(server->m_env_mutex);
 
 	SCRIPTAPI_PRECHECKHEADER
 
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index f6ea23e95..68d10308c 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -137,6 +137,10 @@ void LuaEmergeAreaCallback(v3s16 blockpos, EmergeAction action, void *param)
 	assert(state->script != NULL);
 	assert(state->refcount > 0);
 
+	// state must be protected by envlock
+	Server *server = state->script->getServer();
+	MutexAutoLock envlock(server->m_env_mutex);
+
 	state->refcount--;
 
 	state->script->on_emerge_area_completion(blockpos, action, state);

From c31e354342bbcb9a051f0113d41431827efc4435 Mon Sep 17 00:00:00 2001
From: red-001 <red-001@openmailbox.org>
Date: Tue, 27 Sep 2016 12:53:01 +0100
Subject: [PATCH 247/418] Builtin/../chatcommands: Add /grantme command

---
 builtin/game/chatcommands.lua | 94 +++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 38 deletions(-)

diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua
index 24792bc8a..d8fee1578 100644
--- a/builtin/game/chatcommands.lua
+++ b/builtin/game/chatcommands.lua
@@ -154,53 +154,71 @@ core.register_chatcommand("privs", {
 				core.get_player_privs(param), ' ')
 	end,
 })
+
+local function handle_grant_command(caller, grantname, grantprivstr)
+	local caller_privs = minetest.get_player_privs(caller)
+	if not (caller_privs.privs or caller_privs.basic_privs) then
+		return false, "Your privileges are insufficient."
+	end
+	
+	if not core.auth_table[grantname] then
+		return false, "Player " .. grantname .. " does not exist."
+	end
+	local grantprivs = core.string_to_privs(grantprivstr)
+	if grantprivstr == "all" then
+		grantprivs = core.registered_privileges
+	end
+	local privs = core.get_player_privs(grantname)
+	local privs_unknown = ""
+	local basic_privs =
+		core.string_to_privs(core.setting_get("basic_privs") or "interact,shout")
+	for priv, _ in pairs(grantprivs) do
+		if not basic_privs[priv] and not caller_privs.privs then
+			return false, "Your privileges are insufficient."
+		end
+		if not core.registered_privileges[priv] then
+			privs_unknown = privs_unknown .. "Unknown privilege: " .. priv .. "\n"
+		end
+		privs[priv] = true
+	end
+	if privs_unknown ~= "" then
+		return false, privs_unknown
+	end
+	core.set_player_privs(grantname, privs)
+	core.log("action", caller..' granted ('..core.privs_to_string(grantprivs, ', ')..') privileges to '..grantname)
+	if grantname ~= caller then
+		core.chat_send_player(grantname, caller
+				.. " granted you privileges: "
+				.. core.privs_to_string(grantprivs, ' '))
+	end
+	return true, "Privileges of " .. grantname .. ": "
+		.. core.privs_to_string(
+			core.get_player_privs(grantname), ' ')
+end
+
 core.register_chatcommand("grant", {
 	params = "<name> <privilege>|all",
 	description = "Give privilege to player",
 	func = function(name, param)
-		if not core.check_player_privs(name, {privs=true}) and
-				not core.check_player_privs(name, {basic_privs=true}) then
-			return false, "Your privileges are insufficient."
-		end
 		local grantname, grantprivstr = string.match(param, "([^ ]+) (.+)")
 		if not grantname or not grantprivstr then
 			return false, "Invalid parameters (see /help grant)"
-		elseif not core.auth_table[grantname] then
-			return false, "Player " .. grantname .. " does not exist."
-		end
-		local grantprivs = core.string_to_privs(grantprivstr)
-		if grantprivstr == "all" then
-			grantprivs = core.registered_privileges
-		end
-		local privs = core.get_player_privs(grantname)
-		local privs_unknown = ""
-		local basic_privs =
-			core.string_to_privs(core.setting_get("basic_privs") or "interact,shout")
-		for priv, _ in pairs(grantprivs) do
-			if not basic_privs[priv] and
-					not core.check_player_privs(name, {privs=true}) then
-				return false, "Your privileges are insufficient."
-			end
-			if not core.registered_privileges[priv] then
-				privs_unknown = privs_unknown .. "Unknown privilege: " .. priv .. "\n"
-			end
-			privs[priv] = true
-		end
-		if privs_unknown ~= "" then
-			return false, privs_unknown
-		end
-		core.set_player_privs(grantname, privs)
-		core.log("action", name..' granted ('..core.privs_to_string(grantprivs, ', ')..') privileges to '..grantname)
-		if grantname ~= name then
-			core.chat_send_player(grantname, name
-					.. " granted you privileges: "
-					.. core.privs_to_string(grantprivs, ' '))
-		end
-		return true, "Privileges of " .. grantname .. ": "
-			.. core.privs_to_string(
-				core.get_player_privs(grantname), ' ')
+		end	
+		return handle_grant_command(name, grantname, grantprivstr)
 	end,
 })
+
+core.register_chatcommand("grantme", {
+	params = "<privilege>|all",
+	description = "Grant privileges to yourself",
+	func = function(name, param)
+		if param == "" then
+			return false, "Invalid parameters (see /help grantme)"
+		end	
+		return handle_grant_command(name, name, param)
+	end,
+})
+
 core.register_chatcommand("revoke", {
 	params = "<name> <privilege>|all",
 	description = "Remove privilege from player",

From 2ff054d0419535a9422a957d50491ed119d6eb73 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Sun, 9 Oct 2016 14:36:22 -0400
Subject: [PATCH 248/418] Enable mod security by default

---
 builtin/settingtypes.txt | 2 +-
 minetest.conf.example    | 2 +-
 src/defaultsettings.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 0a6c21a46..9b5f386e0 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -1161,7 +1161,7 @@ mgvalleys_np_inter_valley_slope (Valley Slope) noise_params 0.5, 0.5, (128, 128,
 [*Security]
 
 #    Prevent mods from doing insecure things like running shell commands.
-secure.enable_security (Enable mod security) bool false
+secure.enable_security (Enable mod security) bool true
 
 #    Comma-separated list of trusted mods that are allowed to access insecure
 #    functions even when mod security is on (via request_insecure_environment()).
diff --git a/minetest.conf.example b/minetest.conf.example
index 465e1d069..e24d3a384 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1507,7 +1507,7 @@
 
 #    Prevent mods from doing insecure things like running shell commands.
 #    type: bool
-# secure.enable_security = false
+# secure.enable_security = true
 
 #    Comma-separated list of trusted mods that are allowed to access insecure
 #    functions even when mod security is on (via request_insecure_environment()).
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 00c233a42..522aa8481 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -301,7 +301,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("emergequeue_limit_diskonly", "32");
 	settings->setDefault("emergequeue_limit_generate", "32");
 	settings->setDefault("num_emerge_threads", "1");
-	settings->setDefault("secure.enable_security", "false");
+	settings->setDefault("secure.enable_security", "true");
 	settings->setDefault("secure.trusted_mods", "");
 	settings->setDefault("secure.http_mods", "");
 

From 3253b6bd2238eaa8f773f7881f8e47200dc5f42a Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Sun, 16 Oct 2016 21:27:21 -0700
Subject: [PATCH 249/418] Don't use day light sky unless noclip and free_move
 are enabled

---
 src/game.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index ed2673c71..83ef9c0b0 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1741,6 +1741,8 @@ private:
 	bool m_cache_enable_joysticks;
 	bool m_cache_enable_particles;
 	bool m_cache_enable_fog;
+	bool m_cache_enable_noclip;
+	bool m_cache_enable_free_move;
 	f32  m_cache_mouse_sensitivity;
 	f32  m_cache_joystick_frustum_sensitivity;
 	f32  m_repeat_right_click_time;
@@ -1790,6 +1792,10 @@ Game::Game() :
 		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("repeat_rightclick_time",
 		&settingChangedCallback, this);
+	g_settings->registerChangedCallback("noclip",
+		&settingChangedCallback, this);
+	g_settings->registerChangedCallback("free_move",
+		&settingChangedCallback, this);
 
 	readSettings();
 
@@ -2959,12 +2965,14 @@ void Game::toggleFreeMove(float *statustext_time)
 	static const wchar_t *msg[] = { L"free_move disabled", L"free_move enabled" };
 
 	bool free_move = !g_settings->getBool("free_move");
-	g_settings->set("free_move", bool_to_cstr(free_move));
 
 	*statustext_time = 0;
 	statustext = msg[free_move];
-	if (free_move && !client->checkPrivilege("fly"))
+	if (free_move && !client->checkPrivilege("fly")) {
 		statustext += L" (note: no 'fly' privilege)";
+	} else {
+		g_settings->set("free_move", bool_to_cstr(free_move));
+	}
 }
 
 
@@ -2999,13 +3007,15 @@ void Game::toggleNoClip(float *statustext_time)
 {
 	static const wchar_t *msg[] = { L"noclip disabled", L"noclip enabled" };
 	bool noclip = !g_settings->getBool("noclip");
-	g_settings->set("noclip", bool_to_cstr(noclip));
 
 	*statustext_time = 0;
 	statustext = msg[noclip];
 
-	if (noclip && !client->checkPrivilege("noclip"))
+	if (noclip && !client->checkPrivilege("noclip")) {
 		statustext += L" (note: no 'noclip' privilege)";
+	} else {
+		g_settings->set("noclip", bool_to_cstr(noclip));
+	}
 }
 
 void Game::toggleCinematic(float *statustext_time)
@@ -4097,7 +4107,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats,
 	float direct_brightness;
 	bool sunlight_seen;
 
-	if (g_settings->getBool("free_move")) {
+	if (m_cache_enable_noclip && m_cache_enable_free_move) {
 		direct_brightness = time_brightness;
 		sunlight_seen = true;
 	} else {
@@ -4534,6 +4544,9 @@ void Game::readSettings()
 	m_cache_joystick_frustum_sensitivity = g_settings->getFloat("joystick_frustum_sensitivity");
 	m_repeat_right_click_time            = g_settings->getFloat("repeat_rightclick_time");
 
+	m_cache_enable_noclip                = g_settings->getBool("noclip");
+	m_cache_enable_free_move             = g_settings->getBool("free_move");
+
 	m_cache_mouse_sensitivity = rangelim(m_cache_mouse_sensitivity, 0.001, 100.0);
 }
 

From a291cd61320c2d041d64ed2d56d073d70066efd1 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Sun, 16 Oct 2016 23:55:49 -0700
Subject: [PATCH 250/418] Revert changes to toggleNoClip and toggleFreeMove

---
 src/game.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 83ef9c0b0..3ba600ed5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1845,6 +1845,10 @@ Game::~Game()
 		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("repeat_rightclick_time",
 		&settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("noclip",
+		&settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("free_move",
+		&settingChangedCallback, this);
 }
 
 bool Game::startup(bool *kill,
@@ -2965,14 +2969,12 @@ void Game::toggleFreeMove(float *statustext_time)
 	static const wchar_t *msg[] = { L"free_move disabled", L"free_move enabled" };
 
 	bool free_move = !g_settings->getBool("free_move");
+	g_settings->set("free_move", bool_to_cstr(free_move));
 
 	*statustext_time = 0;
 	statustext = msg[free_move];
-	if (free_move && !client->checkPrivilege("fly")) {
+	if (free_move && !client->checkPrivilege("fly"))
 		statustext += L" (note: no 'fly' privilege)";
-	} else {
-		g_settings->set("free_move", bool_to_cstr(free_move));
-	}
 }
 
 
@@ -3007,15 +3009,13 @@ void Game::toggleNoClip(float *statustext_time)
 {
 	static const wchar_t *msg[] = { L"noclip disabled", L"noclip enabled" };
 	bool noclip = !g_settings->getBool("noclip");
+	g_settings->set("noclip", bool_to_cstr(noclip));
 
 	*statustext_time = 0;
 	statustext = msg[noclip];
 
-	if (noclip && !client->checkPrivilege("noclip")) {
+	if (noclip && !client->checkPrivilege("noclip"))
 		statustext += L" (note: no 'noclip' privilege)";
-	} else {
-		g_settings->set("noclip", bool_to_cstr(noclip));
-	}
 }
 
 void Game::toggleCinematic(float *statustext_time)

From 0d740c5d829bceda8500fc505f4a65b967a1c151 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Mon, 17 Oct 2016 20:36:38 +0100
Subject: [PATCH 251/418] Builtin: Add vector.floor helper function

---
 builtin/common/vector.lua | 9 ++++++++-
 doc/lua_api.txt           | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/builtin/common/vector.lua b/builtin/common/vector.lua
index e9ed3aab3..90ba3cc8b 100644
--- a/builtin/common/vector.lua
+++ b/builtin/common/vector.lua
@@ -31,6 +31,14 @@ function vector.normalize(v)
 	end
 end
 
+function vector.floor(v)
+	return {
+		x = math.floor(v.x),
+		y = math.floor(v.y),
+		z = math.floor(v.z)
+	}
+end
+
 function vector.round(v)
 	return {
 		x = math.floor(v.x + 0.5),
@@ -130,4 +138,3 @@ function vector.divide(a, b)
 			z = a.z / b}
 	end
 end
-
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 8cb3f72bd..1e5084354 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1812,7 +1812,8 @@ Spatial Vectors
 * `vector.distance(p1, p2)`: returns a number
 * `vector.length(v)`: returns a number
 * `vector.normalize(v)`: returns a vector
-* `vector.round(v)`: returns a vector, each dimension rounded to floor
+* `vector.floor(v)`: returns a vector, each dimension rounded down
+* `vector.round(v)`: returns a vector, each dimension rounded to nearest int
 * `vector.apply(v, func)`: returns a vector
 * `vector.equals(v1, v2)`: returns a boolean
 

From 91250c1078dc5dc5f48bba2b309920edd6cdfe68 Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Sun, 9 Oct 2016 20:40:29 +0300
Subject: [PATCH 252/418] Fix crash on attaching player to entity

Rename "refresh" to "processInitData"
---
 src/content_cao.cpp | 79 ++++++++++++++++++++++-----------------------
 src/content_cao.h   |  2 ++
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index a8e03d670..88ed43a8c 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -613,45 +613,7 @@ bool GenericCAO::collideWithObjects()
 void GenericCAO::initialize(const std::string &data)
 {
 	infostream<<"GenericCAO: Got init data"<<std::endl;
-	std::istringstream is(data, std::ios::binary);
-	int num_messages = 0;
-	// version
-	u8 version = readU8(is);
-	// check version
-	if(version == 1) // In PROTOCOL_VERSION 14
-	{
-		m_name = deSerializeString(is);
-		m_is_player = readU8(is);
-		m_id = readS16(is);
-		m_position = readV3F1000(is);
-		m_yaw = readF1000(is);
-		m_hp = readS16(is);
-		num_messages = readU8(is);
-	}
-	else if(version == 0) // In PROTOCOL_VERSION 13
-	{
-		m_name = deSerializeString(is);
-		m_is_player = readU8(is);
-		m_position = readV3F1000(is);
-		m_yaw = readF1000(is);
-		m_hp = readS16(is);
-		num_messages = readU8(is);
-	}
-	else
-	{
-		errorstream<<"GenericCAO: Unsupported init data version"
-				<<std::endl;
-		return;
-	}
-
-	for(int i=0; i<num_messages; i++)
-	{
-		std::string message = deSerializeLongString(is);
-		processMessage(message);
-	}
-
-	pos_translator.init(m_position);
-	updateNodePos();
+	processInitData(data);
 
 	if (m_is_player) {
 		// Check if it's the current player
@@ -665,6 +627,43 @@ void GenericCAO::initialize(const std::string &data)
 	}
 }
 
+void GenericCAO::processInitData(const std::string &data)
+{
+	std::istringstream is(data, std::ios::binary);
+	int num_messages = 0;
+	// version
+	u8 version = readU8(is);
+	// check version
+	if (version == 1) { // In PROTOCOL_VERSION 14
+		m_name = deSerializeString(is);
+		m_is_player = readU8(is);
+		m_id = readS16(is);
+		m_position = readV3F1000(is);
+		m_yaw = readF1000(is);
+		m_hp = readS16(is);
+		num_messages = readU8(is);
+	} else if (version == 0) { // In PROTOCOL_VERSION 13
+		m_name = deSerializeString(is);
+		m_is_player = readU8(is);
+		m_position = readV3F1000(is);
+		m_yaw = readF1000(is);
+		m_hp = readS16(is);
+		num_messages = readU8(is);
+	} else {
+		errorstream<<"GenericCAO: Unsupported init data version"
+				<<std::endl;
+		return;
+	}
+
+	for (int i = 0; i < num_messages; i++) {
+		std::string message = deSerializeLongString(is);
+		processMessage(message);
+	}
+
+	pos_translator.init(m_position);
+	updateNodePos();
+}
+
 GenericCAO::~GenericCAO()
 {
 	if (m_is_player) {
@@ -1761,7 +1760,7 @@ void GenericCAO::processMessage(const std::string &data)
 		u8 type = readU8(is);
 
 		if (GenericCAO *childobj = m_env->getGenericCAO(child_id)) {
-			childobj->initialize(deSerializeLongString(is));
+			childobj->processInitData(deSerializeLongString(is));
 		} else {
 			m_env->addActiveObject(child_id, type, deSerializeLongString(is));
 		}
diff --git a/src/content_cao.h b/src/content_cao.h
index cf14a1e18..5b3471814 100644
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -125,6 +125,8 @@ public:
 
 	void initialize(const std::string &data);
 
+	void processInitData(const std::string &data);
+
 	ClientActiveObject *getParent();
 
 	bool getCollisionBox(aabb3f *toset);

From c7d569b8636d8046393715e46fca40e58138183f Mon Sep 17 00:00:00 2001
From: red-001 <red-001@openmailbox.org>
Date: Mon, 26 Sep 2016 19:07:52 +0100
Subject: [PATCH 253/418] Chat commands: Trim whitespaces from input of
 `/privs` command

---
 builtin/game/chatcommands.lua | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua
index d8fee1578..2bd93855b 100644
--- a/builtin/game/chatcommands.lua
+++ b/builtin/game/chatcommands.lua
@@ -147,11 +147,12 @@ core.register_chatcommand("help", {
 core.register_chatcommand("privs", {
 	params = "<name>",
 	description = "print out privileges of player",
-	func = function(name, param)
-		param = (param ~= "" and param or name)
-		return true, "Privileges of " .. param .. ": "
+	func = function(caller, param)
+		param = param:trim()
+		local name = (param ~= "" and param or caller)
+		return true, "Privileges of " .. name .. ": "
 			.. core.privs_to_string(
-				core.get_player_privs(param), ' ')
+				core.get_player_privs(name), ' ')
 	end,
 })
 

From 63a3bb229a9ff288ab01e3e80c8477da5e84ee1e Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 19 Oct 2016 01:37:12 +0100
Subject: [PATCH 254/418] Changes to static object storage limit and error
 message

Move static object storage force-delete message from errorstream to
warningstream.
Increase 'max objects per block' setting to 64.
Add missing spaces in warning code.
---
 builtin/settingtypes.txt |  2 +-
 minetest.conf.example    |  2 +-
 src/defaultsettings.cpp  |  2 +-
 src/environment.cpp      | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 9b5f386e0..492d7c79d 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -817,7 +817,7 @@ max_clearobjects_extra_loaded_blocks (Max. clearobjects extra blocks) int 4096
 server_unload_unused_data_timeout (Unload unused server data) int 29
 
 #    Maximum number of statically stored objects in a block.
-max_objects_per_block (Maximum objects per block) int 49
+max_objects_per_block (Maximum objects per block) int 64
 
 #    See http://www.sqlite.org/pragma.html#pragma_synchronous
 sqlite_synchronous (Synchronous SQLite) enum 2 0,1,2
diff --git a/minetest.conf.example b/minetest.conf.example
index e24d3a384..b7d705bac 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1008,7 +1008,7 @@
 
 #    Maximum number of statically stored objects in a block.
 #    type: int
-# max_objects_per_block = 49
+# max_objects_per_block = 64
 
 #    See http://www.sqlite.org/pragma.html#pragma_synchronous
 #    type: enum values: 0, 1, 2
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 522aa8481..a64840a8f 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -283,7 +283,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("time_send_interval", "5");
 	settings->setDefault("time_speed", "72");
 	settings->setDefault("server_unload_unused_data_timeout", "29");
-	settings->setDefault("max_objects_per_block", "49");
+	settings->setDefault("max_objects_per_block", "64");
 	settings->setDefault("server_map_save_interval", "5.3");
 	settings->setDefault("chat_message_max_size", "500");
 	settings->setDefault("chat_message_limit_per_10sec", "8.0");
diff --git a/src/environment.cpp b/src/environment.cpp
index ceaf40d89..ecda1b6a4 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -2175,13 +2175,13 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
 
 			if(block)
 			{
-				if(block->m_static_objects.m_stored.size() >= g_settings->getU16("max_objects_per_block")){
-					errorstream<<"ServerEnv: Trying to store id="<<obj->getId()
-							<<" statically but block "<<PP(blockpos)
-							<<" already contains "
-							<<block->m_static_objects.m_stored.size()
-							<<" objects."
-							<<" Forcing delete."<<std::endl;
+				if (block->m_static_objects.m_stored.size() >= g_settings->getU16("max_objects_per_block")) {
+					warningstream << "ServerEnv: Trying to store id = " << obj->getId()
+							<< " statically but block " << PP(blockpos)
+							<< " already contains "
+							<< block->m_static_objects.m_stored.size()
+							<< " objects."
+							<< " Forcing delete." << std::endl;
 					force_delete = true;
 				} else {
 					// If static counterpart already exists in target block,

From 0c76303186d968db89d699d9e512aea9904378bc Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 5 Oct 2016 01:25:02 +0100
Subject: [PATCH 255/418] Damage flash: Reduce maximum alpha. Avoid fade
 overload

Flash alpha maximum is reduced from 180 to 127 to avoid player blindness
in combat. Flash alpha minimum is unchanged.
The 'damage_flash' value is now limited to max alpha, to avoid multiple
hits creating a huge value that causes flash to stay at maximum alpha
for a long period. Now alpha always starts to fade immediately after
taking damage.
Both problems can be seen in Minetest let's play videos.
Simplify and optimise some code.
---
 src/game.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 3ba600ed5..1e4464cc4 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -3374,12 +3374,12 @@ void Game::processClientEvents(CameraOrientation *cam, float *damage_flash)
 			//u16 damage = event.player_damage.amount;
 			//infostream<<"Player damage: "<<damage<<std::endl;
 
-			*damage_flash += 100.0;
-			*damage_flash += 8.0 * event.player_damage.amount;
+			*damage_flash += 95.0 + 3.2 * event.player_damage.amount;
+			*damage_flash = MYMIN(*damage_flash, 127.0);
 
 			player->hurt_tilt_timer = 1.5;
-			player->hurt_tilt_strength = event.player_damage.amount / 4;
-			player->hurt_tilt_strength = rangelim(player->hurt_tilt_strength, 1.0, 4.0);
+			player->hurt_tilt_strength =
+				rangelim(event.player_damage.amount / 4, 1.0, 4.0);
 
 			MtEvent *e = new SimpleTriggerEvent("PlayerDamage");
 			gamedef->event()->put(e);
@@ -4285,10 +4285,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats,
 		Damage flash
 	*/
 	if (runData->damage_flash > 0.0) {
-		video::SColor color(std::min(runData->damage_flash, 180.0f),
-				180,
-				0,
-				0);
+		video::SColor color(runData->damage_flash, 180, 0, 0);
 		driver->draw2DRectangle(color,
 					core::rect<s32>(0, 0, screensize.X, screensize.Y),
 					NULL);

From 74eb7f50c9965e77794c0c5caebc1d067cd49629 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Fri, 21 Oct 2016 02:09:34 +0100
Subject: [PATCH 256/418] Lua_api.txt: Clarify 'override_meta' bool in 'set
 mapgen setting'

---
 doc/lua_api.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 1e5084354..f7fc9ee17 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2202,13 +2202,14 @@ and `minetest.auth_reload` call the authetification handler.
 * `minetest.get_mapgen_setting_noiseparams(name)`
     * Same as above, but returns the value as a NoiseParams table if the setting `name` exists
       and is a valid NoiseParams
-* `minetest.set_mapgen_setting(name, value, [override_meta=false])`
+* `minetest.set_mapgen_setting(name, value, [override_meta])`
    * Sets a mapgen param to `value`, and will take effect if the corresponding mapgen setting
-     is not already present in map_meta.txt.  If the optional boolean override_meta is set to true,
-     this setting will become the active setting regardless of the map metafile contents.
+     is not already present in map_meta.txt.
+   * `override_meta` is an optional boolean (default: `false`). If this is set to true,
+     the setting will become the active setting regardless of the map metafile contents.
    * Note: to set the seed, use "seed", not "fixed_map_seed"
-* `minetest.set_mapgen_setting_noiseparams(name, value, [override_meta=false])`
-   * Same as above, except value is a NoiseParams table
+* `minetest.set_mapgen_setting_noiseparams(name, value, [override_meta])`
+   * Same as above, except value is a NoiseParams table.
 * `minetest.set_noiseparams(name, noiseparams, set_default)`
     * Sets the noiseparams setting of `name` to the noiseparams table specified in `noiseparams`.
     * `set_default` is an optional boolean (default: `true`) that specifies whether the setting

From 779d2c5f64e321cc126b3e3abed9e37fd30edb1b Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Thu, 20 Oct 2016 22:21:49 -0700
Subject: [PATCH 257/418] Shaders: Harmonize Irrlicht and shader fog
 calculations

---
 client/shaders/nodes_shader/opengl_fragment.glsl         | 8 ++++----
 client/shaders/water_surface_shader/opengl_fragment.glsl | 8 ++++----
 client/shaders/wielded_shader/opengl_fragment.glsl       | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index 654b1396d..299de2749 100644
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -197,14 +197,14 @@ void main(void)
 #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT
 	float alpha = gl_Color.a;
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
-		alpha = mix(alpha, 0.0, d);
+		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
+		alpha = mix(0.0, alpha, d);
 	}
 	col = vec4(col.rgb, alpha);
 #else
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
-		col = mix(col, skyBgColor, d);
+		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
+		col = mix(skyBgColor, col, d);
 	}
 	col = vec4(col.rgb, base.a);
 #endif
diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
index 1aa721f83..8321ddf93 100644
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -153,14 +153,14 @@ vec4 base = texture2D(baseTexture, uv).rgba;
 #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
 	float alpha = gl_Color.a;
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
-		alpha = mix(alpha, 0.0, d);
+		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
+		alpha = mix(0.0, alpha, d);
 	}
 	col = vec4(col.rgb, alpha);
 #else
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
-		col = mix(col, skyBgColor, d);
+		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
+		col = mix(skyBgColor, col, d);
 	}
 	col = vec4(col.rgb, base.a);
 #endif
diff --git a/client/shaders/wielded_shader/opengl_fragment.glsl b/client/shaders/wielded_shader/opengl_fragment.glsl
index afb8cc32d..bd9741441 100644
--- a/client/shaders/wielded_shader/opengl_fragment.glsl
+++ b/client/shaders/wielded_shader/opengl_fragment.glsl
@@ -107,8 +107,8 @@ void main(void)
 	vec4 col = vec4(color.rgb, base.a);
 	col *= gl_Color;
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
-		col = mix(col, skyBgColor, d);
+		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
+		col = mix(skyBgColor, col, d);
 	}
 	gl_FragColor = vec4(col.rgb, base.a);
 }

From 98176481c1d0b6f8960574af1c2568085e37e433 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Mon, 24 Oct 2016 08:23:13 -0700
Subject: [PATCH 258/418] Shaders: Apply tone mapping before fog calculation.

---
 client/shaders/nodes_shader/opengl_fragment.glsl         | 8 ++++----
 client/shaders/water_surface_shader/opengl_fragment.glsl | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index 299de2749..09c40b652 100644
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -194,6 +194,10 @@ void main(void)
 
 	vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0); 
 	
+#ifdef ENABLE_TONE_MAPPING
+	col = applyToneMapping(col);
+#endif
+
 #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT
 	float alpha = gl_Color.a;
 	if (fogDistance != 0.0) {
@@ -209,9 +213,5 @@ void main(void)
 	col = vec4(col.rgb, base.a);
 #endif
 
-#ifdef ENABLE_TONE_MAPPING
-	gl_FragColor = applyToneMapping(col);
-#else
 	gl_FragColor = col;
-#endif
 }
diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
index 8321ddf93..d910220e9 100644
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -150,6 +150,10 @@ vec4 base = texture2D(baseTexture, uv).rgba;
 
 	vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0); 
 
+#ifdef ENABLE_TONE_MAPPING
+	col = applyToneMapping(col);
+#endif
+
 #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
 	float alpha = gl_Color.a;
 	if (fogDistance != 0.0) {
@@ -165,9 +169,5 @@ vec4 base = texture2D(baseTexture, uv).rgba;
 	col = vec4(col.rgb, base.a);
 #endif
 
-#ifdef ENABLE_TONE_MAPPING
-	gl_FragColor = applyToneMapping(col);
-#else
 	gl_FragColor = col;
-#endif
 }

From a1e1323d6e2ac2304e56b414dd37975ba7c6b05d Mon Sep 17 00:00:00 2001
From: adrido <addi@king-arthur.eu>
Date: Mon, 24 Oct 2016 06:49:35 +0200
Subject: [PATCH 259/418] Windows: dont link to libraries that are already
 linked by cmake

This solves the problem whith building where build fails if the libaries have different names.
---
 src/main.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f63b6a986..a54454653 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,15 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifdef _MSC_VER
-	#ifndef SERVER // Dedicated server isn't linked with Irrlicht
-		#pragma comment(lib, "Irrlicht.lib")
-		// This would get rid of the console window
-		//#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
-	#endif
-	#pragma comment(lib, "zlibwapi.lib")
-	#pragma comment(lib, "Shell32.lib")
-#endif
+// This would get rid of the console window
+//#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
 
 #include "irrlicht.h" // createDevice
 

From 3db2f08ff95a2e1366b9b5079100b6a681f1e562 Mon Sep 17 00:00:00 2001
From: Gael-de-Sailly <gael.chretien@akeonet.com>
Date: Tue, 25 Oct 2016 17:12:50 +0200
Subject: [PATCH 260/418] ParticleSpawner: fix offset being added twice

---
 src/particles.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/particles.cpp b/src/particles.cpp
index 2efee6ada..f20fb4083 100644
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -274,8 +274,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 				// particle if it is attached to an unloaded
 				// object.
 				if (!unloaded) {
-					v3f pos = random_v3f(m_minpos, m_maxpos)
-							+ attached_offset;
+					v3f pos = random_v3f(m_minpos, m_maxpos);
 					v3f vel = random_v3f(m_minvel, m_maxvel);
 					v3f acc = random_v3f(m_minacc, m_maxacc);
 					// Make relative to offest

From 6eb6e75fff91f86d0e59d337f12ec93fcf9dc46e Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Sun, 23 Oct 2016 20:45:25 +0300
Subject: [PATCH 261/418] Adding LuaError on attempt to assign vectors with
 values out of range

---
 src/script/common/c_converter.cpp | 12 ++++++++++++
 src/script/lua_api/l_object.cpp   |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/script/common/c_converter.cpp b/src/script/common/c_converter.cpp
index 857300fa5..f36298915 100644
--- a/src/script/common/c_converter.cpp
+++ b/src/script/common/c_converter.cpp
@@ -23,6 +23,7 @@ extern "C" {
 }
 
 #include "util/numeric.h"
+#include "util/serialize.h"
 #include "util/string.h"
 #include "common/c_converter.h"
 #include "constants.h"
@@ -37,6 +38,14 @@ extern "C" {
 		} \
 	} while(0)
 #define CHECK_POS_COORD(name) CHECK_TYPE(-1, "position coordinate '" name "'", LUA_TNUMBER)
+#define CHECK_FLOAT_RANGE(value, name) \
+if (value < F1000_MIN || value > F1000_MAX) { \
+	std::ostringstream error_text; \
+	error_text << "Invalid float vector dimension range '" name "' " << \
+	"(expected " << F1000_MIN << " < " name " < " << F1000_MAX << \
+	" got " << value << ")." << std::endl; \
+	throw LuaError(error_text.str()); \
+}
 #define CHECK_POS_TAB(index) CHECK_TYPE(index, "position", LUA_TTABLE)
 
 
@@ -170,14 +179,17 @@ v3f check_v3f(lua_State *L, int index)
 	lua_getfield(L, index, "x");
 	CHECK_POS_COORD("x");
 	pos.X = lua_tonumber(L, -1);
+	CHECK_FLOAT_RANGE(pos.X, "x")
 	lua_pop(L, 1);
 	lua_getfield(L, index, "y");
 	CHECK_POS_COORD("y");
 	pos.Y = lua_tonumber(L, -1);
+	CHECK_FLOAT_RANGE(pos.Y, "y")
 	lua_pop(L, 1);
 	lua_getfield(L, index, "z");
 	CHECK_POS_COORD("z");
 	pos.Z = lua_tonumber(L, -1);
+	CHECK_FLOAT_RANGE(pos.Z, "z")
 	lua_pop(L, 1);
 	return pos;
 }
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index bb352e429..23994181c 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -606,10 +606,10 @@ int ObjectRef::l_set_bone_position(lua_State *L)
 		bone = lua_tostring(L, 2);
 	v3f position = v3f(0, 0, 0);
 	if (!lua_isnil(L, 3))
-		position = read_v3f(L, 3);
+		position = check_v3f(L, 3);
 	v3f rotation = v3f(0, 0, 0);
 	if (!lua_isnil(L, 4))
-		rotation = read_v3f(L, 4);
+		rotation = check_v3f(L, 4);
 	co->setBonePosition(bone, position, rotation);
 	return 0;
 }

From 198ed60cabd3066977df5360b7b32a6b895ea744 Mon Sep 17 00:00:00 2001
From: lhofhansl <lhofhansl@yahoo.com>
Date: Wed, 26 Oct 2016 07:24:45 -0700
Subject: [PATCH 262/418] Shaders: Remove special handling for liquids. (#4670)

---
 client/shaders/nodes_shader/opengl_fragment.glsl         | 9 ---------
 client/shaders/water_surface_shader/opengl_fragment.glsl | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index 09c40b652..4d9ce1c12 100644
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -198,20 +198,11 @@ void main(void)
 	col = applyToneMapping(col);
 #endif
 
-#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT
-	float alpha = gl_Color.a;
-	if (fogDistance != 0.0) {
-		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
-		alpha = mix(0.0, alpha, d);
-	}
-	col = vec4(col.rgb, alpha);
-#else
 	if (fogDistance != 0.0) {
 		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
 		col = mix(skyBgColor, col, d);
 	}
 	col = vec4(col.rgb, base.a);
-#endif
 
 	gl_FragColor = col;
 }
diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
index d910220e9..b4c0cc4f8 100644
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -154,20 +154,11 @@ vec4 base = texture2D(baseTexture, uv).rgba;
 	col = applyToneMapping(col);
 #endif
 
-#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
-	float alpha = gl_Color.a;
-	if (fogDistance != 0.0) {
-		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
-		alpha = mix(0.0, alpha, d);
-	}
-	col = vec4(col.rgb, alpha);
-#else
 	if (fogDistance != 0.0) {
 		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
 		col = mix(skyBgColor, col, d);
 	}
 	col = vec4(col.rgb, base.a);
-#endif
 
 	gl_FragColor = col;
 }

From 1fd9a07497c45364ed8396653501c6be2a2e2ade Mon Sep 17 00:00:00 2001
From: raymoo <raymoo@users.noreply.github.com>
Date: Wed, 26 Oct 2016 20:24:34 -0700
Subject: [PATCH 263/418] Document item use callbacks (#4668)

---
 doc/lua_api.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index f7fc9ee17..43ff66bb9 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3593,15 +3593,18 @@ Definition tables
         on_place = func(itemstack, placer, pointed_thing),
         --[[
         ^ Shall place item and return the leftover itemstack
+        ^ The placer may be any ObjectRef or nil.
         ^ default: minetest.item_place ]]
         on_secondary_use = func(itemstack, user, pointed_thing),
         --[[
         ^ Same as on_place but called when pointing at nothing.
+        ^ The user may be any ObjectRef or nil.
         ^ pointed_thing : always { type = "nothing" }
         ]]
         on_drop = func(itemstack, dropper, pos),
         --[[
         ^ Shall drop item and return the leftover itemstack
+        ^ The dropper may be any ObjectRef or nil.
         ^ default: minetest.item_drop ]]
         on_use = func(itemstack, user, pointed_thing),
         --[[
@@ -3610,6 +3613,7 @@ Definition tables
           inventory, or an itemstack to replace the original itemstack.
             e.g. itemstack:take_item(); return itemstack
         ^ Otherwise, the function is free to do what it wants.
+        ^ The user may be any ObjectRef or nil.
         ^ The default functions handle regular use cases.
         ]]
         after_use = func(itemstack, user, node, digparams),
@@ -3622,6 +3626,7 @@ Definition tables
               itemstack:add_wear(digparams.wear)
               return itemstack
             end
+        ^ The user may be any ObjectRef or nil.
         ]]
     }
 

From c071efaa43ad3dcba7d60a7a67e942aae2a7dc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20Juh=C3=A1sz?= <juhdanad@gmail.com>
Date: Thu, 20 Oct 2016 21:41:38 +0200
Subject: [PATCH 264/418] Improved lighting

This commit rewrites the procedure that is responsible for light
updating.

this commit
-provides iterative solutions for unlighting and light spreading
-introduces a new priority queue-like container for the iteration
-creates per-node MapBlock caching to reduce retrieving MapBlocks from
the map
-calculates with map block positions and in-block relative node
coordinates
-skips light updating if it is not necessary since the node's new light
will be the same as its old light was
---
 src/map.cpp             | 451 ++-----------------------------
 src/map.h               |  16 +-
 src/mapnode.cpp         |  16 +-
 src/mapnode.h           |   9 +
 src/voxelalgorithms.cpp | 584 ++++++++++++++++++++++++++++++++++++++++
 src/voxelalgorithms.h   |  20 ++
 6 files changed, 648 insertions(+), 448 deletions(-)

diff --git a/src/map.cpp b/src/map.cpp
index 38f0fa37c..1694582db 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapblock.h"
 #include "filesys.h"
 #include "voxel.h"
+#include "voxelalgorithms.h"
 #include "porting.h"
 #include "serialization.h"
 #include "nodemetadata.h"
@@ -234,7 +235,6 @@ void Map::setNode(v3s16 p, MapNode & n)
 	block->setNodeNoCheck(relpos, n);
 }
 
-
 /*
 	Goes recursively through the neighbours of the node.
 
@@ -413,20 +413,6 @@ void Map::unspreadLight(enum LightBank bank,
 		unspreadLight(bank, unlighted_nodes, light_sources, modified_blocks);
 }
 
-/*
-	A single-node wrapper of the above
-*/
-void Map::unLightNeighbors(enum LightBank bank,
-		v3s16 pos, u8 lightwas,
-		std::set<v3s16> & light_sources,
-		std::map<v3s16, MapBlock*>  & modified_blocks)
-{
-	std::map<v3s16, u8> from_nodes;
-	from_nodes[pos] = lightwas;
-
-	unspreadLight(bank, from_nodes, light_sources, modified_blocks);
-}
-
 /*
 	Lights neighbors of from_nodes, collects all them and then
 	goes on recursively.
@@ -568,108 +554,6 @@ void Map::spreadLight(enum LightBank bank,
 		spreadLight(bank, lighted_nodes, modified_blocks);
 }
 
-/*
-	A single-node source variation of the above.
-*/
-void Map::lightNeighbors(enum LightBank bank,
-		v3s16 pos,
-		std::map<v3s16, MapBlock*> & modified_blocks)
-{
-	std::set<v3s16> from_nodes;
-	from_nodes.insert(pos);
-	spreadLight(bank, from_nodes, modified_blocks);
-}
-
-v3s16 Map::getBrightestNeighbour(enum LightBank bank, v3s16 p)
-{
-	INodeDefManager *nodemgr = m_gamedef->ndef();
-
-	v3s16 dirs[6] = {
-		v3s16(0,0,1), // back
-		v3s16(0,1,0), // top
-		v3s16(1,0,0), // right
-		v3s16(0,0,-1), // front
-		v3s16(0,-1,0), // bottom
-		v3s16(-1,0,0), // left
-	};
-
-	u8 brightest_light = 0;
-	v3s16 brightest_pos(0,0,0);
-	bool found_something = false;
-
-	// Loop through 6 neighbors
-	for(u16 i=0; i<6; i++){
-		// Get the position of the neighbor node
-		v3s16 n2pos = p + dirs[i];
-		MapNode n2;
-		bool is_valid_position;
-		n2 = getNodeNoEx(n2pos, &is_valid_position);
-		if (!is_valid_position)
-			continue;
-
-		if(n2.getLight(bank, nodemgr) > brightest_light || found_something == false){
-			brightest_light = n2.getLight(bank, nodemgr);
-			brightest_pos = n2pos;
-			found_something = true;
-		}
-	}
-
-	if(found_something == false)
-		throw InvalidPositionException();
-
-	return brightest_pos;
-}
-
-/*
-	Propagates sunlight down from a node.
-	Starting point gets sunlight.
-
-	Returns the lowest y value of where the sunlight went.
-
-	Mud is turned into grass in where the sunlight stops.
-*/
-s16 Map::propagateSunlight(v3s16 start,
-		std::map<v3s16, MapBlock*> & modified_blocks)
-{
-	INodeDefManager *nodemgr = m_gamedef->ndef();
-
-	s16 y = start.Y;
-	for(; ; y--)
-	{
-		v3s16 pos(start.X, y, start.Z);
-
-		v3s16 blockpos = getNodeBlockPos(pos);
-		MapBlock *block;
-		try{
-			block = getBlockNoCreate(blockpos);
-		}
-		catch(InvalidPositionException &e)
-		{
-			break;
-		}
-
-		v3s16 relpos = pos - blockpos*MAP_BLOCKSIZE;
-		bool is_valid_position;
-		MapNode n = block->getNode(relpos, &is_valid_position);
-		if (!is_valid_position)
-			break;
-
-		if(nodemgr->get(n).sunlight_propagates)
-		{
-			n.setLight(LIGHTBANK_DAY, LIGHT_SUN, nodemgr);
-			block->setNode(relpos, n);
-
-			modified_blocks[blockpos] = block;
-		}
-		else
-		{
-			// Sunlight goes no further
-			break;
-		}
-	}
-	return y + 1;
-}
-
 void Map::updateLighting(enum LightBank bank,
 		std::map<v3s16, MapBlock*> & a_blocks,
 		std::map<v3s16, MapBlock*> & modified_blocks)
@@ -922,150 +806,29 @@ void Map::updateLighting(std::map<v3s16, MapBlock*> & a_blocks,
 	}
 }
 
-/*
-*/
 void Map::addNodeAndUpdate(v3s16 p, MapNode n,
 		std::map<v3s16, MapBlock*> &modified_blocks,
 		bool remove_metadata)
 {
 	INodeDefManager *ndef = m_gamedef->ndef();
 
-	/*PrintInfo(m_dout);
-	m_dout<<"Map::addNodeAndUpdate(): p=("
-			<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
-
-	/*
-		From this node to nodes underneath:
-		If lighting is sunlight (1.0), unlight neighbours and
-		set lighting to 0.
-		Else discontinue.
-	*/
-
-	v3s16 toppos = p + v3s16(0,1,0);
-	//v3s16 bottompos = p + v3s16(0,-1,0);
-
-	bool node_under_sunlight = true;
-	std::set<v3s16> light_sources;
-
-	/*
-		Collect old node for rollback
-	*/
+	// Collect old node for rollback
 	RollbackNode rollback_oldnode(this, p, m_gamedef);
 
-	/*
-		If there is a node at top and it doesn't have sunlight,
-		there has not been any sunlight going down.
+	// This is needed for updating the lighting
+	MapNode oldnode = getNodeNoEx(p);
 
-		Otherwise there probably is.
-	*/
-
-	bool is_valid_position;
-	MapNode topnode = getNodeNoEx(toppos, &is_valid_position);
-
-	if(is_valid_position && topnode.getLight(LIGHTBANK_DAY, ndef) != LIGHT_SUN)
-		node_under_sunlight = false;
-
-	/*
-		Remove all light that has come out of this node
-	*/
-
-	enum LightBank banks[] =
-	{
-		LIGHTBANK_DAY,
-		LIGHTBANK_NIGHT
-	};
-	for(s32 i=0; i<2; i++)
-	{
-		enum LightBank bank = banks[i];
-
-		u8 lightwas = getNodeNoEx(p).getLight(bank, ndef);
-
-		// Add the block of the added node to modified_blocks
-		v3s16 blockpos = getNodeBlockPos(p);
-		MapBlock * block = getBlockNoCreate(blockpos);
-		assert(block != NULL);
-		modified_blocks[blockpos] = block;
-
-		assert(isValidPosition(p));
-
-		// Unlight neighbours of node.
-		// This means setting light of all consequent dimmer nodes
-		// to 0.
-		// This also collects the nodes at the border which will spread
-		// light again into this.
-		unLightNeighbors(bank, p, lightwas, light_sources, modified_blocks);
-
-		n.setLight(bank, 0, ndef);
-	}
-
-	/*
-		If node lets sunlight through and is under sunlight, it has
-		sunlight too.
-	*/
-	if(node_under_sunlight && ndef->get(n).sunlight_propagates)
-	{
-		n.setLight(LIGHTBANK_DAY, LIGHT_SUN, ndef);
-	}
-
-	/*
-		Remove node metadata
-	*/
+	// Remove node metadata
 	if (remove_metadata) {
 		removeNodeMetadata(p);
 	}
 
-	/*
-		Set the node on the map
-	*/
-
+	// Set the node on the map
 	setNode(p, n);
 
-	/*
-		If node is under sunlight and doesn't let sunlight through,
-		take all sunlighted nodes under it and clear light from them
-		and from where the light has been spread.
-		TODO: This could be optimized by mass-unlighting instead
-			  of looping
-	*/
-	if(node_under_sunlight && !ndef->get(n).sunlight_propagates)
-	{
-		s16 y = p.Y - 1;
-		for(;; y--){
-			//m_dout<<"y="<<y<<std::endl;
-			v3s16 n2pos(p.X, y, p.Z);
+	// Update lighting
+	voxalgo::update_lighting_node(this, ndef, p, oldnode, modified_blocks);
 
-			MapNode n2;
-
-			n2 = getNodeNoEx(n2pos, &is_valid_position);
-			if (!is_valid_position)
-				break;
-
-			if(n2.getLight(LIGHTBANK_DAY, ndef) == LIGHT_SUN)
-			{
-				unLightNeighbors(LIGHTBANK_DAY,
-						n2pos, n2.getLight(LIGHTBANK_DAY, ndef),
-						light_sources, modified_blocks);
-				n2.setLight(LIGHTBANK_DAY, 0, ndef);
-				setNode(n2pos, n2);
-			}
-			else
-				break;
-		}
-	}
-
-	for(s32 i=0; i<2; i++)
-	{
-		enum LightBank bank = banks[i];
-
-		/*
-			Spread light from all nodes that might be capable of doing so
-		*/
-		spreadLight(bank, light_sources, modified_blocks);
-	}
-
-	/*
-		Update information about whether day and night light differ
-	*/
 	for(std::map<v3s16, MapBlock*>::iterator
 			i = modified_blocks.begin();
 			i != modified_blocks.end(); ++i)
@@ -1073,187 +836,7 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
 		i->second->expireDayNightDiff();
 	}
 
-	/*
-		Report for rollback
-	*/
-	if(m_gamedef->rollback())
-	{
-		RollbackNode rollback_newnode(this, p, m_gamedef);
-		RollbackAction action;
-		action.setSetNode(p, rollback_oldnode, rollback_newnode);
-		m_gamedef->rollback()->reportAction(action);
-	}
-
-	/*
-		Add neighboring liquid nodes and the node itself if it is
-		liquid (=water node was added) to transform queue.
-	*/
-	v3s16 dirs[7] = {
-		v3s16(0,0,0), // self
-		v3s16(0,0,1), // back
-		v3s16(0,1,0), // top
-		v3s16(1,0,0), // right
-		v3s16(0,0,-1), // front
-		v3s16(0,-1,0), // bottom
-		v3s16(-1,0,0), // left
-	};
-	for(u16 i=0; i<7; i++)
-	{
-		v3s16 p2 = p + dirs[i];
-
-		MapNode n2 = getNodeNoEx(p2, &is_valid_position);
-		if(is_valid_position
-				&& (ndef->get(n2).isLiquid() || n2.getContent() == CONTENT_AIR))
-		{
-			m_transforming_liquid.push_back(p2);
-		}
-	}
-}
-
-/*
-*/
-void Map::removeNodeAndUpdate(v3s16 p,
-		std::map<v3s16, MapBlock*> &modified_blocks)
-{
-	INodeDefManager *ndef = m_gamedef->ndef();
-
-	/*PrintInfo(m_dout);
-	m_dout<<"Map::removeNodeAndUpdate(): p=("
-			<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
-
-	bool node_under_sunlight = true;
-
-	v3s16 toppos = p + v3s16(0,1,0);
-
-	// Node will be replaced with this
-	content_t replace_material = CONTENT_AIR;
-
-	/*
-		Collect old node for rollback
-	*/
-	RollbackNode rollback_oldnode(this, p, m_gamedef);
-
-	/*
-		If there is a node at top and it doesn't have sunlight,
-		there will be no sunlight going down.
-	*/
-	bool is_valid_position;
-	MapNode topnode = getNodeNoEx(toppos, &is_valid_position);
-
-	if(is_valid_position && topnode.getLight(LIGHTBANK_DAY, ndef) != LIGHT_SUN)
-		node_under_sunlight = false;
-
-	std::set<v3s16> light_sources;
-
-	enum LightBank banks[] =
-	{
-		LIGHTBANK_DAY,
-		LIGHTBANK_NIGHT
-	};
-	for(s32 i=0; i<2; i++)
-	{
-		enum LightBank bank = banks[i];
-
-		/*
-			Unlight neighbors (in case the node is a light source)
-		*/
-		unLightNeighbors(bank, p,
-				getNodeNoEx(p).getLight(bank, ndef),
-				light_sources, modified_blocks);
-	}
-
-	/*
-		Remove node metadata
-	*/
-
-	removeNodeMetadata(p);
-
-	/*
-		Remove the node.
-		This also clears the lighting.
-	*/
-
-	MapNode n(replace_material);
-	setNode(p, n);
-
-	for(s32 i=0; i<2; i++)
-	{
-		enum LightBank bank = banks[i];
-
-		/*
-			Recalculate lighting
-		*/
-		spreadLight(bank, light_sources, modified_blocks);
-	}
-
-	// Add the block of the removed node to modified_blocks
-	v3s16 blockpos = getNodeBlockPos(p);
-	MapBlock * block = getBlockNoCreate(blockpos);
-	assert(block != NULL);
-	modified_blocks[blockpos] = block;
-
-	/*
-		If the removed node was under sunlight, propagate the
-		sunlight down from it and then light all neighbors
-		of the propagated blocks.
-	*/
-	if(node_under_sunlight)
-	{
-		s16 ybottom = propagateSunlight(p, modified_blocks);
-		/*m_dout<<"Node was under sunlight. "
-				"Propagating sunlight";
-		m_dout<<" -> ybottom="<<ybottom<<std::endl;*/
-		s16 y = p.Y;
-		for(; y >= ybottom; y--)
-		{
-			v3s16 p2(p.X, y, p.Z);
-			/*m_dout<<"lighting neighbors of node ("
-					<<p2.X<<","<<p2.Y<<","<<p2.Z<<")"
-					<<std::endl;*/
-			lightNeighbors(LIGHTBANK_DAY, p2, modified_blocks);
-		}
-	}
-	else
-	{
-		// Set the lighting of this node to 0
-		// TODO: Is this needed? Lighting is cleared up there already.
-		MapNode n = getNodeNoEx(p, &is_valid_position);
-		if (is_valid_position) {
-			n.setLight(LIGHTBANK_DAY, 0, ndef);
-			setNode(p, n);
-		} else {
-			FATAL_ERROR("Invalid position");
-		}
-	}
-
-	for(s32 i=0; i<2; i++)
-	{
-		enum LightBank bank = banks[i];
-
-		// Get the brightest neighbour node and propagate light from it
-		v3s16 n2p = getBrightestNeighbour(bank, p);
-		try{
-			//MapNode n2 = getNode(n2p);
-			lightNeighbors(bank, n2p, modified_blocks);
-		}
-		catch(InvalidPositionException &e)
-		{
-		}
-	}
-
-	/*
-		Update information about whether day and night light differ
-	*/
-	for(std::map<v3s16, MapBlock*>::iterator
-			i = modified_blocks.begin();
-			i != modified_blocks.end(); ++i)
-	{
-		i->second->expireDayNightDiff();
-	}
-
-	/*
-		Report for rollback
-	*/
+	// Report for rollback
 	if(m_gamedef->rollback())
 	{
 		RollbackNode rollback_newnode(this, p, m_gamedef);
@@ -1264,8 +847,8 @@ void Map::removeNodeAndUpdate(v3s16 p,
 
 	/*
 		Add neighboring liquid nodes and this node to transform queue.
-		(it's vital for the node itself to get updated last.)
-	*/
+		(it's vital for the node itself to get updated last, if it was removed.)
+	 */
 	v3s16 dirs[7] = {
 		v3s16(0,0,1), // back
 		v3s16(0,1,0), // top
@@ -1279,9 +862,9 @@ void Map::removeNodeAndUpdate(v3s16 p,
 	{
 		v3s16 p2 = p + dirs[i];
 
-		bool is_position_valid;
-		MapNode n2 = getNodeNoEx(p2, &is_position_valid);
-		if (is_position_valid
+		bool is_valid_position;
+		MapNode n2 = getNodeNoEx(p2, &is_valid_position);
+		if(is_valid_position
 				&& (ndef->get(n2).isLiquid() || n2.getContent() == CONTENT_AIR))
 		{
 			m_transforming_liquid.push_back(p2);
@@ -1289,6 +872,12 @@ void Map::removeNodeAndUpdate(v3s16 p,
 	}
 }
 
+void Map::removeNodeAndUpdate(v3s16 p,
+		std::map<v3s16, MapBlock*> &modified_blocks)
+{
+	addNodeAndUpdate(p, MapNode(CONTENT_AIR), modified_blocks, true);
+}
+
 bool Map::addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata)
 {
 	MapEditEvent event;
diff --git a/src/map.h b/src/map.h
index c73fa92bf..e8d40e982 100644
--- a/src/map.h
+++ b/src/map.h
@@ -211,24 +211,10 @@ public:
 			std::set<v3s16> & light_sources,
 			std::map<v3s16, MapBlock*> & modified_blocks);
 
-	void unLightNeighbors(enum LightBank bank,
-			v3s16 pos, u8 lightwas,
-			std::set<v3s16> & light_sources,
-			std::map<v3s16, MapBlock*> & modified_blocks);
-
 	void spreadLight(enum LightBank bank,
 			std::set<v3s16> & from_nodes,
 			std::map<v3s16, MapBlock*> & modified_blocks);
-
-	void lightNeighbors(enum LightBank bank,
-			v3s16 pos,
-			std::map<v3s16, MapBlock*> & modified_blocks);
-
-	v3s16 getBrightestNeighbour(enum LightBank bank, v3s16 p);
-
-	s16 propagateSunlight(v3s16 start,
-			std::map<v3s16, MapBlock*> & modified_blocks);
-
+	
 	void updateLighting(enum LightBank bank,
 			std::map<v3s16, MapBlock*>  & a_blocks,
 			std::map<v3s16, MapBlock*> & modified_blocks);
diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index eba47446d..5efebf3d8 100644
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -54,10 +54,10 @@ MapNode::MapNode(INodeDefManager *ndef, const std::string &name,
 	param2 = a_param2;
 }
 
-void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr)
+void MapNode::setLight(enum LightBank bank, u8 a_light, const ContentFeatures &f)
 {
 	// If node doesn't contain light data, ignore this
-	if(nodemgr->get(*this).param_type != CPT_LIGHT)
+	if(f.param_type != CPT_LIGHT)
 		return;
 	if(bank == LIGHTBANK_DAY)
 	{
@@ -73,6 +73,11 @@ void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr
 		assert("Invalid light bank" == NULL);
 }
 
+void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr)
+{
+	setLight(bank, a_light, nodemgr->get(*this));
+}
+
 bool MapNode::isLightDayNightEq(INodeDefManager *nodemgr) const
 {
 	const ContentFeatures &f = nodemgr->get(*this);
@@ -103,6 +108,13 @@ u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
 	return MYMAX(f.light_source, light);
 }
 
+u8 MapNode::getLightRaw(enum LightBank bank, const ContentFeatures &f) const
+{
+	if(f.param_type == CPT_LIGHT)
+		return bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f;
+	return 0;
+}
+
 u8 MapNode::getLightNoChecks(enum LightBank bank, const ContentFeatures *f) const
 {
 	return MYMAX(f->light_source,
diff --git a/src/mapnode.h b/src/mapnode.h
index 2f6224f02..0bd61c554 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -191,6 +191,8 @@ struct MapNode
 		param2 = p;
 	}
 
+	void setLight(enum LightBank bank, u8 a_light, const ContentFeatures &f);
+
 	void setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr);
 
 	/**
@@ -202,6 +204,13 @@ struct MapNode
 
 	u8 getLight(enum LightBank bank, INodeDefManager *nodemgr) const;
 
+	/*!
+	 * Returns the node's light level from param1.
+	 * If the node emits light, it is ignored.
+	 * \param f the ContentFeatures of this node.
+	 */
+	u8 getLightRaw(enum LightBank bank, const ContentFeatures &f) const;
+
 	/**
 	 * This function differs from getLight(enum LightBank bank, INodeDefManager *nodemgr)
 	 * in that the ContentFeatures of the node in question are not retrieved by
diff --git a/src/voxelalgorithms.cpp b/src/voxelalgorithms.cpp
index f067a221a..019ec1bc6 100644
--- a/src/voxelalgorithms.cpp
+++ b/src/voxelalgorithms.cpp
@@ -19,6 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "voxelalgorithms.h"
 #include "nodedef.h"
+#include "mapblock.h"
+#include "map.h"
+#include "util/timetaker.h"
 
 namespace voxalgo
 {
@@ -153,5 +156,586 @@ SunlightPropagateResult propagateSunlight(VoxelManipulator &v, VoxelArea a,
 	return SunlightPropagateResult(bottom_sunlight_valid);
 }
 
+/*!
+ * A direction.
+ * 0=X+
+ * 1=Y+
+ * 2=Z+
+ * 3=Z-
+ * 4=Y-
+ * 5=X-
+ * 6=no direction
+ * Two directions ate opposite only if their sum is 5.
+ */
+typedef u8 direction;
+/*!
+ * Relative node position.
+ * This represents a node's position in its map block.
+ * All coordinates must be between 0 and 15.
+ */
+typedef v3s16 relative_v3;
+/*!
+ * Position of a map block.
+ * One block_pos unit is as long as 16 node position units.
+ */
+typedef v3s16 mapblock_v3;
+
+//! Contains information about a node whose light is about to change.
+struct ChangingLight {
+	//! Relative position of the node in its map block.
+	relative_v3 rel_position;
+	//! Position of the node's block.
+	mapblock_v3 block_position;
+	//! Reference to the node's block.
+	MapBlock *block;
+	/*!
+	 * Direction from the node that caused this node's changing
+	 * to this node.
+	 */
+	direction source_direction;
+
+	ChangingLight() :
+		rel_position(),
+		block_position(),
+		block(NULL),
+		source_direction(6)
+	{}
+
+	ChangingLight(relative_v3 rel_pos, mapblock_v3 block_pos,
+		MapBlock *b, direction source_dir) :
+		rel_position(rel_pos),
+		block_position(block_pos),
+		block(b),
+		source_direction(source_dir)
+	{}
+};
+
+/*!
+ * A fast, priority queue-like container to contain ChangingLights.
+ * The ChangingLights are ordered by the given light levels.
+ * The brightest ChangingLight is returned first.
+ */
+struct LightQueue {
+	//! For each light level there is a vector.
+	std::vector<ChangingLight> lights[LIGHT_SUN + 1];
+	//! Light of the brightest ChangingLight in the queue.
+	u8 max_light;
+
+	/*!
+	 * Creates a LightQueue.
+	 * \param reserve for each light level that many slots are reserved.
+	 */
+	LightQueue(size_t reserve)
+	{
+		max_light = LIGHT_SUN;
+		for (u8 i = 0; i <= LIGHT_SUN; i++) {
+			lights[i].reserve(reserve);
+		}
+	}
+
+	/*!
+	 * Returns the next brightest ChangingLight and
+	 * removes it from the queue.
+	 * If there were no elements in the queue, the given parameters
+	 * remain unmodified.
+	 * \param light light level of the popped ChangingLight
+	 * \param data the ChangingLight that was popped
+	 * \returns true if there was a ChangingLight in the queue.
+	 */
+	bool next(u8 &light, ChangingLight &data)
+	{
+		while (lights[max_light].empty()) {
+			if (max_light == 0) {
+				return false;
+			}
+			max_light--;
+		}
+		light = max_light;
+		data = lights[max_light].back();
+		lights[max_light].pop_back();
+		return true;
+	}
+
+	/*!
+	 * Adds an element to the queue.
+	 * The parameters are the same as in ChangingLight's constructor.
+	 * \param light light level of the ChangingLight
+	 */
+	inline void push(u8 light, relative_v3 &rel_pos, mapblock_v3 &block_pos,
+		MapBlock *block, direction source_dir)
+	{
+		lights[light].push_back(
+			ChangingLight(rel_pos, block_pos, block, source_dir));
+	}
+};
+
+/*!
+ * This type of light queue is for unlighting.
+ * A node can be pushed in it only if its raw light is zero.
+ * This prevents pushing nodes twice into this queue.
+ * The light of the pushed ChangingLight must be the
+ * light of the node before unlighting it.
+ */
+typedef LightQueue UnlightQueue;
+/*!
+ * This type of light queue is for spreading lights.
+ * While spreading lights, all the nodes in it must
+ * have the same light as the light level the ChangingLights
+ * were pushed into this queue with. This prevents unnecessary
+ * re-pushing of the nodes into the queue.
+ * If a node doesn't let light trough but emits light, it can be added
+ * too.
+ */
+typedef LightQueue ReLightQueue;
+
+/*!
+ * neighbor_dirs[i] points towards
+ * the direction i.
+ * See the definition of the type "direction"
+ */
+const static v3s16 neighbor_dirs[6] = {
+	v3s16(1, 0, 0), // right
+	v3s16(0, 1, 0), // top
+	v3s16(0, 0, 1), // back
+	v3s16(0, 0, -1), // front
+	v3s16(0, -1, 0), // bottom
+	v3s16(-1, 0, 0), // left
+};
+
+/*!
+ * Transforms the given map block offset by one node towards
+ * the specified direction.
+ * \param dir the direction of the transformation
+ * \param rel_pos the node's relative position in its map block
+ * \param block_pos position of the node's block
+ */
+bool stepRelBlockPos(direction dir, relative_v3 &rel_pos,
+	mapblock_v3 &block_pos)
+{
+	switch (dir) {
+	case 0:
+		if (rel_pos.X < MAP_BLOCKSIZE - 1) {
+			rel_pos.X++;
+		} else {
+			rel_pos.X = 0;
+			block_pos.X++;
+			return true;
+		}
+		break;
+	case 1:
+		if (rel_pos.Y < MAP_BLOCKSIZE - 1) {
+			rel_pos.Y++;
+		} else {
+			rel_pos.Y = 0;
+			block_pos.Y++;
+			return true;
+		}
+		break;
+	case 2:
+		if (rel_pos.Z < MAP_BLOCKSIZE - 1) {
+			rel_pos.Z++;
+		} else {
+			rel_pos.Z = 0;
+			block_pos.Z++;
+			return true;
+		}
+		break;
+	case 3:
+		if (rel_pos.Z > 0) {
+			rel_pos.Z--;
+		} else {
+			rel_pos.Z = MAP_BLOCKSIZE - 1;
+			block_pos.Z--;
+			return true;
+		}
+		break;
+	case 4:
+		if (rel_pos.Y > 0) {
+			rel_pos.Y--;
+		} else {
+			rel_pos.Y = MAP_BLOCKSIZE - 1;
+			block_pos.Y--;
+			return true;
+		}
+		break;
+	case 5:
+		if (rel_pos.X > 0) {
+			rel_pos.X--;
+		} else {
+			rel_pos.X = MAP_BLOCKSIZE - 1;
+			block_pos.X--;
+			return true;
+		}
+		break;
+	}
+	return false;
+}
+
+/*
+ * Removes all light that is potentially emitted by the specified
+ * light sources. These nodes will have zero light.
+ * Returns all nodes whose light became zero but should be re-lighted.
+ *
+ * \param bank the light bank in which the procedure operates
+ * \param from_nodes nodes whose light is removed
+ * \param light_sources nodes that should be re-lighted
+ * \param modified_blocks output, all modified map blocks are added to this
+ */
+void unspreadLight(Map *map, INodeDefManager *nodemgr, LightBank bank,
+	UnlightQueue &from_nodes, ReLightQueue &light_sources,
+	std::map<v3s16, MapBlock*> & modified_blocks)
+{
+	// Stores data popped from from_nodes
+	u8 current_light;
+	ChangingLight current;
+	// Data of the current neighbor
+	mapblock_v3 neighbor_block_pos;
+	relative_v3 neighbor_rel_pos;
+	// A dummy boolean
+	bool is_valid_position;
+	// Direction of the brightest neighbor of the node
+	direction source_dir;
+	while (from_nodes.next(current_light, current)) {
+		// For all nodes that need unlighting
+
+		// There is no brightest neighbor
+		source_dir = 6;
+		// The current node
+		const MapNode &node = current.block->getNodeNoCheck(
+			current.rel_position, &is_valid_position);
+		const ContentFeatures &f = nodemgr->get(node);
+		// If the node emits light, it behaves like it had a
+		// brighter neighbor.
+		u8 brightest_neighbor_light = f.light_source + 1;
+		for (direction i = 0; i < 6; i++) {
+			//For each neighbor
+
+			// The node that changed this node has already zero light
+			// and it can't give light to this node
+			if (current.source_direction + i == 5) {
+				continue;
+			}
+			// Get the neighbor's position and block
+			neighbor_rel_pos = current.rel_position;
+			neighbor_block_pos = current.block_position;
+			MapBlock *neighbor_block;
+			if (stepRelBlockPos(i, neighbor_rel_pos, neighbor_block_pos)) {
+				neighbor_block = map->getBlockNoCreateNoEx(neighbor_block_pos);
+				if (neighbor_block == NULL) {
+					continue;
+				}
+			} else {
+				neighbor_block = current.block;
+			}
+			// Get the neighbor itself
+			MapNode neighbor = neighbor_block->getNodeNoCheck(neighbor_rel_pos,
+				&is_valid_position);
+			const ContentFeatures &neighbor_f = nodemgr->get(
+				neighbor.getContent());
+			u8 neighbor_light = neighbor.getLightRaw(bank, neighbor_f);
+			// If the neighbor has at least as much light as this node, then
+			// it won't lose its light, since it should have been added to
+			// from_nodes earlier, so its light would be zero.
+			if (neighbor_f.light_propagates && neighbor_light < current_light) {
+				// Unlight, but only if the node has light.
+				if (neighbor_light > 0) {
+					neighbor.setLight(bank, 0, neighbor_f);
+					neighbor_block->setNodeNoCheck(neighbor_rel_pos, neighbor);
+					from_nodes.push(neighbor_light, neighbor_rel_pos,
+						neighbor_block_pos, neighbor_block, i);
+					// The current node was modified earlier, so its block
+					// is in modified_blocks.
+					if (current.block != neighbor_block) {
+						modified_blocks[neighbor_block_pos] = neighbor_block;
+					}
+				}
+			} else {
+				// The neighbor can light up this node.
+				if (neighbor_light < neighbor_f.light_source) {
+					neighbor_light = neighbor_f.light_source;
+				}
+				if (brightest_neighbor_light < neighbor_light) {
+					brightest_neighbor_light = neighbor_light;
+					source_dir = i;
+				}
+			}
+		}
+		// If the brightest neighbor is able to light up this node,
+		// then add this node to the output nodes.
+		if (brightest_neighbor_light > 1 && f.light_propagates) {
+			brightest_neighbor_light--;
+			light_sources.push(brightest_neighbor_light, current.rel_position,
+				current.block_position, current.block,
+				(source_dir == 6) ? 6 : 5 - source_dir
+				/* with opposite direction*/);
+		}
+	}
+}
+
+/*
+ * Spreads light from the specified starting nodes.
+ *
+ * Before calling this procedure, make sure that all ChangingLights
+ * in light_sources have as much light on the map as they have in
+ * light_sources (if the queue contains a node multiple times, the brightest
+ * occurrence counts).
+ *
+ * \param bank the light bank in which the procedure operates
+ * \param light_sources starting nodes
+ * \param modified_blocks output, all modified map blocks are added to this
+ */
+void spreadLight(Map *map, INodeDefManager *nodemgr, LightBank bank,
+	LightQueue & light_sources, std::map<v3s16, MapBlock*> & modified_blocks)
+{
+	// The light the current node can provide to its neighbors.
+	u8 spreading_light;
+	// The ChangingLight for the current node.
+	ChangingLight current;
+	// Position of the current neighbor.
+	mapblock_v3 neighbor_block_pos;
+	relative_v3 neighbor_rel_pos;
+	// A dummy boolean.
+	bool is_valid_position;
+	while (light_sources.next(spreading_light, current)) {
+		spreading_light--;
+		for (direction i = 0; i < 6; i++) {
+			// This node can't light up its light source
+			if (current.source_direction + i == 5) {
+				continue;
+			}
+			// Get the neighbor's position and block
+			neighbor_rel_pos = current.rel_position;
+			neighbor_block_pos = current.block_position;
+			MapBlock *neighbor_block;
+			if (stepRelBlockPos(i, neighbor_rel_pos, neighbor_block_pos)) {
+				neighbor_block = map->getBlockNoCreateNoEx(neighbor_block_pos);
+				if (neighbor_block == NULL) {
+					continue;
+				}
+			} else {
+				neighbor_block = current.block;
+			}
+			// Get the neighbor itself
+			MapNode neighbor = neighbor_block->getNodeNoCheck(neighbor_rel_pos,
+				&is_valid_position);
+			const ContentFeatures &f = nodemgr->get(neighbor.getContent());
+			if (f.light_propagates) {
+				// Light up the neighbor, if it has less light than it should.
+				u8 neighbor_light = neighbor.getLightRaw(bank, f);
+				if (neighbor_light < spreading_light) {
+					neighbor.setLight(bank, spreading_light, f);
+					neighbor_block->setNodeNoCheck(neighbor_rel_pos, neighbor);
+					light_sources.push(spreading_light, neighbor_rel_pos,
+						neighbor_block_pos, neighbor_block, i);
+					// The current node was modified earlier, so its block
+					// is in modified_blocks.
+					if (current.block != neighbor_block) {
+						modified_blocks[neighbor_block_pos] = neighbor_block;
+					}
+				}
+			}
+		}
+	}
+}
+
+/*!
+ * Returns true if the node gets sunlight from the
+ * node above it.
+ *
+ * \param pos position of the node.
+ */
+bool isSunlightAbove(Map *map, v3s16 pos, INodeDefManager *ndef)
+{
+	bool sunlight = true;
+	mapblock_v3 source_block_pos;
+	relative_v3 source_rel_pos;
+	getNodeBlockPosWithOffset(pos + v3s16(0, 1, 0), source_block_pos,
+		source_rel_pos);
+	// If the node above has sunlight, this node also can get it.
+	MapBlock *source_block = map->getBlockNoCreateNoEx(source_block_pos);
+	if (source_block == NULL) {
+		// But if there is no node above, then use heuristics
+		MapBlock *node_block = map->getBlockNoCreateNoEx(getNodeBlockPos(pos));
+		if (node_block == NULL) {
+			sunlight = false;
+		} else {
+			sunlight = !node_block->getIsUnderground();
+		}
+	} else {
+		bool is_valid_position;
+		MapNode above = source_block->getNodeNoCheck(source_rel_pos,
+			&is_valid_position);
+		if (is_valid_position) {
+			if (above.getContent() == CONTENT_IGNORE) {
+				// Trust heuristics
+				if (source_block->getIsUnderground()) {
+					sunlight = false;
+				}
+			} else if (above.getLight(LIGHTBANK_DAY, ndef) != LIGHT_SUN) {
+				// If the node above doesn't have sunlight, this
+				// node is in shadow.
+				sunlight = false;
+			}
+		}
+	}
+	return sunlight;
+}
+
+static const LightBank banks[] = { LIGHTBANK_DAY, LIGHTBANK_NIGHT };
+
+void update_lighting_node(Map *map, INodeDefManager *ndef, v3s16 p,
+	MapNode oldnode, std::map<v3s16, MapBlock*> & modified_blocks)
+{
+	// For node getter functions
+	bool is_valid_position;
+
+	// Get position and block of the changed node
+	relative_v3 rel_pos;
+	mapblock_v3 block_pos;
+	getNodeBlockPosWithOffset(p, block_pos, rel_pos);
+	MapBlock *block = map->getBlockNoCreateNoEx(block_pos);
+	if (block == NULL || block->isDummy()) {
+		return;
+	}
+
+	// Process each light bank separately
+	for (s32 i = 0; i < 2; i++) {
+		// Get the new node
+		MapNode n = block->getNodeNoCheck(rel_pos, &is_valid_position);
+		if (!is_valid_position) {
+			break;
+		}
+		LightBank bank = banks[i];
+
+		// Light of the old node
+		u8 old_light = oldnode.getLight(bank, ndef);
+
+		// Add the block of the added node to modified_blocks
+		modified_blocks[block_pos] = block;
+
+		// Get new light level of the node
+		u8 new_light = 0;
+		if (ndef->get(n).light_propagates) {
+			if (bank == LIGHTBANK_DAY && ndef->get(n).sunlight_propagates
+					&& isSunlightAbove(map, p, ndef)) {
+				new_light = LIGHT_SUN;
+			} else {
+				new_light = ndef->get(n).light_source;
+				for (int i = 0; i < 6; i++) {
+					v3s16 p2 = p + neighbor_dirs[i];
+					bool is_valid;
+					MapNode n2 = map->getNodeNoEx(p2, &is_valid);
+					if (is_valid) {
+						u8 spread = n2.getLight(bank, ndef);
+						// If the neighbor is at least as bright as
+						// this node then its light is not from
+						// this node.
+						// Its light can spread to this node.
+						if (spread > new_light && spread >= old_light) {
+							new_light = spread - 1;
+						}
+					}
+				}
+			}
+		} else {
+			// If this is an opaque node, it still can emit light.
+			new_light = ndef->get(n).light_source;
+		}
+
+		ReLightQueue light_sources(256);
+
+		if (new_light > 0) {
+			light_sources.push(new_light, rel_pos, block_pos, block, 6);
+		}
+
+		if (new_light < old_light) {
+			// The node became opaque or doesn't provide as much
+			// light as the previous one, so it must be unlighted.
+			LightQueue disappearing_lights(256);
+
+			// Add to unlight queue
+			n.setLight(bank, 0, ndef);
+			block->setNodeNoCheck(rel_pos, n);
+			disappearing_lights.push(old_light, rel_pos, block_pos, block, 6);
+
+			// Remove sunlight, if there was any
+			if (bank == LIGHTBANK_DAY && old_light == LIGHT_SUN) {
+				for (s16 y = p.Y - 1;; y--) {
+					v3s16 n2pos(p.X, y, p.Z);
+
+					MapNode n2;
+
+					n2 = map->getNodeNoEx(n2pos, &is_valid_position);
+					if (!is_valid_position)
+						break;
+
+					// If this node doesn't have sunlight, the nodes below
+					// it don't have too.
+					if (n2.getLight(LIGHTBANK_DAY, ndef) != LIGHT_SUN) {
+						break;
+					}
+					// Remove sunlight and add to unlight queue.
+					n2.setLight(LIGHTBANK_DAY, 0, ndef);
+					map->setNode(n2pos, n2);
+					relative_v3 rel_pos2;
+					mapblock_v3 block_pos2;
+					getNodeBlockPosWithOffset(n2pos, block_pos2, rel_pos2);
+					MapBlock *block2 = map->getBlockNoCreateNoEx(block_pos2);
+					disappearing_lights.push(LIGHT_SUN, rel_pos2, block_pos2,
+						block2, 4 /* The node above caused the change */);
+				}
+			}
+			// Remove lights
+			unspreadLight(map, ndef, bank, disappearing_lights, light_sources,
+				modified_blocks);
+		} else if (new_light > old_light) {
+			// It is sure that the node provides more light than the previous
+			// one, unlighting is not necessary.
+			// Propagate sunlight
+			if (bank == LIGHTBANK_DAY && new_light == LIGHT_SUN) {
+				for (s16 y = p.Y - 1;; y--) {
+					v3s16 n2pos(p.X, y, p.Z);
+
+					MapNode n2;
+
+					n2 = map->getNodeNoEx(n2pos, &is_valid_position);
+					if (!is_valid_position)
+						break;
+
+					// This should not happen, but if the node has sunlight
+					// then the iteration should stop.
+					if (n2.getLight(LIGHTBANK_DAY, ndef) == LIGHT_SUN) {
+						break;
+					}
+					// If the node terminates sunlight, stop.
+					if (!ndef->get(n2).sunlight_propagates) {
+						break;
+					}
+					relative_v3 rel_pos2;
+					mapblock_v3 block_pos2;
+					getNodeBlockPosWithOffset(n2pos, block_pos2, rel_pos2);
+					MapBlock *block2 = map->getBlockNoCreateNoEx(block_pos2);
+					// Mark node for lighting.
+					light_sources.push(LIGHT_SUN, rel_pos2, block_pos2, block2,
+						4);
+				}
+			}
+		}
+		// Initialize light values for light spreading.
+		for (u8 i = 0; i <= LIGHT_SUN; i++) {
+			const std::vector<ChangingLight> &lights = light_sources.lights[i];
+			for (std::vector<ChangingLight>::const_iterator it = lights.begin();
+					it < lights.end(); it++) {
+				MapNode n = it->block->getNodeNoCheck(it->rel_position,
+					&is_valid_position);
+				n.setLight(bank, i, ndef);
+				it->block->setNodeNoCheck(it->rel_position, n);
+			}
+		}
+		// Spread lights.
+		spreadLight(map, ndef, bank, light_sources, modified_blocks);
+	}
+}
+
 } // namespace voxalgo
 
diff --git a/src/voxelalgorithms.h b/src/voxelalgorithms.h
index 2eba6a176..f2b2fde32 100644
--- a/src/voxelalgorithms.h
+++ b/src/voxelalgorithms.h
@@ -25,6 +25,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <set>
 #include <map>
 
+class Map;
+class MapBlock;
+
 namespace voxalgo
 {
 
@@ -52,6 +55,23 @@ SunlightPropagateResult propagateSunlight(VoxelManipulator &v, VoxelArea a,
 		std::set<v3s16> & light_sources,
 		INodeDefManager *ndef);
 
+/*!
+ * Updates the lighting on the map.
+ * The result will be correct only if
+ * no nodes were changed except the given one.
+ *
+ * \param p position of the changed node
+ * \param oldnode this node was overwritten on the map
+ * \param modified_blocks output, contains all map blocks that
+ * the function modified
+ */
+void update_lighting_node(
+	Map *map,
+	INodeDefManager *ndef,
+	v3s16 p,
+	MapNode oldnode,
+	std::map<v3s16, MapBlock*> &modified_blocks);
+
 } // namespace voxalgo
 
 #endif

From be39f61359ad63f2c6d4aea14c1dfd8357eee03f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20Juh=C3=A1sz?= <juhdanad@gmail.com>
Date: Sun, 23 Oct 2016 17:51:13 +0200
Subject: [PATCH 265/418] Use node lighting for liquid spreading

This commit modifies the liquid transforming procedure to light and
unlight nodes instead of whole map blocks.
---
 src/map.cpp             |  23 +++-
 src/voxelalgorithms.cpp | 231 +++++++++++++++++++++-------------------
 src/voxelalgorithms.h   |  13 +--
 3 files changed, 145 insertions(+), 122 deletions(-)

diff --git a/src/map.cpp b/src/map.cpp
index 1694582db..5a1611c89 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -824,10 +824,15 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
 	}
 
 	// Set the node on the map
+	// Ignore light (because calling voxalgo::update_lighting_nodes)
+	n.setLight(LIGHTBANK_DAY, 0, ndef);
+	n.setLight(LIGHTBANK_NIGHT, 0, ndef);
 	setNode(p, n);
 
 	// Update lighting
-	voxalgo::update_lighting_node(this, ndef, p, oldnode, modified_blocks);
+	std::vector<std::pair<v3s16, MapNode> > oldnodes;
+	oldnodes.push_back(std::pair<v3s16, MapNode>(p, oldnode));
+	voxalgo::update_lighting_nodes(this, ndef, oldnodes, modified_blocks);
 
 	for(std::map<v3s16, MapBlock*>::iterator
 			i = modified_blocks.begin();
@@ -1224,7 +1229,9 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 	std::deque<v3s16> must_reflow;
 
 	// List of MapBlocks that will require a lighting update (due to lava)
-	std::map<v3s16, MapBlock *> lighting_modified_blocks;
+	std::map<v3s16, MapBlock *> lighting_modified_blocks2;
+
+	std::vector<std::pair<v3s16, MapNode> > changed_nodes;
 
 	u32 liquid_loop_max = g_settings->getS32("liquid_loop_max");
 	u32 loop_max = liquid_loop_max;
@@ -1457,6 +1464,10 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 		}
 		n0.setContent(new_node_content);
 
+		// Ignore light (because calling voxalgo::update_lighting_nodes)
+		n0.setLight(LIGHTBANK_DAY, 0, nodemgr);
+		n0.setLight(LIGHTBANK_NIGHT, 0, nodemgr);
+
 		// Find out whether there is a suspect for this action
 		std::string suspect;
 		if (m_gamedef->rollback())
@@ -1484,9 +1495,10 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 		if (block != NULL) {
 			modified_blocks[blockpos] =  block;
 			// If new or old node emits light, MapBlock requires lighting update
-			if (nodemgr->get(n0).light_source != 0 ||
+			/*if (nodemgr->get(n0).light_source != 0 ||
 					nodemgr->get(n00).light_source != 0)
-				lighting_modified_blocks[block->getPos()] = block;
+				lighting_modified_blocks[block->getPos()] = block;*/
+			changed_nodes.push_back(std::pair<v3s16, MapNode>(p0, n00));
 		}
 
 		/*
@@ -1515,7 +1527,8 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 	for (std::deque<v3s16>::iterator iter = must_reflow.begin(); iter != must_reflow.end(); ++iter)
 		m_transforming_liquid.push_back(*iter);
 
-	updateLighting(lighting_modified_blocks, modified_blocks);
+	//updateLighting(lighting_modified_blocks, modified_blocks);
+	voxalgo::update_lighting_nodes(this, nodemgr, changed_nodes, modified_blocks);
 
 
 	/* ----------------------------------------------------------------------
diff --git a/src/voxelalgorithms.cpp b/src/voxelalgorithms.cpp
index 019ec1bc6..83c1dd4ca 100644
--- a/src/voxelalgorithms.cpp
+++ b/src/voxelalgorithms.cpp
@@ -583,144 +583,153 @@ bool isSunlightAbove(Map *map, v3s16 pos, INodeDefManager *ndef)
 
 static const LightBank banks[] = { LIGHTBANK_DAY, LIGHTBANK_NIGHT };
 
-void update_lighting_node(Map *map, INodeDefManager *ndef, v3s16 p,
-	MapNode oldnode, std::map<v3s16, MapBlock*> & modified_blocks)
+void update_lighting_nodes(Map *map, INodeDefManager *ndef,
+	std::vector<std::pair<v3s16, MapNode> > &oldnodes,
+	std::map<v3s16, MapBlock*> & modified_blocks)
 {
 	// For node getter functions
 	bool is_valid_position;
 
-	// Get position and block of the changed node
-	relative_v3 rel_pos;
-	mapblock_v3 block_pos;
-	getNodeBlockPosWithOffset(p, block_pos, rel_pos);
-	MapBlock *block = map->getBlockNoCreateNoEx(block_pos);
-	if (block == NULL || block->isDummy()) {
-		return;
-	}
-
 	// Process each light bank separately
 	for (s32 i = 0; i < 2; i++) {
-		// Get the new node
-		MapNode n = block->getNodeNoCheck(rel_pos, &is_valid_position);
-		if (!is_valid_position) {
-			break;
-		}
 		LightBank bank = banks[i];
+		UnlightQueue disappearing_lights(256);
+		ReLightQueue light_sources(256);
+		// For each changed node process sunlight and initialize
+		for (std::vector<std::pair<v3s16, MapNode> >::iterator it =
+				oldnodes.begin(); it < oldnodes.end(); it++) {
+			// Get position and block of the changed node
+			v3s16 p = it->first;
+			relative_v3 rel_pos;
+			mapblock_v3 block_pos;
+			getNodeBlockPosWithOffset(p, block_pos, rel_pos);
+			MapBlock *block = map->getBlockNoCreateNoEx(block_pos);
+			if (block == NULL || block->isDummy()) {
+				continue;
+			}
+			// Get the new node
+			MapNode n = block->getNodeNoCheck(rel_pos, &is_valid_position);
+			if (!is_valid_position) {
+				break;
+			}
 
-		// Light of the old node
-		u8 old_light = oldnode.getLight(bank, ndef);
+			// Light of the old node
+			u8 old_light = it->second.getLight(bank, ndef);
 
-		// Add the block of the added node to modified_blocks
-		modified_blocks[block_pos] = block;
+			// Add the block of the added node to modified_blocks
+			modified_blocks[block_pos] = block;
 
-		// Get new light level of the node
-		u8 new_light = 0;
-		if (ndef->get(n).light_propagates) {
-			if (bank == LIGHTBANK_DAY && ndef->get(n).sunlight_propagates
+			// Get new light level of the node
+			u8 new_light = 0;
+			if (ndef->get(n).light_propagates) {
+				if (bank == LIGHTBANK_DAY && ndef->get(n).sunlight_propagates
 					&& isSunlightAbove(map, p, ndef)) {
-				new_light = LIGHT_SUN;
-			} else {
-				new_light = ndef->get(n).light_source;
-				for (int i = 0; i < 6; i++) {
-					v3s16 p2 = p + neighbor_dirs[i];
-					bool is_valid;
-					MapNode n2 = map->getNodeNoEx(p2, &is_valid);
-					if (is_valid) {
-						u8 spread = n2.getLight(bank, ndef);
-						// If the neighbor is at least as bright as
-						// this node then its light is not from
-						// this node.
-						// Its light can spread to this node.
-						if (spread > new_light && spread >= old_light) {
-							new_light = spread - 1;
+					new_light = LIGHT_SUN;
+				} else {
+					new_light = ndef->get(n).light_source;
+					for (int i = 0; i < 6; i++) {
+						v3s16 p2 = p + neighbor_dirs[i];
+						bool is_valid;
+						MapNode n2 = map->getNodeNoEx(p2, &is_valid);
+						if (is_valid) {
+							u8 spread = n2.getLight(bank, ndef);
+							// If the neighbor is at least as bright as
+							// this node then its light is not from
+							// this node.
+							// Its light can spread to this node.
+							if (spread > new_light && spread >= old_light) {
+								new_light = spread - 1;
+							}
 						}
 					}
 				}
+			} else {
+				// If this is an opaque node, it still can emit light.
+				new_light = ndef->get(n).light_source;
 			}
-		} else {
-			// If this is an opaque node, it still can emit light.
-			new_light = ndef->get(n).light_source;
-		}
 
-		ReLightQueue light_sources(256);
+			if (new_light > 0) {
+				light_sources.push(new_light, rel_pos, block_pos, block, 6);
+			}
 
-		if (new_light > 0) {
-			light_sources.push(new_light, rel_pos, block_pos, block, 6);
-		}
+			if (new_light < old_light) {
+				// The node became opaque or doesn't provide as much
+				// light as the previous one, so it must be unlighted.
 
-		if (new_light < old_light) {
-			// The node became opaque or doesn't provide as much
-			// light as the previous one, so it must be unlighted.
-			LightQueue disappearing_lights(256);
+				// Add to unlight queue
+				n.setLight(bank, 0, ndef);
+				block->setNodeNoCheck(rel_pos, n);
+				disappearing_lights.push(old_light, rel_pos, block_pos, block,
+					6);
 
-			// Add to unlight queue
-			n.setLight(bank, 0, ndef);
-			block->setNodeNoCheck(rel_pos, n);
-			disappearing_lights.push(old_light, rel_pos, block_pos, block, 6);
+				// Remove sunlight, if there was any
+				if (bank == LIGHTBANK_DAY && old_light == LIGHT_SUN) {
+					for (s16 y = p.Y - 1;; y--) {
+						v3s16 n2pos(p.X, y, p.Z);
 
-			// Remove sunlight, if there was any
-			if (bank == LIGHTBANK_DAY && old_light == LIGHT_SUN) {
-				for (s16 y = p.Y - 1;; y--) {
-					v3s16 n2pos(p.X, y, p.Z);
+						MapNode n2;
 
-					MapNode n2;
+						n2 = map->getNodeNoEx(n2pos, &is_valid_position);
+						if (!is_valid_position)
+							break;
 
-					n2 = map->getNodeNoEx(n2pos, &is_valid_position);
-					if (!is_valid_position)
-						break;
-
-					// If this node doesn't have sunlight, the nodes below
-					// it don't have too.
-					if (n2.getLight(LIGHTBANK_DAY, ndef) != LIGHT_SUN) {
-						break;
+						// If this node doesn't have sunlight, the nodes below
+						// it don't have too.
+						if (n2.getLight(LIGHTBANK_DAY, ndef) != LIGHT_SUN) {
+							break;
+						}
+						// Remove sunlight and add to unlight queue.
+						n2.setLight(LIGHTBANK_DAY, 0, ndef);
+						map->setNode(n2pos, n2);
+						relative_v3 rel_pos2;
+						mapblock_v3 block_pos2;
+						getNodeBlockPosWithOffset(n2pos, block_pos2, rel_pos2);
+						MapBlock *block2 = map->getBlockNoCreateNoEx(
+							block_pos2);
+						disappearing_lights.push(LIGHT_SUN, rel_pos2,
+							block_pos2, block2,
+							4 /* The node above caused the change */);
+					}
+				}
+			} else if (new_light > old_light) {
+				// It is sure that the node provides more light than the previous
+				// one, unlighting is not necessary.
+				// Propagate sunlight
+				if (bank == LIGHTBANK_DAY && new_light == LIGHT_SUN) {
+					for (s16 y = p.Y - 1;; y--) {
+						v3s16 n2pos(p.X, y, p.Z);
+
+						MapNode n2;
+
+						n2 = map->getNodeNoEx(n2pos, &is_valid_position);
+						if (!is_valid_position)
+							break;
+
+						// This should not happen, but if the node has sunlight
+						// then the iteration should stop.
+						if (n2.getLight(LIGHTBANK_DAY, ndef) == LIGHT_SUN) {
+							break;
+						}
+						// If the node terminates sunlight, stop.
+						if (!ndef->get(n2).sunlight_propagates) {
+							break;
+						}
+						relative_v3 rel_pos2;
+						mapblock_v3 block_pos2;
+						getNodeBlockPosWithOffset(n2pos, block_pos2, rel_pos2);
+						MapBlock *block2 = map->getBlockNoCreateNoEx(
+							block_pos2);
+						// Mark node for lighting.
+						light_sources.push(LIGHT_SUN, rel_pos2, block_pos2,
+							block2, 4);
 					}
-					// Remove sunlight and add to unlight queue.
-					n2.setLight(LIGHTBANK_DAY, 0, ndef);
-					map->setNode(n2pos, n2);
-					relative_v3 rel_pos2;
-					mapblock_v3 block_pos2;
-					getNodeBlockPosWithOffset(n2pos, block_pos2, rel_pos2);
-					MapBlock *block2 = map->getBlockNoCreateNoEx(block_pos2);
-					disappearing_lights.push(LIGHT_SUN, rel_pos2, block_pos2,
-						block2, 4 /* The node above caused the change */);
 				}
 			}
-			// Remove lights
-			unspreadLight(map, ndef, bank, disappearing_lights, light_sources,
-				modified_blocks);
-		} else if (new_light > old_light) {
-			// It is sure that the node provides more light than the previous
-			// one, unlighting is not necessary.
-			// Propagate sunlight
-			if (bank == LIGHTBANK_DAY && new_light == LIGHT_SUN) {
-				for (s16 y = p.Y - 1;; y--) {
-					v3s16 n2pos(p.X, y, p.Z);
 
-					MapNode n2;
-
-					n2 = map->getNodeNoEx(n2pos, &is_valid_position);
-					if (!is_valid_position)
-						break;
-
-					// This should not happen, but if the node has sunlight
-					// then the iteration should stop.
-					if (n2.getLight(LIGHTBANK_DAY, ndef) == LIGHT_SUN) {
-						break;
-					}
-					// If the node terminates sunlight, stop.
-					if (!ndef->get(n2).sunlight_propagates) {
-						break;
-					}
-					relative_v3 rel_pos2;
-					mapblock_v3 block_pos2;
-					getNodeBlockPosWithOffset(n2pos, block_pos2, rel_pos2);
-					MapBlock *block2 = map->getBlockNoCreateNoEx(block_pos2);
-					// Mark node for lighting.
-					light_sources.push(LIGHT_SUN, rel_pos2, block_pos2, block2,
-						4);
-				}
-			}
 		}
+		// Remove lights
+		unspreadLight(map, ndef, bank, disappearing_lights, light_sources,
+			modified_blocks);
 		// Initialize light values for light spreading.
 		for (u8 i = 0; i <= LIGHT_SUN; i++) {
 			const std::vector<ChangingLight> &lights = light_sources.lights[i];
diff --git a/src/voxelalgorithms.h b/src/voxelalgorithms.h
index f2b2fde32..3632546dd 100644
--- a/src/voxelalgorithms.h
+++ b/src/voxelalgorithms.h
@@ -58,18 +58,19 @@ SunlightPropagateResult propagateSunlight(VoxelManipulator &v, VoxelArea a,
 /*!
  * Updates the lighting on the map.
  * The result will be correct only if
- * no nodes were changed except the given one.
+ * no nodes were changed except the given ones.
+ * Before calling this procedure make sure that all new nodes on
+ * the map have zero light level!
  *
- * \param p position of the changed node
- * \param oldnode this node was overwritten on the map
+ * \param oldnodes contains the MapNodes that were replaced by the new
+ * MapNodes and their positions
  * \param modified_blocks output, contains all map blocks that
  * the function modified
  */
-void update_lighting_node(
+void update_lighting_nodes(
 	Map *map,
 	INodeDefManager *ndef,
-	v3s16 p,
-	MapNode oldnode,
+	std::vector<std::pair<v3s16, MapNode> > &oldnodes,
 	std::map<v3s16, MapBlock*> &modified_blocks);
 
 } // namespace voxalgo

From bcb06aeb8559a295ae4df2ca71b80c74338fb9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20Juh=C3=A1sz?= <juhdanad@gmail.com>
Date: Tue, 25 Oct 2016 23:04:10 +0200
Subject: [PATCH 266/418] Cleanup

---
 src/map.cpp             | 12 ++++--------
 src/voxelalgorithms.cpp | 38 +++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/map.cpp b/src/map.cpp
index 5a1611c89..d03943a16 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1228,9 +1228,6 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 	// list of nodes that due to viscosity have not reached their max level height
 	std::deque<v3s16> must_reflow;
 
-	// List of MapBlocks that will require a lighting update (due to lava)
-	std::map<v3s16, MapBlock *> lighting_modified_blocks2;
-
 	std::vector<std::pair<v3s16, MapNode> > changed_nodes;
 
 	u32 liquid_loop_max = g_settings->getS32("liquid_loop_max");
@@ -1272,7 +1269,11 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 			Collect information about current node
 		 */
 		s8 liquid_level = -1;
+		// The liquid node which will be placed there if
+		// the liquid flows into this node.
 		content_t liquid_kind = CONTENT_IGNORE;
+		// The node which will be placed there if liquid
+		// can't flow into this node.
 		content_t floodable_node = CONTENT_AIR;
 		const ContentFeatures &cf = nodemgr->get(n0);
 		LiquidType liquid_type = cf.liquid_type;
@@ -1494,10 +1495,6 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 		MapBlock *block = getBlockNoCreateNoEx(blockpos);
 		if (block != NULL) {
 			modified_blocks[blockpos] =  block;
-			// If new or old node emits light, MapBlock requires lighting update
-			/*if (nodemgr->get(n0).light_source != 0 ||
-					nodemgr->get(n00).light_source != 0)
-				lighting_modified_blocks[block->getPos()] = block;*/
 			changed_nodes.push_back(std::pair<v3s16, MapNode>(p0, n00));
 		}
 
@@ -1527,7 +1524,6 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 	for (std::deque<v3s16>::iterator iter = must_reflow.begin(); iter != must_reflow.end(); ++iter)
 		m_transforming_liquid.push_back(*iter);
 
-	//updateLighting(lighting_modified_blocks, modified_blocks);
 	voxalgo::update_lighting_nodes(this, nodemgr, changed_nodes, modified_blocks);
 
 
diff --git a/src/voxelalgorithms.cpp b/src/voxelalgorithms.cpp
index 83c1dd4ca..55f0d1c98 100644
--- a/src/voxelalgorithms.cpp
+++ b/src/voxelalgorithms.cpp
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "mapblock.h"
 #include "map.h"
-#include "util/timetaker.h"
 
 namespace voxalgo
 {
@@ -165,7 +164,7 @@ SunlightPropagateResult propagateSunlight(VoxelManipulator &v, VoxelArea a,
  * 4=Y-
  * 5=X-
  * 6=no direction
- * Two directions ate opposite only if their sum is 5.
+ * Two directions are opposite only if their sum is 5.
  */
 typedef u8 direction;
 /*!
@@ -175,7 +174,7 @@ typedef u8 direction;
  */
 typedef v3s16 relative_v3;
 /*!
- * Position of a map block.
+ * Position of a map block (block coordinates).
  * One block_pos unit is as long as 16 node position units.
  */
 typedef v3s16 mapblock_v3;
@@ -186,7 +185,7 @@ struct ChangingLight {
 	relative_v3 rel_position;
 	//! Position of the node's block.
 	mapblock_v3 block_position;
-	//! Reference to the node's block.
+	//! Pointer to the node's block.
 	MapBlock *block;
 	/*!
 	 * Direction from the node that caused this node's changing
@@ -261,8 +260,9 @@ struct LightQueue {
 	 * The parameters are the same as in ChangingLight's constructor.
 	 * \param light light level of the ChangingLight
 	 */
-	inline void push(u8 light, relative_v3 &rel_pos, mapblock_v3 &block_pos,
-		MapBlock *block, direction source_dir)
+	inline void push(u8 light, const relative_v3 &rel_pos,
+		const mapblock_v3 &block_pos, MapBlock *block,
+		direction source_dir)
 	{
 		lights[light].push_back(
 			ChangingLight(rel_pos, block_pos, block, source_dir));
@@ -309,7 +309,7 @@ const static v3s16 neighbor_dirs[6] = {
  * \param rel_pos the node's relative position in its map block
  * \param block_pos position of the node's block
  */
-bool stepRelBlockPos(direction dir, relative_v3 &rel_pos,
+bool step_rel_block_pos(direction dir, relative_v3 &rel_pos,
 	mapblock_v3 &block_pos)
 {
 	switch (dir) {
@@ -381,9 +381,9 @@ bool stepRelBlockPos(direction dir, relative_v3 &rel_pos,
  * \param light_sources nodes that should be re-lighted
  * \param modified_blocks output, all modified map blocks are added to this
  */
-void unspreadLight(Map *map, INodeDefManager *nodemgr, LightBank bank,
+void unspread_light(Map *map, INodeDefManager *nodemgr, LightBank bank,
 	UnlightQueue &from_nodes, ReLightQueue &light_sources,
-	std::map<v3s16, MapBlock*> & modified_blocks)
+	std::map<v3s16, MapBlock*> &modified_blocks)
 {
 	// Stores data popped from from_nodes
 	u8 current_light;
@@ -419,7 +419,7 @@ void unspreadLight(Map *map, INodeDefManager *nodemgr, LightBank bank,
 			neighbor_rel_pos = current.rel_position;
 			neighbor_block_pos = current.block_position;
 			MapBlock *neighbor_block;
-			if (stepRelBlockPos(i, neighbor_rel_pos, neighbor_block_pos)) {
+			if (step_rel_block_pos(i, neighbor_rel_pos, neighbor_block_pos)) {
 				neighbor_block = map->getBlockNoCreateNoEx(neighbor_block_pos);
 				if (neighbor_block == NULL) {
 					continue;
@@ -484,8 +484,8 @@ void unspreadLight(Map *map, INodeDefManager *nodemgr, LightBank bank,
  * \param light_sources starting nodes
  * \param modified_blocks output, all modified map blocks are added to this
  */
-void spreadLight(Map *map, INodeDefManager *nodemgr, LightBank bank,
-	LightQueue & light_sources, std::map<v3s16, MapBlock*> & modified_blocks)
+void spread_light(Map *map, INodeDefManager *nodemgr, LightBank bank,
+	LightQueue &light_sources, std::map<v3s16, MapBlock*> &modified_blocks)
 {
 	// The light the current node can provide to its neighbors.
 	u8 spreading_light;
@@ -507,7 +507,7 @@ void spreadLight(Map *map, INodeDefManager *nodemgr, LightBank bank,
 			neighbor_rel_pos = current.rel_position;
 			neighbor_block_pos = current.block_position;
 			MapBlock *neighbor_block;
-			if (stepRelBlockPos(i, neighbor_rel_pos, neighbor_block_pos)) {
+			if (step_rel_block_pos(i, neighbor_rel_pos, neighbor_block_pos)) {
 				neighbor_block = map->getBlockNoCreateNoEx(neighbor_block_pos);
 				if (neighbor_block == NULL) {
 					continue;
@@ -544,7 +544,7 @@ void spreadLight(Map *map, INodeDefManager *nodemgr, LightBank bank,
  *
  * \param pos position of the node.
  */
-bool isSunlightAbove(Map *map, v3s16 pos, INodeDefManager *ndef)
+bool is_sunlight_above(Map *map, v3s16 pos, INodeDefManager *ndef)
 {
 	bool sunlight = true;
 	mapblock_v3 source_block_pos;
@@ -585,7 +585,7 @@ static const LightBank banks[] = { LIGHTBANK_DAY, LIGHTBANK_NIGHT };
 
 void update_lighting_nodes(Map *map, INodeDefManager *ndef,
 	std::vector<std::pair<v3s16, MapNode> > &oldnodes,
-	std::map<v3s16, MapBlock*> & modified_blocks)
+	std::map<v3s16, MapBlock*> &modified_blocks)
 {
 	// For node getter functions
 	bool is_valid_position;
@@ -597,7 +597,7 @@ void update_lighting_nodes(Map *map, INodeDefManager *ndef,
 		ReLightQueue light_sources(256);
 		// For each changed node process sunlight and initialize
 		for (std::vector<std::pair<v3s16, MapNode> >::iterator it =
-				oldnodes.begin(); it < oldnodes.end(); it++) {
+				oldnodes.begin(); it < oldnodes.end(); ++it) {
 			// Get position and block of the changed node
 			v3s16 p = it->first;
 			relative_v3 rel_pos;
@@ -623,7 +623,7 @@ void update_lighting_nodes(Map *map, INodeDefManager *ndef,
 			u8 new_light = 0;
 			if (ndef->get(n).light_propagates) {
 				if (bank == LIGHTBANK_DAY && ndef->get(n).sunlight_propagates
-					&& isSunlightAbove(map, p, ndef)) {
+					&& is_sunlight_above(map, p, ndef)) {
 					new_light = LIGHT_SUN;
 				} else {
 					new_light = ndef->get(n).light_source;
@@ -728,7 +728,7 @@ void update_lighting_nodes(Map *map, INodeDefManager *ndef,
 
 		}
 		// Remove lights
-		unspreadLight(map, ndef, bank, disappearing_lights, light_sources,
+		unspread_light(map, ndef, bank, disappearing_lights, light_sources,
 			modified_blocks);
 		// Initialize light values for light spreading.
 		for (u8 i = 0; i <= LIGHT_SUN; i++) {
@@ -742,7 +742,7 @@ void update_lighting_nodes(Map *map, INodeDefManager *ndef,
 			}
 		}
 		// Spread lights.
-		spreadLight(map, ndef, bank, light_sources, modified_blocks);
+		spread_light(map, ndef, bank, light_sources, modified_blocks);
 	}
 }
 

From 361e687f3a81e7093c87d99b091aee080be6684f Mon Sep 17 00:00:00 2001
From: Ner'zhul <nerzhul@users.noreply.github.com>
Date: Thu, 27 Oct 2016 09:45:01 +0200
Subject: [PATCH 267/418] Add unittests to test player saving/loading (#4679)

---
 src/unittest/CMakeLists.txt  |  1 +
 src/unittest/test_player.cpp | 81 ++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 src/unittest/test_player.cpp

diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
index e0978aa72..7ad38099c 100644
--- a/src/unittest/CMakeLists.txt
+++ b/src/unittest/CMakeLists.txt
@@ -12,6 +12,7 @@ set (UNITTEST_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/test_noderesolver.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_noise.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_objdef.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_player.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_profiler.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_random.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_schematic.cpp
diff --git a/src/unittest/test_player.cpp b/src/unittest/test_player.cpp
new file mode 100644
index 000000000..5de9eaaf2
--- /dev/null
+++ b/src/unittest/test_player.cpp
@@ -0,0 +1,81 @@
+/*
+Minetest
+Copyright (C) 2010-2016 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "test.h"
+
+#include "exceptions.h"
+#include "remoteplayer.h"
+#include "content_sao.h"
+#include "server.h"
+
+class TestPlayer : public TestBase {
+public:
+	TestPlayer() { TestManager::registerTestModule(this); }
+	const char *getName() { return "TestPlayer"; }
+
+	void runTests(IGameDef *gamedef);
+
+	void testSave(IGameDef *gamedef);
+	void testLoad(IGameDef *gamedef);
+};
+
+static TestPlayer g_test_instance;
+
+void TestPlayer::runTests(IGameDef *gamedef)
+{
+	TEST(testSave, gamedef);
+	TEST(testLoad, gamedef);
+}
+
+void TestPlayer::testSave(IGameDef *gamedef)
+{
+	RemotePlayer rplayer("testplayer_save", gamedef->idef());
+	rplayer.setBreath(10);
+	rplayer.hp = 8;
+	rplayer.setYaw(0.1f);
+	rplayer.setPitch(0.6f);
+	rplayer.setPosition(v3f(450.2f, -15.7f, 68.1f));
+	rplayer.save(".", gamedef);
+	UASSERT(fs::PathExists("testplayer_save"));
+}
+
+void TestPlayer::testLoad(IGameDef *gamedef)
+{
+	RemotePlayer rplayer("testplayer_load", gamedef->idef());
+	rplayer.setBreath(10);
+	rplayer.hp = 8;
+	rplayer.setYaw(0.1f);
+	rplayer.setPitch(0.6f);
+	rplayer.setPosition(v3f(450.2f, -15.7f, 68.1f));
+	rplayer.save(".", gamedef);
+	UASSERT(fs::PathExists("testplayer_load"));
+
+	RemotePlayer rplayer_load("testplayer_load", gamedef->idef());
+	std::ifstream is("testplayer_load", std::ios_base::binary);
+	UASSERT(is.good());
+	rplayer_load.deSerialize(is, "testplayer_load");
+	is.close();
+
+	UASSERT(strcmp(rplayer_load.getName(), "testplayer_load") == 0);
+	UASSERT(rplayer.getBreath() == 10);
+	UASSERT(rplayer.hp == 8);
+	UASSERT(rplayer.getYaw() == 0.1f);
+	UASSERT(rplayer.getPitch() == 0.6f);
+	UASSERT(rplayer.getPosition() == v3f(450.2f, -15.7f, 68.1f));
+}

From 7252c803e0708bd8511a5b51333983aa24a76cb2 Mon Sep 17 00:00:00 2001
From: Ner'zhul <nerzhul@users.noreply.github.com>
Date: Fri, 28 Oct 2016 15:37:19 +0200
Subject: [PATCH 268/418] Add missing remoteplayer.cpp to Android build

this should fix #4683
---
 build/android/jni/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index 2d850385e..651fa318e 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -203,6 +203,7 @@ LOCAL_SRC_FILES := \
 		jni/src/porting.cpp                       \
 		jni/src/profiler.cpp                      \
 		jni/src/quicktune.cpp                     \
+		jni/src/remoteplayer.cpp                  \
 		jni/src/rollback.cpp                      \
 		jni/src/rollback_interface.cpp            \
 		jni/src/serialization.cpp                 \

From 6d7b95d76355334ccb57638d35b123fb49456cf6 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Fri, 28 Oct 2016 15:50:23 +0200
Subject: [PATCH 269/418] Add missing keyname_to_keycode function (needed on
 Android)

When rewriting keycode.cpp I overlooked this function, fixes #4683 completely
---
 src/keycode.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/keycode.cpp b/src/keycode.cpp
index 48d010cf4..2e211ad59 100644
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -385,3 +385,8 @@ void clearKeyCache()
 {
 	g_key_setting_cache.clear();
 }
+
+irr::EKEY_CODE keyname_to_keycode(const char *name)
+{
+	return lookup_keyname(name).Key;
+}

From d43326021a9a7def27773ed1f7ec01992ed3abf6 Mon Sep 17 00:00:00 2001
From: Hugo Locurcio <hugo.l@openmailbox.org>
Date: Sun, 30 Oct 2016 05:36:57 +0100
Subject: [PATCH 270/418] Rename testsounds/ directory to sounds/ (#1984)

---
 src/game.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game.cpp b/src/game.cpp
index 1e4464cc4..9a03071dd 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -871,7 +871,7 @@ public:
 			return;
 
 		m_fetched.insert(name);
-		std::string base = porting::path_share + DIR_DELIM + "testsounds";
+		std::string base = porting::path_share + DIR_DELIM + "sounds";
 		dst_paths.insert(base + DIR_DELIM + name + ".ogg");
 		dst_paths.insert(base + DIR_DELIM + name + ".0.ogg");
 		dst_paths.insert(base + DIR_DELIM + name + ".1.ogg");

From 9d25242c5c1411d692254cf910345d51c9a24fa3 Mon Sep 17 00:00:00 2001
From: Ner'zhul <nerzhul@users.noreply.github.com>
Date: Sun, 30 Oct 2016 14:53:26 +0100
Subject: [PATCH 271/418] PlayerSAO/LocalPlayer refactor: (#4612)

* Create UnitSAO, a common part between PlayerSAO & LuaEntitySAO
* Move breath to PlayerSAO & LocalPlayer
* Migrate m_yaw from (Remote)Player & LuaEntitySAO to UnitSAO
* Migrate m_yaw from Player to LocalPlayer for client
* Move some functions outside of player class to PlayerSAO/RemotePlayer or LocalPlayer depending on which class needs it
* Move pitch to LocalPlayer & PlayerSAO
* Move m_position from Player to LocalPlayer
* Move camera_barely_in_ceiling to LocalPlayer as it's used only there
* use PlayerSAO::m_base_position for Server side positions
* remove a unused variable
* ServerActiveObject::setPos now uses const ref
* use ServerEnv::loadPlayer unconditionnaly as it creates RemotePlayer only if it's not already loaded
* Move hp from Player to LocalPlayer
* Move m_hp from LuaEntitySAO to UnitSAO
* Use m_hp from PlayerSAO/UnitSAO instead of RemotePlayer
---
 src/clientiface.cpp                 |  14 ++-
 src/collision.cpp                   |   2 +-
 src/content_sao.cpp                 | 155 ++++++++++++++--------------
 src/content_sao.h                   |  62 ++++++++---
 src/environment.cpp                 |  35 ++++---
 src/environment.h                   |   7 +-
 src/localplayer.cpp                 |   7 ++
 src/localplayer.h                   |  41 ++++++++
 src/network/clientpackethandler.cpp |   1 -
 src/network/serverpackethandler.cpp |  55 +++++-----
 src/player.cpp                      |  14 +--
 src/player.h                        |  50 ---------
 src/remoteplayer.cpp                |  66 ++++++------
 src/remoteplayer.h                  |  35 +------
 src/script/lua_api/l_object.cpp     |  32 +++---
 src/server.cpp                      |  71 +++++++------
 src/serverobject.h                  |   2 +-
 src/unittest/test_player.cpp        |  39 ++++---
 18 files changed, 353 insertions(+), 335 deletions(-)

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index d78cf1c53..d2e3a6da0 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "map.h"
 #include "emerge.h"
-#include "serverobject.h"              // TODO this is used for cleanup of only
+#include "content_sao.h"              // TODO this is used for cleanup of only
 #include "log.h"
 #include "util/srp.h"
 
@@ -82,6 +82,10 @@ void RemoteClient::GetNextBlocks (
 	if (player == NULL)
 		return;
 
+	PlayerSAO *sao = player->getPlayerSAO();
+	if (sao == NULL)
+		return;
+
 	// Won't send anything if already sending
 	if(m_blocks_sending.size() >= g_settings->getU16
 			("max_simultaneous_block_sends_per_client"))
@@ -90,7 +94,7 @@ void RemoteClient::GetNextBlocks (
 		return;
 	}
 
-	v3f playerpos = player->getPosition();
+	v3f playerpos = sao->getBasePosition();
 	v3f playerspeed = player->getSpeed();
 	v3f playerspeeddir(0,0,0);
 	if(playerspeed.getLength() > 1.0*BS)
@@ -103,10 +107,10 @@ void RemoteClient::GetNextBlocks (
 	v3s16 center = getNodeBlockPos(center_nodepos);
 
 	// Camera position and direction
-	v3f camera_pos = player->getEyePosition();
+	v3f camera_pos = sao->getEyePosition();
 	v3f camera_dir = v3f(0,0,1);
-	camera_dir.rotateYZBy(player->getPitch());
-	camera_dir.rotateXZBy(player->getYaw());
+	camera_dir.rotateYZBy(sao->getPitch());
+	camera_dir.rotateXZBy(sao->getYaw());
 
 	/*infostream<<"camera_dir=("<<camera_dir.X<<","<<camera_dir.Y<<","
 			<<camera_dir.Z<<")"<<std::endl;*/
diff --git a/src/collision.cpp b/src/collision.cpp
index 6d22c0798..8e5dbcc9b 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -367,7 +367,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 #endif
 		{
 			ServerEnvironment *s_env = dynamic_cast<ServerEnvironment*>(env);
-			if (s_env != 0) {
+			if (s_env != NULL) {
 				f32 distance = speed_f->getLength();
 				std::vector<u16> s_objects;
 				s_env->getObjectsInsideRadius(s_objects, *pos_f, distance * 1.5);
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 375a43c90..23a064085 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -118,14 +118,12 @@ LuaEntitySAO proto_LuaEntitySAO(NULL, v3f(0,0,0), "_prototype", "");
 
 LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
 		const std::string &name, const std::string &state):
-	ServerActiveObject(env, pos),
+	UnitSAO(env, pos),
 	m_init_name(name),
 	m_init_state(state),
 	m_registered(false),
-	m_hp(-1),
 	m_velocity(0,0,0),
 	m_acceleration(0,0,0),
-	m_yaw(0),
 	m_properties_sent(true),
 	m_last_sent_yaw(0),
 	m_last_sent_position(0,0,0),
@@ -664,16 +662,6 @@ v3f LuaEntitySAO::getAcceleration()
 	return m_acceleration;
 }
 
-void LuaEntitySAO::setYaw(float yaw)
-{
-	m_yaw = yaw;
-}
-
-float LuaEntitySAO::getYaw()
-{
-	return m_yaw;
-}
-
 void LuaEntitySAO::setTextureMod(const std::string &mod)
 {
 	std::string str = gob_cmd_set_texture_mod(mod);
@@ -762,10 +750,9 @@ bool LuaEntitySAO::collideWithObjects(){
 
 // No prototype, PlayerSAO does not need to be deserialized
 
-PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_,
-		const std::set<std::string> &privs, bool is_singleplayer):
-	ServerActiveObject(env_, v3f(0,0,0)),
-	m_player(player_),
+PlayerSAO::PlayerSAO(ServerEnvironment *env_, u16 peer_id_, bool is_singleplayer):
+	UnitSAO(env_, v3f(0,0,0)),
+	m_player(NULL),
 	m_peer_id(peer_id_),
 	m_inventory(NULL),
 	m_damage(0),
@@ -777,7 +764,6 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
 	m_position_not_sent(false),
 	m_armor_groups_sent(false),
 	m_properties_sent(true),
-	m_privs(privs),
 	m_is_singleplayer(is_singleplayer),
 	m_animation_speed(0),
 	m_animation_blend(0),
@@ -786,6 +772,8 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
 	m_bone_position_sent(false),
 	m_attachment_parent_id(0),
 	m_attachment_sent(false),
+	m_breath(PLAYER_MAX_BREATH),
+	m_pitch(0),
 	// public
 	m_physics_override_speed(1),
 	m_physics_override_jump(1),
@@ -794,10 +782,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
 	m_physics_override_sneak_glitch(true),
 	m_physics_override_sent(false)
 {
-	assert(m_player);	// pre-condition
 	assert(m_peer_id != 0);	// pre-condition
-	setBasePosition(m_player->getPosition());
-	m_inventory = &m_player->inventory;
 	m_armor_groups["fleshy"] = 100;
 
 	m_prop.hp_max = PLAYER_MAX_HP;
@@ -816,6 +801,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
 	// end of default appearance
 	m_prop.is_visible = true;
 	m_prop.makes_footstep_sound = true;
+	m_hp = PLAYER_MAX_HP;
 }
 
 PlayerSAO::~PlayerSAO()
@@ -824,6 +810,14 @@ PlayerSAO::~PlayerSAO()
 		delete m_inventory;
 }
 
+void PlayerSAO::initialize(RemotePlayer *player, const std::set<std::string> &privs)
+{
+	assert(player);
+	m_player = player;
+	m_privs = privs;
+	m_inventory = &m_player->inventory;
+}
+
 std::string PlayerSAO::getDescription()
 {
 	return std::string("player ") + m_player->getName();
@@ -833,10 +827,10 @@ std::string PlayerSAO::getDescription()
 void PlayerSAO::addedToEnvironment(u32 dtime_s)
 {
 	ServerActiveObject::addedToEnvironment(dtime_s);
-	ServerActiveObject::setBasePosition(m_player->getPosition());
+	ServerActiveObject::setBasePosition(m_base_position);
 	m_player->setPlayerSAO(this);
 	m_player->peer_id = m_peer_id;
-	m_last_good_position = m_player->getPosition();
+	m_last_good_position = m_base_position;
 }
 
 // Called before removing from environment
@@ -844,9 +838,9 @@ void PlayerSAO::removingFromEnvironment()
 {
 	ServerActiveObject::removingFromEnvironment();
 	if (m_player->getPlayerSAO() == this) {
-		m_player->setPlayerSAO(NULL);
 		m_player->peer_id = 0;
 		m_env->savePlayer(m_player);
+		m_player->setPlayerSAO(NULL);
 		m_env->removePlayer(m_player);
 		for (UNORDERED_SET<u32>::iterator it = m_attached_particle_spawners.begin();
 			it != m_attached_particle_spawners.end(); ++it) {
@@ -870,8 +864,8 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 		os<<serializeString(m_player->getName()); // name
 		writeU8(os, 1); // is_player
 		writeS16(os, getId()); //id
-		writeV3F1000(os, m_player->getPosition() + v3f(0,BS*1,0));
-		writeF1000(os, m_player->getYaw());
+		writeV3F1000(os, m_base_position + v3f(0,BS*1,0));
+		writeF1000(os, m_yaw);
 		writeS16(os, getHP());
 
 		writeU8(os, 6 + m_bone_position.size() + m_attachment_child_ids.size()); // number of messages stuffed in here
@@ -900,8 +894,8 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 		writeU8(os, 0); // version
 		os<<serializeString(m_player->getName()); // name
 		writeU8(os, 1); // is_player
-		writeV3F1000(os, m_player->getPosition() + v3f(0,BS*1,0));
-		writeF1000(os, m_player->getYaw());
+		writeV3F1000(os, m_base_position + v3f(0,BS*1,0));
+		writeF1000(os, m_yaw);
 		writeS16(os, getHP());
 		writeU8(os, 2); // number of messages stuffed in here
 		os<<serializeLongString(getPropertyPacket()); // message 1
@@ -947,7 +941,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		m_attachment_bone = "";
 		m_attachment_position = v3f(0,0,0);
 		m_attachment_rotation = v3f(0,0,0);
-		m_player->setPosition(m_last_good_position);
+		setBasePosition(m_last_good_position);
 		((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
 	}
 
@@ -969,14 +963,13 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 
 	// Each frame, parent position is copied if the object is attached, otherwise it's calculated normally
 	// If the object gets detached this comes into effect automatically from the last known origin
-	if(isAttached())
-	{
+	if (isAttached()) {
 		v3f pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition();
 		m_last_good_position = pos;
-		m_player->setPosition(pos);
+		setBasePosition(pos);
 	}
 
-	if(send_recommended == false)
+	if (!send_recommended)
 		return;
 
 	// If the object is attached client-side, don't waste bandwidth sending its position to clients
@@ -988,12 +981,12 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		if(isAttached()) // Just in case we ever do send attachment position too
 			pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition();
 		else
-			pos = m_player->getPosition() + v3f(0,BS*1,0);
+			pos = m_base_position + v3f(0,BS*1,0);
 		std::string str = gob_cmd_update_position(
 			pos,
 			v3f(0,0,0),
 			v3f(0,0,0),
-			m_player->getYaw(),
+			m_yaw,
 			true,
 			false,
 			update_interval
@@ -1003,7 +996,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		m_messages_out.push(aom);
 	}
 
-	if(m_armor_groups_sent == false) {
+	if (!m_armor_groups_sent) {
 		m_armor_groups_sent = true;
 		std::string str = gob_cmd_update_armor_groups(
 				m_armor_groups);
@@ -1012,7 +1005,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		m_messages_out.push(aom);
 	}
 
-	if(m_physics_override_sent == false){
+	if (!m_physics_override_sent) {
 		m_physics_override_sent = true;
 		std::string str = gob_cmd_update_physics_override(m_physics_override_speed,
 				m_physics_override_jump, m_physics_override_gravity,
@@ -1022,7 +1015,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		m_messages_out.push(aom);
 	}
 
-	if(m_animation_sent == false){
+	if (!m_animation_sent) {
 		m_animation_sent = true;
 		std::string str = gob_cmd_update_animation(
 			m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop);
@@ -1055,16 +1048,20 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 
 void PlayerSAO::setBasePosition(const v3f &position)
 {
+	if (m_player && position != m_base_position)
+		m_player->setDirty(true);
+
 	// This needs to be ran for attachments too
 	ServerActiveObject::setBasePosition(position);
 	m_position_not_sent = true;
 }
 
-void PlayerSAO::setPos(v3f pos)
+void PlayerSAO::setPos(const v3f &pos)
 {
 	if(isAttached())
 		return;
-	m_player->setPosition(pos);
+
+	setBasePosition(pos);
 	// Movement caused by this command is always valid
 	m_last_good_position = pos;
 	((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
@@ -1074,22 +1071,34 @@ void PlayerSAO::moveTo(v3f pos, bool continuous)
 {
 	if(isAttached())
 		return;
-	m_player->setPosition(pos);
+
+	setBasePosition(pos);
 	// Movement caused by this command is always valid
 	m_last_good_position = pos;
 	((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
 }
 
-void PlayerSAO::setYaw(float yaw)
+void PlayerSAO::setYaw(const float yaw, bool send_data)
 {
-	m_player->setYaw(yaw);
-	((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
+	if (m_player && yaw != m_yaw)
+		m_player->setDirty(true);
+
+	UnitSAO::setYaw(yaw);
+
+	// Datas should not be sent at player initialization
+	if (send_data)
+		((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
 }
 
-void PlayerSAO::setPitch(float pitch)
+void PlayerSAO::setPitch(const float pitch, bool send_data)
 {
-	m_player->setPitch(pitch);
-	((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
+	if (m_player && pitch != m_pitch)
+		m_player->setDirty(true);
+
+	m_pitch = pitch;
+
+	if (send_data)
+		((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
 }
 
 int PlayerSAO::punch(v3f dir,
@@ -1153,15 +1162,10 @@ int PlayerSAO::punch(v3f dir,
 	return hitparams.wear;
 }
 
-void PlayerSAO::rightClick(ServerActiveObject *clicker)
+void PlayerSAO::rightClick(ServerActiveObject *)
 {
 }
 
-s16 PlayerSAO::getHP() const
-{
-	return m_player->hp;
-}
-
 s16 PlayerSAO::readDamage()
 {
 	s16 damage = m_damage;
@@ -1169,12 +1173,16 @@ s16 PlayerSAO::readDamage()
 	return damage;
 }
 
-void PlayerSAO::setHP(s16 hp)
+void PlayerSAO::setHP(s16 hp, bool direct)
 {
-	s16 oldhp = m_player->hp;
+	if (direct) {
+		m_hp = hp;
+		return;
+	}
 
-	s16 hp_change = m_env->getScriptIface()->on_player_hpchange(this,
-		hp - oldhp);
+	s16 oldhp = m_hp;
+
+	s16 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp);
 	if (hp_change == 0)
 		return;
 	hp = oldhp + hp_change;
@@ -1184,11 +1192,11 @@ void PlayerSAO::setHP(s16 hp)
 	else if (hp > PLAYER_MAX_HP)
 		hp = PLAYER_MAX_HP;
 
-	if(hp < oldhp && g_settings->getBool("enable_damage") == false) {
+	if (hp < oldhp && !g_settings->getBool("enable_damage")) {
 		return;
 	}
 
-	m_player->hp = hp;
+	m_hp = hp;
 
 	if (oldhp > hp)
 		m_damage += (oldhp - hp);
@@ -1198,14 +1206,12 @@ void PlayerSAO::setHP(s16 hp)
 		m_properties_sent = false;
 }
 
-u16 PlayerSAO::getBreath() const
+void PlayerSAO::setBreath(const u16 breath)
 {
-	return m_player->getBreath();
-}
+	if (m_player && breath != m_breath)
+		m_player->setDirty(true);
 
-void PlayerSAO::setBreath(u16 breath)
-{
-	m_player->setBreath(breath);
+	m_breath = breath;
 }
 
 void PlayerSAO::setArmorGroups(const ItemGroupList &armor_groups)
@@ -1355,7 +1361,7 @@ bool PlayerSAO::checkMovementCheat()
 {
 	if (isAttached() || m_is_singleplayer ||
 			g_settings->getBool("disable_anticheat")) {
-		m_last_good_position = m_player->getPosition();
+		m_last_good_position = m_base_position;
 		return false;
 	}
 
@@ -1382,7 +1388,7 @@ bool PlayerSAO::checkMovementCheat()
 	// Tolerance. The lag pool does this a bit.
 	//player_max_speed *= 2.5;
 
-	v3f diff = (m_player->getPosition() - m_last_good_position);
+	v3f diff = (m_base_position - m_last_good_position);
 	float d_vert = diff.Y;
 	diff.Y = 0;
 	float d_horiz = diff.getLength();
@@ -1392,27 +1398,26 @@ bool PlayerSAO::checkMovementCheat()
 		required_time = d_vert / player_max_speed; // Moving upwards
 
 	if (m_move_pool.grab(required_time)) {
-		m_last_good_position = m_player->getPosition();
+		m_last_good_position = m_base_position;
 	} else {
 		actionstream << "Player " << m_player->getName()
 				<< " moved too fast; resetting position"
 				<< std::endl;
-		m_player->setPosition(m_last_good_position);
+		setBasePosition(m_last_good_position);
 		cheated = true;
 	}
 	return cheated;
 }
 
-bool PlayerSAO::getCollisionBox(aabb3f *toset) {
-	//update collision box
-	*toset = m_player->getCollisionbox();
-
+bool PlayerSAO::getCollisionBox(aabb3f *toset)
+{
+	*toset = aabb3f(-BS * 0.30, 0.0, -BS * 0.30, BS * 0.30, BS * 1.75, BS * 0.30);
 	toset->MinEdge += m_base_position;
 	toset->MaxEdge += m_base_position;
-
 	return true;
 }
 
-bool PlayerSAO::collideWithObjects(){
+bool PlayerSAO::collideWithObjects()
+{
 	return true;
 }
diff --git a/src/content_sao.h b/src/content_sao.h
index 76a3a37da..4ea6277ff 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -23,12 +23,35 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serverobject.h"
 #include "itemgroup.h"
 #include "object_properties.h"
+#include "constants.h"
+
+class UnitSAO: public ServerActiveObject
+{
+public:
+	UnitSAO(ServerEnvironment *env, v3f pos):
+			ServerActiveObject(env, pos),
+			m_hp(-1), m_yaw(0) {}
+	virtual ~UnitSAO() {}
+
+	virtual void setYaw(const float yaw) { m_yaw = yaw; }
+	float getYaw() const { return m_yaw; };
+	f32 getRadYaw() const { return m_yaw * core::DEGTORAD; }
+	// Deprecated
+	f32 getRadYawDep() const { return (m_yaw + 90.) * core::DEGTORAD; }
+
+	s16 getHP() const { return m_hp; }
+	// Use a function, if isDead can be defined by other conditions
+	bool isDead() const { return m_hp == 0; }
+protected:
+	s16 m_hp;
+	float m_yaw;
+};
 
 /*
 	LuaEntitySAO needs some internals exposed.
 */
 
-class LuaEntitySAO : public ServerActiveObject
+class LuaEntitySAO : public UnitSAO
 {
 public:
 	LuaEntitySAO(ServerEnvironment *env, v3f pos,
@@ -74,8 +97,7 @@ public:
 	v3f getVelocity();
 	void setAcceleration(v3f acceleration);
 	v3f getAcceleration();
-	void setYaw(float yaw);
-	float getYaw();
+
 	void setTextureMod(const std::string &mod);
 	void setSprite(v2s16 p, int num_frames, float framelength,
 			bool select_horiz_by_yawpitch);
@@ -91,10 +113,9 @@ private:
 	bool m_registered;
 	struct ObjectProperties m_prop;
 
-	s16 m_hp;
 	v3f m_velocity;
 	v3f m_acceleration;
-	float m_yaw;
+
 	ItemGroupList m_armor_groups;
 
 	bool m_properties_sent;
@@ -158,11 +179,10 @@ public:
 
 class RemotePlayer;
 
-class PlayerSAO : public ServerActiveObject
+class PlayerSAO : public UnitSAO
 {
 public:
-	PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_,
-			const std::set<std::string> &privs, bool is_singleplayer);
+	PlayerSAO(ServerEnvironment *env_, u16 peer_id_, bool is_singleplayer);
 	~PlayerSAO();
 	ActiveObjectType getType() const
 	{ return ACTIVEOBJECT_TYPE_PLAYER; }
@@ -182,10 +202,14 @@ public:
 	bool isAttached();
 	void step(float dtime, bool send_recommended);
 	void setBasePosition(const v3f &position);
-	void setPos(v3f pos);
+	void setPos(const v3f &pos);
 	void moveTo(v3f pos, bool continuous);
-	void setYaw(float);
-	void setPitch(float);
+	void setYaw(const float yaw, bool send_data = true);
+	void setPitch(const float pitch, bool send_data = true);
+	f32 getPitch() const { return m_pitch; }
+	f32 getRadPitch() const { return m_pitch * core::DEGTORAD; }
+	// Deprecated
+	f32 getRadPitchDep() const { return -1.0 * m_pitch * core::DEGTORAD; }
 
 	/*
 		Interaction interface
@@ -196,11 +220,10 @@ public:
 		ServerActiveObject *puncher,
 		float time_from_last_punch);
 	void rightClick(ServerActiveObject *clicker);
-	s16 getHP() const;
-	void setHP(s16 hp);
+	void setHP(s16 hp, bool direct = false);
 	s16 readDamage();
-	u16 getBreath() const;
-	void setBreath(u16 breath);
+	u16 getBreath() const { return m_breath; }
+	void setBreath(const u16 breath);
 	void setArmorGroups(const ItemGroupList &armor_groups);
 	ItemGroupList getArmorGroups();
 	void setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop);
@@ -283,6 +306,11 @@ public:
 	bool getCollisionBox(aabb3f *toset);
 	bool collideWithObjects();
 
+	void initialize(RemotePlayer *player, const std::set<std::string> &privs);
+
+	v3f getEyePosition() const { return m_base_position + getEyeOffset(); }
+	v3f getEyeOffset() const { return v3f(0, BS * 1.625f, 0); }
+
 private:
 	std::string getPropertyPacket();
 
@@ -326,8 +354,8 @@ private:
 	v3f m_attachment_position;
 	v3f m_attachment_rotation;
 	bool m_attachment_sent;
-
-
+	u16 m_breath;
+	f32 m_pitch;
 public:
 	float m_physics_override_speed;
 	float m_physics_override_jump;
diff --git a/src/environment.cpp b/src/environment.cpp
index ecda1b6a4..13c64b37c 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -608,9 +608,8 @@ void ServerEnvironment::saveLoadedPlayers()
 	for (std::vector<RemotePlayer *>::iterator it = m_players.begin();
 			it != m_players.end();
 			++it) {
-		RemotePlayer *player = static_cast<RemotePlayer*>(*it);
-		if (player->checkModified()) {
-			player->save(players_path, m_gamedef);
+		if ((*it)->checkModified()) {
+			(*it)->save(players_path, m_gamedef);
 		}
 	}
 }
@@ -623,7 +622,7 @@ void ServerEnvironment::savePlayer(RemotePlayer *player)
 	player->save(players_path, m_gamedef);
 }
 
-RemotePlayer *ServerEnvironment::loadPlayer(const std::string &playername)
+RemotePlayer *ServerEnvironment::loadPlayer(const std::string &playername, PlayerSAO *sao)
 {
 	bool newplayer = false;
 	bool found = false;
@@ -641,7 +640,8 @@ RemotePlayer *ServerEnvironment::loadPlayer(const std::string &playername)
 		std::ifstream is(path.c_str(), std::ios_base::binary);
 		if (!is.good())
 			continue;
-		player->deSerialize(is, path);
+
+		player->deSerialize(is, path, sao);
 		is.close();
 
 		if (player->getName() == playername) {
@@ -657,11 +657,13 @@ RemotePlayer *ServerEnvironment::loadPlayer(const std::string &playername)
 				<< " not found" << std::endl;
 		if (newplayer)
 			delete player;
+
 		return NULL;
 	}
 
-	if (newplayer)
+	if (newplayer) {
 		addPlayer(player);
+	}
 	player->setModified(false);
 	return player;
 }
@@ -1271,12 +1273,16 @@ void ServerEnvironment::step(float dtime)
 				i != m_players.end(); ++i) {
 			RemotePlayer *player = dynamic_cast<RemotePlayer *>(*i);
 			assert(player);
+
 			// Ignore disconnected players
 			if (player->peer_id == 0)
 				continue;
 
+			PlayerSAO *playersao = player->getPlayerSAO();
+			assert(playersao);
+
 			v3s16 blockpos = getNodeBlockPos(
-					floatToInt(player->getPosition(), BS));
+					floatToInt(playersao->getBasePosition(), BS));
 			players_blockpos.push_back(blockpos);
 		}
 
@@ -1584,7 +1590,7 @@ u16 ServerEnvironment::addActiveObject(ServerActiveObject *object)
 	Finds out what new objects have been added to
 	inside a radius around a position
 */
-void ServerEnvironment::getAddedActiveObjects(RemotePlayer *player, s16 radius,
+void ServerEnvironment::getAddedActiveObjects(PlayerSAO *playersao, s16 radius,
 		s16 player_radius,
 		std::set<u16> &current_objects,
 		std::queue<u16> &added_objects)
@@ -1594,7 +1600,6 @@ void ServerEnvironment::getAddedActiveObjects(RemotePlayer *player, s16 radius,
 
 	if (player_radius_f < 0)
 		player_radius_f = 0;
-
 	/*
 		Go through the object list,
 		- discard m_removed objects,
@@ -1602,20 +1607,21 @@ void ServerEnvironment::getAddedActiveObjects(RemotePlayer *player, s16 radius,
 		- discard objects that are found in current_objects.
 		- add remaining objects to added_objects
 	*/
-	for(ActiveObjectMap::iterator i = m_active_objects.begin();
+	for (ActiveObjectMap::iterator i = m_active_objects.begin();
 			i != m_active_objects.end(); ++i) {
 		u16 id = i->first;
 
 		// Get object
 		ServerActiveObject *object = i->second;
-		if(object == NULL)
+		if (object == NULL)
 			continue;
 
 		// Discard if removed or deactivating
 		if(object->m_removed || object->m_pending_deactivation)
 			continue;
 
-		f32 distance_f = object->getBasePosition().getDistanceFrom(player->getPosition());
+		f32 distance_f = object->getBasePosition().
+				getDistanceFrom(playersao->getBasePosition());
 		if (object->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
 			// Discard if too far
 			if (distance_f > player_radius_f && player_radius_f != 0)
@@ -1637,7 +1643,7 @@ void ServerEnvironment::getAddedActiveObjects(RemotePlayer *player, s16 radius,
 	Finds out what objects have been removed from
 	inside a radius around a position
 */
-void ServerEnvironment::getRemovedActiveObjects(RemotePlayer *player, s16 radius,
+void ServerEnvironment::getRemovedActiveObjects(PlayerSAO *playersao, s16 radius,
 		s16 player_radius,
 		std::set<u16> &current_objects,
 		std::queue<u16> &removed_objects)
@@ -1647,7 +1653,6 @@ void ServerEnvironment::getRemovedActiveObjects(RemotePlayer *player, s16 radius
 
 	if (player_radius_f < 0)
 		player_radius_f = 0;
-
 	/*
 		Go through current_objects; object is removed if:
 		- object is not found in m_active_objects (this is actually an
@@ -1675,7 +1680,7 @@ void ServerEnvironment::getRemovedActiveObjects(RemotePlayer *player, s16 radius
 			continue;
 		}
 
-		f32 distance_f = object->getBasePosition().getDistanceFrom(player->getPosition());
+		f32 distance_f = object->getBasePosition().getDistanceFrom(playersao->getBasePosition());
 		if (object->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
 			if (distance_f <= player_radius_f || player_radius_f == 0)
 				continue;
diff --git a/src/environment.h b/src/environment.h
index 3f3c1cf2c..4bee40e57 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -54,6 +54,7 @@ class ClientMap;
 class GameScripting;
 class Player;
 class RemotePlayer;
+class PlayerSAO;
 
 class Environment
 {
@@ -315,7 +316,7 @@ public:
 	// Save players
 	void saveLoadedPlayers();
 	void savePlayer(RemotePlayer *player);
-	RemotePlayer *loadPlayer(const std::string &playername);
+	RemotePlayer *loadPlayer(const std::string &playername, PlayerSAO *sao);
 	void addPlayer(RemotePlayer *player);
 	void removePlayer(RemotePlayer *player);
 
@@ -362,7 +363,7 @@ public:
 		Find out what new objects have been added to
 		inside a radius around a position
 	*/
-	void getAddedActiveObjects(RemotePlayer *player, s16 radius,
+	void getAddedActiveObjects(PlayerSAO *playersao, s16 radius,
 			s16 player_radius,
 			std::set<u16> &current_objects,
 			std::queue<u16> &added_objects);
@@ -371,7 +372,7 @@ public:
 		Find out what new objects have been removed from
 		inside a radius around a position
 	*/
-	void getRemovedActiveObjects(RemotePlayer *player, s16 radius,
+	void getRemovedActiveObjects(PlayerSAO *playersao, s16 radius,
 			s16 player_radius,
 			std::set<u16> &current_objects,
 			std::queue<u16> &removed_objects);
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index bc242a59d..71efb2343 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 LocalPlayer::LocalPlayer(Client *gamedef, const char *name):
 	Player(name, gamedef->idef()),
 	parent(0),
+	hp(PLAYER_MAX_HP),
 	got_teleported(false),
 	isAttached(false),
 	touching_ground(false),
@@ -62,6 +63,7 @@ LocalPlayer::LocalPlayer(Client *gamedef, const char *name):
 	light_color(255,255,255,255),
 	hurt_tilt_timer(0.0f),
 	hurt_tilt_strength(0.0f),
+	m_position(0,0,0),
 	m_sneak_node(32767,32767,32767),
 	m_sneak_node_exists(false),
 	m_need_to_get_new_sneak_node(true),
@@ -69,6 +71,11 @@ LocalPlayer::LocalPlayer(Client *gamedef, const char *name):
 	m_old_node_below(32767,32767,32767),
 	m_old_node_below_type("air"),
 	m_can_jump(false),
+	m_breath(PLAYER_MAX_BREATH),
+	m_yaw(0),
+	m_pitch(0),
+	camera_barely_in_ceiling(false),
+	m_collisionbox(-BS * 0.30, 0.0, -BS * 0.30, BS * 0.30, BS * 1.75, BS * 0.30),
 	m_cao(NULL),
 	m_gamedef(gamedef)
 {
diff --git a/src/localplayer.h b/src/localplayer.h
index eb727d7e3..749f8f8ce 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -40,6 +40,7 @@ public:
 
 	ClientActiveObject *parent;
 
+	u16 hp;
 	bool got_teleported;
 	bool isAttached;
 	bool touching_ground;
@@ -99,10 +100,45 @@ public:
 
 	u32 maxHudId() const { return hud.size(); }
 
+	u16 getBreath() const { return m_breath; }
+	void setBreath(u16 breath) { m_breath = breath; }
+
+	v3s16 getLightPosition() const
+	{
+		return floatToInt(m_position + v3f(0,BS+BS/2,0), BS);
+	}
+
+	void setYaw(f32 yaw)
+	{
+		m_yaw = yaw;
+	}
+
+	f32 getYaw() const { return m_yaw; }
+
+	void setPitch(f32 pitch)
+	{
+		m_pitch = pitch;
+	}
+
+	f32 getPitch() const { return m_pitch; }
+
+	void setPosition(const v3f &position)
+	{
+		m_position = position;
+	}
+
+	v3f getPosition() const { return m_position; }
+	v3f getEyePosition() const { return m_position + getEyeOffset(); }
+	v3f getEyeOffset() const
+	{
+		float eye_height = camera_barely_in_ceiling ? 1.5f : 1.625f;
+		return v3f(0, BS * eye_height, 0);
+	}
 private:
 	void accelerateHorizontal(const v3f &target_speed, const f32 max_increase);
 	void accelerateVertical(const v3f &target_speed, const f32 max_increase);
 
+	v3f m_position;
 	// This is used for determining the sneaking range
 	v3s16 m_sneak_node;
 	// Whether the player is allowed to sneak
@@ -117,6 +153,11 @@ private:
 	v3s16 m_old_node_below;
 	std::string m_old_node_below_type;
 	bool m_can_jump;
+	u16 m_breath;
+	f32 m_yaw;
+	f32 m_pitch;
+	bool camera_barely_in_ceiling;
+	aabb3f m_collisionbox;
 
 	GenericCAO* m_cao;
 	Client *m_gamedef;
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 090741f9f..411982f69 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -634,7 +634,6 @@ void Client::handleCommand_AnnounceMedia(NetworkPacket* pkt)
 		m_media_downloader->addFile(name, sha1_raw);
 	}
 
-	std::vector<std::string> remote_media;
 	try {
 		std::string str;
 
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 554025747..5e70b4c6c 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -809,13 +809,6 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
 		return;
 	}
 
-	// If player is dead we don't care of this packet
-	if (player->isDead()) {
-		verbosestream << "TOSERVER_PLAYERPOS: " << player->getName()
-			<< " is dead. Ignoring packet";
-		return;
-	}
-
 	PlayerSAO *playersao = player->getPlayerSAO();
 	if (playersao == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
@@ -825,10 +818,17 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
 		return;
 	}
 
-	player->setPosition(position);
+	// If player is dead we don't care of this packet
+	if (playersao->isDead()) {
+		verbosestream << "TOSERVER_PLAYERPOS: " << player->getName()
+				<< " is dead. Ignoring packet";
+		return;
+	}
+
+	playersao->setBasePosition(position);
 	player->setSpeed(speed);
-	player->setPitch(pitch);
-	player->setYaw(yaw);
+	playersao->setPitch(pitch, false);
+	playersao->setYaw(yaw, false);
 	player->keyPressed = keyPressed;
 	player->control.up = (keyPressed & 1);
 	player->control.down = (keyPressed & 2);
@@ -1100,7 +1100,7 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
 
 	if (g_settings->getBool("enable_damage")) {
 		actionstream << player->getName() << " damaged by "
-				<< (int)damage << " hp at " << PP(player->getPosition() / BS)
+				<< (int)damage << " hp at " << PP(playersao->getBasePosition() / BS)
 				<< std::endl;
 
 		playersao->setHP(playersao->getHP() - damage);
@@ -1124,16 +1124,6 @@ void Server::handleCommand_Breath(NetworkPacket* pkt)
 		return;
 	}
 
-	/*
-	 * If player is dead, we don't need to update the breath
-	 * He is dead !
-	 */
-	if (player->isDead()) {
-		verbosestream << "TOSERVER_BREATH: " << player->getName()
-			<< " is dead. Ignoring packet";
-		return;
-	}
-
 
 	PlayerSAO *playersao = player->getPlayerSAO();
 	if (playersao == NULL) {
@@ -1144,6 +1134,16 @@ void Server::handleCommand_Breath(NetworkPacket* pkt)
 		return;
 	}
 
+	/*
+	 * If player is dead, we don't need to update the breath
+	 * He is dead !
+	 */
+	if (playersao->isDead()) {
+		verbosestream << "TOSERVER_BREATH: " << player->getName()
+				<< " is dead. Ignoring packet";
+		return;
+	}
+
 	playersao->setBreath(breath);
 	SendPlayerBreath(pkt->getPeerId());
 }
@@ -1264,13 +1264,16 @@ void Server::handleCommand_Respawn(NetworkPacket* pkt)
 		return;
 	}
 
-	if (!player->isDead())
+	PlayerSAO *playersao = player->getPlayerSAO();
+	assert(playersao);
+
+	if (!playersao->isDead())
 		return;
 
 	RespawnPlayer(pkt->getPeerId());
 
 	actionstream << player->getName() << " respawns at "
-			<< PP(player->getPosition()/BS) << std::endl;
+			<< PP(playersao->getBasePosition() / BS) << std::endl;
 
 	// ActiveObject is added to environment in AsyncRunStep after
 	// the previous addition has been successfully removed
@@ -1322,9 +1325,9 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 		return;
 	}
 
-	if (player->isDead()) {
+	if (playersao->isDead()) {
 		verbosestream << "TOSERVER_INTERACT: " << player->getName()
-			<< " is dead. Ignoring packet";
+				<< " is dead. Ignoring packet";
 		return;
 	}
 
@@ -1455,7 +1458,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 			ToolCapabilities toolcap =
 					punchitem.getToolCapabilities(m_itemdef);
 			v3f dir = (pointed_object->getBasePosition() -
-					(player->getPosition() + player->getEyeOffset())
+					(playersao->getBasePosition() + playersao->getEyeOffset())
 						).normalize();
 			float time_from_last_punch =
 				playersao->resetTimeFromLastPunch();
diff --git a/src/player.cpp b/src/player.cpp
index fa82a79f4..9c321d571 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -30,18 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 Player::Player(const char *name, IItemDefManager *idef):
-	camera_barely_in_ceiling(false),
 	inventory(idef),
-	hp(PLAYER_MAX_HP),
 	peer_id(PEER_ID_INEXISTENT),
 	keyPressed(0),
 // protected
-	m_breath(PLAYER_MAX_BREATH),
-	m_pitch(0),
-	m_yaw(0),
-	m_speed(0,0,0),
-	m_position(0,0,0),
-	m_collisionbox(-BS*0.30,0.0,-BS*0.30,BS*0.30,BS*1.75,BS*0.30)
+	m_speed(0,0,0)
 {
 	strlcpy(m_name, name, PLAYERNAME_SIZE);
 
@@ -90,11 +83,6 @@ Player::~Player()
 	clearHud();
 }
 
-v3s16 Player::getLightPosition() const
-{
-	return floatToInt(m_position + v3f(0,BS+BS/2,0), BS);
-}
-
 u32 Player::addHud(HudElement *toadd)
 {
 	MutexAutoLock lock(m_mutex);
diff --git a/src/player.h b/src/player.h
index 6ac5dfe65..5f9bb7ec9 100644
--- a/src/player.h
+++ b/src/player.h
@@ -129,49 +129,7 @@ public:
 		m_speed = speed;
 	}
 
-	v3f getPosition()
-	{
-		return m_position;
-	}
-
-	v3s16 getLightPosition() const;
-
-	v3f getEyeOffset()
-	{
-		float eye_height = camera_barely_in_ceiling ? 1.5f : 1.625f;
-		return v3f(0, BS * eye_height, 0);
-	}
-
-	v3f getEyePosition()
-	{
-		return m_position + getEyeOffset();
-	}
-
-	virtual void setPosition(const v3f &position)
-	{
-		m_position = position;
-	}
-
-	virtual void setPitch(f32 pitch)
-	{
-		m_pitch = pitch;
-	}
-
-	virtual void setYaw(f32 yaw)
-	{
-		m_yaw = yaw;
-	}
-
-	f32 getPitch() const { return m_pitch; }
-	f32 getYaw() const { return m_yaw; }
-	u16 getBreath() const { return m_breath; }
-
-	virtual void setBreath(u16 breath) { m_breath = breath; }
-
-	f32 getRadPitch() const { return m_pitch * core::DEGTORAD; }
-	f32 getRadYaw() const { return m_yaw * core::DEGTORAD; }
 	const char *getName() const { return m_name; }
-	aabb3f getCollisionbox() const { return m_collisionbox; }
 
 	u32 getFreeHudID()
 	{
@@ -183,7 +141,6 @@ public:
 		return size;
 	}
 
-	bool camera_barely_in_ceiling;
 	v3f eye_offset_first;
 	v3f eye_offset_third;
 
@@ -205,8 +162,6 @@ public:
 	v2s32 local_animations[4];
 	float local_animation_speed;
 
-	u16 hp;
-
 	u16 peer_id;
 
 	std::string inventory_formspec;
@@ -225,12 +180,7 @@ public:
 	s32 hud_hotbar_itemcount;
 protected:
 	char m_name[PLAYERNAME_SIZE];
-	u16 m_breath;
-	f32 m_pitch;
-	f32 m_yaw;
 	v3f m_speed;
-	v3f m_position;
-	aabb3f m_collisionbox;
 
 	std::vector<HudElement *> hud;
 private:
diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp
index f64d1d690..605346928 100644
--- a/src/remoteplayer.cpp
+++ b/src/remoteplayer.cpp
@@ -96,7 +96,7 @@ void RemotePlayer::save(std::string savedir, IGameDef *gamedef)
 			infostream << "Failed to open " << path << std::endl;
 			return;
 		}
-		testplayer.deSerialize(is, path);
+		testplayer.deSerialize(is, path, NULL);
 		is.close();
 		if (strcmp(testplayer.getName(), m_name) == 0) {
 			// Open file and serialize
@@ -115,37 +115,46 @@ void RemotePlayer::save(std::string savedir, IGameDef *gamedef)
 	return;
 }
 
-void RemotePlayer::deSerialize(std::istream &is, const std::string &playername)
+void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
+		PlayerSAO *sao)
 {
 	Settings args;
 
 	if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
-		throw SerializationError("PlayerArgsEnd of player " +
-								 playername + " not found!");
+		throw SerializationError("PlayerArgsEnd of player " + playername + " not found!");
 	}
 
 	m_dirty = true;
 	//args.getS32("version"); // Version field value not used
 	std::string name = args.get("name");
 	strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
-	setPitch(args.getFloat("pitch"));
-	setYaw(args.getFloat("yaw"));
-	setPosition(args.getV3F("position"));
-	try {
-		hp = args.getS32("hp");
-	} catch(SettingNotFoundException &e) {
-		hp = PLAYER_MAX_HP;
-	}
 
-	try {
-		m_breath = args.getS32("breath");
-	} catch(SettingNotFoundException &e) {
-		m_breath = PLAYER_MAX_BREATH;
+	if (sao) {
+		try {
+			sao->setHP(args.getS32("hp"), true);
+		} catch(SettingNotFoundException &e) {
+			sao->setHP(PLAYER_MAX_HP, true);
+		}
+
+		try {
+			sao->setBasePosition(args.getV3F("position"));
+		} catch (SettingNotFoundException &e) {}
+
+		try {
+			sao->setPitch(args.getFloat("pitch"), false);
+		} catch (SettingNotFoundException &e) {}
+		try {
+			sao->setYaw(args.getFloat("yaw"), false);
+		} catch (SettingNotFoundException &e) {}
+
+		try {
+			sao->setBreath(args.getS32("breath"));
+		} catch (SettingNotFoundException &e) {}
 	}
 
 	inventory.deSerialize(is);
 
-	if(inventory.getList("craftpreview") == NULL) {
+	if (inventory.getList("craftpreview") == NULL) {
 		// Convert players without craftpreview
 		inventory.addList("craftpreview", 1);
 
@@ -167,11 +176,14 @@ void RemotePlayer::serialize(std::ostream &os)
 	args.setS32("version", 1);
 	args.set("name", m_name);
 	//args.set("password", m_password);
-	args.setFloat("pitch", m_pitch);
-	args.setFloat("yaw", m_yaw);
-	args.setV3F("position", m_position);
-	args.setS32("hp", hp);
-	args.setS32("breath", m_breath);
+
+	if (m_sao) {
+		args.setS32("hp", m_sao->getHP());
+		args.setV3F("position", m_sao->getBasePosition());
+		args.setFloat("pitch", m_sao->getPitch());
+		args.setFloat("yaw", m_sao->getYaw());
+		args.setS32("breath", m_sao->getBreath());
+	}
 
 	args.writeLines(os);
 
@@ -180,16 +192,6 @@ void RemotePlayer::serialize(std::ostream &os)
 	inventory.serialize(os);
 }
 
-void RemotePlayer::setPosition(const v3f &position)
-{
-	if (position != m_position)
-		m_dirty = true;
-
-	Player::setPosition(position);
-	if(m_sao)
-		m_sao->setBasePosition(position);
-}
-
 const RemotePlayerChatResult RemotePlayer::canSendChatMessage()
 {
 	// Rate limit messages
diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index 1b1a90de3..61b5a23de 100644
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -40,11 +40,10 @@ public:
 	virtual ~RemotePlayer() {}
 
 	void save(std::string savedir, IGameDef *gamedef);
-	void deSerialize(std::istream &is, const std::string &playername);
+	void deSerialize(std::istream &is, const std::string &playername, PlayerSAO *sao);
 
 	PlayerSAO *getPlayerSAO() { return m_sao; }
 	void setPlayerSAO(PlayerSAO *sao) { m_sao = sao; }
-	void setPosition(const v3f &position);
 
 	const RemotePlayerChatResult canSendChatMessage();
 
@@ -67,9 +66,6 @@ public:
 		*ratio = m_day_night_ratio;
 	}
 
-	// Use a function, if isDead can be defined by other conditions
-	bool isDead() const { return hp == 0; }
-
 	void setHotbarImage(const std::string &name)
 	{
 		hud_hotbar_image = name;
@@ -90,12 +86,6 @@ public:
 		return hud_hotbar_selected_image;
 	}
 
-	// Deprecated
-	f32 getRadPitchDep() const { return -1.0 * m_pitch * core::DEGTORAD; }
-
-	// Deprecated
-	f32 getRadYawDep() const { return (m_yaw + 90.) * core::DEGTORAD; }
-
 	void setSky(const video::SColor &bgcolor, const std::string &type,
 				const std::vector<std::string> &params)
 	{
@@ -121,27 +111,6 @@ public:
 			inventory.setModified(x);
 	}
 
-	virtual void setBreath(u16 breath)
-	{
-		if (breath != m_breath)
-			m_dirty = true;
-		Player::setBreath(breath);
-	}
-
-	virtual void setPitch(f32 pitch)
-	{
-		if (pitch != m_pitch)
-			m_dirty = true;
-		Player::setPitch(pitch);
-	}
-
-	virtual void setYaw(f32 yaw)
-	{
-		if (yaw != m_yaw)
-			m_dirty = true;
-		Player::setYaw(yaw);
-	}
-
 	void setLocalAnimations(v2s32 frames[4], float frame_speed)
 	{
 		for (int i = 0; i < 4; i++)
@@ -156,6 +125,8 @@ public:
 		*frame_speed = local_animation_speed;
 	}
 
+	void setDirty(bool dirty) { m_dirty = true; }
+
 	u16 protocol_version;
 private:
 	/*
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 23994181c..cf124f17c 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -1013,11 +1013,11 @@ int ObjectRef::l_get_look_dir(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) return 0;
+	PlayerSAO* co = getplayersao(ref);
+	if (co == NULL) return 0;
 	// Do it
-	float pitch = player->getRadPitchDep();
-	float yaw = player->getRadYawDep();
+	float pitch = co->getRadPitchDep();
+	float yaw = co->getRadYawDep();
 	v3f v(cos(pitch)*cos(yaw), sin(pitch), cos(pitch)*sin(yaw));
 	push_v3f(L, v);
 	return 1;
@@ -1033,10 +1033,10 @@ int ObjectRef::l_get_look_pitch(lua_State *L)
 		"Deprecated call to get_look_pitch, use get_look_vertical instead");
 
 	ObjectRef *ref = checkobject(L, 1);
-	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) return 0;
+	PlayerSAO* co = getplayersao(ref);
+	if (co == NULL) return 0;
 	// Do it
-	lua_pushnumber(L, player->getRadPitchDep());
+	lua_pushnumber(L, co->getRadPitchDep());
 	return 1;
 }
 
@@ -1050,10 +1050,10 @@ int ObjectRef::l_get_look_yaw(lua_State *L)
 		"Deprecated call to get_look_yaw, use get_look_horizontal instead");
 
 	ObjectRef *ref = checkobject(L, 1);
-	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) return 0;
+	PlayerSAO* co = getplayersao(ref);
+	if (co == NULL) return 0;
 	// Do it
-	lua_pushnumber(L, player->getRadYawDep());
+	lua_pushnumber(L, co->getRadYawDep());
 	return 1;
 }
 
@@ -1062,10 +1062,10 @@ int ObjectRef::l_get_look_vertical(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) return 0;
+	PlayerSAO* co = getplayersao(ref);
+	if (co == NULL) return 0;
 	// Do it
-	lua_pushnumber(L, player->getRadPitch());
+	lua_pushnumber(L, co->getRadPitch());
 	return 1;
 }
 
@@ -1074,10 +1074,10 @@ int ObjectRef::l_get_look_horizontal(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) return 0;
+	PlayerSAO* co = getplayersao(ref);
+	if (co == NULL) return 0;
 	// Do it
-	lua_pushnumber(L, player->getRadYaw());
+	lua_pushnumber(L, co->getRadYaw());
 	return 1;
 }
 
diff --git a/src/server.cpp b/src/server.cpp
index e67f37d56..cd526ad77 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -701,11 +701,15 @@ void Server::AsyncRunStep(bool initial_step)
 				continue;
 			}
 
+			PlayerSAO *playersao = player->getPlayerSAO();
+			if (playersao == NULL)
+				continue;
+
 			std::queue<u16> removed_objects;
 			std::queue<u16> added_objects;
-			m_env->getRemovedActiveObjects(player, radius, player_radius,
+			m_env->getRemovedActiveObjects(playersao, radius, player_radius,
 					client->m_known_objects, removed_objects);
-			m_env->getAddedActiveObjects(player, radius, player_radius,
+			m_env->getAddedActiveObjects(playersao, radius, player_radius,
 					client->m_known_objects, added_objects);
 
 			// Ignore if nothing happened
@@ -1108,7 +1112,7 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
 	SendPlayerBreath(peer_id);
 
 	// Show death screen if necessary
-	if (player->isDead())
+	if (playersao->isDead())
 		SendDeathscreen(peer_id, false, v3f(0,0,0));
 
 	// Note things in chat if not in simple singleplayer mode
@@ -1860,18 +1864,18 @@ void Server::SendMovePlayer(u16 peer_id)
 	DSTACK(FUNCTION_NAME);
 	RemotePlayer *player = m_env->getPlayer(peer_id);
 	assert(player);
+	PlayerSAO *sao = player->getPlayerSAO();
+	assert(sao);
 
 	NetworkPacket pkt(TOCLIENT_MOVE_PLAYER, sizeof(v3f) + sizeof(f32) * 2, peer_id);
-	pkt << player->getPosition() << player->getPitch() << player->getYaw();
+	pkt << sao->getBasePosition() << sao->getPitch() << sao->getYaw();
 
 	{
-		v3f pos = player->getPosition();
-		f32 pitch = player->getPitch();
-		f32 yaw = player->getYaw();
+		v3f pos = sao->getBasePosition();
 		verbosestream << "Server: Sending TOCLIENT_MOVE_PLAYER"
 				<< " pos=(" << pos.X << "," << pos.Y << "," << pos.Z << ")"
-				<< " pitch=" << pitch
-				<< " yaw=" << yaw
+				<< " pitch=" << sao->getPitch()
+				<< " yaw=" << sao->getYaw()
 				<< std::endl;
 	}
 
@@ -1984,8 +1988,12 @@ s32 Server::playSound(const SimpleSoundSpec &spec,
 			if (!player)
 				continue;
 
+			PlayerSAO *sao = player->getPlayerSAO();
+			if (!sao)
+				continue;
+
 			if (pos_exists) {
-				if(player->getPosition().getDistanceFrom(pos) >
+				if(sao->getBasePosition().getDistanceFrom(pos) >
 						params.max_hear_distance)
 					continue;
 			}
@@ -2044,14 +2052,17 @@ void Server::sendRemoveNode(v3s16 p, u16 ignore_id,
 	pkt << p;
 
 	std::vector<u16> clients = m_clients.getClientIDs();
-	for(std::vector<u16>::iterator i = clients.begin();
-		i != clients.end(); ++i) {
+	for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
 		if (far_players) {
 			// Get player
 			if (RemotePlayer *player = m_env->getPlayer(*i)) {
+				PlayerSAO *sao = player->getPlayerSAO();
+				if (!sao)
+					continue;
+
 				// If player is far away, only set modified blocks not sent
-				v3f player_pos = player->getPosition();
-				if(player_pos.getDistanceFrom(p_f) > maxd) {
+				v3f player_pos = sao->getBasePosition();
+				if (player_pos.getDistanceFrom(p_f) > maxd) {
 					far_players->push_back(*i);
 					continue;
 				}
@@ -2071,14 +2082,16 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
 	v3f p_f = intToFloat(p, BS);
 
 	std::vector<u16> clients = m_clients.getClientIDs();
-	for(std::vector<u16>::iterator i = clients.begin();
-			i != clients.end(); ++i) {
-
-		if(far_players) {
+	for(std::vector<u16>::iterator i = clients.begin();	i != clients.end(); ++i) {
+		if (far_players) {
 			// Get player
 			if (RemotePlayer *player = m_env->getPlayer(*i)) {
+				PlayerSAO *sao = player->getPlayerSAO();
+				if (!sao)
+					continue;
+
 				// If player is far away, only set modified blocks not sent
-				v3f player_pos = player->getPosition();
+				v3f player_pos = sao->getBasePosition();
 				if(player_pos.getDistanceFrom(p_f) > maxd) {
 					far_players->push_back(*i);
 					continue;
@@ -3426,10 +3439,9 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
 		return NULL;
 	}
 
-	// Load player if it isn't already loaded
-	if (!player) {
-		player = m_env->loadPlayer(name);
-	}
+	// Create a new player active object
+	PlayerSAO *playersao = new PlayerSAO(m_env, peer_id, isSingleplayer());
+	player = m_env->loadPlayer(name, playersao);
 
 	// Create player if it doesn't exist
 	if (!player) {
@@ -3438,8 +3450,7 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
 		// Set player position
 		infostream<<"Server: Finding spawn place for player \""
 				<<name<<"\""<<std::endl;
-		v3f pos = findSpawnPos();
-		player->setPosition(pos);
+		playersao->setBasePosition(findSpawnPos());
 
 		// Make sure the player is saved
 		player->setModified(true);
@@ -3450,18 +3461,14 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
 		// If the player exists, ensure that they respawn inside legal bounds
 		// This fixes an assert crash when the player can't be added
 		// to the environment
-		if (objectpos_over_limit(player->getPosition())) {
+		if (objectpos_over_limit(playersao->getBasePosition())) {
 			actionstream << "Respawn position for player \""
 				<< name << "\" outside limits, resetting" << std::endl;
-			v3f pos = findSpawnPos();
-			player->setPosition(pos);
+			playersao->setBasePosition(findSpawnPos());
 		}
 	}
 
-	// Create a new player active object
-	PlayerSAO *playersao = new PlayerSAO(m_env, player, peer_id,
-			getPlayerEffectivePrivs(player->getName()),
-			isSingleplayer());
+	playersao->initialize(player, getPlayerEffectivePrivs(player->getName()));
 
 	player->protocol_version = proto_version;
 
diff --git a/src/serverobject.h b/src/serverobject.h
index 63650e3be..9884eb0a1 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -85,7 +85,7 @@ public:
 		Some more dynamic interface
 	*/
 
-	virtual void setPos(v3f pos)
+	virtual void setPos(const v3f &pos)
 		{ setBasePosition(pos); }
 	// continuous: if true, object does not stop immediately at pos
 	virtual void moveTo(v3f pos, bool continuous)
diff --git a/src/unittest/test_player.cpp b/src/unittest/test_player.cpp
index 5de9eaaf2..fba422475 100644
--- a/src/unittest/test_player.cpp
+++ b/src/unittest/test_player.cpp
@@ -46,11 +46,14 @@ void TestPlayer::runTests(IGameDef *gamedef)
 void TestPlayer::testSave(IGameDef *gamedef)
 {
 	RemotePlayer rplayer("testplayer_save", gamedef->idef());
-	rplayer.setBreath(10);
-	rplayer.hp = 8;
-	rplayer.setYaw(0.1f);
-	rplayer.setPitch(0.6f);
-	rplayer.setPosition(v3f(450.2f, -15.7f, 68.1f));
+	PlayerSAO sao(NULL, 1, false);
+	sao.initialize(&rplayer, std::set<std::string>());
+	rplayer.setPlayerSAO(&sao);
+	sao.setBreath(10);
+	sao.setHP(8, true);
+	sao.setYaw(0.1f, false);
+	sao.setPitch(0.6f, false);
+	sao.setBasePosition(v3f(450.2f, -15.7f, 68.1f));
 	rplayer.save(".", gamedef);
 	UASSERT(fs::PathExists("testplayer_save"));
 }
@@ -58,24 +61,28 @@ void TestPlayer::testSave(IGameDef *gamedef)
 void TestPlayer::testLoad(IGameDef *gamedef)
 {
 	RemotePlayer rplayer("testplayer_load", gamedef->idef());
-	rplayer.setBreath(10);
-	rplayer.hp = 8;
-	rplayer.setYaw(0.1f);
-	rplayer.setPitch(0.6f);
-	rplayer.setPosition(v3f(450.2f, -15.7f, 68.1f));
+	PlayerSAO sao(NULL, 1, false);
+	sao.initialize(&rplayer, std::set<std::string>());
+	rplayer.setPlayerSAO(&sao);
+	sao.setBreath(10);
+	sao.setHP(8, true);
+	sao.setYaw(0.1f, false);
+	sao.setPitch(0.6f, false);
+	sao.setBasePosition(v3f(450.2f, -15.7f, 68.1f));
 	rplayer.save(".", gamedef);
 	UASSERT(fs::PathExists("testplayer_load"));
 
 	RemotePlayer rplayer_load("testplayer_load", gamedef->idef());
+	PlayerSAO sao_load(NULL, 2, false);
 	std::ifstream is("testplayer_load", std::ios_base::binary);
 	UASSERT(is.good());
-	rplayer_load.deSerialize(is, "testplayer_load");
+	rplayer_load.deSerialize(is, "testplayer_load", &sao_load);
 	is.close();
 
 	UASSERT(strcmp(rplayer_load.getName(), "testplayer_load") == 0);
-	UASSERT(rplayer.getBreath() == 10);
-	UASSERT(rplayer.hp == 8);
-	UASSERT(rplayer.getYaw() == 0.1f);
-	UASSERT(rplayer.getPitch() == 0.6f);
-	UASSERT(rplayer.getPosition() == v3f(450.2f, -15.7f, 68.1f));
+	UASSERT(sao_load.getBreath() == 10);
+	UASSERT(sao_load.getHP() == 8);
+	UASSERT(sao_load.getYaw() == 0.1f);
+	UASSERT(sao_load.getPitch() == 0.6f);
+	UASSERT(sao_load.getBasePosition() == v3f(450.2f, -15.7f, 68.1f));
 }

From 595932a8602292f28333ce14e20cee4b6d8820c1 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 30 Oct 2016 16:12:09 +0100
Subject: [PATCH 272/418] Fix overloading problems mentioned by clang

---
 src/content_sao.cpp                 | 30 ++++++++++++++---------------
 src/content_sao.h                   | 13 +++++++++----
 src/network/serverpackethandler.cpp |  4 ++--
 src/remoteplayer.cpp                |  8 ++++----
 src/script/lua_api/l_object.cpp     |  8 ++++----
 src/unittest/test_player.cpp        | 12 ++++++------
 6 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 23a064085..5fb8f936e 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -507,7 +507,7 @@ void LuaEntitySAO::rightClick(ServerActiveObject *clicker)
 	m_env->getScriptIface()->luaentity_Rightclick(m_id, clicker);
 }
 
-void LuaEntitySAO::setPos(v3f pos)
+void LuaEntitySAO::setPos(const v3f &pos)
 {
 	if(isAttached())
 		return;
@@ -1078,27 +1078,32 @@ void PlayerSAO::moveTo(v3f pos, bool continuous)
 	((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
 }
 
-void PlayerSAO::setYaw(const float yaw, bool send_data)
+void PlayerSAO::setYaw(const float yaw)
 {
 	if (m_player && yaw != m_yaw)
 		m_player->setDirty(true);
 
 	UnitSAO::setYaw(yaw);
-
-	// Datas should not be sent at player initialization
-	if (send_data)
-		((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
 }
 
-void PlayerSAO::setPitch(const float pitch, bool send_data)
+void PlayerSAO::setYawAndSend(const float yaw)
+{
+	setYaw(yaw);
+	((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
+}
+
+void PlayerSAO::setPitch(const float pitch)
 {
 	if (m_player && pitch != m_pitch)
 		m_player->setDirty(true);
 
 	m_pitch = pitch;
+}
 
-	if (send_data)
-		((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
+void PlayerSAO::setPitchAndSend(const float pitch)
+{
+	setPitch(pitch);
+	((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
 }
 
 int PlayerSAO::punch(v3f dir,
@@ -1173,13 +1178,8 @@ s16 PlayerSAO::readDamage()
 	return damage;
 }
 
-void PlayerSAO::setHP(s16 hp, bool direct)
+void PlayerSAO::setHP(s16 hp)
 {
-	if (direct) {
-		m_hp = hp;
-		return;
-	}
-
 	s16 oldhp = m_hp;
 
 	s16 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp);
diff --git a/src/content_sao.h b/src/content_sao.h
index 4ea6277ff..5d837a466 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -73,7 +73,7 @@ public:
 			ServerActiveObject *puncher=NULL,
 			float time_from_last_punch=1000000);
 	void rightClick(ServerActiveObject *clicker);
-	void setPos(v3f pos);
+	void setPos(const v3f &pos);
 	void moveTo(v3f pos, bool continuous);
 	float getMinimumSavedMovement();
 	std::string getDescription();
@@ -204,8 +204,12 @@ public:
 	void setBasePosition(const v3f &position);
 	void setPos(const v3f &pos);
 	void moveTo(v3f pos, bool continuous);
-	void setYaw(const float yaw, bool send_data = true);
-	void setPitch(const float pitch, bool send_data = true);
+	void setYaw(const float yaw);
+	// Data should not be sent at player initialization
+	void setYawAndSend(const float yaw);
+	void setPitch(const float pitch);
+	// Data should not be sent at player initialization
+	void setPitchAndSend(const float pitch);
 	f32 getPitch() const { return m_pitch; }
 	f32 getRadPitch() const { return m_pitch * core::DEGTORAD; }
 	// Deprecated
@@ -220,7 +224,8 @@ public:
 		ServerActiveObject *puncher,
 		float time_from_last_punch);
 	void rightClick(ServerActiveObject *clicker);
-	void setHP(s16 hp, bool direct = false);
+	void setHP(s16 hp);
+	void setHPRaw(s16 hp) { m_hp = hp; }
 	s16 readDamage();
 	u16 getBreath() const { return m_breath; }
 	void setBreath(const u16 breath);
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 5e70b4c6c..80eec140d 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -827,8 +827,8 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
 
 	playersao->setBasePosition(position);
 	player->setSpeed(speed);
-	playersao->setPitch(pitch, false);
-	playersao->setYaw(yaw, false);
+	playersao->setPitch(pitch);
+	playersao->setYaw(yaw);
 	player->keyPressed = keyPressed;
 	player->control.up = (keyPressed & 1);
 	player->control.down = (keyPressed & 2);
diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp
index 605346928..f4a79dd08 100644
--- a/src/remoteplayer.cpp
+++ b/src/remoteplayer.cpp
@@ -131,9 +131,9 @@ void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
 
 	if (sao) {
 		try {
-			sao->setHP(args.getS32("hp"), true);
+			sao->setHPRaw(args.getS32("hp"));
 		} catch(SettingNotFoundException &e) {
-			sao->setHP(PLAYER_MAX_HP, true);
+			sao->setHPRaw(PLAYER_MAX_HP);
 		}
 
 		try {
@@ -141,10 +141,10 @@ void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
 		} catch (SettingNotFoundException &e) {}
 
 		try {
-			sao->setPitch(args.getFloat("pitch"), false);
+			sao->setPitch(args.getFloat("pitch"));
 		} catch (SettingNotFoundException &e) {}
 		try {
-			sao->setYaw(args.getFloat("yaw"), false);
+			sao->setYaw(args.getFloat("yaw"));
 		} catch (SettingNotFoundException &e) {}
 
 		try {
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index cf124f17c..42395717f 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -1090,7 +1090,7 @@ int ObjectRef::l_set_look_vertical(lua_State *L)
 	if (co == NULL) return 0;
 	float pitch = luaL_checknumber(L, 2) * core::RADTODEG;
 	// Do it
-	co->setPitch(pitch);
+	co->setPitchAndSend(pitch);
 	return 1;
 }
 
@@ -1103,7 +1103,7 @@ int ObjectRef::l_set_look_horizontal(lua_State *L)
 	if (co == NULL) return 0;
 	float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
 	// Do it
-	co->setYaw(yaw);
+	co->setYawAndSend(yaw);
 	return 1;
 }
 
@@ -1121,7 +1121,7 @@ int ObjectRef::l_set_look_pitch(lua_State *L)
 	if (co == NULL) return 0;
 	float pitch = luaL_checknumber(L, 2) * core::RADTODEG;
 	// Do it
-	co->setPitch(pitch);
+	co->setPitchAndSend(pitch);
 	return 1;
 }
 
@@ -1139,7 +1139,7 @@ int ObjectRef::l_set_look_yaw(lua_State *L)
 	if (co == NULL) return 0;
 	float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
 	// Do it
-	co->setYaw(yaw);
+	co->setYawAndSend(yaw);
 	return 1;
 }
 
diff --git a/src/unittest/test_player.cpp b/src/unittest/test_player.cpp
index fba422475..85fbc8b2d 100644
--- a/src/unittest/test_player.cpp
+++ b/src/unittest/test_player.cpp
@@ -50,9 +50,9 @@ void TestPlayer::testSave(IGameDef *gamedef)
 	sao.initialize(&rplayer, std::set<std::string>());
 	rplayer.setPlayerSAO(&sao);
 	sao.setBreath(10);
-	sao.setHP(8, true);
-	sao.setYaw(0.1f, false);
-	sao.setPitch(0.6f, false);
+	sao.setHPRaw(8);
+	sao.setYaw(0.1f);
+	sao.setPitch(0.6f);
 	sao.setBasePosition(v3f(450.2f, -15.7f, 68.1f));
 	rplayer.save(".", gamedef);
 	UASSERT(fs::PathExists("testplayer_save"));
@@ -65,9 +65,9 @@ void TestPlayer::testLoad(IGameDef *gamedef)
 	sao.initialize(&rplayer, std::set<std::string>());
 	rplayer.setPlayerSAO(&sao);
 	sao.setBreath(10);
-	sao.setHP(8, true);
-	sao.setYaw(0.1f, false);
-	sao.setPitch(0.6f, false);
+	sao.setHPRaw(8);
+	sao.setYaw(0.1f);
+	sao.setPitch(0.6f);
 	sao.setBasePosition(v3f(450.2f, -15.7f, 68.1f));
 	rplayer.save(".", gamedef);
 	UASSERT(fs::PathExists("testplayer_load"));

From e1842ed370f7cab23e460979a08886b5df38e1b3 Mon Sep 17 00:00:00 2001
From: lhofhansl <lhofhansl@yahoo.com>
Date: Sun, 30 Oct 2016 20:35:55 -0700
Subject: [PATCH 273/418] Optionally disable optimization that causes
 underwater and cave rendering glitches. (#4686)

---
 builtin/settingtypes.txt | 7 +++++++
 src/clientiface.cpp      | 4 +++-
 src/defaultsettings.cpp  | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 492d7c79d..e48fc9bc5 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -849,6 +849,13 @@ liquid_queue_purge_time (Liquid queue purge time) int 0
 #    Liquid update interval in seconds.
 liquid_update (Liquid update tick) float 1.0
 
+#    At this distance the server will aggressively optimize which blocks are sent to clients.
+#    Small values potentially improve performance a lot, at the expense of visible rendering glitches.
+#    (some blocks will not be rendered under water and in caves, as well as sometimes on land)
+#    Setting this to a value greater than max_block_send_distance disables this optimization.
+#    Stated in mapblocks (16 nodes)
+block_send_optimize_distance (block send optimize distance) int 4 2
+
 [*Mapgen]
 
 #    Name of map generator to be used when creating a new world.
diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index d2e3a6da0..7dce77cd7 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -174,6 +174,8 @@ void RemoteClient::GetNextBlocks (
 	s32 new_nearest_unsent_d = -1;
 
 	const s16 full_d_max = g_settings->getS16("max_block_send_distance");
+	const s16 d_opt = g_settings->getS16("block_send_optimize_distance");
+
 	s16 d_max = full_d_max;
 	s16 d_max_gen = g_settings->getS16("max_block_generate_distance");
 
@@ -300,7 +302,7 @@ void RemoteClient::GetNextBlocks (
 					Block is near ground level if night-time mesh
 					differs from day-time mesh.
 				*/
-				if(d >= 4)
+				if(d >= d_opt)
 				{
 					if(block->getDayNightDiff() == false)
 						continue;
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index a64840a8f..2cb57532d 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -279,6 +279,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("max_simultaneous_block_sends_server_total", "40");
 	settings->setDefault("max_block_send_distance", "9");
 	settings->setDefault("max_block_generate_distance", "7");
+	settings->setDefault("block_send_optimize_distance", "4");
 	settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
 	settings->setDefault("time_send_interval", "5");
 	settings->setDefault("time_speed", "72");

From 380a4b6d60c3269d1d9c79c122ff5259989decd7 Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar@foo-projects.org>
Date: Thu, 27 Oct 2016 13:59:32 -0700
Subject: [PATCH 274/418] Core.rotate_and_place: Remove unused call to
 get_look_pitch()

---
 builtin/common/misc_helpers.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index e4653d41d..c2dc7514d 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -382,7 +382,6 @@ if INIT == "game" then
 					itemstack, pointed_thing)
 			return
 		end
-		local pitch = placer:get_look_pitch()
 		local fdir = core.dir_to_facedir(placer:get_look_dir())
 		local wield_name = itemstack:get_name()
 

From 70e2df4f86cf4101a10c7e1f7a6ac5cc03992793 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sat, 29 Oct 2016 15:22:18 +0100
Subject: [PATCH 275/418] Lua voxelmanip: Add optional buffer param for 'get
 param2 data'

Update lua_api.txt.
---
 doc/lua_api.txt                 | 4 +++-
 src/script/lua_api/l_vmanip.cpp | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 43ff66bb9..da90f93d2 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3263,7 +3263,9 @@ will place the schematic inside of the VoxelManip.
 * `set_light_data(light_data)`: Sets the `param1` (light) contents of each node
   in the `VoxelManip`
     * expects lighting data in the same format that `get_light_data()` returns
-* `get_param2_data()`: Gets the raw `param2` data read into the `VoxelManip` object
+* `get_param2_data([buffer])`: Gets the raw `param2` data read into the `VoxelManip` object
+    * Returns an array (indices 1 to volume) of integers ranging from `0` to `255`
+    * If the param `buffer` is present, this table will be used to store the result instead
 * `set_param2_data(param2_data)`: Sets the `param2` contents of each node in the `VoxelManip`
 * `calc_lighting([p1, p2], [propagate_shadow])`:  Calculate lighting within the `VoxelManip`
     * To be used only by a `VoxelManip` object from `minetest.get_mapgen_object`
diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp
index 0d8123acd..bdf720f0a 100644
--- a/src/script/lua_api/l_vmanip.cpp
+++ b/src/script/lua_api/l_vmanip.cpp
@@ -277,11 +277,17 @@ int LuaVoxelManip::l_get_param2_data(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 
 	LuaVoxelManip *o = checkobject(L, 1);
+	bool use_buffer  = lua_istable(L, 2);
+
 	MMVManip *vm = o->vm;
 
 	u32 volume = vm->m_area.getVolume();
 
-	lua_newtable(L);
+	if (use_buffer)
+		lua_pushvalue(L, 2);
+	else
+		lua_newtable(L);
+
 	for (u32 i = 0; i != volume; i++) {
 		lua_Integer param2 = vm->m_data[i].param2;
 		lua_pushinteger(L, param2);

From 7607b0ac2065a50a9b68b22909ab40738f2d08e8 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Tue, 6 May 2014 22:31:35 -0400
Subject: [PATCH 276/418] Add version API

---
 builtin/mainmenu/tab_credits.lua  |  3 ++-
 doc/lua_api.txt                   | 11 +++++++++++
 src/script/lua_api/l_mainmenu.cpp |  9 ---------
 src/script/lua_api/l_mainmenu.h   |  2 --
 src/script/lua_api/l_util.cpp     | 29 +++++++++++++++++++++++++++++
 src/script/lua_api/l_util.h       |  3 +++
 6 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua
index 4d2ffd7f4..9b6045263 100644
--- a/builtin/mainmenu/tab_credits.lua
+++ b/builtin/mainmenu/tab_credits.lua
@@ -76,8 +76,9 @@ return {
 	caption = fgettext("Credits"),
 	cbf_formspec = function(tabview, name, tabdata)
 		local logofile = defaulttexturedir .. "logo.png"
+		local version = core.get_version()
 		return "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" ..
-			"label[0.5,3.2;Minetest " .. core.get_version() .. "]" ..
+			"label[0.5,3.2;" .. version.project .. " " .. version.string .. "]" ..
 			"label[0.5,3.5;http://minetest.net]" ..
 			"tablecolumns[color;text]" ..
 			"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index da90f93d2..497864fac 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1908,6 +1908,17 @@ Helper functions
       * nil: return all entries,
       * true: return only subdirectory names, or
       * false: return only file names.
+* `minetest.get_version()`: returns a table containing components of the
+   engine version.  Components:
+    * `project`: Name of the project, eg, "Minetest"
+    * `string`: Simple version, eg, "1.2.3-dev"
+    * `hash`: Full git version (only set if available), eg, "1.2.3-dev-01234567-dirty"
+  Use this for informational purposes only. The information in the returned
+  table does not represent the capabilities of the engine, nor is it
+  reliable or verifyable. Compatible forks will have a different name and
+  version entirely. To check for the presence of engine features, test
+  whether the functions exported by the wanted features exist. For example:
+  `if core.nodeupdate then ... end`.
 
 ### Logging
 * `minetest.debug(...)`
diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
index 8b078eafd..4a2484613 100644
--- a/src/script/lua_api/l_mainmenu.cpp
+++ b/src/script/lua_api/l_mainmenu.cpp
@@ -955,13 +955,6 @@ int ModApiMainMenu::l_show_file_open_dialog(lua_State *L)
 	return 0;
 }
 
-/******************************************************************************/
-int ModApiMainMenu::l_get_version(lua_State *L)
-{
-	lua_pushstring(L, g_version_string);
-	return 1;
-}
-
 /******************************************************************************/
 int ModApiMainMenu::l_sound_play(lua_State *L)
 {
@@ -1157,7 +1150,6 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
 	API_FCT(extract_zip);
 	API_FCT(get_mainmenu_path);
 	API_FCT(show_file_open_dialog);
-	API_FCT(get_version);
 	API_FCT(download_file);
 	API_FCT(get_modstore_details);
 	API_FCT(get_modstore_list);
@@ -1188,7 +1180,6 @@ void ModApiMainMenu::InitializeAsync(AsyncEngine& engine)
 	ASYNC_API_FCT(delete_dir);
 	ASYNC_API_FCT(copy_dir);
 	//ASYNC_API_FCT(extract_zip); //TODO remove dependency to GuiEngine
-	ASYNC_API_FCT(get_version);
 	ASYNC_API_FCT(download_file);
 	ASYNC_API_FCT(get_modstore_details);
 	ASYNC_API_FCT(get_modstore_list);
diff --git a/src/script/lua_api/l_mainmenu.h b/src/script/lua_api/l_mainmenu.h
index 405af25e8..ad5155ac6 100644
--- a/src/script/lua_api/l_mainmenu.h
+++ b/src/script/lua_api/l_mainmenu.h
@@ -79,8 +79,6 @@ private:
 
 	static int l_delete_favorite(lua_State *L);
 
-	static int l_get_version(lua_State *L);
-
 	static int l_sound_play(lua_State *L);
 
 	static int l_sound_stop(lua_State *L);
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index fa2d15b03..818c1aeeb 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -33,8 +33,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "util/auth.h"
 #include "util/base64.h"
+#include "config.h"
+#include "version.h"
 #include <algorithm>
 
+
 // log([level,] text)
 // Writes a line to the logger.
 // The one-argument version logs to infostream.
@@ -302,12 +305,14 @@ int ModApiUtil::l_is_yes(lua_State *L)
 	return 1;
 }
 
+// get_builtin_path()
 int ModApiUtil::l_get_builtin_path(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
 	std::string path = porting::path_share + DIR_DELIM + "builtin";
 	lua_pushstring(L, path.c_str());
+
 	return 1;
 }
 
@@ -460,6 +465,26 @@ int ModApiUtil::l_request_insecure_environment(lua_State *L)
 	return 1;
 }
 
+// get_version()
+int ModApiUtil::l_get_version(lua_State *L)
+{
+	lua_createtable(L, 0, 3);
+	int table = lua_gettop(L);
+
+	lua_pushstring(L, PROJECT_NAME_C);
+	lua_setfield(L, table, "project");
+
+	lua_pushstring(L, g_version_string);
+	lua_setfield(L, table, "string");
+
+	if (strcmp(g_version_string, g_version_hash)) {
+		lua_pushstring(L, g_version_hash);
+		lua_setfield(L, table, "hash");
+	}
+
+	return 1;
+}
+
 
 void ModApiUtil::Initialize(lua_State *L, int top)
 {
@@ -496,6 +521,8 @@ void ModApiUtil::Initialize(lua_State *L, int top)
 
 	API_FCT(encode_base64);
 	API_FCT(decode_base64);
+
+	API_FCT(get_version);
 }
 
 void ModApiUtil::InitializeAsync(AsyncEngine& engine)
@@ -525,5 +552,7 @@ void ModApiUtil::InitializeAsync(AsyncEngine& engine)
 
 	ASYNC_API_FCT(encode_base64);
 	ASYNC_API_FCT(decode_base64);
+
+	ASYNC_API_FCT(get_version);
 }
 
diff --git a/src/script/lua_api/l_util.h b/src/script/lua_api/l_util.h
index 3012d55aa..9910704b3 100644
--- a/src/script/lua_api/l_util.h
+++ b/src/script/lua_api/l_util.h
@@ -104,6 +104,9 @@ private:
 	// decode_base64(string)
 	static int l_decode_base64(lua_State *L);
 
+	// get_version()
+	static int l_get_version(lua_State *L);
+
 public:
 	static void Initialize(lua_State *L, int top);
 

From bf315c05f17549d37d7b4c4bd7938df0b5b32c5a Mon Sep 17 00:00:00 2001
From: Brandon <brandon@bremaweb.com>
Date: Wed, 2 Nov 2016 11:36:58 -0500
Subject: [PATCH 277/418] Add minetest.get_server_uptime() function to Lua API
 (#4702)

Add minetest.get_server_uptime() function to Lua API
---
 doc/lua_api.txt                 |  1 +
 src/script/lua_api/l_server.cpp | 10 ++++++++++
 src/script/lua_api/l_server.h   |  3 +++
 src/server.h                    |  1 +
 4 files changed, 15 insertions(+)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 497864fac..119e69f6f 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2448,6 +2448,7 @@ These functions return the leftover itemstack.
 * `minetest.request_shutdown([message],[reconnect])`: request for server shutdown. Will display `message` to clients,
     and `reconnect` == true displays a reconnect button.
 * `minetest.get_server_status()`: returns server status string
+* `minetest.get_server_uptime()`: returns the server uptime in seconds
 
 ### Bans
 * `minetest.get_ban_list()`: returns the ban list (same as `minetest.get_ban_description("")`)
diff --git a/src/script/lua_api/l_server.cpp b/src/script/lua_api/l_server.cpp
index 95e5da07f..b6d44e0ff 100644
--- a/src/script/lua_api/l_server.cpp
+++ b/src/script/lua_api/l_server.cpp
@@ -45,6 +45,15 @@ int ModApiServer::l_get_server_status(lua_State *L)
 	return 1;
 }
 
+// get_server_uptime()
+int ModApiServer::l_get_server_uptime(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	lua_pushnumber(L, getServer(L)->getUptime());
+	return 1;
+}
+
+
 // print(text)
 int ModApiServer::l_print(lua_State *L)
 {
@@ -507,6 +516,7 @@ void ModApiServer::Initialize(lua_State *L, int top)
 {
 	API_FCT(request_shutdown);
 	API_FCT(get_server_status);
+	API_FCT(get_server_uptime);
 	API_FCT(get_worldpath);
 	API_FCT(is_singleplayer);
 
diff --git a/src/script/lua_api/l_server.h b/src/script/lua_api/l_server.h
index 06a5ddc24..1ad46d440 100644
--- a/src/script/lua_api/l_server.h
+++ b/src/script/lua_api/l_server.h
@@ -30,6 +30,9 @@ private:
 	// get_server_status()
 	static int l_get_server_status(lua_State *L);
 
+	// get_server_uptime()
+	static int l_get_server_uptime(lua_State *L);
+
 	// get_worldpath()
 	static int l_get_worldpath(lua_State *L);
 
diff --git a/src/server.h b/src/server.h
index 5fc2a9133..f8b3ec106 100644
--- a/src/server.h
+++ b/src/server.h
@@ -216,6 +216,7 @@ public:
 
 	// Connection must be locked when called
 	std::wstring getStatusString();
+	inline double getUptime() const { return m_uptime.m_value; }
 
 	// read shutdown state
 	inline bool getShutdownRequested() const { return m_shutdown_requested; }

From f8fd432dca9f84a489cb7033afc4e4eef7cff49d Mon Sep 17 00:00:00 2001
From: lhofhansl <lhofhansl@yahoo.com>
Date: Thu, 3 Nov 2016 19:14:32 -0700
Subject: [PATCH 278/418] Add debug priv, and allow player to display the scene
 as wire-frame. (#4709)

---
 builtin/game/privileges.lua |  5 ++++-
 src/clientmap.cpp           |  1 +
 src/clientmap.h             |  3 +++
 src/game.cpp                | 30 +++++++++++++++++++++---------
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua
index 05c79440c..f89514134 100644
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@@ -58,4 +58,7 @@ core.register_privilege("zoom", {
 	description = "Can zoom the camera",
 	give_to_singleplayer = false,
 })
-
+core.register_privilege("debug", {
+	description = "Allows enabling various debug options that may affect gameplay",
+	give_to_singleplayer = false,
+})
diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index a0a780250..60170ab70 100644
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -521,6 +521,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 				buf->getMaterial().setFlag(video::EMF_TRILINEAR_FILTER, m_cache_trilinear_filter);
 				buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, m_cache_bilinear_filter);
 				buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, m_cache_anistropic_filter);
+				buf->getMaterial().setFlag(video::EMF_WIREFRAME, m_control.show_wireframe);
 
 				const video::SMaterial& material = buf->getMaterial();
 				video::IMaterialRenderer* rnd =
diff --git a/src/clientmap.h b/src/clientmap.h
index 396e68f64..8855eecf6 100644
--- a/src/clientmap.h
+++ b/src/clientmap.h
@@ -32,6 +32,7 @@ struct MapDrawControl
 		range_all(false),
 		wanted_range(0),
 		wanted_max_blocks(0),
+		show_wireframe(false),
 		blocks_drawn(0),
 		blocks_would_have_drawn(0),
 		farthest_drawn(0)
@@ -43,6 +44,8 @@ struct MapDrawControl
 	float wanted_range;
 	// Maximum number of blocks to draw
 	u32 wanted_max_blocks;
+	// show a wire frame for debugging
+	bool show_wireframe;
 	// Number of blocks rendered is written here by the renderer
 	u32 blocks_drawn;
 	// Number of blocks that would have been drawn in wanted_range
diff --git a/src/game.cpp b/src/game.cpp
index 9a03071dd..af0476a0b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1573,7 +1573,7 @@ protected:
 			bool shift_pressed);
 	void toggleFog(float *statustext_time, bool *flag);
 	void toggleDebug(float *statustext_time, bool *show_debug,
-			bool *show_profiler_graph);
+			bool *show_profiler_graph, bool *show_wireframe);
 	void toggleUpdateCamera(float *statustext_time, bool *flag);
 	void toggleProfiler(float *statustext_time, u32 *profiler_current_page,
 			u32 profiler_max_page);
@@ -2812,7 +2812,8 @@ void Game::processKeyInput(VolatileRunFlags *flags,
 	} else if (wasKeyDown(KeyType::TOGGLE_UPDATE_CAMERA)) {
 		toggleUpdateCamera(statustext_time, &flags->disable_camera_update);
 	} else if (wasKeyDown(KeyType::TOGGLE_DEBUG)) {
-		toggleDebug(statustext_time, &flags->show_debug, &flags->show_profiler_graph);
+		toggleDebug(statustext_time, &flags->show_debug, &flags->show_profiler_graph,
+			&draw_control->show_wireframe);
 	} else if (wasKeyDown(KeyType::TOGGLE_PROFILER)) {
 		toggleProfiler(statustext_time, profiler_current_page, profiler_max_page);
 	} else if (wasKeyDown(KeyType::INCREASE_VIEWING_RANGE)) {
@@ -3119,22 +3120,33 @@ void Game::toggleFog(float *statustext_time, bool *flag)
 
 
 void Game::toggleDebug(float *statustext_time, bool *show_debug,
-		bool *show_profiler_graph)
+		bool *show_profiler_graph, bool *show_wireframe)
 {
-	// Initial / 3x toggle: Chat only
+	// Initial / 4x toggle: Chat only
 	// 1x toggle: Debug text with chat
 	// 2x toggle: Debug text with profiler graph
+	// 3x toggle: Debug text and wireframe
 	if (!*show_debug) {
 		*show_debug = true;
 		*show_profiler_graph = false;
+		*show_wireframe = false;
 		statustext = L"Debug info shown";
-	} else if (*show_profiler_graph) {
-		*show_debug = false;
-		*show_profiler_graph = false;
-		statustext = L"Debug info and profiler graph hidden";
-	} else {
+	} else if (!*show_profiler_graph) {
 		*show_profiler_graph = true;
 		statustext = L"Profiler graph shown";
+	} else if (!*show_wireframe && client->checkPrivilege("debug")) {
+		*show_profiler_graph = false;
+		*show_wireframe = true;
+		statustext = L"Wireframe shown";
+	} else {
+		*show_debug = false;
+		*show_profiler_graph = false;
+		*show_wireframe = false;
+		if (client->checkPrivilege("debug")) {
+			statustext = L"Debug info, profiler graph, and wireframe hidden";
+		} else {
+			statustext = L"Debug info and profiler graph hidden";
+		}
 	}
 	*statustext_time = 0;
 }

From dde66a82ed06c4887ce0e63ef5f0b8d3bce2ed74 Mon Sep 17 00:00:00 2001
From: lhofhansl <lhofhansl@yahoo.com>
Date: Fri, 4 Nov 2016 05:06:32 +0100
Subject: [PATCH 279/418] Cycle directly to nothing shown instead of showing
 the profiler graph again

Fix for previous commit.
---
 src/game.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game.cpp b/src/game.cpp
index af0476a0b..33795abc5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -3131,7 +3131,7 @@ void Game::toggleDebug(float *statustext_time, bool *show_debug,
 		*show_profiler_graph = false;
 		*show_wireframe = false;
 		statustext = L"Debug info shown";
-	} else if (!*show_profiler_graph) {
+	} else if (!*show_profiler_graph && !*show_wireframe) {
 		*show_profiler_graph = true;
 		statustext = L"Profiler graph shown";
 	} else if (!*show_wireframe && client->checkPrivilege("debug")) {

From 6bb43472082d8003a6cd140c1221c81005fdd752 Mon Sep 17 00:00:00 2001
From: lhofhansl <lhofhansl@yahoo.com>
Date: Fri, 4 Nov 2016 10:12:45 -0700
Subject: [PATCH 280/418] Remove unused shader matrices. (#4723)

---
 client/shaders/minimap_shader/opengl_vertex.glsl |  2 --
 client/shaders/nodes_shader/opengl_vertex.glsl   |  2 --
 .../water_surface_shader/opengl_vertex.glsl      |  2 --
 client/shaders/wielded_shader/opengl_vertex.glsl |  2 --
 src/shader.cpp                                   | 16 ----------------
 5 files changed, 24 deletions(-)

diff --git a/client/shaders/minimap_shader/opengl_vertex.glsl b/client/shaders/minimap_shader/opengl_vertex.glsl
index 06df5a3cf..88f9356d5 100644
--- a/client/shaders/minimap_shader/opengl_vertex.glsl
+++ b/client/shaders/minimap_shader/opengl_vertex.glsl
@@ -1,6 +1,4 @@
 uniform mat4 mWorldViewProj;
-uniform mat4 mInvWorld;
-uniform mat4 mTransWorld;
 uniform mat4 mWorld;
 
 void main(void)
diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl
index 28c5f197e..44c48cc4c 100644
--- a/client/shaders/nodes_shader/opengl_vertex.glsl
+++ b/client/shaders/nodes_shader/opengl_vertex.glsl
@@ -1,6 +1,4 @@
 uniform mat4 mWorldViewProj;
-uniform mat4 mInvWorld;
-uniform mat4 mTransWorld;
 uniform mat4 mWorld;
 
 uniform float dayNightRatio;
diff --git a/client/shaders/water_surface_shader/opengl_vertex.glsl b/client/shaders/water_surface_shader/opengl_vertex.glsl
index 9b461f4c1..a930e7b8f 100644
--- a/client/shaders/water_surface_shader/opengl_vertex.glsl
+++ b/client/shaders/water_surface_shader/opengl_vertex.glsl
@@ -1,6 +1,4 @@
 uniform mat4 mWorldViewProj;
-uniform mat4 mInvWorld;
-uniform mat4 mTransWorld;
 uniform mat4 mWorld;
 
 uniform float dayNightRatio;
diff --git a/client/shaders/wielded_shader/opengl_vertex.glsl b/client/shaders/wielded_shader/opengl_vertex.glsl
index c33b0a7d3..86c626896 100644
--- a/client/shaders/wielded_shader/opengl_vertex.glsl
+++ b/client/shaders/wielded_shader/opengl_vertex.glsl
@@ -1,6 +1,4 @@
 uniform mat4 mWorldViewProj;
-uniform mat4 mInvWorld;
-uniform mat4 mTransWorld;
 uniform mat4 mWorld;
 
 uniform float dayNightRatio;
diff --git a/src/shader.cpp b/src/shader.cpp
index e13ab8df3..b0131c952 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -219,14 +219,6 @@ public:
 		video::IVideoDriver *driver = services->getVideoDriver();
 		sanity_check(driver);
 
-		// set inverted world matrix
-		core::matrix4 invWorld = driver->getTransform(video::ETS_WORLD);
-		invWorld.makeInverse();
-		if(is_highlevel)
-			services->setVertexShaderConstant("mInvWorld", invWorld.pointer(), 16);
-		else
-			services->setVertexShaderConstant(invWorld.pointer(), 0, 4);
-
 		// set clip matrix
 		core::matrix4 worldViewProj;
 		worldViewProj = driver->getTransform(video::ETS_PROJECTION);
@@ -237,14 +229,6 @@ public:
 		else
 			services->setVertexShaderConstant(worldViewProj.pointer(), 4, 4);
 
-		// set transposed world matrix
-		core::matrix4 transWorld = driver->getTransform(video::ETS_WORLD);
-		transWorld = transWorld.getTransposed();
-		if(is_highlevel)
-			services->setVertexShaderConstant("mTransWorld", transWorld.pointer(), 16);
-		else
-			services->setVertexShaderConstant(transWorld.pointer(), 8, 4);
-
 		// set world matrix
 		core::matrix4 world = driver->getTransform(video::ETS_WORLD);
 		if(is_highlevel)

From b5c84c34ce283a56317902d24067d9a0795a44c5 Mon Sep 17 00:00:00 2001
From: Zeno- <kde.psych@gmail.com>
Date: Sat, 5 Nov 2016 15:10:49 +1000
Subject: [PATCH 281/418] Fix memory leak in ::safeLoadFile (#4730)

---
 src/script/cpp_api/s_security.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 0e64c4c61..3a8f724fe 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -323,9 +323,12 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
 	}
 
 	if (luaL_loadbuffer(L, code, size, chunk_name)) {
+		delete [] code;
 		return false;
 	}
 
+	delete [] code;
+
 	if (path) {
 		delete [] chunk_name;
 	}

From 66bb2954362748c4722d366d0df490ad51a591a2 Mon Sep 17 00:00:00 2001
From: Ner'zhul <nerzhul@users.noreply.github.com>
Date: Sat, 5 Nov 2016 10:25:30 +0100
Subject: [PATCH 282/418] PlayerSAO saving fix (#4734)

PlayerSAO::disconnected() function was historical and remove the link between SAO and RemotePlayer session. With previous attributes linked to RemotePlayer saving was working. But now attributes are read from SAO not RemotePlayer and the current serialize function verify SAO exists to save the player attributes.

Because PlayerSAO::disconnected marks playersao for removal, only mark playerSAO for removal and let PlayerSAO::removingFromEnvironment do the correct saving behaviour and all the disconnection process instead of doing a partial removal and let the server loop doing the RemotePlayer cleanup and remove some saved attributes...
---
 src/content_sao.cpp  | 20 +++++++++++---------
 src/content_sao.h    |  1 +
 src/remoteplayer.cpp | 14 +++++++-------
 src/server.cpp       |  2 +-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 5fb8f936e..dff222f42 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -838,10 +838,7 @@ void PlayerSAO::removingFromEnvironment()
 {
 	ServerActiveObject::removingFromEnvironment();
 	if (m_player->getPlayerSAO() == this) {
-		m_player->peer_id = 0;
-		m_env->savePlayer(m_player);
-		m_player->setPlayerSAO(NULL);
-		m_env->removePlayer(m_player);
+		unlinkPlayerSessionAndSave();
 		for (UNORDERED_SET<u32>::iterator it = m_attached_particle_spawners.begin();
 			it != m_attached_particle_spawners.end(); ++it) {
 			m_env->deleteParticleSpawner(*it, false);
@@ -1340,15 +1337,20 @@ void PlayerSAO::setWieldIndex(int i)
 	}
 }
 
+// Erase the peer id and make the object for removal
 void PlayerSAO::disconnected()
 {
 	m_peer_id = 0;
 	m_removed = true;
-	if(m_player->getPlayerSAO() == this)
-	{
-		m_player->setPlayerSAO(NULL);
-		m_player->peer_id = 0;
-	}
+}
+
+void PlayerSAO::unlinkPlayerSessionAndSave()
+{
+	assert(m_player->getPlayerSAO() == this);
+	m_player->peer_id = 0;
+	m_env->savePlayer(m_player);
+	m_player->setPlayerSAO(NULL);
+	m_env->removePlayer(m_player);
 }
 
 std::string PlayerSAO::getPropertyPacket()
diff --git a/src/content_sao.h b/src/content_sao.h
index 5d837a466..f58c7dadb 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -318,6 +318,7 @@ public:
 
 private:
 	std::string getPropertyPacket();
+	void unlinkPlayerSessionAndSave();
 
 	RemotePlayer *m_player;
 	u16 m_peer_id;
diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp
index f4a79dd08..67ab89113 100644
--- a/src/remoteplayer.cpp
+++ b/src/remoteplayer.cpp
@@ -177,13 +177,13 @@ void RemotePlayer::serialize(std::ostream &os)
 	args.set("name", m_name);
 	//args.set("password", m_password);
 
-	if (m_sao) {
-		args.setS32("hp", m_sao->getHP());
-		args.setV3F("position", m_sao->getBasePosition());
-		args.setFloat("pitch", m_sao->getPitch());
-		args.setFloat("yaw", m_sao->getYaw());
-		args.setS32("breath", m_sao->getBreath());
-	}
+	// This should not happen
+	assert(m_sao);
+	args.setS32("hp", m_sao->getHP());
+	args.setV3F("position", m_sao->getBasePosition());
+	args.setFloat("pitch", m_sao->getPitch());
+	args.setFloat("yaw", m_sao->getYaw());
+	args.setS32("breath", m_sao->getBreath());
 
 	args.writeLines(os);
 
diff --git a/src/server.cpp b/src/server.cpp
index cd526ad77..48331e4f8 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2654,7 +2654,7 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 		RemotePlayer *player = m_env->getPlayer(peer_id);
 
 		/* Run scripts and remove from environment */
-		if(player != NULL) {
+		if (player != NULL) {
 			PlayerSAO *playersao = player->getPlayerSAO();
 			assert(playersao);
 

From 1c570cb3906a871920f8a628a307308820004a23 Mon Sep 17 00:00:00 2001
From: Wuzzy <wuzzy2@mail.ru>
Date: Sat, 5 Nov 2016 18:42:14 +0100
Subject: [PATCH 283/418] Separate optional from required mod dependencies in
 main menu (#4721)

* Separate optional from require dep's in main menu

* Simplify modmgr mod dependency listing code
---
 builtin/mainmenu/dlg_config_world.lua | 15 ++++++++++-----
 builtin/mainmenu/modmgr.lua           | 17 +++++++++++------
 builtin/mainmenu/tab_mods.lua         | 22 +++++++++++++++++-----
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua
index 6e6224c92..7b3ab9852 100644
--- a/builtin/mainmenu/dlg_config_world.lua
+++ b/builtin/mainmenu/dlg_config_world.lua
@@ -47,13 +47,18 @@ local function get_formspec(data)
 	if mod == nil then
 		mod = {name=""}
 	end
+
+	local hard_deps, soft_deps = modmgr.get_dependencies(mod.path)
 	
 	retval = retval ..
 		"label[0,0.7;" .. fgettext("Mod:") .. "]" ..
 		"label[0.75,0.7;" .. mod.name .. "]" ..
-		"label[0,1.25;" .. fgettext("Depends:") .. "]" ..
-		"textlist[0,1.75;5,4.25;world_config_depends;" ..
-		modmgr.get_dependencies(mod.path) .. ";0]" ..
+		"label[0,1.25;" .. fgettext("Dependencies:") .. "]" ..
+		"textlist[0,1.75;5,2.125;world_config_depends;" ..
+		hard_deps .. ";0]" ..
+		"label[0,3.875;" .. fgettext("Optional dependencies:") .. "]" ..
+		"textlist[0,4.375;5,1.8;world_config_optdepends;" ..
+		soft_deps .. ";0]" ..
 		"button[3.25,7;2.5,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" ..
 		"button[5.75,7;2.5,0.5;btn_config_world_cancel;" .. fgettext("Cancel") .. "]"
 
@@ -86,11 +91,11 @@ local function get_formspec(data)
 	if enabled_all then 
 		retval = retval ..
 			"button[8.75,0.125;2.5,0.5;btn_disable_all_mods;" .. fgettext("Disable all") .. "]" ..
-			"textlist[5.5,0.75;5.75,5.25;world_config_modlist;"
+			"textlist[5.5,0.75;5.75,5.4;world_config_modlist;"
 	else
 		retval = retval ..
 			"button[8.75,0.125;2.5,0.5;btn_enable_all_mods;" .. fgettext("Enable all") .. "]" ..
-			"textlist[5.5,0.75;5.75,5.25;world_config_modlist;"
+			"textlist[5.5,0.75;5.75,5.4;world_config_modlist;"
 	end
 	retval = retval .. modmgr.render_modlist(data.list)
 	retval = retval .. ";" .. data.selected_mod .."]"
diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua
index f996df7ba..bf87b1dfa 100644
--- a/builtin/mainmenu/modmgr.lua
+++ b/builtin/mainmenu/modmgr.lua
@@ -284,27 +284,32 @@ end
 
 --------------------------------------------------------------------------------
 function modmgr.get_dependencies(modfolder)
-	local toadd = ""
+	local toadd_hard = ""
+	local toadd_soft = ""
 	if modfolder ~= nil then
 		local filename = modfolder ..
 					DIR_DELIM .. "depends.txt"
 
+		local hard_dependencies = {}
+		local soft_dependencies = {}
 		local dependencyfile = io.open(filename,"r")
-
 		if dependencyfile then
 			local dependency = dependencyfile:read("*l")
 			while dependency do
-				if toadd ~= "" then
-					toadd = toadd .. ","
+				if string.sub(dependency, -1, -1) == "?" then
+					table.insert(soft_dependencies, string.sub(dependency, 1, -2))
+				else
+					table.insert(hard_dependencies, dependency)
 				end
-				toadd = toadd .. dependency
 				dependency = dependencyfile:read()
 			end
 			dependencyfile:close()
 		end
+		toadd_hard = table.concat(hard_dependencies, ",")
+		toadd_soft = table.concat(soft_dependencies, ",")
 	end
 
-	return toadd
+	return toadd_hard, toadd_soft
 end
 
 --------------------------------------------------------------------------------
diff --git a/builtin/mainmenu/tab_mods.lua b/builtin/mainmenu/tab_mods.lua
index 5b59aa110..4a5b6c041 100644
--- a/builtin/mainmenu/tab_mods.lua
+++ b/builtin/mainmenu/tab_mods.lua
@@ -98,12 +98,24 @@ local function get_formspec(tabview, name, tabdata)
 				.. fgettext("Uninstall selected modpack") .. "]"
 		else
 			--show dependencies
+			local toadd_hard, toadd_soft = modmgr.get_dependencies(selected_mod.path)
+			if toadd_hard == "" and toadd_soft == "" then
+				retval = retval .. "," .. fgettext("No dependencies.")
+			else
+				if toadd_hard ~= "" then
+					retval = retval .. "," .. fgettext("Dependencies:") .. ","
+					retval = retval .. toadd_hard
+				end
+				if toadd_soft ~= "" then
+					if toadd_hard ~= "" then
+						retval = retval .. ","
+					end
+					retval = retval .. "," .. fgettext("Optional dependencies:") .. ","
+					retval = retval .. toadd_soft
+				end
+			end
 
-			retval = retval .. "," .. fgettext("Depends:") .. ","
-
-			local toadd = modmgr.get_dependencies(selected_mod.path)
-
-			retval = retval .. toadd .. ";0]"
+			retval = retval .. ";0]"
 
 			retval = retval .. "button[5.5,4.85;4.5,0.5;btn_mod_mgr_delete_mod;"
 				.. fgettext("Uninstall selected mod") .. "]"

From ad4bf2ccf966ac21b94f1778a017ac98f8957ab6 Mon Sep 17 00:00:00 2001
From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Sun, 6 Nov 2016 17:14:36 +0100
Subject: [PATCH 284/418] MSVC: Generate debug information for release builds
 (#4674)

Replace parameters with the equivalent /Ox
---
 src/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3eda27953..cb04c9425 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -696,9 +696,9 @@ if(MSVC)
 	# Visual Studio
 
 	# EHa enables SEH exceptions (used for catching segfaults)
-	set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /Ob2 /Oi /Ot /Oy /GL /FD /MT /GS- /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
+	set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /GL /FD /MT /GS- /Zi /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
 	#set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\" /NODEFAULTLIB:\"libcmt.lib\"")
-	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG")
+	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /DEBUG /OPT:REF /OPT:ICF")
 
 	set(CMAKE_CXX_FLAGS_SEMIDEBUG "/MDd /Zi /Ob0 /O1 /RTC1")
 

From 295232667eb25f6eef9ed3b06d6a71a5cdcc9476 Mon Sep 17 00:00:00 2001
From: adrido <addi@king-arthur.eu>
Date: Sat, 29 Oct 2016 18:01:37 +0200
Subject: [PATCH 285/418] Windows: Add manifest file and set "High DPI Aware"
 true

This resolves washy font and incorrect mouse handling on Windows if
a screen with high DPI is used.
---
 misc/minetest.exe.manifest | 15 +++++++++++++++
 src/CMakeLists.txt         |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 misc/minetest.exe.manifest

diff --git a/misc/minetest.exe.manifest b/misc/minetest.exe.manifest
new file mode 100644
index 000000000..3c32b0f8b
--- /dev/null
+++ b/misc/minetest.exe.manifest
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <application xmlns="urn:schemas-microsoft-com:asm.v3">
+        <windowsSettings>
+            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+        </windowsSettings>
+    </application>
+</assembly>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb04c9425..1983bb078 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -474,6 +474,7 @@ set(common_SRCS
 # This gives us the icon and file version information
 if(WIN32)
 	set(WINRESOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc")
+	set(MINETEST_EXE_MANIFEST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/minetest.exe.manifest")
 	if(MINGW)
 		if(NOT CMAKE_RC_COMPILER)
 			set(CMAKE_RC_COMPILER "windres.exe")
@@ -486,7 +487,7 @@ if(WIN32)
 			DEPENDS ${WINRESOURCE_FILE})
 		SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
 	else(MINGW) # Probably MSVC
-		set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE})
+		set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE})
 	endif(MINGW)
 endif()
 

From e82bd3f067d76b2043a3bcc55fca42de26b5dc4d Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sun, 6 Nov 2016 00:37:20 +0100
Subject: [PATCH 286/418] Privileges: Only give singleplayer 4 basic privs

- interact
- shout
- privs
- basic_privs
---
 builtin/game/privileges.lua | 50 +++++++++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua
index f89514134..56e090f4c 100644
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@@ -26,21 +26,46 @@ function core.register_privilege(name, param)
 end
 
 core.register_privilege("interact", "Can interact with things and modify the world")
-core.register_privilege("teleport", "Can use /teleport command")
-core.register_privilege("bring", "Can teleport other players")
-core.register_privilege("settime", "Can use /time")
-core.register_privilege("privs", "Can modify privileges")
+core.register_privilege("shout", "Can speak in chat")
 core.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges")
-core.register_privilege("server", "Can do server maintenance stuff")
+core.register_privilege("privs", "Can modify privileges")
+
+core.register_privilege("teleport", {
+	description = "Can use /teleport command",
+	give_to_singleplayer = false,
+})
+core.register_privilege("bring", {
+	description = "Can teleport other players",
+	give_to_singleplayer = false,
+})
+core.register_privilege("settime", {
+	description = "Can use /time",
+	give_to_singleplayer = false,
+})
+core.register_privilege("server", {
+	description = "Can do server maintenance stuff",
+	give_to_singleplayer = false,
+})
 core.register_privilege("protection_bypass", {
 	description = "Can bypass node protection in the world",
 	give_to_singleplayer = false,
 })
-core.register_privilege("shout", "Can speak in chat")
-core.register_privilege("ban", "Can ban and unban players")
-core.register_privilege("kick", "Can kick players")
-core.register_privilege("give", "Can use /give and /giveme")
-core.register_privilege("password", "Can use /setpassword and /clearpassword")
+core.register_privilege("ban", {
+	description = "Can ban and unban players",
+	give_to_singleplayer = false,
+})
+core.register_privilege("kick", {
+	description = "Can kick players",
+	give_to_singleplayer = false,
+})
+core.register_privilege("give", {
+	description = "Can use /give and /giveme",
+	give_to_singleplayer = false,
+})
+core.register_privilege("password", {
+	description = "Can use /setpassword and /clearpassword",
+	give_to_singleplayer = false,
+})
 core.register_privilege("fly", {
 	description = "Can fly using the free_move mode",
 	give_to_singleplayer = false,
@@ -53,7 +78,10 @@ core.register_privilege("noclip", {
 	description = "Can fly through walls",
 	give_to_singleplayer = false,
 })
-core.register_privilege("rollback", "Can use the rollback functionality")
+core.register_privilege("rollback", {
+	description = "Can use the rollback functionality",
+	give_to_singleplayer = false,
+})
 core.register_privilege("zoom", {
 	description = "Can zoom the camera",
 	give_to_singleplayer = false,

From 3c5da70d7cfafe52f286bbe9a36ea7c04e92bf9f Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 6 Nov 2016 09:10:05 +0000
Subject: [PATCH 287/418] Builtin/../falling: Fix bugs caused by 'ignore' nodes

Original commit by t4im, rebased and developed by paramat.
Fix CONTENT_IGNORE being replaced by falling nodes or causing large
areas of sand to collapse into itself.
Format some conditional code for clarity.
Add and clarify some comments.
---
 builtin/game/falling.lua | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 5244ee782..1932b170a 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -46,15 +46,17 @@ core.register_entity(":__builtin:falling_node", {
 		if not vector.equals(acceleration, {x = 0, y = -10, z = 0}) then
 			self.object:setacceleration({x = 0, y = -10, z = 0})
 		end
-		-- Turn to actual sand when collides to ground or just move
+		-- Turn to actual node when colliding with ground, or continue to move
 		local pos = self.object:getpos()
-		local bcp = {x = pos.x, y = pos.y - 0.7, z = pos.z} -- Position of bottom center point
-		local bcn = core.get_node(bcp)
-		local bcd = core.registered_nodes[bcn.name]
-		-- Note: walkable is in the node definition, not in item groups
-		if not bcd or bcd.walkable or
+		-- Position of bottom center point
+		local bcp = {x = pos.x, y = pos.y - 0.7, z = pos.z}
+		-- Avoid bugs caused by an unloaded node below
+		local bcn = core.get_node_or_nil(bcp)
+		local bcd = bcn and core.registered_nodes[bcn.name]
+		if bcn and
+				(not bcd or bcd.walkable or
 				(core.get_item_group(self.node.name, "float") ~= 0 and
-				bcd.liquidtype ~= "none") then
+				bcd.liquidtype ~= "none")) then
 			if bcd and bcd.leveled and
 					bcn.name == self.node.name then
 				local addlevel = self.node.level
@@ -154,16 +156,19 @@ function nodeupdate_single(p)
 	local n = core.get_node(p)
 	if core.get_item_group(n.name, "falling_node") ~= 0 then
 		local p_bottom = {x = p.x, y = p.y - 1, z = p.z}
-		local n_bottom = core.get_node(p_bottom)
-		local d_bottom = core.registered_nodes[n_bottom.name]
-		-- Note: walkable is in the node definition, not in item groups
+		-- Only spawn falling node if node below is loaded
+		local n_bottom = core.get_node_or_nil(p_bottom)
+		local d_bottom = n_bottom and core.registered_nodes[n_bottom.name]
 		if d_bottom and
+
 				(core.get_item_group(n.name, "float") == 0 or
-					d_bottom.liquidtype == "none") and
+				d_bottom.liquidtype == "none") and
+
 				(n.name ~= n_bottom.name or (d_bottom.leveled and
-					core.get_node_level(p_bottom) < core.get_node_max_level(p_bottom))) and
-				(not d_bottom.walkable or
-					d_bottom.buildable_to) then
+				core.get_node_level(p_bottom) <
+				core.get_node_max_level(p_bottom))) and
+
+				(not d_bottom.walkable or d_bottom.buildable_to) then
 			n.level = core.get_node_level(p)
 			core.remove_node(p)
 			spawn_falling_node(p, n)

From 45eab340b90e54134a6f1cde3314c10cce08820b Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Sun, 6 Nov 2016 21:30:49 -0800
Subject: [PATCH 288/418] Don't use reduced vertical limits for mapblock send
 and generation

---
 src/clientiface.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 7dce77cd7..4b9efcb49 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -235,16 +235,6 @@ void RemoteClient::GetNextBlocks (
 			// If this is true, inexistent block will be made from scratch
 			bool generate = d <= d_max_gen;
 
-			{
-				/*// Limit the generating area vertically to 2/3
-				if(abs(p.Y - center.Y) > d_max_gen - d_max_gen / 3)
-					generate = false;*/
-
-				// Limit the send area vertically to 1/2
-				if (abs(p.Y - center.Y) > full_d_max / 2)
-					continue;
-			}
-
 			/*
 				Don't generate or send if not in sight
 				FIXME This only works if the client uses a small enough

From 2b21cac1d80454bd23c5f60c4570b30edba62584 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Fri, 4 Nov 2016 00:13:17 -0700
Subject: [PATCH 289/418] Occlusion culling: Fix 'end offset' distance, half
 this for centre point

'endoff', the maximum diagonal of a mapblock, was incorrectly calculated.
Half this value for the centre point of the mapblock.
---
 src/clientmap.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index 60170ab70..1d856520b 100644
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -293,13 +293,14 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver)
 			float step = BS * 1;
 			float stepfac = 1.1;
 			float startoff = BS * 1;
-			float endoff = -BS*MAP_BLOCKSIZE * 1.42 * 1.42;
+			// - Length of the diagonal of a mapblock.
+			float endoff = -BS * MAP_BLOCKSIZE * 1.732050807569;
 			v3s16 spn = cam_pos_nodes + v3s16(0, 0, 0);
 			s16 bs2 = MAP_BLOCKSIZE / 2 + 1;
 			u32 needed_count = 1;
 			if (occlusion_culling_enabled &&
 					isOccluded(this, spn, cpn + v3s16(0, 0, 0),
-						step, stepfac, startoff, endoff, needed_count, nodemgr) &&
+						step, stepfac, startoff, endoff / 2, needed_count, nodemgr) &&
 					isOccluded(this, spn, cpn + v3s16(bs2,bs2,bs2),
 						step, stepfac, startoff, endoff, needed_count, nodemgr) &&
 					isOccluded(this, spn, cpn + v3s16(bs2,bs2,-bs2),

From e7c62edec90c476b54ea7cf7c44354f1609e4575 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Fri, 4 Nov 2016 00:14:07 -0700
Subject: [PATCH 290/418] Retrieve mapblocks from the server in a sphere, not a
 cube

Use unused range argument in 'isBlockInSight()' to limit mapblock sends
to a sphere of radius 'max block send distance'.
---
 src/clientiface.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 4b9efcb49..7e75c69a4 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -175,6 +175,7 @@ void RemoteClient::GetNextBlocks (
 
 	const s16 full_d_max = g_settings->getS16("max_block_send_distance");
 	const s16 d_opt = g_settings->getS16("block_send_optimize_distance");
+	const s16 d_blocks_in_sight = (full_d_max + 1) * BS * MAP_BLOCKSIZE;
 
 	s16 d_max = full_d_max;
 	s16 d_max_gen = g_settings->getS16("max_block_generate_distance");
@@ -242,7 +243,7 @@ void RemoteClient::GetNextBlocks (
 			*/
 
 			float camera_fov = (72.0*M_PI/180) * 4./3.;
-			if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, 10000*BS) == false)
+			if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, d_blocks_in_sight) == false)
 			{
 				continue;
 			}

From 739ef175aa804650ce4f25dfb3cf375d38517660 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Sun, 6 Nov 2016 22:01:21 -0800
Subject: [PATCH 291/418] Sky: Draw bottom of the sky box in 'cloudy fog color'

To be identical to the lower half of the skybox sides.
Now needed as the skybox base is often seen due to increasingly vertical
mapgens.
---
 src/sky.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/sky.cpp b/src/sky.cpp
index 64f8cb5e7..211a2dcdc 100644
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -232,6 +232,14 @@ void Sky::render()
 			driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
 		}
 
+		// Draw bottom far cloudy fog thing
+		video::SColor c = cloudyfogcolor;
+		vertices[0] = video::S3DVertex(-1, -1.0, -1, 0, 1, 0, c, t, t);
+		vertices[1] = video::S3DVertex( 1, -1.0, -1, 0, 1, 0, c, o, t);
+		vertices[2] = video::S3DVertex( 1, -1.0, 1, 0, 1, 0, c, o, o);
+		vertices[3] = video::S3DVertex(-1, -1.0, 1, 0, 1, 0, c, t, o);
+		driver->drawIndexedTriangleFan(&vertices[0], 4, indices, 2);
+
 		driver->setMaterial(m_materials[2]);
 
 		// Draw sunrise/sunset horizon glow texture (textures/base/pack/sunrisebg.png)

From c79370023b322df2195f80a2f2d2b5b142add2bb Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Mon, 7 Nov 2016 20:44:40 -0800
Subject: [PATCH 292/418] Conf.example: Document block_send_optimize_distance

Add missing documentation.
---
 minetest.conf.example | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/minetest.conf.example b/minetest.conf.example
index b7d705bac..02f31779f 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -945,6 +945,14 @@
 #    type: integer
 # chat_message_limit_trigger_kick = 50
 
+#    At this distance the server will aggressively optimize which blocks are sent to clients.
+#    Small values potentially improve performance a lot, at the expense of visible rendering glitches.
+#    (some blocks will not be rendered under water and in caves, as well as sometimes on land)
+#    Setting this to a value greater than max_block_send_distance disables this optimization.
+#    Stated in mapblocks (16 nodes)
+#    type: int
+# block_send_optimize_distance = 4
+
 ### Physics
 
 #    type: float

From c05aac3766e88530fcf5d38a8c25c994b792b324 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Tue, 8 Nov 2016 16:07:56 +0000
Subject: [PATCH 293/418] Occlusion culling: Add comments, minor code
 improvements

Remove unnecessary code.
Use '/ 2.0f' because endoff is a float.
---
 src/clientmap.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index 1d856520b..8691cc0b2 100644
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -293,14 +293,19 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver)
 			float step = BS * 1;
 			float stepfac = 1.1;
 			float startoff = BS * 1;
-			// - Length of the diagonal of a mapblock.
+			// The occlusion search of 'isOccluded()' must stop short of the target
+			// point by distance 'endoff' (end offset) to not enter the target mapblock.
+			// For the 8 mapblock corners 'endoff' must therefore be the maximum diagonal
+			// of a mapblock, because we must consider all view angles.
+			// sqrt(1^2 + 1^2 + 1^2) = 1.732
 			float endoff = -BS * MAP_BLOCKSIZE * 1.732050807569;
-			v3s16 spn = cam_pos_nodes + v3s16(0, 0, 0);
+			v3s16 spn = cam_pos_nodes;
 			s16 bs2 = MAP_BLOCKSIZE / 2 + 1;
 			u32 needed_count = 1;
 			if (occlusion_culling_enabled &&
-					isOccluded(this, spn, cpn + v3s16(0, 0, 0),
-						step, stepfac, startoff, endoff / 2, needed_count, nodemgr) &&
+					// For the central point of the mapblock 'endoff' can be halved
+					isOccluded(this, spn, cpn,
+						step, stepfac, startoff, endoff / 2.0f, needed_count, nodemgr) &&
 					isOccluded(this, spn, cpn + v3s16(bs2,bs2,bs2),
 						step, stepfac, startoff, endoff, needed_count, nodemgr) &&
 					isOccluded(this, spn, cpn + v3s16(bs2,bs2,-bs2),

From 7e17eaedb2e697581ace1bd038781f908e19a985 Mon Sep 17 00:00:00 2001
From: Rogier-5 <rogier777@gmail.com>
Date: Thu, 10 Nov 2016 13:42:49 +0100
Subject: [PATCH 294/418] Fix mob deserialization errors in the client (#4743)

The problem was seen while using the mobf mod package.

The problem happens when the server serializes entity attachments.
Sometimes, such attachments no longer exist. The serialization code
skips those. However, the total number of attachments was serialized
earlier.  Therefore the client expects more than it gets, and logs a
serialization error.
---
 src/content_sao.cpp | 48 ++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index dff222f42..6caea5198 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -383,23 +383,30 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 		writeF1000(os, m_yaw);
 		writeS16(os, m_hp);
 
-		writeU8(os, 4 + m_bone_position.size() + m_attachment_child_ids.size()); // number of messages stuffed in here
-		os<<serializeLongString(getPropertyPacket()); // message 1
-		os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
-		os<<serializeLongString(gob_cmd_update_animation(
+		std::ostringstream msg_os(std::ios::binary);
+		msg_os << serializeLongString(getPropertyPacket()); // message 1
+		msg_os << serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
+		msg_os << serializeLongString(gob_cmd_update_animation(
 			m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
 		for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
 				ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
-			os << serializeLongString(gob_cmd_update_bone_position((*ii).first,
+			msg_os << serializeLongString(gob_cmd_update_bone_position((*ii).first,
 					(*ii).second.X, (*ii).second.Y)); // m_bone_position.size
 		}
-		os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
+		msg_os << serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id,
+			m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
+		int message_count = 4 + m_bone_position.size();
 		for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin();
 				(ii != m_attachment_child_ids.end()); ++ii) {
 			if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
-				os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
+				message_count++;
+				msg_os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(),
+					obj->getClientInitializationData(protocol_version)));
 			}
 		}
+
+		writeU8(os, message_count);
+		os.write(msg_os.str().c_str(), msg_os.str().size());
 	}
 	else
 	{
@@ -865,26 +872,35 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 		writeF1000(os, m_yaw);
 		writeS16(os, getHP());
 
-		writeU8(os, 6 + m_bone_position.size() + m_attachment_child_ids.size()); // number of messages stuffed in here
-		os<<serializeLongString(getPropertyPacket()); // message 1
-		os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
-		os<<serializeLongString(gob_cmd_update_animation(
+		std::ostringstream msg_os(std::ios::binary);
+		msg_os << serializeLongString(getPropertyPacket()); // message 1
+		msg_os << serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
+		msg_os << serializeLongString(gob_cmd_update_animation(
 			m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
 		for (UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
 				ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
-			os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
+			msg_os << serializeLongString(gob_cmd_update_bone_position((*ii).first,
+				(*ii).second.X, (*ii).second.Y)); // m_bone_position.size
 		}
-		os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
-		os<<serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed,
+		msg_os << serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id,
+			m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
+		msg_os << serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed,
 				m_physics_override_jump, m_physics_override_gravity, m_physics_override_sneak,
 				m_physics_override_sneak_glitch)); // 5
-		os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6 (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
+		// (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
+		msg_os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6
+		int message_count = 6 + m_bone_position.size();
 		for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin();
 				ii != m_attachment_child_ids.end(); ++ii) {
 			if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
-				os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
+				message_count++;
+				msg_os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(),
+					obj->getClientInitializationData(protocol_version)));
 			}
 		}
+
+		writeU8(os, message_count);
+		os.write(msg_os.str().c_str(), msg_os.str().size());
 	}
 	else
 	{

From b98f98b367f2c55d5a0bff4bafaaa183b3746403 Mon Sep 17 00:00:00 2001
From: Rogier-5 <rogier777@gmail.com>
Date: Fri, 11 Nov 2016 09:30:37 +0100
Subject: [PATCH 295/418] Fix incorrect distance computation for visible blocks
 (#4765)

The client would not compute the distance from the camera to
to a mapblock correctly. The result was that blocks that were in
view (i.e. not beyond the fog limit) would not be rendered.

With the improved distance computation, a range adjustment that
existed in clientiface.cpp is no longer required.
---
 src/clientiface.cpp  |  2 +-
 src/util/numeric.cpp | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 7e75c69a4..bdc16f31c 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -175,7 +175,7 @@ void RemoteClient::GetNextBlocks (
 
 	const s16 full_d_max = g_settings->getS16("max_block_send_distance");
 	const s16 d_opt = g_settings->getS16("block_send_optimize_distance");
-	const s16 d_blocks_in_sight = (full_d_max + 1) * BS * MAP_BLOCKSIZE;
+	const s16 d_blocks_in_sight = full_d_max * BS * MAP_BLOCKSIZE;
 
 	s16 d_max = full_d_max;
 	s16 d_max_gen = g_settings->getS16("max_block_generate_distance");
diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp
index 6a7bfcac9..a9e7ae584 100644
--- a/src/util/numeric.cpp
+++ b/src/util/numeric.cpp
@@ -188,14 +188,19 @@ u64 murmur_hash_64_ua(const void *key, int len, unsigned int seed)
 }
 
 /*
-	blockpos: position of block in block coordinates
+	blockpos_b: position of block in block coordinates
 	camera_pos: position of camera in nodes
 	camera_dir: an unit vector pointing to camera direction
 	range: viewing range
+	distance_ptr: return location for distance from the camera
 */
 bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
 		f32 camera_fov, f32 range, f32 *distance_ptr)
 {
+	// Maximum radius of a block.  The magic number is
+	// sqrt(3.0) / 2.0 in literal form.
+	const f32 block_max_radius = 0.866025403784 * MAP_BLOCKSIZE * BS;
+
 	v3s16 blockpos_nodes = blockpos_b * MAP_BLOCKSIZE;
 
 	// Block center position
@@ -209,7 +214,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
 	v3f blockpos_relative = blockpos - camera_pos;
 
 	// Total distance
-	f32 d = blockpos_relative.getLength();
+	f32 d = MYMAX(0, blockpos_relative.getLength() - block_max_radius);
 
 	if(distance_ptr)
 		*distance_ptr = d;
@@ -218,13 +223,9 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
 	if(d > range)
 		return false;
 
-	// Maximum radius of a block.  The magic number is
-	// sqrt(3.0) / 2.0 in literal form.
-	f32 block_max_radius = 0.866025403784 * MAP_BLOCKSIZE * BS;
-
 	// If block is (nearly) touching the camera, don't
 	// bother validating further (that is, render it anyway)
-	if(d < block_max_radius)
+	if(d == 0)
 		return true;
 
 	// Adjust camera position, for purposes of computing the angle,

From 8a1a9fdc24d29419422f0fb41095fd0388c4be9e Mon Sep 17 00:00:00 2001
From: lisacvuk <lisacvukhome@gmail.com>
Date: Fri, 11 Nov 2016 12:16:34 +0100
Subject: [PATCH 296/418] Fixed tooltips not resizing with \n (#4766)

* Fixed tooltips not resizing with \n

* Fixed it for 1.8.4 too.

* Fixed not working with Freetype disabled.

* Modified it to use Zeno-'s solution.
---
 src/guiFormSpecMenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 73388114b..981a8edba 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -2314,7 +2314,7 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase,
 				this->bringToFront(m_tooltip_element);
 				setStaticText(m_tooltip_element, tooltip_text.c_str());
 				s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height;
-#if IRRLICHT_VERSION_MAJOR <= 1 && IRRLICHT_VERSION_MINOR <= 8 && IRRLICHT_VERSION_REVISION < 2
+#if (IRRLICHT_VERSION_MAJOR <= 1 && IRRLICHT_VERSION_MINOR <= 8 && IRRLICHT_VERSION_REVISION < 2) || USE_FREETYPE == 1
 				s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5;
 #else
 				s32 tooltip_height = m_tooltip_element->getTextHeight() + 5;

From 68f5b877c72cf91106ac343673f8a31b9712a470 Mon Sep 17 00:00:00 2001
From: RealBadAngel <maciej.kasatkin@o2.pl>
Date: Sun, 21 Feb 2016 06:50:41 +0100
Subject: [PATCH 297/418] Halo: Highlight selected face

This is a slightly modified and cleaned up version of #3774 by RealBadAngel.
By sofar: Remove color change (just make it lighter) and some minor cleanups.
---
 src/game.cpp                |   2 ++
 src/hud.cpp                 |   6 ++++++
 src/hud.h                   |   9 +++++++--
 src/mesh.cpp                |  20 ++++++++++++++++++++
 src/mesh.h                  |   4 ++++
 textures/base/pack/halo.png | Bin 144 -> 144 bytes
 6 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 33795abc5..e0ffa1be5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -362,6 +362,7 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio
 
 			min_distance = (selected_object->getPosition() - camera_position).getLength();
 
+			hud->setSelectedFaceNormal(v3f(0.0, 0.0, 0.0));
 			result.type = POINTEDTHING_OBJECT;
 			result.object_id = selected_object->getId();
 		}
@@ -473,6 +474,7 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio
 				if (!facebox.intersectsWithLine(shootline))
 					continue;
 				result.node_abovesurface = pointed_pos + facedir;
+				hud->setSelectedFaceNormal(v3f(facedir.X, facedir.Y, facedir.Z));
 				face_min_distance = distance;
 			}
 		}
diff --git a/src/hud.cpp b/src/hud.cpp
index 19feaef7b..43d957380 100644
--- a/src/hud.cpp
+++ b/src/hud.cpp
@@ -544,6 +544,12 @@ void Hud::drawSelectionMesh()
 		video::SMaterial oldmaterial = driver->getMaterial2D();
 		driver->setMaterial(m_selection_material);
 		setMeshColor(m_selection_mesh, m_selection_mesh_color);
+		video::SColor face_color(0,
+			MYMIN(255, m_selection_mesh_color.getRed() * 1.5),
+			MYMIN(255, m_selection_mesh_color.getGreen() * 1.5),
+			MYMIN(255, m_selection_mesh_color.getBlue() * 1.5));
+		setMeshColorByNormal(m_selection_mesh, m_selected_face_normal,
+			face_color);
 		scene::IMesh* mesh = cloneMesh(m_selection_mesh);
 		translateMesh(mesh, m_selection_pos_with_offset);
 		u32 mc = m_selection_mesh->getMeshBufferCount();
diff --git a/src/hud.h b/src/hud.h
index 7f0fbe7b3..a4d7990e9 100644
--- a/src/hud.h
+++ b/src/hud.h
@@ -139,8 +139,11 @@ public:
 	v3f getSelectionPos() const
 	{ return m_selection_pos; }
 
-	void setSelectionMeshColor(const video::SColor &c)
-	{ m_selection_mesh_color = c; }
+	void setSelectionMeshColor(const video::SColor &color)
+	{ m_selection_mesh_color = color; }
+
+	void setSelectedFaceNormal(const v3f &face_normal)
+	{ m_selected_face_normal = face_normal; }
 
 	void drawLuaElements(const v3s16 &camera_offset);
 
@@ -169,6 +172,8 @@ private:
 
 	scene::IMesh* m_selection_mesh;
 	video::SColor m_selection_mesh_color;
+	v3f m_selected_face_normal;
+
 	video::SMaterial m_selection_material;
 	bool m_use_selection_mesh;
 };
diff --git a/src/mesh.cpp b/src/mesh.cpp
index b5bf8660a..b68862d22 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -226,7 +226,27 @@ void setMeshColorByNormalXYZ(scene::IMesh *mesh,
 				vertex->Color = colorY;
 			else
 				vertex->Color = colorZ;
+		}
+	}
+}
 
+void setMeshColorByNormal(scene::IMesh *mesh, const v3f &normal,
+		const video::SColor &color)
+{
+	if (!mesh)
+		return;
+
+	u16 mc = mesh->getMeshBufferCount();
+	for (u16 j = 0; j < mc; j++) {
+		scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
+		const u32 stride = getVertexPitchFromType(buf->getVertexType());
+		u32 vertex_count = buf->getVertexCount();
+		u8 *vertices = (u8 *)buf->getVertices();
+		for (u32 i = 0; i < vertex_count; i++) {
+			video::S3DVertex *vertex = (video::S3DVertex *)(vertices + i * stride);
+			if (normal == vertex->Normal) {
+				vertex->Color = color;
+			}
 		}
 	}
 }
diff --git a/src/mesh.h b/src/mesh.h
index 8e1893773..10df97015 100644
--- a/src/mesh.h
+++ b/src/mesh.h
@@ -64,6 +64,10 @@ void setMeshColorByNormalXYZ(scene::IMesh *mesh,
 		const video::SColor &colorX,
 		const video::SColor &colorY,
 		const video::SColor &colorZ);
+
+void setMeshColorByNormal(scene::IMesh *mesh, const v3f &normal,
+		const video::SColor &color);
+
 /*
 	Rotate the mesh by 6d facedir value.
 	Method only for meshnodes, not suitable for entities.
diff --git a/textures/base/pack/halo.png b/textures/base/pack/halo.png
index eaea782da6480cd7996367a1a10785db6f5933cb..ed3ff9d8c856f3fb8758f75f665b4e04a42d6605 100644
GIT binary patch
delta 68
zcmbQhIDv6Ou&pR7gTgPP<!2Ze7-T(N978NlCx40iu(q#}>A(>OMG4b{D-D6nY~73u
Y50#ke59Y7U2P$OnboFyt=akR{03(?fPXGV_

delta 68
zcmbQhIDv6Ouq`{2m1tSH2|EJ=gRG~EV~EA+<S%g_a`~898#)`E46+WaU|h_`BgV`S
XHIr$sLFfGxph5;uS3j3^P6<r_qP-MK


From 67ec2fa92d7441e0dab0fdc222003e916f3b5efa Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Tue, 8 Nov 2016 18:12:24 +0000
Subject: [PATCH 298/418] Nodeupdate: Remove documentation in lua_api.txt

In preparation for nodeupdate being renamed and made official API
in future.
---
 doc/lua_api.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 119e69f6f..b9208dbad 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2286,11 +2286,6 @@ and `minetest.auth_reload` call the authetification handler.
     * increase level of leveled node by level, default `level` equals `1`
     * if `totallevel > maxlevel`, returns rest (`total-max`)
     * can be negative for decreasing
-* `nodeupdate_single(pos)`
-    * causes an unsupported `group:falling_node` node to fall and causes an
-      unattached `group:attached_node` node to fall.
-    * does not spread these updates to neighbours
-    * a helper function, not officially part of the API, but useful
 
 ### Inventory
 `minetest.get_inventory(location)`: returns an `InvRef`

From e4031156f13d062b03960e7ef1c9221f749f884b Mon Sep 17 00:00:00 2001
From: raymoo <raymoo@users.noreply.github.com>
Date: Fri, 11 Nov 2016 23:22:39 -0800
Subject: [PATCH 299/418] Add control information to player interacts (#4685)

---
 src/client.cpp                      | 52 ++++++++++++++--------
 src/network/networkpacket.h         |  1 +
 src/network/serverpackethandler.cpp | 68 ++++++++++++++++-------------
 src/server.h                        |  4 ++
 4 files changed, 76 insertions(+), 49 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 62bd274aa..3726f5bc4 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -929,6 +929,30 @@ void Client::Send(NetworkPacket* pkt)
 		serverCommandFactoryTable[pkt->getCommand()].reliable);
 }
 
+// Will fill up 12 + 12 + 4 + 4 + 4 bytes
+void writePlayerPos(LocalPlayer *myplayer, NetworkPacket *pkt)
+{
+	v3f pf         = myplayer->getPosition() * 100;
+	v3f sf         = myplayer->getSpeed() * 100;
+	s32 pitch      = myplayer->getPitch() * 100;
+	s32 yaw        = myplayer->getYaw() * 100;
+	u32 keyPressed = myplayer->keyPressed;
+
+	v3s32 position(pf.X, pf.Y, pf.Z);
+	v3s32 speed(sf.X, sf.Y, sf.Z);
+
+	/*
+		Format:
+		[0] v3s32 position*100
+		[12] v3s32 speed*100
+		[12+12] s32 pitch*100
+		[12+12+4] s32 yaw*100
+		[12+12+4+4] u32 keyPressed
+	*/
+
+	*pkt << position << speed << pitch << yaw << keyPressed;
+}
+
 void Client::interact(u8 action, const PointedThing& pointed)
 {
 	if(m_state != LC_Ready) {
@@ -938,12 +962,17 @@ void Client::interact(u8 action, const PointedThing& pointed)
 		return;
 	}
 
+	LocalPlayer *myplayer = m_env.getLocalPlayer();
+	if (myplayer == NULL)
+		return;
+
 	/*
 		[0] u16 command
 		[2] u8 action
 		[3] u16 item
-		[5] u32 length of the next item
+		[5] u32 length of the next item (plen)
 		[9] serialized PointedThing
+		[9 + plen] player position information
 		actions:
 		0: start digging (from undersurface) or use
 		1: stop digging (all parameters ignored)
@@ -963,6 +992,8 @@ void Client::interact(u8 action, const PointedThing& pointed)
 
 	pkt.putLongString(tmp_os.str());
 
+	writePlayerPos(myplayer, &pkt);
+
 	Send(&pkt);
 }
 
@@ -1291,26 +1322,9 @@ void Client::sendPlayerPos()
 
 	assert(myplayer->peer_id == our_peer_id);
 
-	v3f pf         = myplayer->getPosition();
-	v3f sf         = myplayer->getSpeed();
-	s32 pitch      = myplayer->getPitch() * 100;
-	s32 yaw        = myplayer->getYaw() * 100;
-	u32 keyPressed = myplayer->keyPressed;
-
-	v3s32 position(pf.X*100, pf.Y*100, pf.Z*100);
-	v3s32 speed(sf.X*100, sf.Y*100, sf.Z*100);
-	/*
-		Format:
-		[0] v3s32 position*100
-		[12] v3s32 speed*100
-		[12+12] s32 pitch*100
-		[12+12+4] s32 yaw*100
-		[12+12+4+4] u32 keyPressed
-	*/
-
 	NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4);
 
-	pkt << position << speed << pitch << yaw << keyPressed;
+	writePlayerPos(myplayer, &pkt);
 
 	Send(&pkt);
 }
diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
index 72f8cabe2..524470999 100644
--- a/src/network/networkpacket.h
+++ b/src/network/networkpacket.h
@@ -40,6 +40,7 @@ public:
 		u32 getSize() { return m_datasize; }
 		u16 getPeerId() { return m_peer_id; }
 		u16 getCommand() { return m_command; }
+		const u32 getRemainingBytes() const { return m_datasize - m_read_offset; }
 
 		// Returns a c-string without copying.
 		// A better name for this would be getRawString()
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 80eec140d..d56424b75 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -774,9 +774,10 @@ void Server::handleCommand_GotBlocks(NetworkPacket* pkt)
 	}
 }
 
-void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
+void Server::process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
+	NetworkPacket *pkt)
 {
-	if (pkt->getSize() < 12 + 12 + 4 + 4)
+	if (pkt->getRemainingBytes() < 12 + 12 + 4 + 4)
 		return;
 
 	v3s32 ps, ss;
@@ -791,7 +792,7 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
 	f32 yaw = (f32)f32yaw / 100.0;
 	u32 keyPressed = 0;
 
-	if (pkt->getSize() >= 12 + 12 + 4 + 4 + 4)
+	if (pkt->getRemainingBytes() >= 4)
 		*pkt >> keyPressed;
 
 	v3f position((f32)ps.X / 100.0, (f32)ps.Y / 100.0, (f32)ps.Z / 100.0);
@@ -800,6 +801,30 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
 	pitch = modulo360f(pitch);
 	yaw = modulo360f(yaw);
 
+	playersao->setBasePosition(position);
+	player->setSpeed(speed);
+	playersao->setPitch(pitch);
+	playersao->setYaw(yaw);
+	player->keyPressed = keyPressed;
+	player->control.up = (keyPressed & 1);
+	player->control.down = (keyPressed & 2);
+	player->control.left = (keyPressed & 4);
+	player->control.right = (keyPressed & 8);
+	player->control.jump = (keyPressed & 16);
+	player->control.aux1 = (keyPressed & 32);
+	player->control.sneak = (keyPressed & 64);
+	player->control.LMB = (keyPressed & 128);
+	player->control.RMB = (keyPressed & 256);
+
+	if (playersao->checkMovementCheat()) {
+		// Call callbacks
+		m_script->on_cheat(playersao, "moved_too_fast");
+		SendMovePlayer(pkt->getPeerId());
+	}
+}
+
+void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
+{
 	RemotePlayer *player = m_env->getPlayer(pkt->getPeerId());
 	if (player == NULL) {
 		errorstream << "Server::ProcessData(): Canceling: "
@@ -825,26 +850,7 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
 		return;
 	}
 
-	playersao->setBasePosition(position);
-	player->setSpeed(speed);
-	playersao->setPitch(pitch);
-	playersao->setYaw(yaw);
-	player->keyPressed = keyPressed;
-	player->control.up = (keyPressed & 1);
-	player->control.down = (keyPressed & 2);
-	player->control.left = (keyPressed & 4);
-	player->control.right = (keyPressed & 8);
-	player->control.jump = (keyPressed & 16);
-	player->control.aux1 = (keyPressed & 32);
-	player->control.sneak = (keyPressed & 64);
-	player->control.LMB = (keyPressed & 128);
-	player->control.RMB = (keyPressed & 256);
-
-	if (playersao->checkMovementCheat()) {
-		// Call callbacks
-		m_script->on_cheat(playersao, "moved_too_fast");
-		SendMovePlayer(pkt->getPeerId());
-	}
+	process_PlayerPos(player, playersao, pkt);
 }
 
 void Server::handleCommand_DeletedBlocks(NetworkPacket* pkt)
@@ -1281,15 +1287,13 @@ void Server::handleCommand_Respawn(NetworkPacket* pkt)
 
 void Server::handleCommand_Interact(NetworkPacket* pkt)
 {
-	std::string datastring(pkt->getString(0), pkt->getSize());
-	std::istringstream is(datastring, std::ios_base::binary);
-
 	/*
 		[0] u16 command
 		[2] u8 action
 		[3] u16 item
-		[5] u32 length of the next item
+		[5] u32 length of the next item (plen)
 		[9] serialized PointedThing
+		[9 + plen] player position information
 		actions:
 		0: start digging (from undersurface) or use
 		1: stop digging (all parameters ignored)
@@ -1297,9 +1301,11 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 		3: place block or item (to abovesurface)
 		4: use item
 	*/
-	u8 action = readU8(is);
-	u16 item_i = readU16(is);
-	std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+	u8 action;
+	u16 item_i;
+	*pkt >> action;
+	*pkt >> item_i;
+	std::istringstream tmp_is(pkt->readLongString(), std::ios::binary);
 	PointedThing pointed;
 	pointed.deSerialize(tmp_is);
 
@@ -1331,6 +1337,8 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 		return;
 	}
 
+	process_PlayerPos(player, playersao, pkt);
+
 	v3f player_pos = playersao->getLastGoodPosition();
 
 	// Update wielded item
diff --git a/src/server.h b/src/server.h
index f8b3ec106..9e844e36c 100644
--- a/src/server.h
+++ b/src/server.h
@@ -197,6 +197,10 @@ public:
 
 	void Send(NetworkPacket* pkt);
 
+	// Helper for handleCommand_PlayerPos and handleCommand_Interact
+	void process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
+		NetworkPacket *pkt);
+
 	// Both setter and getter need no envlock,
 	// can be called freely from threads
 	void setTimeOfDay(u32 time);

From 1980d9ea31e969c5b604f6ee01693cbcfc2c795a Mon Sep 17 00:00:00 2001
From: Rogier <rogier777@gmail.com>
Date: Sun, 6 Nov 2016 16:18:29 +0100
Subject: [PATCH 300/418] Fix crash when attached object no longer exists

Active objects that are attached to other objects are not safe
from deletion. As a result, the parent object may have a reference
to an id of a child's that no longer exists.

If at some point an attempt is made to manipulate the child,
enviromment->getActiveObject(child-id) returns NULL. Using the
NULL pointer causes the crash...
---
 src/script/lua_api/l_object.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 42395717f..2a8b8a64e 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -140,8 +140,9 @@ int ObjectRef::l_remove(lua_State *L)
 	UNORDERED_SET<int> child_ids = co->getAttachmentChildIds();
 	UNORDERED_SET<int>::iterator it;
 	for (it = child_ids.begin(); it != child_ids.end(); ++it) {
-		ServerActiveObject *child = env->getActiveObject(*it);
-		child->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0));
+		// Child can be NULL if it was deleted earlier
+		if (ServerActiveObject *child = env->getActiveObject(*it))
+			child->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0));
 	}
 
 	verbosestream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;

From 6707d622bbb298e4884eedc7791c81af1da43e92 Mon Sep 17 00:00:00 2001
From: Yutao Yuan <yyt16384@gmail.com>
Date: Sun, 9 Oct 2016 20:46:18 +0800
Subject: [PATCH 301/418] Install texture_packs.txt to DOCDIR

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbf6bb7fa..15b3fc33c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,6 +167,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}")
 install(FILES "README.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/menu_lua_api.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/texture_packs.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/world_format.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 

From 649448a2a91fbf3e944b2f2e739f4e2292af1df0 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Sat, 12 Nov 2016 10:55:26 +0100
Subject: [PATCH 302/418] Rename nodeupdate and nodeupdate_single and make them
 part of the official API

Now, the renamed forms of nodeupdate and nodeupdate_single are part of the official API.

As nodeupdate has been used by Minetest Game and in mods despite of not
being part of the official API, we ease the transition by still supporting
it for the 0.4.15 release. After the release, the two functions can be removed.

The removal will not violate the stability promise, as that promise only
includes the official and documented API.

Also, make some formerly global functions local. They most likely haven't
been used by mods, therefore they won't get stubs with deprecation warnings,
hard erroring directly.
---
 builtin/game/falling.lua | 46 +++++++++++++++++++++++++++-------------
 doc/lua_api.txt          |  9 ++++++++
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 1932b170a..ece08b325 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -98,7 +98,7 @@ core.register_entity(":__builtin:falling_node", {
 				core.add_node(np, self.node)
 			end
 			self.object:remove()
-			nodeupdate(np)
+			core.check_for_falling(np)
 			return
 		end
 		local vel = self.object:getvelocity()
@@ -109,12 +109,12 @@ core.register_entity(":__builtin:falling_node", {
 	end
 })
 
-function spawn_falling_node(p, node)
+local function spawn_falling_node(p, node)
 	local obj = core.add_entity(p, "__builtin:falling_node")
 	obj:get_luaentity():set_node(node)
 end
 
-function drop_attached_node(p)
+local function drop_attached_node(p)
 	local nn = core.get_node(p).name
 	core.remove_node(p)
 	for _, item in pairs(core.get_node_drops(nn, "")) do
@@ -127,7 +127,7 @@ function drop_attached_node(p)
 	end
 end
 
-function check_attached_node(p, n)
+local function check_attached_node(p, n)
 	local def = core.registered_nodes[n.name]
 	local d = {x = 0, y = 0, z = 0}
 	if def.paramtype2 == "wallmounted" then
@@ -152,7 +152,7 @@ end
 -- Some common functions
 --
 
-function nodeupdate_single(p)
+function core.check_single_for_falling(p)
 	local n = core.get_node(p)
 	if core.get_item_group(n.name, "falling_node") ~= 0 then
 		local p_bottom = {x = p.x, y = p.y - 1, z = p.z}
@@ -190,7 +190,7 @@ end
 -- We don't walk diagonals, only our direct neighbors, and self.
 -- Down first as likely case, but always before self. The same with sides.
 -- Up must come last, so that things above self will also fall all at once.
-local nodeupdate_neighbors = {
+local check_for_falling_neighbors = {
 	{x = -1, y = -1, z = 0},
 	{x = 1, y = -1, z = 0},
 	{x = 0, y = -1, z = -1},
@@ -204,7 +204,7 @@ local nodeupdate_neighbors = {
 	{x = 0, y = 1, z = 0},
 }
 
-function nodeupdate(p)
+function core.check_for_falling(p)
 	-- Round p to prevent falling entities to get stuck.
 	p = vector.round(p)
 
@@ -223,10 +223,10 @@ function nodeupdate(p)
 		n = n + 1
 		s[n] = {p = p, v = v}
 		-- Select next node from neighbor list.
-		p = vector.add(p, nodeupdate_neighbors[v])
+		p = vector.add(p, check_for_falling_neighbors[v])
 		-- Now we check out the node. If it is in need of an update,
 		-- it will let us know in the return value (true = updated).
-		if not nodeupdate_single(p) then
+		if not core.check_single_for_falling(p) then
 			-- If we don't need to "recurse" (walk) to it then pop
 			-- our previous pos off the stack and continue from there,
 			-- with the v value we were at when we last were at that
@@ -258,17 +258,33 @@ end
 -- Global callbacks
 --
 
-function on_placenode(p, node)
-	nodeupdate(p)
+local function on_placenode(p, node)
+	core.check_for_falling(p)
 end
 core.register_on_placenode(on_placenode)
 
-function on_dignode(p, node)
-	nodeupdate(p)
+local function on_dignode(p, node)
+	core.check_for_falling(p)
 end
 core.register_on_dignode(on_dignode)
 
-function on_punchnode(p, node)
-	nodeupdate(p)
+local function on_punchnode(p, node)
+	core.check_for_falling(p)
 end
 core.register_on_punchnode(on_punchnode)
+
+--
+-- Globally exported functions
+--
+
+-- TODO remove this function after the 0.4.15 release
+function nodeupdate(p)
+	core.log("deprecated", "nodeupdate: deprecated, please use core.check_for_falling instead")
+	core.check_for_falling(p)
+end
+
+-- TODO remove this function after the 0.4.15 release
+function nodeupdate_single(p)
+	core.log("deprecated", "nodeupdate_single: deprecated, please use core.check_single_for_falling instead")
+	core.check_single_for_falling(p)
+end
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index b9208dbad..7d552c980 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2286,6 +2286,15 @@ and `minetest.auth_reload` call the authetification handler.
     * increase level of leveled node by level, default `level` equals `1`
     * if `totallevel > maxlevel`, returns rest (`total-max`)
     * can be negative for decreasing
+* `core.check_single_for_falling(pos)`
+    * causes an unsupported `group:falling_node` node to fall and causes an
+      unattached `group:attached_node` node to fall.
+    * does not spread these updates to neighbours.
+* `core.check_for_falling(pos)`
+    * causes an unsupported `group:falling_node` node to fall and causes an
+      unattached `group:attached_node` node to fall.
+    * spread these updates to neighbours and can cause a cascade
+      of nodes to fall.
 
 ### Inventory
 `minetest.get_inventory(location)`: returns an `InvRef`

From 93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Mon, 14 Nov 2016 18:09:59 +0400
Subject: [PATCH 303/418] Adding particle blend, glow and animation (#4705)

---
 builtin/common/misc_helpers.lua     |  37 +++++
 doc/lua_api.txt                     | 189 +++++++++++++++++++++++++-
 src/client.h                        |  18 +++
 src/network/clientpackethandler.cpp | 111 ++++++++++-----
 src/nodedef.cpp                     |   4 +-
 src/nodedef.h                       |  11 +-
 src/particles.cpp                   | 203 +++++++++++++++++++++++++---
 src/particles.h                     |  32 ++++-
 src/script/common/c_content.cpp     |  13 +-
 src/script/common/c_content.h       |   2 +-
 src/script/common/c_converter.cpp   |  22 +++
 src/script/common/c_converter.h     |   2 +
 src/script/lua_api/l_particles.cpp  | 166 ++++++++++++++++++++++-
 src/server.cpp                      |  44 +++++-
 src/server.h                        |  27 +++-
 15 files changed, 800 insertions(+), 81 deletions(-)

diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index c2dc7514d..a495058d9 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -237,6 +237,43 @@ function math.sign(x, tolerance)
 	return 0
 end
 
+--------------------------------------------------------------------------------
+-- Video enums and pack function
+
+-- E_BLEND_FACTOR
+minetest.ebf = {			     
+	zero			= 0, -- src & dest (0, 0, 0, 0)
+	one			= 1, -- src & dest (1, 1, 1, 1)
+	dst_color 		= 2, -- src (destR, destG, destB, destA)
+	one_minus_dst_color 	= 3, -- src (1-destR, 1-destG, 1-destB, 1-destA)
+	src_color 		= 4, -- dest (srcR, srcG, srcB, srcA)
+	one_minus_src_color 	= 5, -- dest (1-srcR, 1-srcG, 1-srcB, 1-srcA)
+	src_alpha 		= 6, -- src & dest (srcA, srcA, srcA, srcA)
+	one_minus_src_alpha 	= 7, -- src & dest (1-srcA, 1-srcA, 1-srcA, 1-srcA)
+	dst_alpha 		= 8, -- src & dest (destA, destA, destA, destA)
+	one_minus_dst_alpha 	= 9, -- src & dest (1-destA, 1-destA, 1-destA, 1-destA)
+	src_alpha_saturate  	= 10,-- src (min(srcA, 1-destA), idem, ...) 
+}
+
+-- E_MODULATE_FUNC
+minetest.emfn = {
+	modulate_1x    = 1,
+	modulate_2x    = 2,
+	modulate_4x    = 4,
+}
+
+-- E_ALPHA_SOURCE
+minetest.eas = {
+	none	 = 0,
+	vertex_color = 1,
+	texture	 = 2,
+}
+
+-- BlendFunc = source * sourceFactor + dest * destFactor
+function minetest.pack_texture_blend_func(srcFact, dstFact, modulate, alphaSource) 
+	return alphaSource * 4096 + modulate * 256 + srcFact * 16 + dstFact
+end
+
 --------------------------------------------------------------------------------
 function get_last_folder(text,count)
 	local parts = text:split(DIR_DELIM)
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 7d552c980..3b3f17634 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -414,6 +414,119 @@ the word "`alpha`", then each texture pixel will contain the RGB of
 `<color>` and the alpha of `<color>` multiplied by the alpha of the
 texture pixel.
 
+Particle blend
+--------------
+Blend function is defined by integer number.
+There is a huge number of acceptable blend modificators.
+Colour of a resulting pixel calculated using formulae:
+
+	red = source_red * source_factor + destination_red * destination_factor
+
+and so on for every channel.
+
+Here is a some examples:
+
+Default value:
+
+	material_type_param = 0,
+
+Use this value to disable blending. Texture will be applied to existing pixels
+using alpha channel of it. Its recomended to use 1-bit alpha
+in that case. This value will leave z-buffer writeable.
+
+Additive blend:
+
+	material_type_param = 12641,
+
+Source = src_alpha, destination = one, alpha source is a texture and 
+vertex_color, modulate_1x.
+Black color is completely transparent, white color is completely opaque.
+Alpha channel still used to calculate result color, but not nessesary.
+'destination = one' means that resulting color will be calculated using 
+overwritten pixels values.
+For example with color of source (our texture) RGBA = (0,192,255,63)
+"blue-cyan", 1/4 opaque.
+and already rendered pixel color (40,192,0) "dark lime green" we will get color:
+
+R = source_red(0) * source_factor(src_alpha=63/255) + 
+	destination_red(40) * destination_factor(one) =
+	0 * 63/255 + 40 * 1 = 40
+
+G = 192 * 63/255 + 192 * 1 = 239
+B = 255 * 63/255 + 0 * 1 = 63
+
+Result: (40,239,63), "green" (a kind of).
+Note, if you made a texture with some kind of shape with colour 662211h 
+it will appear dark red with a single particle, then yellow with a 
+several of them and white if player looking thru a lot of them. With 
+this you could made a nice-looking fire.
+
+Substractive blend:
+	
+	material_type_param = 12548,
+
+Source = zero, destination = src_color, alpha source is a texture and 
+vertex_color, modulate_1x.
+Texture darkness act like an alpha channel.
+Black color is completely opaque, white color is completely transparent.
+'destination = src_color' means that destination in multiplied by
+a source values. 'source = zero' means that source values ignored
+(multiplied by 0).
+
+Invert blend:
+
+	material_type_param = 12597,
+	
+Source = one_minus_dst_color, destination = one_minus_src_alpha, alpha source 
+is a texture and vertex_color, modulate_1x.
+Pixels invert color if source color value is big enough. If not, they just
+black.
+'destination = one_minus_src_alpha' means, that effect is masked by a
+source alpha channel.
+
+You can design and use your own blend using those enum values and function
+'minetest.pack_texture_blend_func'. Returned value of a function is 
+your 'material_type_param'.
+
+A values in a brackets is a multiplicators of a red, green, blue 
+and alpha channels respectively.
+
+* 'minetest.ebf': global table, containing blend factor enum values. Such as:
+    *	zero			= 0  -- src & dest (0, 0, 0, 0)
+    *	one			= 1  -- src & dest (1, 1, 1, 1)
+    *	dst_color 		= 2  -- src (destR, destG, destB, destA)
+    *	one_minus_dst_color 	= 3  -- src (1-destR, 1-destG, 1-destB, 1-destA)
+    *	src_color 		= 4  -- dest (srcR, srcG, srcB, srcA)
+    *	one_minus_src_color 	= 5  -- dest (1-srcR, 1-srcG, 1-srcB, 1-srcA)
+    *	src_alpha 		= 6  -- src & dest (srcA, srcA, srcA, srcA)
+    *	one_minus_src_alpha 	= 7  -- src & dest (1-srcA, 1-srcA, 1-srcA, 1-srcA)
+    *	dst_alpha 		= 8  -- src & dest (destA, destA, destA, destA)
+    *	one_minus_dst_alpha 	= 9  -- src & dest (1-destA, 1-destA, 1-destA, 1-destA)
+    *	src_alpha_saturate  	= 10 -- src (min(srcA, 1-destA), idem, ...) 
+
+* 'minetest.emfn': global table, containing modulate enum values. 
+    * Multiply the components of the arguments, and shift the products to the 
+    * left by x bits for brightening. Contain:
+    *	modulate_1x    = 1 -- no bit shift
+    *	modulate_2x    = 2 -- 1 bits shift
+    *	modulate_4x    = 4 -- 2 bits shift
+
+'modulate_4x' is quite useful when you want to make additive blend stronger
+with a lower amount of particles.
+
+* 'minetest.eas': global table, containing alpha source enum values. Such as:
+    *	none	 	= 0 -- do not use alpha.
+    *	vertex_color 	= 1 -- use vertex color alpha.
+    *	texture	 	= 2 -- use texture alpha.
+
+You can use both 'vertex_color' and 'texture' source by using value 3.
+
+* 'minetest.pack_texture_blend_func(srcFact, dstFact, modulate, alphaSource)': return integer
+    * Pack texture blend funcion variable. Depending from that variable blend 
+    * function will be applied in time of a render poligons with selected material.
+    * Therefore resulting pixel will be 'source * srcFact + destination * dstFact'
+    * Use result of this function as 'material_type_param'.
+
 Sounds
 ------
 Only Ogg Vorbis files are supported.
@@ -3650,7 +3763,7 @@ Definition tables
 
 ### Tile definition
 * `"image.png"`
-* `{name="image.png", animation={Tile Animation definition}}`
+* `{name="image.png", animation={Animation definition}}`
 * `{name="image.png", backface_culling=bool, tileable_vertical=bool,
     tileable_horizontal=bool}`
     * backface culling enabled by default for most nodes
@@ -3661,8 +3774,50 @@ Definition tables
 * deprecated, yet still supported field names:
     * `image` (name)
 
-### Tile animation definition
-* `{type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}`
+### Animation definition
+
+#### Node animation, particle and particle spawners
+* `{	type="vertical_frames", 
+	aspect_w=16, 
+    --  ^ specify width of a picture in pixels. 
+	aspect_h=16, 
+    --  ^ specify height of a frame in pixels. 
+	length=3.0
+    --  ^ specify full loop length. 
+	first_frame = 0, -- <- only for particles, use
+	min_first_frame = 0, -- <- for particle spawners
+	max_first_frame = 0,
+	loop_animation = true,  -- <- only for particles and particle spawners
+    --  specify if animation should start from beginning after last frame.
+}`
+
+#### Particle and particle spawners only
+* `{	
+	type="2d_animation_sheet", -- <- only for particles and particle spawners
+	vertical_frame_num = 1,
+	horizontal_frame_num = 1,
+    --  ^ specify amount of frames in texture. 
+    --	Can be used both for animation or for texture transform 
+    --	together with first_frame variable.
+    --	A animation texture separated on equal parts of frames,
+    --	by horizontal and vertical numbers. For example with 
+    --	vertical_frame_num = 4 and horizontal_frame_num = 3 we got
+    --	4*3 = 12 frames in total. Animation sequence start from
+    --	left top frame and go on to the right until reach end of
+    --	row. Next row also start from left frame.
+	first_frame = 0, -- <- only for particles, use
+	min_first_frame = 0, -- <- for particle spawners
+	max_first_frame = 0,
+    --  ^ specify first frame to start animation.
+	frame_length = -1,
+    --  ^ specify length of a frame in seconds. Negative and zero values
+    --	disable animation. A sequence with vertical_frame_num = 4 and 
+    --	horizontal_frame_num = 3, first_frame = 4 and frame_length = 0.1 
+    --	will end in (4*3-4)*0.1 = 0.8 seconds.
+	loop_animation = true,
+    --  specify if animation should start from beginning after last frame.
+}`
+    * All settings are optional. Default values is located in this example.
 
 ### Node definition (`register_node`)
 
@@ -4117,6 +4272,20 @@ The Biome API is still in an experimental phase and subject to change.
     --  ^ Uses texture (string)
         playername = "singleplayer"
     --  ^ optional, if specified spawns particle only on the player's client
+	material_type_param = 12641,
+    --  ^ optional, if specified spawns particle with 
+    --  specified material type param and disable z-buffer.
+    --  Some examples:
+    --  Default value: 0,
+    --  Additive blend: 12641,
+    --  Substractive blend: 12548,
+    --  Invert blend: 12597,
+    --  See also "Particle blend".
+    	animation = {Animation definition},
+    --	^ see above. Note, that particle and particle spawners have differences.
+	glow = 15,
+    --  ^ optional, specify particle self-luminescence in darkness. 
+	values may vary from 0 (no glow) to 15 (bright glow). 
     }
 
 ### `ParticleSpawner` definition (`add_particlespawner`)
@@ -4151,6 +4320,20 @@ The Biome API is still in an experimental phase and subject to change.
     --  ^ Uses texture (string)
         playername = "singleplayer"
     --  ^ Playername is optional, if specified spawns particle only on the player's client
+	material_type_param = 12641,
+    --	^ optional, if specified spawns particle with specified material type 
+    --	param and disable z-buffer.
+    --  Some examples:
+    --  Default value: 0,
+    --  Additive blend: 12641,
+    --  Substractive blend: 12548,
+    --  Invert blend: 12597,
+    --  See also "Particle blend".
+    	animation = {Animation definition},
+    --	^ see above. Note, that particle and particle spawners have differences.
+	glow = 15,
+    --  ^ optional, specify particle self-luminescence in darkness. 
+	values may vary from 0 (no glow) to 15 (bright glow).
     }
 
 ### `HTTPRequest` definition (`HTTPApiTable.fetch_async`, `HTTPApiTable.fetch_async`)
diff --git a/src/client.h b/src/client.h
index 9f5bda059..c51daf7bc 100644
--- a/src/client.h
+++ b/src/client.h
@@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "hud.h"
 #include "particles.h"
 #include "network/networkpacket.h"
+#include "nodedef.h" // AnimationType
 
 struct MeshMakeData;
 class MapBlockMesh;
@@ -185,6 +186,14 @@ struct ClientEvent
 			bool collision_removal;
 			bool vertical;
 			std::string *texture;
+			u32 material_type_param;
+			AnimationType animation_type;
+			u16 vertical_frame_num;
+			u16 horizontal_frame_num;
+			u16 first_frame;
+			float frame_length;
+			bool loop_animation;
+			u8 glow;
 		} spawn_particle;
 		struct{
 			u16 amount;
@@ -205,6 +214,15 @@ struct ClientEvent
 			bool vertical;
 			std::string *texture;
 			u32 id;
+			u32 material_type_param;
+			AnimationType animation_type;
+			u16 vertical_frame_num;
+			u16 horizontal_frame_num;
+			u16 min_first_frame;
+			u16 max_first_frame;
+			float frame_length;
+			bool loop_animation;
+			u8 glow;
 		} add_particlespawner;
 		struct{
 			u32 id;
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 411982f69..03baf078a 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -896,23 +896,46 @@ void Client::handleCommand_SpawnParticle(NetworkPacket* pkt)
 	std::string texture     = deSerializeLongString(is);
 	bool vertical           = false;
 	bool collision_removal  = false;
+	u32 material_type_param = 0;
+	AnimationType animation_type = AT_NONE;
+	u16 vertical_frame_num = 1;
+	u16 horizontal_frame_num = 1;
+	u16 first_frame = 0;
+	float frame_length = -1;
+	bool loop_animation = true;
+	u8 glow = 0;
 	try {
 		vertical = readU8(is);
 		collision_removal = readU8(is);
+		material_type_param = readU32(is);
+		animation_type = (AnimationType)readU8(is);
+		vertical_frame_num = readU16(is);
+		horizontal_frame_num = readU16(is);
+		first_frame = readU16(is);
+		frame_length = readF1000(is);
+		loop_animation = readU8(is);
+		glow = readU8(is);
 	} catch (...) {}
 
 	ClientEvent event;
-	event.type                              = CE_SPAWN_PARTICLE;
-	event.spawn_particle.pos                = new v3f (pos);
-	event.spawn_particle.vel                = new v3f (vel);
-	event.spawn_particle.acc                = new v3f (acc);
-	event.spawn_particle.expirationtime     = expirationtime;
-	event.spawn_particle.size               = size;
-	event.spawn_particle.collisiondetection = collisiondetection;
-	event.spawn_particle.collision_removal  = collision_removal;
-	event.spawn_particle.vertical           = vertical;
-	event.spawn_particle.texture            = new std::string(texture);
-
+	event.type                                 = CE_SPAWN_PARTICLE;
+	event.spawn_particle.pos                   = new v3f (pos);
+	event.spawn_particle.vel                   = new v3f (vel);
+	event.spawn_particle.acc                   = new v3f (acc);
+	event.spawn_particle.expirationtime        = expirationtime;
+	event.spawn_particle.size                  = size;
+	event.spawn_particle.collisiondetection	   = collisiondetection;
+	event.spawn_particle.collision_removal     = collision_removal;
+	event.spawn_particle.vertical              = vertical;
+	event.spawn_particle.texture               = new std::string(texture);
+	event.spawn_particle.material_type_param   = material_type_param;
+	event.spawn_particle.animation_type        = animation_type;
+	event.spawn_particle.vertical_frame_num    = vertical_frame_num;
+	event.spawn_particle.horizontal_frame_num  = horizontal_frame_num;
+	event.spawn_particle.first_frame           = first_frame;
+	event.spawn_particle.frame_length          = frame_length;
+	event.spawn_particle.loop_animation        = loop_animation;
+	event.spawn_particle.glow                  = glow;
 	m_client_event_queue.push(event);
 }
 
@@ -932,6 +955,15 @@ void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt)
 	float maxsize;
 	bool collisiondetection;
 	u32 id;
+	u32 material_type_param = 0;
+	u8 animation_type = (u8)AT_NONE;
+	u16 vertical_frame_num = 1;
+	u16 horizontal_frame_num = 1;
+	u16 min_first_frame = 0;
+	u16 max_first_frame = 0;
+	float frame_length = -1;
+	bool loop_animation = true;
+	u8 glow = 0;
 
 	*pkt >> amount >> spawntime >> minpos >> maxpos >> minvel >> maxvel
 		>> minacc >> maxacc >> minexptime >> maxexptime >> minsize
@@ -948,29 +980,46 @@ void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt)
 		*pkt >> vertical;
 		*pkt >> collision_removal;
 		*pkt >> attached_id;
-
+		*pkt >> material_type_param;
+		*pkt >> animation_type;
+		*pkt >> vertical_frame_num;
+		*pkt >> horizontal_frame_num;
+		*pkt >> min_first_frame;
+		*pkt >> max_first_frame;
+		*pkt >> frame_length;
+		*pkt >> loop_animation;
+		*pkt >> glow;
 	} catch (...) {}
 
 	ClientEvent event;
-	event.type                                   = CE_ADD_PARTICLESPAWNER;
-	event.add_particlespawner.amount             = amount;
-	event.add_particlespawner.spawntime          = spawntime;
-	event.add_particlespawner.minpos             = new v3f (minpos);
-	event.add_particlespawner.maxpos             = new v3f (maxpos);
-	event.add_particlespawner.minvel             = new v3f (minvel);
-	event.add_particlespawner.maxvel             = new v3f (maxvel);
-	event.add_particlespawner.minacc             = new v3f (minacc);
-	event.add_particlespawner.maxacc             = new v3f (maxacc);
-	event.add_particlespawner.minexptime         = minexptime;
-	event.add_particlespawner.maxexptime         = maxexptime;
-	event.add_particlespawner.minsize            = minsize;
-	event.add_particlespawner.maxsize            = maxsize;
-	event.add_particlespawner.collisiondetection = collisiondetection;
-	event.add_particlespawner.collision_removal  = collision_removal;
-	event.add_particlespawner.attached_id        = attached_id;
-	event.add_particlespawner.vertical           = vertical;
-	event.add_particlespawner.texture            = new std::string(texture);
-	event.add_particlespawner.id                 = id;
+	event.type                                     = CE_ADD_PARTICLESPAWNER;
+	event.add_particlespawner.amount               = amount;
+	event.add_particlespawner.spawntime            = spawntime;
+	event.add_particlespawner.minpos               = new v3f (minpos);
+	event.add_particlespawner.maxpos               = new v3f (maxpos);
+	event.add_particlespawner.minvel               = new v3f (minvel);
+	event.add_particlespawner.maxvel               = new v3f (maxvel);
+	event.add_particlespawner.minacc               = new v3f (minacc);
+	event.add_particlespawner.maxacc               = new v3f (maxacc);
+	event.add_particlespawner.minexptime           = minexptime;
+	event.add_particlespawner.maxexptime           = maxexptime;
+	event.add_particlespawner.minsize              = minsize;
+	event.add_particlespawner.maxsize              = maxsize;
+	event.add_particlespawner.collisiondetection   = collisiondetection;
+	event.add_particlespawner.collision_removal    = collision_removal;
+	event.add_particlespawner.attached_id          = attached_id;
+	event.add_particlespawner.vertical             = vertical;
+	event.add_particlespawner.texture              = new std::string(texture);
+	event.add_particlespawner.id                   = id;
+	event.add_particlespawner.material_type_param  = material_type_param;
+	event.add_particlespawner.animation_type       = (AnimationType)animation_type;
+	event.add_particlespawner.vertical_frame_num   = vertical_frame_num;
+	event.add_particlespawner.horizontal_frame_num = horizontal_frame_num;
+	event.add_particlespawner.min_first_frame      = min_first_frame;
+	event.add_particlespawner.max_first_frame      = max_first_frame;
+	event.add_particlespawner.frame_length	       = frame_length;
+	event.add_particlespawner.loop_animation       = loop_animation;
+	event.add_particlespawner.glow                 = glow;
 
 	m_client_event_queue.push(event);
 }
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 39ea1a60e..c690e6720 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -211,7 +211,7 @@ void TileDef::deSerialize(std::istream &is, const u8 contenfeatures_version, con
 {
 	int version = readU8(is);
 	name = deSerializeString(is);
-	animation.type = (TileAnimationType)readU8(is);
+	animation.type = (AnimationType)readU8(is);
 	animation.aspect_w = readU16(is);
 	animation.aspect_h = readU16(is);
 	animation.length = readF1000(is);
@@ -531,7 +531,7 @@ void ContentFeatures::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
 	tile->material_flags = 0;
 	if (backface_culling)
 		tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
-	if (tiledef->animation.type == TAT_VERTICAL_FRAMES)
+	if (tiledef->animation.type == AT_VERTICAL_FRAMES)
 		tile->material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
 	if (tiledef->tileable_horizontal)
 		tile->material_flags |= MATERIAL_FLAG_TILEABLE_HORIZONTAL;
diff --git a/src/nodedef.h b/src/nodedef.h
index 80396f992..f47517c4a 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -161,9 +161,10 @@ enum NodeDrawType
 /*
 	Stand-alone definition of a TileSpec (basically a server-side TileSpec)
 */
-enum TileAnimationType{
-	TAT_NONE=0,
-	TAT_VERTICAL_FRAMES=1,
+enum AnimationType{
+	AT_NONE = 0,
+	AT_VERTICAL_FRAMES = 1,
+	AT_2D_ANIMATION_SHEET = 2,
 };
 struct TileDef
 {
@@ -172,7 +173,7 @@ struct TileDef
 	bool tileable_horizontal;
 	bool tileable_vertical;
 	struct{
-		enum TileAnimationType type;
+		enum AnimationType type;
 		int aspect_w; // width for aspect ratio
 		int aspect_h; // height for aspect ratio
 		float length; // seconds
@@ -184,7 +185,7 @@ struct TileDef
 		backface_culling = true;
 		tileable_horizontal = true;
 		tileable_vertical = true;
-		animation.type = TAT_NONE;
+		animation.type = AT_NONE;
 		animation.aspect_w = 1;
 		animation.aspect_h = 1;
 		animation.length = 1.0;
diff --git a/src/particles.cpp b/src/particles.cpp
index f20fb4083..538487028 100644
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -43,6 +43,22 @@ v3f random_v3f(v3f min, v3f max)
 			rand()/(float)RAND_MAX*(max.Z-min.Z)+min.Z);
 }
 
+u32 check_material_type_param(u32 material_type_param)
+{
+	u32 alphaSource = (material_type_param & 0x0000F000) >> 12;
+	u32 modulo  = (material_type_param & 0x00000F00) >> 8;
+	u32 srcFact = (material_type_param & 0x000000F0) >> 4;
+	u32 dstFact = material_type_param & 0x0000000F;
+	if (alphaSource <= 3 && modulo <= 4 && srcFact <= 10 && dstFact <= 10) {
+		return material_type_param;
+	} else {
+		errorstream << "Server send incorrect ";
+		errorstream << "material_type_param value for particle.";
+		errorstream << std::endl;
+		return 0;
+	}
+}
+
 Particle::Particle(
 	IGameDef *gamedef,
 	scene::ISceneManager* smgr,
@@ -58,7 +74,14 @@ Particle::Particle(
 	bool vertical,
 	video::ITexture *texture,
 	v2f texpos,
-	v2f texsize
+	v2f texsize,
+	u32 material_type_param,
+	u16 vertical_frame_num,
+	u16 horizontal_frame_num,
+	u16 first_frame,
+	float frame_length,
+	bool loop_animation,
+	u8 glow
 ):
 	scene::ISceneNode(smgr->getRootSceneNode(), smgr)
 {
@@ -71,11 +94,26 @@ Particle::Particle(
 	m_material.setFlag(video::EMF_BACK_FACE_CULLING, false);
 	m_material.setFlag(video::EMF_BILINEAR_FILTER, false);
 	m_material.setFlag(video::EMF_FOG_ENABLE, true);
-	m_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+	if (material_type_param != 0) {
+		m_material.MaterialType = video::EMT_ONETEXTURE_BLEND;
+		m_material.MaterialTypeParam = irr::core::FR(material_type_param);
+		// We must disable z-buffer if we want to avoid transparent pixels
+		// to overlap pixels with lower z-value.
+		m_material.setFlag(video::EMF_ZWRITE_ENABLE, false); 
+	} else {
+		m_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+	}
 	m_material.setTexture(0, texture);
+
 	m_texpos = texpos;
 	m_texsize = texsize;
-
+	m_vertical_frame_num = vertical_frame_num;
+	m_horizontal_frame_num = horizontal_frame_num;
+	m_first_frame = first_frame;
+	m_frame_length = frame_length;
+	m_loop_animation = loop_animation;
+	m_texsize.Y /= m_vertical_frame_num;
+	m_texsize.X /= m_horizontal_frame_num;
 
 	// Particle related
 	m_pos = pos;
@@ -88,6 +126,7 @@ Particle::Particle(
 	m_collisiondetection = collisiondetection;
 	m_collision_removal = collision_removal;
 	m_vertical = vertical;
+	m_glow = glow;
 
 	// Irrlicht stuff
 	m_collisionbox = aabb3f
@@ -170,16 +209,29 @@ void Particle::updateLight()
 	else
 		light = blend_light(m_env->getDayNightRatio(), LIGHT_SUN, 0);
 
-	m_light = decode_light(light);
+	m_light = decode_light(light + m_glow);
 }
 
 void Particle::updateVertices()
 {
 	video::SColor c(255, m_light, m_light, m_light);
-	f32 tx0 = m_texpos.X;
-	f32 tx1 = m_texpos.X + m_texsize.X;
-	f32 ty0 = m_texpos.Y;
-	f32 ty1 = m_texpos.Y + m_texsize.Y;
+	u16 frame = m_first_frame;
+	if (m_frame_length > 0) {
+		if (m_loop_animation)
+			frame = m_first_frame + (u32)(m_time / m_frame_length)
+					% (m_vertical_frame_num * 
+					m_horizontal_frame_num - m_first_frame);
+		else if (m_time >= 
+				(m_vertical_frame_num * m_horizontal_frame_num 
+				- m_first_frame) * m_frame_length)
+			frame = m_vertical_frame_num * m_horizontal_frame_num - 1;
+		else
+			frame = m_first_frame + (u16)(m_time / m_frame_length);
+	}
+	f32 tx0 = m_texpos.X + m_texsize.X * (frame % m_horizontal_frame_num);
+	f32 tx1 = m_texpos.X + m_texsize.X * (frame % m_horizontal_frame_num + 1);
+	f32 ty0 = m_texpos.Y + m_texsize.Y * (frame / m_horizontal_frame_num);
+	f32 ty1 = m_texpos.Y + m_texsize.Y * (frame / m_horizontal_frame_num + 1);
 
 	m_vertices[0] = video::S3DVertex(-m_size/2,-m_size/2,0, 0,0,0,
 			c, tx0, ty1);
@@ -214,7 +266,16 @@ ParticleSpawner::ParticleSpawner(IGameDef* gamedef, scene::ISceneManager *smgr,
 	v3f minpos, v3f maxpos, v3f minvel, v3f maxvel, v3f minacc, v3f maxacc,
 	float minexptime, float maxexptime, float minsize, float maxsize,
 	bool collisiondetection, bool collision_removal, u16 attached_id, bool vertical,
-	video::ITexture *texture, u32 id, ParticleManager *p_manager) :
+	video::ITexture *texture, u32 id, 
+	u32 material_type_param,
+	u16 vertical_frame_num,
+	u16 horizontal_frame_num,
+	u16 min_first_frame,
+	u16 max_first_frame,
+	float frame_length,
+	bool loop_animation,
+	u8 glow,
+	ParticleManager *p_manager) :
 	m_particlemanager(p_manager)
 {
 	m_gamedef = gamedef;
@@ -238,6 +299,14 @@ ParticleSpawner::ParticleSpawner(IGameDef* gamedef, scene::ISceneManager *smgr,
 	m_vertical = vertical;
 	m_texture = texture;
 	m_time = 0;
+	m_vertical_frame_num = vertical_frame_num;
+	m_horizontal_frame_num = horizontal_frame_num;
+	m_min_first_frame = min_first_frame;
+	m_max_first_frame = max_first_frame;
+	m_frame_length = frame_length;
+	m_loop_animation = loop_animation;
+	m_material_type_param = material_type_param;
+	m_glow = glow;
 
 	for (u16 i = 0; i<=m_amount; i++)
 	{
@@ -251,7 +320,6 @@ ParticleSpawner::~ParticleSpawner() {}
 void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 {
 	m_time += dtime;
-
 	bool unloaded = false;
 	v3f attached_offset = v3f(0,0,0);
 	if (m_attached_id != 0) {
@@ -285,7 +353,10 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 					float size = rand()/(float)RAND_MAX
 							*(m_maxsize-m_minsize)
 							+m_minsize;
-
+					u16 first_frame = m_min_first_frame + 
+							rand() % 
+							(m_max_first_frame - 
+							m_min_first_frame + 1);
 					Particle* toadd = new Particle(
 						m_gamedef,
 						m_smgr,
@@ -301,7 +372,14 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 						m_vertical,
 						m_texture,
 						v2f(0.0, 0.0),
-						v2f(1.0, 1.0));
+						v2f(1.0, 1.0),
+						m_material_type_param, 
+						m_vertical_frame_num,
+						m_horizontal_frame_num,
+						first_frame,
+						m_frame_length,
+						m_loop_animation,
+						m_glow);
 					m_particlemanager->addParticle(toadd);
 				}
 				i = m_spawntimes.erase(i);
@@ -331,7 +409,10 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 				float size = rand()/(float)RAND_MAX
 						*(m_maxsize-m_minsize)
 						+m_minsize;
-
+				u16 first_frame = m_min_first_frame + 
+						rand() % 
+						(m_max_first_frame - 
+						m_min_first_frame + 1);
 				Particle* toadd = new Particle(
 					m_gamedef,
 					m_smgr,
@@ -347,7 +428,14 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 					m_vertical,
 					m_texture,
 					v2f(0.0, 0.0),
-					v2f(1.0, 1.0));
+					v2f(1.0, 1.0),
+					m_material_type_param, 
+					m_vertical_frame_num,
+					m_horizontal_frame_num,
+					first_frame,
+					m_frame_length,
+					m_loop_animation,
+					m_glow);
 				m_particlemanager->addParticle(toadd);
 			}
 		}
@@ -459,6 +547,39 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 			video::ITexture *texture =
 				gamedef->tsrc()->getTextureForMesh(*(event->add_particlespawner.texture));
 
+			float frame_length = -1;
+			u16 vertical_frame_num = 1;
+			u16 horizontal_frame_num = 1;
+			u32 material_type_param =
+				check_material_type_param(event->add_particlespawner.material_type_param);
+
+			switch (event->add_particlespawner.animation_type) {
+				case AT_NONE:
+					break;
+				case AT_VERTICAL_FRAMES: {
+					v2u32 size = texture->getOriginalSize();
+					int frame_height = (float)size.X /
+						(float)event->add_particlespawner.vertical_frame_num *
+						(float)event->add_particlespawner.horizontal_frame_num;
+					vertical_frame_num = size.Y / frame_height;
+					frame_length = 
+						event->add_particlespawner.frame_length / 
+						vertical_frame_num;
+					break;
+				}
+				case AT_2D_ANIMATION_SHEET: {
+					vertical_frame_num =
+						event->add_particlespawner.vertical_frame_num;
+					horizontal_frame_num =
+						event->add_particlespawner.horizontal_frame_num;
+					frame_length = 
+						event->add_particlespawner.frame_length;
+					break;
+				}
+				default:
+					break;
+			}
+
 			ParticleSpawner* toadd = new ParticleSpawner(gamedef, smgr, player,
 					event->add_particlespawner.amount,
 					event->add_particlespawner.spawntime,
@@ -478,6 +599,14 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 					event->add_particlespawner.vertical,
 					texture,
 					event->add_particlespawner.id,
+					material_type_param,
+					vertical_frame_num,
+					horizontal_frame_num,
+					event->add_particlespawner.min_first_frame,
+					event->add_particlespawner.max_first_frame,
+					frame_length,
+					event->add_particlespawner.loop_animation,
+					event->add_particlespawner.glow,
 					this);
 
 			/* delete allocated content of event */
@@ -502,6 +631,39 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 			video::ITexture *texture =
 				gamedef->tsrc()->getTextureForMesh(*(event->spawn_particle.texture));
 
+			float frame_length = -1;
+			u16 vertical_frame_num = 1;
+			u16 horizontal_frame_num = 1;
+			u32 material_type_param =
+				check_material_type_param(event->spawn_particle.material_type_param);
+
+			switch (event->spawn_particle.animation_type) {
+				case AT_NONE:
+					break;
+				case AT_VERTICAL_FRAMES: {
+					v2u32 size = texture->getOriginalSize();
+					int frame_height = (float)size.X /
+						(float)event->spawn_particle.vertical_frame_num *
+						(float)event->spawn_particle.horizontal_frame_num;
+					vertical_frame_num = size.Y / frame_height;
+					frame_length = 
+						event->spawn_particle.frame_length / 
+						vertical_frame_num;
+					break;
+				}
+				case AT_2D_ANIMATION_SHEET: {
+					vertical_frame_num =
+						event->spawn_particle.vertical_frame_num;
+					horizontal_frame_num =
+						event->spawn_particle.horizontal_frame_num;
+					frame_length = 
+						event->spawn_particle.frame_length;
+					break;
+				}
+				default:
+					break;
+			}
+
 			Particle* toadd = new Particle(gamedef, smgr, player, m_env,
 					*event->spawn_particle.pos,
 					*event->spawn_particle.vel,
@@ -513,13 +675,21 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 					event->spawn_particle.vertical,
 					texture,
 					v2f(0.0, 0.0),
-					v2f(1.0, 1.0));
+					v2f(1.0, 1.0),
+					material_type_param,
+					vertical_frame_num,
+					horizontal_frame_num,
+					event->spawn_particle.first_frame,
+					frame_length,
+					event->spawn_particle.loop_animation,
+					event->spawn_particle.glow);
 
 			addParticle(toadd);
 
 			delete event->spawn_particle.pos;
 			delete event->spawn_particle.vel;
 			delete event->spawn_particle.acc;
+			delete event->spawn_particle.texture;
 
 			break;
 		}
@@ -588,7 +758,8 @@ void ParticleManager::addNodeParticle(IGameDef* gamedef, scene::ISceneManager* s
 		false,
 		texture,
 		texpos,
-		texsize);
+		texsize,
+		0, 1, 1, 0, -1, true, 0);
 
 	addParticle(toadd);
 }
diff --git a/src/particles.h b/src/particles.h
index eb8c6665d..6d8c6139f 100644
--- a/src/particles.h
+++ b/src/particles.h
@@ -50,7 +50,14 @@ class Particle : public scene::ISceneNode
 		bool vertical,
 		video::ITexture *texture,
 		v2f texpos,
-		v2f texsize
+		v2f texsize,
+		u32 material_type_param,
+		u16 vertical_frame_num,
+		u16 horizontal_frame_num,
+		u16 first_frame,
+		float frame_length,
+		bool loop_animation,
+		u8 glow
 	);
 	~Particle();
 
@@ -102,6 +109,12 @@ private:
 	bool m_collision_removal;
 	bool m_vertical;
 	v3s16 m_camera_offset;
+	u16 m_vertical_frame_num;
+	u16 m_horizontal_frame_num;
+	u16 m_first_frame;
+	float m_frame_length;
+	bool m_loop_animation;
+	u8 m_glow;
 };
 
 class ParticleSpawner
@@ -123,8 +136,15 @@ class ParticleSpawner
 		bool vertical,
 		video::ITexture *texture,
 		u32 id,
+		u32 material_type_param,
+		u16 vertical_frame_num,
+		u16 horizontal_frame_num,
+		u16 min_first_frame,
+		u16 max_first_frame,
+		float frame_length,
+		bool loop_animation,
+		u8 glow,
 		ParticleManager* p_manager);
-
 	~ParticleSpawner();
 
 	void step(float dtime, ClientEnvironment *env);
@@ -156,6 +176,14 @@ class ParticleSpawner
 	bool m_collision_removal;
 	bool m_vertical;
 	u16 m_attached_id;
+	u32 m_material_type_param;
+	u16 m_vertical_frame_num;
+	u16 m_horizontal_frame_num;
+	u16 m_min_first_frame;
+	u16 m_max_first_frame;
+	float m_frame_length;
+	bool m_loop_animation;
+	u8 m_glow;
 };
 
 /**
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index f20a65903..d4a25b68b 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -35,10 +35,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "noise.h"
 #include <json/json.h>
 
-struct EnumString es_TileAnimationType[] =
+struct EnumString es_AnimationType[] =
 {
-	{TAT_NONE, "none"},
-	{TAT_VERTICAL_FRAMES, "vertical_frames"},
+	{AT_NONE, "none"},
+	{AT_VERTICAL_FRAMES, "vertical_frames"},
+	{AT_2D_ANIMATION_SHEET, "2d_animation_sheet"},
 	{0, NULL},
 };
 
@@ -335,9 +336,9 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype)
 		lua_getfield(L, index, "animation");
 		if(lua_istable(L, -1)){
 			// {type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}
-			tiledef.animation.type = (TileAnimationType)
-				getenumfield(L, -1, "type", es_TileAnimationType,
-				TAT_NONE);
+			tiledef.animation.type = (AnimationType)
+				getenumfield(L, -1, "type", es_AnimationType,
+				AT_NONE);
 			tiledef.animation.aspect_w =
 				getintfield_default(L, -1, "aspect_w", 16);
 			tiledef.animation.aspect_h =
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index 2a2228b6d..32fdb4f04 100644
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -159,6 +159,6 @@ bool               push_json_value           (lua_State *L,
 void               read_json_value           (lua_State *L, Json::Value &root,
                                               int index, u8 recursion = 0);
 
-extern struct EnumString es_TileAnimationType[];
+extern struct EnumString es_AnimationType[];
 
 #endif /* C_CONTENT_H_ */
diff --git a/src/script/common/c_converter.cpp b/src/script/common/c_converter.cpp
index f36298915..cfb5e26db 100644
--- a/src/script/common/c_converter.cpp
+++ b/src/script/common/c_converter.cpp
@@ -513,6 +513,28 @@ int getintfield_default(lua_State *L, int table,
 	return result;
 }
 
+int check_material_type_param(lua_State *L, int table,
+		const char *fieldname, int default_)
+{
+	int material_type_param =
+		getintfield_default(L, table, fieldname, default_);
+	u32 alphaSource = (material_type_param & 0x0000F000) >> 12;
+	u32 modulo  = (material_type_param & 0x00000F00) >> 8;
+	u32 srcFact = (material_type_param & 0x000000F0) >> 4;
+	u32 dstFact = material_type_param & 0x0000000F;
+	if (alphaSource <= 3 && modulo <= 4 && srcFact <= 10 && dstFact <= 10) {
+		return material_type_param;
+	} else {
+		std::ostringstream error_text;
+		error_text << "Incorrect material_type_param value ";
+		error_text << "for particle or particle spawner.";
+		error_text << std::endl;
+		throw LuaError(error_text.str());
+		return 0;
+	}
+}
+
+
 float getfloatfield_default(lua_State *L, int table,
 		const char *fieldname, float default_)
 {
diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h
index a5fbee765..71ac735c1 100644
--- a/src/script/common/c_converter.h
+++ b/src/script/common/c_converter.h
@@ -45,6 +45,8 @@ float              getfloatfield_default(lua_State *L, int table,
                              const char *fieldname, float default_);
 int                getintfield_default           (lua_State *L, int table,
                              const char *fieldname, int default_);
+int                check_material_type_param(lua_State *L, int table,
+                             const char *fieldname, int default_);
 
 bool               getstringfield(lua_State *L, int table,
                              const char *fieldname, std::string &result);
diff --git a/src/script/lua_api/l_particles.cpp b/src/script/lua_api/l_particles.cpp
index 667ac7272..b0a57ce6d 100644
--- a/src/script/lua_api/l_particles.cpp
+++ b/src/script/lua_api/l_particles.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_object.h"
 #include "lua_api/l_internal.h"
 #include "common/c_converter.h"
+#include "common/c_content.h"
 #include "server.h"
 #include "particles.h"
 
@@ -34,6 +35,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // collision_removal = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
+// material_type_param = num
+// animation = animation definition
+// glow = indexed color or color string
 int ModApiParticles::l_add_particle(lua_State *L)
 {
 	MAP_LOCK_REQUIRED;
@@ -44,13 +48,24 @@ int ModApiParticles::l_add_particle(lua_State *L)
 
 	float expirationtime, size;
 	expirationtime = size = 1;
+	float frame_or_loop_length = -1;
+	
+	AnimationType animation_type = AT_NONE;
+
+	u16 vertical_frame_num_or_aspect = 1;
+	u16 horizontal_frame_num_or_aspect = 1;
+	u16 first_frame = 0;
 
 	bool collisiondetection, vertical, collision_removal;
 	collisiondetection = vertical = collision_removal = false;
+	bool loop_animation = true;
 
 	std::string texture = "";
 	std::string playername = "";
 
+	u32 material_type_param = 0;
+	u8 glow = 0;
+
 	if (lua_gettop(L) > 1) // deprecated
 	{
 		log_deprecated(L, "Deprecated add_particle call with individual parameters instead of definition");
@@ -94,8 +109,61 @@ int ModApiParticles::l_add_particle(lua_State *L)
 		acc = lua_istable(L, -1) ? check_v3f(L, -1) : acc;
 		lua_pop(L, 1);
 
-		expirationtime = getfloatfield_default(L, 1, "expirationtime", 1);
+		expirationtime = getfloatfield_default(L, 1, "expirationtime", 1);	
 		size = getfloatfield_default(L, 1, "size", 1);
+
+		lua_getfield(L, 1, "animation");
+		if (lua_istable(L, -1)) {
+			animation_type = (AnimationType)
+				getenumfield(L, -1, "type", es_AnimationType,
+				AT_NONE);
+		}
+		switch (animation_type) {
+			case AT_NONE:
+				break;
+			case AT_2D_ANIMATION_SHEET:
+				frame_or_loop_length = 
+					getfloatfield_default(L, -1, "frame_length", -1);
+				vertical_frame_num_or_aspect = 
+					getintfield_default(L, -1, "vertical_frame_num", 1);
+				horizontal_frame_num_or_aspect = 
+					getintfield_default(L, -1, "horizontal_frame_num", 1);
+				first_frame = 
+					getintfield_default(L, -1, "first_frame", 0);
+				loop_animation = 
+					getboolfield_default(L, -1, "loop_animation", true);
+				break;
+			case AT_VERTICAL_FRAMES:
+				frame_or_loop_length = 
+					getfloatfield_default(L, -1, "length", -1);
+				vertical_frame_num_or_aspect = 
+					getintfield_default(L, -1, "aspect_w", 1);
+				horizontal_frame_num_or_aspect = 
+					getintfield_default(L, -1, "aspect_h", 1);
+				first_frame = 
+					getintfield_default(L, -1, "first_frame", 0);
+				loop_animation = 
+					getboolfield_default(L, -1, "loop_animation", true);
+				break;
+			default:
+				break;
+		}
+		lua_pop(L, 1);
+
+		if (animation_type == AT_2D_ANIMATION_SHEET && 
+				first_frame >= vertical_frame_num_or_aspect * 
+				horizontal_frame_num_or_aspect) {
+			std::ostringstream error_text; 
+			error_text << "first_frame should be lower, than "
+				<< "vertical_frame_num * horizontal_frame_num. "
+				<< "Got first_frame=" << first_frame
+				<< ", vertical_frame_num="
+				<< vertical_frame_num_or_aspect
+				<< " and horizontal_frame_num="
+				<< horizontal_frame_num_or_aspect << std::endl;
+			throw LuaError(error_text.str());
+		}
+
 		collisiondetection = getboolfield_default(L, 1,
 			"collisiondetection", collisiondetection);
 		collision_removal = getboolfield_default(L, 1,
@@ -103,9 +171,16 @@ int ModApiParticles::l_add_particle(lua_State *L)
 		vertical = getboolfield_default(L, 1, "vertical", vertical);
 		texture = getstringfield_default(L, 1, "texture", "");
 		playername = getstringfield_default(L, 1, "playername", "");
+		material_type_param = check_material_type_param(L, 1, "material_type_param", 0);
+		glow = getintfield_default (L, 1, "glow", 0);
 	}
-	getServer(L)->spawnParticle(playername, pos, vel, acc, expirationtime, size,
-			collisiondetection, collision_removal, vertical, texture);
+	getServer(L)->spawnParticle(playername, pos, vel, acc, expirationtime, 
+		size, collisiondetection, collision_removal, vertical, 
+		texture, material_type_param,
+		animation_type,
+		vertical_frame_num_or_aspect, 
+		horizontal_frame_num_or_aspect,
+		first_frame, frame_or_loop_length, loop_animation, glow);
 	return 1;
 }
 
@@ -127,21 +202,33 @@ int ModApiParticles::l_add_particle(lua_State *L)
 // collision_removal = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
+// material_type_param = num
+// animation = animation definition
+// glow = indexed color or color string
 int ModApiParticles::l_add_particlespawner(lua_State *L)
 {
 	MAP_LOCK_REQUIRED;
 
 	// Get parameters
 	u16 amount = 1;
+	u16 vertical_frame_num_or_aspect = 1;
+	u16 horizontal_frame_num_or_aspect = 1;
+	u16 min_first_frame = 0;
+	u16 max_first_frame = 0;
 	v3f minpos, maxpos, minvel, maxvel, minacc, maxacc;
 	    minpos= maxpos= minvel= maxvel= minacc= maxacc= v3f(0, 0, 0);
 	float time, minexptime, maxexptime, minsize, maxsize;
 	      time= minexptime= maxexptime= minsize= maxsize= 1;
+	AnimationType animation_type = AT_NONE;
+	float frame_or_loop_length = -1;
 	bool collisiondetection, vertical, collision_removal;
 	     collisiondetection = vertical = collision_removal = false;
+	bool loop_animation = true;
 	ServerActiveObject *attached = NULL;
 	std::string texture = "";
 	std::string playername = "";
+	u32 material_type_param = 0;
+	u8 glow = 0;
 
 	if (lua_gettop(L) > 1) //deprecated
 	{
@@ -196,6 +283,65 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 		maxexptime = getfloatfield_default(L, 1, "maxexptime", maxexptime);
 		minsize = getfloatfield_default(L, 1, "minsize", minsize);
 		maxsize = getfloatfield_default(L, 1, "maxsize", maxsize);
+
+
+		lua_getfield(L, 1, "animation");
+		if (lua_istable(L, -1)) {
+			animation_type = (AnimationType)
+				getenumfield(L, -1, "type", es_AnimationType,
+				AT_NONE);
+		}
+		switch (animation_type) {
+			case AT_NONE:
+				break;
+			case AT_2D_ANIMATION_SHEET:
+				frame_or_loop_length = 
+					getfloatfield_default(L, -1, "frame_length", -1);
+				vertical_frame_num_or_aspect = 
+					getintfield_default(L, -1, "vertical_frame_num", 1);
+				horizontal_frame_num_or_aspect = 
+					getintfield_default(L, -1, "horizontal_frame_num", 1);
+				min_first_frame = 
+					getintfield_default(L, -1, "min_first_frame", 0);
+				max_first_frame = 
+					getintfield_default(L, -1, "max_first_frame", 0);
+				loop_animation = 
+					getboolfield_default(L, -1, "loop_animation", true);
+				break;
+			case AT_VERTICAL_FRAMES:
+				frame_or_loop_length = 
+					getfloatfield_default(L, -1, "length", -1);
+				vertical_frame_num_or_aspect = 
+					getintfield_default(L, -1, "aspect_w", 1);
+				horizontal_frame_num_or_aspect = 
+					getintfield_default(L, -1, "aspect_h", 1);
+				min_first_frame = 
+					getintfield_default(L, -1, "min_first_frame", 0);
+				max_first_frame = 
+					getintfield_default(L, -1, "max_first_frame", 0);
+				loop_animation = 
+					getboolfield_default(L, -1, "loop_animation", true);
+				break;
+			default:
+				break;
+		}
+		lua_pop(L, 1);
+
+		if (animation_type == AT_2D_ANIMATION_SHEET && 
+				max_first_frame >= vertical_frame_num_or_aspect * 
+				horizontal_frame_num_or_aspect) {
+			std::ostringstream error_text; 
+			error_text << "max_first_frame should be lower, than "
+				<< "vertical_frame_num * horizontal_frame_num. " 
+				<< "Got max_first_frame="
+				<< max_first_frame
+				<< ", vertical_frame_num="
+				<< vertical_frame_num_or_aspect
+				<< " and horizontal_frame_num="
+				<< horizontal_frame_num_or_aspect << std::endl;
+			throw LuaError(error_text.str());
+		}
+		
 		collisiondetection = getboolfield_default(L, 1,
 			"collisiondetection", collisiondetection);
 		collision_removal = getboolfield_default(L, 1,
@@ -211,6 +357,8 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 		vertical = getboolfield_default(L, 1, "vertical", vertical);
 		texture = getstringfield_default(L, 1, "texture", "");
 		playername = getstringfield_default(L, 1, "playername", "");
+		material_type_param = check_material_type_param(L, 1, "material_type_param", 0);
+		glow = getintfield_default(L, 1, "glow", 0);
 	}
 
 	u32 id = getServer(L)->addParticleSpawner(amount, time,
@@ -223,9 +371,17 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 			collision_removal,
 			attached,
 			vertical,
-			texture, playername);
+			texture, 
+			playername, 
+			material_type_param, 
+			animation_type,
+			vertical_frame_num_or_aspect, 
+			horizontal_frame_num_or_aspect,
+			min_first_frame, max_first_frame, 
+			frame_or_loop_length, 
+			loop_animation,
+			glow);
 	lua_pushnumber(L, id);
-
 	return 1;
 }
 
diff --git a/src/server.cpp b/src/server.cpp
index 48331e4f8..cef57be88 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1658,7 +1658,11 @@ void Server::SendShowFormspecMessage(u16 peer_id, const std::string &formspec,
 void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f acceleration,
 				float expirationtime, float size, bool collisiondetection,
 				bool collision_removal,
-				bool vertical, const std::string &texture)
+				bool vertical, const std::string &texture,
+				u32 material_type_param,  AnimationType animation_type,
+				u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
+				float frame_length, bool loop_animation, 
+				u8 glow)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -1670,6 +1674,12 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
 	pkt << vertical;
 	pkt << collision_removal;
 
+	pkt << material_type_param 
+		<< (u8)animation_type
+		<< vertical_frame_num 
+		<< horizontal_frame_num << first_frame 
+		<< frame_length << loop_animation << glow;
+
 	if (peer_id != PEER_ID_INEXISTENT) {
 		Send(&pkt);
 	}
@@ -1682,7 +1692,10 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
 void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3f minpos, v3f maxpos,
 	v3f minvel, v3f maxvel, v3f minacc, v3f maxacc, float minexptime, float maxexptime,
 	float minsize, float maxsize, bool collisiondetection, bool collision_removal,
-	u16 attached_id, bool vertical, const std::string &texture, u32 id)
+	u16 attached_id, bool vertical, const std::string &texture, u32 id,
+	u32 material_type_param,  AnimationType animation_type, u16 vertical_frame_num, u16 horizontal_frame_num, 
+	u16 min_first_frame, u16 max_first_frame, float frame_length, 
+	bool loop_animation, u8 glow)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -1698,6 +1711,12 @@ void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3
 	pkt << collision_removal;
 	pkt << attached_id;
 
+	pkt << material_type_param 
+		<< (u8)animation_type
+		<< vertical_frame_num << horizontal_frame_num 
+		<< min_first_frame << max_first_frame
+		<< frame_length << loop_animation << glow;
+
 	if (peer_id != PEER_ID_INEXISTENT) {
 		Send(&pkt);
 	}
@@ -3147,7 +3166,11 @@ void Server::spawnParticle(const std::string &playername, v3f pos,
 	v3f velocity, v3f acceleration,
 	float expirationtime, float size, bool
 	collisiondetection, bool collision_removal,
-	bool vertical, const std::string &texture)
+	bool vertical, const std::string &texture,
+	u32 material_type_param,  AnimationType animation_type,
+	u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
+	float frame_length, bool loop_animation,
+	u8 glow)
 {
 	// m_env will be NULL if the server is initializing
 	if (!m_env)
@@ -3163,7 +3186,11 @@ void Server::spawnParticle(const std::string &playername, v3f pos,
 
 	SendSpawnParticle(peer_id, pos, velocity, acceleration,
 			expirationtime, size, collisiondetection,
-			collision_removal, vertical, texture);
+			collision_removal, vertical, texture,
+			material_type_param, animation_type,
+			vertical_frame_num, horizontal_frame_num, 
+			first_frame, frame_length, loop_animation, 
+			glow);
 }
 
 u32 Server::addParticleSpawner(u16 amount, float spawntime,
@@ -3171,7 +3198,9 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 	float minexptime, float maxexptime, float minsize, float maxsize,
 	bool collisiondetection, bool collision_removal,
 	ServerActiveObject *attached, bool vertical, const std::string &texture,
-	const std::string &playername)
+	const std::string &playername,	u32 material_type_param,  AnimationType animation_type,
+	u16 vertical_frame_num, u16 horizontal_frame_num, u16 min_first_frame, u16 max_first_frame, 
+	float frame_length, bool loop_animation, u8 glow)
 {
 	// m_env will be NULL if the server is initializing
 	if (!m_env)
@@ -3197,7 +3226,10 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 		minpos, maxpos, minvel, maxvel, minacc, maxacc,
 		minexptime, maxexptime, minsize, maxsize,
 		collisiondetection, collision_removal, attached_id, vertical,
-		texture, id);
+		texture, id, material_type_param, animation_type,
+		vertical_frame_num, horizontal_frame_num, 
+		min_first_frame, max_first_frame, frame_length, loop_animation,
+		glow);
 
 	return id;
 }
diff --git a/src/server.h b/src/server.h
index 9e844e36c..9a8d22b2e 100644
--- a/src/server.h
+++ b/src/server.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "hud.h"
 #include "gamedef.h"
 #include "serialization.h" // For SER_FMT_VER_INVALID
+#include "nodedef.h" // AnimationType
 #include "mods.h"
 #include "inventorymanager.h"
 #include "subgame.h"
@@ -254,7 +255,11 @@ public:
 		v3f pos, v3f velocity, v3f acceleration,
 		float expirationtime, float size,
 		bool collisiondetection, bool collision_removal,
-		bool vertical, const std::string &texture);
+		bool vertical, const std::string &texture,
+		u32 material_type_param,  AnimationType animation_type, 
+		u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
+		float frame_length, bool loop_animation,
+		u8 glow);
 
 	u32 addParticleSpawner(u16 amount, float spawntime,
 		v3f minpos, v3f maxpos,
@@ -265,7 +270,12 @@ public:
 		bool collisiondetection, bool collision_removal,
 		ServerActiveObject *attached,
 		bool vertical, const std::string &texture,
-		const std::string &playername);
+		const std::string &playername,
+		u32 material_type_param,  AnimationType animation_type, 
+		u16 vertical_frame_num, u16 horizontal_frame_num, 
+		u16 min_first_frame, u16 max_first_frame, 
+		float frame_length, bool loop_animation,
+		u8 glow);
 
 	void deleteParticleSpawner(const std::string &playername, u32 id);
 
@@ -441,7 +451,12 @@ private:
 		float minsize, float maxsize,
 		bool collisiondetection, bool collision_removal,
 		u16 attached_id,
-		bool vertical, const std::string &texture, u32 id);
+		bool vertical, const std::string &texture, u32 id,
+		u32 material_type_param,  AnimationType animation_type, 
+		u16 vertical_frame_num, u16 horizontal_frame_num, 
+		u16 min_first_frame, u16 max_first_frame, 
+		float frame_length, bool loop_animation,
+		u8 glow);
 
 	void SendDeleteParticleSpawner(u16 peer_id, u32 id);
 
@@ -450,7 +465,11 @@ private:
 		v3f pos, v3f velocity, v3f acceleration,
 		float expirationtime, float size,
 		bool collisiondetection, bool collision_removal,
-		bool vertical, const std::string &texture);
+		bool vertical, const std::string &texture,
+		u32 material_type_param,  AnimationType animation_type, 
+		u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
+		float frame_length, bool loop_animation,
+		u8 glow);
 
 	u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
 	void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);

From 5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Mon, 14 Nov 2016 15:28:06 +0100
Subject: [PATCH 304/418] Revert "Adding particle blend, glow and animation
 (#4705)"

This reverts commit 93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef.
---
 builtin/common/misc_helpers.lua     |  37 -----
 doc/lua_api.txt                     | 189 +-------------------------
 src/client.h                        |  18 ---
 src/network/clientpackethandler.cpp | 111 +++++----------
 src/nodedef.cpp                     |   4 +-
 src/nodedef.h                       |  11 +-
 src/particles.cpp                   | 203 +++-------------------------
 src/particles.h                     |  32 +----
 src/script/common/c_content.cpp     |  13 +-
 src/script/common/c_content.h       |   2 +-
 src/script/common/c_converter.cpp   |  22 ---
 src/script/common/c_converter.h     |   2 -
 src/script/lua_api/l_particles.cpp  | 166 +----------------------
 src/server.cpp                      |  44 +-----
 src/server.h                        |  27 +---
 15 files changed, 81 insertions(+), 800 deletions(-)

diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index a495058d9..c2dc7514d 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -237,43 +237,6 @@ function math.sign(x, tolerance)
 	return 0
 end
 
---------------------------------------------------------------------------------
--- Video enums and pack function
-
--- E_BLEND_FACTOR
-minetest.ebf = {			     
-	zero			= 0, -- src & dest (0, 0, 0, 0)
-	one			= 1, -- src & dest (1, 1, 1, 1)
-	dst_color 		= 2, -- src (destR, destG, destB, destA)
-	one_minus_dst_color 	= 3, -- src (1-destR, 1-destG, 1-destB, 1-destA)
-	src_color 		= 4, -- dest (srcR, srcG, srcB, srcA)
-	one_minus_src_color 	= 5, -- dest (1-srcR, 1-srcG, 1-srcB, 1-srcA)
-	src_alpha 		= 6, -- src & dest (srcA, srcA, srcA, srcA)
-	one_minus_src_alpha 	= 7, -- src & dest (1-srcA, 1-srcA, 1-srcA, 1-srcA)
-	dst_alpha 		= 8, -- src & dest (destA, destA, destA, destA)
-	one_minus_dst_alpha 	= 9, -- src & dest (1-destA, 1-destA, 1-destA, 1-destA)
-	src_alpha_saturate  	= 10,-- src (min(srcA, 1-destA), idem, ...) 
-}
-
--- E_MODULATE_FUNC
-minetest.emfn = {
-	modulate_1x    = 1,
-	modulate_2x    = 2,
-	modulate_4x    = 4,
-}
-
--- E_ALPHA_SOURCE
-minetest.eas = {
-	none	 = 0,
-	vertex_color = 1,
-	texture	 = 2,
-}
-
--- BlendFunc = source * sourceFactor + dest * destFactor
-function minetest.pack_texture_blend_func(srcFact, dstFact, modulate, alphaSource) 
-	return alphaSource * 4096 + modulate * 256 + srcFact * 16 + dstFact
-end
-
 --------------------------------------------------------------------------------
 function get_last_folder(text,count)
 	local parts = text:split(DIR_DELIM)
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 3b3f17634..7d552c980 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -414,119 +414,6 @@ the word "`alpha`", then each texture pixel will contain the RGB of
 `<color>` and the alpha of `<color>` multiplied by the alpha of the
 texture pixel.
 
-Particle blend
---------------
-Blend function is defined by integer number.
-There is a huge number of acceptable blend modificators.
-Colour of a resulting pixel calculated using formulae:
-
-	red = source_red * source_factor + destination_red * destination_factor
-
-and so on for every channel.
-
-Here is a some examples:
-
-Default value:
-
-	material_type_param = 0,
-
-Use this value to disable blending. Texture will be applied to existing pixels
-using alpha channel of it. Its recomended to use 1-bit alpha
-in that case. This value will leave z-buffer writeable.
-
-Additive blend:
-
-	material_type_param = 12641,
-
-Source = src_alpha, destination = one, alpha source is a texture and 
-vertex_color, modulate_1x.
-Black color is completely transparent, white color is completely opaque.
-Alpha channel still used to calculate result color, but not nessesary.
-'destination = one' means that resulting color will be calculated using 
-overwritten pixels values.
-For example with color of source (our texture) RGBA = (0,192,255,63)
-"blue-cyan", 1/4 opaque.
-and already rendered pixel color (40,192,0) "dark lime green" we will get color:
-
-R = source_red(0) * source_factor(src_alpha=63/255) + 
-	destination_red(40) * destination_factor(one) =
-	0 * 63/255 + 40 * 1 = 40
-
-G = 192 * 63/255 + 192 * 1 = 239
-B = 255 * 63/255 + 0 * 1 = 63
-
-Result: (40,239,63), "green" (a kind of).
-Note, if you made a texture with some kind of shape with colour 662211h 
-it will appear dark red with a single particle, then yellow with a 
-several of them and white if player looking thru a lot of them. With 
-this you could made a nice-looking fire.
-
-Substractive blend:
-	
-	material_type_param = 12548,
-
-Source = zero, destination = src_color, alpha source is a texture and 
-vertex_color, modulate_1x.
-Texture darkness act like an alpha channel.
-Black color is completely opaque, white color is completely transparent.
-'destination = src_color' means that destination in multiplied by
-a source values. 'source = zero' means that source values ignored
-(multiplied by 0).
-
-Invert blend:
-
-	material_type_param = 12597,
-	
-Source = one_minus_dst_color, destination = one_minus_src_alpha, alpha source 
-is a texture and vertex_color, modulate_1x.
-Pixels invert color if source color value is big enough. If not, they just
-black.
-'destination = one_minus_src_alpha' means, that effect is masked by a
-source alpha channel.
-
-You can design and use your own blend using those enum values and function
-'minetest.pack_texture_blend_func'. Returned value of a function is 
-your 'material_type_param'.
-
-A values in a brackets is a multiplicators of a red, green, blue 
-and alpha channels respectively.
-
-* 'minetest.ebf': global table, containing blend factor enum values. Such as:
-    *	zero			= 0  -- src & dest (0, 0, 0, 0)
-    *	one			= 1  -- src & dest (1, 1, 1, 1)
-    *	dst_color 		= 2  -- src (destR, destG, destB, destA)
-    *	one_minus_dst_color 	= 3  -- src (1-destR, 1-destG, 1-destB, 1-destA)
-    *	src_color 		= 4  -- dest (srcR, srcG, srcB, srcA)
-    *	one_minus_src_color 	= 5  -- dest (1-srcR, 1-srcG, 1-srcB, 1-srcA)
-    *	src_alpha 		= 6  -- src & dest (srcA, srcA, srcA, srcA)
-    *	one_minus_src_alpha 	= 7  -- src & dest (1-srcA, 1-srcA, 1-srcA, 1-srcA)
-    *	dst_alpha 		= 8  -- src & dest (destA, destA, destA, destA)
-    *	one_minus_dst_alpha 	= 9  -- src & dest (1-destA, 1-destA, 1-destA, 1-destA)
-    *	src_alpha_saturate  	= 10 -- src (min(srcA, 1-destA), idem, ...) 
-
-* 'minetest.emfn': global table, containing modulate enum values. 
-    * Multiply the components of the arguments, and shift the products to the 
-    * left by x bits for brightening. Contain:
-    *	modulate_1x    = 1 -- no bit shift
-    *	modulate_2x    = 2 -- 1 bits shift
-    *	modulate_4x    = 4 -- 2 bits shift
-
-'modulate_4x' is quite useful when you want to make additive blend stronger
-with a lower amount of particles.
-
-* 'minetest.eas': global table, containing alpha source enum values. Such as:
-    *	none	 	= 0 -- do not use alpha.
-    *	vertex_color 	= 1 -- use vertex color alpha.
-    *	texture	 	= 2 -- use texture alpha.
-
-You can use both 'vertex_color' and 'texture' source by using value 3.
-
-* 'minetest.pack_texture_blend_func(srcFact, dstFact, modulate, alphaSource)': return integer
-    * Pack texture blend funcion variable. Depending from that variable blend 
-    * function will be applied in time of a render poligons with selected material.
-    * Therefore resulting pixel will be 'source * srcFact + destination * dstFact'
-    * Use result of this function as 'material_type_param'.
-
 Sounds
 ------
 Only Ogg Vorbis files are supported.
@@ -3763,7 +3650,7 @@ Definition tables
 
 ### Tile definition
 * `"image.png"`
-* `{name="image.png", animation={Animation definition}}`
+* `{name="image.png", animation={Tile Animation definition}}`
 * `{name="image.png", backface_culling=bool, tileable_vertical=bool,
     tileable_horizontal=bool}`
     * backface culling enabled by default for most nodes
@@ -3774,50 +3661,8 @@ Definition tables
 * deprecated, yet still supported field names:
     * `image` (name)
 
-### Animation definition
-
-#### Node animation, particle and particle spawners
-* `{	type="vertical_frames", 
-	aspect_w=16, 
-    --  ^ specify width of a picture in pixels. 
-	aspect_h=16, 
-    --  ^ specify height of a frame in pixels. 
-	length=3.0
-    --  ^ specify full loop length. 
-	first_frame = 0, -- <- only for particles, use
-	min_first_frame = 0, -- <- for particle spawners
-	max_first_frame = 0,
-	loop_animation = true,  -- <- only for particles and particle spawners
-    --  specify if animation should start from beginning after last frame.
-}`
-
-#### Particle and particle spawners only
-* `{	
-	type="2d_animation_sheet", -- <- only for particles and particle spawners
-	vertical_frame_num = 1,
-	horizontal_frame_num = 1,
-    --  ^ specify amount of frames in texture. 
-    --	Can be used both for animation or for texture transform 
-    --	together with first_frame variable.
-    --	A animation texture separated on equal parts of frames,
-    --	by horizontal and vertical numbers. For example with 
-    --	vertical_frame_num = 4 and horizontal_frame_num = 3 we got
-    --	4*3 = 12 frames in total. Animation sequence start from
-    --	left top frame and go on to the right until reach end of
-    --	row. Next row also start from left frame.
-	first_frame = 0, -- <- only for particles, use
-	min_first_frame = 0, -- <- for particle spawners
-	max_first_frame = 0,
-    --  ^ specify first frame to start animation.
-	frame_length = -1,
-    --  ^ specify length of a frame in seconds. Negative and zero values
-    --	disable animation. A sequence with vertical_frame_num = 4 and 
-    --	horizontal_frame_num = 3, first_frame = 4 and frame_length = 0.1 
-    --	will end in (4*3-4)*0.1 = 0.8 seconds.
-	loop_animation = true,
-    --  specify if animation should start from beginning after last frame.
-}`
-    * All settings are optional. Default values is located in this example.
+### Tile animation definition
+* `{type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}`
 
 ### Node definition (`register_node`)
 
@@ -4272,20 +4117,6 @@ The Biome API is still in an experimental phase and subject to change.
     --  ^ Uses texture (string)
         playername = "singleplayer"
     --  ^ optional, if specified spawns particle only on the player's client
-	material_type_param = 12641,
-    --  ^ optional, if specified spawns particle with 
-    --  specified material type param and disable z-buffer.
-    --  Some examples:
-    --  Default value: 0,
-    --  Additive blend: 12641,
-    --  Substractive blend: 12548,
-    --  Invert blend: 12597,
-    --  See also "Particle blend".
-    	animation = {Animation definition},
-    --	^ see above. Note, that particle and particle spawners have differences.
-	glow = 15,
-    --  ^ optional, specify particle self-luminescence in darkness. 
-	values may vary from 0 (no glow) to 15 (bright glow). 
     }
 
 ### `ParticleSpawner` definition (`add_particlespawner`)
@@ -4320,20 +4151,6 @@ The Biome API is still in an experimental phase and subject to change.
     --  ^ Uses texture (string)
         playername = "singleplayer"
     --  ^ Playername is optional, if specified spawns particle only on the player's client
-	material_type_param = 12641,
-    --	^ optional, if specified spawns particle with specified material type 
-    --	param and disable z-buffer.
-    --  Some examples:
-    --  Default value: 0,
-    --  Additive blend: 12641,
-    --  Substractive blend: 12548,
-    --  Invert blend: 12597,
-    --  See also "Particle blend".
-    	animation = {Animation definition},
-    --	^ see above. Note, that particle and particle spawners have differences.
-	glow = 15,
-    --  ^ optional, specify particle self-luminescence in darkness. 
-	values may vary from 0 (no glow) to 15 (bright glow).
     }
 
 ### `HTTPRequest` definition (`HTTPApiTable.fetch_async`, `HTTPApiTable.fetch_async`)
diff --git a/src/client.h b/src/client.h
index c51daf7bc..9f5bda059 100644
--- a/src/client.h
+++ b/src/client.h
@@ -35,7 +35,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "hud.h"
 #include "particles.h"
 #include "network/networkpacket.h"
-#include "nodedef.h" // AnimationType
 
 struct MeshMakeData;
 class MapBlockMesh;
@@ -186,14 +185,6 @@ struct ClientEvent
 			bool collision_removal;
 			bool vertical;
 			std::string *texture;
-			u32 material_type_param;
-			AnimationType animation_type;
-			u16 vertical_frame_num;
-			u16 horizontal_frame_num;
-			u16 first_frame;
-			float frame_length;
-			bool loop_animation;
-			u8 glow;
 		} spawn_particle;
 		struct{
 			u16 amount;
@@ -214,15 +205,6 @@ struct ClientEvent
 			bool vertical;
 			std::string *texture;
 			u32 id;
-			u32 material_type_param;
-			AnimationType animation_type;
-			u16 vertical_frame_num;
-			u16 horizontal_frame_num;
-			u16 min_first_frame;
-			u16 max_first_frame;
-			float frame_length;
-			bool loop_animation;
-			u8 glow;
 		} add_particlespawner;
 		struct{
 			u32 id;
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 03baf078a..411982f69 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -896,46 +896,23 @@ void Client::handleCommand_SpawnParticle(NetworkPacket* pkt)
 	std::string texture     = deSerializeLongString(is);
 	bool vertical           = false;
 	bool collision_removal  = false;
-	u32 material_type_param = 0;
-	AnimationType animation_type = AT_NONE;
-	u16 vertical_frame_num = 1;
-	u16 horizontal_frame_num = 1;
-	u16 first_frame = 0;
-	float frame_length = -1;
-	bool loop_animation = true;
-	u8 glow = 0;
 	try {
 		vertical = readU8(is);
 		collision_removal = readU8(is);
-		material_type_param = readU32(is);
-		animation_type = (AnimationType)readU8(is);
-		vertical_frame_num = readU16(is);
-		horizontal_frame_num = readU16(is);
-		first_frame = readU16(is);
-		frame_length = readF1000(is);
-		loop_animation = readU8(is);
-		glow = readU8(is);
 	} catch (...) {}
 
 	ClientEvent event;
-	event.type                                 = CE_SPAWN_PARTICLE;
-	event.spawn_particle.pos                   = new v3f (pos);
-	event.spawn_particle.vel                   = new v3f (vel);
-	event.spawn_particle.acc                   = new v3f (acc);
-	event.spawn_particle.expirationtime        = expirationtime;
-	event.spawn_particle.size                  = size;
-	event.spawn_particle.collisiondetection	   = collisiondetection;
-	event.spawn_particle.collision_removal     = collision_removal;
-	event.spawn_particle.vertical              = vertical;
-	event.spawn_particle.texture               = new std::string(texture);
-	event.spawn_particle.material_type_param   = material_type_param;
-	event.spawn_particle.animation_type        = animation_type;
-	event.spawn_particle.vertical_frame_num    = vertical_frame_num;
-	event.spawn_particle.horizontal_frame_num  = horizontal_frame_num;
-	event.spawn_particle.first_frame           = first_frame;
-	event.spawn_particle.frame_length          = frame_length;
-	event.spawn_particle.loop_animation        = loop_animation;
-	event.spawn_particle.glow                  = glow;
+	event.type                              = CE_SPAWN_PARTICLE;
+	event.spawn_particle.pos                = new v3f (pos);
+	event.spawn_particle.vel                = new v3f (vel);
+	event.spawn_particle.acc                = new v3f (acc);
+	event.spawn_particle.expirationtime     = expirationtime;
+	event.spawn_particle.size               = size;
+	event.spawn_particle.collisiondetection = collisiondetection;
+	event.spawn_particle.collision_removal  = collision_removal;
+	event.spawn_particle.vertical           = vertical;
+	event.spawn_particle.texture            = new std::string(texture);
+
 	m_client_event_queue.push(event);
 }
 
@@ -955,15 +932,6 @@ void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt)
 	float maxsize;
 	bool collisiondetection;
 	u32 id;
-	u32 material_type_param = 0;
-	u8 animation_type = (u8)AT_NONE;
-	u16 vertical_frame_num = 1;
-	u16 horizontal_frame_num = 1;
-	u16 min_first_frame = 0;
-	u16 max_first_frame = 0;
-	float frame_length = -1;
-	bool loop_animation = true;
-	u8 glow = 0;
 
 	*pkt >> amount >> spawntime >> minpos >> maxpos >> minvel >> maxvel
 		>> minacc >> maxacc >> minexptime >> maxexptime >> minsize
@@ -980,46 +948,29 @@ void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt)
 		*pkt >> vertical;
 		*pkt >> collision_removal;
 		*pkt >> attached_id;
-		*pkt >> material_type_param;
-		*pkt >> animation_type;
-		*pkt >> vertical_frame_num;
-		*pkt >> horizontal_frame_num;
-		*pkt >> min_first_frame;
-		*pkt >> max_first_frame;
-		*pkt >> frame_length;
-		*pkt >> loop_animation;
-		*pkt >> glow;
+
 	} catch (...) {}
 
 	ClientEvent event;
-	event.type                                     = CE_ADD_PARTICLESPAWNER;
-	event.add_particlespawner.amount               = amount;
-	event.add_particlespawner.spawntime            = spawntime;
-	event.add_particlespawner.minpos               = new v3f (minpos);
-	event.add_particlespawner.maxpos               = new v3f (maxpos);
-	event.add_particlespawner.minvel               = new v3f (minvel);
-	event.add_particlespawner.maxvel               = new v3f (maxvel);
-	event.add_particlespawner.minacc               = new v3f (minacc);
-	event.add_particlespawner.maxacc               = new v3f (maxacc);
-	event.add_particlespawner.minexptime           = minexptime;
-	event.add_particlespawner.maxexptime           = maxexptime;
-	event.add_particlespawner.minsize              = minsize;
-	event.add_particlespawner.maxsize              = maxsize;
-	event.add_particlespawner.collisiondetection   = collisiondetection;
-	event.add_particlespawner.collision_removal    = collision_removal;
-	event.add_particlespawner.attached_id          = attached_id;
-	event.add_particlespawner.vertical             = vertical;
-	event.add_particlespawner.texture              = new std::string(texture);
-	event.add_particlespawner.id                   = id;
-	event.add_particlespawner.material_type_param  = material_type_param;
-	event.add_particlespawner.animation_type       = (AnimationType)animation_type;
-	event.add_particlespawner.vertical_frame_num   = vertical_frame_num;
-	event.add_particlespawner.horizontal_frame_num = horizontal_frame_num;
-	event.add_particlespawner.min_first_frame      = min_first_frame;
-	event.add_particlespawner.max_first_frame      = max_first_frame;
-	event.add_particlespawner.frame_length	       = frame_length;
-	event.add_particlespawner.loop_animation       = loop_animation;
-	event.add_particlespawner.glow                 = glow;
+	event.type                                   = CE_ADD_PARTICLESPAWNER;
+	event.add_particlespawner.amount             = amount;
+	event.add_particlespawner.spawntime          = spawntime;
+	event.add_particlespawner.minpos             = new v3f (minpos);
+	event.add_particlespawner.maxpos             = new v3f (maxpos);
+	event.add_particlespawner.minvel             = new v3f (minvel);
+	event.add_particlespawner.maxvel             = new v3f (maxvel);
+	event.add_particlespawner.minacc             = new v3f (minacc);
+	event.add_particlespawner.maxacc             = new v3f (maxacc);
+	event.add_particlespawner.minexptime         = minexptime;
+	event.add_particlespawner.maxexptime         = maxexptime;
+	event.add_particlespawner.minsize            = minsize;
+	event.add_particlespawner.maxsize            = maxsize;
+	event.add_particlespawner.collisiondetection = collisiondetection;
+	event.add_particlespawner.collision_removal  = collision_removal;
+	event.add_particlespawner.attached_id        = attached_id;
+	event.add_particlespawner.vertical           = vertical;
+	event.add_particlespawner.texture            = new std::string(texture);
+	event.add_particlespawner.id                 = id;
 
 	m_client_event_queue.push(event);
 }
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index c690e6720..39ea1a60e 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -211,7 +211,7 @@ void TileDef::deSerialize(std::istream &is, const u8 contenfeatures_version, con
 {
 	int version = readU8(is);
 	name = deSerializeString(is);
-	animation.type = (AnimationType)readU8(is);
+	animation.type = (TileAnimationType)readU8(is);
 	animation.aspect_w = readU16(is);
 	animation.aspect_h = readU16(is);
 	animation.length = readF1000(is);
@@ -531,7 +531,7 @@ void ContentFeatures::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
 	tile->material_flags = 0;
 	if (backface_culling)
 		tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
-	if (tiledef->animation.type == AT_VERTICAL_FRAMES)
+	if (tiledef->animation.type == TAT_VERTICAL_FRAMES)
 		tile->material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
 	if (tiledef->tileable_horizontal)
 		tile->material_flags |= MATERIAL_FLAG_TILEABLE_HORIZONTAL;
diff --git a/src/nodedef.h b/src/nodedef.h
index f47517c4a..80396f992 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -161,10 +161,9 @@ enum NodeDrawType
 /*
 	Stand-alone definition of a TileSpec (basically a server-side TileSpec)
 */
-enum AnimationType{
-	AT_NONE = 0,
-	AT_VERTICAL_FRAMES = 1,
-	AT_2D_ANIMATION_SHEET = 2,
+enum TileAnimationType{
+	TAT_NONE=0,
+	TAT_VERTICAL_FRAMES=1,
 };
 struct TileDef
 {
@@ -173,7 +172,7 @@ struct TileDef
 	bool tileable_horizontal;
 	bool tileable_vertical;
 	struct{
-		enum AnimationType type;
+		enum TileAnimationType type;
 		int aspect_w; // width for aspect ratio
 		int aspect_h; // height for aspect ratio
 		float length; // seconds
@@ -185,7 +184,7 @@ struct TileDef
 		backface_culling = true;
 		tileable_horizontal = true;
 		tileable_vertical = true;
-		animation.type = AT_NONE;
+		animation.type = TAT_NONE;
 		animation.aspect_w = 1;
 		animation.aspect_h = 1;
 		animation.length = 1.0;
diff --git a/src/particles.cpp b/src/particles.cpp
index 538487028..f20fb4083 100644
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -43,22 +43,6 @@ v3f random_v3f(v3f min, v3f max)
 			rand()/(float)RAND_MAX*(max.Z-min.Z)+min.Z);
 }
 
-u32 check_material_type_param(u32 material_type_param)
-{
-	u32 alphaSource = (material_type_param & 0x0000F000) >> 12;
-	u32 modulo  = (material_type_param & 0x00000F00) >> 8;
-	u32 srcFact = (material_type_param & 0x000000F0) >> 4;
-	u32 dstFact = material_type_param & 0x0000000F;
-	if (alphaSource <= 3 && modulo <= 4 && srcFact <= 10 && dstFact <= 10) {
-		return material_type_param;
-	} else {
-		errorstream << "Server send incorrect ";
-		errorstream << "material_type_param value for particle.";
-		errorstream << std::endl;
-		return 0;
-	}
-}
-
 Particle::Particle(
 	IGameDef *gamedef,
 	scene::ISceneManager* smgr,
@@ -74,14 +58,7 @@ Particle::Particle(
 	bool vertical,
 	video::ITexture *texture,
 	v2f texpos,
-	v2f texsize,
-	u32 material_type_param,
-	u16 vertical_frame_num,
-	u16 horizontal_frame_num,
-	u16 first_frame,
-	float frame_length,
-	bool loop_animation,
-	u8 glow
+	v2f texsize
 ):
 	scene::ISceneNode(smgr->getRootSceneNode(), smgr)
 {
@@ -94,26 +71,11 @@ Particle::Particle(
 	m_material.setFlag(video::EMF_BACK_FACE_CULLING, false);
 	m_material.setFlag(video::EMF_BILINEAR_FILTER, false);
 	m_material.setFlag(video::EMF_FOG_ENABLE, true);
-	if (material_type_param != 0) {
-		m_material.MaterialType = video::EMT_ONETEXTURE_BLEND;
-		m_material.MaterialTypeParam = irr::core::FR(material_type_param);
-		// We must disable z-buffer if we want to avoid transparent pixels
-		// to overlap pixels with lower z-value.
-		m_material.setFlag(video::EMF_ZWRITE_ENABLE, false); 
-	} else {
-		m_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-	}
+	m_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 	m_material.setTexture(0, texture);
-
 	m_texpos = texpos;
 	m_texsize = texsize;
-	m_vertical_frame_num = vertical_frame_num;
-	m_horizontal_frame_num = horizontal_frame_num;
-	m_first_frame = first_frame;
-	m_frame_length = frame_length;
-	m_loop_animation = loop_animation;
-	m_texsize.Y /= m_vertical_frame_num;
-	m_texsize.X /= m_horizontal_frame_num;
+
 
 	// Particle related
 	m_pos = pos;
@@ -126,7 +88,6 @@ Particle::Particle(
 	m_collisiondetection = collisiondetection;
 	m_collision_removal = collision_removal;
 	m_vertical = vertical;
-	m_glow = glow;
 
 	// Irrlicht stuff
 	m_collisionbox = aabb3f
@@ -209,29 +170,16 @@ void Particle::updateLight()
 	else
 		light = blend_light(m_env->getDayNightRatio(), LIGHT_SUN, 0);
 
-	m_light = decode_light(light + m_glow);
+	m_light = decode_light(light);
 }
 
 void Particle::updateVertices()
 {
 	video::SColor c(255, m_light, m_light, m_light);
-	u16 frame = m_first_frame;
-	if (m_frame_length > 0) {
-		if (m_loop_animation)
-			frame = m_first_frame + (u32)(m_time / m_frame_length)
-					% (m_vertical_frame_num * 
-					m_horizontal_frame_num - m_first_frame);
-		else if (m_time >= 
-				(m_vertical_frame_num * m_horizontal_frame_num 
-				- m_first_frame) * m_frame_length)
-			frame = m_vertical_frame_num * m_horizontal_frame_num - 1;
-		else
-			frame = m_first_frame + (u16)(m_time / m_frame_length);
-	}
-	f32 tx0 = m_texpos.X + m_texsize.X * (frame % m_horizontal_frame_num);
-	f32 tx1 = m_texpos.X + m_texsize.X * (frame % m_horizontal_frame_num + 1);
-	f32 ty0 = m_texpos.Y + m_texsize.Y * (frame / m_horizontal_frame_num);
-	f32 ty1 = m_texpos.Y + m_texsize.Y * (frame / m_horizontal_frame_num + 1);
+	f32 tx0 = m_texpos.X;
+	f32 tx1 = m_texpos.X + m_texsize.X;
+	f32 ty0 = m_texpos.Y;
+	f32 ty1 = m_texpos.Y + m_texsize.Y;
 
 	m_vertices[0] = video::S3DVertex(-m_size/2,-m_size/2,0, 0,0,0,
 			c, tx0, ty1);
@@ -266,16 +214,7 @@ ParticleSpawner::ParticleSpawner(IGameDef* gamedef, scene::ISceneManager *smgr,
 	v3f minpos, v3f maxpos, v3f minvel, v3f maxvel, v3f minacc, v3f maxacc,
 	float minexptime, float maxexptime, float minsize, float maxsize,
 	bool collisiondetection, bool collision_removal, u16 attached_id, bool vertical,
-	video::ITexture *texture, u32 id, 
-	u32 material_type_param,
-	u16 vertical_frame_num,
-	u16 horizontal_frame_num,
-	u16 min_first_frame,
-	u16 max_first_frame,
-	float frame_length,
-	bool loop_animation,
-	u8 glow,
-	ParticleManager *p_manager) :
+	video::ITexture *texture, u32 id, ParticleManager *p_manager) :
 	m_particlemanager(p_manager)
 {
 	m_gamedef = gamedef;
@@ -299,14 +238,6 @@ ParticleSpawner::ParticleSpawner(IGameDef* gamedef, scene::ISceneManager *smgr,
 	m_vertical = vertical;
 	m_texture = texture;
 	m_time = 0;
-	m_vertical_frame_num = vertical_frame_num;
-	m_horizontal_frame_num = horizontal_frame_num;
-	m_min_first_frame = min_first_frame;
-	m_max_first_frame = max_first_frame;
-	m_frame_length = frame_length;
-	m_loop_animation = loop_animation;
-	m_material_type_param = material_type_param;
-	m_glow = glow;
 
 	for (u16 i = 0; i<=m_amount; i++)
 	{
@@ -320,6 +251,7 @@ ParticleSpawner::~ParticleSpawner() {}
 void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 {
 	m_time += dtime;
+
 	bool unloaded = false;
 	v3f attached_offset = v3f(0,0,0);
 	if (m_attached_id != 0) {
@@ -353,10 +285,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 					float size = rand()/(float)RAND_MAX
 							*(m_maxsize-m_minsize)
 							+m_minsize;
-					u16 first_frame = m_min_first_frame + 
-							rand() % 
-							(m_max_first_frame - 
-							m_min_first_frame + 1);
+
 					Particle* toadd = new Particle(
 						m_gamedef,
 						m_smgr,
@@ -372,14 +301,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 						m_vertical,
 						m_texture,
 						v2f(0.0, 0.0),
-						v2f(1.0, 1.0),
-						m_material_type_param, 
-						m_vertical_frame_num,
-						m_horizontal_frame_num,
-						first_frame,
-						m_frame_length,
-						m_loop_animation,
-						m_glow);
+						v2f(1.0, 1.0));
 					m_particlemanager->addParticle(toadd);
 				}
 				i = m_spawntimes.erase(i);
@@ -409,10 +331,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 				float size = rand()/(float)RAND_MAX
 						*(m_maxsize-m_minsize)
 						+m_minsize;
-				u16 first_frame = m_min_first_frame + 
-						rand() % 
-						(m_max_first_frame - 
-						m_min_first_frame + 1);
+
 				Particle* toadd = new Particle(
 					m_gamedef,
 					m_smgr,
@@ -428,14 +347,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 					m_vertical,
 					m_texture,
 					v2f(0.0, 0.0),
-					v2f(1.0, 1.0),
-					m_material_type_param, 
-					m_vertical_frame_num,
-					m_horizontal_frame_num,
-					first_frame,
-					m_frame_length,
-					m_loop_animation,
-					m_glow);
+					v2f(1.0, 1.0));
 				m_particlemanager->addParticle(toadd);
 			}
 		}
@@ -547,39 +459,6 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 			video::ITexture *texture =
 				gamedef->tsrc()->getTextureForMesh(*(event->add_particlespawner.texture));
 
-			float frame_length = -1;
-			u16 vertical_frame_num = 1;
-			u16 horizontal_frame_num = 1;
-			u32 material_type_param =
-				check_material_type_param(event->add_particlespawner.material_type_param);
-
-			switch (event->add_particlespawner.animation_type) {
-				case AT_NONE:
-					break;
-				case AT_VERTICAL_FRAMES: {
-					v2u32 size = texture->getOriginalSize();
-					int frame_height = (float)size.X /
-						(float)event->add_particlespawner.vertical_frame_num *
-						(float)event->add_particlespawner.horizontal_frame_num;
-					vertical_frame_num = size.Y / frame_height;
-					frame_length = 
-						event->add_particlespawner.frame_length / 
-						vertical_frame_num;
-					break;
-				}
-				case AT_2D_ANIMATION_SHEET: {
-					vertical_frame_num =
-						event->add_particlespawner.vertical_frame_num;
-					horizontal_frame_num =
-						event->add_particlespawner.horizontal_frame_num;
-					frame_length = 
-						event->add_particlespawner.frame_length;
-					break;
-				}
-				default:
-					break;
-			}
-
 			ParticleSpawner* toadd = new ParticleSpawner(gamedef, smgr, player,
 					event->add_particlespawner.amount,
 					event->add_particlespawner.spawntime,
@@ -599,14 +478,6 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 					event->add_particlespawner.vertical,
 					texture,
 					event->add_particlespawner.id,
-					material_type_param,
-					vertical_frame_num,
-					horizontal_frame_num,
-					event->add_particlespawner.min_first_frame,
-					event->add_particlespawner.max_first_frame,
-					frame_length,
-					event->add_particlespawner.loop_animation,
-					event->add_particlespawner.glow,
 					this);
 
 			/* delete allocated content of event */
@@ -631,39 +502,6 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 			video::ITexture *texture =
 				gamedef->tsrc()->getTextureForMesh(*(event->spawn_particle.texture));
 
-			float frame_length = -1;
-			u16 vertical_frame_num = 1;
-			u16 horizontal_frame_num = 1;
-			u32 material_type_param =
-				check_material_type_param(event->spawn_particle.material_type_param);
-
-			switch (event->spawn_particle.animation_type) {
-				case AT_NONE:
-					break;
-				case AT_VERTICAL_FRAMES: {
-					v2u32 size = texture->getOriginalSize();
-					int frame_height = (float)size.X /
-						(float)event->spawn_particle.vertical_frame_num *
-						(float)event->spawn_particle.horizontal_frame_num;
-					vertical_frame_num = size.Y / frame_height;
-					frame_length = 
-						event->spawn_particle.frame_length / 
-						vertical_frame_num;
-					break;
-				}
-				case AT_2D_ANIMATION_SHEET: {
-					vertical_frame_num =
-						event->spawn_particle.vertical_frame_num;
-					horizontal_frame_num =
-						event->spawn_particle.horizontal_frame_num;
-					frame_length = 
-						event->spawn_particle.frame_length;
-					break;
-				}
-				default:
-					break;
-			}
-
 			Particle* toadd = new Particle(gamedef, smgr, player, m_env,
 					*event->spawn_particle.pos,
 					*event->spawn_particle.vel,
@@ -675,21 +513,13 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
 					event->spawn_particle.vertical,
 					texture,
 					v2f(0.0, 0.0),
-					v2f(1.0, 1.0),
-					material_type_param,
-					vertical_frame_num,
-					horizontal_frame_num,
-					event->spawn_particle.first_frame,
-					frame_length,
-					event->spawn_particle.loop_animation,
-					event->spawn_particle.glow);
+					v2f(1.0, 1.0));
 
 			addParticle(toadd);
 
 			delete event->spawn_particle.pos;
 			delete event->spawn_particle.vel;
 			delete event->spawn_particle.acc;
-			delete event->spawn_particle.texture;
 
 			break;
 		}
@@ -758,8 +588,7 @@ void ParticleManager::addNodeParticle(IGameDef* gamedef, scene::ISceneManager* s
 		false,
 		texture,
 		texpos,
-		texsize,
-		0, 1, 1, 0, -1, true, 0);
+		texsize);
 
 	addParticle(toadd);
 }
diff --git a/src/particles.h b/src/particles.h
index 6d8c6139f..eb8c6665d 100644
--- a/src/particles.h
+++ b/src/particles.h
@@ -50,14 +50,7 @@ class Particle : public scene::ISceneNode
 		bool vertical,
 		video::ITexture *texture,
 		v2f texpos,
-		v2f texsize,
-		u32 material_type_param,
-		u16 vertical_frame_num,
-		u16 horizontal_frame_num,
-		u16 first_frame,
-		float frame_length,
-		bool loop_animation,
-		u8 glow
+		v2f texsize
 	);
 	~Particle();
 
@@ -109,12 +102,6 @@ private:
 	bool m_collision_removal;
 	bool m_vertical;
 	v3s16 m_camera_offset;
-	u16 m_vertical_frame_num;
-	u16 m_horizontal_frame_num;
-	u16 m_first_frame;
-	float m_frame_length;
-	bool m_loop_animation;
-	u8 m_glow;
 };
 
 class ParticleSpawner
@@ -136,15 +123,8 @@ class ParticleSpawner
 		bool vertical,
 		video::ITexture *texture,
 		u32 id,
-		u32 material_type_param,
-		u16 vertical_frame_num,
-		u16 horizontal_frame_num,
-		u16 min_first_frame,
-		u16 max_first_frame,
-		float frame_length,
-		bool loop_animation,
-		u8 glow,
 		ParticleManager* p_manager);
+
 	~ParticleSpawner();
 
 	void step(float dtime, ClientEnvironment *env);
@@ -176,14 +156,6 @@ class ParticleSpawner
 	bool m_collision_removal;
 	bool m_vertical;
 	u16 m_attached_id;
-	u32 m_material_type_param;
-	u16 m_vertical_frame_num;
-	u16 m_horizontal_frame_num;
-	u16 m_min_first_frame;
-	u16 m_max_first_frame;
-	float m_frame_length;
-	bool m_loop_animation;
-	u8 m_glow;
 };
 
 /**
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index d4a25b68b..f20a65903 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -35,11 +35,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "noise.h"
 #include <json/json.h>
 
-struct EnumString es_AnimationType[] =
+struct EnumString es_TileAnimationType[] =
 {
-	{AT_NONE, "none"},
-	{AT_VERTICAL_FRAMES, "vertical_frames"},
-	{AT_2D_ANIMATION_SHEET, "2d_animation_sheet"},
+	{TAT_NONE, "none"},
+	{TAT_VERTICAL_FRAMES, "vertical_frames"},
 	{0, NULL},
 };
 
@@ -336,9 +335,9 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype)
 		lua_getfield(L, index, "animation");
 		if(lua_istable(L, -1)){
 			// {type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}
-			tiledef.animation.type = (AnimationType)
-				getenumfield(L, -1, "type", es_AnimationType,
-				AT_NONE);
+			tiledef.animation.type = (TileAnimationType)
+				getenumfield(L, -1, "type", es_TileAnimationType,
+				TAT_NONE);
 			tiledef.animation.aspect_w =
 				getintfield_default(L, -1, "aspect_w", 16);
 			tiledef.animation.aspect_h =
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index 32fdb4f04..2a2228b6d 100644
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -159,6 +159,6 @@ bool               push_json_value           (lua_State *L,
 void               read_json_value           (lua_State *L, Json::Value &root,
                                               int index, u8 recursion = 0);
 
-extern struct EnumString es_AnimationType[];
+extern struct EnumString es_TileAnimationType[];
 
 #endif /* C_CONTENT_H_ */
diff --git a/src/script/common/c_converter.cpp b/src/script/common/c_converter.cpp
index cfb5e26db..f36298915 100644
--- a/src/script/common/c_converter.cpp
+++ b/src/script/common/c_converter.cpp
@@ -513,28 +513,6 @@ int getintfield_default(lua_State *L, int table,
 	return result;
 }
 
-int check_material_type_param(lua_State *L, int table,
-		const char *fieldname, int default_)
-{
-	int material_type_param =
-		getintfield_default(L, table, fieldname, default_);
-	u32 alphaSource = (material_type_param & 0x0000F000) >> 12;
-	u32 modulo  = (material_type_param & 0x00000F00) >> 8;
-	u32 srcFact = (material_type_param & 0x000000F0) >> 4;
-	u32 dstFact = material_type_param & 0x0000000F;
-	if (alphaSource <= 3 && modulo <= 4 && srcFact <= 10 && dstFact <= 10) {
-		return material_type_param;
-	} else {
-		std::ostringstream error_text;
-		error_text << "Incorrect material_type_param value ";
-		error_text << "for particle or particle spawner.";
-		error_text << std::endl;
-		throw LuaError(error_text.str());
-		return 0;
-	}
-}
-
-
 float getfloatfield_default(lua_State *L, int table,
 		const char *fieldname, float default_)
 {
diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h
index 71ac735c1..a5fbee765 100644
--- a/src/script/common/c_converter.h
+++ b/src/script/common/c_converter.h
@@ -45,8 +45,6 @@ float              getfloatfield_default(lua_State *L, int table,
                              const char *fieldname, float default_);
 int                getintfield_default           (lua_State *L, int table,
                              const char *fieldname, int default_);
-int                check_material_type_param(lua_State *L, int table,
-                             const char *fieldname, int default_);
 
 bool               getstringfield(lua_State *L, int table,
                              const char *fieldname, std::string &result);
diff --git a/src/script/lua_api/l_particles.cpp b/src/script/lua_api/l_particles.cpp
index b0a57ce6d..667ac7272 100644
--- a/src/script/lua_api/l_particles.cpp
+++ b/src/script/lua_api/l_particles.cpp
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_object.h"
 #include "lua_api/l_internal.h"
 #include "common/c_converter.h"
-#include "common/c_content.h"
 #include "server.h"
 #include "particles.h"
 
@@ -35,9 +34,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // collision_removal = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
-// material_type_param = num
-// animation = animation definition
-// glow = indexed color or color string
 int ModApiParticles::l_add_particle(lua_State *L)
 {
 	MAP_LOCK_REQUIRED;
@@ -48,24 +44,13 @@ int ModApiParticles::l_add_particle(lua_State *L)
 
 	float expirationtime, size;
 	expirationtime = size = 1;
-	float frame_or_loop_length = -1;
-	
-	AnimationType animation_type = AT_NONE;
-
-	u16 vertical_frame_num_or_aspect = 1;
-	u16 horizontal_frame_num_or_aspect = 1;
-	u16 first_frame = 0;
 
 	bool collisiondetection, vertical, collision_removal;
 	collisiondetection = vertical = collision_removal = false;
-	bool loop_animation = true;
 
 	std::string texture = "";
 	std::string playername = "";
 
-	u32 material_type_param = 0;
-	u8 glow = 0;
-
 	if (lua_gettop(L) > 1) // deprecated
 	{
 		log_deprecated(L, "Deprecated add_particle call with individual parameters instead of definition");
@@ -109,61 +94,8 @@ int ModApiParticles::l_add_particle(lua_State *L)
 		acc = lua_istable(L, -1) ? check_v3f(L, -1) : acc;
 		lua_pop(L, 1);
 
-		expirationtime = getfloatfield_default(L, 1, "expirationtime", 1);	
+		expirationtime = getfloatfield_default(L, 1, "expirationtime", 1);
 		size = getfloatfield_default(L, 1, "size", 1);
-
-		lua_getfield(L, 1, "animation");
-		if (lua_istable(L, -1)) {
-			animation_type = (AnimationType)
-				getenumfield(L, -1, "type", es_AnimationType,
-				AT_NONE);
-		}
-		switch (animation_type) {
-			case AT_NONE:
-				break;
-			case AT_2D_ANIMATION_SHEET:
-				frame_or_loop_length = 
-					getfloatfield_default(L, -1, "frame_length", -1);
-				vertical_frame_num_or_aspect = 
-					getintfield_default(L, -1, "vertical_frame_num", 1);
-				horizontal_frame_num_or_aspect = 
-					getintfield_default(L, -1, "horizontal_frame_num", 1);
-				first_frame = 
-					getintfield_default(L, -1, "first_frame", 0);
-				loop_animation = 
-					getboolfield_default(L, -1, "loop_animation", true);
-				break;
-			case AT_VERTICAL_FRAMES:
-				frame_or_loop_length = 
-					getfloatfield_default(L, -1, "length", -1);
-				vertical_frame_num_or_aspect = 
-					getintfield_default(L, -1, "aspect_w", 1);
-				horizontal_frame_num_or_aspect = 
-					getintfield_default(L, -1, "aspect_h", 1);
-				first_frame = 
-					getintfield_default(L, -1, "first_frame", 0);
-				loop_animation = 
-					getboolfield_default(L, -1, "loop_animation", true);
-				break;
-			default:
-				break;
-		}
-		lua_pop(L, 1);
-
-		if (animation_type == AT_2D_ANIMATION_SHEET && 
-				first_frame >= vertical_frame_num_or_aspect * 
-				horizontal_frame_num_or_aspect) {
-			std::ostringstream error_text; 
-			error_text << "first_frame should be lower, than "
-				<< "vertical_frame_num * horizontal_frame_num. "
-				<< "Got first_frame=" << first_frame
-				<< ", vertical_frame_num="
-				<< vertical_frame_num_or_aspect
-				<< " and horizontal_frame_num="
-				<< horizontal_frame_num_or_aspect << std::endl;
-			throw LuaError(error_text.str());
-		}
-
 		collisiondetection = getboolfield_default(L, 1,
 			"collisiondetection", collisiondetection);
 		collision_removal = getboolfield_default(L, 1,
@@ -171,16 +103,9 @@ int ModApiParticles::l_add_particle(lua_State *L)
 		vertical = getboolfield_default(L, 1, "vertical", vertical);
 		texture = getstringfield_default(L, 1, "texture", "");
 		playername = getstringfield_default(L, 1, "playername", "");
-		material_type_param = check_material_type_param(L, 1, "material_type_param", 0);
-		glow = getintfield_default (L, 1, "glow", 0);
 	}
-	getServer(L)->spawnParticle(playername, pos, vel, acc, expirationtime, 
-		size, collisiondetection, collision_removal, vertical, 
-		texture, material_type_param,
-		animation_type,
-		vertical_frame_num_or_aspect, 
-		horizontal_frame_num_or_aspect,
-		first_frame, frame_or_loop_length, loop_animation, glow);
+	getServer(L)->spawnParticle(playername, pos, vel, acc, expirationtime, size,
+			collisiondetection, collision_removal, vertical, texture);
 	return 1;
 }
 
@@ -202,33 +127,21 @@ int ModApiParticles::l_add_particle(lua_State *L)
 // collision_removal = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
-// material_type_param = num
-// animation = animation definition
-// glow = indexed color or color string
 int ModApiParticles::l_add_particlespawner(lua_State *L)
 {
 	MAP_LOCK_REQUIRED;
 
 	// Get parameters
 	u16 amount = 1;
-	u16 vertical_frame_num_or_aspect = 1;
-	u16 horizontal_frame_num_or_aspect = 1;
-	u16 min_first_frame = 0;
-	u16 max_first_frame = 0;
 	v3f minpos, maxpos, minvel, maxvel, minacc, maxacc;
 	    minpos= maxpos= minvel= maxvel= minacc= maxacc= v3f(0, 0, 0);
 	float time, minexptime, maxexptime, minsize, maxsize;
 	      time= minexptime= maxexptime= minsize= maxsize= 1;
-	AnimationType animation_type = AT_NONE;
-	float frame_or_loop_length = -1;
 	bool collisiondetection, vertical, collision_removal;
 	     collisiondetection = vertical = collision_removal = false;
-	bool loop_animation = true;
 	ServerActiveObject *attached = NULL;
 	std::string texture = "";
 	std::string playername = "";
-	u32 material_type_param = 0;
-	u8 glow = 0;
 
 	if (lua_gettop(L) > 1) //deprecated
 	{
@@ -283,65 +196,6 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 		maxexptime = getfloatfield_default(L, 1, "maxexptime", maxexptime);
 		minsize = getfloatfield_default(L, 1, "minsize", minsize);
 		maxsize = getfloatfield_default(L, 1, "maxsize", maxsize);
-
-
-		lua_getfield(L, 1, "animation");
-		if (lua_istable(L, -1)) {
-			animation_type = (AnimationType)
-				getenumfield(L, -1, "type", es_AnimationType,
-				AT_NONE);
-		}
-		switch (animation_type) {
-			case AT_NONE:
-				break;
-			case AT_2D_ANIMATION_SHEET:
-				frame_or_loop_length = 
-					getfloatfield_default(L, -1, "frame_length", -1);
-				vertical_frame_num_or_aspect = 
-					getintfield_default(L, -1, "vertical_frame_num", 1);
-				horizontal_frame_num_or_aspect = 
-					getintfield_default(L, -1, "horizontal_frame_num", 1);
-				min_first_frame = 
-					getintfield_default(L, -1, "min_first_frame", 0);
-				max_first_frame = 
-					getintfield_default(L, -1, "max_first_frame", 0);
-				loop_animation = 
-					getboolfield_default(L, -1, "loop_animation", true);
-				break;
-			case AT_VERTICAL_FRAMES:
-				frame_or_loop_length = 
-					getfloatfield_default(L, -1, "length", -1);
-				vertical_frame_num_or_aspect = 
-					getintfield_default(L, -1, "aspect_w", 1);
-				horizontal_frame_num_or_aspect = 
-					getintfield_default(L, -1, "aspect_h", 1);
-				min_first_frame = 
-					getintfield_default(L, -1, "min_first_frame", 0);
-				max_first_frame = 
-					getintfield_default(L, -1, "max_first_frame", 0);
-				loop_animation = 
-					getboolfield_default(L, -1, "loop_animation", true);
-				break;
-			default:
-				break;
-		}
-		lua_pop(L, 1);
-
-		if (animation_type == AT_2D_ANIMATION_SHEET && 
-				max_first_frame >= vertical_frame_num_or_aspect * 
-				horizontal_frame_num_or_aspect) {
-			std::ostringstream error_text; 
-			error_text << "max_first_frame should be lower, than "
-				<< "vertical_frame_num * horizontal_frame_num. " 
-				<< "Got max_first_frame="
-				<< max_first_frame
-				<< ", vertical_frame_num="
-				<< vertical_frame_num_or_aspect
-				<< " and horizontal_frame_num="
-				<< horizontal_frame_num_or_aspect << std::endl;
-			throw LuaError(error_text.str());
-		}
-		
 		collisiondetection = getboolfield_default(L, 1,
 			"collisiondetection", collisiondetection);
 		collision_removal = getboolfield_default(L, 1,
@@ -357,8 +211,6 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 		vertical = getboolfield_default(L, 1, "vertical", vertical);
 		texture = getstringfield_default(L, 1, "texture", "");
 		playername = getstringfield_default(L, 1, "playername", "");
-		material_type_param = check_material_type_param(L, 1, "material_type_param", 0);
-		glow = getintfield_default(L, 1, "glow", 0);
 	}
 
 	u32 id = getServer(L)->addParticleSpawner(amount, time,
@@ -371,17 +223,9 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 			collision_removal,
 			attached,
 			vertical,
-			texture, 
-			playername, 
-			material_type_param, 
-			animation_type,
-			vertical_frame_num_or_aspect, 
-			horizontal_frame_num_or_aspect,
-			min_first_frame, max_first_frame, 
-			frame_or_loop_length, 
-			loop_animation,
-			glow);
+			texture, playername);
 	lua_pushnumber(L, id);
+
 	return 1;
 }
 
diff --git a/src/server.cpp b/src/server.cpp
index cef57be88..48331e4f8 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1658,11 +1658,7 @@ void Server::SendShowFormspecMessage(u16 peer_id, const std::string &formspec,
 void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f acceleration,
 				float expirationtime, float size, bool collisiondetection,
 				bool collision_removal,
-				bool vertical, const std::string &texture,
-				u32 material_type_param,  AnimationType animation_type,
-				u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
-				float frame_length, bool loop_animation, 
-				u8 glow)
+				bool vertical, const std::string &texture)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -1674,12 +1670,6 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
 	pkt << vertical;
 	pkt << collision_removal;
 
-	pkt << material_type_param 
-		<< (u8)animation_type
-		<< vertical_frame_num 
-		<< horizontal_frame_num << first_frame 
-		<< frame_length << loop_animation << glow;
-
 	if (peer_id != PEER_ID_INEXISTENT) {
 		Send(&pkt);
 	}
@@ -1692,10 +1682,7 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
 void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3f minpos, v3f maxpos,
 	v3f minvel, v3f maxvel, v3f minacc, v3f maxacc, float minexptime, float maxexptime,
 	float minsize, float maxsize, bool collisiondetection, bool collision_removal,
-	u16 attached_id, bool vertical, const std::string &texture, u32 id,
-	u32 material_type_param,  AnimationType animation_type, u16 vertical_frame_num, u16 horizontal_frame_num, 
-	u16 min_first_frame, u16 max_first_frame, float frame_length, 
-	bool loop_animation, u8 glow)
+	u16 attached_id, bool vertical, const std::string &texture, u32 id)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -1711,12 +1698,6 @@ void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3
 	pkt << collision_removal;
 	pkt << attached_id;
 
-	pkt << material_type_param 
-		<< (u8)animation_type
-		<< vertical_frame_num << horizontal_frame_num 
-		<< min_first_frame << max_first_frame
-		<< frame_length << loop_animation << glow;
-
 	if (peer_id != PEER_ID_INEXISTENT) {
 		Send(&pkt);
 	}
@@ -3166,11 +3147,7 @@ void Server::spawnParticle(const std::string &playername, v3f pos,
 	v3f velocity, v3f acceleration,
 	float expirationtime, float size, bool
 	collisiondetection, bool collision_removal,
-	bool vertical, const std::string &texture,
-	u32 material_type_param,  AnimationType animation_type,
-	u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
-	float frame_length, bool loop_animation,
-	u8 glow)
+	bool vertical, const std::string &texture)
 {
 	// m_env will be NULL if the server is initializing
 	if (!m_env)
@@ -3186,11 +3163,7 @@ void Server::spawnParticle(const std::string &playername, v3f pos,
 
 	SendSpawnParticle(peer_id, pos, velocity, acceleration,
 			expirationtime, size, collisiondetection,
-			collision_removal, vertical, texture,
-			material_type_param, animation_type,
-			vertical_frame_num, horizontal_frame_num, 
-			first_frame, frame_length, loop_animation, 
-			glow);
+			collision_removal, vertical, texture);
 }
 
 u32 Server::addParticleSpawner(u16 amount, float spawntime,
@@ -3198,9 +3171,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 	float minexptime, float maxexptime, float minsize, float maxsize,
 	bool collisiondetection, bool collision_removal,
 	ServerActiveObject *attached, bool vertical, const std::string &texture,
-	const std::string &playername,	u32 material_type_param,  AnimationType animation_type,
-	u16 vertical_frame_num, u16 horizontal_frame_num, u16 min_first_frame, u16 max_first_frame, 
-	float frame_length, bool loop_animation, u8 glow)
+	const std::string &playername)
 {
 	// m_env will be NULL if the server is initializing
 	if (!m_env)
@@ -3226,10 +3197,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 		minpos, maxpos, minvel, maxvel, minacc, maxacc,
 		minexptime, maxexptime, minsize, maxsize,
 		collisiondetection, collision_removal, attached_id, vertical,
-		texture, id, material_type_param, animation_type,
-		vertical_frame_num, horizontal_frame_num, 
-		min_first_frame, max_first_frame, frame_length, loop_animation,
-		glow);
+		texture, id);
 
 	return id;
 }
diff --git a/src/server.h b/src/server.h
index 9a8d22b2e..9e844e36c 100644
--- a/src/server.h
+++ b/src/server.h
@@ -26,7 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "hud.h"
 #include "gamedef.h"
 #include "serialization.h" // For SER_FMT_VER_INVALID
-#include "nodedef.h" // AnimationType
 #include "mods.h"
 #include "inventorymanager.h"
 #include "subgame.h"
@@ -255,11 +254,7 @@ public:
 		v3f pos, v3f velocity, v3f acceleration,
 		float expirationtime, float size,
 		bool collisiondetection, bool collision_removal,
-		bool vertical, const std::string &texture,
-		u32 material_type_param,  AnimationType animation_type, 
-		u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
-		float frame_length, bool loop_animation,
-		u8 glow);
+		bool vertical, const std::string &texture);
 
 	u32 addParticleSpawner(u16 amount, float spawntime,
 		v3f minpos, v3f maxpos,
@@ -270,12 +265,7 @@ public:
 		bool collisiondetection, bool collision_removal,
 		ServerActiveObject *attached,
 		bool vertical, const std::string &texture,
-		const std::string &playername,
-		u32 material_type_param,  AnimationType animation_type, 
-		u16 vertical_frame_num, u16 horizontal_frame_num, 
-		u16 min_first_frame, u16 max_first_frame, 
-		float frame_length, bool loop_animation,
-		u8 glow);
+		const std::string &playername);
 
 	void deleteParticleSpawner(const std::string &playername, u32 id);
 
@@ -451,12 +441,7 @@ private:
 		float minsize, float maxsize,
 		bool collisiondetection, bool collision_removal,
 		u16 attached_id,
-		bool vertical, const std::string &texture, u32 id,
-		u32 material_type_param,  AnimationType animation_type, 
-		u16 vertical_frame_num, u16 horizontal_frame_num, 
-		u16 min_first_frame, u16 max_first_frame, 
-		float frame_length, bool loop_animation,
-		u8 glow);
+		bool vertical, const std::string &texture, u32 id);
 
 	void SendDeleteParticleSpawner(u16 peer_id, u32 id);
 
@@ -465,11 +450,7 @@ private:
 		v3f pos, v3f velocity, v3f acceleration,
 		float expirationtime, float size,
 		bool collisiondetection, bool collision_removal,
-		bool vertical, const std::string &texture,
-		u32 material_type_param,  AnimationType animation_type, 
-		u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
-		float frame_length, bool loop_animation,
-		u8 glow);
+		bool vertical, const std::string &texture);
 
 	u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
 	void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);

From bc3980e1d69ca9f848f80eb7386525fa4fb326cd Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Fri, 16 Sep 2016 04:59:25 +0100
Subject: [PATCH 305/418] Mgv7: Add optional floatlands, disabled by default

---
 builtin/settingtypes.txt |  24 ++++-
 minetest.conf.example    |  29 +++++-
 src/mapgen_v7.cpp        | 206 ++++++++++++++++++++++++++++-----------
 src/mapgen_v7.h          |  24 ++++-
 4 files changed, 218 insertions(+), 65 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index e48fc9bc5..b1f31054e 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -963,23 +963,39 @@ mgv6_np_apple_trees (Mapgen v6 apple trees noise parameters) noise_params 0, 1,
 [***Mapgen v7]
 
 #    Map generation attributes specific to Mapgen v7.
-#    The 'ridges' flag controls the rivers.
+#    The 'ridges' flag enables the rivers.
+#    Floatlands are currently experimental and subject to change.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
-mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,nomountains,noridges
+mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,floatlands,nomountains,noridges,nofloatlands
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 mgv7_cave_width (Mapgen v7 cave width) float 0.2
 
+#    Controls the density of floatland mountain terrain.
+#    Is an offset added to the 'np_mountain' noise value.
+mgv7_float_mount_density (Mapgen v7 floatland mountain density) float 0.6
+
+#    Typical maximum height, above and below midpoint, of floatland mountain terrain.
+mgv7_float_mount_height (Mapgen v7 floatland mountain height) float 128.0
+
+#    Y-level of floatland midpoint and lake surface.
+mgv7_floatland_level (Mapgen v7 floatland level) int 1280
+
+#    Y-level to which floatland shadows extend.
+mgv7_shadow_limit (Mapgen v7 shadow limit) int 1024
+
 mgv7_np_terrain_base (Mapgen v7 terrain base noise parameters) noise_params 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0
 mgv7_np_terrain_alt (Mapgen v7 terrain altitude noise parameters) noise_params 4, 25, (600, 600, 600), 5934, 5, 0.6, 2.0
 mgv7_np_terrain_persist (Mapgen v7 terrain persistation noise parameters) noise_params 0.6, 0.1, (2000, 2000, 2000), 539, 3, 0.6, 2.0
 mgv7_np_height_select (Mapgen v7 height select noise parameters) noise_params -8, 16, (500, 500, 500), 4213, 6, 0.7, 2.0
 mgv7_np_filler_depth (Mapgen v7 filler depth noise parameters) noise_params 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0
 mgv7_np_mount_height (Mapgen v7 mount height noise parameters) noise_params 256, 112, (1000, 1000, 1000), 72449, 3, 0.6, 2.0
-mgv7_np_ridge_uwater (Mapgen v7 ridge water noise parameters) noise_params 0, 1, (1000, 1000, 1000), 85039, 5, 0.6, 2.0
+mgv7_np_ridge_uwater (Mapgen v7 river course noise parameters) noise_params 0, 1, (1000, 1000, 1000), 85039, 5, 0.6, 2.0
+mgv7_np_floatland_base (Mapgen v7 floatland base terrain noise parameters) noise_params -0.6, 1.5, (600, 600, 600), 114, 5, 0.6, 2.0
+mgv7_np_float_base_height (Mapgen v7 floatland base terrain height noise parameters) noise_params 48, 24, (300, 300, 300), 907, 4, 0.7, 2.0
 mgv7_np_mountain (Mapgen v7 mountain noise parameters) noise_params -0.6, 1, (250, 350, 250), 5333, 5, 0.63, 2.0
-mgv7_np_ridge (Mapgen v7 ridge noise parameters) noise_params 0, 1, (100, 100, 100), 6467, 4, 0.75, 2.0
+mgv7_np_ridge (Mapgen v7 river channel wall noise parameters) noise_params 0, 1, (100, 100, 100), 6467, 4, 0.75, 2.0
 mgv7_np_cave1 (Mapgen v7 cave1 noise parameters) noise_params 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0
 mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0
 
diff --git a/minetest.conf.example b/minetest.conf.example
index 02f31779f..361311ba0 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1239,16 +1239,35 @@
 #### Mapgen v7
 
 #    Map generation attributes specific to Mapgen v7.
-#    The 'ridges' flag controls the rivers.
+#    The 'ridges' flag enables the rivers.
+#    Floatlands are currently experimental and subject to change.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
-#    type: flags possible values: mountains, ridges, nomountains, noridges
+#    type: flags possible values: mountains, ridges, floatlands,
+#    nomountains, noridges, nofloatlands
 # mgv7_spflags = mountains,ridges
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    type: float
 # mgv7_cave_width = 0.2
 
+#    Controls the density of floatland mountain terrain.
+#    Is an offset added to the 'np_mountain' noise value.
+#    type: float
+# mgv7_float_mount_density = 0.6
+
+#    Typical maximum height, above and below midpoint, of floatland mountain terrain.
+#    type: float
+# mgv7_float_mount_height = 128.0
+
+#    Y-level of floatland midpoint and lake surface.
+#    type: int
+# mgv7_floatland_level = 1280
+
+#    Y-level to which floatland shadows extend.
+#    type: int
+# mgv7_shadow_limit = 1024
+
 #    type: noise_params
 # mgv7_np_terrain_base = 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0
 
@@ -1270,6 +1289,12 @@
 #    type: noise_params
 # mgv7_np_ridge_uwater = 0, 1, (1000, 1000, 1000), 85039, 5, 0.6, 2.0
 
+#    type: noise_params
+# mgv7_np_floatland_base = -0.6, 1.5, (600, 600, 600), 114, 5, 0.6, 2.0
+
+#    type: noise_params
+# mgv7_np_float_base_height = 48, 24, (300, 300, 300), 907, 4, 0.7, 2.0
+
 #    type: noise_params
 # mgv7_np_mountain = -0.6, 1, (250, 350, 250), 5333, 5, 0.63, 2.0
 
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 86f559af3..c4fa024a8 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -41,9 +41,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 FlagDesc flagdesc_mapgen_v7[] = {
-	{"mountains", MGV7_MOUNTAINS},
-	{"ridges",    MGV7_RIDGES},
-	{NULL,        0}
+	{"mountains",    MGV7_MOUNTAINS},
+	{"ridges",       MGV7_RIDGES},
+	{"floatlands",   MGV7_FLOATLANDS},
+	{NULL,           0}
 };
 
 
@@ -53,17 +54,23 @@ FlagDesc flagdesc_mapgen_v7[] = {
 MapgenV7::MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge)
 	: MapgenBasic(mapgenid, params, emerge)
 {
-	this->spflags    = params->spflags;
-	this->cave_width = params->cave_width;
+	this->spflags             = params->spflags;
+	this->cave_width          = params->cave_width;
+	this->float_mount_density = params->float_mount_density;
+	this->float_mount_height  = params->float_mount_height;
+	this->floatland_level     = params->floatland_level;
+	this->shadow_limit        = params->shadow_limit;
 
 	//// Terrain noise
-	noise_terrain_base    = new Noise(&params->np_terrain_base,    seed, csize.X, csize.Z);
-	noise_terrain_alt     = new Noise(&params->np_terrain_alt,     seed, csize.X, csize.Z);
-	noise_terrain_persist = new Noise(&params->np_terrain_persist, seed, csize.X, csize.Z);
-	noise_height_select   = new Noise(&params->np_height_select,   seed, csize.X, csize.Z);
-	noise_filler_depth    = new Noise(&params->np_filler_depth,    seed, csize.X, csize.Z);
-	noise_mount_height    = new Noise(&params->np_mount_height,    seed, csize.X, csize.Z);
-	noise_ridge_uwater    = new Noise(&params->np_ridge_uwater,    seed, csize.X, csize.Z);
+	noise_terrain_base      = new Noise(&params->np_terrain_base,      seed, csize.X, csize.Z);
+	noise_terrain_alt       = new Noise(&params->np_terrain_alt,       seed, csize.X, csize.Z);
+	noise_terrain_persist   = new Noise(&params->np_terrain_persist,   seed, csize.X, csize.Z);
+	noise_height_select     = new Noise(&params->np_height_select,     seed, csize.X, csize.Z);
+	noise_filler_depth      = new Noise(&params->np_filler_depth,      seed, csize.X, csize.Z);
+	noise_mount_height      = new Noise(&params->np_mount_height,      seed, csize.X, csize.Z);
+	noise_ridge_uwater      = new Noise(&params->np_ridge_uwater,      seed, csize.X, csize.Z);
+	noise_floatland_base    = new Noise(&params->np_floatland_base,    seed, csize.X, csize.Z);
+	noise_float_base_height = new Noise(&params->np_float_base_height, seed, csize.X, csize.Z);
 
 	//// 3d terrain noise
 	// 1-up 1-down overgeneration
@@ -84,6 +91,8 @@ MapgenV7::~MapgenV7()
 	delete noise_filler_depth;
 	delete noise_mount_height;
 	delete noise_ridge_uwater;
+	delete noise_floatland_base;
+	delete noise_float_base_height;
 	delete noise_mountain;
 	delete noise_ridge;
 }
@@ -91,58 +100,76 @@ MapgenV7::~MapgenV7()
 
 MapgenV7Params::MapgenV7Params()
 {
-	spflags    = MGV7_MOUNTAINS | MGV7_RIDGES;
-	cave_width = 0.2;
+	spflags             = MGV7_MOUNTAINS | MGV7_RIDGES;
+	cave_width          = 0.2;
+	float_mount_density = 0.6;
+	float_mount_height  = 128.0;
+	floatland_level     = 1280;
+	shadow_limit        = 1024;
 
-	np_terrain_base    = NoiseParams(4,    70,  v3f(600,  600,  600),  82341, 5, 0.6,  2.0);
-	np_terrain_alt     = NoiseParams(4,    25,  v3f(600,  600,  600),  5934,  5, 0.6,  2.0);
-	np_terrain_persist = NoiseParams(0.6,  0.1, v3f(2000, 2000, 2000), 539,   3, 0.6,  2.0);
-	np_height_select   = NoiseParams(-8,   16,  v3f(500,  500,  500),  4213,  6, 0.7,  2.0);
-	np_filler_depth    = NoiseParams(0,    1.2, v3f(150,  150,  150),  261,   3, 0.7,  2.0);
-	np_mount_height    = NoiseParams(256,  112, v3f(1000, 1000, 1000), 72449, 3, 0.6,  2.0);
-	np_ridge_uwater    = NoiseParams(0,    1,   v3f(1000, 1000, 1000), 85039, 5, 0.6,  2.0);
-	np_mountain        = NoiseParams(-0.6, 1,   v3f(250,  350,  250),  5333,  5, 0.63, 2.0);
-	np_ridge           = NoiseParams(0,    1,   v3f(100,  100,  100),  6467,  4, 0.75, 2.0);
-	np_cave1           = NoiseParams(0,    12,  v3f(61,   61,   61),   52534, 3, 0.5,  2.0);
-	np_cave2           = NoiseParams(0,    12,  v3f(67,   67,   67),   10325, 3, 0.5,  2.0);
+	np_terrain_base      = NoiseParams(4,    70,   v3f(600,  600,  600),  82341, 5, 0.6,  2.0);
+	np_terrain_alt       = NoiseParams(4,    25,   v3f(600,  600,  600),  5934,  5, 0.6,  2.0);
+	np_terrain_persist   = NoiseParams(0.6,  0.1,  v3f(2000, 2000, 2000), 539,   3, 0.6,  2.0);
+	np_height_select     = NoiseParams(-8,   16,   v3f(500,  500,  500),  4213,  6, 0.7,  2.0);
+	np_filler_depth      = NoiseParams(0,    1.2,  v3f(150,  150,  150),  261,   3, 0.7,  2.0);
+	np_mount_height      = NoiseParams(256,  112,  v3f(1000, 1000, 1000), 72449, 3, 0.6,  2.0);
+	np_ridge_uwater      = NoiseParams(0,    1,    v3f(1000, 1000, 1000), 85039, 5, 0.6,  2.0);
+	np_floatland_base    = NoiseParams(-0.6, 1.5,  v3f(600,  600,  600),  114,   5, 0.6,  2.0);
+	np_float_base_height = NoiseParams(48,   24,   v3f(300,  300,  300),  907,   4, 0.7,  2.0);
+	np_mountain          = NoiseParams(-0.6, 1,    v3f(250,  350,  250),  5333,  5, 0.63, 2.0);
+	np_ridge             = NoiseParams(0,    1,    v3f(100,  100,  100),  6467,  4, 0.75, 2.0);
+	np_cave1             = NoiseParams(0,    12,   v3f(61,   61,   61),   52534, 3, 0.5,  2.0);
+	np_cave2             = NoiseParams(0,    12,   v3f(67,   67,   67),   10325, 3, 0.5,  2.0);
 }
 
 
 void MapgenV7Params::readParams(const Settings *settings)
 {
-	settings->getFlagStrNoEx("mgv7_spflags",  spflags, flagdesc_mapgen_v7);
-	settings->getFloatNoEx("mgv7_cave_width", cave_width);
+	settings->getFlagStrNoEx("mgv7_spflags",           spflags, flagdesc_mapgen_v7);
+	settings->getFloatNoEx("mgv7_cave_width",          cave_width);
+	settings->getFloatNoEx("mgv7_float_mount_density", float_mount_density);
+	settings->getFloatNoEx("mgv7_float_mount_height",  float_mount_height);
+	settings->getS16NoEx("mgv7_floatland_level",       floatland_level);
+	settings->getS16NoEx("mgv7_shadow_limit",          shadow_limit);
 
-	settings->getNoiseParams("mgv7_np_terrain_base",    np_terrain_base);
-	settings->getNoiseParams("mgv7_np_terrain_alt",     np_terrain_alt);
-	settings->getNoiseParams("mgv7_np_terrain_persist", np_terrain_persist);
-	settings->getNoiseParams("mgv7_np_height_select",   np_height_select);
-	settings->getNoiseParams("mgv7_np_filler_depth",    np_filler_depth);
-	settings->getNoiseParams("mgv7_np_mount_height",    np_mount_height);
-	settings->getNoiseParams("mgv7_np_ridge_uwater",    np_ridge_uwater);
-	settings->getNoiseParams("mgv7_np_mountain",        np_mountain);
-	settings->getNoiseParams("mgv7_np_ridge",           np_ridge);
-	settings->getNoiseParams("mgv7_np_cave1",           np_cave1);
-	settings->getNoiseParams("mgv7_np_cave2",           np_cave2);
+	settings->getNoiseParams("mgv7_np_terrain_base",      np_terrain_base);
+	settings->getNoiseParams("mgv7_np_terrain_alt",       np_terrain_alt);
+	settings->getNoiseParams("mgv7_np_terrain_persist",   np_terrain_persist);
+	settings->getNoiseParams("mgv7_np_height_select",     np_height_select);
+	settings->getNoiseParams("mgv7_np_filler_depth",      np_filler_depth);
+	settings->getNoiseParams("mgv7_np_mount_height",      np_mount_height);
+	settings->getNoiseParams("mgv7_np_ridge_uwater",      np_ridge_uwater);
+	settings->getNoiseParams("mgv7_np_floatland_base",    np_floatland_base);
+	settings->getNoiseParams("mgv7_np_float_base_height", np_float_base_height);
+	settings->getNoiseParams("mgv7_np_mountain",          np_mountain);
+	settings->getNoiseParams("mgv7_np_ridge",             np_ridge);
+	settings->getNoiseParams("mgv7_np_cave1",             np_cave1);
+	settings->getNoiseParams("mgv7_np_cave2",             np_cave2);
 }
 
 
 void MapgenV7Params::writeParams(Settings *settings) const
 {
-	settings->setFlagStr("mgv7_spflags",  spflags, flagdesc_mapgen_v7, U32_MAX);
-	settings->setFloat("mgv7_cave_width", cave_width);
+	settings->setFlagStr("mgv7_spflags",           spflags, flagdesc_mapgen_v7, U32_MAX);
+	settings->setFloat("mgv7_cave_width",          cave_width);
+	settings->setFloat("mgv7_float_mount_density", float_mount_density);
+	settings->setFloat("mgv7_float_mount_height",  float_mount_height);
+	settings->setS16("mgv7_floatland_level",       floatland_level);
+	settings->setS16("mgv7_shadow_limit",          shadow_limit);
 
-	settings->setNoiseParams("mgv7_np_terrain_base",    np_terrain_base);
-	settings->setNoiseParams("mgv7_np_terrain_alt",     np_terrain_alt);
-	settings->setNoiseParams("mgv7_np_terrain_persist", np_terrain_persist);
-	settings->setNoiseParams("mgv7_np_height_select",   np_height_select);
-	settings->setNoiseParams("mgv7_np_filler_depth",    np_filler_depth);
-	settings->setNoiseParams("mgv7_np_mount_height",    np_mount_height);
-	settings->setNoiseParams("mgv7_np_ridge_uwater",    np_ridge_uwater);
-	settings->setNoiseParams("mgv7_np_mountain",        np_mountain);
-	settings->setNoiseParams("mgv7_np_ridge",           np_ridge);
-	settings->setNoiseParams("mgv7_np_cave1",           np_cave1);
-	settings->setNoiseParams("mgv7_np_cave2",           np_cave2);
+	settings->setNoiseParams("mgv7_np_terrain_base",      np_terrain_base);
+	settings->setNoiseParams("mgv7_np_terrain_alt",       np_terrain_alt);
+	settings->setNoiseParams("mgv7_np_terrain_persist",   np_terrain_persist);
+	settings->setNoiseParams("mgv7_np_height_select",     np_height_select);
+	settings->setNoiseParams("mgv7_np_filler_depth",      np_filler_depth);
+	settings->setNoiseParams("mgv7_np_mount_height",      np_mount_height);
+	settings->setNoiseParams("mgv7_np_ridge_uwater",      np_ridge_uwater);
+	settings->setNoiseParams("mgv7_np_floatland_base",    np_floatland_base);
+	settings->setNoiseParams("mgv7_np_float_base_height", np_float_base_height);
+	settings->setNoiseParams("mgv7_np_mountain",          np_mountain);
+	settings->setNoiseParams("mgv7_np_ridge",             np_ridge);
+	settings->setNoiseParams("mgv7_np_cave1",             np_cave1);
+	settings->setNoiseParams("mgv7_np_cave2",             np_cave2);
 }
 
 
@@ -249,9 +276,13 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 
 	updateLiquid(&data->transforming_liquid, full_node_min, full_node_max);
 
+	// Limit floatland shadow
+	bool propagate_shadow = !((spflags & MGV7_FLOATLANDS) &&
+		node_min.Y <= shadow_limit && node_max.Y >= shadow_limit);
+
 	if (flags & MG_LIGHT)
 		calcLighting(node_min - v3s16(0, 1, 0), node_max + v3s16(0, 1, 0),
-			full_node_min, full_node_max);
+			full_node_min, full_node_max, propagate_shadow);
 
 	//setLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
 	//			node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE, 0xFF);
@@ -313,6 +344,47 @@ bool MapgenV7::getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y)
 }
 
 
+bool MapgenV7::getFloatlandMountainFromMap(int idx_xyz, int idx_xz, s16 y)
+{
+	float density_gradient =
+		-pow(fabs((float)(y - floatland_level) / float_mount_height), 0.8f);
+	float floatn = noise_mountain->result[idx_xyz] + float_mount_density;
+
+	return floatn + density_gradient >= 0.0f;
+}
+
+
+void MapgenV7::floatBaseExtentFromMap(s16 *float_base_min, s16 *float_base_max, int idx_xz)
+{
+	// '+1' to avoid a layer of stone at y = MAX_MAP_GENERATION_LIMIT
+	s16 base_min = MAX_MAP_GENERATION_LIMIT + 1;
+	s16 base_max = MAX_MAP_GENERATION_LIMIT;
+
+	float n_base = noise_floatland_base->result[idx_xz];
+	if (n_base > 0.0f) {
+		float n_base_height =
+			MYMAX(noise_float_base_height->result[idx_xz], 0.0f);
+		float amp = n_base * n_base_height;
+		float ridge = n_base_height / 3.0f;
+		base_min = floatland_level - amp / 2.0f;
+
+		if (amp > ridge * 2.0f) {
+			// Lake bed
+			base_max = floatland_level - (amp - ridge * 2.0f) / 2.0f;
+		} else {
+			// Hills and ridges
+			float diff = fabs(amp - ridge) / ridge;
+			// Smooth ridges using the 'smoothstep function'
+			float smooth_diff = diff * diff * (3.0f - 2.0f * diff);
+			base_max = floatland_level + ridge - smooth_diff * ridge;
+		}
+	}
+
+	*float_base_min = base_min;
+	*float_base_max = base_max;
+}
+
+
 int MapgenV7::generateTerrain()
 {
 	MapNode n_air(CONTENT_AIR);
@@ -327,11 +399,19 @@ int MapgenV7::generateTerrain()
 	noise_terrain_alt->perlinMap2D(node_min.X, node_min.Z, persistmap);
 	noise_height_select->perlinMap2D(node_min.X, node_min.Z);
 
-	if (spflags & MGV7_MOUNTAINS) {
+	if ((spflags & MGV7_MOUNTAINS) || (spflags & MGV7_FLOATLANDS)) {
 		noise_mountain->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
+	}
+
+	if (spflags & MGV7_MOUNTAINS) {
 		noise_mount_height->perlinMap2D(node_min.X, node_min.Z);
 	}
 
+	if (spflags & MGV7_FLOATLANDS) {
+		noise_floatland_base->perlinMap2D(node_min.X, node_min.Z);
+		noise_float_base_height->perlinMap2D(node_min.X, node_min.Z);
+	}
+
 	//// Place nodes
 	v3s16 em = vm->m_area.getExtent();
 	s16 stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT;
@@ -340,10 +420,16 @@ int MapgenV7::generateTerrain()
 	for (s16 z = node_min.Z; z <= node_max.Z; z++)
 	for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
 		s16 surface_y = baseTerrainLevelFromMap(index2d);
-
 		if (surface_y > stone_surface_max_y)
 			stone_surface_max_y = surface_y;
 
+		// Get extent of floatland base terrain
+		// '+1' to avoid a layer of stone at y = MAX_MAP_GENERATION_LIMIT
+		s16 float_base_min = MAX_MAP_GENERATION_LIMIT + 1;
+		s16 float_base_max = MAX_MAP_GENERATION_LIMIT;
+		if (spflags & MGV7_FLOATLANDS)
+			floatBaseExtentFromMap(&float_base_min, &float_base_max, index2d);
+
 		u32 vi = vm->m_area.index(x, node_min.Y - 1, z);
 		u32 index3d = (z - node_min.Z) * zstride_1u1d + (x - node_min.X);
 
@@ -356,8 +442,16 @@ int MapgenV7::generateTerrain()
 					vm->m_data[vi] = n_stone;  // Mountain terrain
 					if (y > stone_surface_max_y)
 						stone_surface_max_y = y;
+				} else if ((spflags & MGV7_FLOATLANDS) &&
+						((y >= float_base_min && y <= float_base_max) ||
+						getFloatlandMountainFromMap(index3d, index2d, y))) {
+					vm->m_data[vi] = n_stone;  // Floatland terrain
+					stone_surface_max_y = node_max.Y;
 				} else if (y <= water_level) {
-					vm->m_data[vi] = n_water;
+					vm->m_data[vi] = n_water;  // Ground level water
+				} else if ((spflags & MGV7_FLOATLANDS) &&
+						(y >= float_base_max && y <= floatland_level)) {
+					vm->m_data[vi] = n_water;  // Floatland water
 				} else {
 					vm->m_data[vi] = n_air;
 				}
@@ -373,7 +467,7 @@ int MapgenV7::generateTerrain()
 
 void MapgenV7::generateRidgeTerrain()
 {
-	if (node_max.Y < water_level - 16)
+	if ((node_max.Y < water_level - 16) || (node_max.Y > shadow_limit))
 		return;
 
 	noise_ridge->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 3a6bc0801..3972387a7 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -23,9 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mapgen.h"
 
-/////////////////// Mapgen V7 flags
-#define MGV7_MOUNTAINS   0x01
-#define MGV7_RIDGES      0x02
+////////////// Mapgen V7 flags
+#define MGV7_MOUNTAINS    0x01
+#define MGV7_RIDGES       0x02
+#define MGV7_FLOATLANDS   0x04
 
 class BiomeManager;
 
@@ -35,6 +36,11 @@ extern FlagDesc flagdesc_mapgen_v7[];
 struct MapgenV7Params : public MapgenParams {
 	u32 spflags;
 	float cave_width;
+	float float_mount_density;
+	float float_mount_height;
+	s16 floatland_level;
+	s16 shadow_limit;
+
 	NoiseParams np_terrain_base;
 	NoiseParams np_terrain_alt;
 	NoiseParams np_terrain_persist;
@@ -42,6 +48,8 @@ struct MapgenV7Params : public MapgenParams {
 	NoiseParams np_filler_depth;
 	NoiseParams np_mount_height;
 	NoiseParams np_ridge_uwater;
+	NoiseParams np_floatland_base;
+	NoiseParams np_float_base_height;
 	NoiseParams np_mountain;
 	NoiseParams np_ridge;
 	NoiseParams np_cave1;
@@ -68,16 +76,26 @@ public:
 	float baseTerrainLevelFromMap(int index);
 	bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
 	bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
+	bool getFloatlandMountainFromMap(int idx_xyz, int idx_xz, s16 y);
+	void floatBaseExtentFromMap(s16 *float_base_min, s16 *float_base_max, int idx_xz);
+
 	int generateTerrain();
 	void generateRidgeTerrain();
 
 private:
+	float float_mount_density;
+	float float_mount_height;
+	s16 floatland_level;
+	s16 shadow_limit;
+
 	Noise *noise_terrain_base;
 	Noise *noise_terrain_alt;
 	Noise *noise_terrain_persist;
 	Noise *noise_height_select;
 	Noise *noise_mount_height;
 	Noise *noise_ridge_uwater;
+	Noise *noise_floatland_base;
+	Noise *noise_float_base_height;
 	Noise *noise_mountain;
 	Noise *noise_ridge;
 };

From 8e61c1dfd9c07abbea82b3acecf729c118d95793 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sat, 12 Nov 2016 17:49:41 +0100
Subject: [PATCH 306/418] Lua_api.txt: Naming convention for custom item/entity
 fields

Custom (non-engine) field names of items and entities are allowed.
This is now documented in lua_api.txt. Field names beginning with
an underscore are now reserved for mod use, the engine must not
introduce any fields beginning with an underscore.
---
 doc/lua_api.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 7d552c980..2164bfc5e 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3529,8 +3529,9 @@ Definition tables
     --  ^ Called sometimes; the string returned is passed to on_activate when
     --    the entity is re-activated from static state
 
-        -- Also you can define arbitrary member variables here
-        myvariable = whatever,
+        -- Also you can define arbitrary member variables here (see item definition for
+        -- more info)
+        _custom_field = whatever,
     }
 
 ### ABM (ActiveBlockModifier) definition (`register_abm`)
@@ -3646,6 +3647,12 @@ Definition tables
             end
         ^ The user may be any ObjectRef or nil.
         ]]
+        _custom_field = whatever,
+        --[[
+        ^ Add your own custom fields. By convention, all custom field names
+          should start with `_` to avoid naming collisions with future engine
+          usage.
+        ]]
     }
 
 ### Tile definition

From 5f0dc8e78ad7e62959786efd5c7f72044aacb53a Mon Sep 17 00:00:00 2001
From: Rogier-5 <rogier777@gmail.com>
Date: Wed, 16 Nov 2016 17:56:05 +0100
Subject: [PATCH 307/418] Fix unexplained shader issue (glsl compiler bug??)
 (#4757)

---
 client/shaders/nodes_shader/opengl_fragment.glsl | 16 ++++++++++++++--
 .../water_surface_shader/opengl_fragment.glsl    | 16 ++++++++++++++--
 .../shaders/wielded_shader/opengl_fragment.glsl  | 16 ++++++++++++++--
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index 4d9ce1c12..149aa2bc5 100644
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -19,6 +19,8 @@ bool normalTexturePresent = false;
 
 const float e = 2.718281828459;
 const float BS = 10.0;
+const float fogStart = 0.4;
+const float fogShadingParameter = 1 / ( 1 - fogStart);
 
 #ifdef ENABLE_TONE_MAPPING
 
@@ -199,8 +201,18 @@ void main(void)
 #endif
 
 	if (fogDistance != 0.0) {
-		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
-		col = mix(skyBgColor, col, d);
+		// Due to a bug in some (older ?) graphics stacks (possibly in the glsl compiler ?),
+		// the fog will only be rendered correctly if the last operation before the
+		// clamp() is an addition. Else, the clamp() seems to be ignored.
+		// E.g. the following won't work:
+		//      float clarity = clamp(fogShadingParameter
+		//		* (fogDistance - length(eyeVec)) / fogDistance), 0.0, 1.0);
+		// As additions usually come for free following a multiplication, the new formula
+		// should be more efficient as well.
+		// Note: clarity = (1 - fogginess)
+		float clarity = clamp(fogShadingParameter
+			- fogShadingParameter * length(eyeVec) / fogDistance, 0.0, 1.0);
+		col = mix(skyBgColor, col, clarity);
 	}
 	col = vec4(col.rgb, base.a);
 
diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
index b4c0cc4f8..4164870c7 100644
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -21,6 +21,8 @@ bool texSeamless = false;
 
 const float e = 2.718281828459;
 const float BS = 10.0;
+const float fogStart = 0.4;
+const float fogShadingParameter = 1 / ( 1 - fogStart);
 
 #ifdef ENABLE_TONE_MAPPING
 
@@ -155,8 +157,18 @@ vec4 base = texture2D(baseTexture, uv).rgba;
 #endif
 
 	if (fogDistance != 0.0) {
-		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
-		col = mix(skyBgColor, col, d);
+		// Due to a bug in some (older ?) graphics stacks (possibly in the glsl compiler ?),
+		// the fog will only be rendered correctly if the last operation before the
+		// clamp() is an addition. Else, the clamp() seems to be ignored.
+		// E.g. the following won't work:
+		//      float clarity = clamp(fogShadingParameter
+		//		* (fogDistance - length(eyeVec)) / fogDistance), 0.0, 1.0);
+		// As additions usually come for free following a multiplication, the new formula
+		// should be more efficient as well.
+		// Note: clarity = (1 - fogginess)
+		float clarity = clamp(fogShadingParameter
+			- fogShadingParameter * length(eyeVec) / fogDistance, 0.0, 1.0);
+		col = mix(skyBgColor, col, clarity);
 	}
 	col = vec4(col.rgb, base.a);
 
diff --git a/client/shaders/wielded_shader/opengl_fragment.glsl b/client/shaders/wielded_shader/opengl_fragment.glsl
index bd9741441..7c38b749a 100644
--- a/client/shaders/wielded_shader/opengl_fragment.glsl
+++ b/client/shaders/wielded_shader/opengl_fragment.glsl
@@ -19,6 +19,8 @@ bool texSeamless = false;
 
 const float e = 2.718281828459;
 const float BS = 10.0;
+const float fogStart = 0.4;
+const float fogShadingParameter = 1 / ( 1 - fogStart);
 
 void get_texture_flags()
 {
@@ -107,8 +109,18 @@ void main(void)
 	vec4 col = vec4(color.rgb, base.a);
 	col *= gl_Color;
 	if (fogDistance != 0.0) {
-		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
-		col = mix(skyBgColor, col, d);
+		// Due to a bug in some (older ?) graphics stacks (possibly in the glsl compiler ?),
+		// the fog will only be rendered correctly if the last operation before the
+		// clamp() is an addition. Else, the clamp() seems to be ignored.
+		// E.g. the following won't work:
+		//      float clarity = clamp(fogShadingParameter
+		//		* (fogDistance - length(eyeVec)) / fogDistance), 0.0, 1.0);
+		// As additions usually come for free following a multiplication, the new formula
+		// should be more efficient as well.
+		// Note: clarity = (1 - fogginess)
+		float clarity = clamp(fogShadingParameter
+			- fogShadingParameter * length(eyeVec) / fogDistance, 0.0, 1.0);
+		col = mix(skyBgColor, col, clarity);
 	}
 	gl_FragColor = vec4(col.rgb, base.a);
 }

From afc48c802a81b95b11aef3ad0141a56f6a184979 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 16 Nov 2016 10:17:46 +0100
Subject: [PATCH 308/418] Introduce builtin_shared and use it to fix #4778

Fixes #4778 which was about the error:

ServerError: Lua: Runtime error from mod '' in callback item_OnPlace():
/usr/local/share/minetest/builtin/game/item.lua:278: attempt to call global 'check_attached_node' (a nil value)

The issue was a regression of commit 649448a2a91fbf3e944b2f2e739f4e2292af1df0

"Rename nodeupdate and nodeupdate_single and make them part of the official API"
---
 builtin/game/falling.lua | 6 ++++--
 builtin/game/init.lua    | 8 ++++++--
 builtin/game/item.lua    | 4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index ece08b325..8b88b68d8 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -1,5 +1,7 @@
 -- Minetest: builtin/item.lua
 
+local builtin_shared = ...
+
 --
 -- Falling stuff
 --
@@ -127,7 +129,7 @@ local function drop_attached_node(p)
 	end
 end
 
-local function check_attached_node(p, n)
+function builtin_shared.check_attached_node(p, n)
 	local def = core.registered_nodes[n.name]
 	local d = {x = 0, y = 0, z = 0}
 	if def.paramtype2 == "wallmounted" then
@@ -177,7 +179,7 @@ function core.check_single_for_falling(p)
 	end
 
 	if core.get_item_group(n.name, "attached_node") ~= 0 then
-		if not check_attached_node(p, n) then
+		if not builtin_shared.check_attached_node(p, n) then
 			drop_attached_node(p)
 			return true
 		end
diff --git a/builtin/game/init.lua b/builtin/game/init.lua
index 2f9f90315..b5e2f7cca 100644
--- a/builtin/game/init.lua
+++ b/builtin/game/init.lua
@@ -3,10 +3,14 @@ local scriptpath = core.get_builtin_path()..DIR_DELIM
 local commonpath = scriptpath.."common"..DIR_DELIM
 local gamepath = scriptpath.."game"..DIR_DELIM
 
+-- Shared between builtin files, but
+-- not exposed to outer context
+local builtin_shared = {}
+
 dofile(commonpath.."vector.lua")
 
 dofile(gamepath.."constants.lua")
-dofile(gamepath.."item.lua")
+assert(loadfile(gamepath.."item.lua"))(builtin_shared)
 dofile(gamepath.."register.lua")
 
 if core.setting_getbool("profiler.load") then
@@ -21,7 +25,7 @@ dofile(gamepath.."auth.lua")
 dofile(gamepath.."chatcommands.lua")
 dofile(gamepath.."static_spawn.lua")
 dofile(gamepath.."detached_inventory.lua")
-dofile(gamepath.."falling.lua")
+assert(loadfile(gamepath.."falling.lua"))(builtin_shared)
 dofile(gamepath.."features.lua")
 dofile(gamepath.."voxelarea.lua")
 dofile(gamepath.."forceloading.lua")
diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 26ff8225c..ec996292f 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -1,5 +1,7 @@
 -- Minetest: builtin/item.lua
 
+local builtin_shared = ...
+
 local function copy_pointed_thing(pointed_thing)
 	return {
 		type  = pointed_thing.type,
@@ -275,7 +277,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2)
 
 	-- Check if the node is attached and if it can be placed there
 	if core.get_item_group(def.name, "attached_node") ~= 0 and
-		not check_attached_node(place_to, newnode) then
+		not builtin_shared.check_attached_node(place_to, newnode) then
 		core.log("action", "attached node " .. def.name ..
 			" can not be placed at " .. core.pos_to_string(place_to))
 		return itemstack, false

From 4a0a6723afc5c5a14acd7cd833aea33cb53ac618 Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar@foo-projects.org>
Date: Fri, 22 Jan 2016 21:52:50 -0800
Subject: [PATCH 309/418] Builtin/../item: Enable tool breaking sounds

If a tool wears out and is destroyed, it's itemstack count
goes to 0, and we can optionally play a breaking sound.

This patch implements playing a breaking sound when this
occurs. Sounds need to be added to the tool itemdef
registration as the sound name string in the .sound.breaks
member.
---
 builtin/game/item.lua | 3 +++
 doc/lua_api.txt       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index ec996292f..a2fdbc1f4 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -474,6 +474,9 @@ function core.node_dig(pos, node, digger)
 		-- Wear out tool
 		if not core.setting_getbool("creative_mode") then
 			wielded:add_wear(dp.wear)
+			if wielded:get_count() == 0 and wdef.sound and wdef.sound.breaks then
+				core.sound_play(wdef.sound.breaks, {pos = pos, gain = 1.0})
+			end
 		end
 	end
 	digger:set_wielded_item(wielded)
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 2164bfc5e..84080502f 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3606,6 +3606,7 @@ Definition tables
           actual result to client in a short moment.
         ]]
         sound = {
+            breaks = "default_tool_break", -- tools only
             place = --[[<SimpleSoundSpec>]],
         },
 

From 681d127ff1d288f4c3123a05f71ef15a6c549b5d Mon Sep 17 00:00:00 2001
From: orwell96 <mono96.mml@gmail.com>
Date: Mon, 24 Oct 2016 19:56:27 +0200
Subject: [PATCH 310/418] Particles: Make attached particle spawners respect
 the parent's yaw

Position, velocity and acceleration vectors of particles are rotated
by the yaw of the parent object so that they are truly relative to it.
Clarify new attached particle spawner behavior in lua_api.txt.
---
 doc/lua_api.txt     |  3 ++-
 src/clientobject.h  |  1 +
 src/content_cao.cpp |  3 ++-
 src/content_cao.h   |  4 ++++
 src/particles.cpp   | 36 ++++++++++++++++++++++++++++--------
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 84080502f..80e66020d 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -4152,7 +4152,8 @@ The Biome API is still in an experimental phase and subject to change.
     --  ^ collision_removal: if true then particle is removed when it collides,
     --  ^ requires collisiondetection = true to have any effect
         attached = ObjectRef,
-    --  ^ attached: if defined, makes particle positions relative to this object.
+    --  ^ attached: if defined, particle positions, velocities and accelerations
+    --  ^ are relative to this object's position and yaw.
         vertical = false,
     --  ^ vertical: if true faces player using y axis only
         texture = "image.png",
diff --git a/src/clientobject.h b/src/clientobject.h
index c4e1a634b..83931e438 100644
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -61,6 +61,7 @@ public:
 	virtual bool getCollisionBox(aabb3f *toset){return false;}
 	virtual bool collideWithObjects(){return false;}
 	virtual v3f getPosition(){return v3f(0,0,0);}
+	virtual float getYaw() const {return 0;}
 	virtual scene::ISceneNode *getSceneNode(){return NULL;}
 	virtual scene::IMeshSceneNode *getMeshSceneNode(){return NULL;}
 	virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode(){return NULL;}
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 88ed43a8c..6b35d5881 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -313,7 +313,8 @@ public:
 		{return &m_selection_box;}
 	v3f getPosition()
 		{return m_position;}
-
+	inline float getYaw() const
+		{return 0;}
 	std::string infoText()
 		{return m_infotext;}
 
diff --git a/src/content_cao.h b/src/content_cao.h
index 5b3471814..a158e8296 100644
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -136,6 +136,10 @@ public:
 	aabb3f *getSelectionBox();
 
 	v3f getPosition();
+	inline float getYaw() const
+	{
+		return m_yaw;
+	}
 
 	scene::ISceneNode *getSceneNode();
 
diff --git a/src/particles.cpp b/src/particles.cpp
index f20fb4083..acf9cc815 100644
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -253,12 +253,17 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 	m_time += dtime;
 
 	bool unloaded = false;
-	v3f attached_offset = v3f(0,0,0);
+	bool is_attached = false;
+	v3f attached_pos = v3f(0,0,0);
+	float attached_yaw = 0;
 	if (m_attached_id != 0) {
-		if (ClientActiveObject *attached = env->getActiveObject(m_attached_id))
-			attached_offset = attached->getPosition() / BS;
-		else
+		if (ClientActiveObject *attached = env->getActiveObject(m_attached_id)) {
+			attached_pos = attached->getPosition() / BS;
+			attached_yaw = attached->getYaw();
+			is_attached = true;
+		} else {
 			unloaded = true;
+		}
 	}
 
 	if (m_spawntime != 0) // Spawner exists for a predefined timespan
@@ -277,8 +282,15 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 					v3f pos = random_v3f(m_minpos, m_maxpos);
 					v3f vel = random_v3f(m_minvel, m_maxvel);
 					v3f acc = random_v3f(m_minacc, m_maxacc);
-					// Make relative to offest
-					pos += attached_offset;
+
+					if (is_attached) {
+						// Apply attachment yaw and position
+						pos.rotateXZBy(attached_yaw);
+						pos += attached_pos;
+						vel.rotateXZBy(attached_yaw);
+						acc.rotateXZBy(attached_yaw);
+					}
+
 					float exptime = rand()/(float)RAND_MAX
 							*(m_maxexptime-m_minexptime)
 							+m_minexptime;
@@ -321,10 +333,18 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 		{
 			if (rand()/(float)RAND_MAX < dtime)
 			{
-				v3f pos = random_v3f(m_minpos, m_maxpos)
-						+ attached_offset;
+				v3f pos = random_v3f(m_minpos, m_maxpos);
 				v3f vel = random_v3f(m_minvel, m_maxvel);
 				v3f acc = random_v3f(m_minacc, m_maxacc);
+
+				if (is_attached) {
+					// Apply attachment yaw and position
+					pos.rotateXZBy(attached_yaw);
+					pos += attached_pos;
+					vel.rotateXZBy(attached_yaw);
+					acc.rotateXZBy(attached_yaw);
+				}
+
 				float exptime = rand()/(float)RAND_MAX
 						*(m_maxexptime-m_minexptime)
 						+m_minexptime;

From c6ca7a81cc61b51451594fc2da1868aa92ac7dd2 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Sat, 19 Nov 2016 22:58:11 +0000
Subject: [PATCH 311/418] Tool break: Reduce gain of break sounds

---
 builtin/game/item.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index a2fdbc1f4..bf456a4e0 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -475,7 +475,7 @@ function core.node_dig(pos, node, digger)
 		if not core.setting_getbool("creative_mode") then
 			wielded:add_wear(dp.wear)
 			if wielded:get_count() == 0 and wdef.sound and wdef.sound.breaks then
-				core.sound_play(wdef.sound.breaks, {pos = pos, gain = 1.0})
+				core.sound_play(wdef.sound.breaks, {pos = pos, gain = 0.5})
 			end
 		end
 	end

From 4bf4154cad127560ffe831e7b2cd1a0b960d0f03 Mon Sep 17 00:00:00 2001
From: ShadowNinja <ShadowNinja@users.noreply.github.com>
Date: Tue, 22 Nov 2016 09:05:39 -0500
Subject: [PATCH 312/418] Fix superflous shader setting updates (#4800)

This improves rendering performance by ~40%
---
 src/game.cpp   | 186 ++++++++++++++++++++++++++++++++++---------------
 src/shader.cpp | 129 +++++++++++++++++-----------------
 src/shader.h   |  63 ++++++++++++++---
 3 files changed, 250 insertions(+), 128 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index e0ffa1be5..16287fe0d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -888,40 +888,73 @@ public:
 	}
 };
 
+
+// before 1.8 there isn't a "integer interface", only float
+#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
+typedef f32 SamplerLayer_t;
+#else
+typedef s32 SamplerLayer_t;
+#endif
+
+
 class GameGlobalShaderConstantSetter : public IShaderConstantSetter
 {
 	Sky *m_sky;
 	bool *m_force_fog_off;
 	f32 *m_fog_range;
+	bool m_fog_enabled;
+	CachedPixelShaderSetting<float, 4> m_sky_bg_color;
+	CachedPixelShaderSetting<float> m_fog_distance;
+	CachedVertexShaderSetting<float> m_animation_timer_vertex;
+	CachedPixelShaderSetting<float> m_animation_timer_pixel;
+	CachedPixelShaderSetting<float> m_day_night_ratio;
+	CachedPixelShaderSetting<float, 3> m_eye_position_pixel;
+	CachedVertexShaderSetting<float, 3> m_eye_position_vertex;
+	CachedPixelShaderSetting<float, 3> m_minimap_yaw;
+	CachedPixelShaderSetting<SamplerLayer_t> m_base_texture;
+	CachedPixelShaderSetting<SamplerLayer_t> m_normal_texture;
+	CachedPixelShaderSetting<SamplerLayer_t> m_texture_flags;
 	Client *m_client;
-	bool m_fogEnabled;
 
 public:
 	void onSettingsChange(const std::string &name)
 	{
 		if (name == "enable_fog")
-			m_fogEnabled = g_settings->getBool("enable_fog");
+			m_fog_enabled = g_settings->getBool("enable_fog");
 	}
 
-	static void SettingsCallback(const std::string &name, void *userdata)
+	static void settingsCallback(const std::string &name, void *userdata)
 	{
 		reinterpret_cast<GameGlobalShaderConstantSetter*>(userdata)->onSettingsChange(name);
 	}
 
+	void setSky(Sky *sky) { m_sky = sky; }
+
 	GameGlobalShaderConstantSetter(Sky *sky, bool *force_fog_off,
 			f32 *fog_range, Client *client) :
 		m_sky(sky),
 		m_force_fog_off(force_fog_off),
 		m_fog_range(fog_range),
+		m_sky_bg_color("skyBgColor"),
+		m_fog_distance("fogDistance"),
+		m_animation_timer_vertex("animationTimer"),
+		m_animation_timer_pixel("animationTimer"),
+		m_day_night_ratio("dayNightRatio"),
+		m_eye_position_pixel("eyePosition"),
+		m_eye_position_vertex("eyePosition"),
+		m_minimap_yaw("yawVec"),
+		m_base_texture("baseTexture"),
+		m_normal_texture("normalTexture"),
+		m_texture_flags("textureFlags"),
 		m_client(client)
 	{
-		g_settings->registerChangedCallback("enable_fog", SettingsCallback, this);
-		m_fogEnabled = g_settings->getBool("enable_fog");
+		g_settings->registerChangedCallback("enable_fog", settingsCallback, this);
+		m_fog_enabled = g_settings->getBool("enable_fog");
 	}
 
 	~GameGlobalShaderConstantSetter()
 	{
-		g_settings->deregisterChangedCallback("enable_fog", SettingsCallback, this);
+		g_settings->deregisterChangedCallback("enable_fog", settingsCallback, this);
 	}
 
 	virtual void onSetConstants(video::IMaterialRendererServices *services,
@@ -939,54 +972,92 @@ public:
 			bgcolorf.b,
 			bgcolorf.a,
 		};
-		services->setPixelShaderConstant("skyBgColor", bgcolorfa, 4);
+		m_sky_bg_color.set(bgcolorfa, services);
 
 		// Fog distance
 		float fog_distance = 10000 * BS;
 
-		if (m_fogEnabled && !*m_force_fog_off)
+		if (m_fog_enabled && !*m_force_fog_off)
 			fog_distance = *m_fog_range;
 
-		services->setPixelShaderConstant("fogDistance", &fog_distance, 1);
+		m_fog_distance.set(&fog_distance, services);
 
-		// Day-night ratio
-		u32 daynight_ratio = m_client->getEnv().getDayNightRatio();
-		float daynight_ratio_f = (float)daynight_ratio / 1000.0;
-		services->setPixelShaderConstant("dayNightRatio", &daynight_ratio_f, 1);
+		float daynight_ratio = (float)m_client->getEnv().getDayNightRatio() / 1000.f;
+		m_day_night_ratio.set(&daynight_ratio, services);
 
 		u32 animation_timer = porting::getTimeMs() % 100000;
-		float animation_timer_f = (float)animation_timer / 100000.0;
-		services->setPixelShaderConstant("animationTimer", &animation_timer_f, 1);
-		services->setVertexShaderConstant("animationTimer", &animation_timer_f, 1);
+		float animation_timer_f = (float)animation_timer / 100000.f;
+		m_animation_timer_vertex.set(&animation_timer_f, services);
+		m_animation_timer_pixel.set(&animation_timer_f, services);
 
-		LocalPlayer *player = m_client->getEnv().getLocalPlayer();
-		v3f eye_position = player->getEyePosition();
-		services->setPixelShaderConstant("eyePosition", (irr::f32 *)&eye_position, 3);
-		services->setVertexShaderConstant("eyePosition", (irr::f32 *)&eye_position, 3);
-
-		v3f minimap_yaw_vec = m_client->getMapper()->getYawVec();
-		services->setPixelShaderConstant("yawVec", (irr::f32 *)&minimap_yaw_vec, 3);
-
-		// Uniform sampler layers
-		// before 1.8 there isn't a "integer interface", only float
+		float eye_position_array[3];
+		v3f epos = m_client->getEnv().getLocalPlayer()->getEyePosition();
 #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
-		f32 layer0 = 0;
-		f32 layer1 = 1;
-		f32 layer2 = 2;
-		services->setPixelShaderConstant("baseTexture" , (irr::f32 *)&layer0, 1);
-		services->setPixelShaderConstant("normalTexture" , (irr::f32 *)&layer1, 1);
-		services->setPixelShaderConstant("textureFlags" , (irr::f32 *)&layer2, 1);
+		eye_position_array[0] = epos.X;
+		eye_position_array[1] = epos.Y;
+		eye_position_array[2] = epos.Z;
 #else
-		s32 layer0 = 0;
-		s32 layer1 = 1;
-		s32 layer2 = 2;
-		services->setPixelShaderConstant("baseTexture" , (irr::s32 *)&layer0, 1);
-		services->setPixelShaderConstant("normalTexture" , (irr::s32 *)&layer1, 1);
-		services->setPixelShaderConstant("textureFlags" , (irr::s32 *)&layer2, 1);
+		epos.getAs3Values(eye_position_array);
 #endif
+		m_eye_position_pixel.set(eye_position_array, services);
+		m_eye_position_vertex.set(eye_position_array, services);
+
+		float minimap_yaw_array[3];
+		v3f minimap_yaw = m_client->getMapper()->getYawVec();
+#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
+		minimap_yaw_array[0] = minimap_yaw.X;
+		minimap_yaw_array[1] = minimap_yaw.Y;
+		minimap_yaw_array[2] = minimap_yaw.Z;
+#else
+		minimap_yaw.getAs3Values(minimap_yaw_array);
+#endif
+		m_minimap_yaw.set(minimap_yaw_array, services);
+
+		SamplerLayer_t base_tex = 0,
+				normal_tex = 1,
+				flags_tex = 2;
+		m_base_texture.set(&base_tex, services);
+		m_normal_texture.set(&normal_tex, services);
+		m_texture_flags.set(&flags_tex, services);
 	}
 };
 
+
+class GameGlobalShaderConstantSetterFactory : public IShaderConstantSetterFactory
+{
+	Sky *m_sky;
+	bool *m_force_fog_off;
+	f32 *m_fog_range;
+	Client *m_client;
+	std::vector<GameGlobalShaderConstantSetter *> created_nosky;
+public:
+	GameGlobalShaderConstantSetterFactory(bool *force_fog_off,
+			f32 *fog_range, Client *client) :
+		m_sky(NULL),
+		m_force_fog_off(force_fog_off),
+		m_fog_range(fog_range),
+		m_client(client)
+	{}
+
+	void setSky(Sky *sky) {
+		m_sky = sky;
+		for (size_t i = 0; i < created_nosky.size(); ++i) {
+			created_nosky[i]->setSky(m_sky);
+		}
+		created_nosky.clear();
+	}
+
+	virtual IShaderConstantSetter* create()
+	{
+		GameGlobalShaderConstantSetter *scs = new GameGlobalShaderConstantSetter(
+				m_sky, m_force_fog_off, m_fog_range, m_client);
+		if (!m_sky)
+			created_nosky.push_back(scs);
+		return scs;
+	}
+};
+
+
 bool nodePlacementPrediction(Client &client,
 		const ItemDefinition &playeritem_def, v3s16 nodepos, v3s16 neighbourpos)
 {
@@ -1695,6 +1766,9 @@ private:
 	Hud *hud;
 	Mapper *mapper;
 
+	GameRunData runData;
+	VolatileRunFlags flags;
+
 	/* 'cache'
 	   This class does take ownership/responsibily for cleaning up etc of any of
 	   these items (e.g. device)
@@ -1886,6 +1960,18 @@ bool Game::startup(bool *kill,
 
 	smgr->getParameters()->setAttribute(scene::OBJ_LOADER_IGNORE_MATERIAL_FILES, true);
 
+	memset(&runData, 0, sizeof(runData));
+	runData.time_from_last_punch = 10.0;
+	runData.profiler_max_page = 3;
+	runData.update_wielded_item_trigger = true;
+
+	memset(&flags, 0, sizeof(flags));
+	flags.show_chat = true;
+	flags.show_hud = true;
+	flags.show_debug = g_settings->getBool("show_debug");
+	flags.invert_mouse = g_settings->getBool("invert_mouse");
+	flags.first_loop_after_window_activation = true;
+
 	if (!init(map_dir, address, port, gamespec))
 		return false;
 
@@ -1902,34 +1988,15 @@ void Game::run()
 	RunStats stats              = { 0 };
 	CameraOrientation cam_view_target  = { 0 };
 	CameraOrientation cam_view  = { 0 };
-	GameRunData runData         = { 0 };
 	FpsControl draw_times       = { 0 };
-	VolatileRunFlags flags      = { 0 };
 	f32 dtime; // in seconds
 
-	runData.time_from_last_punch  = 10.0;
-	runData.profiler_max_page = 3;
-	runData.update_wielded_item_trigger = true;
-
-	flags.show_chat = true;
-	flags.show_hud = true;
-	flags.show_minimap = g_settings->getBool("enable_minimap");
-	flags.show_debug = g_settings->getBool("show_debug");
-	flags.invert_mouse = g_settings->getBool("invert_mouse");
-	flags.first_loop_after_window_activation = true;
-
 	/* Clear the profiler */
 	Profiler::GraphValues dummyvalues;
 	g_profiler->graphGet(dummyvalues);
 
 	draw_times.last_time = device->getTimer()->getTime();
 
-	shader_src->addGlobalConstantSetter(new GameGlobalShaderConstantSetter(
-			sky,
-			&flags.force_fog_off,
-			&runData.fog_range,
-			client));
-
 	set_light_table(g_settings->getFloat("display_gamma"));
 
 #ifdef __ANDROID__
@@ -2169,6 +2236,10 @@ bool Game::createClient(const std::string &playername,
 		return false;
 	}
 
+	GameGlobalShaderConstantSetterFactory *scsf = new GameGlobalShaderConstantSetterFactory(
+			&flags.force_fog_off, &runData.fog_range, client);
+	shader_src->addShaderConstantSetterFactory(scsf);
+
 	// Update cached textures, meshes and materials
 	client->afterContentReceived(device);
 
@@ -2193,6 +2264,7 @@ bool Game::createClient(const std::string &playername,
 	/* Skybox
 	 */
 	sky = new Sky(smgr->getRootSceneNode(), smgr, -1, texture_src);
+	scsf->setSky(sky);
 	skybox = NULL;	// This is used/set later on in the main run loop
 
 	local_inventory = new Inventory(itemdef_manager);
diff --git a/src/shader.cpp b/src/shader.cpp
index b0131c952..170b0354d 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -167,29 +167,27 @@ private:
 	}
 };
 
+
 /*
 	ShaderCallback: Sets constants that can be used in shaders
 */
 
-class IShaderConstantSetterRegistry
-{
-public:
-	virtual ~IShaderConstantSetterRegistry(){};
-	virtual void onSetConstants(video::IMaterialRendererServices *services,
-			bool is_highlevel, const std::string &name) = 0;
-};
-
 class ShaderCallback : public video::IShaderConstantSetCallBack
 {
-	IShaderConstantSetterRegistry *m_scsr;
-	std::string m_name;
+	std::vector<IShaderConstantSetter*> m_setters;
 
 public:
-	ShaderCallback(IShaderConstantSetterRegistry *scsr, const std::string &name):
-		m_scsr(scsr),
-		m_name(name)
-	{}
-	~ShaderCallback() {}
+	ShaderCallback(const std::vector<IShaderConstantSetterFactory*> &factories)
+	{
+		for (u32 i = 0; i < factories.size(); ++i)
+			m_setters.push_back(factories[i]->create());
+	}
+
+	~ShaderCallback()
+	{
+		for (u32 i = 0; i < m_setters.size(); ++i)
+			delete m_setters[i];
+	}
 
 	virtual void OnSetConstants(video::IMaterialRendererServices *services, s32 userData)
 	{
@@ -198,18 +196,25 @@ public:
 
 		bool is_highlevel = userData;
 
-		m_scsr->onSetConstants(services, is_highlevel, m_name);
+		for (u32 i = 0; i < m_setters.size(); ++i)
+			m_setters[i]->onSetConstants(services, is_highlevel);
 	}
 };
 
+
 /*
 	MainShaderConstantSetter: Set basic constants required for almost everything
 */
 
 class MainShaderConstantSetter : public IShaderConstantSetter
 {
+	CachedVertexShaderSetting<float, 16> m_world_view_proj;
+	CachedVertexShaderSetting<float, 16> m_world;
+
 public:
-	MainShaderConstantSetter(IrrlichtDevice *device)
+	MainShaderConstantSetter() :
+		m_world_view_proj("mWorldViewProj"),
+		m_world("mWorld")
 	{}
 	~MainShaderConstantSetter() {}
 
@@ -219,31 +224,40 @@ public:
 		video::IVideoDriver *driver = services->getVideoDriver();
 		sanity_check(driver);
 
-		// set clip matrix
+		// Set clip matrix
 		core::matrix4 worldViewProj;
 		worldViewProj = driver->getTransform(video::ETS_PROJECTION);
 		worldViewProj *= driver->getTransform(video::ETS_VIEW);
 		worldViewProj *= driver->getTransform(video::ETS_WORLD);
-		if(is_highlevel)
-			services->setVertexShaderConstant("mWorldViewProj", worldViewProj.pointer(), 16);
+		if (is_highlevel)
+			m_world_view_proj.set(*reinterpret_cast<float(*)[16]>(worldViewProj.pointer()), services);
 		else
-			services->setVertexShaderConstant(worldViewProj.pointer(), 4, 4);
+			services->setVertexShaderConstant(worldViewProj.pointer(), 0, 4);
 
-		// set world matrix
+		// Set world matrix
 		core::matrix4 world = driver->getTransform(video::ETS_WORLD);
-		if(is_highlevel)
-			services->setVertexShaderConstant("mWorld", world.pointer(), 16);
+		if (is_highlevel)
+			m_world.set(*reinterpret_cast<float(*)[16]>(world.pointer()), services);
 		else
-			services->setVertexShaderConstant(world.pointer(), 8, 4);
+			services->setVertexShaderConstant(world.pointer(), 4, 4);
 
 	}
 };
 
+
+class MainShaderConstantSetterFactory : public IShaderConstantSetterFactory
+{
+public:
+	virtual IShaderConstantSetter* create()
+		{ return new MainShaderConstantSetter(); }
+};
+
+
 /*
 	ShaderSource
 */
 
-class ShaderSource : public IWritableShaderSource, public IShaderConstantSetterRegistry
+class ShaderSource : public IWritableShaderSource
 {
 public:
 	ShaderSource(IrrlichtDevice *device);
@@ -286,22 +300,17 @@ public:
 	// Shall be called from the main thread.
 	void rebuildShaders();
 
-	void addGlobalConstantSetter(IShaderConstantSetter *setter)
+	void addShaderConstantSetterFactory(IShaderConstantSetterFactory *setter)
 	{
-		m_global_setters.push_back(setter);
+		m_setter_factories.push_back(setter);
 	}
 
-	void onSetConstants(video::IMaterialRendererServices *services,
-			bool is_highlevel, const std::string &name);
-
 private:
 
 	// The id of the thread that is allowed to use irrlicht directly
 	threadid_t m_main_thread;
 	// The irrlicht device
 	IrrlichtDevice *m_device;
-	// The set-constants callback
-	ShaderCallback *m_shader_callback;
 
 	// Cache of source shaders
 	// This should be only accessed from the main thread
@@ -316,9 +325,11 @@ private:
 	// Queued shader fetches (to be processed by the main thread)
 	RequestQueue<std::string, u32, u8, u8> m_get_shader_queue;
 
-	// Global constant setters
-	// TODO: Delete these in the destructor
-	std::vector<IShaderConstantSetter*> m_global_setters;
+	// Global constant setter factories
+	std::vector<IShaderConstantSetterFactory *> m_setter_factories;
+
+	// Shader callbacks
+	std::vector<ShaderCallback *> m_callbacks;
 };
 
 IWritableShaderSource* createShaderSource(IrrlichtDevice *device)
@@ -331,8 +342,8 @@ IWritableShaderSource* createShaderSource(IrrlichtDevice *device)
 */
 ShaderInfo generate_shader(std::string name,
 		u8 material_type, u8 drawtype,
-		IrrlichtDevice *device,
-		video::IShaderConstantSetCallBack *callback,
+		IrrlichtDevice *device, std::vector<ShaderCallback *> &callbacks,
+		const std::vector<IShaderConstantSetterFactory*> &setter_factories,
 		SourceShaderCache *sourcecache);
 
 /*
@@ -348,28 +359,24 @@ ShaderSource::ShaderSource(IrrlichtDevice *device):
 {
 	assert(m_device); // Pre-condition
 
-	m_shader_callback = new ShaderCallback(this, "default");
-
 	m_main_thread = thr_get_current_thread_id();
 
 	// Add a dummy ShaderInfo as the first index, named ""
 	m_shaderinfo_cache.push_back(ShaderInfo());
 
 	// Add main global constant setter
-	addGlobalConstantSetter(new MainShaderConstantSetter(device));
+	addShaderConstantSetterFactory(new MainShaderConstantSetterFactory());
 }
 
 ShaderSource::~ShaderSource()
 {
-	for (std::vector<IShaderConstantSetter*>::iterator iter = m_global_setters.begin();
-			iter != m_global_setters.end(); ++iter) {
+	for (std::vector<ShaderCallback *>::iterator iter = m_callbacks.begin();
+			iter != m_callbacks.end(); ++iter) {
 		delete *iter;
 	}
-	m_global_setters.clear();
-
-	if (m_shader_callback) {
-		m_shader_callback->drop();
-		m_shader_callback = NULL;
+	for (std::vector<IShaderConstantSetterFactory *>::iterator iter = m_setter_factories.begin();
+			iter != m_setter_factories.end(); ++iter) {
+		delete *iter;
 	}
 }
 
@@ -445,8 +452,8 @@ u32 ShaderSource::getShaderIdDirect(const std::string &name,
 		return 0;
 	}
 
-	ShaderInfo info = generate_shader(name, material_type, drawtype, m_device,
-			m_shader_callback, &m_sourcecache);
+	ShaderInfo info = generate_shader(name, material_type, drawtype,
+			m_device, m_callbacks, m_setter_factories, &m_sourcecache);
 
 	/*
 		Add shader to caches (add dummy shaders too)
@@ -511,22 +518,16 @@ void ShaderSource::rebuildShaders()
 		ShaderInfo *info = &m_shaderinfo_cache[i];
 		if(info->name != ""){
 			*info = generate_shader(info->name, info->material_type,
-					info->drawtype, m_device, m_shader_callback, &m_sourcecache);
+					info->drawtype, m_device, m_callbacks,
+					m_setter_factories, &m_sourcecache);
 		}
 	}
 }
 
-void ShaderSource::onSetConstants(video::IMaterialRendererServices *services,
-		bool is_highlevel, const std::string &name)
-{
-	for(u32 i=0; i<m_global_setters.size(); i++){
-		IShaderConstantSetter *setter = m_global_setters[i];
-		setter->onSetConstants(services, is_highlevel);
-	}
-}
 
 ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
-		IrrlichtDevice *device,	video::IShaderConstantSetCallBack *callback,
+		IrrlichtDevice *device, std::vector<ShaderCallback *> &callbacks,
+		const std::vector<IShaderConstantSetterFactory*> &setter_factories,
 		SourceShaderCache *sourcecache)
 {
 	ShaderInfo shaderinfo;
@@ -766,6 +767,7 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
 		geometry_program = shaders_header + geometry_program;
 		geometry_program_ptr = geometry_program.c_str();
 	}
+	ShaderCallback *cb = new ShaderCallback(setter_factories);
 	s32 shadermat = -1;
 	if(is_highlevel){
 		infostream<<"Compiling high level shaders for "<<name<<std::endl;
@@ -782,7 +784,7 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
 			scene::EPT_TRIANGLES,      // Geometry shader input
 			scene::EPT_TRIANGLE_STRIP, // Geometry shader output
 			0,                         // Support maximum number of vertices
-			callback,                  // Set-constant callback
+			cb, // Set-constant callback
 			shaderinfo.base_material,  // Base material
 			1                          // Userdata passed to callback
 			);
@@ -794,6 +796,7 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
 			dumpShaderProgram(warningstream, "Vertex", vertex_program);
 			dumpShaderProgram(warningstream, "Pixel", pixel_program);
 			dumpShaderProgram(warningstream, "Geometry", geometry_program);
+			delete cb;
 			return shaderinfo;
 		}
 	}
@@ -802,7 +805,7 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
 		shadermat = gpu->addShaderMaterial(
 			vertex_program_ptr,   // Vertex shader program
 			pixel_program_ptr,    // Pixel shader program
-			callback,             // Set-constant callback
+			cb, // Set-constant callback
 			shaderinfo.base_material,  // Base material
 			0                     // Userdata passed to callback
 			);
@@ -814,9 +817,11 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
 					<<std::endl;
 			dumpShaderProgram(warningstream, "Vertex", vertex_program);
 			dumpShaderProgram(warningstream,"Pixel", pixel_program);
+			delete cb;
 			return shaderinfo;
 		}
 	}
+	callbacks.push_back(cb);
 
 	// HACK, TODO: investigate this better
 	// Grab the material renderer once more so minetest doesn't crash on exit
diff --git a/src/shader.h b/src/shader.h
index b8aa88bce..766871f02 100644
--- a/src/shader.h
+++ b/src/shader.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SHADER_HEADER
 #define SHADER_HEADER
 
+#include <IMaterialRendererServices.h>
 #include "irrlichttypes_extrabloated.h"
 #include "threads.h"
 #include <string>
@@ -43,8 +44,7 @@ class IGameDef;
 std::string getShaderPath(const std::string &name_of_shader,
 		const std::string &filename);
 
-struct ShaderInfo
-{
+struct ShaderInfo {
 	std::string name;
 	video::E_MATERIAL_TYPE base_material;
 	video::E_MATERIAL_TYPE material;
@@ -66,20 +66,66 @@ namespace irr { namespace video {
 	class IMaterialRendererServices;
 } }
 
-class IShaderConstantSetter
-{
+
+class IShaderConstantSetter {
 public:
 	virtual ~IShaderConstantSetter(){};
 	virtual void onSetConstants(video::IMaterialRendererServices *services,
 			bool is_highlevel) = 0;
 };
 
+
+class IShaderConstantSetterFactory {
+public:
+	virtual ~IShaderConstantSetterFactory() {};
+	virtual IShaderConstantSetter* create() = 0;
+};
+
+
+template <typename T, std::size_t count=1>
+class CachedShaderSetting {
+	const char *m_name;
+	T m_sent[count];
+	bool has_been_set;
+	bool is_pixel;
+protected:
+	CachedShaderSetting(const char *name, bool is_pixel) :
+		m_name(name), has_been_set(false), is_pixel(is_pixel)
+	{}
+public:
+	void set(const T value[count], video::IMaterialRendererServices *services)
+	{
+		if (has_been_set && std::equal(m_sent, m_sent + count, value))
+			return;
+		if (is_pixel)
+			services->setPixelShaderConstant(m_name, value, count);
+		else
+			services->setVertexShaderConstant(m_name, value, count);
+		std::copy(value, value + count, m_sent);
+		has_been_set = true;
+	}
+};
+
+template <typename T, std::size_t count = 1>
+class CachedPixelShaderSetting : public CachedShaderSetting<T, count> {
+public:
+	CachedPixelShaderSetting(const char *name) :
+		CachedShaderSetting<T, count>(name, true){}
+};
+
+template <typename T, std::size_t count = 1>
+class CachedVertexShaderSetting : public CachedShaderSetting<T, count> {
+public:
+	CachedVertexShaderSetting(const char *name) :
+		CachedShaderSetting<T, count>(name, false){}
+};
+
+
 /*
 	ShaderSource creates and caches shaders.
 */
 
-class IShaderSource
-{
+class IShaderSource {
 public:
 	IShaderSource(){}
 	virtual ~IShaderSource(){}
@@ -90,8 +136,7 @@ public:
 		const u8 material_type, const u8 drawtype){return 0;}
 };
 
-class IWritableShaderSource : public IShaderSource
-{
+class IWritableShaderSource : public IShaderSource {
 public:
 	IWritableShaderSource(){}
 	virtual ~IWritableShaderSource(){}
@@ -105,7 +150,7 @@ public:
 	virtual void insertSourceShader(const std::string &name_of_shader,
 		const std::string &filename, const std::string &program)=0;
 	virtual void rebuildShaders()=0;
-	virtual void addGlobalConstantSetter(IShaderConstantSetter *setter)=0;
+	virtual void addShaderConstantSetterFactory(IShaderConstantSetterFactory *setter) = 0;
 };
 
 IWritableShaderSource* createShaderSource(IrrlichtDevice *device);

From dbeb322f62bfdd431365622a6f5ddfae062c0d31 Mon Sep 17 00:00:00 2001
From: Zeno- <kde.psych@gmail.com>
Date: Wed, 23 Nov 2016 01:23:34 +1000
Subject: [PATCH 313/418] No functional changes. Credit gcu

This merge doesn't make any functional changes. It's a trivial style fix so that @gregorycu can be dual credited along with shadowninja for PR #4800
---
 src/shader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shader.cpp b/src/shader.cpp
index 170b0354d..d51c1e308 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -557,7 +557,7 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
 	}
 
 	bool enable_shaders = g_settings->getBool("enable_shaders");
-	if(!enable_shaders)
+	if (!enable_shaders)
 		return shaderinfo;
 
 	video::IVideoDriver* driver = device->getVideoDriver();

From 0d1c9598a0d2a4f21dc57de32efca2dc52b6b146 Mon Sep 17 00:00:00 2001
From: orwell96 <mono96.mml@gmail.com>
Date: Tue, 22 Nov 2016 17:15:22 +0100
Subject: [PATCH 314/418] Make supplying empty formspec strings close the
 formspec (#4737)

This will only happen if the formname matches or if formname is "".
---
 builtin/game/misc.lua |  4 ++++
 doc/lua_api.txt       |  7 +++++++
 src/game.cpp          | 27 ++++++++++++++++++++-------
 src/server.cpp        |  8 ++++++--
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 1333a75ba..040016333 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -239,3 +239,7 @@ else
 
 end
 
+function core.close_formspec(player_name, formname)
+	return minetest.show_formspec(player_name, formname, "")
+end
+
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 80e66020d..760a829d3 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2316,6 +2316,13 @@ and `minetest.auth_reload` call the authetification handler.
     * `formname`: name passed to `on_player_receive_fields` callbacks.
       It should follow the `"modname:<whatever>"` naming convention
     * `formspec`: formspec to display
+* `minetest.close_formspec(playername, formname)`
+    * `playername`: name of player to close formspec
+    * `formname`: has to exactly match the one given in show_formspec, or the formspec will
+       not close.
+    * calling show_formspec(playername, formname, "") is equal to this expression
+    * to close a formspec regardless of the formname, call 
+      minetest.close_formspec(playername, ""). USE THIS ONLY WHEN ABSOLUTELY NECESSARY!
 * `minetest.formspec_escape(string)`: returns a string
     * escapes the characters "[", "]", "\", "," and ";", which can not be used in formspecs
 * `minetest.explode_table_event(string)`: returns a table
diff --git a/src/game.cpp b/src/game.cpp
index 16287fe0d..671682348 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1205,6 +1205,7 @@ static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec,
 		(*cur_formspec)->setFormSource(fs_src);
 		(*cur_formspec)->setTextDest(txt_dest);
 	}
+	
 }
 
 #ifdef __ANDROID__
@@ -1753,6 +1754,8 @@ private:
 	ChatBackend *chat_backend;
 
 	GUIFormSpecMenu *current_formspec;
+	//default: "". If other than "", empty show_formspec packets will only close the formspec when the formname matches
+	std::string cur_formname;
 
 	EventManager *eventmgr;
 	QuicktuneShortcutter *quicktune;
@@ -1841,6 +1844,7 @@ Game::Game() :
 	soundmaker(NULL),
 	chat_backend(NULL),
 	current_formspec(NULL),
+	cur_formname(""),
 	eventmgr(NULL),
 	quicktune(NULL),
 	gui_chat_console(NULL),
@@ -3005,6 +3009,7 @@ void Game::openInventory()
 
 	create_formspec_menu(&current_formspec, client, gamedef, texture_src,
 			device, &input->joystick, fs_src, txt_dst, client);
+	cur_formname = "";
 
 	InventoryLocation inventoryloc;
 	inventoryloc.setCurrentPlayer();
@@ -3484,14 +3489,21 @@ void Game::processClientEvents(CameraOrientation *cam, float *damage_flash)
 			player->hurt_tilt_strength = 0;
 
 		} else if (event.type == CE_SHOW_FORMSPEC) {
-			FormspecFormSource *fs_src =
-				new FormspecFormSource(*(event.show_formspec.formspec));
-			TextDestPlayerInventory *txt_dst =
-				new TextDestPlayerInventory(client, *(event.show_formspec.formname));
+			if (*(event.show_formspec.formspec) == "") {
+				if (current_formspec && ( *(event.show_formspec.formname) == "" || *(event.show_formspec.formname) == cur_formname) ){
+					current_formspec->quitMenu();
+				}
+			} else {
+				FormspecFormSource *fs_src =
+					new FormspecFormSource(*(event.show_formspec.formspec));
+				TextDestPlayerInventory *txt_dst =
+					new TextDestPlayerInventory(client, *(event.show_formspec.formname));
 
-			create_formspec_menu(&current_formspec, client, gamedef,
-				texture_src, device, &input->joystick,
-				fs_src, txt_dst, client);
+				create_formspec_menu(&current_formspec, client, gamedef,
+					texture_src, device, &input->joystick,
+					fs_src, txt_dst, client);
+				cur_formname = *(event.show_formspec.formname);
+			}
 
 			delete(event.show_formspec.formspec);
 			delete(event.show_formspec.formname);
@@ -3955,6 +3967,7 @@ void Game::handlePointingAtNode(GameRunData *runData,
 
 			create_formspec_menu(&current_formspec, client, gamedef,
 				texture_src, device, &input->joystick, fs_src, txt_dst, client);
+			cur_formname = "";
 
 			current_formspec->setFormSpec(meta->getString("formspec"), inventoryloc);
 		} else {
diff --git a/src/server.cpp b/src/server.cpp
index 48331e4f8..fae375425 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1647,8 +1647,12 @@ void Server::SendShowFormspecMessage(u16 peer_id, const std::string &formspec,
 	DSTACK(FUNCTION_NAME);
 
 	NetworkPacket pkt(TOCLIENT_SHOW_FORMSPEC, 0 , peer_id);
-
-	pkt.putLongString(FORMSPEC_VERSION_STRING + formspec);
+	if (formspec == "" ){
+		//the client should close the formspec
+		pkt.putLongString("");
+	} else {
+		pkt.putLongString(FORMSPEC_VERSION_STRING + formspec);
+	}
 	pkt << formname;
 
 	Send(&pkt);

From 9e10f9f49a558050d36a49db619bf8f5eb3853c0 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Thu, 24 Nov 2016 09:58:21 -0500
Subject: [PATCH 315/418] Fix secure io.open without mode

---
 src/script/cpp_api/s_security.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 3a8f724fe..5a64c249c 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -525,14 +525,19 @@ int ScriptApiSecurity::sl_g_require(lua_State *L)
 
 int ScriptApiSecurity::sl_io_open(lua_State *L)
 {
+	bool with_mode = lua_gettop(L) > 1;
+
 	luaL_checktype(L, 1, LUA_TSTRING);
 	const char *path = lua_tostring(L, 1);
 	CHECK_SECURE_PATH(L, path);
 
 	push_original(L, "io", "open");
 	lua_pushvalue(L, 1);
-	lua_pushvalue(L, 2);
-	lua_call(L, 2, 2);
+	if (with_mode) {
+		lua_pushvalue(L, 2);
+	}
+
+	lua_call(L, with_mode ? 2 : 1, 2);
 	return 2;
 }
 

From 3af5eef96463510a27cf06b9c3ecc9f1d04cdac6 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Thu, 24 Nov 2016 10:10:20 -0500
Subject: [PATCH 316/418] Fix secure io.lines

It used to drop all of the return values from the
insecure version of the function.
---
 src/script/cpp_api/s_security.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 5a64c249c..c9816f89b 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -577,13 +577,13 @@ int ScriptApiSecurity::sl_io_lines(lua_State *L)
 		CHECK_SECURE_PATH(L, path);
 	}
 
+	int top_precall = lua_gettop(L);
 	push_original(L, "io", "lines");
 	lua_pushvalue(L, 1);
-	int top_precall = lua_gettop(L);
 	lua_call(L, 1, LUA_MULTRET);
 	// Return number of arguments returned by the function,
 	// adjusting for the function being poped.
-	return lua_gettop(L) - (top_precall - 1);
+	return lua_gettop(L) - top_precall;
 }
 
 

From e4ee6548afd01040046ee3780d0fbb121d141251 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Thu, 24 Nov 2016 10:35:48 -0500
Subject: [PATCH 317/418] Fix fs::RemoveRelativePathComponents for paths with a
 leading dot component

Previously, paths like ./worlds would be resolved to /worlds since the
leading dot was considered just as irrelevant as a dot in the middle of
the path.
---
 src/filesys.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/filesys.cpp b/src/filesys.cpp
index b4c52ab79..c718a9689 100644
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -631,7 +631,7 @@ std::string RemoveRelativePathComponents(std::string path)
 		std::string component = path.substr(component_start,
 				component_end - component_start);
 		bool remove_this_component = false;
-		if(component == "."){
+		if(component == "." && component_start != 0){
 			remove_this_component = true;
 		}
 		else if(component == ".."){

From 785a9a6c1af424b0a46f334de7176c9e67341cfb Mon Sep 17 00:00:00 2001
From: TeTpaAka <TeTpaAka@users.noreply.github.com>
Date: Thu, 25 Jun 2015 13:06:49 +0200
Subject: [PATCH 318/418] Wieldhand: Allow overriding the hand

---
 doc/lua_api.txt                     |  7 ++++++
 src/content_sao.cpp                 | 36 +++++++++++++++++++++++++++++
 src/content_sao.h                   |  2 ++
 src/game.cpp                        | 17 ++++++++++++++
 src/network/serverpackethandler.cpp |  5 +---
 src/player.cpp                      |  1 +
 6 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 760a829d3..9da0fb4f9 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1759,6 +1759,13 @@ Inventory locations
 * `"nodemeta:<X>,<Y>,<Z>"`: Any node metadata
 * `"detached:<name>"`: A detached inventory
 
+Player Inventory lists
+----------------------
+* `main`: list containing the default inventory
+* `craft`: list containing the craft input
+* `craftpreview`: list containing the craft output
+* `hand`: list containing an override for the empty hand
+
 `ColorString`
 -------------
 `#RGB` defines a color in hexadecimal format.
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 6caea5198..609673ed9 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1341,6 +1341,42 @@ std::string PlayerSAO::getWieldList() const
 	return "main";
 }
 
+ItemStack PlayerSAO::getWieldedItem() const
+{
+	const Inventory *inv = getInventory();
+	ItemStack ret;
+	const InventoryList *mlist = inv->getList(getWieldList());
+	if (mlist && getWieldIndex() < (s32)mlist->getSize())
+		ret = mlist->getItem(getWieldIndex());
+	if (ret.name.empty()) {
+		const InventoryList *hlist = inv->getList("hand");
+		if (hlist)
+			ret = hlist->getItem(0);
+	}
+	return ret;
+}
+
+bool PlayerSAO::setWieldedItem(const ItemStack &item)
+{
+	Inventory *inv = getInventory();
+	if (inv) {
+		InventoryList *mlist = inv->getList(getWieldList());
+		if (mlist) {
+			ItemStack olditem = mlist->getItem(getWieldIndex());
+			if (olditem.name.empty()) {
+				InventoryList *hlist = inv->getList("hand");
+				if (hlist) {
+					hlist->changeItem(0, item);
+					return true;
+				}
+			}
+			mlist->changeItem(getWieldIndex(), item);
+			return true;
+		}
+	}
+	return false;
+}
+
 int PlayerSAO::getWieldIndex() const
 {
 	return m_wield_index;
diff --git a/src/content_sao.h b/src/content_sao.h
index f58c7dadb..c5b066f50 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -251,6 +251,8 @@ public:
 	const Inventory* getInventory() const;
 	InventoryLocation getInventoryLocation() const;
 	std::string getWieldList() const;
+	ItemStack getWieldedItem() const;
+	bool setWieldedItem(const ItemStack &item);
 	int getWieldIndex() const;
 	void setWieldIndex(int i);
 
diff --git a/src/game.cpp b/src/game.cpp
index 671682348..e6d38d0a0 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -3684,6 +3684,12 @@ void Game::updateCamera(VolatileRunFlags *flags, u32 busy_time,
 		if (mlist && client->getPlayerItem() < mlist->getSize())
 			playeritem = mlist->getItem(client->getPlayerItem());
 	}
+	if (playeritem.getDefinition(itemdef_manager).name.empty()) { // override the hand
+		InventoryList *hlist = local_inventory->getList("hand");
+		if (hlist)
+			playeritem = hlist->getItem(0);
+	}
+
 
 	ToolCapabilities playeritem_toolcap =
 		playeritem.getToolCapabilities(itemdef_manager);
@@ -3768,6 +3774,11 @@ void Game::processPlayerInteraction(GameRunData *runData,
 			playeritem = mlist->getItem(client->getPlayerItem());
 	}
 
+	if (playeritem.getDefinition(itemdef_manager).name.empty()) { // override the hand
+		InventoryList *hlist = local_inventory->getList("hand");
+		if (hlist)
+			playeritem = hlist->getItem(0);
+	}
 	const ItemDefinition &playeritem_def =
 			playeritem.getDefinition(itemdef_manager);
 
@@ -4321,8 +4332,14 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats,
 
 		if (mlist && (client->getPlayerItem() < mlist->getSize())) {
 			ItemStack item = mlist->getItem(client->getPlayerItem());
+			if (item.getDefinition(itemdef_manager).name.empty()) { // override the hand
+				InventoryList *hlist = local_inventory->getList("hand");
+				if (hlist)
+					item = hlist->getItem(0);
+			}
 			camera->wield(item);
 		}
+
 		runData->update_wielded_item_trigger = false;
 	}
 
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index d56424b75..70eb0a828 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1529,10 +1529,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 					m_script->on_cheat(playersao, "finished_unknown_dig");
 				}
 				// Get player's wielded item
-				ItemStack playeritem;
-				InventoryList *mlist = playersao->getInventory()->getList("main");
-				if (mlist != NULL)
-					playeritem = mlist->getItem(playersao->getWieldIndex());
+				ItemStack playeritem = playersao->getWieldedItem();
 				ToolCapabilities playeritem_toolcap =
 						playeritem.getToolCapabilities(m_itemdef);
 				// Get diggability and expected digging time
diff --git a/src/player.cpp b/src/player.cpp
index 9c321d571..85bc639ec 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -40,6 +40,7 @@ Player::Player(const char *name, IItemDefManager *idef):
 
 	inventory.clear();
 	inventory.addList("main", PLAYER_INVENTORY_SIZE);
+	inventory.addList("hand", 1);
 	InventoryList *craft = inventory.addList("craft", 9);
 	craft->setWidth(3);
 	inventory.addList("craftpreview", 1);

From bb06d377a163b2d168c9d327ad38b871132fa8ea Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sun, 27 Nov 2016 18:38:28 +0100
Subject: [PATCH 319/418] Fix filepath > RemoveRelativePathComponent unittest

(was broken by e4ee6548afd01040046ee3780d0fbb121d141251)
---
 src/unittest/test_filepath.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/unittest/test_filepath.cpp b/src/unittest/test_filepath.cpp
index 6ea7ac076..5e3cdcc08 100644
--- a/src/unittest/test_filepath.cpp
+++ b/src/unittest/test_filepath.cpp
@@ -251,7 +251,7 @@ void TestFilePath::testRemoveRelativePathComponent()
 	UASSERT(result == p("/home/user/minetest/worlds/world1"));
 	path = p(".");
 	result = fs::RemoveRelativePathComponents(path);
-	UASSERT(result == "");
+	UASSERT(result == ".");
 	path = p("./subdir/../..");
 	result = fs::RemoveRelativePathComponents(path);
 	UASSERT(result == "");

From 2fe3bf5a18eb9aa9f38654b3c0a0729c42408cd6 Mon Sep 17 00:00:00 2001
From: juhdanad <juhdanad@gmail.com>
Date: Mon, 28 Nov 2016 09:43:33 +0100
Subject: [PATCH 320/418] Limit light_source in the engine (#4814)

Since light_source>15 causes crash, it must be limited.
---
 src/nodedef.cpp                 | 2 ++
 src/script/common/c_content.cpp | 6 ++++++
 src/voxelalgorithms.cpp         | 1 +
 3 files changed, 9 insertions(+)

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 39ea1a60e..ccbb42c66 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -482,6 +482,7 @@ void ContentFeatures::deSerialize(std::istream &is)
 	liquid_viscosity = readU8(is);
 	liquid_renewable = readU8(is);
 	light_source = readU8(is);
+	light_source = MYMIN(light_source, LIGHT_MAX);
 	damage_per_second = readU32(is);
 	node_box.deSerialize(is);
 	selection_box.deSerialize(is);
@@ -1442,6 +1443,7 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
 		liquid_alternative_source = deSerializeString(is);
 		liquid_viscosity = readU8(is);
 		light_source = readU8(is);
+		light_source = MYMIN(light_source, LIGHT_MAX);
 		damage_per_second = readU32(is);
 		node_box.deSerialize(is);
 		selection_box.deSerialize(is);
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index f20a65903..541744895 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -526,6 +526,12 @@ ContentFeatures read_content_features(lua_State *L, int index)
 	// Amount of light the node emits
 	f.light_source = getintfield_default(L, index,
 			"light_source", f.light_source);
+	if (f.light_source > LIGHT_MAX) {
+		warningstream << "Node " << f.name.c_str()
+			<< " had greater light_source than " << LIGHT_MAX
+			<< ", it was reduced." << std::endl;
+		f.light_source = LIGHT_MAX;
+	}
 	f.damage_per_second = getintfield_default(L, index,
 			"damage_per_second", f.damage_per_second);
 
diff --git a/src/voxelalgorithms.cpp b/src/voxelalgorithms.cpp
index 55f0d1c98..93cc33acc 100644
--- a/src/voxelalgorithms.cpp
+++ b/src/voxelalgorithms.cpp
@@ -264,6 +264,7 @@ struct LightQueue {
 		const mapblock_v3 &block_pos, MapBlock *block,
 		direction source_dir)
 	{
+		assert(light <= LIGHT_SUN);
 		lights[light].push_back(
 			ChangingLight(rel_pos, block_pos, block, source_dir));
 	}

From c38985825f299999135cc01aaf0052ec9138135a Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sat, 26 Nov 2016 17:35:25 +0100
Subject: [PATCH 321/418] Allow restricting detached inventories to one player

This combats the problem of sending the hundreds of
"creative" / "armor" or whatever detached invs that
exist on popular servers to each and every player
on join or on change of said invs.
---
 builtin/game/detached_inventory.lua |  4 ++--
 doc/lua_api.txt                     |  5 ++++-
 src/script/lua_api/l_inventory.cpp  |  7 ++++---
 src/server.cpp                      | 18 ++++++++++++------
 src/server.h                        |  4 +++-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/builtin/game/detached_inventory.lua b/builtin/game/detached_inventory.lua
index b5d106b04..420e89ff2 100644
--- a/builtin/game/detached_inventory.lua
+++ b/builtin/game/detached_inventory.lua
@@ -2,7 +2,7 @@
 
 core.detached_inventories = {}
 
-function core.create_detached_inventory(name, callbacks)
+function core.create_detached_inventory(name, callbacks, player_name)
 	local stuff = {}
 	stuff.name = name
 	if callbacks then
@@ -15,6 +15,6 @@ function core.create_detached_inventory(name, callbacks)
 	end
 	stuff.mod_origin = core.get_current_modname() or "??"
 	core.detached_inventories[name] = stuff
-	return core.create_detached_inventory_raw(name)
+	return core.create_detached_inventory_raw(name, player_name)
 end
 
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 9da0fb4f9..eb47270f4 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2310,8 +2310,11 @@ and `minetest.auth_reload` call the authetification handler.
     * `{type="player", name="celeron55"}`
     * `{type="node", pos={x=, y=, z=}}`
     * `{type="detached", name="creative"}`
-* `minetest.create_detached_inventory(name, callbacks)`: returns an `InvRef`
+* `minetest.create_detached_inventory(name, callbacks, [player_name])`: returns an `InvRef`
     * callbacks: See "Detached inventory callbacks"
+    * player_name: Make detached inventory available to one player exclusively,
+      by default they will be sent to every player (even if not used).
+      Note that this parameter is mostly just a workaround and will be removed in future releases.
     * Creates a detached inventory. If it already exists, it is cleared.
 * `minetest.do_item_eat(hp_change, replace_with_item, itemstack, user, pointed_thing)`:
    returns left over ItemStack
diff --git a/src/script/lua_api/l_inventory.cpp b/src/script/lua_api/l_inventory.cpp
index 110e68d23..38eade609 100644
--- a/src/script/lua_api/l_inventory.cpp
+++ b/src/script/lua_api/l_inventory.cpp
@@ -520,16 +520,17 @@ int ModApiInventory::l_get_inventory(lua_State *L)
 	}
 }
 
-// create_detached_inventory_raw(name)
+// create_detached_inventory_raw(name, [player_name])
 int ModApiInventory::l_create_detached_inventory_raw(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	const char *name = luaL_checkstring(L, 1);
-	if(getServer(L)->createDetachedInventory(name) != NULL){
+	const char *player = lua_isstring(L, 2) ? lua_tostring(L, 2) : "";
+	if (getServer(L)->createDetachedInventory(name, player) != NULL) {
 		InventoryLocation loc;
 		loc.setDetached(name);
 		InvRef::create(L, loc);
-	}else{
+	} else {
 		lua_pushnil(L);
 	}
 	return 1;
diff --git a/src/server.cpp b/src/server.cpp
index fae375425..fe67ac96e 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2487,11 +2487,16 @@ void Server::sendDetachedInventory(const std::string &name, u16 peer_id)
 	NetworkPacket pkt(TOCLIENT_DETACHED_INVENTORY, 0, peer_id);
 	pkt.putRawString(s.c_str(), s.size());
 
-	if (peer_id != PEER_ID_INEXISTENT) {
-		Send(&pkt);
-	}
-	else {
-		m_clients.sendToAll(0, &pkt, true);
+	const std::string &check = m_detached_inventories_player[name];
+	if (peer_id == PEER_ID_INEXISTENT) {
+		if (check == "")
+			return m_clients.sendToAll(0, &pkt, true);
+		RemotePlayer *p = m_env->getPlayer(check.c_str());
+		if (p)
+			m_clients.send(p->peer_id, 0, &pkt, true);
+	} else {
+		if (check == "" || getPlayerName(peer_id) == check)
+			Send(&pkt);
 	}
 }
 
@@ -3224,7 +3229,7 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
 	SendDeleteParticleSpawner(peer_id, id);
 }
 
-Inventory* Server::createDetachedInventory(const std::string &name)
+Inventory* Server::createDetachedInventory(const std::string &name, const std::string &player)
 {
 	if(m_detached_inventories.count(name) > 0){
 		infostream<<"Server clearing detached inventory \""<<name<<"\""<<std::endl;
@@ -3235,6 +3240,7 @@ Inventory* Server::createDetachedInventory(const std::string &name)
 	Inventory *inv = new Inventory(m_itemdef);
 	sanity_check(inv);
 	m_detached_inventories[name] = inv;
+	m_detached_inventories_player[name] = player;
 	//TODO find a better way to do this
 	sendDetachedInventory(name,PEER_ID_INEXISTENT);
 	return inv;
diff --git a/src/server.h b/src/server.h
index 9e844e36c..cc2bcef25 100644
--- a/src/server.h
+++ b/src/server.h
@@ -270,7 +270,7 @@ public:
 	void deleteParticleSpawner(const std::string &playername, u32 id);
 
 	// Creates or resets inventory
-	Inventory* createDetachedInventory(const std::string &name);
+	Inventory* createDetachedInventory(const std::string &name, const std::string &player="");
 
 	// Envlock and conlock should be locked when using scriptapi
 	GameScripting *getScriptIface(){ return m_script; }
@@ -647,6 +647,8 @@ private:
 	*/
 	// key = name
 	std::map<std::string, Inventory*> m_detached_inventories;
+	// value = "" (visible to all players) or player name
+	std::map<std::string, std::string> m_detached_inventories_player;
 
 	DISABLE_CLASS_COPY(Server);
 };

From 5dc61988788e44bc87e8c57c0beded97d4efdf05 Mon Sep 17 00:00:00 2001
From: lhofhansl <lhofhansl@yahoo.com>
Date: Wed, 30 Nov 2016 00:13:14 -0800
Subject: [PATCH 322/418] Optimize/adjust blocks/ActiveObjects sent at the
 server based on client settings. (#4811)

Optimize/adjust blocks and active blocks sent at the server based on client settings.
---
 src/camera.cpp                      |  5 ++-
 src/client.cpp                      | 52 +++++++++++++++++++----------
 src/clientiface.cpp                 | 15 ++++++---
 src/clientmap.h                     |  4 ++-
 src/content_sao.cpp                 | 18 ++++++++++
 src/content_sao.h                   |  6 ++++
 src/localplayer.cpp                 |  2 ++
 src/localplayer.h                   |  2 ++
 src/network/networkprotocol.h       |  2 ++
 src/network/serverpackethandler.cpp | 13 ++++++++
 src/server.cpp                      |  8 +++--
 11 files changed, 99 insertions(+), 28 deletions(-)

diff --git a/src/camera.cpp b/src/camera.cpp
index b86f218fe..43980db1c 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -484,13 +484,12 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
 
 void Camera::updateViewingRange()
 {
+	f32 viewing_range = g_settings->getFloat("viewing_range");
+	m_draw_control.wanted_range = viewing_range;
 	if (m_draw_control.range_all) {
 		m_cameranode->setFarValue(100000.0);
 		return;
 	}
-
-	f32 viewing_range = g_settings->getFloat("viewing_range");
-	m_draw_control.wanted_range = viewing_range;
 	m_cameranode->setFarValue((viewing_range < 2000) ? 2000 * BS : viewing_range * BS);
 }
 
diff --git a/src/client.cpp b/src/client.cpp
index 3726f5bc4..5a3dc5df7 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -930,13 +930,16 @@ void Client::Send(NetworkPacket* pkt)
 }
 
 // Will fill up 12 + 12 + 4 + 4 + 4 bytes
-void writePlayerPos(LocalPlayer *myplayer, NetworkPacket *pkt)
+void writePlayerPos(LocalPlayer *myplayer, ClientMap *clientMap, NetworkPacket *pkt)
 {
-	v3f pf         = myplayer->getPosition() * 100;
-	v3f sf         = myplayer->getSpeed() * 100;
-	s32 pitch      = myplayer->getPitch() * 100;
-	s32 yaw        = myplayer->getYaw() * 100;
-	u32 keyPressed = myplayer->keyPressed;
+	v3f pf           = myplayer->getPosition() * 100;
+	v3f sf           = myplayer->getSpeed() * 100;
+	s32 pitch        = myplayer->getPitch() * 100;
+	s32 yaw          = myplayer->getYaw() * 100;
+	u32 keyPressed   = myplayer->keyPressed;
+	// scaled by 80, so that pi can fit into a u8
+	u8 fov           = clientMap->getCameraFov() * 80;
+	u8 wanted_range  = clientMap->getControl().wanted_range / MAP_BLOCKSIZE;
 
 	v3s32 position(pf.X, pf.Y, pf.Z);
 	v3s32 speed(sf.X, sf.Y, sf.Z);
@@ -948,9 +951,11 @@ void writePlayerPos(LocalPlayer *myplayer, NetworkPacket *pkt)
 		[12+12] s32 pitch*100
 		[12+12+4] s32 yaw*100
 		[12+12+4+4] u32 keyPressed
+		[12+12+4+4+1] u8 fov*80
+		[12+12+4+4+4+1] u8 wanted_range / MAP_BLOCKSIZE
 	*/
-
 	*pkt << position << speed << pitch << yaw << keyPressed;
+	*pkt << fov << wanted_range;
 }
 
 void Client::interact(u8 action, const PointedThing& pointed)
@@ -992,7 +997,7 @@ void Client::interact(u8 action, const PointedThing& pointed)
 
 	pkt.putLongString(tmp_os.str());
 
-	writePlayerPos(myplayer, &pkt);
+	writePlayerPos(myplayer, &m_env.getClientMap(), &pkt);
 
 	Send(&pkt);
 }
@@ -1296,19 +1301,30 @@ void Client::sendPlayerPos()
 	if(myplayer == NULL)
 		return;
 
+	ClientMap &map = m_env.getClientMap();
+
+	u8 camera_fov    = map.getCameraFov();
+	u8 wanted_range  = map.getControl().wanted_range;
+
 	// Save bandwidth by only updating position when something changed
 	if(myplayer->last_position        == myplayer->getPosition() &&
-			myplayer->last_speed      == myplayer->getSpeed()    &&
-			myplayer->last_pitch      == myplayer->getPitch()    &&
-			myplayer->last_yaw        == myplayer->getYaw()      &&
-			myplayer->last_keyPressed == myplayer->keyPressed)
+			myplayer->last_speed        == myplayer->getSpeed()    &&
+			myplayer->last_pitch        == myplayer->getPitch()    &&
+			myplayer->last_yaw          == myplayer->getYaw()      &&
+			myplayer->last_keyPressed   == myplayer->keyPressed    &&
+			myplayer->last_camera_fov   == camera_fov              &&
+			myplayer->last_wanted_range == wanted_range)
 		return;
 
-	myplayer->last_position   = myplayer->getPosition();
-	myplayer->last_speed      = myplayer->getSpeed();
-	myplayer->last_pitch      = myplayer->getPitch();
-	myplayer->last_yaw        = myplayer->getYaw();
-	myplayer->last_keyPressed = myplayer->keyPressed;
+	myplayer->last_position     = myplayer->getPosition();
+	myplayer->last_speed        = myplayer->getSpeed();
+	myplayer->last_pitch        = myplayer->getPitch();
+	myplayer->last_yaw          = myplayer->getYaw();
+	myplayer->last_keyPressed   = myplayer->keyPressed;
+	myplayer->last_camera_fov   = camera_fov;
+	myplayer->last_wanted_range = wanted_range;
+
+	//infostream << "Sending Player Position information" << std::endl;
 
 	u16 our_peer_id;
 	{
@@ -1324,7 +1340,7 @@ void Client::sendPlayerPos()
 
 	NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4);
 
-	writePlayerPos(myplayer, &pkt);
+	writePlayerPos(myplayer, &map, &pkt);
 
 	Send(&pkt);
 }
diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index bdc16f31c..abe878ecc 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -173,12 +173,20 @@ void RemoteClient::GetNextBlocks (
 	*/
 	s32 new_nearest_unsent_d = -1;
 
-	const s16 full_d_max = g_settings->getS16("max_block_send_distance");
-	const s16 d_opt = g_settings->getS16("block_send_optimize_distance");
+	// get view range and camera fov from the client
+	s16 wanted_range = sao->getWantedRange();
+	float camera_fov = sao->getFov();
+	// if FOV, wanted_range are not available (old client), fall back to old default
+	if (wanted_range <= 0) wanted_range = 1000;
+	if (camera_fov <= 0) camera_fov = (72.0*M_PI/180) * 4./3.;
+
+	const s16 full_d_max = MYMIN(g_settings->getS16("max_block_send_distance"), wanted_range);
+	const s16 d_opt = MYMIN(g_settings->getS16("block_send_optimize_distance"), wanted_range);
 	const s16 d_blocks_in_sight = full_d_max * BS * MAP_BLOCKSIZE;
+	//infostream << "Fov from client " << camera_fov << " full_d_max " << full_d_max << std::endl;
 
 	s16 d_max = full_d_max;
-	s16 d_max_gen = g_settings->getS16("max_block_generate_distance");
+	s16 d_max_gen = MYMIN(g_settings->getS16("max_block_generate_distance"), wanted_range);
 
 	// Don't loop very much at a time
 	s16 max_d_increment_at_time = 2;
@@ -242,7 +250,6 @@ void RemoteClient::GetNextBlocks (
 				FOV setting. The default of 72 degrees is fine.
 			*/
 
-			float camera_fov = (72.0*M_PI/180) * 4./3.;
 			if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, d_blocks_in_sight) == false)
 			{
 				continue;
diff --git a/src/clientmap.h b/src/clientmap.h
index 8855eecf6..cb686ff33 100644
--- a/src/clientmap.h
+++ b/src/clientmap.h
@@ -138,7 +138,9 @@ public:
 	{
 		return (m_last_drawn_sectors.find(p) != m_last_drawn_sectors.end());
 	}
-	
+
+	const MapDrawControl & getControl() const { return m_control; }
+	f32 getCameraFov() const { return m_camera_fov; }
 private:
 	Client *m_client;
 	
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 609673ed9..77ab51a02 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -781,6 +781,8 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, u16 peer_id_, bool is_singleplayer
 	m_attachment_sent(false),
 	m_breath(PLAYER_MAX_BREATH),
 	m_pitch(0),
+	m_fov(0),
+	m_wanted_range(0),
 	// public
 	m_physics_override_speed(1),
 	m_physics_override_jump(1),
@@ -1099,6 +1101,22 @@ void PlayerSAO::setYaw(const float yaw)
 	UnitSAO::setYaw(yaw);
 }
 
+void PlayerSAO::setFov(const float fov)
+{
+	if (m_player && fov != m_fov)
+		m_player->setDirty(true);
+
+	m_fov = fov;
+}
+
+void PlayerSAO::setWantedRange(const s16 range)
+{
+	if (m_player && range != m_wanted_range)
+		m_player->setDirty(true);
+
+	m_wanted_range = range;
+}
+
 void PlayerSAO::setYawAndSend(const float yaw)
 {
 	setYaw(yaw);
diff --git a/src/content_sao.h b/src/content_sao.h
index c5b066f50..86255183d 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -214,6 +214,10 @@ public:
 	f32 getRadPitch() const { return m_pitch * core::DEGTORAD; }
 	// Deprecated
 	f32 getRadPitchDep() const { return -1.0 * m_pitch * core::DEGTORAD; }
+	void setFov(const float pitch);
+	f32 getFov() const { return m_fov; }
+	void setWantedRange(const s16 range);
+	s16 getWantedRange() const { return m_wanted_range; }
 
 	/*
 		Interaction interface
@@ -364,6 +368,8 @@ private:
 	bool m_attachment_sent;
 	u16 m_breath;
 	f32 m_pitch;
+	f32 m_fov;
+	s16 m_wanted_range;
 public:
 	float m_physics_override_speed;
 	float m_physics_override_jump;
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 71efb2343..4d0ca0600 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -56,6 +56,8 @@ LocalPlayer::LocalPlayer(Client *gamedef, const char *name):
 	last_pitch(0),
 	last_yaw(0),
 	last_keyPressed(0),
+	last_camera_fov(0),
+	last_wanted_range(0),
 	camera_impact(0.f),
 	last_animation(NO_ANIM),
 	hotbar_image(""),
diff --git a/src/localplayer.h b/src/localplayer.h
index 749f8f8ce..7a1cb7466 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -75,6 +75,8 @@ public:
 	float last_pitch;
 	float last_yaw;
 	unsigned int last_keyPressed;
+	u8 last_camera_fov;
+	u8 last_wanted_range;
 
 	float camera_impact;
 
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index e3fcae0c6..c9919e1c4 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -651,6 +651,8 @@ enum ToServerCommand
 		[2+12+12] s32 pitch*100
 		[2+12+12+4] s32 yaw*100
 		[2+12+12+4+4] u32 keyPressed
+		[2+12+12+4+4+1] u8 fov*80
+		[2+12+12+4+4+4+1] u8 wanted_range / MAP_BLOCKSIZE
 	*/
 
 	TOSERVER_GOTBLOCKS = 0x24,
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 70eb0a828..5e50bb865 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -782,6 +782,7 @@ void Server::process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
 
 	v3s32 ps, ss;
 	s32 f32pitch, f32yaw;
+	u8 f32fov;
 
 	*pkt >> ps;
 	*pkt >> ss;
@@ -792,8 +793,18 @@ void Server::process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
 	f32 yaw = (f32)f32yaw / 100.0;
 	u32 keyPressed = 0;
 
+	// default behavior (in case an old client doesn't send these)
+	f32 fov = (72.0*M_PI/180) * 4./3.;
+	u8 wanted_range = 0;
+
 	if (pkt->getRemainingBytes() >= 4)
 		*pkt >> keyPressed;
+	if (pkt->getRemainingBytes() >= 1) {
+		*pkt >> f32fov;
+		fov = (f32)f32fov / 80.0;
+	}
+	if (pkt->getRemainingBytes() >= 1)
+		*pkt >> wanted_range;
 
 	v3f position((f32)ps.X / 100.0, (f32)ps.Y / 100.0, (f32)ps.Z / 100.0);
 	v3f speed((f32)ss.X / 100.0, (f32)ss.Y / 100.0, (f32)ss.Z / 100.0);
@@ -805,6 +816,8 @@ void Server::process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
 	player->setSpeed(speed);
 	playersao->setPitch(pitch);
 	playersao->setYaw(yaw);
+	playersao->setFov(fov);
+	playersao->setWantedRange(wanted_range);
 	player->keyPressed = keyPressed;
 	player->control.up = (keyPressed & 1);
 	player->control.down = (keyPressed & 2);
diff --git a/src/server.cpp b/src/server.cpp
index fe67ac96e..c9d5c7129 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -705,11 +705,15 @@ void Server::AsyncRunStep(bool initial_step)
 			if (playersao == NULL)
 				continue;
 
+			s16 my_radius = MYMIN(radius, playersao->getWantedRange() * MAP_BLOCKSIZE);
+			if (my_radius <= 0) my_radius = radius;
+			//infostream << "Server: Active Radius " << my_radius << std::endl;
+
 			std::queue<u16> removed_objects;
 			std::queue<u16> added_objects;
-			m_env->getRemovedActiveObjects(playersao, radius, player_radius,
+			m_env->getRemovedActiveObjects(playersao, my_radius, player_radius,
 					client->m_known_objects, removed_objects);
-			m_env->getAddedActiveObjects(playersao, radius, player_radius,
+			m_env->getAddedActiveObjects(playersao, my_radius, player_radius,
 					client->m_known_objects, added_objects);
 
 			// Ignore if nothing happened

From 6c9f10e132ac80a0caffef12d61de84a0a6b02b3 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Tue, 29 Nov 2016 04:08:55 +0000
Subject: [PATCH 323/418] Mgv7 floatlands: Various improvements

Floatland base terrain underside was too thin, causing excessive water
leakage through tunnels under lakes, now make it thicker.
Floatland mountain terrain had a rim 1 node thick which made it bare
stone, now make it 2 nodes thick to merge with the floatland base
terrain rim and to have a layer of biome material.
Make mountain terrain more exponentially shaped by altering the
exponent.
Remove unnecessary and potentially ugly MYMAX() applied to
n_base_height.
---
 src/mapgen_v7.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index c4fa024a8..498a1333c 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -346,8 +346,11 @@ bool MapgenV7::getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y)
 
 bool MapgenV7::getFloatlandMountainFromMap(int idx_xyz, int idx_xz, s16 y)
 {
-	float density_gradient =
-		-pow(fabs((float)(y - floatland_level) / float_mount_height), 0.8f);
+	// Make rim 2 nodes thick to match floatland base terrain
+	float density_gradient = (y >= floatland_level) ?
+		-pow((float)(y - floatland_level) / float_mount_height, 0.75f) :
+		-pow((float)(floatland_level - 1 - y) / float_mount_height, 0.75f);
+
 	float floatn = noise_mountain->result[idx_xyz] + float_mount_density;
 
 	return floatn + density_gradient >= 0.0f;
@@ -362,11 +365,10 @@ void MapgenV7::floatBaseExtentFromMap(s16 *float_base_min, s16 *float_base_max,
 
 	float n_base = noise_floatland_base->result[idx_xz];
 	if (n_base > 0.0f) {
-		float n_base_height =
-			MYMAX(noise_float_base_height->result[idx_xz], 0.0f);
+		float n_base_height = noise_float_base_height->result[idx_xz];
 		float amp = n_base * n_base_height;
 		float ridge = n_base_height / 3.0f;
-		base_min = floatland_level - amp / 2.0f;
+		base_min = floatland_level - amp / 1.5f;
 
 		if (amp > ridge * 2.0f) {
 			// Lake bed

From 105676b952484affdb97164eceaf4cb903955373 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Thu, 1 Dec 2016 04:49:17 +0000
Subject: [PATCH 324/418] Lua_api.txt: Clarify use of looping sounds

---
 doc/lua_api.txt | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index eb47270f4..092704c04 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -441,18 +441,24 @@ from the available ones of the following files:
 
 Examples of sound parameter tables:
 
-    -- Play location-less on all clients
+    -- Play locationless on all clients
     {
         gain = 1.0, -- default
     }
-    -- Play location-less to a player
+    -- Play locationless to one player
     {
         to_player = name,
         gain = 1.0, -- default
     }
+    -- Play locationless to one player, looped
+    {
+        to_player = name,
+        gain = 1.0, -- default
+        loop = true,
+    }
     -- Play in a location
     {
-        pos = {x=1,y=2,z=3},
+        pos = {x = 1, y = 2, z = 3},
         gain = 1.0, -- default
         max_hear_distance = 32, -- default, uses an euclidean metric
     }
@@ -461,15 +467,18 @@ Examples of sound parameter tables:
         object = <an ObjectRef>,
         gain = 1.0, -- default
         max_hear_distance = 32, -- default, uses an euclidean metric
-        loop = true, -- only sounds connected to objects can be looped
+        loop = true,
     }
 
+Looped sounds must either be connected to an object or played locationless to
+one player using `to_player = name,`
+
 ### `SimpleSoundSpec`
 * e.g. `""`
 * e.g. `"default_place_node"`
 * e.g. `{}`
-* e.g. `{name="default_place_node"}`
-* e.g. `{name="default_place_node", gain=1.0}`
+* e.g. `{name = "default_place_node"}`
+* e.g. `{name = "default_place_node", gain = 1.0}`
 
 Registered definitions of stuff
 -------------------------------

From 144da5f522bf057ac612ef1fa09478d0215f6d0d Mon Sep 17 00:00:00 2001
From: Bluebird <bluebird.greycoat@gmail.com>
Date: Fri, 2 Dec 2016 04:20:55 -0600
Subject: [PATCH 325/418] Very small documentation fix. (#4830)

---
 doc/lua_api.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 092704c04..61e035fce 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2134,7 +2134,7 @@ and `minetest.auth_reload` call the authetification handler.
 * `minetest.set_node(pos, node)`
 * `minetest.add_node(pos, node): alias set_node(pos, node)`
     * Set node at position (`node = {name="foo", param1=0, param2=0}`)
-* `minetest.swap_node(pos, node`
+* `minetest.swap_node(pos, node)`
     * Set node at position, but don't remove metadata
 * `minetest.remove_node(pos)`
     * Equivalent to `set_node(pos, "air")`
@@ -2340,7 +2340,7 @@ and `minetest.auth_reload` call the authetification handler.
     * `formname`: has to exactly match the one given in show_formspec, or the formspec will
        not close.
     * calling show_formspec(playername, formname, "") is equal to this expression
-    * to close a formspec regardless of the formname, call 
+    * to close a formspec regardless of the formname, call
       minetest.close_formspec(playername, ""). USE THIS ONLY WHEN ABSOLUTELY NECESSARY!
 * `minetest.formspec_escape(string)`: returns a string
     * escapes the characters "[", "]", "\", "," and ";", which can not be used in formspecs

From 8b63fbefba7f592299328d6d24b8c35a6c2417da Mon Sep 17 00:00:00 2001
From: Amaz <Amaz1@users.noreply.github.com>
Date: Fri, 2 Dec 2016 10:41:08 +0000
Subject: [PATCH 326/418] Fix incorrect docs about minetest.hud_replace_builtin
 (#4833)

Fixes https://github.com/minetest/minetest/issues/4832
---
 doc/lua_api.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 61e035fce..bab3e11f7 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2576,6 +2576,10 @@ These functions return the leftover itemstack.
 
 ### Misc.
 * `minetest.get_connected_players()`: returns list of `ObjectRefs`
+* `minetest.hud_replace_builtin(name, hud_definition)`
+    * Replaces definition of a builtin hud element
+    * `name`: `"breath"` or `"health"`
+    * `hud_definition`: definition to replace builtin definition
 * `minetest.hash_node_position({x=,y=,z=})`: returns an 48-bit integer
     * Gives a unique hash number for a node position (16+16+16=48bit)
 * `minetest.get_position_from_hash(hash)`: returns a position
@@ -2901,10 +2905,6 @@ This is basically a reference to a C++ `ServerActiveObject`
 * `hud_set_hotbar_selected_image(texturename)`
     * sets image for selected item of hotbar
 * `hud_get_hotbar_selected_image`: returns texturename
-* `hud_replace_builtin(name, hud_definition)`
-    * replace definition of a builtin hud element
-    * `name`: `"breath"` or `"health"`
-    * `hud_definition`: definition to replace builtin definition
 * `set_sky(bgcolor, type, {texture names})`
     * `bgcolor`: ColorSpec, defaults to white
     * Available types:

From fb1406bdff6b906ae5a04c34fe58cc57aae6d31e Mon Sep 17 00:00:00 2001
From: red-001 <red-001@openmailbox.org>
Date: Sun, 28 Aug 2016 00:13:41 +0100
Subject: [PATCH 327/418] Don't send a join message in singleplayer mode.

---
 builtin/game/misc.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 040016333..7caa9e7ba 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -89,7 +89,9 @@ local player_list = {}
 core.register_on_joinplayer(function(player)
 	local player_name = player:get_player_name()
 	player_list[player_name] = player
-	core.chat_send_all("*** " .. player_name .. " joined the game.")
+	if not minetest.is_singleplayer() then
+		core.chat_send_all("*** " .. player_name .. " joined the game.")
+	end
 end)
 
 core.register_on_leaveplayer(function(player, timed_out)

From e2cbfa82e80b1243e0214e65a2709c9c30fa63cb Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Fri, 2 Dec 2016 00:57:33 +0000
Subject: [PATCH 328/418] Biomes: Increase heat and humidity noise spread to
 1000

To avoid smaller biomes when extra biomes are added to MTGame.
The addition of bushes in MTGame grasslands makes wood resources easier
to find and less distant, so slightly larger biomes are now acceptable,
but also desirable to encourage travel and create more sense of adventure.
---
 src/mg_biome.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mg_biome.h b/src/mg_biome.h
index eb0a18a2f..a10193bc3 100644
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -134,8 +134,8 @@ protected:
 
 struct BiomeParamsOriginal : public BiomeParams {
 	BiomeParamsOriginal() :
-		np_heat(50, 50, v3f(750.0, 750.0, 750.0), 5349, 3, 0.5, 2.0),
-		np_humidity(50, 50, v3f(750.0, 750.0, 750.0), 842, 3, 0.5, 2.0),
+		np_heat(50, 50, v3f(1000.0, 1000.0, 1000.0), 5349, 3, 0.5, 2.0),
+		np_humidity(50, 50, v3f(1000.0, 1000.0, 1000.0), 842, 3, 0.5, 2.0),
 		np_heat_blend(0, 1.5, v3f(8.0, 8.0, 8.0), 13, 2, 1.0, 2.0),
 		np_humidity_blend(0, 1.5, v3f(8.0, 8.0, 8.0), 90003, 2, 1.0, 2.0)
 	{

From 8a7dc838a8c1f8f2a5e9b710a8ee27d4d00715f9 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Wed, 30 Nov 2016 21:42:22 -0800
Subject: [PATCH 329/418] Optimize block sent: Fix rendering issue

---
 src/client.cpp                      | 4 ++--
 src/clientiface.cpp                 | 2 +-
 src/network/serverpackethandler.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 5a3dc5df7..e9d273c69 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -951,7 +951,7 @@ void writePlayerPos(LocalPlayer *myplayer, ClientMap *clientMap, NetworkPacket *
 		[12+12] s32 pitch*100
 		[12+12+4] s32 yaw*100
 		[12+12+4+4] u32 keyPressed
-		[12+12+4+4+1] u8 fov*80
+		[12+12+4+4+4] u8 fov*80
 		[12+12+4+4+4+1] u8 wanted_range / MAP_BLOCKSIZE
 	*/
 	*pkt << position << speed << pitch << yaw << keyPressed;
@@ -1338,7 +1338,7 @@ void Client::sendPlayerPos()
 
 	assert(myplayer->peer_id == our_peer_id);
 
-	NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4);
+	NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4 + 1 + 1);
 
 	writePlayerPos(myplayer, &map, &pkt);
 
diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index abe878ecc..0390cf0ff 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -357,7 +357,7 @@ queue_full_break:
 	} else if(nearest_emergefull_d != -1){
 		new_nearest_unsent_d = nearest_emergefull_d;
 	} else {
-		if(d > g_settings->getS16("max_block_send_distance")){
+		if(d > full_d_max){
 			new_nearest_unsent_d = 0;
 			m_nothing_to_send_pause_timer = 2.0;
 		} else {
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 5e50bb865..dca9aabc4 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -794,7 +794,7 @@ void Server::process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
 	u32 keyPressed = 0;
 
 	// default behavior (in case an old client doesn't send these)
-	f32 fov = (72.0*M_PI/180) * 4./3.;
+	f32 fov = 0;
 	u8 wanted_range = 0;
 
 	if (pkt->getRemainingBytes() >= 4)

From 2829742ae8869276f000bdb64a9f14977e70038b Mon Sep 17 00:00:00 2001
From: MillersMan <millersman@users.noreply.github.com>
Date: Sun, 27 Nov 2016 21:34:16 +0100
Subject: [PATCH 330/418] Map::isValidPosition: Return false instead of
 throwing exception

---
 src/map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/map.cpp b/src/map.cpp
index d03943a16..3c135cd48 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -174,7 +174,7 @@ bool Map::isNodeUnderground(v3s16 p)
 bool Map::isValidPosition(v3s16 p)
 {
 	v3s16 blockpos = getNodeBlockPos(p);
-	MapBlock *block = getBlockNoCreate(blockpos);
+	MapBlock *block = getBlockNoCreateNoEx(blockpos);
 	return (block != NULL);
 }
 

From cc36f5e99ae46cf2fd370dde8311f139169a4c43 Mon Sep 17 00:00:00 2001
From: MillersMan <millersman@users.noreply.github.com>
Date: Sun, 27 Nov 2016 21:46:14 +0100
Subject: [PATCH 331/418] Liquids: Preserve flow state if 'ignore' is a
 neighbour

Prevent waterfalls from falling down or streams from flowing away when the
source node is in an unloaded block - Nodes near a CONTENT_IGNORE node will
be interpreted as if the ignored node is a liquid node that just supports
the current state of the nodes in question.
---
 src/map.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/map.cpp b/src/map.cpp
index 3c135cd48..28d650276 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1309,6 +1309,7 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 		NodeNeighbor neutrals[6]; // nodes that are solid or another kind of liquid
 		int num_neutrals = 0;
 		bool flowing_down = false;
+		bool ignored_sources = false;
 		for (u16 i = 0; i < 6; i++) {
 			NeighborType nt = NEIGHBOR_SAME_LEVEL;
 			switch (i) {
@@ -1336,10 +1337,15 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 							flowing_down = true;
 					} else {
 						neutrals[num_neutrals++] = nb;
-						// If neutral below is ignore prevent water spreading outwards
-						if (nb.t == NEIGHBOR_LOWER &&
-								nb.n.getContent() == CONTENT_IGNORE)
-							flowing_down = true;
+						if (nb.n.getContent() == CONTENT_IGNORE) {
+							// If node below is ignore prevent water from
+							// spreading outwards and otherwise prevent from
+							// flowing away as ignore node might be the source
+							if (nb.t == NEIGHBOR_LOWER)
+								flowing_down = true;
+							else
+								ignored_sources = true;
+						}
 					}
 					break;
 				case LIQUID_SOURCE:
@@ -1392,6 +1398,11 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
 				new_node_content = liquid_kind;
 			else
 				new_node_content = floodable_node;
+		} else if (ignored_sources && liquid_level >= 0) {
+			// Maybe there are neighbouring sources that aren't loaded yet
+			// so prevent flowing away.
+			new_node_level = liquid_level;
+			new_node_content = liquid_kind;
 		} else {
 			// no surrounding sources, so get the maximum level that can flow into this node
 			for (u16 i = 0; i < num_flows; i++) {

From 9714cdcf4ba51b44cca72e133ec5ef2a3c9f50f6 Mon Sep 17 00:00:00 2001
From: MillersMan <millersman@users.noreply.github.com>
Date: Sun, 27 Nov 2016 21:51:40 +0100
Subject: [PATCH 332/418] Liquids: Update flow on block load

When loading a block add liquid-nodes that might flow away or spread to
neighbours to the transforming_liquid queue.
---
 src/CMakeLists.txt |   1 +
 src/map.cpp        |  11 ++-
 src/reflowscan.cpp | 206 +++++++++++++++++++++++++++++++++++++++++++++
 src/reflowscan.h   |  50 +++++++++++
 4 files changed, 266 insertions(+), 2 deletions(-)
 create mode 100644 src/reflowscan.cpp
 create mode 100644 src/reflowscan.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1983bb078..d43e4133f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -445,6 +445,7 @@ set(common_SRCS
 	porting.cpp
 	profiler.cpp
 	quicktune.cpp
+	reflowscan.cpp
 	remoteplayer.cpp
 	rollback.cpp
 	rollback_interface.cpp
diff --git a/src/map.cpp b/src/map.cpp
index 28d650276..7bb8c4a13 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/mathconstants.h"
 #include "rollback_interface.h"
 #include "environment.h"
+#include "reflowscan.h"
 #include "emerge.h"
 #include "mapgen_v6.h"
 #include "mg_biome.h"
@@ -2905,8 +2906,11 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile,
 		block->deSerialize(is, version, true);
 
 		// If it's a new block, insert it to the map
-		if(created_new)
+		if (created_new) {
 			sector->insertBlock(block);
+			ReflowScan scanner(this, m_emerge->ndef);
+			scanner.scan(block, &m_transforming_liquid);
+		}
 
 		/*
 			Save blocks loaded in old format in new format
@@ -2972,8 +2976,11 @@ void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool
 		block->deSerialize(is, version, true);
 
 		// If it's a new block, insert it to the map
-		if(created_new)
+		if (created_new) {
 			sector->insertBlock(block);
+			ReflowScan scanner(this, m_emerge->ndef);
+			scanner.scan(block, &m_transforming_liquid);
+		}
 
 		/*
 			Save blocks loaded in old format in new format
diff --git a/src/reflowscan.cpp b/src/reflowscan.cpp
new file mode 100644
index 000000000..49b9406d7
--- /dev/null
+++ b/src/reflowscan.cpp
@@ -0,0 +1,206 @@
+/*
+Minetest
+Copyright (C) 2016 MillersMan <millersman@users.noreply.github.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "reflowscan.h"
+#include "map.h"
+#include "mapblock.h"
+#include "nodedef.h"
+#include "util/timetaker.h"
+
+
+ReflowScan::ReflowScan(Map *map, INodeDefManager *ndef) :
+	m_map(map),
+	m_ndef(ndef),
+	m_liquid_queue(NULL)
+{
+}
+
+void ReflowScan::scan(MapBlock *block, UniqueQueue<v3s16> *liquid_queue)
+{
+	m_block_pos = block->getPos();
+	m_rel_block_pos = block->getPosRelative();
+	m_liquid_queue = liquid_queue;
+
+	// Prepare the lookup which is a 3x3x3 array of the blocks surrounding the
+	// scanned block. Blocks are only added to the lookup if they are really
+	// needed. The lookup is indexed manually to use the same index in a
+	// bit-array (of uint32 type) which stores for unloaded blocks that they
+	// were already fetched from Map but were actually NULL.
+	memset(m_lookup, 0, sizeof(m_lookup));
+	int block_idx = 1 + (1 * 9) + (1 * 3);
+	m_lookup[block_idx] = block;
+	m_lookup_state_bitset = 1 << block_idx;
+
+	// Scan the columns in the block
+	for (s16 z = 0; z < MAP_BLOCKSIZE; z++)
+	for (s16 x = 0; x < MAP_BLOCKSIZE; x++) {
+		scanColumn(x, z);
+	}
+
+	// Scan neighbouring columns from the nearby blocks as they might contain
+	// liquid nodes that weren't allowed to flow to prevent gaps.
+	for (s16 i = 0; i < MAP_BLOCKSIZE; i++) {
+		scanColumn(i, -1);
+		scanColumn(i, MAP_BLOCKSIZE);
+		scanColumn(-1, i);
+		scanColumn(MAP_BLOCKSIZE, i);
+	}
+}
+
+inline MapBlock *ReflowScan::lookupBlock(int x, int y, int z)
+{
+	// Gets the block that contains (x,y,z) relativ to the scanned block.
+	// This uses a lookup as there might be many lookups into the same
+	// neighbouring block which makes fetches from Map costly.
+	int bx = (MAP_BLOCKSIZE + x) / MAP_BLOCKSIZE;
+	int by = (MAP_BLOCKSIZE + y) / MAP_BLOCKSIZE;
+	int bz = (MAP_BLOCKSIZE + z) / MAP_BLOCKSIZE;
+	int idx = (bx + (by * 9) + (bz * 3));
+	MapBlock *result = m_lookup[idx];
+	if (!result && (m_lookup_state_bitset & (1 << idx)) == 0) {
+		// The block wasn't requested yet so fetch it from Map and store it
+		// in the lookup
+		v3s16 pos = m_block_pos + v3s16(bx - 1, by - 1, bz - 1);
+		m_lookup[idx] = result = m_map->getBlockNoCreateNoEx(pos);
+		m_lookup_state_bitset |= (1 << idx);
+	}
+	return result;
+}
+
+inline bool ReflowScan::isLiquidFlowableTo(int x, int y, int z)
+{
+	// Tests whether (x,y,z) is a node to which liquid might flow.
+	bool valid_position;
+	MapBlock *block = lookupBlock(x, y, z);
+	if (block) {
+		int dx = (MAP_BLOCKSIZE + x) % MAP_BLOCKSIZE;
+		int dy = (MAP_BLOCKSIZE + y) % MAP_BLOCKSIZE;
+		int dz = (MAP_BLOCKSIZE + z) % MAP_BLOCKSIZE;
+		MapNode node = block->getNodeNoCheck(dx, dy, dz, &valid_position);
+		if (node.getContent() != CONTENT_IGNORE) {
+			const ContentFeatures &f = m_ndef->get(node);
+			// NOTE: No need to check for flowing nodes with lower liquid level
+			// as they should only occur on top of other columns where they
+			// will be added to the queue themselves.
+			return f.floodable;
+		}
+	}
+	return false;
+}
+
+inline bool ReflowScan::isLiquidHorizontallyFlowable(int x, int y, int z)
+{
+	// Check if the (x,y,z) might spread to one of the horizontally
+	// neighbouring nodes
+	return isLiquidFlowableTo(x - 1, y, z) ||
+		isLiquidFlowableTo(x + 1, y, z) ||
+		isLiquidFlowableTo(x, y, z - 1) ||
+		isLiquidFlowableTo(x, y, z + 1);
+}
+
+void ReflowScan::scanColumn(int x, int z)
+{
+	bool valid_position;
+
+	// Is the column inside a loaded block?
+	MapBlock *block = lookupBlock(x, 0, z);
+	if (!block)
+		return;
+
+	MapBlock *above = lookupBlock(x, MAP_BLOCKSIZE, z);
+	int dx = (MAP_BLOCKSIZE + x) % MAP_BLOCKSIZE;
+	int dz = (MAP_BLOCKSIZE + z) % MAP_BLOCKSIZE;
+
+	// Get the state from the node above the scanned block
+	bool was_ignore, was_liquid;
+	if (above) {
+		MapNode node = above->getNodeNoCheck(dx, 0, dz, &valid_position);
+		was_ignore = node.getContent() == CONTENT_IGNORE;
+		was_liquid = m_ndef->get(node).isLiquid();
+	} else {
+		was_ignore = true;
+		was_liquid = false;
+	}
+	bool was_checked = false;
+	bool was_pushed = false;
+
+	// Scan through the whole block
+	for (s16 y = MAP_BLOCKSIZE - 1; y >= 0; y--) {
+		MapNode node = block->getNodeNoCheck(dx, y, dz, &valid_position);
+		const ContentFeatures &f = m_ndef->get(node);
+		bool is_ignore = node.getContent() == CONTENT_IGNORE;
+		bool is_liquid = f.isLiquid();
+
+		if (is_ignore || was_ignore || is_liquid == was_liquid) {
+			// Neither topmost node of liquid column nor topmost node below column
+			was_checked = false;
+			was_pushed = false;
+		} else if (is_liquid) {
+			// This is the topmost node in the column
+			bool is_pushed = false;
+			if (f.liquid_type == LIQUID_FLOWING ||
+					isLiquidHorizontallyFlowable(x, y, z)) {
+				m_liquid_queue->push_back(m_rel_block_pos + v3s16(x, y, z));
+				is_pushed = true;
+			}
+			// Remember waschecked and waspushed to avoid repeated
+			// checks/pushes in case the column consists of only this node
+			was_checked = true;
+			was_pushed = is_pushed;
+		} else {
+			// This is the topmost node below a liquid column
+			if (!was_pushed && (f.floodable ||
+					(!was_checked && isLiquidHorizontallyFlowable(x, y + 1, z)))) {
+				// Activate the lowest node in the column which is one
+				// node above this one
+				m_liquid_queue->push_back(m_rel_block_pos + v3s16(x, y + 1, z));
+			}
+		}
+
+		was_liquid = is_liquid;
+		was_ignore = is_ignore;
+	}
+
+	// Check the node below the current block
+	MapBlock *below = lookupBlock(x, -1, z);
+	if (below) {
+		MapNode node = below->getNodeNoCheck(dx, MAP_BLOCKSIZE - 1, dz, &valid_position);
+		const ContentFeatures &f = m_ndef->get(node);
+		bool is_ignore = node.getContent() == CONTENT_IGNORE;
+		bool is_liquid = f.isLiquid();
+
+		if (is_ignore || was_ignore || is_liquid == was_liquid) {
+			// Neither topmost node of liquid column nor topmost node below column
+		} else if (is_liquid) {
+			// This is the topmost node in the column and might want to flow away
+			if (f.liquid_type == LIQUID_FLOWING ||
+					isLiquidHorizontallyFlowable(x, -1, z)) {
+				m_liquid_queue->push_back(m_rel_block_pos + v3s16(x, -1, z));
+			}
+		} else {
+			// This is the topmost node below a liquid column
+			if (!was_pushed && (f.floodable ||
+					(!was_checked && isLiquidHorizontallyFlowable(x, 0, z)))) {
+				// Activate the lowest node in the column which is one
+				// node above this one
+				m_liquid_queue->push_back(m_rel_block_pos + v3s16(x, 0, z));
+			}
+		}
+	}
+}
diff --git a/src/reflowscan.h b/src/reflowscan.h
new file mode 100644
index 000000000..a6d289ad5
--- /dev/null
+++ b/src/reflowscan.h
@@ -0,0 +1,50 @@
+/*
+Minetest
+Copyright (C) 2016 MillersMan <millersman@users.noreply.github.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef REFLOWSCAN_H
+#define REFLOWSCAN_H
+
+#include "util/container.h"
+#include "irrlichttypes_bloated.h"
+
+class INodeDefManager;
+class Map;
+class MapBlock;
+
+class ReflowScan {
+public:
+	ReflowScan(Map *map, INodeDefManager *ndef);
+	void scan(MapBlock *block, UniqueQueue<v3s16> *liquid_queue);
+
+private:
+	MapBlock *lookupBlock(int x, int y, int z);
+	bool isLiquidFlowableTo(int x, int y, int z);
+	bool isLiquidHorizontallyFlowable(int x, int y, int z);
+	void scanColumn(int x, int z);
+
+private:
+	Map *m_map;
+	INodeDefManager *m_ndef;
+	v3s16 m_block_pos, m_rel_block_pos;
+	UniqueQueue<v3s16> *m_liquid_queue;
+	MapBlock *m_lookup[3 * 3 * 3];
+	u32 m_lookup_state_bitset;
+};
+
+#endif // REFLOWSCAN_H

From 075833e39368e63e06889f21140f816420e83541 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Sat, 3 Dec 2016 21:43:25 -0800
Subject: [PATCH 333/418] Fog: Make fraction of visible distance at which fog
 starts configurable

Optimise the fetching of global settings 'camera_smoothing',
'cinematic' and 'cinematic_camera_smoothing'.
Cache 'cam_smoothing'.
---
 builtin/settingtypes.txt                      |  3 ++
 .../shaders/nodes_shader/opengl_fragment.glsl |  2 +-
 .../water_surface_shader/opengl_fragment.glsl |  2 +-
 .../wielded_shader/opengl_fragment.glsl       |  2 +-
 minetest.conf.example                         |  4 ++
 src/defaultsettings.cpp                       |  1 +
 src/game.cpp                                  | 37 ++++++++++++++-----
 src/shader.cpp                                |  4 ++
 8 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index b1f31054e..10db4787d 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -529,6 +529,9 @@ ambient_occlusion_gamma (Ambient occlusion gamma) float 2.2 0.25 4.0
 #    Enables animation of inventory items.
 inventory_items_animations (Inventory items animations) bool false
 
+#    Fraction of the visible distance at which fog starts to be rendered
+fog_start (Fog Start) float 0.4 0.0 0.99
+
 [**Menus]
 
 #    Use a cloud animation for the main menu background.
diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index 149aa2bc5..71ded2b9d 100644
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -19,7 +19,7 @@ bool normalTexturePresent = false;
 
 const float e = 2.718281828459;
 const float BS = 10.0;
-const float fogStart = 0.4;
+const float fogStart = FOG_START;
 const float fogShadingParameter = 1 / ( 1 - fogStart);
 
 #ifdef ENABLE_TONE_MAPPING
diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
index 4164870c7..c4e78470d 100644
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -21,7 +21,7 @@ bool texSeamless = false;
 
 const float e = 2.718281828459;
 const float BS = 10.0;
-const float fogStart = 0.4;
+const float fogStart = FOG_START;
 const float fogShadingParameter = 1 / ( 1 - fogStart);
 
 #ifdef ENABLE_TONE_MAPPING
diff --git a/client/shaders/wielded_shader/opengl_fragment.glsl b/client/shaders/wielded_shader/opengl_fragment.glsl
index 7c38b749a..ba7a8f12d 100644
--- a/client/shaders/wielded_shader/opengl_fragment.glsl
+++ b/client/shaders/wielded_shader/opengl_fragment.glsl
@@ -19,7 +19,7 @@ bool texSeamless = false;
 
 const float e = 2.718281828459;
 const float BS = 10.0;
-const float fogStart = 0.4;
+const float fogStart = FOG_START;
 const float fogShadingParameter = 1 / ( 1 - fogStart);
 
 void get_texture_flags()
diff --git a/minetest.conf.example b/minetest.conf.example
index 361311ba0..90d7af0a3 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -615,6 +615,10 @@
 #    type: bool
 # inventory_items_animations = false
 
+#    Fraction of the visible distance at which fog starts to be rendered
+#    Range 0 - 0.99
+# fog_start = 0.4
+
 ### Menus
 
 #    Use a cloud animation for the main menu background.
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 2cb57532d..bd88cf530 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -106,6 +106,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("client_unload_unused_data_timeout", "600");
 	settings->setDefault("client_mapblock_limit", "5000");
 	settings->setDefault("enable_fog", "true");
+	settings->setDefault("fog_start", "0.4");
 	settings->setDefault("fov", "72");
 	settings->setDefault("view_bobbing", "true");
 	settings->setDefault("leaves_style", "fancy");
diff --git a/src/game.cpp b/src/game.cpp
index e6d38d0a0..cc6e5a0e3 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1825,6 +1825,8 @@ private:
 	f32  m_cache_mouse_sensitivity;
 	f32  m_cache_joystick_frustum_sensitivity;
 	f32  m_repeat_right_click_time;
+	f32  m_cache_cam_smoothing;
+	f32  m_cache_fog_start;
 
 #ifdef __ANDROID__
 	bool m_cache_hold_aux1;
@@ -1876,6 +1878,12 @@ Game::Game() :
 		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("free_move",
 		&settingChangedCallback, this);
+	g_settings->registerChangedCallback("cinematic",
+		&settingChangedCallback, this);
+	g_settings->registerChangedCallback("cinematic_camera_smoothing",
+		&settingChangedCallback, this);
+	g_settings->registerChangedCallback("camera_smoothing",
+		&settingChangedCallback, this);
 
 	readSettings();
 
@@ -1929,6 +1937,12 @@ Game::~Game()
 		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("free_move",
 		&settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("cinematic",
+		&settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("cinematic_camera_smoothing",
+		&settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("camera_smoothing",
+		&settingChangedCallback, this);
 }
 
 bool Game::startup(bool *kill,
@@ -2034,16 +2048,10 @@ void Game::run()
 		processUserInput(&flags, &runData, dtime);
 		// Update camera before player movement to avoid camera lag of one frame
 		updateCameraDirection(&cam_view_target, &flags, dtime);
-		float cam_smoothing = 0;
-		if (g_settings->getBool("cinematic"))
-			cam_smoothing = 1 - g_settings->getFloat("cinematic_camera_smoothing");
-		else
-			cam_smoothing = 1 - g_settings->getFloat("camera_smoothing");
-		cam_smoothing = rangelim(cam_smoothing, 0.01f, 1.0f);
 		cam_view.camera_yaw += (cam_view_target.camera_yaw -
-				cam_view.camera_yaw) * cam_smoothing;
+				cam_view.camera_yaw) * m_cache_cam_smoothing;
 		cam_view.camera_pitch += (cam_view_target.camera_pitch -
-				cam_view.camera_pitch) * cam_smoothing;
+				cam_view.camera_pitch) * m_cache_cam_smoothing;
 		updatePlayerControl(cam_view);
 		step(&dtime);
 		processClientEvents(&cam_view_target, &runData.damage_flash);
@@ -4284,7 +4292,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats,
 		driver->setFog(
 				sky->getBgColor(),
 				video::EFT_FOG_LINEAR,
-				runData->fog_range * 0.4,
+				runData->fog_range * m_cache_fog_start,
 				runData->fog_range * 1.0,
 				0.01,
 				false, // pixel fog
@@ -4660,7 +4668,18 @@ void Game::readSettings()
 	m_cache_enable_noclip                = g_settings->getBool("noclip");
 	m_cache_enable_free_move             = g_settings->getBool("free_move");
 
+	m_cache_fog_start                    = g_settings->getFloat("fog_start");
+
+	m_cache_cam_smoothing = 0;
+	if (g_settings->getBool("cinematic"))
+		m_cache_cam_smoothing = 1 - g_settings->getFloat("cinematic_camera_smoothing");
+	else
+		m_cache_cam_smoothing = 1 - g_settings->getFloat("camera_smoothing");
+
+	m_cache_fog_start = rangelim(m_cache_fog_start, 0.0f, 0.99f);
+	m_cache_cam_smoothing = rangelim(m_cache_cam_smoothing, 0.01f, 1.0f);
 	m_cache_mouse_sensitivity = rangelim(m_cache_mouse_sensitivity, 0.001, 100.0);
+
 }
 
 /****************************************************************************/
diff --git a/src/shader.cpp b/src/shader.cpp
index d51c1e308..c0ecf738d 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -751,6 +751,10 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
 	if (g_settings->getBool("tone_mapping"))
 		shaders_header += "#define ENABLE_TONE_MAPPING\n";
 
+	shaders_header += "#define FOG_START ";
+	shaders_header += ftos(rangelim(g_settings->getFloat("fog_start"), 0.0f, 0.99f));
+	shaders_header += "\n";
+
 	// Call addHighLevelShaderMaterial() or addShaderMaterial()
 	const c8* vertex_program_ptr = 0;
 	const c8* pixel_program_ptr = 0;

From 2e69711613c18e1075f245d196823ea23675f027 Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar@foo-projects.org>
Date: Tue, 6 Dec 2016 16:39:33 -0800
Subject: [PATCH 334/418] Simple deco: Allow setting param2 value on placement

Schematics can already be placed with a param2 value, but not
simple 1-node plant decorations of the simple type.

This adds a `param2` field to the simple deco type that is
checked to be between 0 and 255, and put to the placed node
at mapgen.

This can be used to put a degrotate value in, or e.g. a fill
value for leveltype nodes, or a place_param2 value at mapgen
placement, or vary the shape of meshoptions plantlike drawtype.
---
 doc/lua_api.txt                 | 4 +++-
 src/mg_decoration.cpp           | 2 +-
 src/mg_decoration.h             | 1 +
 src/script/lua_api/l_mapgen.cpp | 7 +++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index bab3e11f7..62cd6bb46 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -4040,8 +4040,10 @@ The Biome API is still in an experimental phase and subject to change.
     --  ^ Number of nodes high the decoration is made.
     --  ^ If height_max is not 0, this is the lower bound of the randomly selected height.
         height_max = 0,
-    --      ^ Number of nodes the decoration can be at maximum.
+    --  ^ Number of nodes the decoration can be at maximum.
     --  ^ If absent, the parameter 'height' is used as a constant.
+        param2 = 0,
+    --  ^ Param2 value of placed decoration node.
 
         ----- Schematic-type parameters
         schematic = "foobar.mts",
diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index 92483abc3..51e4fbbcc 100644
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -315,7 +315,7 @@ size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
 				!force_placement)
 			break;
 
-		vm->m_data[vi] = MapNode(c_place);
+		vm->m_data[vi] = MapNode(c_place, 0, deco_param2);
 	}
 
 	return 1;
diff --git a/src/mg_decoration.h b/src/mg_decoration.h
index be0ba44d7..986328ec3 100644
--- a/src/mg_decoration.h
+++ b/src/mg_decoration.h
@@ -100,6 +100,7 @@ public:
 	std::vector<content_t> c_decos;
 	s16 deco_height;
 	s16 deco_height_max;
+	u8 deco_param2;
 };
 
 class DecoSchematic : public Decoration {
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index da8e71cdc..cefea3da9 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -975,6 +975,7 @@ bool read_deco_simple(lua_State *L, DecoSimple *deco)
 
 	deco->deco_height     = getintfield_default(L, index, "height", 1);
 	deco->deco_height_max = getintfield_default(L, index, "height_max", 0);
+	deco->deco_param2     = getintfield_default(L, index, "param2", 0);
 
 	if (deco->deco_height <= 0) {
 		errorstream << "register_decoration: simple decoration height"
@@ -990,6 +991,12 @@ bool read_deco_simple(lua_State *L, DecoSimple *deco)
 		return false;
 	}
 
+	if ((deco->deco_param2 < 0) || (deco->deco_param2 > 255)) {
+		errorstream << "register_decoration: param2 out of bounds (0-255)"
+			<< std::endl;
+		return false;
+	}
+
 	return true;
 }
 

From bbe8386a667e4fe719502bd838211f37c5448efa Mon Sep 17 00:00:00 2001
From: Zeno- <kde.psych@gmail.com>
Date: Wed, 7 Dec 2016 23:45:29 +1000
Subject: [PATCH 335/418] Update credits (#4827)

Update credits
---
 builtin/mainmenu/tab_credits.lua | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua
index 9b6045263..224731b14 100644
--- a/builtin/mainmenu/tab_credits.lua
+++ b/builtin/mainmenu/tab_credits.lua
@@ -29,20 +29,22 @@ local core_developers = {
 	"Loic Blot (nerzhul/nrz) <loic.blot@unix-experience.fr>",
 	"Matt Gregory (paramat)",
 	"est31 <MTest31@outlook.com>",
-	"Craig Robbins (Zeno)",
+	"Craig Robbins (Zeno) <craig.d.robbins@gmail.com>",
+	"Auke Kok (sofar) <sofar@foo-projects.org>",
+	"Andrew Ward (rubenwardy) <rubenwardy@gmail.com>",
 }
 
 local active_contributors = {
-	"Auke Kok (sofar) <sofar@foo-projects.org>",
 	"Duane Robertson <duane@duanerobertson.com>",
 	"SmallJoker <mk939@ymail.com>",
-	"Andrew Ward (rubenwardy) <rubenwardy@gmail.com>",
+	"Lars Hofhansl <larsh@apache.org>",
 	"Jeija <jeija@mesecons.net>",
 	"Gregory Currie (gregorycu)",
 	"Sokomine <wegwerf@anarres.dyndns.org>",
 	"TeTpaAka",
 	"Jean-Patrick G (kilbith) <jeanpatrick.guerrero@gmail.com>",
 	"Diego Martínez (kaeza) <kaeza@users.sf.net>",
+	"Dániel Juhász (juhdanad) <juhdanad@gmail.com>",
 }
 
 local previous_core_developers = {
@@ -83,11 +85,6 @@ return {
 			"tablecolumns[color;text]" ..
 			"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
 			"table[3.5,-0.25;8.5,5.8;list_credits;" ..
-			"#FFFF00," .. "Dedication of the current release" .. ",," ..
-			"The 0.4.14 release is dedicated to the memory of" .. ",," ..
-			"Minetest developer Maciej Kasatkin (RealBadAngel)" .. ",," ..
-			"who died on March 24 2016." .. ",," ..
-			"Our thoughts are with his family and friends." .. ",,," ..
 			"#FFFF00," .. fgettext("Core Developers") .. ",," ..
 			table.concat(core_developers, ",,") .. ",,," ..
 			"#FFFF00," .. fgettext("Active Contributors") .. ",," ..

From 24719c6908305c9505eafc372fb4cfbbbd2fcf70 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 7 Dec 2016 21:27:07 +0100
Subject: [PATCH 336/418] Android: fix build and update deps

---
 build/android/Makefile       | 8 ++++----
 build/android/jni/Android.mk | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/android/Makefile b/build/android/Makefile
index 380296993..9f2b5d626 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -91,7 +91,7 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp
 IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp
 IRRLICHT_URL_SVN = https://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION)
 
-OPENSSL_VERSION = 1.0.2h
+OPENSSL_VERSION = 1.0.2j
 OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION)
 OPENSSL_DIR = $(ANDR_ROOT)/deps/$(OPENSSL_BASEDIR)/
 OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0
@@ -99,14 +99,14 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp
 OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp
 OPENSSL_URL = https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
 
-CURL_VERSION = 7.48.0
+CURL_VERSION = 7.51.0
 CURL_DIR = $(ANDR_ROOT)/deps/curl-$(CURL_VERSION)
 CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
 CURL_TIMESTAMP = $(CURL_DIR)/timestamp
 CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp
 CURL_URL_HTTP = https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2
 
-GMP_VERSION = 6.1.0
+GMP_VERSION = 6.1.1
 GMP_DIR = $(ANDR_ROOT)/deps/gmp-$(GMP_VERSION)
 GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so
 GMP_TIMESTAMP = $(GMP_DIR)/timestamp
@@ -126,7 +126,7 @@ ICONV_TIMESTAMP = $(ICONV_DIR)timestamp
 ICONV_TIMESTAMP_INT = $(ANDR_ROOT)/deps/iconv_timestamp
 ICONV_URL_HTTP = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz
 
-SQLITE3_FOLDER = sqlite-amalgamation-3120200
+SQLITE3_FOLDER = sqlite-amalgamation-3150200
 SQLITE3_URL = https://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip
 
 ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//')
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index 651fa318e..c2186efaf 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -203,6 +203,7 @@ LOCAL_SRC_FILES := \
 		jni/src/porting.cpp                       \
 		jni/src/profiler.cpp                      \
 		jni/src/quicktune.cpp                     \
+		jni/src/reflowscan.cpp                    \
 		jni/src/remoteplayer.cpp                  \
 		jni/src/rollback.cpp                      \
 		jni/src/rollback_interface.cpp            \

From 5a2431a9bd9a019a47cd279ac988435b075cdabe Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar@foo-projects.org>
Date: Tue, 6 Dec 2016 22:08:16 -0800
Subject: [PATCH 337/418] Simple decorations: Fix range check for
 deco->deco_param2

Allow any int value, and properly range check it before casting.
---
 src/script/lua_api/l_mapgen.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index cefea3da9..281f68e46 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -972,10 +972,10 @@ int ModApiMapgen::l_register_decoration(lua_State *L)
 bool read_deco_simple(lua_State *L, DecoSimple *deco)
 {
 	int index = 1;
+	int param2;
 
 	deco->deco_height     = getintfield_default(L, index, "height", 1);
 	deco->deco_height_max = getintfield_default(L, index, "height_max", 0);
-	deco->deco_param2     = getintfield_default(L, index, "param2", 0);
 
 	if (deco->deco_height <= 0) {
 		errorstream << "register_decoration: simple decoration height"
@@ -991,11 +991,13 @@ bool read_deco_simple(lua_State *L, DecoSimple *deco)
 		return false;
 	}
 
-	if ((deco->deco_param2 < 0) || (deco->deco_param2 > 255)) {
+	param2 = getintfield_default(L, index, "param2", 0);
+	if ((param2 < 0) || (param2 > 255)) {
 		errorstream << "register_decoration: param2 out of bounds (0-255)"
 			<< std::endl;
 		return false;
 	}
+	deco->deco_param2 = (u8)param2;
 
 	return true;
 }

From 3f88d776dcfb6d8844906ec44d9131d4519a34cb Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Wed, 7 Dec 2016 10:18:18 +0100
Subject: [PATCH 338/418] Buildbot: Update LuaJIT version

---
 util/buildbot/buildwin32.sh | 8 ++++----
 util/buildbot/buildwin64.sh | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index 27c7e556f..e58c25ccc 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -20,7 +20,7 @@ curl_version=7.50.3
 gettext_version=0.14.4
 freetype_version=2.7
 sqlite3_version=3.14.2
-luajit_version=2.0.1
+luajit_version=2.1.0-beta2
 leveldb_version=1.18
 zlib_version=1.2.8
 
@@ -46,8 +46,8 @@ cd $builddir
 	-c -O $packagedir/freetype2-$freetype_version.zip
 [ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip \
 	-c -O $packagedir/sqlite3-$sqlite3_version.zip
-[ -e $packagedir/luajit-$luajit_version-static-win32.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-static-win32.zip \
-	-c -O $packagedir/luajit-$luajit_version-static-win32.zip
+[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip \
+	-c -O $packagedir/luajit-$luajit_version.zip
 [ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \
 	-c -O $packagedir/libleveldb-$leveldb_version.zip
 [ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped.zip \
@@ -64,7 +64,7 @@ cd $libdir
 [ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
 [ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
 [ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
-[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version-static-win32.zip -d luajit
+[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
 [ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
 
 # Get minetest
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 3e4079a12..1c31fe4bd 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -20,7 +20,7 @@ curl_version=7.50.3
 gettext_version=0.18.2
 freetype_version=2.7
 sqlite3_version=3.14.2
-luajit_version=2.0.3
+luajit_version=2.1.0-beta2
 leveldb_version=1.18
 zlib_version=1.2.8
 
@@ -46,7 +46,7 @@ cd $builddir
 	-c -O $packagedir/freetype2-$freetype_version.zip
 [ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip \
 	-c -O $packagedir/sqlite3-$sqlite3_version.zip
-[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-static-win64.zip \
+[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip \
 	-c -O $packagedir/luajit-$luajit_version.zip
 [ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip \
 	-c -O $packagedir/libleveldb-$leveldb_version.zip

From 2886f0ccb06af04927d4cd661eaf82a253426c05 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Fri, 9 Dec 2016 17:27:36 +0000
Subject: [PATCH 339/418] Fix sqlite databases being read-only on 64bit Android
 by patching sqlite (#4871)

Fixes #4121
---
 build/android/Makefile                          |  5 +++--
 .../android/patches/sqlite3-readonly-fix.patch  | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 build/android/patches/sqlite3-readonly-fix.patch

diff --git a/build/android/Makefile b/build/android/Makefile
index 9f2b5d626..40520c5bf 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -665,7 +665,9 @@ deps/${SQLITE3_FOLDER}/sqlite3.c :
 	cd deps;                                                                    \
 	wget ${SQLITE3_URL};                                                        \
 	unzip ${SQLITE3_FOLDER}.zip;                                                \
-	ln -s ${SQLITE3_FOLDER} sqlite
+	ln -s ${SQLITE3_FOLDER} sqlite;                                             \
+	cd ${SQLITE3_FOLDER};                                                       \
+	patch sqlite3.c < ${ANDR_ROOT}/patches/sqlite3-readonly-fix.patch
 
 clean_sqlite3:
 	cd deps && $(RM) -rf ${SQLITE3_FOLDER} && $(RM) -f ${SQLITE3_FOLDER}.zip && \
@@ -831,4 +833,3 @@ $(ANDR_ROOT)/jni/src/android_version.h : prep_srcdir
 	fi
 
 clean : clean_apk clean_assets
-
diff --git a/build/android/patches/sqlite3-readonly-fix.patch b/build/android/patches/sqlite3-readonly-fix.patch
new file mode 100644
index 000000000..be19055ee
--- /dev/null
+++ b/build/android/patches/sqlite3-readonly-fix.patch
@@ -0,0 +1,17 @@
+--- sqlite3.c	2016-11-29 02:29:24.000000000 +0000
++++ sqlite3.c	2016-12-08 22:54:54.206465377 +0000
+@@ -30445,7 +30445,14 @@
+ #if OS_VXWORKS
+   struct vxworksFileId *pId;  /* Unique file ID for vxworks. */
+ #else
+-  ino_t ino;                  /* Inode number */
++  #ifdef ANDROID
++    // Bionic's struct stat has a 64 bit st_ino on both 32 and
++    // 64 bit architectures. ino_t remains 32 bits wide on 32 bit
++    // architectures and can lead to inode truncation.
++    unsigned long long ino;     /* Inode number */
++  #else
++    ino_t ino;     /* Inode number */
++  #endif
+ #endif
+ };

From 60772071e9b63c24a939078c706b713f46bf3279 Mon Sep 17 00:00:00 2001
From: Rogier-5 <rogier777@gmail.com>
Date: Sun, 11 Dec 2016 19:49:49 +0100
Subject: [PATCH 340/418] Fix computation of viewing range (in blocks) sent to
 server (#4882)

Fixes #4878

Also remove an artificial viewing range reduction that
(presumably) was added to compensate for miscomputed
viewing ranges, and that doesn't seem to be needed any
more (thanks to lhofhansl).
---
 src/client.cpp                | 5 +++--
 src/game.cpp                  | 2 +-
 src/network/networkprotocol.h | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index e9d273c69..7e88e5562 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <algorithm>
 #include <sstream>
+#include <cmath>
 #include <IFileSystem.h>
 #include "threading/mutex_auto_lock.h"
 #include "util/auth.h"
@@ -939,7 +940,7 @@ void writePlayerPos(LocalPlayer *myplayer, ClientMap *clientMap, NetworkPacket *
 	u32 keyPressed   = myplayer->keyPressed;
 	// scaled by 80, so that pi can fit into a u8
 	u8 fov           = clientMap->getCameraFov() * 80;
-	u8 wanted_range  = clientMap->getControl().wanted_range / MAP_BLOCKSIZE;
+	u8 wanted_range  = std::ceil(clientMap->getControl().wanted_range / MAP_BLOCKSIZE);
 
 	v3s32 position(pf.X, pf.Y, pf.Z);
 	v3s32 speed(sf.X, sf.Y, sf.Z);
@@ -952,7 +953,7 @@ void writePlayerPos(LocalPlayer *myplayer, ClientMap *clientMap, NetworkPacket *
 		[12+12+4] s32 yaw*100
 		[12+12+4+4] u32 keyPressed
 		[12+12+4+4+4] u8 fov*80
-		[12+12+4+4+4+1] u8 wanted_range / MAP_BLOCKSIZE
+		[12+12+4+4+4+1] u8 ceil(wanted_range / MAP_BLOCKSIZE)
 	*/
 	*pkt << position << speed << pitch << yaw << keyPressed;
 	*pkt << fov << wanted_range;
diff --git a/src/game.cpp b/src/game.cpp
index cc6e5a0e3..18b28c142 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -4214,7 +4214,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats,
 	if (draw_control->range_all) {
 		runData->fog_range = 100000 * BS;
 	} else {
-		runData->fog_range = 0.9 * draw_control->wanted_range * BS;
+		runData->fog_range = draw_control->wanted_range * BS;
 	}
 
 	/*
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index c9919e1c4..018b392b6 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -652,7 +652,7 @@ enum ToServerCommand
 		[2+12+12+4] s32 yaw*100
 		[2+12+12+4+4] u32 keyPressed
 		[2+12+12+4+4+1] u8 fov*80
-		[2+12+12+4+4+4+1] u8 wanted_range / MAP_BLOCKSIZE
+		[2+12+12+4+4+4+1] u8 ceil(wanted_range / MAP_BLOCKSIZE)
 	*/
 
 	TOSERVER_GOTBLOCKS = 0x24,

From 38abc91802ec12996d4fbb1e2f0ba4365d86b545 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Thu, 1 Dec 2016 21:53:43 +0000
Subject: [PATCH 341/418] Mapgen: Make mgv7 the default mapgen

---
 src/mapgen.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mapgen.h b/src/mapgen.h
index 403fb7470..b18bfb930 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -26,8 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/string.h"
 #include "util/container.h"
 
-#define MAPGEN_DEFAULT MAPGEN_V6
-#define MAPGEN_DEFAULT_NAME "v6"
+#define MAPGEN_DEFAULT MAPGEN_V7
+#define MAPGEN_DEFAULT_NAME "v7"
 
 /////////////////// Mapgen flags
 #define MG_TREES       0x01  // Deprecated. Moved into mgv6 flags

From 02112f84e2102182816ffa48d5444a7321730936 Mon Sep 17 00:00:00 2001
From: Rogier <rogier777@gmail.com>
Date: Sun, 11 Dec 2016 00:23:32 +0100
Subject: [PATCH 342/418] View range: Set maximum to 4000 nodes

The network protocol does not support larger than 255 mapblocks.
---
 builtin/settingtypes.txt |  3 +--
 minetest.conf.example    |  3 +--
 src/client.cpp           |  3 ++-
 src/game.cpp             | 22 ++++++++++++++++------
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 10db4787d..822568af4 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -418,8 +418,7 @@ fps_max (Maximum FPS) int 60
 pause_fps_max (FPS in pause menu) int 20
 
 #    View distance in nodes.
-#    Min = 20
-viewing_range (Viewing range) int 100
+viewing_range (Viewing range) int 100 20 4000
 
 #    Width component of the initial window size.
 screenW (Screen width) int 800
diff --git a/minetest.conf.example b/minetest.conf.example
index 90d7af0a3..f0e5f1d47 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -473,8 +473,7 @@
 # pause_fps_max = 20
 
 #    View distance in nodes.
-#    Min = 20
-#    type: int
+#    type: int min: 20 max: 4000
 # viewing_range = 100
 
 #    Width component of the initial window size.
diff --git a/src/client.cpp b/src/client.cpp
index 7e88e5562..5476aad0e 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -940,7 +940,8 @@ void writePlayerPos(LocalPlayer *myplayer, ClientMap *clientMap, NetworkPacket *
 	u32 keyPressed   = myplayer->keyPressed;
 	// scaled by 80, so that pi can fit into a u8
 	u8 fov           = clientMap->getCameraFov() * 80;
-	u8 wanted_range  = std::ceil(clientMap->getControl().wanted_range / MAP_BLOCKSIZE);
+	u8 wanted_range  = MYMIN(255,
+			std::ceil(clientMap->getControl().wanted_range / MAP_BLOCKSIZE));
 
 	v3s32 position(pf.X, pf.Y, pf.Z);
 	v3s32 speed(sf.X, sf.Y, sf.Z);
diff --git a/src/game.cpp b/src/game.cpp
index 18b28c142..ea07accf8 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -3277,9 +3277,16 @@ void Game::increaseViewRange(float *statustext_time)
 {
 	s16 range = g_settings->getS16("viewing_range");
 	s16 range_new = range + 10;
+
+	if (range_new > 4000) {
+		range_new = 4000;
+		statustext = utf8_to_wide("Viewing range is at maximum: "
+				+ itos(range_new));
+	} else {
+		statustext = utf8_to_wide("Viewing range changed to "
+				+ itos(range_new));
+	}
 	g_settings->set("viewing_range", itos(range_new));
-	statustext = utf8_to_wide("Viewing range changed to "
-			+ itos(range_new));
 	*statustext_time = 0;
 }
 
@@ -3289,12 +3296,15 @@ void Game::decreaseViewRange(float *statustext_time)
 	s16 range = g_settings->getS16("viewing_range");
 	s16 range_new = range - 10;
 
-	if (range_new < 20)
+	if (range_new < 20) {
 		range_new = 20;
-
+		statustext = utf8_to_wide("Viewing range is at minimum: "
+				+ itos(range_new));
+	} else {
+		statustext = utf8_to_wide("Viewing range changed to "
+				+ itos(range_new));
+	}
 	g_settings->set("viewing_range", itos(range_new));
-	statustext = utf8_to_wide("Viewing range changed to "
-			+ itos(range_new));
 	*statustext_time = 0;
 }
 

From c98ae2a91f2a9eb8dad011e71a04fd8ee2c2d767 Mon Sep 17 00:00:00 2001
From: Rogier <rogier777@gmail.com>
Date: Sun, 11 Dec 2016 20:13:49 +0100
Subject: [PATCH 343/418] Setting limits: Fix message text in advanced settings
 tab

It would complain that the value should be higher than the lower
bound, when it should be higher than or equal to the lower bound.

Similar issue for the upper bound.
---
 builtin/mainmenu/dlg_settings_advanced.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua
index 06def72a3..b0d923768 100644
--- a/builtin/mainmenu/dlg_settings_advanced.lua
+++ b/builtin/mainmenu/dlg_settings_advanced.lua
@@ -479,13 +479,13 @@ local function handle_change_setting_buttons(this, fields)
 				return true
 			end
 			if setting.min and new_value < setting.min then
-				this.data.error_message = fgettext_ne("The value must be greater than $1.", setting.min)
+				this.data.error_message = fgettext_ne("The value must be at least $1.", setting.min)
 				this.data.entered_text = fields["te_setting_value"]
 				core.update_formspec(this:get_formspec())
 				return true
 			end
 			if setting.max and new_value > setting.max then
-				this.data.error_message = fgettext_ne("The value must be lower than $1.", setting.max)
+				this.data.error_message = fgettext_ne("The value must not be larger than $1.", setting.max)
 				this.data.entered_text = fields["te_setting_value"]
 				core.update_formspec(this:get_formspec())
 				return true

From d9675d3d922a2c8f521102c9386d14c694fda365 Mon Sep 17 00:00:00 2001
From: Bernardo Sulzbach <mafagafogigante@gmail.com>
Date: Mon, 12 Dec 2016 00:39:09 -0200
Subject: [PATCH 344/418] Mod dependency lists: Should have
 platform-independent line breaking

This fixes a bug existing in modmgr.lua as reported by @Wuzzy2 which
caused the mod dependency list to glitch if input was using a line
terminator different than the OS default.

The C++ code does not need any changes as it already trims CR
occurrences on platforms on which the line termination sequence is LF.

Taken into account the size of the depends.txt files used, this should
not introduce a noticeable performance regression.

Fixes #4720
---
 builtin/mainmenu/modmgr.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua
index bf87b1dfa..2b7b371bf 100644
--- a/builtin/mainmenu/modmgr.lua
+++ b/builtin/mainmenu/modmgr.lua
@@ -296,6 +296,7 @@ function modmgr.get_dependencies(modfolder)
 		if dependencyfile then
 			local dependency = dependencyfile:read("*l")
 			while dependency do
+				dependency = dependency:gsub("\r", "")
 				if string.sub(dependency, -1, -1) == "?" then
 					table.insert(soft_dependencies, string.sub(dependency, 1, -2))
 				else

From 0fdf24d64ab055a97e488eb3775cc7c721156d3c Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Sun, 11 Dec 2016 21:57:43 +0000
Subject: [PATCH 345/418] Fix camera jumping on Android when panning past 0/360
 mark

---
 src/game.cpp           |  6 +++---
 src/touchscreengui.cpp | 14 ++++----------
 src/touchscreengui.h   | 10 ++++++++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index ea07accf8..966c23073 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1205,7 +1205,7 @@ static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec,
 		(*cur_formspec)->setFormSource(fs_src);
 		(*cur_formspec)->setTextDest(txt_dest);
 	}
-	
+
 }
 
 #ifdef __ANDROID__
@@ -3362,8 +3362,8 @@ void Game::updateCameraOrientation(CameraOrientation *cam,
 {
 #ifdef HAVE_TOUCHSCREENGUI
 	if (g_touchscreengui) {
-		cam->camera_yaw   = g_touchscreengui->getYaw();
-		cam->camera_pitch = g_touchscreengui->getPitch();
+		cam->camera_yaw   += g_touchscreengui->getYawChange();
+		cam->camera_pitch  = g_touchscreengui->getPitch();
 	} else {
 #endif
 
diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp
index f51b2d5fa..e3c6a39a9 100644
--- a/src/touchscreengui.cpp
+++ b/src/touchscreengui.cpp
@@ -414,7 +414,7 @@ void AutoHideButtonBar::show()
 TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver* receiver):
 	m_device(device),
 	m_guienv(device->getGUIEnvironment()),
-	m_camera_yaw(0.0),
+	m_camera_yaw_change(0.0),
 	m_camera_pitch(0.0),
 	m_visible(false),
 	m_move_id(-1),
@@ -835,17 +835,11 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
 
 					/* adapt to similar behaviour as pc screen */
 					double d         = g_settings->getFloat("mouse_sensitivity") *4;
-					double old_yaw   = m_camera_yaw;
+					double old_yaw   = m_camera_yaw_change;
 					double old_pitch = m_camera_pitch;
 
-					m_camera_yaw   -= dx * d;
-					m_camera_pitch  = MYMIN(MYMAX( m_camera_pitch + (dy * d),-180),180);
-
-					while (m_camera_yaw < 0)
-						m_camera_yaw += 360;
-
-					while (m_camera_yaw > 360)
-						m_camera_yaw -= 360;
+					m_camera_yaw_change -= dx * d;
+					m_camera_pitch = MYMIN(MYMAX(m_camera_pitch + (dy * d), -180), 180);
 
 					// update shootline
 					m_shootline = m_device
diff --git a/src/touchscreengui.h b/src/touchscreengui.h
index d8106a260..b4de1b032 100644
--- a/src/touchscreengui.h
+++ b/src/touchscreengui.h
@@ -147,8 +147,14 @@ public:
 
 	void init(ISimpleTextureSource* tsrc);
 
-	double getYaw() { return m_camera_yaw; }
+	double getYawChange() {
+		double res = m_camera_yaw_change;
+		m_camera_yaw_change = 0;
+		return res;
+	}
+
 	double getPitch() { return m_camera_pitch; }
+
 	line3d<f32> getShootline() { return m_shootline; }
 
 	void step(float dtime);
@@ -170,7 +176,7 @@ private:
 	bool                    m_visible; // is the gui visible
 
 	/* value in degree */
-	double                  m_camera_yaw;
+	double                  m_camera_yaw_change;
 	double                  m_camera_pitch;
 
 	line3d<f32>             m_shootline;

From 540071002e949dfa7be3999a58be46d75d7631e9 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Sun, 11 Dec 2016 22:17:32 +0000
Subject: [PATCH 346/418] Fix segfault on startup error on Android

---
 src/touchscreengui.cpp | 6 ++++--
 src/touchscreengui.h   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp
index e3c6a39a9..8d210c63a 100644
--- a/src/touchscreengui.cpp
+++ b/src/touchscreengui.cpp
@@ -177,8 +177,10 @@ void AutoHideButtonBar::init(ISimpleTextureSource* tsrc,
 
 AutoHideButtonBar::~AutoHideButtonBar()
 {
-	m_starter.guibutton->setVisible(false);
-	m_starter.guibutton->drop();
+	if (m_starter.guibutton) {
+		m_starter.guibutton->setVisible(false);
+		m_starter.guibutton->drop();
+	}
 }
 
 void AutoHideButtonBar::addButton(touch_gui_button_id button_id,
diff --git a/src/touchscreengui.h b/src/touchscreengui.h
index b4de1b032..53fc6d683 100644
--- a/src/touchscreengui.h
+++ b/src/touchscreengui.h
@@ -75,7 +75,7 @@ struct button_info {
 	float            repeatdelay;
 	irr::EKEY_CODE   keycode;
 	std::vector<int> ids;
-	IGUIButton*      guibutton;
+	IGUIButton*      guibutton = NULL;
 	bool             immediate_release;
 };
 

From 0d94bfabcc71efac20210746430a2b9e401425b1 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Mon, 12 Dec 2016 17:10:16 +0100
Subject: [PATCH 347/418] Mgv7: Change default cave width to 0.09

---
 builtin/settingtypes.txt | 2 +-
 minetest.conf.example    | 2 +-
 src/mapgen_v7.cpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 822568af4..df4484750 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -972,7 +972,7 @@ mgv6_np_apple_trees (Mapgen v6 apple trees noise parameters) noise_params 0, 1,
 mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,floatlands,nomountains,noridges,nofloatlands
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
-mgv7_cave_width (Mapgen v7 cave width) float 0.2
+mgv7_cave_width (Mapgen v7 cave width) float 0.09
 
 #    Controls the density of floatland mountain terrain.
 #    Is an offset added to the 'np_mountain' noise value.
diff --git a/minetest.conf.example b/minetest.conf.example
index f0e5f1d47..e372e5833 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1252,7 +1252,7 @@
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    type: float
-# mgv7_cave_width = 0.2
+# mgv7_cave_width = 0.09
 
 #    Controls the density of floatland mountain terrain.
 #    Is an offset added to the 'np_mountain' noise value.
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 498a1333c..04a9e3c16 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -101,7 +101,7 @@ MapgenV7::~MapgenV7()
 MapgenV7Params::MapgenV7Params()
 {
 	spflags             = MGV7_MOUNTAINS | MGV7_RIDGES;
-	cave_width          = 0.2;
+	cave_width          = 0.09;
 	float_mount_density = 0.6;
 	float_mount_height  = 128.0;
 	floatland_level     = 1280;

From 05f6b274a5cf06050f9c33aab7869961fd0b63a5 Mon Sep 17 00:00:00 2001
From: Thomas Wagner Nielsen <thomas@viawords.com>
Date: Tue, 30 Aug 2016 07:05:41 +0000
Subject: [PATCH 348/418] Translated using Weblate (Danish)

Currently translated at 29.5% (271 of 918 strings)
---
 po/da/minetest.po | 130 +++++++++++++++++++++++-----------------------
 1 file changed, 66 insertions(+), 64 deletions(-)

diff --git a/po/da/minetest.po b/po/da/minetest.po
index d2d1c4eb5..6a21d2cfb 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -2,22 +2,22 @@
 # Copyright (C) 2011 celeron
 # This file is distributed under the same license as the minetest-c55 package.
 # Frederik Helth <Guides@live.dk>, 2011.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-08-30 04:09+0000\n"
-"Last-Translator: Rui <rui.minetest@gmail.com>\n"
-"Language-Team: Danish <https://hosted.weblate.org/projects/minetest/minetest/"
-"da/>\n"
+"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"PO-Revision-Date: 2016-08-30 08:57+0200\n"
+"Last-Translator: Thomas Wagner Nielsen <thomas@viawords.com>\n"
+"Language-Team: Danish "
+"<https://hosted.weblate.org/projects/minetest/minetest/da/>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.8-dev\n"
+"X-Generator: Weblate 2.7-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -530,7 +530,7 @@ msgstr "Avancerede indstillinger"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr ""
+msgstr "Udjævning:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Are you sure to reset your singleplayer world?"
@@ -641,7 +641,7 @@ msgstr "Glat belysning"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Texturing:"
-msgstr ""
+msgstr "Teksturering:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
@@ -705,11 +705,11 @@ msgstr "Der er ikke nogen information tilgængelig"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Select texture pack:"
-msgstr ""
+msgstr "Vælg teksturpakke:"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Texturepacks"
-msgstr ""
+msgstr "Teksturpakker"
 
 #: src/client.cpp
 msgid "Connection timed out."
@@ -729,7 +729,7 @@ msgstr "Initialiserer noder..."
 
 #: src/client.cpp
 msgid "Loading textures..."
-msgstr ""
+msgstr "Indlæser teksturer..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
@@ -1346,7 +1346,7 @@ msgid ""
 "The default is suitable for mandelbrot sets, it needs to be edited for julia "
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
-msgstr ""
+msgstr " "
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1375,6 +1375,8 @@ msgid ""
 "-    sidebyside: split screen side by side.\n"
 "-    pageflip: quadbuffer based 3d."
 msgstr ""
+"Understøttelse af 3D.\n"
+"Understøttet på nuværende tidspunkt:\n"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1570,7 +1572,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "Grottebredde"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
@@ -1785,7 +1787,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Crouch speed"
-msgstr ""
+msgstr "Krybehastighed"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2048,7 +2050,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
-msgstr ""
+msgstr "FSAA"
 
 #: src/settings_translation_file.cpp
 msgid "Fall bobbing"
@@ -2072,7 +2074,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fast key"
-msgstr ""
+msgstr "Hurtigtast"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode acceleration"
@@ -2143,15 +2145,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
-msgstr ""
+msgstr "Flyvetast"
 
 #: src/settings_translation_file.cpp
 msgid "Flying"
-msgstr ""
+msgstr "Flyver"
 
 #: src/settings_translation_file.cpp
 msgid "Fog"
-msgstr ""
+msgstr "Tåge"
 
 #: src/settings_translation_file.cpp
 msgid "Fog toggle key"
@@ -2159,11 +2161,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Font path"
-msgstr ""
+msgstr "Sti til font"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
-msgstr ""
+msgstr "Fontskygge"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha"
@@ -2179,7 +2181,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Font size"
-msgstr ""
+msgstr "Skriftstørrelse"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
@@ -2212,7 +2214,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
-msgstr ""
+msgstr "Fuld skærm"
 
 #: src/settings_translation_file.cpp
 msgid "Full screen BPP"
@@ -2220,11 +2222,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fullscreen mode."
-msgstr ""
+msgstr "Fuldskærmstilstand."
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
-msgstr ""
+msgstr "Skalering af grafisk brugerflade"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter"
@@ -2236,11 +2238,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #: src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "Generelt"
 
 #: src/settings_translation_file.cpp
 msgid "Generate normalmaps"
@@ -2262,11 +2264,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
-msgstr ""
+msgstr "Grafik"
 
 #: src/settings_translation_file.cpp
 msgid "Gravity"
-msgstr ""
+msgstr "Tyngdekraft"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2333,15 +2335,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 server"
-msgstr ""
+msgstr "IPv6-server"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 support."
-msgstr ""
+msgstr "Understøttelse af IPv6."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2469,7 +2471,7 @@ msgstr "Beholdning"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
-msgstr ""
+msgstr "Invertér mus"
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
@@ -2529,7 +2531,7 @@ msgstr "Hop"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
-msgstr ""
+msgstr "Hoppehastighed"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2749,7 +2751,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Language"
-msgstr ""
+msgstr "Sprog"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
@@ -2761,7 +2763,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
-msgstr ""
+msgstr "Bladstil"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3272,7 +3274,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
-msgstr ""
+msgstr "Maksimal FPS"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS when game is paused."
@@ -3384,11 +3386,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
-msgstr ""
+msgstr "Minikort"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap key"
-msgstr ""
+msgstr "Minikorttast"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap scan height"
@@ -3463,7 +3465,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Network"
-msgstr ""
+msgstr "Netværk"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3497,7 +3499,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Noises"
-msgstr ""
+msgstr "Lyde"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps sampling"
@@ -3577,7 +3579,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
-msgstr ""
+msgstr "Fysik"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3587,7 +3589,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Player name"
-msgstr ""
+msgstr "Spillerens navn"
 
 #: src/settings_translation_file.cpp
 msgid "Player transfer distance"
@@ -3655,7 +3657,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Remote port"
-msgstr ""
+msgstr "Fjernport"
 
 #: src/settings_translation_file.cpp
 msgid "Replaces the default main menu with a custom one."
@@ -3677,7 +3679,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "River Depth"
-msgstr ""
+msgstr "Floddybde"
 
 #: src/settings_translation_file.cpp
 msgid "River Noise"
@@ -3685,7 +3687,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "River Size"
-msgstr ""
+msgstr "Flodstørrelse"
 
 #: src/settings_translation_file.cpp
 msgid "River noise -- rivers occur close to zero"
@@ -3718,11 +3720,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
-msgstr ""
+msgstr "Skærmhøjde"
 
 #: src/settings_translation_file.cpp
 msgid "Screen width"
-msgstr ""
+msgstr "Skærmbredde"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3752,7 +3754,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Security"
-msgstr ""
+msgstr "Sikkerhed"
 
 #: src/settings_translation_file.cpp
 msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
@@ -3777,23 +3779,23 @@ msgstr "Enligspiller"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
-msgstr ""
+msgstr "Server-URL"
 
 #: src/settings_translation_file.cpp
 msgid "Server address"
-msgstr ""
+msgstr "Serveradresse"
 
 #: src/settings_translation_file.cpp
 msgid "Server description"
-msgstr ""
+msgstr "Serverbeskrivelse"
 
 #: src/settings_translation_file.cpp
 msgid "Server name"
-msgstr ""
+msgstr "Servernavn"
 
 #: src/settings_translation_file.cpp
 msgid "Server port"
-msgstr ""
+msgstr "Serverport"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist URL"
@@ -3886,7 +3888,7 @@ msgstr "Snige"
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
-msgstr ""
+msgstr "Lyd"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3914,7 +3916,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
-msgstr ""
+msgstr "Understøt ældre servere"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -4029,7 +4031,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Time speed"
-msgstr ""
+msgstr "Tidshastighed"
 
 #: src/settings_translation_file.cpp
 msgid "Timeout for client to remove unused map data from memory."
@@ -4110,11 +4112,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
-msgstr ""
+msgstr "V-Sync"
 
 #: src/settings_translation_file.cpp
 msgid "VBO"
-msgstr ""
+msgstr "VBO"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Depth"
@@ -4168,7 +4170,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
-msgstr ""
+msgstr "Lydstyrke"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4180,7 +4182,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
-msgstr ""
+msgstr "Ganghastighed"
 
 #: src/settings_translation_file.cpp
 msgid "Water Features"
@@ -4188,7 +4190,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
-msgstr ""
+msgstr "Vandstand"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
@@ -4333,7 +4335,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"
-msgstr ""
+msgstr "cURL-tidsudløb"
 
 #, fuzzy
 #~ msgid "Downloading"

From 1c8d43cab5a2efdf7540ea9e0905de60a3ced8ca Mon Sep 17 00:00:00 2001
From: Joe Hansen <joedalton2@yahoo.dk>
Date: Thu, 6 Oct 2016 14:48:01 +0000
Subject: [PATCH 349/418] Translated using Weblate (Danish)

Currently translated at 73.0% (671 of 918 strings)

This is a merger of 3 commits.
---
 po/da/minetest.po | 892 ++++++++++++++++++++++++++++------------------
 1 file changed, 555 insertions(+), 337 deletions(-)

diff --git a/po/da/minetest.po b/po/da/minetest.po
index 6a21d2cfb..84cfab33f 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-08-30 08:57+0200\n"
-"Last-Translator: Thomas Wagner Nielsen <thomas@viawords.com>\n"
+"PO-Revision-Date: 2016-10-20 13:59+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish "
 "<https://hosted.weblate.org/projects/minetest/minetest/da/>\n"
 "Language: da\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -132,7 +132,7 @@ msgstr "aktiveret"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr "En verden med navnet \"$1\" eksisterer allerede"
+msgstr "En verden med navnet »$1« findes allerede"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -140,7 +140,7 @@ msgstr "Skab"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "Hent et subgame, så som minetest_game fra minetest.net"
+msgstr "Hent et underspil, såsom minetest_game fra minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
@@ -155,7 +155,6 @@ msgid "Mapgen"
 msgstr "Mapgen"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "No worldname given or no game selected"
 msgstr "Intet navn på verden angivet eller intet spil valgt"
 
@@ -178,7 +177,7 @@ msgstr "Du har ikke installeret nogle subgames."
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr "Er du sikker på du vil slette \"$1\"?"
+msgstr "Er du sikker på, at du vil slette »$1«?"
 
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
@@ -215,12 +214,10 @@ msgid "(No description of setting given)"
 msgstr "(Der er ikke nogen beskrivelse af denne indstilling)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "< Back to Settings page"
 msgstr "< Tilbage til siden Indstillinger"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Browse"
 msgstr "Gennemse"
 
@@ -259,7 +256,7 @@ msgstr "Mods"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
-msgstr ""
+msgstr "Valgfrit kan »lacunarity'en« tilføjes med et foranstillet komma."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a comma seperated list of flags."
@@ -436,14 +433,12 @@ msgid "Del. Favorite"
 msgstr "Vis favoritter"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Favorite"
-msgstr "Vis favoritter"
+msgstr "Favorit"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "Navn/kodeord:"
+msgstr "Navn/adgangskode"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -451,7 +446,7 @@ msgstr "Spiller mod spiller aktiveret"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Bind Address"
-msgstr ""
+msgstr "Bind adresse"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Configure"
@@ -476,9 +471,8 @@ msgid "New"
 msgstr "Ny"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
-#, fuzzy
 msgid "No world created or selected!"
-msgstr "Ingen verden skabt eller valgt!"
+msgstr "Ingen verden oprettet eller valgt!"
 
 #: builtin/mainmenu/tab_server.lua
 #, fuzzy
@@ -506,7 +500,6 @@ msgid "Start Game"
 msgstr "Start spil / Forbind"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "2x"
 msgstr "2x"
 
@@ -515,12 +508,10 @@ msgid "3D Clouds"
 msgstr "3D-skyer"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "4x"
 msgstr "4x"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "8x"
 msgstr "8x"
 
@@ -554,18 +545,17 @@ msgid "Connected Glass"
 msgstr "Forbundet glas"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Fancy Leaves"
-msgstr "Opakt (uigennemsigtigt) vand"
+msgstr "Smukke blade"
 
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Mipmap"
-msgstr "Mip-mapping"
+msgstr "Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
-msgstr ""
+msgstr "Mipmap + Aniso-filter"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No"
@@ -576,52 +566,44 @@ msgid "No Filter"
 msgstr "Intet filter"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "No Mipmap"
-msgstr "Mip-mapping"
+msgstr "Ingen Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Highlighting"
-msgstr "Glat belysning"
+msgstr "Knudepunktsfremhævelse"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Outlining"
-msgstr "Glat belysning"
+msgstr "Knudepunktsomrids"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
 msgstr "Ingen"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Normal Mapping"
-msgstr "Mip-mapping"
+msgstr "Normal oversættelse"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Opaque Leaves"
-msgstr "Opakt (uigennemsigtigt) vand"
+msgstr "Uuigennemsigtige blade"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Opaque Water"
-msgstr "Opakt (uigennemsigtigt) vand"
+msgstr "Uigennemsigtigt vand"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Parallax Occlusion"
-msgstr ""
+msgstr "Parallax-okklusion"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "Aktivér partikler"
+msgstr "Partikler"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Reset singleplayer world"
-msgstr "Er du sikker på, at du vil nulstille din enkelt spiller-verden?"
+msgstr "Nulstil spillerverden"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -629,7 +611,7 @@ msgstr "Indstillinger"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Shaders"
-msgstr "Shadere"
+msgstr "Dybdeskabere"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Simple Leaves"
@@ -645,35 +627,31 @@ msgstr "Teksturering:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr ""
+msgstr "For at aktivere dybdeskabere skal OpenGL-driveren bruges."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-#, fuzzy
 msgid "Tone Mapping"
-msgstr "Mip-mapping"
+msgstr "Toneoversættelse"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold (px)"
-msgstr ""
+msgstr "Føletærskel (px)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
 msgstr "Tri-lineær filtréring"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Leaves"
-msgstr "\"Smarte\" træer"
+msgstr "Bølgende blade"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Plants"
-msgstr "\"Smarte\" træer"
+msgstr "Bølgende planter"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Water"
-msgstr "\"Smarte\" træer"
+msgstr "Bølgende vand"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Yes"
@@ -733,7 +711,7 @@ msgstr "Indlæser teksturer..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr ""
+msgstr "Genbygger dybdeskabere ..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
@@ -761,13 +739,12 @@ msgid "Player name too long."
 msgstr "Spillerens navn er for langt."
 
 #: src/client/clientlauncher.cpp
-#, fuzzy
 msgid "Provided world path doesn't exist: "
-msgstr "Den angivne sti til verdenen findes ikke: "
+msgstr "Angivne sti til verdenen findes ikke: "
 
 #: src/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr ""
+msgstr "kræver_reserve_skrifttype"
 
 #: src/game.cpp
 msgid ""
@@ -794,17 +771,14 @@ msgid "Continue"
 msgstr "Fortsæt"
 
 #: src/game.cpp
-#, fuzzy
 msgid "Creating client..."
-msgstr "Opretter klient..."
+msgstr "Opretter klient ..."
 
 #: src/game.cpp
-#, fuzzy
 msgid "Creating server..."
-msgstr "Opretter server..."
+msgstr "Opretter server ..."
 
 #: src/game.cpp
-#, fuzzy
 msgid ""
 "Default Controls:\n"
 "- WASD: move\n"
@@ -818,7 +792,7 @@ msgid ""
 "- Mouse wheel: select item\n"
 "- T: chat\n"
 msgstr ""
-"Standard-styring:\n"
+"Standardstyring:\n"
 "- WASD: Bevæge sig rundt\n"
 "- Mellemrumstast: Hoppe/klatre\n"
 "- Skift: Snige/gå nedad\n"
@@ -828,10 +802,9 @@ msgstr ""
 "- Mus venstre: Grave/slå\n"
 "- Mus højre: Placere/bruge\n"
 "- Musehjul: Vælge genstand\n"
-"- T: Chat\n"
+"- T: Snakke (chat)\n"
 
 #: src/game.cpp
-#, fuzzy
 msgid ""
 "Default Controls:\n"
 "No menu visible:\n"
@@ -846,7 +819,7 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
-"Standard-styring:\n"
+"Standardstyring:\n"
 "Ingen menu synlig:\n"
 "- Enkelt tryk: Aktivér knap\n"
 "- Dobbelt tryk: Placér/brug\n"
@@ -869,10 +842,9 @@ msgstr "Afslut til operativsystemet"
 
 #: src/game.cpp
 msgid "Item definitions..."
-msgstr ""
+msgstr "Elementdefinitioner ..."
 
 #: src/game.cpp
-#, fuzzy
 msgid "KiB/s"
 msgstr "KiB/s"
 
@@ -881,18 +853,16 @@ msgid "Media..."
 msgstr "Medier..."
 
 #: src/game.cpp
-#, fuzzy
 msgid "MiB/s"
 msgstr "MiB/s"
 
 #: src/game.cpp
-#, fuzzy
 msgid "Node definitions..."
-msgstr "Blokdefinitioner..."
+msgstr "Knudepunktsdefinitioner ..."
 
 #: src/game.cpp
 msgid "Resolving address..."
-msgstr ""
+msgstr "Slår adresse op ..."
 
 #: src/game.cpp
 msgid "Respawn"
@@ -995,9 +965,8 @@ msgid "Sneak"
 msgstr "Snige"
 
 #: src/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle Cinematic"
-msgstr "Omstil hurtig"
+msgstr "Aktiver filmisk"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
@@ -1044,18 +1013,16 @@ msgid "Passwords do not match!"
 msgstr "Kodeordene er ikke ens!"
 
 #: src/guiVolumeChange.cpp
-#, fuzzy
 msgid "Exit"
 msgstr "Afslut"
 
 #: src/guiVolumeChange.cpp
-#, fuzzy
 msgid "Sound Volume: "
 msgstr "Lydstyrke: "
 
 #: src/keycode.cpp
 msgid "Apps"
-msgstr "Apps"
+msgstr "Prg."
 
 #: src/keycode.cpp
 msgid "Attn"
@@ -1066,7 +1033,6 @@ msgid "Back"
 msgstr "Tilbage"
 
 #: src/keycode.cpp
-#, fuzzy
 msgid "Capital"
 msgstr "Store bogstaver"
 
@@ -1315,9 +1281,8 @@ msgid "Sleep"
 msgstr "Sov"
 
 #: src/keycode.cpp
-#, fuzzy
 msgid "Snapshot"
-msgstr "Tilstandsbillede"
+msgstr "Øjebliksbillede"
 
 #: src/keycode.cpp
 msgid "Space"
@@ -1346,21 +1311,25 @@ msgid ""
 "The default is suitable for mandelbrot sets, it needs to be edited for julia "
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
-msgstr " "
+msgstr ""
+"(X,Y,Z)-forskydning for fraktal fra verdencentrum i enheder af »skala«.\n"
+"Brugt til at flytte en egnet udlægning af lavt land tæt på (0, 0).\n"
+"Standarden er egnet til mandelbrot-sæt, skal redigeres for julia-sæt.\n"
+"Interval cirka -2 til 2. Gang med »skala« i knudepunkter."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "0 = parallax occlusion with slope information (faster).\n"
 "1 = relief mapping (slower, more accurate)."
 msgstr ""
+"0 = parallax-okklusion med kurveinformation (hurtigere).\n"
+"1 = relief-oversættelse (langsommere, mere præcis)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D clouds"
-msgstr "3D skyer"
+msgstr "3D-skyer"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode"
 msgstr "3D-tilstand"
 
@@ -1377,51 +1346,57 @@ msgid ""
 msgstr ""
 "Understøttelse af 3D.\n"
 "Understøttet på nuværende tidspunkt:\n"
+"-    none: ingen 3d-udgang.\n"
+"-    anaglyph: cyan/magenta farve 3d.\n"
+"-    interlaced: ulige/lige linjebaseret polarisering for "
+"skærmunderstøttelsen\n"
+"-    topbottom: opdel skærm top/bund.\n"
+"-    sidebyside: opdel skærm side om side.\n"
+"-    pageflip: quadbuffer baseret 3d."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "A chosen map seed for a new map, leave empty for random.\n"
 "Will be overridden when creating a new world in the main menu."
 msgstr ""
+"En valgt kortfødning for et nyt kort, efterlad tom for vilkårlig.\n"
+"Vil blive overskrevet når en ny verden oprettes i hovedmenuen."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "A message to be displayed to all clients when the server crashes."
 msgstr "Besked, som skal vises til alle klienter, når serveren går ned."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "A message to be displayed to all clients when the server shuts down."
 msgstr "Besked, som skal vises til alle klienter, når serveren lukker ned."
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of emerge queues"
-msgstr ""
+msgstr "Absolut begrænsning af fremkomstkøer"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Acceleration in air"
 msgstr "Acceleration i luft"
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Management interval"
-msgstr ""
+msgstr "Aktiv blokhåndteringsinterval"
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifier interval"
-msgstr ""
+msgstr "Aktivt blokændringsinterval"
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
-msgstr ""
+msgstr "Aktive blokændringer"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr ""
+msgstr "Aktiv blokinterval"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
-msgstr ""
+msgstr "Aktivt objektafsendelsesinterval"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1434,12 +1409,11 @@ msgstr ""
 "Bemærk, at adressefeltet i hovedmenuen tilsidesætter denne indstilling."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
-"Justér DPI-konfigurationen til din skærm (ikke-X11 / kun Andorid) f.eks. til "
+"Justér DPI-konfigurationen til din skærm (ikke-X11 / kun Android) f.eks. til "
 "4k-skærme."
 
 #: src/settings_translation_file.cpp
@@ -1447,7 +1421,7 @@ msgid ""
 "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
 "This setting is for the client only and is ignored by the server."
 msgstr ""
-" Et mindre tal betyder lysere.\n"
+"Juster gammakodningen for lystabellerne. Et mindre tal betyder lysere.\n"
 "Denne indstilling gælder kun for klienten og ignoreres af serveren."
 
 #: src/settings_translation_file.cpp
@@ -1456,30 +1430,27 @@ msgstr "Avanceret"
 
 #: src/settings_translation_file.cpp
 msgid "Altitude Chill"
-msgstr ""
+msgstr "Højdekulde"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Always fly and fast"
 msgstr "Flyv altid og hurtigt"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
-msgstr ""
+msgstr "Ambient okklusiongamma"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Amplifies the valleys"
 msgstr "Forstærker dalene"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anisotropic filtering"
-msgstr "Anisotropisk filtréring"
+msgstr "Anisotropisk filtrering"
 
 #: src/settings_translation_file.cpp
 msgid "Announce server"
-msgstr ""
+msgstr "Meddelelsesserver"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1487,33 +1458,33 @@ msgid ""
 "If you want to announce your ipv6 address, use  serverlist_url = v6.servers."
 "minetest.net."
 msgstr ""
+"Meddel på denne serverliste\n"
+"Hvis du ønsker at annoncere din ipv6-adresse, så brug serverlist_url = "
+"v6.servers.minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
-msgstr ""
+msgstr "Omtrentlig (X, Y, Z) fraktalskala i knudepunkter."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ask to reconnect after crash"
-msgstr "Spørg om at forbinde igen, efter den er gået ned."
+msgstr "Spørg om at forbinde igen efter nedbrud"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Automaticaly report to the serverlist."
-msgstr "Rapportér automatisk til serverlisten."
+msgstr "Rapporter automatisk til serverlisten."
 
 #: src/settings_translation_file.cpp
 msgid "Autorun key"
-msgstr ""
+msgstr "Tast til automatisk løb"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Backward key"
-msgstr "Baglæns"
+msgstr "Tilbage-tast"
 
 #: src/settings_translation_file.cpp
 msgid "Base terrain height"
-msgstr ""
+msgstr "Baseterrænhøjde"
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
@@ -1524,26 +1495,24 @@ msgid "Basic Privileges"
 msgstr "Grundlæggende privilegier"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bilinear filtering"
-msgstr "Bi-lineær filtréring"
+msgstr "Bilineær filtrering"
 
 #: src/settings_translation_file.cpp
 msgid "Bind address"
-msgstr ""
+msgstr "Bind adresse"
 
 #: src/settings_translation_file.cpp
 msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr ""
+msgstr "Bit per billedpunkt (a.k.a. farvedybde) i fuldskærmtilstand."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Build inside player"
-msgstr "Flerspiller"
+msgstr "Byg intern spiller"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "Indbygget"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1556,19 +1525,19 @@ msgstr "Kameraudjævning"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
-msgstr ""
+msgstr "Kameraudjævning i biograftilstand"
 
 #: src/settings_translation_file.cpp
 msgid "Camera update toggle key"
-msgstr ""
+msgstr "Tast til ændring af kameraopdatering"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #1"
-msgstr ""
+msgstr "Hulestøj #1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #2"
-msgstr ""
+msgstr "Hulestøj #2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
@@ -1576,22 +1545,19 @@ msgstr "Grottebredde"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
-msgstr ""
+msgstr "Huler og tunneler dannes ved skæringspunktet for de to støjkilder"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat key"
-msgstr "Skift bindinger"
+msgstr "Snakketast"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat toggle key"
-msgstr "Skift bindinger"
+msgstr "Tast for snak (chat)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Kommando"
+msgstr "Snakkekommandoer"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1615,24 +1581,41 @@ msgid ""
 "17 = 4D \"Mandelbulb\" mandelbrot set.\n"
 "18 = 4D \"Mandelbulb\" julia set."
 msgstr ""
+"Valg af 18 fraktaler fra 9 formler.\n"
+"1 = 4D »Roundy« mandelbrot-sæt.\n"
+"2 = 4D »Roundy« julia-sæt.\n"
+"3 = 4D »Squarry« mandelbrot-sæt.\n"
+"4 = 4D »Squarry\" julia-sæt.\n"
+"5 = 4D »Mandy Cousin« mandelbrot-sæt.\n"
+"6 = 4D »Mandy Cousin« julia-sæt.\n"
+"7 = 4D »Variation« mandelbrot-sæt.\n"
+"8 = 4D »Variation« julia-sæt.\n"
+"9 = 3D »Mandelbrot/Mandelbar« mandelbrot-sæt.\n"
+"10 = 3D »Mandelbrot/Mandelbar« julia-sæt.\n"
+"11 = 3D »Christmas Tree« mandelbrot-sæt.\n"
+"12 = 3D »Christmas Tree« julia-sæt.\n"
+"13 = 3D »Mandelbulb« mandelbrot-sæt.\n"
+"14 = 3D »Mandelbulb« julia-sæt.\n"
+"15 = 3D »Cosine Mandelbulb« mandelbrot-sæt.\n"
+"16 = 3D »Cosine Mandelbulb« julia-sæt.\n"
+"17 = 4D »Mandelbulb« mandelbrot-sæt.\n"
+"18 = 4D »Mandelbulb« julia-sæt."
 
 #: src/settings_translation_file.cpp
 msgid "Chunk size"
-msgstr ""
+msgstr "Klumpstørrelse"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cinematic mode"
-msgstr "Kreativ tilstand"
+msgstr "Filmisk tilstand"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cinematic mode key"
-msgstr "Kreativ tilstand"
+msgstr "Tast for filmisk tilstand"
 
 #: src/settings_translation_file.cpp
 msgid "Clean transparent textures"
-msgstr ""
+msgstr "Rene gennemsigtige teksturer"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
@@ -1656,12 +1639,11 @@ msgstr "Skyer"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client side effect."
-msgstr ""
+msgstr "Skyer er en klientsideeffekt."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clouds in menu"
-msgstr "Hovedmenu"
+msgstr "Skyer i menu"
 
 #: src/settings_translation_file.cpp
 msgid "Colored fog"
@@ -1672,22 +1654,27 @@ msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"Kommaadskilt liste af mod'er som har tilladelse til at tilgå HTTP API'er, "
+"som\n"
+"tillader dem at hente og overføre data fra internettet."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
+"Kommaadskil liste over troværdige mod'er som har tilladelse til at tilgå "
+"usikre\n"
+"funktioner selv når mod-sikkerhed er aktiveret (via "
+"request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Command key"
-msgstr "Kommando"
+msgstr "Kommandotast"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Connect glass"
-msgstr "Forbind"
+msgstr "Forbind glas"
 
 #: src/settings_translation_file.cpp
 msgid "Connect to external media server"
@@ -1695,22 +1682,19 @@ msgstr "Opret forbindelse til ekstern medieserver"
 
 #: src/settings_translation_file.cpp
 msgid "Connects glass if supported by node."
-msgstr ""
+msgstr "Forbinder glass hvis understøttet af knudepunkt."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Console alpha"
-msgstr "Konsol"
+msgstr "Konsolalfa"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Console color"
-msgstr "Konsol"
+msgstr "Konsolfarve"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Console key"
-msgstr "Konsol"
+msgstr "Konsoltast"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward"
@@ -1721,9 +1705,8 @@ msgid "Continuous forward movement (only used for testing)."
 msgstr "Kontinuerlig bevægelse fremad (bruges kun til test)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Controls"
-msgstr "Control"
+msgstr "Styring"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1740,10 +1723,12 @@ msgid ""
 "Controls size of deserts and beaches in Mapgen v6.\n"
 "When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
 msgstr ""
+"Kontroller størrelse for ørkener og strande i Mapgen v6.\n"
+"Når snebiomer er aktiveret ignoreres »mgv6_freq_desert«."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
-msgstr ""
+msgstr "Kontrollerer hældning/dybe for sødybder."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/height of hills."
@@ -1768,22 +1753,24 @@ msgid ""
 "Creates unpredictable water features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
+"Opretter uforudsigelige vandfunktioner i huler.\n"
+"Disse kan gøre vanskeliggøre minedrift. Nul deaktiverer dem (0-10)"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
-msgstr ""
+msgstr "Crosshair alpha"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr ""
+msgstr "Crosshair alpha (uigennemsigtighed, mellem 0 og 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
-msgstr ""
+msgstr "Crosshair-farve"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color (R,G,B)."
-msgstr ""
+msgstr "Crosshair-farve (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Crouch speed"
@@ -1794,21 +1781,20 @@ msgid "DPI"
 msgstr "DPI"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Damage"
-msgstr "Aktivér skade"
+msgstr "Skade"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
-msgstr ""
+msgstr "Tast til aktivering af fejlsøgningsinfo"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log level"
-msgstr ""
+msgstr "Logniveau for fejlsøgning"
 
 #: src/settings_translation_file.cpp
 msgid "Dedicated server step"
-msgstr ""
+msgstr "Dedikeret server-trin"
 
 #: src/settings_translation_file.cpp
 msgid "Default acceleration"
@@ -1825,9 +1811,8 @@ msgid ""
 msgstr "Standard spil, når du skaber en ny verden."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default password"
-msgstr "Nyt kodeord"
+msgstr "Standardadgangskode"
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
@@ -1835,57 +1820,64 @@ msgstr "Standardprivilegier"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Standardformat for rapport"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
 "Only has an effect if compiled with cURL."
 msgstr ""
+"Standardtidsudløb for cURL, angivet i millisekunder.\n"
+"Har kun effekt hvis kompileret med cURL."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Defines sampling step of texture.\n"
 "A higher value results in smoother normal maps."
 msgstr ""
+"Definerer sampling-trin for tekstur.\n"
+"En højere værdi resulterer i en mere rullende normale kort."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
+"Definerer den maksimale spillerflytningsafstand i blokke (0 = ubegrænset)."
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Forsinkelse i afsendelse af blokke efter bygning"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
+msgstr "Forsinkelse ved visning af værktøjsfif, angivet i millisekunder."
 
 #: src/settings_translation_file.cpp
 msgid "Deprecated Lua API handling"
-msgstr ""
+msgstr "Forældet Lua API-håndtering"
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find large caves."
-msgstr ""
+msgstr "Dybde hvorunder du kan finde store huler."
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find massive caves."
-msgstr ""
+msgstr "Dybde hvorunder du finder kæmpestore huler."
 
 #: src/settings_translation_file.cpp
 msgid "Descending speed"
-msgstr ""
+msgstr "Faldende hastighed"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
 msgstr ""
+"Beskrivelse af server, som vises når spillere tilslutter sig og i "
+"serverlisten."
 
 #: src/settings_translation_file.cpp
 msgid "Desynchronize block animation"
-msgstr ""
+msgstr "Afsynkroniser blokanimation"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1893,15 +1885,17 @@ msgid ""
 "The 3 numbers in brackets control the scale of the\n"
 "terrain, the 3 numbers should be identical."
 msgstr ""
+"Bestemmer terrænform.\n"
+"De tre tal i parenteser kontrollerer skalaen for\n"
+"terrænet, de tre tal skal være identiske."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Disable anticheat"
-msgstr "Aktivér partikler"
+msgstr "Deaktiver antisnyd"
 
 #: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Deaktiver undvigesekvenser"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1910,6 +1904,10 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"Deaktiver undvigesekvenser, f.eks. snak-farvelægning.\n"
+"Brug denne hvis du ønsker at afvikle en server med pre-0.4.14-klienter og du "
+"ønsker\n"
+"at deaktivere undvigesekvenserne oprettet af mod'er."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
@@ -1917,56 +1915,51 @@ msgstr "Tillad ikke tomme adgangskoder"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "Domænenavn for server, til visning i serverlisten."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Double tap jump for fly"
-msgstr ""
-"Tryk på \"hop\" hurtigt to gange for at skifte frem og tilbage mellem flyve-"
-"tilstand"
+msgstr "Tryk to gange på »hop« for at flyve"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Double-tapping the jump key toggles fly mode."
-msgstr ""
-"Tryk på \"hop\" hurtigt to gange for at skifte frem og tilbage mellem flyve-"
-"tilstand"
+msgstr "Tryk på »hop« to gange for at skifte frem og tilbage fra flyvetilstand."
 
 #: src/settings_translation_file.cpp
 msgid "Drop item key"
-msgstr ""
+msgstr "Drop element-tast"
 
 #: src/settings_translation_file.cpp
 msgid "Dump the mapgen debug infos."
-msgstr ""
+msgstr "Dump mapgen-fejlsøgningsinfo."
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
 msgstr "Aktivér joysticks"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable VBO"
-msgstr "Aktivér MP"
+msgstr "Aktiver VBO"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod security"
-msgstr ""
+msgstr "Aktiver mod-sikkerhed"
 
 #: src/settings_translation_file.cpp
 msgid "Enable players getting damage and dying."
-msgstr ""
+msgstr "Aktiver at spillere kan skades og dø."
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
-msgstr ""
+msgstr "Aktiver vilkårlig brugerinddata (kun til test)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable smooth lighting with simple ambient occlusion.\n"
 "Disable for speed or for different looks."
 msgstr ""
+"Aktiver blød lyssætning med simpel ambient okklusion.\n"
+"Deaktiver for hastighed eller for anderledes udseender."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1976,6 +1969,10 @@ msgid ""
 "to new servers, but they may not support all new features that you are "
 "expecting."
 msgstr ""
+"Aktiver for at nægte gamle klienter i at forbinde.\n"
+"Ældre klienter er kompatible på den måde, at de ikke vil stoppe ved "
+"tilkobling\n"
+"til nye servere, men de understøtter ikke alle nye funktioner."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1984,6 +1981,10 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
+"Aktiver brug af ekstern medieserver (hvis tilbudt af server).\n"
+"Eksterne servere tilbyder en signifikant hurtigere måde at hente medier ("
+"f.eks. teksturer\n"
+"ved forbindelse til serveren."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1991,10 +1992,14 @@ msgid ""
 "to IPv6 clients, depending on system configuration.\n"
 "Ignored if bind_address is set."
 msgstr ""
+"Aktivere/deaktivere afvikling af en IPv6-server. En IPv6-server kan være "
+"begrænset\n"
+"til IPv6-klienter, afhængig af systemkonfiguration.\n"
+"Ignoreret hvis bind_address er angivet."
 
 #: src/settings_translation_file.cpp
 msgid "Enables animation of inventory items."
-msgstr ""
+msgstr "Aktiverer animation af lagerelementer."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2003,50 +2008,58 @@ msgid ""
 "or need to be auto-generated.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Aktiverer bumpmapping for teksturer. Normalmaps skal være angivet af "
+"teksturpakken\n"
+"eller skal være automatisk oprettet.\n"
+"Kræver at dybdeskabere er aktiveret."
 
 #: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
-msgstr ""
+msgstr "Aktiverer mellemlagring af facedir-roterede mesher."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enables filmic tone mapping"
-msgstr "Aktivér skade"
+msgstr "Aktiverer filmisk toneoversættelse"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enables minimap."
-msgstr "Aktivér skade"
+msgstr "Aktiverer minikort."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables on the fly normalmap generation (Emboss effect).\n"
 "Requires bumpmapping to be enabled."
 msgstr ""
+"Aktiverer løbende normalmap-oprettelse (Emboss-effekt).\n"
+"Kræver bumpmapping for at være aktiveret."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables parallax occlusion mapping.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Aktiverer parallax-okklusionoversættelse.\n"
+"Kræver at dybdeskabere er aktiveret."
 
 #: src/settings_translation_file.cpp
 msgid "Engine profiling data print interval"
-msgstr ""
+msgstr "Udskrivningsinterval for motorprofileringsdata"
 
 #: src/settings_translation_file.cpp
 msgid "Entity methods"
-msgstr ""
+msgstr "Entitetmetoder"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
 "when set to higher number than 0."
 msgstr ""
+"Eksperimentelt tilvalg, kan medføre synlige mellemrum mellem blokke\n"
+"når angivet til et højere nummer end 0."
 
 #: src/settings_translation_file.cpp
 msgid "FPS in pause menu"
-msgstr ""
+msgstr "FPS i pausemenu"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -2054,23 +2067,23 @@ msgstr "FSAA"
 
 #: src/settings_translation_file.cpp
 msgid "Fall bobbing"
-msgstr ""
+msgstr "Faldrystelse"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font"
-msgstr ""
+msgstr "Reserveskrifttype"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow"
-msgstr ""
+msgstr "Skygge for reserveskrifttypen"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow alpha"
-msgstr ""
+msgstr "Skyggealfa for reserveskrifttypen"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font size"
-msgstr ""
+msgstr "Størrelse for reserveskrifttypen"
 
 #: src/settings_translation_file.cpp
 msgid "Fast key"
@@ -2078,53 +2091,59 @@ msgstr "Hurtigtast"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode acceleration"
-msgstr ""
+msgstr "Hurtig tilstandsacceleration"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode speed"
-msgstr ""
+msgstr "Hurtig tilstandshastighed"
 
 #: src/settings_translation_file.cpp
 msgid "Fast movement"
-msgstr ""
+msgstr "Hurtig bevægelse"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Fast movement (via use key).\n"
 "This requires the \"fast\" privilege on the server."
 msgstr ""
+"Hurtig bevægelse (via tast).\n"
+"Dette kræver privilegiet »fast« på serveren."
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
-msgstr ""
+msgstr "Visningsområde"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view for zoom"
-msgstr ""
+msgstr "Zoom for visningsområde"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
-msgstr ""
+msgstr "Visningsområde i grader."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
+"Visningsområde under zoom i grader.\n"
+"Dette kræver privilegiet »zoom« på serveren."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
 "the Multiplayer Tab."
 msgstr ""
+"Fil i client/serverlist/ som indeholder dine favoritservere vist i "
+"fanebladet for flere spillere."
 
 #: src/settings_translation_file.cpp
 msgid "Filler Depth"
-msgstr ""
+msgstr "Fyldstofdybde"
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
-msgstr ""
+msgstr "Filmisk toneoversættelse"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2133,15 +2152,20 @@ msgid ""
 "light edge to transparent textures.  Apply this filter to clean that up\n"
 "at texture load time."
 msgstr ""
+"Filtrerede teksturer kan blande RGB-værdier med fuldt gennemsigtige naboer,\n"
+"som PNG-optimeringsprogrammer normalt fjerner, undertiden resulterende i en "
+"\n"
+"mørk eller lys kant  for gennemsigtige teksturer. Anvend dette filter for at "
+"rydde\n"
+"op i dette på indlæsningstidspunktet for tekstur."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filtering"
-msgstr "Anisotropisk filtréring"
+msgstr "Filtrering"
 
 #: src/settings_translation_file.cpp
 msgid "Fixed map seed"
-msgstr ""
+msgstr "Fast kortfødning"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
@@ -2157,7 +2181,7 @@ msgstr "Tåge"
 
 #: src/settings_translation_file.cpp
 msgid "Fog toggle key"
-msgstr ""
+msgstr "Tast for tåge"
 
 #: src/settings_translation_file.cpp
 msgid "Font path"
@@ -2169,15 +2193,16 @@ msgstr "Fontskygge"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha"
-msgstr ""
+msgstr "Alfa for skrifttypeskygge"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha (opaqueness, between 0 and 255)."
-msgstr ""
+msgstr "Alfa for skrifttypeskygge (uigennemsigtighed, mellem 0 og 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow offset, if 0 then shadow will not be drawn."
 msgstr ""
+"Forskydning for skrifttypeskygge, hvis 0 så vil skygge ikke blive tegnet."
 
 #: src/settings_translation_file.cpp
 msgid "Font size"
@@ -2185,32 +2210,37 @@ msgstr "Skriftstørrelse"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
-msgstr ""
+msgstr "Format for skærmbilleder."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Forward key"
-msgstr "Fremad"
+msgstr "Fremadtast"
 
 #: src/settings_translation_file.cpp
 msgid "Freetype fonts"
-msgstr ""
+msgstr "Freetype-skrifttyper"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far blocks are generated for clients, stated in mapblocks (16 "
 "nodes)."
 msgstr ""
+"Fra hvor langt væk blokke oprettes for klienten, angivet i kortblokke (16 "
+"knudepunkter)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
+"Fra hvor langt væk blokke sendes til klienter, angivet i kortblokke (16 "
+"knudepunker)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far clients know about objects, stated in mapblocks (16 nodes)."
 msgstr ""
+"Fra hvor langt væk klinter ved om objekter, angivet i kortblokke (16 "
+"knudepunkter)."
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
@@ -2218,7 +2248,7 @@ msgstr "Fuld skærm"
 
 #: src/settings_translation_file.cpp
 msgid "Full screen BPP"
-msgstr ""
+msgstr "Fuldskærm BPP"
 
 #: src/settings_translation_file.cpp
 msgid "Fullscreen mode."
@@ -2230,11 +2260,11 @@ msgstr "Skalering af grafisk brugerflade"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter"
-msgstr ""
+msgstr "GUI-skaleringsfilter"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter txr2img"
-msgstr ""
+msgstr "GUI-skaleringsfilter txr2img"
 
 #: src/settings_translation_file.cpp
 msgid "Gamma"
@@ -2246,11 +2276,11 @@ msgstr "Generelt"
 
 #: src/settings_translation_file.cpp
 msgid "Generate normalmaps"
-msgstr ""
+msgstr "Opret normalkort"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
-msgstr ""
+msgstr "Globale tilbagekald"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2261,6 +2291,13 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Globale kortoprettelsesattributter.\n"
+"I Mapgen v6 kontrollerer flaget »decorations« alle dekorationer undtagen "
+"træer\n"
+"og junglegræs, i alle andre mapgen'er kontrollerer dette flag alle "
+"dekorationer.\n"
+"Flag som ikke er angivet i flagstrengen ændres ikke fra standarden.\n"
+"Flag startende med »no« (nej) bruges til eksplicit at deaktivere dem."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
@@ -2271,13 +2308,12 @@ msgid "Gravity"
 msgstr "Tyngdekraft"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HTTP Mods"
-msgstr "Mods"
+msgstr "HTTP-Mod'er"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
-msgstr ""
+msgstr "Tast for HUD"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2286,6 +2322,11 @@ msgid ""
 "-    log: mimic and log backtrace of deprecated call (default for debug).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
+"Håndtering for forældede lua api-kald:\n"
+"-    legacy: (prøv at) efterligne gammel opførsel (standard for udgivelse).\n"
+"-    log: efterlign og log tilbagesporing for forældede kald (standard for "
+"fejlsøgning).\n"
+"-    error: afbryd ved brug af forældede kald (foreslået af mod-udviklere)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2295,26 +2336,31 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
+"Få profilprogrammet til at instruere sig selv:\n"
+"* Instruer en tom funktion.\n"
+"Dette estimerer belastningen, som instrumenteringen tilføjer (+1 "
+"funktionkald).\n"
+"* Instruer sampleren i brug til at opdatere statistikken."
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
-msgstr ""
+msgstr "Højdekomponent for den oprindelige vinduestørrelse."
 
 #: src/settings_translation_file.cpp
 msgid "Height on which clouds are appearing."
-msgstr ""
+msgstr "Højde hvor skyer fremkommer."
 
 #: src/settings_translation_file.cpp
 msgid "High-precision FPU"
-msgstr ""
+msgstr "Højpræcisions FPU"
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "Hjemmeside for serveren, som vist i serverlisten."
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers"
-msgstr ""
+msgstr "Dybde for floder"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2322,16 +2368,21 @@ msgid ""
 "mapblocks (16 nodes).\n"
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
+"Hvordan store områder af blokke påvirkes af det aktive blokindhold, angivet "
+"i mapblocks (16 knudepunkter).\n"
+"I aktive blokke bliver objekter indlæst og ABM'er afviklet."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
 "Higher value is smoother, but will use more RAM."
 msgstr ""
+"Hvor lang tid serveren vil vente før ubrugt kortblokke fjernes.\n"
+"Højere værdier er længere tid, men vil bruge mere RAM."
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers"
-msgstr ""
+msgstr "Hvor brede floder skal være"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
@@ -2350,12 +2401,16 @@ msgid ""
 "If FPS would go higher than this, limit it by sleeping\n"
 "to not waste CPU power for no benefit."
 msgstr ""
+"Hvis FPS skal være højere end dette, så begræns ved at sove\n"
+"for ikke at spilde CPU-kraft uden nogen fordel."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If disabled \"use\" key is used to fly fast if both fly and fast mode are "
 "enabled."
 msgstr ""
+"Hvis deaktiveret bruges »brug«-tasten til at flyve hurtig hvis både flyvning "
+"og hurtig tilstand er aktiveret."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2363,32 +2418,43 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
+"Hvis aktiveret sammen med fly-tilstand, kan spilleren flyve igennem faste "
+"knudepunkter.\n"
+"Dette kræver privilegiet »noclip« på serveren."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
 "and descending."
 msgstr ""
+"Hvis aktiveret bruges »brug«-tasten i stedet for »snig«-tasten til at klatre "
+"ned og aftagende."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
 msgstr ""
+"Hvis aktiveret, optages handlinger for tilbagerulning.\n"
+"Dette tilvalg læses kun når serveren starter."
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, disable cheat prevention in multiplayer."
 msgstr ""
+"Hvis aktiveret så deaktiver forhindring af snyd i spil med flere deltagere."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, invalid world data won't cause the server to shut down.\n"
 "Only enable this if you know what you are doing."
 msgstr ""
+"Hvis aktiveret, så vil ugyldige data ikke medføre at serveren lukke ned.\n"
+"Aktiver kun hvis du ved hvad du gør."
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, new players cannot join with an empty password."
 msgstr ""
+"Hvis aktiveret kan nye spillere ikke slutte sig til uden en tom adgangskode."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2396,78 +2462,87 @@ msgid ""
 "you stand.\n"
 "This is helpful when working with nodeboxes in small areas."
 msgstr ""
+"Hvis aktiveret så kan du placere blokke ved positionen (fod + øje niveau) "
+"hvor du står.\n"
+"Dette er nyttigt under arbejde med knudepunktbokse i små områder."
 
 #: src/settings_translation_file.cpp
 msgid "If this is set, players will always (re)spawn at the given position."
 msgstr ""
+"Hvis aktiveret, så vil spillere altid (gen)starte ved den angivne position."
 
 #: src/settings_translation_file.cpp
 msgid "Ignore world errors"
-msgstr ""
+msgstr "Ignorer verdensfejl"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "In-Game"
-msgstr "Spil"
+msgstr "I-spil"
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
 msgstr ""
+"Baggrundsalfa for snakkekonsollen i spillet (uigennemsigtighed, mellem 0 og "
+"255)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background color (R,G,B)."
-msgstr ""
+msgstr "Baggrundsfarve for snakkekonsollen i spillet (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
+"Instrumenteringsindbygning.\n"
+"Er normalt kun krævet af kerne/indbygningsbidragydere"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument chatcommands on registration."
-msgstr ""
+msgstr "Udstyr chatkommandoer ved registrering."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
+"Udstyr globale tilbagekaldsfunktioner ved registrering.\n"
+"(alt du sender til en minetest.register_*()-funktion)"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
-msgstr ""
+msgstr "Udstyr handlingsfunktionen for Aktiv blokændringer ved registrering."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
 msgstr ""
+"Udstyr handlingsfunktionen for Indlæsning af blokændringer ved registrering."
 
 #: src/settings_translation_file.cpp
 msgid "Instrument the methods of entities on registration."
-msgstr ""
+msgstr "Udstyr metoderne for enheder ved registrering."
 
 #: src/settings_translation_file.cpp
 msgid "Instrumentation"
-msgstr ""
+msgstr "Instrumentering"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
-msgstr ""
+msgstr "Interval for lagring af vigtige ændringer i verden, angivet i sekunder."
 
 #: src/settings_translation_file.cpp
 msgid "Interval of sending time of day to clients."
-msgstr ""
+msgstr "Interval for afsendelse af tidspunkt på dagen til klienter."
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
-msgstr ""
+msgstr "Animationer for lagerelementer"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Inventory key"
-msgstr "Beholdning"
+msgstr "Lagertast"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
@@ -2475,25 +2550,27 @@ msgstr "Invertér mus"
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
-msgstr ""
+msgstr "Vend lodret musebevægelse om."
 
 #: src/settings_translation_file.cpp
 msgid "Item entity TTL"
-msgstr ""
+msgstr "Elemententitet TTL"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Iterations of the recursive function.\n"
 "Controls the amount of fine detail."
 msgstr ""
+"Gennemløb for den rekursive funktion.\n"
+"Kontrollerer mængden af små detaljer."
 
 #: src/settings_translation_file.cpp
 msgid "Joystick button repetition interval"
-msgstr ""
+msgstr "Joystick-knaps gentagelsesinterval"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
-msgstr ""
+msgstr "Joystick frustum-sensitivitet"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2502,6 +2579,10 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Kun Juliasæt: W-komponent for hyperkompleks konstant der bestemmer Juliaform."
+"\n"
+"Har ingen effekt på 3D-fraktaler.\n"
+"Interval cirka -2 til 2."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2509,6 +2590,9 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Kun Juliasæt: X-komponent for hyperkompleks konstant der bestemmer Juliaform."
+"\n"
+"Interval cirka -2 til 2."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2516,6 +2600,9 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Kun Juliasæt: Y-komponent for hyperkompleks konstant der bestemmer Juliaform."
+"\n"
+"Interval cirka -2 til 2."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2523,11 +2610,13 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Kun Juliasæt: Z-komponent for hyperkompleks konstant der bestemmer Juliaform."
+"\n"
+"Interval cirka -2 til 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Jump key"
-msgstr "Hop"
+msgstr "Hop-tast"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
@@ -2539,6 +2628,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast for mindskning af den sete afstand.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2546,6 +2638,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast som smider det nuværende valgte element.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2553,6 +2648,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast for øgning af den sete afstand.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2560,6 +2658,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast for hop.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2567,6 +2668,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at bevæge sig hurtigt i tilstanden hurtig.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2574,6 +2678,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at bevæge spilleren baglæns.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2581,6 +2688,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at bevæge spilleren fremad.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2588,6 +2698,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at bevæge spilleren mod venstre.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2595,6 +2708,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at bevæge spilleren mod højre.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2602,6 +2718,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at åbne snakkekonsollen (chat).\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2609,6 +2728,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at åbne snakkevinduet for at indtaste kommandoer.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2616,6 +2738,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at åbne snakkevinduet (chat).\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2623,6 +2748,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at åbne lageret.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2630,6 +2758,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at udskrive fejlsøgningsstakke. Brugt til udvikling.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2639,6 +2770,11 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til snigning.\n"
+"Bruges også til at klatre ned og synke ned i vand hvis aux1_descends er "
+"deaktiveret.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2646,6 +2782,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte mellem første- og tredjepersons kamera.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2653,6 +2792,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at lave skærmbilleder.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2660,6 +2802,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte til automatisk løb.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2667,6 +2812,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte til biograftilstand.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2674,6 +2822,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte til visning af minikort.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2681,6 +2832,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte til hurtig tilstand.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2688,6 +2842,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte til flyvning.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2695,6 +2852,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte til noclip-tilstand.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2702,6 +2862,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast for at skifte kameraopdateringen. Bruges kun til udvikling\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2709,6 +2872,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte til visning af fejlsøgningsinformation.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2716,6 +2882,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til skift af visningen for HUD'en.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2723,6 +2892,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte visningen af snakken (chat).\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2730,6 +2902,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte visningen af tåge.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2737,6 +2912,10 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte visningen af profileringsprogrammet. Brugt til udvikling."
+"\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2744,10 +2923,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tast til at skifte til ubegrænset se-afstand.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
-msgstr ""
+msgstr "Tast brugt til at klatre op/ned"
 
 #: src/settings_translation_file.cpp
 msgid "Language"
@@ -2755,11 +2937,11 @@ msgstr "Sprog"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
-msgstr ""
+msgstr "Dybde for stor hule"
 
 #: src/settings_translation_file.cpp
 msgid "Lava Features"
-msgstr ""
+msgstr "Lavafunktioner"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
@@ -2772,25 +2954,30 @@ msgid ""
 "-   Simple: only outer faces, if defined special_tiles are used\n"
 "-   Opaque: disable transparency"
 msgstr ""
+"Bladstil:\n"
+"-   Fancy:  alle sider synlige\n"
+"-   Simple: kun ydre sider, hvis defineret special_tiles anvendes\n"
+"-   Opaque: deaktiver gennemsigtighed"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Left key"
-msgstr "Venstre Menu"
+msgstr "Venstretast"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Length of a server tick and the interval at which objects are generally "
 "updated over network."
 msgstr ""
+"Længde på serveraktivering og intervallet som objekter opdateres efter over "
+"netværket."
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between ABM execution cycles"
-msgstr ""
+msgstr "Tidslængde mellem ABM-kørselscyklusser"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between NodeTimer execution cycles"
-msgstr ""
+msgstr "Tidslængde mellem NodeTimer-kørselscyklusser"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2803,14 +2990,22 @@ msgid ""
 "-    info\n"
 "-    verbose"
 msgstr ""
+"Niveau for logning der skrives til debug.txt:\n"
+"-    <nothing> (ingen logning)\n"
+"-    none (beskeder uden niveau)\n"
+"-    error\n"
+"-    warning\n"
+"-    action\n"
+"-    info\n"
+"-    verbose"
 
 #: src/settings_translation_file.cpp
 msgid "Limit of emerge queues on disk"
-msgstr ""
+msgstr "Begrænsning af fremkomsten af forespørgsler på disk"
 
 #: src/settings_translation_file.cpp
 msgid "Limit of emerge queues to generate"
-msgstr ""
+msgstr "Begrænsning af fremkomsten af køer at oprette"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2820,38 +3015,43 @@ msgid ""
 "-    Downloads performed by main menu (e.g. mod manager).\n"
 "Only has an effect if compiled with cURL."
 msgstr ""
+"Begrænser antallet af parallelle HTTP-forespørgsler. Påvirker:\n"
+"-    Medioverførsel hvis serveren bruger indstillingen remote_media.\n"
+"-    Serverlist-overførsel og serverbesked.\n"
+"-    Overførsler udført af hovedmenuen (f.eks. mod-håndtering).\n"
+"Har kun en effekt hvis kompileret med cURL."
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity"
-msgstr ""
+msgstr "Væskes evne til at flyde"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity smoothing"
-msgstr ""
+msgstr "Blødgøring af væskes evne til at flyde"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid loop max"
-msgstr ""
+msgstr "Væske loop maks."
 
 #: src/settings_translation_file.cpp
 msgid "Liquid queue purge time"
-msgstr ""
+msgstr "Køfjernelsestid for væske"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid sink"
-msgstr ""
+msgstr "Synkehastighed for væske"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid update interval in seconds."
-msgstr ""
+msgstr "Væskeopdateringsinterval i sekunder."
 
 #: src/settings_translation_file.cpp
 msgid "Liquid update tick"
-msgstr ""
+msgstr "Væskeopdateringsudløsning"
 
 #: src/settings_translation_file.cpp
 msgid "Load the game profiler"
-msgstr ""
+msgstr "Indlæs spilprofileringsprogrammet"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2859,37 +3059,41 @@ msgid ""
 "Provides a /profiler command to access the compiled profile.\n"
 "Useful for mod developers and server operators."
 msgstr ""
+"Indlæs spilprofileringsprogrammet for at indsamle profileringsdata.\n"
+"Tilbyder en kommando /profiler til at tilgå den indsamlede profil.\n"
+"Nyttig for mod-udviklere og serveroperatører."
 
 #: src/settings_translation_file.cpp
 msgid "Loading Block Modifiers"
-msgstr ""
+msgstr "Indlæser blokændringer"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
-msgstr ""
+msgstr "Hovedmenus spilhåndtering"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Main menu mod manager"
-msgstr "Hovedmenu"
+msgstr "Hovedmenus mod-håndtering"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Main menu script"
-msgstr "Hovedmenu"
+msgstr "Hovedmenuskript"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
+"Tåge- og himmelfarver afhænger af tid på dagen (solopgang/solnedgang) og den "
+"sete retning."
 
 #: src/settings_translation_file.cpp
 msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 msgstr ""
+"Får DirectX til at fungere med LuaJIT. Deaktiver hvis det giver problemer."
 
 #: src/settings_translation_file.cpp
 msgid "Map directory"
-msgstr ""
+msgstr "Kortmappe"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2903,6 +3107,14 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Kortoprettelsesattributer specifik for Mapgen Valleys.\n"
+"»altitude_chill« gør højere områder koldere, hvilket kan medføre "
+"habitatproblemstillinger.\n"
+"»humid_rivers« ændrer fugtighed omkring floder og i områder hvor vand har "
+"tendens til at samle sig,\n"
+"det kan influere med ømtålelige habitatter.\n"
+"Flag som ikke er specificeret i flag-strengen ændres ikke fra standarden.\n"
+"Flag der starter med »no« bruges til eksplicit at deaktivere dem."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2912,6 +3124,10 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Kortoprettelsesattributter specifikke for Mapgen flat.\n"
+"Undtagelsesvis kan søer og bakker tilføjes til den flade verden.\n"
+"Flag som ikke er specificeret i flag-strengen ændres ikke fra standarden.\n"
+"Flag der starter med »no« bruges til eksplicit at deaktivere dem."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2922,6 +3138,11 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Kortoprettelsesattributter specifikke for Mapgen v6.\n"
+"Når snehabitatter er aktiveret bliver jungler automatisk aktiveret, flaget "
+"»jungles« ignoreres.\n"
+"Flag som ikke er specificeret i flag-strengen ændres ikke fra standarden.\n"
+"Flag der starter med »no« bruges til eksplicit at deaktivere dem."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2931,110 +3152,110 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Kortoprettelsesattributter specifikek til Mapgen v7.\n"
+"Flaget »ridges« kontroller floderne.\n"
+"Flag som ikke er specificeret i flag-strengen ændres ikke fra standarden.\n"
+"Flag der starter med »no« bruges til eksplicit at deaktivere dem."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
-msgstr ""
+msgstr "Kortoprettelsesbegrænsning"
 
 #: src/settings_translation_file.cpp
 msgid "Map save interval"
-msgstr ""
+msgstr "Interval for kortlagring"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
-msgstr ""
+msgstr "Kortblokbegrænsning"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
-msgstr ""
+msgstr "Tidsudløb for kortblokfjernelse"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Valleys"
-msgstr "Mapgen"
+msgstr "Mapgen-daler"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome heat noise parameters"
-msgstr ""
+msgstr "Støjparametre til biotopvarme for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome humidity blend noise parameters"
-msgstr ""
+msgstr "Støjparametre til biotopfugtighedsblanding for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome humidity noise parameters"
-msgstr ""
+msgstr "Støjparametre for biotopfugtighed for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"
-msgstr ""
+msgstr "Fejlsøgning for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "Flag for Mapgen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat"
-msgstr "Mapgen"
+msgstr "Mapgen-flad"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave width"
-msgstr "Mapgen"
+msgstr "Mapgen - flad hulebredde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave1 noise parameters"
-msgstr ""
+msgstr "Støjparametre til flade cave1 for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave2 noise parameters"
-msgstr ""
+msgstr "Støjparametre til flade cave2 for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat filler depth noise parameters"
-msgstr ""
+msgstr "Mapgen - støjparametre for flad fyldstofdybde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat flags"
-msgstr ""
+msgstr "Flade flag for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat ground level"
-msgstr ""
+msgstr "Flade grundniveauer for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill steepness"
-msgstr ""
+msgstr "Flad bakkestejlhed for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill threshold"
-msgstr ""
+msgstr "Flad bakketærskel for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat lake steepness"
-msgstr ""
+msgstr "Flad søstejlhed for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat lake threshold"
-msgstr ""
+msgstr "Flad søtærskel for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat large cave depth"
-msgstr ""
+msgstr "Flad stor hule-dybde for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat terrain noise parameters"
-msgstr ""
+msgstr "Støjparametre til flad terræn for Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal"
-msgstr ""
+msgstr "Fraktral for Mapgen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal cave width"
-msgstr "Mapgen"
+msgstr "Mapgen - fraktal hulebredde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave1 noise parameters"
@@ -3046,7 +3267,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal filler depth noise parameters"
-msgstr ""
+msgstr "Mapgen - støjparametre for fraktal fyldstofdybde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal fractal"
@@ -3118,7 +3339,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 filler depth noise parameters"
-msgstr ""
+msgstr "Mapgen v5 - støjparametre for fyldstofdybde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 height noise parameters"
@@ -3202,7 +3423,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 filler depth noise parameters"
-msgstr ""
+msgstr "Mapgen v7 - støjparametre for fyldstofdybde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 flags"
@@ -3364,9 +3585,8 @@ msgid "Maximum users"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Menus"
-msgstr "Menu"
+msgstr "Menuer"
 
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
@@ -3403,7 +3623,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Mipmapping"
-msgstr "Mip-mapping"
+msgstr "Mipmapping"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
@@ -3664,14 +3884,12 @@ msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
-msgstr "Vælg sti"
+msgstr "Rapportsti"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Right key"
-msgstr "Højre Menu"
+msgstr "Højretast"
 
 #: src/settings_translation_file.cpp
 msgid "Rightclick repetition interval"
@@ -3727,23 +3945,20 @@ msgid "Screen width"
 msgstr "Skærmbredde"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot"
-msgstr "Tilstandsbillede"
+msgstr "Skærmbillede"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot folder"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "Tilstandsbillede"
+msgstr "Skærmbilledformat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "Tilstandsbillede"
+msgstr "Skærmbilledkvalitet"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3773,9 +3988,8 @@ msgid "Selection box width"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server / Singleplayer"
-msgstr "Enligspiller"
+msgstr "Server/alene"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
@@ -3816,18 +4030,24 @@ msgid ""
 "Set to true enables waving leaves.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Sat til true (sand) aktiverer bølgende blade.\n"
+"Kræver at dybdeskabere er aktiveret."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Angivet til true (sand) aktiverer bølgende planter.\n"
+"Kræver at dybdeskabere er aktiveret."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving water.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Angivet til true (sand) aktiverer bølgende vand.\n"
+"Kræver at dybdeskabere er aktiveret."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3835,6 +4055,9 @@ msgid ""
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
+"Dybdeskabere tillader avancerede visuelle effekter og kan forøge ydelsen på "
+"nogle videokort.\n"
+"De fungerer kun med OpenGL-videomotoren."
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
@@ -3863,9 +4086,8 @@ msgid "Slope and fill work together to modify the heights"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Smooth lighting"
-msgstr "Glat belysning"
+msgstr "Blød belysning"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3882,9 +4104,8 @@ msgid "Smooths rotation of camera. 0 to disable."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Sneak key"
-msgstr "Snige"
+msgstr "Snigetast"
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
@@ -3956,7 +4177,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
-msgstr ""
+msgstr "Dybde for smuds eller andet fyldstof"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4054,9 +4275,8 @@ msgid "Tooltip delay"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Trilinear filtering"
-msgstr "Tri-lineær filtréring"
+msgstr "Trilineær filtrering"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4098,9 +4318,8 @@ msgid "Use bilinear filtering when scaling textures."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use key"
-msgstr "Tryk på en tast"
+msgstr "Brug-tast"
 
 #: src/settings_translation_file.cpp
 msgid "Use mip mapping to scale textures. May slightly increase performance."
@@ -4201,9 +4420,8 @@ msgid "Waving Nodes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving leaves"
-msgstr "\"Smarte\" træer"
+msgstr "Bølgende blade"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"

From 7958bda9d83a826fda7f2b45a41e9f0d5863768b Mon Sep 17 00:00:00 2001
From: Thomas Wagner Nielsen <thomas@viawords.com>
Date: Thu, 24 Nov 2016 15:52:26 +0000
Subject: [PATCH 350/418] Translated using Weblate (Danish)

Currently translated at 73.0% (671 of 918 strings)
---
 po/da/minetest.po | 82 +++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/po/da/minetest.po b/po/da/minetest.po
index 84cfab33f..cc7e17993 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2011 celeron
 # This file is distributed under the same license as the minetest-c55 package.
 # Frederik Helth <Guides@live.dk>, 2011.
-# 
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-12 20:49+0200\n"
-"PO-Revision-Date: 2016-10-20 13:59+0000\n"
+"PO-Revision-Date: 2016-11-24 16:48+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish "
 "<https://hosted.weblate.org/projects/minetest/minetest/da/>\n"
@@ -3259,11 +3259,11 @@ msgstr "Mapgen - fraktal hulebredde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave1 noise parameters"
-msgstr ""
+msgstr "Støjparametre for Mapgen fraktal grotte1"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave2 noise parameters"
-msgstr ""
+msgstr "Støjparametre for Mapgen fraktal grotte2"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal filler depth noise parameters"
@@ -3271,71 +3271,71 @@ msgstr "Mapgen - støjparametre for fraktal fyldstofdybde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal fractal"
-msgstr ""
+msgstr "Mapgen fraktal fraktal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal iterations"
-msgstr ""
+msgstr "Mapgen fraktaliterationer"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia w"
-msgstr ""
+msgstr "Mapgen fraktal Julia w"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia x"
-msgstr ""
+msgstr "Mapgen fraktal Julia x"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia y"
-msgstr ""
+msgstr "Mapgen fraktal Julia y"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia z"
-msgstr ""
+msgstr "Mapgen fraktal Julia z"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal offset"
-msgstr ""
+msgstr "Mapgen fraktal forskydning"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal scale"
-msgstr ""
+msgstr "Mapgen fraktal skalering"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal seabed noise parameters"
-msgstr ""
+msgstr "Støjparametre for Mapgen fraktal havbund"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal slice w"
-msgstr ""
+msgstr "Mapgen fraktal udsnit w"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen heat blend noise parameters"
-msgstr ""
+msgstr "Støjparametre for Mapgen varmeblanding"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
-msgstr ""
+msgstr "Mapgen-navn"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5"
-msgstr ""
+msgstr "Mapgen v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave width"
-msgstr ""
+msgstr "Mapgen v5 grottebredde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave1 noise parameters"
-msgstr ""
+msgstr "Støjparametre for Mapgen v5 grotte1"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave2 noise parameters"
-msgstr ""
+msgstr "Støjparametre for Mapgen v5 grotte2"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 factor noise parameters"
-msgstr ""
+msgstr "Støjparametre for Mapgen v5 faktor"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 filler depth noise parameters"
@@ -3343,43 +3343,43 @@ msgstr "Mapgen v5 - støjparametre for fyldstofdybde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 height noise parameters"
-msgstr ""
+msgstr "Mapgen v5 – støjparametre for højde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6"
-msgstr ""
+msgstr "Mapgen v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 apple trees noise parameters"
-msgstr ""
+msgstr "Mapgen v6 – støjparametre for æbletræer"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach frequency"
-msgstr ""
+msgstr "Mapgen v6 – strandhyppighed"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach noise parameters"
-msgstr ""
+msgstr "Mapgen v6 – støjparametre for strand"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 biome noise parameters"
-msgstr ""
+msgstr "Mapgen v6 – støjparametre for økosystem"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 cave noise parameters"
-msgstr ""
+msgstr "Mapgen v6 – støjparametre for grotter"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 desert frequency"
-msgstr ""
+msgstr "Mapgen v6 – ørkenhyppighed"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 flags"
-msgstr ""
+msgstr "Mapgen v6 – flag"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 height select noise parameters"
-msgstr ""
+msgstr "Mapgen v6 – støjparametre for højdevalg"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 humidity noise parameters"
@@ -3407,7 +3407,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7"
-msgstr ""
+msgstr "Mapgen v7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave width"
@@ -3427,11 +3427,11 @@ msgstr "Mapgen v7 - støjparametre for fyldstofdybde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 flags"
-msgstr ""
+msgstr "Mapgen v7 – flag"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 height select noise parameters"
-msgstr ""
+msgstr "Mapgen v7 – støjparametre for højdevalg"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 mount height noise parameters"
@@ -3582,7 +3582,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
-msgstr ""
+msgstr "Maksimum antal brugere"
 
 #: src/settings_translation_file.cpp
 msgid "Menus"
@@ -3594,11 +3594,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day"
-msgstr ""
+msgstr "Dagens besked"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day displayed to players connecting."
-msgstr ""
+msgstr "Dagens besked"
 
 #: src/settings_translation_file.cpp
 msgid "Method used to highlight selected object."
@@ -3901,7 +3901,7 @@ msgstr "Floddybde"
 
 #: src/settings_translation_file.cpp
 msgid "River Noise"
-msgstr ""
+msgstr "Flodstøj"
 
 #: src/settings_translation_file.cpp
 msgid "River Size"
@@ -3917,7 +3917,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Round minimap"
-msgstr ""
+msgstr "Rundt minikort"
 
 #: src/settings_translation_file.cpp
 msgid "Save the map received by the client on disk."
@@ -4073,7 +4073,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
-msgstr ""
+msgstr "Nedlukningsbesked"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4145,7 +4145,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Terrain Height"
-msgstr ""
+msgstr "Terrænhøjde"
 
 #: src/settings_translation_file.cpp
 msgid ""

From 1e6130d128762b162f0869e7a4d610f0d495f8a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Henrique=20Luckmann?= <joseh.luckmann@gmail.com>
Date: Tue, 27 Sep 2016 17:51:17 +0000
Subject: [PATCH 351/418] Translated using Weblate (Portuguese (Brazil))

Currently translated at 84.2% (773 of 918 strings)
---
 po/pt_BR/minetest.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index 4bb839e1b..9814261a5 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-07-21 17:30+0000\n"
-"Last-Translator: Bruno Borges <borgesdossantosbruno@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
-"minetest/minetest/pt_BR/>\n"
+"PO-Revision-Date: 2016-09-27 17:51+0000\n"
+"Last-Translator: José Henrique Luckmann <joseh.luckmann@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) "
+"<https://hosted.weblate.org/projects/minetest/minetest/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.8-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "Ocorreu um erro no script Lua, assim como em um modificador:"
+msgstr "Ocorreu um erro no script Lua em um mod :"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -213,7 +213,7 @@ msgstr "\"$1\" não é uma flag válida."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
-msgstr "(Descrição de configuração não fornecida)"
+msgstr "(Não há uma descrição para esta configuração)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
@@ -253,7 +253,7 @@ msgstr "Jogos"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
 msgid "Mods"
-msgstr "Módulos"
+msgstr "Mods"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."

From 22ad774ff41ee91bbec1350a56cedb5d2bee3358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Tue, 8 Nov 2016 00:48:08 +0000
Subject: [PATCH 352/418] Translated using Weblate (Portuguese)

Currently translated at 66.7% (613 of 918 strings)

There is no need to specify that a mod is an extra.
---
 po/pt/minetest.po | 303 +++++++++++++++++++++-------------------------
 1 file changed, 141 insertions(+), 162 deletions(-)

diff --git a/po/pt/minetest.po b/po/pt/minetest.po
index 907746b03..d1fc17115 100644
--- a/po/pt/minetest.po
+++ b/po/pt/minetest.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-07-21 00:15+0000\n"
-"Last-Translator: Bruno Borges <borgesdossantosbruno@gmail.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/minetest/"
-"minetest/pt/>\n"
+"PO-Revision-Date: 2016-11-08 00:48+0000\n"
+"Last-Translator: João Rodrigues <joaoadriano3@gmail.com>\n"
+"Language-Team: Portuguese "
+"<https://hosted.weblate.org/projects/minetest/minetest/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.8-dev\n"
+"X-Generator: Weblate 2.9\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "Ocorreu um erro num script Lua, como por exemplo num extra:"
+msgstr "Ocorreu um erro num script Lua, como por exemplo num mod:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -41,7 +41,7 @@ msgstr "Reconectar"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "O servidor solicitou uma reconexão:"
+msgstr "O servidor requisitou uma reconexão:"
 
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
@@ -49,20 +49,20 @@ msgstr "A carregar..."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr "Versão do protocolo não coincide. "
+msgstr "A versão do protocolo não coincide. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "O servidor requere o protocolo versão $1. "
+msgstr "O servidor requer o protocolo versão $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "Servidor suporta versões de protocolo entre $1 e $2. "
+msgstr "O servidor suporta versões de protocolo entre $1 e $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
 msgstr ""
-"Tente recarregar a lista de servidores públicos e verificar a sua ligação à "
+"Tente recarregar a lista de servidores públicos e verifique a sua ligação à "
 "internet."
 
 #: builtin/mainmenu/common.lua
@@ -103,7 +103,7 @@ msgid ""
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
 "Falha ao ativar mod \"$1\" porque contém caracteres inválidos. Apenas "
-"caracteres de \"a\" até \"z\" e algarismos de 0 até 9 são permitidos."
+"caracteres [a-z0-9_] são permitidos."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -115,7 +115,7 @@ msgstr "Ocultar conteúdo do pacote"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr "Extra:"
+msgstr "Mod:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
@@ -128,7 +128,7 @@ msgstr "Mundo:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
-msgstr "ativo"
+msgstr "ativado"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -140,11 +140,11 @@ msgstr "Criar"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "Descarregue um jogo, como o minetest_game, do sítio minetest.net"
+msgstr "Descarregue um subjogo, como o minetest_game, do site minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr "Descarregue um do sítio minetest.net"
+msgstr "Descarregue um do site minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -160,25 +160,23 @@ msgstr "Mundo sem nome ou nenhum jogo selecionado"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Seed"
-msgstr "Semente aleatória"
+msgstr "Seed"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The minimal development test is meant for developers."
-msgstr ""
-"Aviso: O jogo \"minimal development test\" destina-se apenas a "
-"desenvolvedores."
+msgstr "Aviso: O minimal development test destina-se apenas a desenvolvedores."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
-msgstr "Nome do Mundo"
+msgstr "Nome do mundo"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no subgames installed."
-msgstr "Você não tem nenhum jogo instalado."
+msgstr "Não possui nenhum subjogo instalado."
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr "Tem a certeza que pertende eliminar \"$1\"?"
+msgstr "Tem a certeza que pretende eliminar \"$1\"?"
 
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
@@ -188,15 +186,15 @@ msgstr "Eliminar"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: failed to delete \"$1\""
-msgstr "Mensagem de Extra: falhou a eliminação de \"$1\""
+msgstr "Modmgr: falha ao apagar \"$1\""
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: invalid modpath \"$1\""
-msgstr "Mensagem de extra: caminho inválido \"$1\""
+msgstr "Modmgr: caminho para o mod inválido \"$1\""
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr "Eliminar Mundo \"$1\"?"
+msgstr "Eliminar mundo \"$1\"?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
 msgid "Accept"
@@ -204,7 +202,7 @@ msgstr "Aceitar"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr "Renomear Pacote de Extras:"
+msgstr "Renomear ModPack:"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "\"$1\" is not a valid flag."
@@ -212,11 +210,11 @@ msgstr "\"$1\" não é uma flag válida."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
-msgstr "(Descrição de configuração não fornecida)"
+msgstr "(Não há descrição para esta configuração)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
-msgstr "< Voltar para as configurações"
+msgstr "< Voltar para as definições"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
@@ -236,15 +234,15 @@ msgstr "Ativado"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Format is 3 numbers separated by commas and inside brackets."
-msgstr "O formato é de 3 números separados por vírgulas dentro de paréntesis."
+msgstr "O formato é de 3 números separados por vírgulas dentro de parêntesis."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
-"Formato: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
-"<octaves>, <persistence>"
+"Formato: <offset>, <escala>, (<distânciaX>, <distânciaY>, <distânciaZ>), "
+"<seed>, <oitavos>, <persistência>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
@@ -252,7 +250,7 @@ msgstr "Jogos"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
 msgid "Mods"
-msgstr "Extras"
+msgstr "Mods"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
@@ -265,7 +263,7 @@ msgstr "Por favor, introduza uma lista de flags separadas por vírgulas."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
-msgstr "Por favor insira um inteiro válido."
+msgstr "Por favor, insira um número inteiro válido."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid number."
@@ -281,7 +279,7 @@ msgstr "Restaurar valores por defeito"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select path"
-msgstr "Selecionar diretório"
+msgstr "Seleccionar diretório"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
@@ -301,7 +299,7 @@ msgid ""
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
 "\n"
-"Instalação de extra: o tipo de arquivo \"$1\" não é suportado ou o arquivo "
+"Instalação de mod: o tipo de ficheiro \"$1\" não é suportado ou o ficheiro "
 "está corrompido"
 
 #: builtin/mainmenu/modmgr.lua
@@ -310,25 +308,25 @@ msgstr "Falha ao instalar de $1 ao $2"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: file: \"$1\""
-msgstr "Instalar Extra: ficheiro: \"$1\""
+msgstr "Instalação de Mod: ficheiro: \"$1\""
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find real modname for: $1"
-msgstr "Instalação de extra: nome real de extra não encontrado para: $1"
+msgstr "Instalação de Mod: nome real de extra não encontrado para: $1"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find suitable foldername for modpack $1"
 msgstr ""
-"Instalação de extra: não foi possível encontrar o nome adequado da pasta "
-"para o pacote de extras $1"
+"Instalação de Mod: não foi possível encontrar o nome adequado da pasta para "
+"o pacote de mods $1"
 
 #: builtin/mainmenu/store.lua
 msgid "Close store"
-msgstr "Fechar repositório de extras"
+msgstr "Fechar repositório"
 
 #: builtin/mainmenu/store.lua
 msgid "Downloading $1, please wait..."
-msgstr "Descarregando $1, por favor aguarde..."
+msgstr "A descarregar $1, por favor aguarde..."
 
 #: builtin/mainmenu/store.lua
 msgid "Install"
@@ -360,7 +358,7 @@ msgstr "Não ordenado"
 
 #: builtin/mainmenu/store.lua
 msgid "re-Install"
-msgstr "re-Instalar"
+msgstr "reinstalar"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
@@ -380,19 +378,19 @@ msgstr "Antigos Contribuidores"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr "Desenvolvedores Chave Antigos"
+msgstr "Desenvolvedores principais anteriores"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Installed Mods:"
-msgstr "Extras Instalados:"
+msgstr "Mods Instalados:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Mod information:"
-msgstr "Informação do extra:"
+msgstr "Informação do Mod:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "No mod description available"
-msgstr "Nenhuma descrição disponível do extra"
+msgstr "Nenhuma descrição do Mod disponível"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Rename"
@@ -400,20 +398,19 @@ msgstr "Renomear"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Select Mod File:"
-msgstr "Seleccionar ficheiro de Extra:"
+msgstr "Seleccionar ficheiro de Mod:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected mod"
-msgstr "Desinstalar extra selecionado"
+msgstr "Desinstalar mod selecionado"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected modpack"
-msgstr "Desinstalar pacote de extras selecionado"
+msgstr "Desinstalar pacote de mods selecionado"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "Endereço / Porta :"
+msgstr "Endereço / Porta"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -432,27 +429,24 @@ msgid "Damage enabled"
 msgstr "Dano ativado"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Del. Favorite"
-msgstr "Favoritos:"
+msgstr "Rem. Favorito"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Favorite"
-msgstr "Favoritos:"
+msgstr "Favorito"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "Nome / Senha :"
+msgstr "Nome / Senha"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
-msgstr "PvP activado"
+msgstr "PvP ativado"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Bind Address"
-msgstr "Endereço Bind"
+msgstr "Endereço de ligação"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Configure"
@@ -478,7 +472,7 @@ msgstr "Novo"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "No world created or selected!"
-msgstr "Nenhum mundo criado ou selecionado!"
+msgstr "Nenhum mundo criado ou seleccionado!"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Port"
@@ -498,11 +492,11 @@ msgstr "Servidor"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Server Port"
-msgstr "Porta"
+msgstr "Porta do servidor"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Start Game"
-msgstr "Jogar"
+msgstr "Iniciar Jogo"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
@@ -526,7 +520,7 @@ msgstr "Configurações Avançadas"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr "Antisserrilhamento:"
+msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Are you sure to reset your singleplayer world?"
@@ -534,10 +528,9 @@ msgstr "Tem a certeza que deseja reiniciar o seu mundo?"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
-msgstr "Filtro bi-linear"
+msgstr "Filtro bilinear"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
 msgstr "Bump mapping"
 
@@ -555,11 +548,11 @@ msgstr "Folhas detalhadas"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
-msgstr "Mapa MIP"
+msgstr "Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
-msgstr "Mapa MIP + Filtro Anisotrópico"
+msgstr "Mipmap + Filtro Anisotrópico"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No"
@@ -571,14 +564,13 @@ msgstr "Sem Filtro"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
-msgstr "Sem mapa MIP"
+msgstr "Sem Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
 msgstr "Destaque dos Cubos"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Outlining"
 msgstr "Destaque dos Cubos"
 
@@ -587,9 +579,8 @@ msgid "None"
 msgstr "Nenhum"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Normal Mapping"
-msgstr "Mapeamento de tons"
+msgstr "Mapeamento Normal"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -604,14 +595,12 @@ msgid "Parallax Occlusion"
 msgstr "Oclusão de paralaxe"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "Ativar Partículas"
+msgstr "Ativar Particulas"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Reset singleplayer world"
-msgstr "Tem a certeza que deseja reiniciar o seu mundo?"
+msgstr "Reiniciar mundo singleplayer"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -635,7 +624,7 @@ msgstr "Texturização:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr "Para ativar os sombreadores é necessário usar o driver OpenGL."
+msgstr "Para ativar as sombras é necessário usar o controlador OpenGL."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
@@ -647,7 +636,7 @@ msgstr "Nível de sensibilidade ao toque (px)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
-msgstr "Filtro tri-linear"
+msgstr "Filtro trilinear"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
@@ -667,7 +656,7 @@ msgstr "Sim"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Config mods"
-msgstr "Configurar extras"
+msgstr "Configurar mods"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Main"
@@ -675,7 +664,7 @@ msgstr "Principal"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Start Singleplayer"
-msgstr "Iniciar jogo solo"
+msgstr "Iniciar Um Jogador"
 
 #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
 msgid "Play"
@@ -687,7 +676,7 @@ msgstr "Um Jogador"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "No information available"
-msgstr "Sem informação"
+msgstr "Sem informações disponíveis"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Select texture pack:"
@@ -695,7 +684,7 @@ msgstr "Selecione um pacote de texturas:"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Texturepacks"
-msgstr "Pacotes texturas"
+msgstr "Pacotes de texturas"
 
 #: src/client.cpp
 msgid "Connection timed out."
@@ -703,7 +692,7 @@ msgstr "Erro de ligação (tempo excedido)."
 
 #: src/client.cpp
 msgid "Done!"
-msgstr "Terminado!"
+msgstr "Feito!"
 
 #: src/client.cpp
 msgid "Initializing nodes"
@@ -719,11 +708,11 @@ msgstr "A carregar texturas..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr "Reconstruindo sombreadores..."
+msgstr "A reconstruir sombras..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
-msgstr "Erro de conexão (excedeu tempo?)"
+msgstr "Erro de ligação (excedeu tempo?)"
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
@@ -731,7 +720,7 @@ msgstr "Não foi possível encontrar ou carregar jogo \""
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
-msgstr "gamespec inválido."
+msgstr "Especificação de jogo inválida."
 
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
@@ -739,8 +728,7 @@ msgstr "Menu Principal"
 
 #: src/client/clientlauncher.cpp
 msgid "No world selected and no address provided. Nothing to do."
-msgstr ""
-"Nenhum mundo seleccionado e nenhum endereço providenciado. Nada para fazer."
+msgstr "Nenhum mundo seleccionado e nenhum endereço fornecido. Nada a fazer."
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
@@ -748,11 +736,11 @@ msgstr "Nome de jogador demasiado longo."
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr "O caminho fornecido não existe: "
+msgstr "O caminho fornecido do mundo não existe: "
 
 #: src/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr "yes"
+msgstr "necessita_fonte_alternativa"
 
 #: src/game.cpp
 msgid ""
@@ -801,7 +789,7 @@ msgid ""
 "- T: chat\n"
 msgstr ""
 "Teclas por defeito:\n"
-"- WASD: mover\n"
+"- WASD: andar\n"
 "- Barra de espaço: saltar/subir\n"
 "- Shift: andar cuidadosamente/descer\n"
 "- Q: Largar item\n"
@@ -810,7 +798,7 @@ msgstr ""
 "- Clique esquerdo: cavar/bater\n"
 "- Clique direito: colocar/utilizar\n"
 "- Roda do rato: seleccionar item\n"
-"- T: conversação\n"
+"- T: chat\n"
 
 #: src/game.cpp
 msgid ""
@@ -842,11 +830,11 @@ msgstr ""
 
 #: src/game.cpp
 msgid "Exit to Menu"
-msgstr "Sair para Menu"
+msgstr "Sair para o Menu"
 
 #: src/game.cpp
 msgid "Exit to OS"
-msgstr "Sair para o sistema"
+msgstr "Sair para o S.O"
 
 #: src/game.cpp
 msgid "Item definitions..."
@@ -854,11 +842,11 @@ msgstr "Definições dos Itens..."
 
 #: src/game.cpp
 msgid "KiB/s"
-msgstr "KB/s"
+msgstr "KiB/s"
 
 #: src/game.cpp
 msgid "Media..."
-msgstr "Dados..."
+msgstr "Media..."
 
 #: src/game.cpp
 msgid "MiB/s"
@@ -866,7 +854,7 @@ msgstr "MiB/s"
 
 #: src/game.cpp
 msgid "Node definitions..."
-msgstr "Definindo cubos..."
+msgstr "A definir cubos..."
 
 #: src/game.cpp
 msgid "Resolving address..."
@@ -874,7 +862,7 @@ msgstr "A resolver endereço..."
 
 #: src/game.cpp
 msgid "Respawn"
-msgstr "Reaparecer"
+msgstr "Renascer"
 
 #: src/game.cpp
 msgid "Shutting down..."
@@ -910,7 +898,7 @@ msgstr "Recuar"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Chat"
-msgstr "Conversa"
+msgstr "Chat"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Command"
@@ -922,7 +910,7 @@ msgstr "Consola"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr "Carregue duas vezes em \"saltar\" para ativar o vôo"
+msgstr "Carregue duas vezes em \"saltar\" para voar"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Drop"
@@ -1014,7 +1002,7 @@ msgstr "Senha antiga"
 
 #: src/guiPasswordChange.cpp
 msgid "Passwords do not match!"
-msgstr "Senhas não correspondem!"
+msgstr "As senhas não correspondem!"
 
 #: src/guiVolumeChange.cpp
 msgid "Exit"
@@ -1026,11 +1014,11 @@ msgstr "Volume do som: "
 
 #: src/keycode.cpp
 msgid "Apps"
-msgstr "App"
+msgstr "Aplicações"
 
 #: src/keycode.cpp
 msgid "Attn"
-msgstr "Attm"
+msgstr "Attn"
 
 #: src/keycode.cpp
 msgid "Back"
@@ -1054,7 +1042,7 @@ msgstr "Control"
 
 #: src/keycode.cpp
 msgid "Convert"
-msgstr "Converter"
+msgstr "Convert"
 
 #: src/keycode.cpp
 msgid "CrSel"
@@ -1138,7 +1126,7 @@ msgstr "Menu"
 
 #: src/keycode.cpp
 msgid "Middle Button"
-msgstr "Botão Central do Rato"
+msgstr "Roda do Rato"
 
 #: src/keycode.cpp
 msgid "Minus"
@@ -1230,7 +1218,7 @@ msgstr "Pausa"
 
 #: src/keycode.cpp
 msgid "Period"
-msgstr "Período"
+msgstr "Ponto"
 
 #: src/keycode.cpp
 msgid "Plus"
@@ -1318,7 +1306,7 @@ msgid ""
 msgstr ""
 "Deslocamento (X,Y,Z) do fractal a partir do centro do mundo em unidades "
 "'escala'.\n"
-"Usado para obter uma área de nascimento apropriada, próxima de (0, 0).\n"
+"Usado para obter um spawnpoint apropriado, próximo de (0, 0).\n"
 "Valores por defeito apropriados para conjunto de Mandelbrot, necessitam ser "
 "adaptados para conjunto de Julia.\n"
 "Intervalos aproximadamente entre -2 e 2. Multiplicar por 'escala' para "
@@ -1364,14 +1352,14 @@ msgid ""
 "A chosen map seed for a new map, leave empty for random.\n"
 "Will be overridden when creating a new world in the main menu."
 msgstr ""
-"Semente aleatória para gerar um novo mundo (em branco para deixar o "
-"computador escolher).\n"
+"Seed aleatória para um novo mundo (em branco para ser aleatória).\n"
 "Será anulada quando for criado um outro novo mundo no menu principal."
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server crashes."
 msgstr ""
-"Mensagem a ser mostrada a todos os clientes do servidor quando ele bloqueia."
+"Mensagem a ser mostrada a todos os clientes do servidor quando o servidor "
+"crasha."
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server shuts down."
@@ -1388,27 +1376,24 @@ msgid "Acceleration in air"
 msgstr "Aceleração no ar"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Management interval"
-msgstr "Distância de ativação de blocos"
+msgstr "Intervalo de gestão de blocos ativos"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifier interval"
-msgstr "Distância de ativação de blocos"
+msgstr "Intervalo de Modificador de Blocos ativos"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifiers"
-msgstr "Distância de ativação de blocos"
+msgstr "Modificadores de Blocos Ativos"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr "Distância de ativação de blocos"
+msgstr "Alcance de blocos ativos"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
-msgstr "Distância de ativação de objectos"
+msgstr "Distância de envio de objetos ativos"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1416,7 +1401,7 @@ msgid ""
 "Leave this blank to start a local server.\n"
 "Note that the address field in the main menu overrides this setting."
 msgstr ""
-"Endereço para conexão.\n"
+"Endereço para ligação.\n"
 "Deixe em branco para iniciar um servidor local.\n"
 "Note que o campo de endereço no menu principal sobrescreve esta configuração."
 
@@ -1425,7 +1410,7 @@ msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
-"Ajustar configuração de dpi ao seu ecrã (não aplicável a X11/Android) e.g. "
+"Ajustar configuração de dpi ao seu ecrã (não aplicável a X11/Android) ex: "
 "para ecrãs 4K."
 
 #: src/settings_translation_file.cpp
@@ -1433,9 +1418,9 @@ msgid ""
 "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
 "This setting is for the client only and is ignored by the server."
 msgstr ""
-"Ajusta a correção gama nas tabelas de luminosidade. Valores mais baixos "
+"Ajusta a codificação gama nas tabelas de luminosidade. Valores mais baixos "
 "resultam \n"
-"em imagem mais clara. Configuração somente para o cliente e ignorada pelo "
+"numa imagem mais clara. Configuração somente para o cliente e ignorada pelo "
 "servidor."
 
 #: src/settings_translation_file.cpp
@@ -1490,7 +1475,7 @@ msgstr "Informar automáticamente a lista de servidores."
 
 #: src/settings_translation_file.cpp
 msgid "Autorun key"
-msgstr ""
+msgstr "Tecla de autoexecução"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -1505,9 +1490,8 @@ msgid "Basic"
 msgstr "Básico"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic Privileges"
-msgstr "Privilégios por defeito"
+msgstr "Privilégios básicos"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
@@ -1527,7 +1511,7 @@ msgstr "Construir com o jogador dentro do cubo"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "Builtin"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
@@ -1570,9 +1554,8 @@ msgid "Chat toggle key"
 msgstr "Tecla mostra/esconde conversação"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Comando"
+msgstr "Comandos do Chat"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1665,7 +1648,6 @@ msgid "Colored fog"
 msgstr "Névoa colorida"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
@@ -1840,7 +1822,7 @@ msgstr "Privilégios por defeito"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Formato de report predefinido"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1866,7 +1848,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Atraso no envio de blocos após construção"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -1955,7 +1937,7 @@ msgstr "Mostrar informações de depuração do gerador de mapa."
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "Ativar Joysticks"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
@@ -1978,6 +1960,8 @@ msgid ""
 "Enable smooth lighting with simple ambient occlusion.\n"
 "Disable for speed or for different looks."
 msgstr ""
+"Ativar a iluminação suave com oclusão de ambiente simples.\n"
+"Desativar para velocidade ou vistas diferentes."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2000,6 +1984,10 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
+"Ativar a utilização de um servidor media remoto (se fornecido pelo servidor)."
+"\n"
+"Servidores remotos oferecem uma maneira mais rápida de descarregar media\n"
+"(ex. texturas) quando se estiver a conectar ao servidor."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2023,10 +2011,14 @@ msgid ""
 "or need to be auto-generated.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Ativa o bumpmapping para texturas. Mapas normais devem ser fornecidos pelo "
+"pack de\n"
+"texturas ou gerado automaticamente.\n"
+"Requer que as sombras sejam ativadas."
 
 #: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
-msgstr ""
+msgstr "Ativar armazenamento em cache para os meshes das faces."
 
 #: src/settings_translation_file.cpp
 msgid "Enables filmic tone mapping"
@@ -2121,7 +2113,6 @@ msgid "Field of view"
 msgstr "Campo de visão"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view for zoom"
 msgstr "Campo de visão"
 
@@ -2130,14 +2121,12 @@ msgid "Field of view in degrees."
 msgstr "Campo de visão em graus."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"Se ativado com o modo de vôo, o jogador é capaz de voar através de cubos "
-"sólidos.\n"
-"Isto requer o privilégio \"noclip\" no servidor."
+"Campo de visão durante o zoom em graus.\n"
+"Isto requer o privilégio \"zoom\" no servidor."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2718,15 +2707,14 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling autorun.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla para ativar/desativar a exibição do mini-mapa.\n"
-"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tecla para ativar auto-corrida.\n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319"
+"01735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2767,15 +2755,14 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla para imprimir pilhas de depuração. Usado para o desenvolvimento.\n"
-"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tecla para ativar a atualização da câmara. Usado para desenvolvimento.\n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319"
+"01735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2949,9 +2936,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Loading Block Modifiers"
-msgstr "Distância de ativação de blocos"
+msgstr "A carregar modificadores de blocos"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
@@ -3064,9 +3050,8 @@ msgid "Mapgen flat"
 msgstr "Gerador de mapa plano"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave width"
-msgstr "Limite de lagos no gerador de mapa plano"
+msgstr "Tamanho de cavernas lisas no Mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave1 noise parameters"
@@ -3117,9 +3102,8 @@ msgid "Mapgen fractal"
 msgstr "Gerador de mapa fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal cave width"
-msgstr "W do corte do gerador de mapa fractal"
+msgstr "Tamanho da caverna mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave1 noise parameters"
@@ -3187,9 +3171,8 @@ msgid "Mapgen v5"
 msgstr "Gerador de mapa V5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave width"
-msgstr "Gerador de mapa V5"
+msgstr "Tamanho da Caverna no Mapgen v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave1 noise parameters"
@@ -3276,9 +3259,8 @@ msgid "Mapgen v7"
 msgstr "Gerador de mapa V7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 cave width"
-msgstr "Gerador de mapa V7"
+msgstr "Tamanho da caverna no mapgen v7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave1 noise parameters"
@@ -3751,9 +3733,8 @@ msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
-msgstr "Caminho para ficheiro fonte"
+msgstr "Diretório para logs"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
@@ -3826,14 +3807,12 @@ msgid "Screenshot folder"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "Captura de ecrã"
+msgstr "Formato da captura de ecrã"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "Captura de ecrã"
+msgstr "Qualidade da Captura de ecrã"
 
 #: src/settings_translation_file.cpp
 msgid ""

From 7af9442ea39ec0623060fefef152581cbacda706 Mon Sep 17 00:00:00 2001
From: Eidy <JulianBiddle@practicalcybernetics.com>
Date: Mon, 3 Oct 2016 03:39:22 +0000
Subject: [PATCH 353/418] Added translation using Weblate (Swahili)

---
 po/sw/minetest.po | 4177 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 4177 insertions(+)
 create mode 100644 po/sw/minetest.po

diff --git a/po/sw/minetest.po b/po/sw/minetest.po
new file mode 100644
index 000000000..0f29ebb6d
--- /dev/null
+++ b/po/sw/minetest.po
@@ -0,0 +1,4177 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the minetest package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: minetest\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sw\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: builtin/fstk/ui.lua
+msgid "The server has requested a reconnect:"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "Main menu"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "Reconnect"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "An error occured in a Lua script, such as a mod:"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "An error occured:"
+msgstr ""
+
+#: builtin/fstk/ui.lua builtin/mainmenu/store.lua
+msgid "Ok"
+msgstr ""
+
+#: builtin/mainmenu/common.lua src/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Server supports protocol versions between $1 and $2. "
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Server enforces protocol version $1. "
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "We support protocol versions between version $1 and $2."
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "We only support protocol version $1."
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Protocol version mismatch. "
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "World:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Hide Game"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Hide mp content"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Mod:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
+msgid "Depends:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
+msgid "Save"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
+#: builtin/mainmenu/dlg_rename_modpack.lua
+#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
+#: src/keycode.cpp
+msgid "Cancel"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Enable MP"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Disable MP"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "enabled"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Enable all"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid ""
+"Failed to enable mod \"$1\" as it contains disallowed characters. Only "
+"chararacters [a-z0-9_] are allowed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "World name"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Seed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Mapgen"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Game"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Create"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "You have no subgames installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Download one from minetest.net"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Warning: The minimal development test is meant for developers."
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Download a subgame, such as minetest_game, from minetest.net"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "A world named \"$1\" already exists"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "No worldname given or no game selected"
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_mod.lua
+msgid "Are you sure you want to delete \"$1\"?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+#: src/keycode.cpp
+msgid "Delete"
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_mod.lua
+msgid "Modmgr: failed to delete \"$1\""
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_mod.lua
+msgid "Modmgr: invalid modpath \"$1\""
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_world.lua
+msgid "Delete World \"$1\"?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid "Rename Modpack:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
+msgid "Accept"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "(No description of setting given)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a comma seperated list of flags."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Possible values are: "
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid ""
+"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
+"<octaves>, <persistence>"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Optionally the lacunarity can be appended with a leading comma."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Format is 3 numbers separated by commas and inside brackets."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Disabled"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Enabled"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Browse"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a valid integer."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "The value must be greater than $1."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "The value must be lower than $1."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a valid number."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "\"$1\" is not a valid flag."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Select path"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "< Back to Settings page"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Edit"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Restore Default"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Show technical names"
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid "Install Mod: file: \"$1\""
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid ""
+"\n"
+"Install Mod: unsupported filetype \"$1\" or broken archive"
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid "Failed to install $1 to $2"
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid "Install Mod: unable to find suitable foldername for modpack $1"
+msgstr ""
+
+#: builtin/mainmenu/modmgr.lua
+msgid "Install Mod: unable to find real modname for: $1"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Unsorted"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Downloading $1, please wait..."
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Successfully installed:"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Shortname:"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Rating"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "re-Install"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Close store"
+msgstr ""
+
+#: builtin/mainmenu/store.lua
+msgid "Page $1 of $2"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Credits"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Core Developers"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Active Contributors"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Previous Core Developers"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Previous Contributors"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Installed Mods:"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "No mod description available"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Mod information:"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Rename"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Uninstall selected modpack"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Uninstall selected mod"
+msgstr ""
+
+#: builtin/mainmenu/tab_mods.lua
+msgid "Select Mod File:"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua
+msgid "Address / Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Name / Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Connect"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Del. Favorite"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Favorite"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Creative mode"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Damage enabled"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "PvP enabled"
+msgstr ""
+
+#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
+msgid "Client"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "New"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "Configure"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Start Game"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "Select World:"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_singleplayer.lua
+msgid "Creative Mode"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_singleplayer.lua
+msgid "Enable Damage"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Public"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Name/Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Bind Address"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Server Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "No world created or selected!"
+msgstr ""
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Server"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Opaque Leaves"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Simple Leaves"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Fancy Leaves"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Node Outlining"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Node Highlighting"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No Filter"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Bilinear Filter"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Trilinear Filter"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No Mipmap"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Mipmap"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Mipmap + Aniso. Filter"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
+msgid "None"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "2x"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "4x"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "8x"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Are you sure to reset your singleplayer world?"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Yes"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Smooth Lighting"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Particles"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "3D Clouds"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Opaque Water"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Connected Glass"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Texturing:"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Antialiasing:"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Shaders"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Change keys"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Advanced Settings"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Touchthreshold (px)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Bump Mapping"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Tone Mapping"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Normal Mapping"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Parallax Occlusion"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Waving Water"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Waving Leaves"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Waving Plants"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "To enable shaders the OpenGL driver needs to be used."
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Settings"
+msgstr ""
+
+#: builtin/mainmenu/tab_simple_main.lua
+msgid "Start Singleplayer"
+msgstr ""
+
+#: builtin/mainmenu/tab_simple_main.lua
+msgid "Config mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_simple_main.lua
+msgid "Main"
+msgstr ""
+
+#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
+msgid "Play"
+msgstr ""
+
+#: builtin/mainmenu/tab_singleplayer.lua
+msgid "Singleplayer"
+msgstr ""
+
+#: builtin/mainmenu/tab_texturepacks.lua
+msgid "Select texture pack:"
+msgstr ""
+
+#: builtin/mainmenu/tab_texturepacks.lua
+msgid "No information available"
+msgstr ""
+
+#: builtin/mainmenu/tab_texturepacks.lua
+msgid "Texturepacks"
+msgstr ""
+
+#: src/client.cpp
+msgid "Connection timed out."
+msgstr ""
+
+#: src/client.cpp
+msgid "Loading textures..."
+msgstr ""
+
+#: src/client.cpp
+msgid "Rebuilding shaders..."
+msgstr ""
+
+#: src/client.cpp
+msgid "Initializing nodes..."
+msgstr ""
+
+#: src/client.cpp
+msgid "Initializing nodes"
+msgstr ""
+
+#: src/client.cpp
+msgid "Done!"
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Main Menu"
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Player name too long."
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "No world selected and no address provided. Nothing to do."
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Provided world path doesn't exist: "
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Could not find or load game \""
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Invalid gamespec."
+msgstr ""
+
+#: src/fontengine.cpp
+msgid "needs_fallback_font"
+msgstr ""
+
+#: src/game.cpp
+msgid "You died."
+msgstr ""
+
+#: src/game.cpp
+msgid "Respawn"
+msgstr ""
+
+#: src/game.cpp
+msgid ""
+"Default Controls:\n"
+"No menu visible:\n"
+"- single tap: button activate\n"
+"- double tap: place/use\n"
+"- slide finger: look around\n"
+"Menu/Inventory visible:\n"
+"- double tap (outside):\n"
+" -->close\n"
+"- touch stack, touch slot:\n"
+" --> move stack\n"
+"- touch&drag, tap 2nd finger\n"
+" --> place single item to slot\n"
+msgstr ""
+
+#: src/game.cpp
+msgid ""
+"Default Controls:\n"
+"- WASD: move\n"
+"- Space: jump/climb\n"
+"- Shift: sneak/go down\n"
+"- Q: drop item\n"
+"- I: inventory\n"
+"- Mouse: turn/look\n"
+"- Mouse left: dig/punch\n"
+"- Mouse right: place/use\n"
+"- Mouse wheel: select item\n"
+"- T: chat\n"
+msgstr ""
+
+#: src/game.cpp
+msgid "Continue"
+msgstr ""
+
+#: src/game.cpp
+msgid "Change Password"
+msgstr ""
+
+#: src/game.cpp
+msgid "Sound Volume"
+msgstr ""
+
+#: src/game.cpp
+msgid "Change Keys"
+msgstr ""
+
+#: src/game.cpp
+msgid "Exit to Menu"
+msgstr ""
+
+#: src/game.cpp
+msgid "Exit to OS"
+msgstr ""
+
+#: src/game.cpp
+msgid "Shutting down..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Creating server..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Creating client..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Resolving address..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Connecting to server..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Item definitions..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Node definitions..."
+msgstr ""
+
+#: src/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/game.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/game.cpp
+msgid "MiB/s"
+msgstr ""
+
+#: src/game.cpp src/guiFormSpecMenu.cpp
+msgid "ok"
+msgstr ""
+
+#: src/game.cpp
+msgid ""
+"\n"
+"Check debug.txt for details."
+msgstr ""
+
+#: src/guiFormSpecMenu.cpp
+msgid "Proceed"
+msgstr ""
+
+#: src/guiFormSpecMenu.cpp
+msgid "Enter "
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "\"Use\" = climb down"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Double tap \"jump\" to toggle fly"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Key already in use"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "press key"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Forward"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Backward"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Left"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Right"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Use"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Jump"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Sneak"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Drop"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Inventory"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Chat"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Command"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Console"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle fly"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle fast"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle Cinematic"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle noclip"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Range select"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
+msgid "Print stacks"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Zoom"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "Old Password"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "New Password"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "Confirm Password"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "Change"
+msgstr ""
+
+#: src/guiPasswordChange.cpp
+msgid "Passwords do not match!"
+msgstr ""
+
+#: src/guiVolumeChange.cpp
+msgid "Sound Volume: "
+msgstr ""
+
+#: src/guiVolumeChange.cpp
+msgid "Exit"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Button"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Middle Button"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Button"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "X Button 1"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Back"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Clear"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Return"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Tab"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "X Button 2"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Capital"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Control"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Kana"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Menu"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Pause"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Shift"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Convert"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Escape"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Final"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Junja"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Kanji"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Nonconvert"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "End"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Home"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Mode Change"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Next"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Prior"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Space"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Down"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Execute"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Print"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Select"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Up"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Help"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Insert"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Snapshot"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Windows"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Apps"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 0"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 1"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Windows"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Sleep"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 2"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 3"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 4"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 5"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 6"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 7"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad *"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad +"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad -"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad /"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 8"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Numpad 9"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Num Lock"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Scroll Lock"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Shift"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Shift"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Control"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Left Menu"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Control"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Right Menu"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Comma"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Minus"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Period"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Plus"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Attn"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "CrSel"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "Erase OEF"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "ExSel"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "OEM Clear"
+msgstr ""
+
+#: src/keycode.cpp
+msgid "PA1"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Build inside player"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, you can place blocks at the position (feet + eye level) where "
+"you stand.\n"
+"This is helpful when working with nodeboxes in small areas."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Flying"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Player is able to fly without being affected by gravity.\n"
+"This requires the \"fly\" privilege on the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast movement"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Fast movement (via use key).\n"
+"This requires the \"fast\" privilege on the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noclip"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled together with fly mode, player is able to fly through solid "
+"nodes.\n"
+"This requires the \"noclip\" privilege on the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cinematic mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
+"Useful for recording videos."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera smoothing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooths rotation of camera. 0 to disable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera smoothing in cinematic mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert mouse"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert vertical mouse movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity multiplier."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Key use for climbing/descending"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
+"and descending."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double tap jump for fly"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double-tapping the jump key toggles fly mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Always fly and fast"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If disabled \"use\" key is used to fly fast if both fly and fast mode are "
+"enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rightclick repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated right clicks when holding the "
+"right mouse button."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Random input"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable random user input (only used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Continuous forward"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Continuous forward movement (only used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Forward key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player forward.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Backward key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player backward.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Left key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player left.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Right key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player right.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Jump key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for jumping.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sneak key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for sneaking.\n"
+"Also used for climbing down and descending in water if aux1_descends is "
+"disabled.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Inventory key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the inventory.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving fast in fast mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat window.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Command key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat window to type commands.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat console.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Range select key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling unlimited view range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fly key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling flying.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling fast mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noclip key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling noclip mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cinematic mode key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling cinematic mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling display of minimap.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for taking screenshots.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Drop item key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for dropping the currently selected item.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "HUD toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the HUD.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the chat.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fog toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the fog.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera update toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the camera update. Only used for development\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug info toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of debug info.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiler toggle key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the profiler. Used for development.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Toggle camera mode key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for switching between first- and third-person camera.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View range increase key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for increasing the viewing range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View range decrease key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for decreasing the viewing range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for printing debug stacks. Used for development.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Network"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Address to connect to.\n"
+"Leave this blank to start a local server.\n"
+"Note that the address field in the main menu overrides this setting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remote port"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Port to connect to (UDP).\n"
+"Note that the port field in the main menu overrides this setting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Support older servers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to support older servers before protocol version 25.\n"
+"Enable if you want to connect to 0.4.12 servers and before.\n"
+"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
+"Disabling this option will protect your password better."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Saving map received from server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Save the map received by the client on disk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show entity selection boxes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connect to external media server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable usage of remote media server (if provided by server).\n"
+"Remote servers offer a significantly faster way to download media (e.g. "
+"textures)\n"
+"when connecting to the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "URL to the server list displayed in the Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist file"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"File in client/serverlist/ that contains your favorite servers displayed in "
+"the Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Graphics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-Game"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Basic"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "VBO"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable VBO"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fog"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether to fog out the end of the visible area."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Leaves style"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Leaves style:\n"
+"-   Fancy:  all faces visible\n"
+"-   Simple: only outer faces, if defined special_tiles are used\n"
+"-   Opaque: disable transparency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connect glass"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connects glass if supported by node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooth lighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable smooth lighting with simple ambient occlusion.\n"
+"Disable for speed or for different looks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds are a client side effect."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D clouds"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use 3D cloud look instead of flat."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Node highlighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Method used to highlight selected object."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mipmapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use mip mapping to scale textures. May slightly increase performance."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Anisotropic filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use anisotropic filtering when viewing at textures from an angle."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bilinear filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use bilinear filtering when scaling textures."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trilinear filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use trilinear filtering when scaling textures."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clean transparent textures"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Filtered textures can blend RGB values with fully-transparent neighbors,\n"
+"which PNG optimizers usually discard, sometimes resulting in a dark or\n"
+"light edge to transparent textures.  Apply this filter to clean that up\n"
+"at texture load time."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimum texture size for filters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
+"can be blurred, so automatically upscale them with nearest-neighbor\n"
+"interpolation to preserve crisp pixels.  This sets the minimum texture size\n"
+"for the upscaled textures; higher values look sharper, but require more\n"
+"memory.  Powers of 2 are recommended.  Setting this higher than 1 may not\n"
+"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
+"enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FSAA"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Experimental option, might cause visible spaces between blocks\n"
+"when set to higher number than 0."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Shaders allow advanced visual effects and may increase performance on some "
+"video cards.\n"
+"Thy only work with the OpenGL video backend."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filmic tone mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables filmic tone mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bumpmapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+"texture pack\n"
+"or need to be auto-generated.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Generate normalmaps"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables on the fly normalmap generation (Emboss effect).\n"
+"Requires bumpmapping to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Normalmaps strength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strength of generated normalmaps."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Normalmaps sampling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines sampling step of texture.\n"
+"A higher value results in smoother normal maps."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables parallax occlusion mapping.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"0 = parallax occlusion with slope information (faster).\n"
+"1 = relief mapping (slower, more accurate)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion strength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strength of parallax."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion iterations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Number of parallax occlusion iterations."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion Scale"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Overall scale of parallax occlusion effect."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion bias"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Overall bias of parallax occlusion effect, usually scale/2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving Nodes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true enables waving water.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water length"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving water speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving leaves"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true enables waving leaves.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving plants"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true enables waving plants.\n"
+"Requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Advanced"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If FPS would go higher than this, limit it by sleeping\n"
+"to not waste CPU power for no benefit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FPS in pause menu"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS when game is paused."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Viewing range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"View distance in nodes.\n"
+"Min = 20"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Full screen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fullscreen mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Full screen BPP"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bits per pixel (aka color depth) in fullscreen mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "V-Sync"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Vertical screen synchronization."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view in degrees."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
+"This setting is for the client only and is ignored by the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Texture path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Path to texture directory. All textures are first searched from here."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Video driver"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The rendering back-end for Irrlicht."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cloud height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height on which clouds are appearing."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cloud radius"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Radius of cloud area stated in number of 64 node cloud squares.\n"
+"Values larger than 26 will start to produce sharp cutoffs at cloud area "
+"corners."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View bobbing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Multiplier for view bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fall bobbing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Multiplier for fall bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"3D support.\n"
+"Currently supported:\n"
+"-    none: no 3d output.\n"
+"-    anaglyph: cyan/magenta color 3d.\n"
+"-    interlaced: odd/even line based polarisation screen support.\n"
+"-    topbottom: split screen top/bottom.\n"
+"-    sidebyside: split screen side by side.\n"
+"-    pageflip: quadbuffer based 3d."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box border color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width of the selectionbox's lines around nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Desynchronize block animation"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether node texture animations should be desynchronized per mapblock."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum hotbar width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum proportion of current window to be used for hotbar.\n"
+"Useful if there's something to be displayed right or left of hotbar."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mesh cache"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables caching of facedir rotated meshes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables minimap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Round minimap"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shape of the minimap. Enabled = round, disabled = square."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap scan height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"True = 256\n"
+"False = 128\n"
+"Useable to make minimap smoother on slower machines."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Colored fog"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ambient occlusion gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The strength (darkness) of node ambient-occlusion shading.\n"
+"Lower is darker, Higher is lighter. The valid range of values for this\n"
+"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
+"set to the nearest valid value."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Inventory items animations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables animation of inventory items."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Menus"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds in menu"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use a cloud animation for the main menu background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Scale gui by a user specified value.\n"
+"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
+"This will smooth over some of the rough edges, and blend\n"
+"pixels when scaling down, at the cost of blurring some\n"
+"edge pixels when images are scaled by non-integer sizes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter is true, all GUI images need to be\n"
+"filtered in software, but some images are generated directly\n"
+"to hardware (e.g. render-to-texture for nodes in inventory)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter txr2img"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter_txr2img is true, copy those images\n"
+"from hardware to software for scaling.  When false, fall back\n"
+"to the old scaling method, for video drivers that don't\n"
+"properly support downloading textures back from hardware."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Tooltip delay"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Delay showing tooltips, stated in milliseconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Freetype fonts"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether freetype fonts are used, requires freetype support to be compiled in."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Path to TrueTypeFont or bitmap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow offset, if 0 then shadow will not be drawn."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "This font will be used for certain languages."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font shadow"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font shadow alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot folder"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Path to save screenshots at."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Format of screenshots."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot quality"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Screenshot quality. Only used for JPEG format.\n"
+"1 means worst quality; 100 means best quality.\n"
+"Use 0 for default quality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "DPI"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
+"screens."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volume"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock unload timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Timeout for client to remove unused map data from memory."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of mapblocks for client to be kept in memory.\n"
+"Set to -1 for unlimited amount."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show debug info"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to show the client debug info (has the same effect as hitting F5)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server / Singleplayer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the server, to be displayed when players join and in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server description"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Description of server, to be displayed when players join and in the "
+"serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Domain name of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Homepage of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Announce server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Automaticaly report to the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Announce to this serverlist.\n"
+"If you want to announce your ipv6 address, use  serverlist_url = v6.servers."
+"minetest.net."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server port"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Network port to listen (UDP).\n"
+"This value will be overridden when starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bind address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The network interface that the server listens on."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strict protocol checking"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable to disallow old clients from connecting.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remote media"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Specifies URL from which client fetches media instead of using UDP.\n"
+"$filename should be accessible from $remote_media$filename via cURL\n"
+"(obviously, remote_media should end with a slash).\n"
+"Files that are not present will be fetched the usual way."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable/disable running an IPv6 server.  An IPv6 server may be restricted\n"
+"to IPv6 clients, depending on system configuration.\n"
+"Ignored if bind_address is set."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum simultaneous block sends per client"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum simultaneous block sends total"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"To reduce lag, block transfers are slowed down when a player is building "
+"something.\n"
+"This determines how long they are slowed down after placing or removing a "
+"node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. packets per iteration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of packets sent per send step, if you have a slow connection\n"
+"try reducing it, but don't reduce it to a number below double of targeted\n"
+"client number."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default game"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default game when creating a new world.\n"
+"This will be overridden when creating a world from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day displayed to players connecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum users"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of players that can connect simultaneously."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map directory"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"World directory (everything in the world is stored here).\n"
+"Not needed if starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Item entity TTL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Time in seconds for item entity (dropped items) to live.\n"
+"Setting it to -1 disables the feature."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Damage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable players getting damage and dying."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fixed map seed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"A chosen map seed for a new map, leave empty for random.\n"
+"Will be overridden when creating a new world in the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default password"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "New users need to input this password."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default privileges"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The privileges that new users automatically get.\n"
+"See /privs in game for a full list on your server and mod configuration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Basic Privileges"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Privileges that players with basic_privs can grant"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unlimited player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether players are shown to clients without any range limit.\n"
+"Deprecated, use the setting player_transfer_distance instead."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player versus Player"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether to allow players to damage and kill each other."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Static spawnpoint"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If this is set, players will always (re)spawn at the given position."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disallow empty passwords"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, new players cannot join with an empty password."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disable anticheat"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, disable cheat prevention in multiplayer."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rollback recording"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, actions are recorded for rollback.\n"
+"This option is only read when server starts."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shutdown message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "A message to be displayed to all clients when the server shuts down."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crash message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "A message to be displayed to all clients when the server crashes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ask to reconnect after crash"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to ask clients to reconnect after a (Lua) crash.\n"
+"Set this to true if your server is set up to restart automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active object send range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far clients know about objects, stated in mapblocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active block range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How large area of blocks are subject to the active block stuff, stated in "
+"mapblocks (16 nodes).\n"
+"In active blocks objects are loaded and ABMs run."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block send distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum forceloaded blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of forceloaded mapblocks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time send interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of sending time of day to clients."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls length of day/night cycle.\n"
+"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
+"unchanged."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map save interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of saving important changes in the world, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Physics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Acceleration in air"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Walking speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crouch speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Climbing speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Jumping speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Descending speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity smoothing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid sink"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Gravity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Deprecated Lua API handling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Handling for deprecated lua api calls:\n"
+"-    legacy: (try to) mimic old behaviour (default for release).\n"
+"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    error: abort on usage of deprecated call (suggested for mod developers)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. clearobjects extra blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of extra blocks that can be loaded by /clearobjects at once.\n"
+"This is a trade-off between sqlite transaction overhead and\n"
+"memory consumption (4096=100MB, as a rule of thumb)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unload unused server data"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How much the server will wait before unloading unused mapblocks.\n"
+"Higher value is smoother, but will use more RAM."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of statically stored objects in a block."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Synchronous SQLite"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dedicated server step"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of a server tick and the interval at which objects are generally "
+"updated over network."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active Block Management interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time in between active block management cycles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifier interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between ABM execution cycles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "NodeTimer interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between NodeTimer execution cycles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ignore world errors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, invalid world data won't cause the server to shut down.\n"
+"Only enable this if you know what you are doing."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid loop max"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max liquids processed per step."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid queue purge time"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time (in seconds) that the liquids queue may grow beyond processing\n"
+"capacity until an attempt is made to decrease its size by dumping old queue\n"
+"items.  A value of 0 disables the functionality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update tick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update interval in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of map generator to be used when creating a new world.\n"
+"Creating a world in the main menu will override this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water surface level of the world."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block generate distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are generated for clients, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map generation limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Where the map generator stops.\n"
+"Please note:\n"
+"-    Limited to 31000 (setting above has no effect)\n"
+"-    The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n"
+"-    Those groups have an offset of -32, -32 nodes from the origin.\n"
+"-    Only groups which are within the map_generation_limit are generated"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Global map generation attributes.\n"
+"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
+"and junglegrass, in all other mapgens this flag controls all decorations.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chunk size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dump the mapgen debug infos."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Absolute limit of emerge queues"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that can be queued for loading."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Limit of emerge queues on disk"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be loaded from file.\n"
+"Set to blank for an appropriate amount to be chosen automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Limit of emerge queues to generate"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be generated.\n"
+"Set to blank for an appropriate amount to be chosen automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Number of emerge threads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of emerge threads to use. Make this field blank, or increase this "
+"number\n"
+"to use multiple threads. On multiprocessor systems, this will improve mapgen "
+"speed greatly\n"
+"at the cost of slightly buggy caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome heat noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noise parameters for biome API temperature, humidity and biome blend."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen heat blend noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome humidity noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome humidity blend noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls width of tunnels, a smaller value creates wider tunnels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 factor noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 height noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v6.\n"
+"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
+"flag is ignored.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 desert frequency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls size of deserts and beaches in Mapgen v6.\n"
+"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 beach frequency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 terrain base noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 terrain altitude noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 steepness noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 height select noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 mud noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 beach noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 biome noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 cave noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 humidity noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 trees noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 apple trees noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v7.\n"
+"The 'ridges' flag controls the rivers.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain base noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain altitude noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain persistation noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 height select noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 mount height noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 ridge water noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 mountain noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 ridge noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen flat.\n"
+"Occasional lakes and hills can be added to the flat world.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat ground level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of flat ground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat large cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of upper limit of large pseudorandom caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat lake threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for lakes.\n"
+"Controls proportion of world area covered by lakes.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat lake steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/depth of lake depressions."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat hill threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for hills.\n"
+"Controls proportion of world area covered by hills.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat hill steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/height of hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat terrain noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Determines terrain shape.\n"
+"The 3 numbers in brackets control the scale of the\n"
+"terrain, the 3 numbers should be identical."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal fractal"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Choice of 18 fractals from 9 formulas.\n"
+"1 = 4D \"Roundy\" mandelbrot set.\n"
+"2 = 4D \"Roundy\" julia set.\n"
+"3 = 4D \"Squarry\" mandelbrot set.\n"
+"4 = 4D \"Squarry\" julia set.\n"
+"5 = 4D \"Mandy Cousin\" mandelbrot set.\n"
+"6 = 4D \"Mandy Cousin\" julia set.\n"
+"7 = 4D \"Variation\" mandelbrot set.\n"
+"8 = 4D \"Variation\" julia set.\n"
+"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n"
+"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n"
+"11 = 3D \"Christmas Tree\" mandelbrot set.\n"
+"12 = 3D \"Christmas Tree\" julia set.\n"
+"13 = 3D \"Mandelbulb\" mandelbrot set.\n"
+"14 = 3D \"Mandelbulb\" julia set.\n"
+"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n"
+"16 = 3D \"Cosine Mandelbulb\" julia set.\n"
+"17 = 4D \"Mandelbulb\" mandelbrot set.\n"
+"18 = 4D \"Mandelbulb\" julia set."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal iterations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Iterations of the recursive function.\n"
+"Controls the amount of fine detail."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal scale"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Approximate (X,Y,Z) scale of fractal in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal offset"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
+"Used to move a suitable spawn area of low land close to (0, 0).\n"
+"The default is suitable for mandelbrot sets, it needs to be edited for julia "
+"sets.\n"
+"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal slice w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"W co-ordinate of the generated 3D slice of a 4D fractal.\n"
+"Determines which 3D slice of the 4D shape is generated.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia x"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only: X component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only: Y component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia z"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only: Z component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only: W component of hypercomplex constant determining julia "
+"shape.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal seabed noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Valleys"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "General"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valleys C Flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Valleys.\n"
+"'altitude_chill' makes higher elevations colder, which may cause biome "
+"issues.\n"
+"'humid_rivers' modifies the humidity around rivers and in areas where water "
+"would tend to pool,\n"
+"it may interfere with delicately adjusted biomes.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Altitude Chill"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The altitude at which temperature drops by 20C"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Large cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find large caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lava Features"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable lava features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find massive caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How deep to make rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How wide to make rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water Features"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable water features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noises"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #1"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Caves and tunnels form at the intersection of the two noises"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #2"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filler Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The depth of dirt or other filler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive cave noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive caves form here."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River noise -- rivers occur close to zero"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain Height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Base terrain height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Raises terrain to make valleys around the rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Fill"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Slope and fill work together to modify the heights"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Profile"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Amplifies the valleys"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Slope"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable mod security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Prevent mods from doing insecure things like running shell commands."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trusted mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "HTTP Mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chatcommands"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client and Server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the player.\n"
+"When running a server, clients connecting with this name are admins.\n"
+"When starting from the main menu, this is overridden."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Language"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the language. Leave empty to use the system language.\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug log level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Level of logging to be written to debug.txt:\n"
+"-    <nothing> (no logging)\n"
+"-    none (messages with no level)\n"
+"-    error\n"
+"-    warning\n"
+"-    action\n"
+"-    info\n"
+"-    verbose"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 support."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default timeout for cURL, stated in milliseconds.\n"
+"Only has an effect if compiled with cURL."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL parallel limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Limits number of parallel HTTP requests. Affects:\n"
+"-    Media fetch if server uses remote_media setting.\n"
+"-    Serverlist download and server announcement.\n"
+"-    Downloads performed by main menu (e.g. mod manager).\n"
+"Only has an effect if compiled with cURL."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL file download timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum time in ms a file download (e.g. a mod download) may take."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "High-precision FPU"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Main menu script"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Replaces the default main menu with a custom one."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Main menu game manager"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Main menu mod manager"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Modstore download URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Modstore mods list URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Modstore details URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""

From 6752dda856d1c16e3b2e974ff9ea76e24e171a14 Mon Sep 17 00:00:00 2001
From: Eidy <JulianBiddle@practicalcybernetics.com>
Date: Mon, 3 Oct 2016 04:27:05 +0000
Subject: [PATCH 354/418] Translated using Weblate (Swahili)

Currently translated at 99.8% (917 of 918 strings)

This is a merger of 3 commits.
---
 po/sw/minetest.po | 2002 ++++++++++++++++++++++++++++-----------------
 1 file changed, 1235 insertions(+), 767 deletions(-)

diff --git a/po/sw/minetest.po b/po/sw/minetest.po
index 0f29ebb6d..3b851e057 100644
--- a/po/sw/minetest.po
+++ b/po/sw/minetest.po
@@ -1,97 +1,95 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the minetest package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: minetest\n"
+"Project-Id-Version: Minetest Translate\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2016-10-03 05:13+0000\n"
+"Last-Translator: Eidy <JulianBiddle@practicalcybernetics.com>\n"
+"Language-Team: Swahili "
+"<https://hosted.weblate.org/projects/minetest/minetest/sw/>\n"
 "Language: sw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr ""
+msgstr "Seva imeomba na Unganisha upya:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
-msgstr ""
+msgstr "Menyu kuu"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr ""
+msgstr "Unganisha upya"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr ""
+msgstr "Kosa limetokea katika hati Lua, kama vile Moduli na:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
-msgstr ""
+msgstr "Kosa limetokea:"
 
 #: builtin/fstk/ui.lua builtin/mainmenu/store.lua
 msgid "Ok"
-msgstr ""
+msgstr "Sawa kabisa"
 
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
-msgstr ""
+msgstr "Inapakia..."
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
+msgstr "Jaribu reenabling serverlist umma na Kagua muunganisho wako wa tovuti."
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr ""
+msgstr "Seva inasaidia matoleo ya itifaki kati ya $1 na $2."
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr ""
+msgstr "Seva anahimiza itifaki toleo dola 1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr ""
+msgstr "Tunaunga mkono matoleo ya itifaki kati ya toleo la $1 na $2."
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr ""
+msgstr "Sisi tu mkono itifaki toleo la $1."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr ""
+msgstr "Itifaki ya toleo haifanani."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
-msgstr ""
+msgstr "Ulimwengu:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
-msgstr ""
+msgstr "Ficha mchezo"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide mp content"
-msgstr ""
+msgstr "Ficha maudhui ya mbunge"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr ""
+msgstr "Moduli:"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
 msgid "Depends:"
-msgstr ""
+msgstr "Inategemea:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
 msgid "Save"
-msgstr ""
+msgstr "Hifadhi"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -99,641 +97,652 @@ msgstr ""
 #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
 #: src/keycode.cpp
 msgid "Cancel"
-msgstr ""
+msgstr "Katisha"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable MP"
-msgstr ""
+msgstr "Wezesha MP"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable MP"
-msgstr ""
+msgstr "Lemaza MP"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
-msgstr ""
+msgstr "kuwezeshwa"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr ""
+msgstr "Wezesha yote"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
+"Ilishindwa kuwezesha Moduli \"dola 1\" kama lina vibambo ilipopiga. Tu "
+"chararacters [kwa-z0-9_] wanaruhusiwa."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
-msgstr ""
+msgstr "Jina la ulimwengu"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Seed"
-msgstr ""
+msgstr "Mbegu"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
-msgstr ""
+msgstr "Mwandishi ramani"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
-msgstr ""
+msgstr "Mchezo"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
-msgstr ""
+msgstr "Kuunda"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no subgames installed."
-msgstr ""
+msgstr "Una subgames hakuna imewekwa."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr ""
+msgstr "Pakua moja kutoka minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The minimal development test is meant for developers."
-msgstr ""
+msgstr "Tahadhari: Mtihani wa maendeleo ndogo ni maana kwa watengenezaji."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr ""
+msgstr "Pakua subgame, kama vile minetest_game, kutoka minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr ""
+msgstr "Ulimwengu inayoitwa \"dola 1\" tayari ipo"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No worldname given or no game selected"
-msgstr ""
+msgstr "Hakuna worldname kupewa au mchezo hakuna iliyoteuliwa"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr ""
+msgstr "Una uhakika unataka kufuta \"dola 1\"?"
 
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 #: src/keycode.cpp
 msgid "Delete"
-msgstr ""
+msgstr "Futa"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: failed to delete \"$1\""
-msgstr ""
+msgstr "Modmgr: imeshindwa kufuta \"dola 1\""
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: invalid modpath \"$1\""
-msgstr ""
+msgstr "Modmgr: batili modpath \"dola 1\""
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr ""
+msgstr "Futa ulimwengu \"dola 1\"?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr ""
+msgstr "Ita jina jipya Modpack:"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
 msgid "Accept"
-msgstr ""
+msgstr "Kukubali"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
-msgstr ""
+msgstr "Michezo"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
 msgid "Mods"
-msgstr ""
+msgstr "Mods"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
-msgstr ""
+msgstr "(Hakuna maelezo ya kuweka kupewa)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a comma seperated list of flags."
-msgstr ""
+msgstr "Tafadhali ingiza mkato seperated orodha ya bendera."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Possible values are: "
-msgstr ""
+msgstr "Thamani inayofaa ni:"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
+"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
+"<octaves>, <persistence></persistence></octaves></seed></spreadZ></spreadY></"
+"spreadX></scale></offset>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
-msgstr ""
+msgstr "Hiari ya lacunarity unaweza umeongezewa na mkato kuongoza."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Format is 3 numbers separated by commas and inside brackets."
-msgstr ""
+msgstr "Umbizo ni namba 3 limegawanywa na mikato na ndani ya mabano."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
-msgstr ""
+msgstr "Walemavu"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Enabled"
-msgstr ""
+msgstr "Kuwezeshwa"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
-msgstr ""
+msgstr "Vinjari"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
-msgstr ""
+msgstr "Tafadhali ingiza namba kamili halali."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be greater than $1."
-msgstr ""
+msgstr "Thamani lazima iwe kubwa kuliko dola 1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be lower than $1."
-msgstr ""
+msgstr "Thamani lazima iwe chini kuliko dola 1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid number."
-msgstr ""
+msgstr "Tafadhali ingiza namba halali."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "\"$1\" is not a valid flag."
-msgstr ""
+msgstr "\"dola 1\" si bendera halali."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select path"
-msgstr ""
+msgstr "Teua njia"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
 msgstr ""
+"< Back to Settings page back=\"\" to=\"\" settings=\"\"></ Back to Settings "
+"page>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Edit"
-msgstr ""
+msgstr "Hariri"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
-msgstr ""
+msgstr "Rejesha chaguo-msingi"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
-msgstr ""
+msgstr "Onyesha majina ya kiufundi"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: file: \"$1\""
-msgstr ""
+msgstr "Sakinisha Moduli: faili: \"dola 1\""
 
 #: builtin/mainmenu/modmgr.lua
 msgid ""
 "\n"
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
+"Sakinisha Moduli: filetype visivyotegemezwa \"dola 1\" au nyaraka kuvunjwa"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Failed to install $1 to $2"
-msgstr ""
+msgstr "Imeshindwa kusakinisha dola 1 hadi $2"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find suitable foldername for modpack $1"
 msgstr ""
+"Sakinisha Moduli: haiwezi kupata foldername ya kufaa kwa ajili ya modpack $1"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find real modname for: $1"
-msgstr ""
+msgstr "Sakinisha Moduli: haiwezi kupata modname halisi kwa: $1"
 
 #: builtin/mainmenu/store.lua
 msgid "Unsorted"
-msgstr ""
+msgstr "Zisizochambuliwa"
 
 #: builtin/mainmenu/store.lua
 msgid "Search"
-msgstr ""
+msgstr "Utafutaji"
 
 #: builtin/mainmenu/store.lua
 msgid "Downloading $1, please wait..."
-msgstr ""
+msgstr "Inapakua $1, Tafadhali subiri..."
 
 #: builtin/mainmenu/store.lua
 msgid "Successfully installed:"
-msgstr ""
+msgstr "Imefanikiwa kusakinisha:"
 
 #: builtin/mainmenu/store.lua
 msgid "Shortname:"
-msgstr ""
+msgstr "Shortname:"
 
 #: builtin/mainmenu/store.lua
 msgid "Rating"
-msgstr ""
+msgstr "Makadirio"
 
 #: builtin/mainmenu/store.lua
 msgid "re-Install"
-msgstr ""
+msgstr "Sakinisha upya"
 
 #: builtin/mainmenu/store.lua
 msgid "Install"
-msgstr ""
+msgstr "Sakinisha"
 
 #: builtin/mainmenu/store.lua
 msgid "Close store"
-msgstr ""
+msgstr "Duka la karibu"
 
 #: builtin/mainmenu/store.lua
 msgid "Page $1 of $2"
-msgstr ""
+msgstr "Ukurasa dola 1 ya $2"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
-msgstr ""
+msgstr "Mikopo"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
-msgstr ""
+msgstr "Watengenezaji wa msingi"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
-msgstr ""
+msgstr "Wachangiaji amilifu"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr ""
+msgstr "Awali msingi watengenezaji"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
-msgstr ""
+msgstr "Wachangiaji wa awali"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Installed Mods:"
-msgstr ""
+msgstr "Mods zilizosakinishwa:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "No mod description available"
-msgstr ""
+msgstr "Hakuna maelezo Moduli inapatikana"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Mod information:"
-msgstr ""
+msgstr "Taarifa Moduli:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Rename"
-msgstr ""
+msgstr "Ita jina jipya"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected modpack"
-msgstr ""
+msgstr "Sakinusha modpack teuliwa"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected mod"
-msgstr ""
+msgstr "Sakinusha Moduli teuliwa"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Select Mod File:"
-msgstr ""
+msgstr "Teua faili ya Moduli:"
 
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port"
-msgstr ""
+msgstr "Kushughulikia / bandari"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Name / Password"
-msgstr ""
+msgstr "Jina / nenosiri"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Connect"
-msgstr ""
+msgstr "Kuunganisha"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr ""
+msgstr "Del. kipendwa"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
-msgstr ""
+msgstr "Kipendwa"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative mode"
-msgstr ""
+msgstr "Hali ya ubunifu"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Damage enabled"
-msgstr ""
+msgstr "Uharibifu kuwezeshwa"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
-msgstr ""
+msgstr "PvP kuwezeshwa"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
-msgstr ""
+msgstr "Mteja"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "New"
-msgstr ""
+msgstr "Mpya"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Configure"
-msgstr ""
+msgstr "Sanidi"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Start Game"
-msgstr ""
+msgstr "Anzisha mchezo"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Select World:"
-msgstr ""
+msgstr "Teua ulimwengu:"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Creative Mode"
-msgstr ""
+msgstr "Hali ya ubunifu"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Enable Damage"
-msgstr ""
+msgstr "Wezesha uharibifu"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Public"
-msgstr ""
+msgstr "Umma"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Name/Password"
-msgstr ""
+msgstr "Jina/nenosiri"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Bind Address"
-msgstr ""
+msgstr "Kumfunga anwani"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Port"
-msgstr ""
+msgstr "Bandari"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Server Port"
-msgstr ""
+msgstr "Kituo tarishi cha seva"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "No world created or selected!"
-msgstr ""
+msgstr "Duniani hakuna kuundwa au kuteuliwa!"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Server"
-msgstr ""
+msgstr "Seva"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
-msgstr ""
+msgstr "Majani opaque"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Simple Leaves"
-msgstr ""
+msgstr "Rahisi majani"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Fancy Leaves"
-msgstr ""
+msgstr "Majani ya dhana"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Outlining"
-msgstr ""
+msgstr "Fundo Ufupisho"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr ""
+msgstr "Fundo udhulisho"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
-msgstr ""
+msgstr "Kichujio hakuna"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
-msgstr ""
+msgstr "Kichujio bilinear"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
-msgstr ""
+msgstr "Kichujio trilinear"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
-msgstr ""
+msgstr "Hakuna Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
-msgstr ""
+msgstr "Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
-msgstr ""
+msgstr "Mipmap + Aniso. Kichujio"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
-msgstr ""
+msgstr "Hakuna"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
-msgstr ""
+msgstr "2 x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
-msgstr ""
+msgstr "4 x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "8x"
-msgstr ""
+msgstr "8 x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
+msgstr "Je, una hakika upya ulimwengu wako singleplayer?"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Yes"
-msgstr ""
+msgstr "Ndio"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No"
-msgstr ""
+msgstr "La"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Smooth Lighting"
-msgstr ""
+msgstr "Taa laini"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
-msgstr ""
+msgstr "Chembe"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "3D Clouds"
-msgstr ""
+msgstr "Mawingu ya 3D"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Water"
-msgstr ""
+msgstr "Maji opaque"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Connected Glass"
-msgstr ""
+msgstr "Kioo kushikamana"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Texturing:"
-msgstr ""
+msgstr "Texturing:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr ""
+msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Shaders"
-msgstr ""
+msgstr "Shaders"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Reset singleplayer world"
-msgstr ""
+msgstr "Weka upya singleplayer ulimwengu"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
-msgstr ""
+msgstr "Badilisha funguo"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Vipimo pevu"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold (px)"
-msgstr ""
+msgstr "Touchthreshold (px)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bump Mapping"
-msgstr ""
+msgstr "Mapema ramani"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr ""
+msgstr "Ramani ya toni"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Normal Mapping"
-msgstr ""
+msgstr "Ramani ya kawaida"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Parallax Occlusion"
-msgstr ""
+msgstr "Parallax Occlusion"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Water"
-msgstr ""
+msgstr "Waving maji"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
-msgstr ""
+msgstr "Waving majani"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Plants"
-msgstr ""
+msgstr "Waving mimea"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr ""
+msgstr "Ili kuwezesha shaders OpenGL ya kiendeshaji inahitaji kutumiwa."
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
-msgstr ""
+msgstr "Vipimo vya"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Start Singleplayer"
-msgstr ""
+msgstr "Kuanza Singleplayer"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Config mods"
-msgstr ""
+msgstr "Mods Now"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Main"
-msgstr ""
+msgstr "Kuu"
 
 #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
 msgid "Play"
-msgstr ""
+msgstr "Kucheza"
 
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Singleplayer"
-msgstr ""
+msgstr "Singleplayer"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Select texture pack:"
-msgstr ""
+msgstr "Chagua Kipeto cha unamu:"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "No information available"
-msgstr ""
+msgstr "Hakuna taarifa zilizopo"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Texturepacks"
-msgstr ""
+msgstr "Texturepacks"
 
 #: src/client.cpp
 msgid "Connection timed out."
-msgstr ""
+msgstr "Muunganisho limekatika."
 
 #: src/client.cpp
 msgid "Loading textures..."
-msgstr ""
+msgstr "Kupakia unamu..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr ""
+msgstr "Kuijenga upya shaders..."
 
 #: src/client.cpp
 msgid "Initializing nodes..."
-msgstr ""
+msgstr "Inaanzilisha fundo..."
 
 #: src/client.cpp
 msgid "Initializing nodes"
-msgstr ""
+msgstr "Inaanzilisha fundo"
 
 #: src/client.cpp
 msgid "Done!"
-msgstr ""
+msgstr "Kufanyika!"
 
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
-msgstr ""
+msgstr "Menyu kuu"
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
-msgstr ""
+msgstr "Mchezaji jina refu."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
-msgstr ""
+msgstr "Kosa la muunganisho (wakati muafaka?)"
 
 #: src/client/clientlauncher.cpp
 msgid "No world selected and no address provided. Nothing to do."
 msgstr ""
+"Duniani hakuna iliyoteuliwa na hakuna anwani iliyotolewa. Kitu cha kufanya."
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr ""
+msgstr "Njia ya dunia iliyotolewa haipo:"
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
-msgstr ""
+msgstr "Haikuweza kupata wala kupakia mchezo\""
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
-msgstr ""
+msgstr "Gamespec batili."
 
 #: src/fontengine.cpp
+#, fuzzy
 msgid "needs_fallback_font"
-msgstr ""
+msgstr "Maalum Alphabet Inahitajika"
 
 #: src/game.cpp
 msgid "You died."
-msgstr ""
+msgstr "Alikufa."
 
 #: src/game.cpp
 msgid "Respawn"
-msgstr ""
+msgstr "Respawn"
 
 #: src/game.cpp
 msgid ""
@@ -750,6 +759,11 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
+"Vidhibiti vya chaguo-msingi: Hakuna Menyu kuonekana:-bomba moja: kitufe "
+"kuamilisha - mara mbili bomba: mahali/matumizi - slaidi kidole: kuangalia "
+"kote Menyu/hesabu dhahiri: - mara mbili bomba (nje):--> Funga - kugusa "
+"mpororo, kugusa mpenyo:--> hoja mpororo - kugusa & buruta, bomba kidole 2--> "
+"kipengee kimoja mahali kwa yanayopangwa"
 
 #: src/game.cpp
 msgid ""
@@ -765,504 +779,508 @@ msgid ""
 "- Mouse wheel: select item\n"
 "- T: chat\n"
 msgstr ""
+"Vidhibiti vya chaguo-msingi:-WASD: hoja - nafasi: kuruka/kupanda - Hamisha: "
+"taarifa/kwenda chini - q: tone kipengee - nikasema hesabu - kipanya: kugeuka/"
+"kuangalia - kipanya kushoto: kuchimba/punch - kipanya kulia: mahali/matumizi "
+"- kipanya gurudumu: Teua kipengee - T: mazungumzo"
 
 #: src/game.cpp
 msgid "Continue"
-msgstr ""
+msgstr "Kuendelea"
 
 #: src/game.cpp
 msgid "Change Password"
-msgstr ""
+msgstr "Badilisha nywila"
 
 #: src/game.cpp
 msgid "Sound Volume"
-msgstr ""
+msgstr "Kiwango cha sauti"
 
 #: src/game.cpp
 msgid "Change Keys"
-msgstr ""
+msgstr "Badilisha funguo"
 
 #: src/game.cpp
 msgid "Exit to Menu"
-msgstr ""
+msgstr "Toka kwenye menyu"
 
 #: src/game.cpp
 msgid "Exit to OS"
-msgstr ""
+msgstr "Toka kwa OS"
 
 #: src/game.cpp
 msgid "Shutting down..."
-msgstr ""
+msgstr "Inazima..."
 
 #: src/game.cpp
 msgid "Creating server..."
-msgstr ""
+msgstr "Inaunda seva..."
 
 #: src/game.cpp
 msgid "Creating client..."
-msgstr ""
+msgstr "Inaunda mteja..."
 
 #: src/game.cpp
 msgid "Resolving address..."
-msgstr ""
+msgstr "Kusuluhisha anwani..."
 
 #: src/game.cpp
 msgid "Connecting to server..."
-msgstr ""
+msgstr "Inaunganisha seva..."
 
 #: src/game.cpp
 msgid "Item definitions..."
-msgstr ""
+msgstr "Fasili ya kipengele..."
 
 #: src/game.cpp
 msgid "Node definitions..."
-msgstr ""
+msgstr "Fundo Fasili..."
 
 #: src/game.cpp
 msgid "Media..."
-msgstr ""
+msgstr "Vyombo vya habari..."
 
 #: src/game.cpp
 msgid "KiB/s"
-msgstr ""
+msgstr "Kibu/s"
 
 #: src/game.cpp
 msgid "MiB/s"
-msgstr ""
+msgstr "MiB/s"
 
 #: src/game.cpp src/guiFormSpecMenu.cpp
 msgid "ok"
-msgstr ""
+msgstr "Sawa kabisa"
 
 #: src/game.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
-msgstr ""
+msgstr "Angalia debug.txt kwa maelezo."
 
 #: src/guiFormSpecMenu.cpp
 msgid "Proceed"
-msgstr ""
+msgstr "Kuendelea"
 
 #: src/guiFormSpecMenu.cpp
 msgid "Enter "
-msgstr ""
+msgstr "Ingiza"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
-msgstr ""
+msgstr "Keybindings. (Kama Menyu hii screws, Ondoa vitu kutoka minetest.conf)"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "\"Use\" = climb down"
-msgstr ""
+msgstr "\"Matumizi\" = kupanda chini"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr ""
+msgstr "Mara mbili bomba \"Ruka\" hadi Togo kuruka"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Key already in use"
-msgstr ""
+msgstr "Muhimu tayari katika matumizi"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
-msgstr ""
+msgstr "Bonyeza Kibonye"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Forward"
-msgstr ""
+msgstr "Mbele"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Backward"
-msgstr ""
+msgstr "Nyuma"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Left"
-msgstr ""
+msgstr "Kushoto"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Right"
-msgstr ""
+msgstr "Kulia"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Use"
-msgstr ""
+msgstr "Matumizi"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Jump"
-msgstr ""
+msgstr "Kuruka"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Sneak"
-msgstr ""
+msgstr "Taarifa"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Drop"
-msgstr ""
+msgstr "Achia"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Inventory"
-msgstr ""
+msgstr "Hesabu"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Chat"
-msgstr ""
+msgstr "Kuzungumza"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Command"
-msgstr ""
+msgstr "Amri"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Console"
-msgstr ""
+msgstr "Kiweko"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fly"
-msgstr ""
+msgstr "Togoa kuruka"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
-msgstr ""
+msgstr "Togoa haraka"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle Cinematic"
-msgstr ""
+msgstr "Togoa Cinematic"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
-msgstr ""
+msgstr "Togoa noclip"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Range select"
-msgstr ""
+msgstr "Teua masafa"
 
 #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Print stacks"
-msgstr ""
+msgstr "Chapisha mipororo"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Zoom"
-msgstr ""
+msgstr "Kuza"
 
 #: src/guiPasswordChange.cpp
 msgid "Old Password"
-msgstr ""
+msgstr "Nywila ya zamani"
 
 #: src/guiPasswordChange.cpp
 msgid "New Password"
-msgstr ""
+msgstr "Nywila mpya"
 
 #: src/guiPasswordChange.cpp
 msgid "Confirm Password"
-msgstr ""
+msgstr "Thibitisha nywila"
 
 #: src/guiPasswordChange.cpp
 msgid "Change"
-msgstr ""
+msgstr "Mabadiliko"
 
 #: src/guiPasswordChange.cpp
 msgid "Passwords do not match!"
-msgstr ""
+msgstr "MaNenotambulishi hayaoani!"
 
 #: src/guiVolumeChange.cpp
 msgid "Sound Volume: "
-msgstr ""
+msgstr "Kiwango sauti:"
 
 #: src/guiVolumeChange.cpp
 msgid "Exit"
-msgstr ""
+msgstr "Toka"
 
 #: src/keycode.cpp
 msgid "Left Button"
-msgstr ""
+msgstr "Kitufe kushoto"
 
 #: src/keycode.cpp
 msgid "Middle Button"
-msgstr ""
+msgstr "Kitufe kati"
 
 #: src/keycode.cpp
 msgid "Right Button"
-msgstr ""
+msgstr "Kitufe kulia"
 
 #: src/keycode.cpp
 msgid "X Button 1"
-msgstr ""
+msgstr "X kitufe 1"
 
 #: src/keycode.cpp
 msgid "Back"
-msgstr ""
+msgstr "Nyuma"
 
 #: src/keycode.cpp
 msgid "Clear"
-msgstr ""
+msgstr "Wazi"
 
 #: src/keycode.cpp
 msgid "Return"
-msgstr ""
+msgstr "Kurudi"
 
 #: src/keycode.cpp
 msgid "Tab"
-msgstr ""
+msgstr "Kichupo"
 
 #: src/keycode.cpp
 msgid "X Button 2"
-msgstr ""
+msgstr "X kitufe 2"
 
 #: src/keycode.cpp
 msgid "Capital"
-msgstr ""
+msgstr "Mji mkuu"
 
 #: src/keycode.cpp
 msgid "Control"
-msgstr ""
+msgstr "Udhibiti"
 
 #: src/keycode.cpp
 msgid "Kana"
-msgstr ""
+msgstr "Kana"
 
 #: src/keycode.cpp
 msgid "Menu"
-msgstr ""
+msgstr "Menyu"
 
 #: src/keycode.cpp
 msgid "Pause"
-msgstr ""
+msgstr "Sitisha"
 
 #: src/keycode.cpp
 msgid "Shift"
-msgstr ""
+msgstr "Shift"
 
 #: src/keycode.cpp
 msgid "Convert"
-msgstr ""
+msgstr "Geuza"
 
 #: src/keycode.cpp
 msgid "Escape"
-msgstr ""
+msgstr "Kutoroka"
 
 #: src/keycode.cpp
 msgid "Final"
-msgstr ""
+msgstr "Mwisho"
 
 #: src/keycode.cpp
 msgid "Junja"
-msgstr ""
+msgstr "Junja"
 
 #: src/keycode.cpp
 msgid "Kanji"
-msgstr ""
+msgstr "KanJi"
 
 #: src/keycode.cpp
 msgid "Nonconvert"
-msgstr ""
+msgstr "Nonconvert"
 
 #: src/keycode.cpp
 msgid "End"
-msgstr ""
+msgstr "Mwisho"
 
 #: src/keycode.cpp
 msgid "Home"
-msgstr ""
+msgstr "Nyumbani"
 
 #: src/keycode.cpp
 msgid "Mode Change"
-msgstr ""
+msgstr "Mabadiliko ya hali ya"
 
 #: src/keycode.cpp
 msgid "Next"
-msgstr ""
+msgstr "Ijayo"
 
 #: src/keycode.cpp
 msgid "Prior"
-msgstr ""
+msgstr "Awali"
 
 #: src/keycode.cpp
 msgid "Space"
-msgstr ""
+msgstr "Nafasi"
 
 #: src/keycode.cpp
 msgid "Down"
-msgstr ""
+msgstr "Chini"
 
 #: src/keycode.cpp
 msgid "Execute"
-msgstr ""
+msgstr "Kutekeleza"
 
 #: src/keycode.cpp
 msgid "Print"
-msgstr ""
+msgstr "Chapa"
 
 #: src/keycode.cpp
 msgid "Select"
-msgstr ""
+msgstr "Teua"
 
 #: src/keycode.cpp
 msgid "Up"
-msgstr ""
+msgstr "Juu"
 
 #: src/keycode.cpp
 msgid "Help"
-msgstr ""
+msgstr "Msaada"
 
 #: src/keycode.cpp
 msgid "Insert"
-msgstr ""
+msgstr "Chomeka"
 
 #: src/keycode.cpp
 msgid "Snapshot"
-msgstr ""
+msgstr "Taswira tuli"
 
 #: src/keycode.cpp
 msgid "Left Windows"
-msgstr ""
+msgstr "Windows kushoto"
 
 #: src/keycode.cpp
 msgid "Apps"
-msgstr ""
+msgstr "Programu"
 
 #: src/keycode.cpp
 msgid "Numpad 0"
-msgstr ""
+msgstr "Kinanda 0"
 
 #: src/keycode.cpp
 msgid "Numpad 1"
-msgstr ""
+msgstr "Kinanda 1"
 
 #: src/keycode.cpp
 msgid "Right Windows"
-msgstr ""
+msgstr "Windows kulia"
 
 #: src/keycode.cpp
 msgid "Sleep"
-msgstr ""
+msgstr "Usingizi"
 
 #: src/keycode.cpp
 msgid "Numpad 2"
-msgstr ""
+msgstr "Kinanda 2"
 
 #: src/keycode.cpp
 msgid "Numpad 3"
-msgstr ""
+msgstr "Kinanda 3"
 
 #: src/keycode.cpp
 msgid "Numpad 4"
-msgstr ""
+msgstr "Kinanda 4"
 
 #: src/keycode.cpp
 msgid "Numpad 5"
-msgstr ""
+msgstr "Kinanda 5"
 
 #: src/keycode.cpp
 msgid "Numpad 6"
-msgstr ""
+msgstr "Kinanda 6"
 
 #: src/keycode.cpp
 msgid "Numpad 7"
-msgstr ""
+msgstr "Kinanda 7"
 
 #: src/keycode.cpp
 msgid "Numpad *"
-msgstr ""
+msgstr "Kinanda *"
 
 #: src/keycode.cpp
 msgid "Numpad +"
-msgstr ""
+msgstr "Kinanda +"
 
 #: src/keycode.cpp
 msgid "Numpad -"
-msgstr ""
+msgstr "Numpad-"
 
 #: src/keycode.cpp
 msgid "Numpad /"
-msgstr ""
+msgstr "Kinanda /"
 
 #: src/keycode.cpp
 msgid "Numpad 8"
-msgstr ""
+msgstr "Kinanda 8"
 
 #: src/keycode.cpp
 msgid "Numpad 9"
-msgstr ""
+msgstr "Kinanda 9"
 
 #: src/keycode.cpp
 msgid "Num Lock"
-msgstr ""
+msgstr "Num Lock"
 
 #: src/keycode.cpp
 msgid "Scroll Lock"
-msgstr ""
+msgstr "Scroll Lock"
 
 #: src/keycode.cpp
 msgid "Left Shift"
-msgstr ""
+msgstr "Kisogezi kushoto"
 
 #: src/keycode.cpp
 msgid "Right Shift"
-msgstr ""
+msgstr "Kisogezi kulia"
 
 #: src/keycode.cpp
 msgid "Left Control"
-msgstr ""
+msgstr "Udhibiti wa kushoto"
 
 #: src/keycode.cpp
 msgid "Left Menu"
-msgstr ""
+msgstr "Menyu ya kushoto"
 
 #: src/keycode.cpp
 msgid "Right Control"
-msgstr ""
+msgstr "Udhibiti sahihi"
 
 #: src/keycode.cpp
 msgid "Right Menu"
-msgstr ""
+msgstr "Menyu kulia"
 
 #: src/keycode.cpp
 msgid "Comma"
-msgstr ""
+msgstr "Mkato"
 
 #: src/keycode.cpp
 msgid "Minus"
-msgstr ""
+msgstr "Alama ya kutoa"
 
 #: src/keycode.cpp
 msgid "Period"
-msgstr ""
+msgstr "Kipindi cha"
 
 #: src/keycode.cpp
 msgid "Plus"
-msgstr ""
+msgstr "Plus"
 
 #: src/keycode.cpp
 msgid "Attn"
-msgstr ""
+msgstr "Attn"
 
 #: src/keycode.cpp
 msgid "CrSel"
-msgstr ""
+msgstr "CrSel"
 
 #: src/keycode.cpp
 msgid "Erase OEF"
-msgstr ""
+msgstr "Futa OEF"
 
 #: src/keycode.cpp
 msgid "ExSel"
-msgstr ""
+msgstr "ExSel"
 
 #: src/keycode.cpp
 msgid "OEM Clear"
-msgstr ""
+msgstr "Wazi ya OEM"
 
 #: src/keycode.cpp
 msgid "PA1"
-msgstr ""
+msgstr "PA1"
 
 #: src/settings_translation_file.cpp
 msgid "Controls"
-msgstr ""
+msgstr "Vidhibiti"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
-msgstr ""
+msgstr "Kujenga ndani ya mchezaji"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1270,30 +1288,37 @@ msgid ""
 "you stand.\n"
 "This is helpful when working with nodeboxes in small areas."
 msgstr ""
+"Ikiwa imewezeshwa, unaweza mahali vitalu katika nafasi (miguu + jicho "
+"kiwango) ambako kusimama.\n"
+"Hii ni kusaidia unapofanya kazi na nodeboxes katika maeneo madogo."
 
 #: src/settings_translation_file.cpp
 msgid "Flying"
-msgstr ""
+msgstr "Kuruka"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
 msgstr ""
+"Mchezaji ni uwezo wa kuruka bila kuwa walioathirika na mvuto.\n"
+"Hii inahitaji upendeleo \"kuruka\" kwenye seva."
 
 #: src/settings_translation_file.cpp
 msgid "Fast movement"
-msgstr ""
+msgstr "Kutembea haraka"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Fast movement (via use key).\n"
 "This requires the \"fast\" privilege on the server."
 msgstr ""
+"Harakati haraka (kupitia matumizi muhimu).\n"
+"Hii inahitaji upendeleo \"haraka\" kwenye seva."
 
 #: src/settings_translation_file.cpp
 msgid "Noclip"
-msgstr ""
+msgstr "Noclip"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1301,130 +1326,144 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
+"Kama kuwezeshwa pamoja na hali ya kuruka, mchezaji ni uwezo wa kuruka kwa "
+"fundo imara.\n"
+"Hii inahitaji upendeleo wa \"noclip\" kwenye seva."
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode"
-msgstr ""
+msgstr "Hali ya cinematic"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
+"Smooths kamera wakati wa kutafuta karibu. Pia huitwa kuangalia au kipanya "
+"unyooshaji.\n"
+"Muhimu kwa ajili ya kurekodi video."
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
-msgstr ""
+msgstr "Kamera unyooshaji"
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera. 0 to disable."
-msgstr ""
+msgstr "Smooths mzunguko wa kamera. 0 kulemaza."
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
-msgstr ""
+msgstr "Kamera unyooshaji hali cinematic"
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
-msgstr ""
+msgstr "Smooths mzunguko wa kamera katika hali-tumizi cinematic. 0 kulemaza."
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
-msgstr ""
+msgstr "Pindua kipanya"
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
-msgstr ""
+msgstr "Pindua harakati ya kipanya wima."
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
-msgstr ""
+msgstr "Unyeti wa kipanya"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity multiplier."
-msgstr ""
+msgstr "Mengi ya unyeti wa kipanya."
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
-msgstr ""
+msgstr "Matumizi muhimu kwa ajili ya kupanda/kushuka"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
 "and descending."
 msgstr ""
+"Ikiwa imewezeshwa, ufunguo wa \"kutumia\" badala ya \"sneak\" ufunguo ni "
+"kutumika kwa ajili ya kupanda na kushuka."
 
 #: src/settings_translation_file.cpp
 msgid "Double tap jump for fly"
-msgstr ""
+msgstr "Mara mbili ya bomba kuruka kwa kuruka"
 
 #: src/settings_translation_file.cpp
 msgid "Double-tapping the jump key toggles fly mode."
-msgstr ""
+msgstr "Mbili-tapping ufunguo wa kuruka Inatogoa hali ya kuruka."
 
 #: src/settings_translation_file.cpp
 msgid "Always fly and fast"
-msgstr ""
+msgstr "Daima kuruka na kufunga"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If disabled \"use\" key is used to fly fast if both fly and fast mode are "
 "enabled."
 msgstr ""
+"Ikiwa kimelemazwa \"kutumia\" ufunguo ni kutumika kwa kuruka haraka kama "
+"hali-tumizi ya kuruka na ya haraka ni kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid "Rightclick repetition interval"
-msgstr ""
+msgstr "Bofya kulia marudio nafasi"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
 "right mouse button."
 msgstr ""
+"Wakati katika sekunde inachukua kati ya vibonyezo mara kwa mara sahihi "
+"wakati wa kufanya kitufe cha kulia."
 
 #: src/settings_translation_file.cpp
 msgid "Random input"
-msgstr ""
+msgstr "Ingizo la nasibu"
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
-msgstr ""
+msgstr "Wezesha ingizo la mtumiaji nasibu (kutumika tu kwa ajili ya kupima)."
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward"
-msgstr ""
+msgstr "Kuendelea mbele"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward movement (only used for testing)."
-msgstr ""
+msgstr "Harakati endelevu mbele (kutumika tu kwa ajili ya kupima)."
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "Wezesha vifimbocheza"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick button repetition interval"
-msgstr ""
+msgstr "Kifimbocheza kitufe marudio nafasi"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
+"Wakati katika sekunde inachukua kati ya matukio ya mara kwa mara wakati "
+"kushikilia chini kifimbocheza kitufe mchanganyiko."
 
 #: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
-msgstr ""
+msgstr "Kifimbocheza frustum unyeti"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The sensitivity of the joystick axes for moving the\n"
 "ingame view frustum around."
-msgstr ""
+msgstr "Unyeti wa Jira kifimbocheza kwa kuzunguka Mwoneko ingame frustum."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
-msgstr ""
+msgstr "Ufunguo wa mbele"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1432,10 +1471,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kuhamia mchezaji mbele.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
-msgstr ""
+msgstr "Ufunguo wa nyuma"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1443,10 +1485,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kuhamia mchezaji nyuma.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Left key"
-msgstr ""
+msgstr "Ufunguo wa kushoto"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1454,10 +1499,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kuhamia mchezaji kushoto.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
-msgstr ""
+msgstr "Ufunguo sahihi"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1465,10 +1513,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kusonga mchezaji haki.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Jump key"
-msgstr ""
+msgstr "Ufunguo wa kuruka"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1476,10 +1527,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kuruka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Sneak key"
-msgstr ""
+msgstr "Zawadi muhimu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1489,10 +1543,15 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya sneaking.\n"
+"Pia kutumika kwa ajili ya kupanda na kushuka katika maji kama aux1_descends "
+"imelemazwa.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Inventory key"
-msgstr ""
+msgstr "Ufunguo wa hesabu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1500,10 +1559,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kufungua hesabu.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Use key"
-msgstr ""
+msgstr "Ufunguo wa matumizi"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1511,10 +1573,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kusonga haraka katika hali ya haraka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
-msgstr ""
+msgstr "Ufunguo wa mazungumzo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1522,10 +1587,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kufungua dirisha la soga.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Command key"
-msgstr ""
+msgstr "Ufunguo wa amri"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1533,10 +1601,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kufungua dirisha la soga kuchapa amri.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Console key"
-msgstr ""
+msgstr "Muhimu ya Kiweko"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1544,10 +1615,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kufungua muano wa mazungumzo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Range select key"
-msgstr ""
+msgstr "Kibonye Teua masafa"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1555,10 +1629,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling masafa ya Mwoneko ukomo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
-msgstr ""
+msgstr "Kuruka ufunguo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1566,10 +1643,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling kuruka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Fast key"
-msgstr ""
+msgstr "Ufunguo kasi"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1577,10 +1657,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling hali ya haraka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Noclip key"
-msgstr ""
+msgstr "Ufunguo wa Noclip"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1588,10 +1671,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling hali ya noclip.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Autorun key"
-msgstr ""
+msgstr "Autorun ufunguo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1599,10 +1685,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling autorun.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode key"
-msgstr ""
+msgstr "Hali ya cinematic ufunguo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1610,10 +1699,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling hali ya cinematic.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap key"
-msgstr ""
+msgstr "Ufunguo wa minimap"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1621,10 +1713,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la minimap.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot"
-msgstr ""
+msgstr "Screenshot"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1632,10 +1727,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kuchukua viwambo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Drop item key"
-msgstr ""
+msgstr "Tone kipengee muhimu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1643,10 +1741,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kuacha kipengee kilichoteuliwa kwa sasa.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
-msgstr ""
+msgstr "HUD kibonye"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1654,10 +1755,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la ya HUD.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Chat toggle key"
-msgstr ""
+msgstr "Kibonye guro wa mazungumzo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1665,10 +1769,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la kuzungumza.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Fog toggle key"
-msgstr ""
+msgstr "Kibonye guro wa ukungu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1676,10 +1783,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la ukungu.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Camera update toggle key"
-msgstr ""
+msgstr "Kibonye guro Usasishaji wa kamera"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1687,10 +1797,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling sasaishi ya kamera. Tu kutumika kwa ajili ya "
+"maendeleo ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0"
+"e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
-msgstr ""
+msgstr "Rekebisha taarifa kibonye"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1698,10 +1811,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la maelezo kuhusu marekebisho.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
-msgstr ""
+msgstr "Profiler kibonye"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1709,10 +1825,14 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la profiler ya. Kutumika kwa ajili ya "
+"maendeleo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Toggle camera mode key"
-msgstr ""
+msgstr "Togoa kamera hali muhimu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1720,10 +1840,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kubadili kati ya kamera ya kwanza - na -mtu wa tatu.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "View range increase key"
-msgstr ""
+msgstr "Mwoneko masafa ongezeko muhimu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1731,10 +1854,13 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kuongeza kiwango cha kuonyesha.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
-msgstr ""
+msgstr "Mwoneko masafa Punguza ufunguo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1742,6 +1868,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya kupunguza kiwango cha kuonyesha.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1749,14 +1878,18 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Muhimu kwa ajili ya uchapishaji mipororo rekebishi. Kutumika kwa ajili ya "
+"maendeleo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Network"
-msgstr ""
+msgstr "Mtandao"
 
 #: src/settings_translation_file.cpp
 msgid "Server address"
-msgstr ""
+msgstr "Anwani ya seva"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1764,20 +1897,25 @@ msgid ""
 "Leave this blank to start a local server.\n"
 "Note that the address field in the main menu overrides this setting."
 msgstr ""
+"Anwani ya kuunganishwa.\n"
+"Acha hii wazi kuanzisha seva ya ndani.\n"
+"Kumbuka kwamba uga wa anwani katika Menyu kuu Puuza kipimo hiki."
 
 #: src/settings_translation_file.cpp
 msgid "Remote port"
-msgstr ""
+msgstr "Bandari ya mbali"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Port to connect to (UDP).\n"
 "Note that the port field in the main menu overrides this setting."
 msgstr ""
+"Bandari ya kuunganishwa (UDP).\n"
+"Kumbuka kwamba uwanja wa bandari katika Menyu kuu Puuza kipimo hiki."
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
-msgstr ""
+msgstr "Msaada mkubwa seva"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1786,22 +1924,26 @@ msgid ""
 "Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
 "Disabling this option will protect your password better."
 msgstr ""
+"Kama kusaidia seva za zamani kabla ya Itifaki ya toleo la 25.\n"
+"Wezesha kama unataka kuunganishwa 0.4.12 seva na kabla.\n"
+"Seva kuanzia na 0.4.13 kazi, 0.4.12-dev seva huenda kazi.\n"
+"Mlemavu chaguo hili kulinda nywila yako bora."
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
-msgstr ""
+msgstr "Ramani kuokoa kupokea kutoka seva"
 
 #: src/settings_translation_file.cpp
 msgid "Save the map received by the client on disk."
-msgstr ""
+msgstr "Hifadhi ramani kupokelewa na mteja kwenye diski."
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
-msgstr ""
+msgstr "Onyesha chombo masanduku ya uteuzi"
 
 #: src/settings_translation_file.cpp
 msgid "Connect to external media server"
-msgstr ""
+msgstr "Unganisha kwenye seva ya midia za nje"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1810,56 +1952,61 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
+"Kuwezesha matumizi ya seva ya midia ya mbali (kama zinazotolewa na seva).\n"
+"Seva ya mbali kutoa njia kwa kiasi kikubwa kasi ya kupakua midia (k.m unamu) "
+"wakati wa kuunganisha kwenye seva."
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist URL"
-msgstr ""
+msgstr "URL ya Serverlist"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
-msgstr ""
+msgstr "URL kwenye orodha ya seva iliyoonyeshwa katika kichupo cha Multiplayer."
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist file"
-msgstr ""
+msgstr "Faili ya Serverlist"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
 "the Multiplayer Tab."
 msgstr ""
+"Faili katika mteja/serverlist/yenye seva zako Pendwa kuonyeshwa katika "
+"kichupo cha Multiplayer."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
-msgstr ""
+msgstr "Michoro"
 
 #: src/settings_translation_file.cpp
 msgid "In-Game"
-msgstr ""
+msgstr "Katika mchezo"
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
-msgstr ""
+msgstr "Msingi"
 
 #: src/settings_translation_file.cpp
 msgid "VBO"
-msgstr ""
+msgstr "VBO"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
-msgstr ""
+msgstr "Wezesha VBO"
 
 #: src/settings_translation_file.cpp
 msgid "Fog"
-msgstr ""
+msgstr "Ukungu"
 
 #: src/settings_translation_file.cpp
 msgid "Whether to fog out the end of the visible area."
-msgstr ""
+msgstr "Kama ukungu nje mwisho wa eneo hili dhahiri."
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
-msgstr ""
+msgstr "Mtindo wa majani"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1868,88 +2015,94 @@ msgid ""
 "-   Simple: only outer faces, if defined special_tiles are used\n"
 "-   Opaque: disable transparency"
 msgstr ""
+"Majani mtindo: - dhana: nyuso zote kuonekana - rahisi: tu nyuso nje, kama "
+"inavyoelezwa special_tiles ni kutumika - Opaque: Lemaza uwazi"
 
 #: src/settings_translation_file.cpp
 msgid "Connect glass"
-msgstr ""
+msgstr "Kuunganisha kioo"
 
 #: src/settings_translation_file.cpp
 msgid "Connects glass if supported by node."
-msgstr ""
+msgstr "Huunganisha kioo kama mkono na fundo."
 
 #: src/settings_translation_file.cpp
 msgid "Smooth lighting"
-msgstr ""
+msgstr "Taa laini"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable smooth lighting with simple ambient occlusion.\n"
 "Disable for speed or for different looks."
 msgstr ""
+"Wezesha taa laini na rahisi iliyoko occlusion.\n"
+"Lemaza kwa kasi au kwa ajili ya inaonekana tofauti."
 
 #: src/settings_translation_file.cpp
 msgid "Clouds"
-msgstr ""
+msgstr "Mawingu"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client side effect."
-msgstr ""
+msgstr "Mawingu ni mteja upande athari."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
-msgstr ""
+msgstr "Mawingu ya 3D"
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
-msgstr ""
+msgstr "Matumizi wingu 3D kuangalia badala ya gorofa."
 
 #: src/settings_translation_file.cpp
 msgid "Node highlighting"
-msgstr ""
+msgstr "Fundo udhulisho"
 
 #: src/settings_translation_file.cpp
 msgid "Method used to highlight selected object."
-msgstr ""
+msgstr "Mbinu inayotumiwa kuonyesha kipengee kilichoteuliwa."
 
 #: src/settings_translation_file.cpp
 msgid "Filtering"
-msgstr ""
+msgstr "Uchujaji"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
-msgstr ""
+msgstr "Mipmapping"
 
 #: src/settings_translation_file.cpp
 msgid "Use mip mapping to scale textures. May slightly increase performance."
 msgstr ""
+"Tumia ramani ya malaria kwa kipimo cha unamu. Huenda kidogo kuongeza "
+"utendaji."
 
 #: src/settings_translation_file.cpp
 msgid "Anisotropic filtering"
-msgstr ""
+msgstr "Uchujaji wa anisotropic"
 
 #: src/settings_translation_file.cpp
 msgid "Use anisotropic filtering when viewing at textures from an angle."
-msgstr ""
+msgstr "Tumia uchujaji anisotropic wakati unatazama katika unamu kutoka pembe."
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
-msgstr ""
+msgstr "Uchujaji wa bilinear"
 
 #: src/settings_translation_file.cpp
 msgid "Use bilinear filtering when scaling textures."
-msgstr ""
+msgstr "Tumia uchujaji bilinear wakati upimaji unamu."
 
 #: src/settings_translation_file.cpp
 msgid "Trilinear filtering"
-msgstr ""
+msgstr "Uchujaji wa trilinear"
 
 #: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
-msgstr ""
+msgstr "Tumia uchujaji trilinear wakati upimaji unamu."
 
 #: src/settings_translation_file.cpp
 msgid "Clean transparent textures"
-msgstr ""
+msgstr "Unamu angavu safi"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1958,10 +2111,14 @@ msgid ""
 "light edge to transparent textures.  Apply this filter to clean that up\n"
 "at texture load time."
 msgstr ""
+"Unamu kuchujwa wanaweza kujichanganya RGB thamani na majirani kikamilifu-"
+"uwazi, ambayo PNG optimizers kawaida Tupa, wakati mwingine kusababisha "
+"katika ukingo wa giza au mwanga angavu ya unamu.  Tekeleza Kichujio hii "
+"kusafisha kwamba wakati mzigo, unamu."
 
 #: src/settings_translation_file.cpp
 msgid "Minimum texture size for filters"
-msgstr ""
+msgstr "Unamu wa kima cha chini cha ukubwa wa Vichujio"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1973,16 +2130,25 @@ msgid ""
 "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
 "enabled."
 msgstr ""
+"Wakati wa kutumia Vichujio bilinear/trilinear/anisotropic, unamu low-"
+"resolution unaweza kizunguzungu, hivyo otomatiki upscale yao na karibu "
+"jirani interpolation kuhifadhi pikseli hubainisha.  Hii Seti Ukubwa wa unamu "
+"chini kwa ajili ya unamu upscaled; thamani ya juu kuangalia kali, lakini "
+"zinahitaji kumbukumbu zaidi.  Nguvu ya 2 ni ilipendekeza.  Kuweka hii zaidi "
+"1 usiwe na athari inayoonekana isipokuwa uchujaji wa bilinear/trilinear/"
+"anisotropic ni kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
-msgstr ""
+msgstr "FSAA"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
 "when set to higher number than 0."
 msgstr ""
+"Chaguo majaribio, inaweza kusababisha nafasi inayoonekana kati ya vitalu "
+"wakati kuweka namba ya juu zaidi kuliko 0."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1990,18 +2156,21 @@ msgid ""
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
+"Shaders kuruhusu athari pevu onekana na inaweza kuongeza utendaji wa baadhi "
+"ya kadi ya video.\n"
+"Kazi yako tu na OpenGL video backend."
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
-msgstr ""
+msgstr "Ramani ya toni filmic"
 
 #: src/settings_translation_file.cpp
 msgid "Enables filmic tone mapping"
-msgstr ""
+msgstr "Huwezesha toni filmic ramani"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
-msgstr ""
+msgstr "Bumpmapping"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2010,260 +2179,285 @@ msgid ""
 "or need to be auto-generated.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Inawezesha bumpmapping kwa ajili ya unamu. Normalmaps haja iwekwe kwa pakiti "
+"ya unamu au haja ya kuwa yaliyozalishwa na otomatiki.\n"
+"Inahitaji shaders kwa kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid "Generate normalmaps"
-msgstr ""
+msgstr "Kuzalisha normalmaps"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables on the fly normalmap generation (Emboss effect).\n"
 "Requires bumpmapping to be enabled."
 msgstr ""
+"Huwezesha kwenye kizazi cha normalmap kuruka (Emboss athari).\n"
+"Inahitaji bumpmapping kwa kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps strength"
-msgstr ""
+msgstr "Nguvu ya Normalmaps"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of generated normalmaps."
-msgstr ""
+msgstr "Nguvu ya normalmaps inayozalishwa."
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps sampling"
-msgstr ""
+msgstr "Sampuli ya Normalmaps"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Defines sampling step of texture.\n"
 "A higher value results in smoother normal maps."
 msgstr ""
+"Inafasili hatua ya sampuli ya unamu.\n"
+"Thamani ya juu zaidi matokeo katika ramani ya laini ya kawaida."
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion"
-msgstr ""
+msgstr "Parallax occlusion"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables parallax occlusion mapping.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Huwezesha parallax occlusion uramanishi.\n"
+"Inahitaji shaders kwa kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion mode"
-msgstr ""
+msgstr "Parallax occlusion hali"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "0 = parallax occlusion with slope information (faster).\n"
 "1 = relief mapping (slower, more accurate)."
 msgstr ""
+"0 = parallax occlusion na taarifa ya mteremko (haraka).\n"
+"1 = ramani ya misaada (polepole, sahihi zaidi)."
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion strength"
-msgstr ""
+msgstr "Parallax occlusion nguvu"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of parallax."
-msgstr ""
+msgstr "Nguvu ya parallax."
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion iterations"
-msgstr ""
+msgstr "Parallax occlusion Marudiorudio"
 
 #: src/settings_translation_file.cpp
 msgid "Number of parallax occlusion iterations."
-msgstr ""
+msgstr "Idadi ya parallax occlusion Marudiorudio."
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion Scale"
-msgstr ""
+msgstr "Parallax occlusion wadogo"
 
 #: src/settings_translation_file.cpp
 msgid "Overall scale of parallax occlusion effect."
-msgstr ""
+msgstr "Kipimo cha jumla ya parallax occlusion athari."
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion bias"
-msgstr ""
+msgstr "Parallax occlusion upendeleo"
 
 #: src/settings_translation_file.cpp
 msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
+msgstr "Upendeleo wa jumla wa parallax occlusion athari, kawaida kipimo/2."
 
 #: src/settings_translation_file.cpp
 msgid "Waving Nodes"
-msgstr ""
+msgstr "Waving fundo"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water"
-msgstr ""
+msgstr "Waving maji"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving water.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Kuweka huwezesha kweli waving maji.\n"
+"Inahitaji shaders kwa kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid "Waving water height"
-msgstr ""
+msgstr "Waving maji urefu"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water length"
-msgstr ""
+msgstr "Waving maji urefu"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water speed"
-msgstr ""
+msgstr "Waving kasi ya maji"
 
 #: src/settings_translation_file.cpp
 msgid "Waving leaves"
-msgstr ""
+msgstr "Waving majani"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving leaves.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Kuweka huwezesha kweli waving majani.\n"
+"Inahitaji shaders kwa kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
-msgstr ""
+msgstr "Waving mimea"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Kuweka huwezesha kweli waving mimea.\n"
+"Inahitaji shaders kwa kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
-msgstr ""
+msgstr "Pevu"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
-msgstr ""
+msgstr "Ramprogrammen juu"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If FPS would go higher than this, limit it by sleeping\n"
 "to not waste CPU power for no benefit."
 msgstr ""
+"Kama Ramprogrammen angekwenda juu kuliko hii, kikomo kwa kulala si kupoteza "
+"nguvu ya CPU kwa faida yoyote."
 
 #: src/settings_translation_file.cpp
 msgid "FPS in pause menu"
-msgstr ""
+msgstr "Ramprogrammen katika Menyu ya mapumziko"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS when game is paused."
-msgstr ""
+msgstr "Ramprogrammen juu wakati mchezo umesitishwa."
 
 #: src/settings_translation_file.cpp
 msgid "Viewing range"
-msgstr ""
+msgstr "Kuonyesha masafa"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "View distance in nodes.\n"
 "Min = 20"
 msgstr ""
+"Onyesha umbali katika fundo.\n"
+"Min = 20"
 
 #: src/settings_translation_file.cpp
 msgid "Screen width"
-msgstr ""
+msgstr "Upana wa kiwamba"
 
 #: src/settings_translation_file.cpp
 msgid "Width component of the initial window size."
-msgstr ""
+msgstr "Upana sehemu ya ukubwa cha kidirisha awali."
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
-msgstr ""
+msgstr "Urefu wa kiwamba"
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
-msgstr ""
+msgstr "Kijenzi cha urefu wa ukubwa cha kidirisha awali."
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
-msgstr ""
+msgstr "Kiwamba kizima"
 
 #: src/settings_translation_file.cpp
 msgid "Fullscreen mode."
-msgstr ""
+msgstr "Hali-tumizi ya skrini nzima."
 
 #: src/settings_translation_file.cpp
 msgid "Full screen BPP"
-msgstr ""
+msgstr "Skrini BPP"
 
 #: src/settings_translation_file.cpp
 msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr ""
+msgstr "Biti kwa pikseli (a.k.a rangi kina) katika hali-tumizi ya skrini nzima."
 
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
-msgstr ""
+msgstr "V-ulandanishi"
 
 #: src/settings_translation_file.cpp
 msgid "Vertical screen synchronization."
-msgstr ""
+msgstr "Ulandanishi wa kiwamba wima."
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
-msgstr ""
+msgstr "Uga wa Mwoneko"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
-msgstr ""
+msgstr "Uga wa Mwoneko katika nyuzi."
 
 #: src/settings_translation_file.cpp
 msgid "Field of view for zoom"
-msgstr ""
+msgstr "Uga wa Mwoneko kwa ajili ya Kuza"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
+"Uga wa Mwoneko ukikuza katika nyuzi.\n"
+"Hii inahitaji nafasi \"Kuza\" kwenye seva."
 
 #: src/settings_translation_file.cpp
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
 "This setting is for the client only and is ignored by the server."
 msgstr ""
+"Rekebisha simbiko gamma kwa majedwali mwanga. Idadi ya chini ni mkali.\n"
+"Kipimo hiki ni kwa ajili ya mteja tu na ni kupuuzwa na seva."
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
-msgstr ""
+msgstr "Njia ya unamu"
 
 #: src/settings_translation_file.cpp
 msgid "Path to texture directory. All textures are first searched from here."
-msgstr ""
+msgstr "Njia ya orodha ya unamu. Unamu wote vinatafutizwa kwanza kutoka hapa."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
-msgstr ""
+msgstr "Kiendeshaji video"
 
 #: src/settings_translation_file.cpp
 msgid "The rendering back-end for Irrlicht."
-msgstr ""
+msgstr "Utungulizaji nyuma-mwisho wa Irrlicht."
 
 #: src/settings_translation_file.cpp
 msgid "Cloud height"
-msgstr ""
+msgstr "Urefu wa wingu"
 
 #: src/settings_translation_file.cpp
 msgid "Height on which clouds are appearing."
-msgstr ""
+msgstr "Urefu ambayo mawingu ni kuonekana."
 
 #: src/settings_translation_file.cpp
 msgid "Cloud radius"
-msgstr ""
+msgstr "Wingu eneo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2271,30 +2465,39 @@ msgid ""
 "Values larger than 26 will start to produce sharp cutoffs at cloud area "
 "corners."
 msgstr ""
+"Eneo la eneo la wingu alisema katika idadi ya 64 fundo wingu miraba.\n"
+"Thamani kubwa kuliko 26 itaanza kuzalisha cutoffs mkali katika wingu eneo la "
+"pembe."
 
 #: src/settings_translation_file.cpp
 msgid "View bobbing"
-msgstr ""
+msgstr "Mwoneko kando"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Multiplier for view bobbing.\n"
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
+"Mengi kwa ajili ya Mwoneko kando.\n"
+"Kwa mfano: 0 kwa ajili ya Mwoneko hakuna kando; 1.0 kwa ajili ya kawaida; "
+"2.0 kwa mara mbili."
 
 #: src/settings_translation_file.cpp
 msgid "Fall bobbing"
-msgstr ""
+msgstr "Kuanguka bobbing"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Multiplier for fall bobbing.\n"
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
+"Mengi kwa ajili ya kuanguka kando.\n"
+"Kwa mfano: 0 kwa ajili ya Mwoneko hakuna kando; 1.0 kwa ajili ya kawaida; "
+"2.0 kwa mara mbili."
 
 #: src/settings_translation_file.cpp
 msgid "3D mode"
-msgstr ""
+msgstr "Hali ya 3D"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2307,100 +2510,111 @@ msgid ""
 "-    sidebyside: split screen side by side.\n"
 "-    pageflip: quadbuffer based 3d."
 msgstr ""
+"Msaada ya 3D.\n"
+"Tegemeza kwa sasa:-Hakuna: Hakuna towe 3d.\n"
+"-anaglyph: Bluu-kijani/rangi nzee rangi 3d.\n"
+"-sokotana: witiri/shufwa mstari msingi polarisation kiwamba msaada.\n"
+"-topbottom: Baidisha skrini juu/chini.\n"
+"-sidebyside: Baidisha skrini upande kwa upande.\n"
+"-pageflip: quadbuffer msingi 3d."
 
 #: src/settings_translation_file.cpp
 msgid "Console color"
-msgstr ""
+msgstr "Rangi ya Kiweko"
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background color (R,G,B)."
-msgstr ""
+msgstr "Mazungumzo katika mchezo console mandharinyuma rangi (R, G, B)."
 
 #: src/settings_translation_file.cpp
 msgid "Console alpha"
-msgstr ""
+msgstr "Alfa ya Kiweko"
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
 msgstr ""
+"Mazungumzo katika mchezo console mandharinyuma Alfa (opaqueness kati ya 0 na "
+"255)."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box color"
-msgstr ""
+msgstr "Uteuzi kikasha rangi"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
-msgstr ""
+msgstr "Uteuzi kikasha mpaka rangi (R, G, B)."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box width"
-msgstr ""
+msgstr "Uteuzi kikasha upana"
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selectionbox's lines around nodes."
-msgstr ""
+msgstr "Upana wa mistari ya selectionbox karibu fundo."
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
-msgstr ""
+msgstr "Rangi ya crosshair"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color (R,G,B)."
-msgstr ""
+msgstr "Rangi ya crosshair (R, G, B)."
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
-msgstr ""
+msgstr "Crosshair Alfa"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr ""
+msgstr "Crosshair Alfa (opaqueness kati ya 0 na 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Desynchronize block animation"
-msgstr ""
+msgstr "Desynchronize umbo la uhuishaji"
 
 #: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
-msgstr ""
+msgstr "Kama fundo unamu uhuishaji lazima desynchronized kwa mapblock."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum hotbar width"
-msgstr ""
+msgstr "Hotbar kiwango cha juu cha upana"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
 "Useful if there's something to be displayed right or left of hotbar."
 msgstr ""
+"Uwiano juu ya dirisha la sasa kutumika kwa ajili ya hotbar.\n"
+"Muhimu kama kuna kitu cha kuonyeshwa kulia au kushoto wa hotbar."
 
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
-msgstr ""
+msgstr "Kirudufu cha matundu"
 
 #: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
-msgstr ""
+msgstr "Huwezesha uwekaji kache kwa facedir Iliyozungushwa meshes."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
-msgstr ""
+msgstr "Ramani"
 
 #: src/settings_translation_file.cpp
 msgid "Enables minimap."
-msgstr ""
+msgstr "Inawezesha minimap."
 
 #: src/settings_translation_file.cpp
 msgid "Round minimap"
-msgstr ""
+msgstr "Ramani pande zote"
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr ""
+msgstr "Sura ya minimap ya. Kuwezeshwa = pande zote, walemavu = mraba."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap scan height"
-msgstr ""
+msgstr "Ramani tambazo urefu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2408,19 +2622,23 @@ msgid ""
 "False = 128\n"
 "Useable to make minimap smoother on slower machines."
 msgstr ""
+"Kweli = 256 bandia = Useable 128 kufanya minimap laini juu ya mashine "
+"polepole."
 
 #: src/settings_translation_file.cpp
 msgid "Colored fog"
-msgstr ""
+msgstr "Ukungu wa rangi"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
+"Kufanya rangi wa ukungu na anga hutegemea mchana (alfajiri/machweo) na "
+"kuonyesha mwelekeo."
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
-msgstr ""
+msgstr "Occlusion iliyoko gamma"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2429,30 +2647,34 @@ msgid ""
 "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
 "set to the nearest valid value."
 msgstr ""
+"Nguvu (giza) ya fundo iliyoko occlusion kivuli.\n"
+"Chini ni nyeusi, juu ni hafifu. Masafa halali ya thamani kwa ajili ya kipimo "
+"hiki ni 0.25 kwa 4.0 jumuishi. Kama thamani iko nje ya masafa ni itasetiwa "
+"kwenye ya karibu Thamani halali."
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
-msgstr ""
+msgstr "Hesabu vitu uhuishaji"
 
 #: src/settings_translation_file.cpp
 msgid "Enables animation of inventory items."
-msgstr ""
+msgstr "Huwezesha uhuishaji wa vitu inventering."
 
 #: src/settings_translation_file.cpp
 msgid "Menus"
-msgstr ""
+msgstr "Menyu"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds in menu"
-msgstr ""
+msgstr "Mawingu katika Menyu"
 
 #: src/settings_translation_file.cpp
 msgid "Use a cloud animation for the main menu background."
-msgstr ""
+msgstr "Tumia uhuishaji wa wingu ya mandharinyuma ya Menyu kuu."
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
-msgstr ""
+msgstr "GUI kurekebisha"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2462,10 +2684,15 @@ msgid ""
 "pixels when scaling down, at the cost of blurring some\n"
 "edge pixels when images are scaled by non-integer sizes."
 msgstr ""
+"Rekebisha gui kwa mtumiaji maalum thamani.\n"
+"Tumia kichujio karibu-jirani-Waanti-Lakabu Rekebisha GUI ya.\n"
+"Hii laini baadhi ya kingo mbaya, na mchanganyiko pikseli wakati upimaji "
+"chini, wanatengeneza ukungu wa jinsia pikseli baadhi makali wakati picha ni "
+"yamesimamisha na ukubwa wa yasiyo ya takwimu."
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter"
-msgstr ""
+msgstr "GUI kipimo Kichujio"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2473,10 +2700,13 @@ msgid ""
 "filtered in software, but some images are generated directly\n"
 "to hardware (e.g. render-to-texture for nodes in inventory)."
 msgstr ""
+"Wakati gui_scaling_filter ni kweli, yote GUI picha haja ya kuchujwa katika "
+"programu, lakini taswira zingine hutolewa moja kwa moja kwa maunzi (k.m "
+"kutoa-kwa-unamu kwa fundo katika hesabu)."
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter txr2img"
-msgstr ""
+msgstr "GUI kipimo Kichujio txr2img"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2485,99 +2715,105 @@ msgid ""
 "to the old scaling method, for video drivers that don't\n"
 "properly support downloading textures back from hardware."
 msgstr ""
+"Wakati gui_scaling_filter_txr2img ni kweli, kunakili picha hizo kutoka "
+"maunzi na programu kwa ajili ya kurekebisha.  Wakati uongo, kuanguka nyuma "
+"kwa mbinu ya zamani ya kipimo, kwa madereva video vizuri siungi mkono unamu "
+"Inapakua nyuma kutoka maunzi."
 
 #: src/settings_translation_file.cpp
 msgid "Tooltip delay"
-msgstr ""
+msgstr "Kidokezozana kuchelewa"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
+msgstr "Kuchelewa kuonyesha vidokezozana, alisema katika milisekunde."
 
 #: src/settings_translation_file.cpp
 msgid "Freetype fonts"
-msgstr ""
+msgstr "Fonti Freetype"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether freetype fonts are used, requires freetype support to be compiled in."
 msgstr ""
+"Kama freetype fonti hutumiwa, inahitaji msaada wa freetype kuwa alikusanya "
+"katika."
 
 #: src/settings_translation_file.cpp
 msgid "Font path"
-msgstr ""
+msgstr "Njia ya fonti"
 
 #: src/settings_translation_file.cpp
 msgid "Path to TrueTypeFont or bitmap."
-msgstr ""
+msgstr "Njia ya TrueTypeFont au vitone michoro."
 
 #: src/settings_translation_file.cpp
 msgid "Font size"
-msgstr ""
+msgstr "Ukubwa wa fonti"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
-msgstr ""
+msgstr "Kivuli cha fonti"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow offset, if 0 then shadow will not be drawn."
-msgstr ""
+msgstr "Fonti kivuli Sawazisha, kama 0 basi kivuli itakuwa kuchukuliwa."
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha"
-msgstr ""
+msgstr "Fonti kivuli Alfa"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha (opaqueness, between 0 and 255)."
-msgstr ""
+msgstr "Fonti kivuli Alfa (opaqueness kati ya 0 na 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
-msgstr ""
+msgstr "Monospace njia ya fonti"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font size"
-msgstr ""
+msgstr "Ukubwa wa fonti wa Monospace"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font"
-msgstr ""
+msgstr "Fonti amebadilisha"
 
 #: src/settings_translation_file.cpp
 msgid "This font will be used for certain languages."
-msgstr ""
+msgstr "Fonti hii itatumika kwa lugha fulani."
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font size"
-msgstr ""
+msgstr "Ukubwa fonti amebadilisha"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow"
-msgstr ""
+msgstr "Fonti amebadilisha kivuli"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow alpha"
-msgstr ""
+msgstr "Fonti amebadilisha kivuli Alfa"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot folder"
-msgstr ""
+msgstr "Screenshot kabrasha"
 
 #: src/settings_translation_file.cpp
 msgid "Path to save screenshots at."
-msgstr ""
+msgstr "Njia ya kuokoa viwambo katika."
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot format"
-msgstr ""
+msgstr "Screenshot umbizo"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
-msgstr ""
+msgstr "Umbizo la viwambo."
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot quality"
-msgstr ""
+msgstr "Screenshot ubora"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2585,94 +2821,107 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"Screenshot ubora. Tu kutumika kwa ajili ya Umbiza JPEG.\n"
+"1 maana ubora mbaya; 100 humaanisha ubora.\n"
+"Tumia 0 kwa ubora wa chaguo-msingi."
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
-msgstr ""
+msgstr "DPI"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
+"Rekebisha usakinishaji wa dpi kwenye kiwamba chako (yasiyo X11/Android tu) "
+"mfano kwa 4 k skrini."
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
-msgstr ""
+msgstr "Sauti"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
-msgstr ""
+msgstr "Kiasi"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
-msgstr ""
+msgstr "Mkatiko Muda Mapblock wakipakua"
 
 #: src/settings_translation_file.cpp
 msgid "Timeout for client to remove unused map data from memory."
 msgstr ""
+"Muda wa kuisha kwa mteja kuondoa data ya ramani zisizotumika kutoka kwa "
+"kumbukumbu."
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
-msgstr ""
+msgstr "Kikomo cha Mapblock"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum number of mapblocks for client to be kept in memory.\n"
 "Set to -1 for unlimited amount."
 msgstr ""
+"Namba ya juu ya mapblocks kwa mteja kwa kuwekwa katika kumbukumbu.\n"
+"Seti -1 kwa kiasi ukomo."
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
-msgstr ""
+msgstr "Onyesha maelezo kuhusu marekebisho"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether to show the client debug info (has the same effect as hitting F5)."
 msgstr ""
+"Kama kuonyesha mteja Rekebisha taarifa (ina athari sawa kama kupiga F5)."
 
 #: src/settings_translation_file.cpp
 msgid "Server / Singleplayer"
-msgstr ""
+msgstr "Seva / Singleplayer"
 
 #: src/settings_translation_file.cpp
 msgid "Server name"
-msgstr ""
+msgstr "Jina la seva"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Name of the server, to be displayed when players join and in the serverlist."
 msgstr ""
+"Jina la seva, kuonyeshwa wakati wachezaji kujiunga na katika serverlist ya."
 
 #: src/settings_translation_file.cpp
 msgid "Server description"
-msgstr ""
+msgstr "Maelezo ya seva"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
 msgstr ""
+"Maelezo ya seva, kuonyeshwa wakati wachezaji kujiunga na katika serverlist "
+"ya."
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "Kikoa jina la seva, kuonyeshwa katika serverlist ya."
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
-msgstr ""
+msgstr "URL ya seva"
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "Homepage ya seva, kuonyeshwa katika serverlist ya."
 
 #: src/settings_translation_file.cpp
 msgid "Announce server"
-msgstr ""
+msgstr "Kutangaza seva"
 
 #: src/settings_translation_file.cpp
 msgid "Automaticaly report to the serverlist."
-msgstr ""
+msgstr "Automaticaly ripoti ya serverlist."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2680,10 +2929,13 @@ msgid ""
 "If you want to announce your ipv6 address, use  serverlist_url = v6.servers."
 "minetest.net."
 msgstr ""
+"Kutangaza kwa serverlist hii.\n"
+"Kama unataka kutangaza anwani yako ya ipv6, kutumia serverlist_url = "
+"v6.servers.minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Lemaza kutoroka mwandamano"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2692,28 +2944,33 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"Lemaza mwandamano wa kutoroka, k.m kuzungumza kuchorea.\n"
+"Tumia hii kama unataka kuendesha seva na wateja wa awali-0.4.14 na unataka "
+"kulemaza mwandamano kutoroka yanayotokana na mods."
 
 #: src/settings_translation_file.cpp
 msgid "Server port"
-msgstr ""
+msgstr "Kituo tarishi cha seva"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Network port to listen (UDP).\n"
 "This value will be overridden when starting from the main menu."
 msgstr ""
+"Mtandao bandari kusikiliza (UDP).\n"
+"Thamani hii itakuwa kuuharibu wakati kuanzia Menyu kuu."
 
 #: src/settings_translation_file.cpp
 msgid "Bind address"
-msgstr ""
+msgstr "Kumfunga anwani"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
-msgstr ""
+msgstr "Interface mtandao kwamba seva husikiliza juu."
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
-msgstr ""
+msgstr "Itifaki ya kali kukagua"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2723,10 +2980,14 @@ msgid ""
 "to new servers, but they may not support all new features that you are "
 "expecting."
 msgstr ""
+"Wezesha Usiruhusu wateja wa zamani kutoka kuunganisha.\n"
+"Wateja wakubwa ni patanifu katika maana ya kwamba wao si mapenzi ajali "
+"wakati wa kuunganisha kwenye seva mpya, lakini inaweza kusaidia nduni zote "
+"mpya ambayo ni kutarajia."
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
-msgstr ""
+msgstr "Midia ya mbali"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2735,10 +2996,15 @@ msgid ""
 "(obviously, remote_media should end with a slash).\n"
 "Files that are not present will be fetched the usual way."
 msgstr ""
+"Inabainisha URL kutoka ambayo mteja fetches vyombo vya habari badala ya "
+"kutumia UDP.\n"
+"$filename lazima kupatikana kutoka $remote_media$ JinaFaili kupitia cURL (ni "
+"wazi, remote_media lazima kumaliza na kufyeka na).\n"
+"Faili ambayo sasa itakuwa kuwa fetched njia ya kawaida."
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 server"
-msgstr ""
+msgstr "IPv6 Seva"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2746,26 +3012,29 @@ msgid ""
 "to IPv6 clients, depending on system configuration.\n"
 "Ignored if bind_address is set."
 msgstr ""
+"Wezesha/Lemaza kuendesha seva ya IPv6.  Seva ya IPv6 unaweza kuzuiliwa kwa "
+"wateja IPv6, kutegemea usanidi mfumo.\n"
+"Kupuuzwa kama bind_address kuweka."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneous block sends per client"
-msgstr ""
+msgstr "Fungu juu ya samtidiga hutuma kwa mteja"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that are simultaneously sent per client."
-msgstr ""
+msgstr "Namba ya juu ya vitalu kwamba ni wakati huo huo uliotumwa kwa mteja."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneous block sends total"
-msgstr ""
+msgstr "Fungu juu ya samtidiga hutuma jumla"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that are simultaneously sent in total."
-msgstr ""
+msgstr "Namba ya juu ya vitalu kwamba wakati huo huo hutumwa kwa jumla."
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Kuchelewa katika kutuma vitalu baada ya jengo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2774,10 +3043,13 @@ msgid ""
 "This determines how long they are slowed down after placing or removing a "
 "node."
 msgstr ""
+"Kupunguza bakia, uhamisho wa fungu ni sjunkit wakati mchezaji ni kujenga "
+"kitu.\n"
+"Hii huamua lini wao ni sjunkit baada ya kuweka au kuondoa fundo."
 
 #: src/settings_translation_file.cpp
 msgid "Max. packets per iteration"
-msgstr ""
+msgstr "Max. pakiti kila Marudiorudio"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2785,195 +3057,220 @@ msgid ""
 "try reducing it, but don't reduce it to a number below double of targeted\n"
 "client number."
 msgstr ""
+"Namba ya juu ya pakiti iliyotumwa kwa hatua ya kutuma, kama una muunganisho "
+"polepole jaribu kupunguza ni, lakini si ya kupunguza kadhaa chini ya mara "
+"mbili ya idadi ya mteja lengwa."
 
 #: src/settings_translation_file.cpp
 msgid "Default game"
-msgstr ""
+msgstr "Chaguo-msingi mchezo"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Default game when creating a new world.\n"
 "This will be overridden when creating a world from the main menu."
 msgstr ""
+"Chaguo-msingi mchezo wakati wa kuunda dunia mpya.\n"
+"Hii itakuwa kuwa kuuharibu wakati kutengeneza ulimwengu kutoka kwenye menyu "
+"kuu."
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day"
-msgstr ""
+msgstr "Ujumbe wa siku ya"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day displayed to players connecting."
-msgstr ""
+msgstr "Ujumbe wa siku ya kuonyeshwa kwa wachezaji kuunganisha."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
-msgstr ""
+msgstr "Watumiaji wa kiwango cha juu"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of players that can connect simultaneously."
-msgstr ""
+msgstr "Namba ya juu ya wachezaji ambao wanaweza kuunganisha wakati huo huo."
 
 #: src/settings_translation_file.cpp
 msgid "Map directory"
-msgstr ""
+msgstr "Orodha ya ramani"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
+"Mpangilio orodha ulimwengu (kila kitu ulimwenguni kuhifadhiwa hapa).\n"
+"Si zinahitajika kama kuanzia Menyu kuu."
 
 #: src/settings_translation_file.cpp
 msgid "Item entity TTL"
-msgstr ""
+msgstr "Kipengee chombo TTL"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
 "Setting it to -1 disables the feature."
 msgstr ""
+"Wakati katika sekunde kwa kipengee chombo (vitu chopo) kuishi.\n"
+"Kuweka kwa -1 Hulemaza kipengele."
 
 #: src/settings_translation_file.cpp
 msgid "Damage"
-msgstr ""
+msgstr "Uharibifu"
 
 #: src/settings_translation_file.cpp
 msgid "Enable players getting damage and dying."
-msgstr ""
+msgstr "Wezesha wachezaji kupata uharibifu na kufa."
 
 #: src/settings_translation_file.cpp
 msgid "Fixed map seed"
-msgstr ""
+msgstr "Mbegu ya ramani fasta"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "A chosen map seed for a new map, leave empty for random.\n"
 "Will be overridden when creating a new world in the main menu."
 msgstr ""
+"Mbegu ramani waliochaguliwa kwa ajili ya ramani mpya, kuondoka tupu kwa "
+"nasibu.\n"
+"Itakuwa kuuharibu wakati wa kuunda dunia mpya katika Menyu kuu."
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
-msgstr ""
+msgstr "Nywila ya chaguo-msingi"
 
 #: src/settings_translation_file.cpp
 msgid "New users need to input this password."
-msgstr ""
+msgstr "Watumiaji wapya haja Ingiza nywila hii."
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
-msgstr ""
+msgstr "Upendeleo wa chaguo-msingi"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The privileges that new users automatically get.\n"
 "See /privs in game for a full list on your server and mod configuration."
 msgstr ""
+"Upendeleo kwamba watumiaji wapya otomatiki kupata.\n"
+"Ona /privs katika mchezo kwa ajili ya orodha kamili kwenye msabidi wa seva "
+"na Moduli."
 
 #: src/settings_translation_file.cpp
 msgid "Basic Privileges"
-msgstr ""
+msgstr "Haki za msingi"
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
-msgstr ""
+msgstr "Marupurupu ya wachezaji na basic_privs unaweza ruzuku"
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
-msgstr ""
+msgstr "Umbali wa uhamisho wa mchezaji ukomo"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether players are shown to clients without any range limit.\n"
 "Deprecated, use the setting player_transfer_distance instead."
 msgstr ""
+"Kama wachezaji huonyeshwa kwa wateja bila kikomo yoyote mbalimbali.\n"
+"Deprecated, Tumia kipimo player_transfer_distance badala yake."
 
 #: src/settings_translation_file.cpp
 msgid "Player transfer distance"
-msgstr ""
+msgstr "Umbali wa uhamisho wa mchezaji"
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
+"Inafasili umbali wa uhamisho wa mchezaji maximal katika vitalu (0 = ukomo)."
 
 #: src/settings_translation_file.cpp
 msgid "Player versus Player"
-msgstr ""
+msgstr "Mchezaji dhidi ya mchezaji"
 
 #: src/settings_translation_file.cpp
 msgid "Whether to allow players to damage and kill each other."
-msgstr ""
+msgstr "Kama kuruhusu wachezaji kuharibu na kuua kila mmoja."
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
-msgstr ""
+msgstr "Spawnpoint tuli"
 
 #: src/settings_translation_file.cpp
 msgid "If this is set, players will always (re)spawn at the given position."
-msgstr ""
+msgstr "Kama hii ni kuweka, wachezaji mapenzi daima (re) spawn mahali fulani."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
-msgstr ""
+msgstr "Usiruhusu nywila tupu"
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, new players cannot join with an empty password."
-msgstr ""
+msgstr "Ikiwa imewezeshwa, wachezaji wapya haiwezi kujiunga na nywila wazi."
 
 #: src/settings_translation_file.cpp
 msgid "Disable anticheat"
-msgstr ""
+msgstr "Lemaza anticheat"
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, disable cheat prevention in multiplayer."
-msgstr ""
+msgstr "Ikiwa imewezeshwa, kulemaza uzuiaji wa soka katika multiplayer."
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
-msgstr ""
+msgstr "Mserereko kurekodi"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
 msgstr ""
+"Ikiwa imewezeshwa, matendo ni kumbukumbu kwa ajili ya mserereko.\n"
+"Chaguo hili ni soma tu wakati wa kuanza kwa seva."
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
-msgstr ""
+msgstr "Uzimaji ujumbe"
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server shuts down."
-msgstr ""
+msgstr "Ujumbe kuonyeshwa kwa wateja wote wakati seva huzima."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
-msgstr ""
+msgstr "Ajali ujumbe"
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server crashes."
-msgstr ""
+msgstr "Ujumbe kuonyeshwa kwa wateja wote wakati seva yaanguka."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
-msgstr ""
+msgstr "Uliza kuunganisha baada ya ajali"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether to ask clients to reconnect after a (Lua) crash.\n"
 "Set this to true if your server is set up to restart automatically."
 msgstr ""
+"Kama kuuliza wateja kuunganisha baada (Lua) ajali.\n"
+"Seti hii kweli kama seva yako ni kuanzisha kuwasha upya otomatiki."
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
-msgstr ""
+msgstr "Kiolwa amilifu Tuma masafa"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far clients know about objects, stated in mapblocks (16 nodes)."
 msgstr ""
+"Kutoka wateja mbali kiasi gani kujua kuhusu vitu, alisema katika mapblocks ("
+"fundo 16)."
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr ""
+msgstr "Masafa ya fungu amilifu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2981,35 +3278,40 @@ msgid ""
 "mapblocks (16 nodes).\n"
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
+"Jinsi ya eneo kubwa la vitalu ni chini ya fungu amilifu mambo, alisema "
+"katika mapblocks (fundo 16).\n"
+"Katika vitalu amilifu vitu ni kupakiwa na ABMs kukimbia."
 
 #: src/settings_translation_file.cpp
 msgid "Max block send distance"
-msgstr ""
+msgstr "Umbo la Max Tuma umbali"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
+"Kutoka vitalu mbali jinsi hutumwa kwa wateja, alisema katika mapblocks ("
+"fundo 16)."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
-msgstr ""
+msgstr "Forceloaded upeo vitalu"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
-msgstr ""
+msgstr "Namba ya juu ya forceloaded mapblocks."
 
 #: src/settings_translation_file.cpp
 msgid "Time send interval"
-msgstr ""
+msgstr "Wakati kutuma nafasi"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of sending time of day to clients."
-msgstr ""
+msgstr "Muda wa kutuma wakati wa siku kwa wateja."
 
 #: src/settings_translation_file.cpp
 msgid "Time speed"
-msgstr ""
+msgstr "Kasi ya muda"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3017,74 +3319,78 @@ msgid ""
 "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
 "unchanged."
 msgstr ""
+"Vidhibiti vya urefu wa mzunguko wa siku/usiku.\n"
+"Mifano: 72 = 20 min, 360 = 4 min, 1 = 24 saa, 0 = anakaa siku/usiku/whatever "
+"unchanged."
 
 #: src/settings_translation_file.cpp
 msgid "Map save interval"
-msgstr ""
+msgstr "Ramani hifadhi muda"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
+"Muda wa kuhifadhi mabadiliko muhimu katika ulimwengu, alisema katika sekunde."
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
-msgstr ""
+msgstr "Fizikia"
 
 #: src/settings_translation_file.cpp
 msgid "Default acceleration"
-msgstr ""
+msgstr "Kichapuzi Chaguo-msingi"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
-msgstr ""
+msgstr "Kuongeza kasi katika hewa"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode acceleration"
-msgstr ""
+msgstr "Kuongeza kasi hali ya haraka"
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
-msgstr ""
+msgstr "Kutembea kasi"
 
 #: src/settings_translation_file.cpp
 msgid "Crouch speed"
-msgstr ""
+msgstr "Ingia kasi"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode speed"
-msgstr ""
+msgstr "Kasi ya hali ya haraka"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
-msgstr ""
+msgstr "Kasi ya upandaji"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
-msgstr ""
+msgstr "Kuruka kasi"
 
 #: src/settings_translation_file.cpp
 msgid "Descending speed"
-msgstr ""
+msgstr "Kushuka kasi"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity"
-msgstr ""
+msgstr "Fluidity kioevu"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity smoothing"
-msgstr ""
+msgstr "Fluidity kioevu unyooshaji"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid sink"
-msgstr ""
+msgstr "Kuzama kioevu"
 
 #: src/settings_translation_file.cpp
 msgid "Gravity"
-msgstr ""
+msgstr "Mvutano"
 
 #: src/settings_translation_file.cpp
 msgid "Deprecated Lua API handling"
-msgstr ""
+msgstr "Deprecated Lua API utunzaji"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3093,10 +3399,16 @@ msgid ""
 "-    log: mimic and log backtrace of deprecated call (default for debug).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
+"Utunzaji kwa deprecated lua ya API: - Rithi: (jaribu kwa) mimic zamani tabia "
+"(chaguo-msingi kwa ajili ya kutolewa).\n"
+"-logi: kuiga na kuingia backtrace wa deprecated wito (chaguo-msingi kwa "
+"ajili ya rekebishi).\n"
+"-Kosa: tusiseme juu ya matumizi ya simu deprecated (alipendekeza kwa "
+"watengenezaji Moduli)."
 
 #: src/settings_translation_file.cpp
 msgid "Max. clearobjects extra blocks"
-msgstr ""
+msgstr "Max. clearobjects vitalu vya ziada"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3104,88 +3416,97 @@ msgid ""
 "This is a trade-off between sqlite transaction overhead and\n"
 "memory consumption (4096=100MB, as a rule of thumb)."
 msgstr ""
+"Idadi ya vitalu ziada ambayo inaweza kupakiwa na /clearobjects mara moja.\n"
+"Hii ni mikinzano kati sqlite shughuli uendeshaji na matumizi ya kumbukumbu ("
+"4096 = 100 MB, kama kanuni ya thumb)."
 
 #: src/settings_translation_file.cpp
 msgid "Unload unused server data"
-msgstr ""
+msgstr "Wakipakua zisizotumika seva ya data"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
 "Higher value is smoother, but will use more RAM."
 msgstr ""
+"Seva kiasi kusubiri kabla ya kupakua mapblocks zisizotumika.\n"
+"Thamani ya juu zaidi ni laini, lakini kutumia RAM zaidi."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum objects per block"
-msgstr ""
+msgstr "Vipengee juu kwa kila fungu"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of statically stored objects in a block."
-msgstr ""
+msgstr "Namba ya juu ya vipengee statically kuhifadhiwa katika umbo la."
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
-msgstr ""
+msgstr "SQLite Uvingirizi"
 
 #: src/settings_translation_file.cpp
 msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
-msgstr ""
+msgstr "Ona http://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
 msgid "Dedicated server step"
-msgstr ""
+msgstr "Hatua ya seva ya kujitolea"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Length of a server tick and the interval at which objects are generally "
 "updated over network."
 msgstr ""
+"Urefu wa alama ya tiki seva na nafasi ambayo vitu ni kwa ujumla kusasaishwa "
+"kwenye mtandao."
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Management interval"
-msgstr ""
+msgstr "Nafasi kazi ya usimamizi wa umbo"
 
 #: src/settings_translation_file.cpp
 msgid "Time in between active block management cycles"
-msgstr ""
+msgstr "Muda kati ya mizunguko ya usimamizi ya fungu amilifu"
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifier interval"
-msgstr ""
+msgstr "Amilifu fungu Kigeuza nafasi"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between ABM execution cycles"
-msgstr ""
+msgstr "Urefu wa muda kati ya ABM utekelezaji mizunguko"
 
 #: src/settings_translation_file.cpp
 msgid "NodeTimer interval"
-msgstr ""
+msgstr "Nafasi ya NodeTimer"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between NodeTimer execution cycles"
-msgstr ""
+msgstr "Urefu wa muda kati ya mzunguko wa utekelezaji wa NodeTimer"
 
 #: src/settings_translation_file.cpp
 msgid "Ignore world errors"
-msgstr ""
+msgstr "Kupuuza makosa ya ulimwengu"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, invalid world data won't cause the server to shut down.\n"
 "Only enable this if you know what you are doing."
 msgstr ""
+"Ikiwa imewezeshwa, data ya dunia batili si kusababisha seva kuzima.\n"
+"Tu kuwezesha hii kama unajua nini unafanya."
 
 #: src/settings_translation_file.cpp
 msgid "Liquid loop max"
-msgstr ""
+msgstr "Kitanzi kioevu upeo"
 
 #: src/settings_translation_file.cpp
 msgid "Max liquids processed per step."
-msgstr ""
+msgstr "Max viowevu kusindika kwa kila hatua."
 
 #: src/settings_translation_file.cpp
 msgid "Liquid queue purge time"
-msgstr ""
+msgstr "Wakati wa usafishaji wa foleni ya kioevu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3193,46 +3514,53 @@ msgid ""
 "capacity until an attempt is made to decrease its size by dumping old queue\n"
 "items.  A value of 0 disables the functionality."
 msgstr ""
+"Muda (katika sekunde) kuwa foleni ya viowevu inaweza kukua zaidi usindikaji "
+"uwezo hadi jaribio ni alifanya kupungua ukubwa wake na utupaji vipengee "
+"kongwe ya foleni.  Thamani ya 0 Hulemaza utendaji."
 
 #: src/settings_translation_file.cpp
 msgid "Liquid update tick"
-msgstr ""
+msgstr "Pata sasishi kioevu"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid update interval in seconds."
-msgstr ""
+msgstr "Sasisha kioevu nafasi katika sekunde."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
-msgstr ""
+msgstr "Mwandishi ramani jina"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Name of map generator to be used when creating a new world.\n"
 "Creating a world in the main menu will override this."
 msgstr ""
+"Jina la ramani jenereta kutumika wakati wa kuunda dunia mpya.\n"
+"Kujenga ulimwengu katika Menyu kuu itakuwa vinabatilisha hii."
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
-msgstr ""
+msgstr "Kiwango cha maji"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
-msgstr ""
+msgstr "Maji ngazi ya uso wa dunia."
 
 #: src/settings_translation_file.cpp
 msgid "Max block generate distance"
-msgstr ""
+msgstr "Umbo la Max kuzalisha umbali"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far blocks are generated for clients, stated in mapblocks (16 "
 "nodes)."
 msgstr ""
+"Kutoka vitalu mbali kiasi gani hutolewa kwa wateja, alisema katika mapblocks "
+"(fundo 16)."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
-msgstr ""
+msgstr "Kikomo cha kizazi cha ramani"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3243,10 +3571,15 @@ msgid ""
 "-    Those groups have an offset of -32, -32 nodes from the origin.\n"
 "-    Only groups which are within the map_generation_limit are generated"
 msgstr ""
+"Ambapo jenereta ramani hukomesha.\n"
+"Tafadhali kumbuka: - mdogo kwa 31000 (kipimo hapo juu ina athari) - jenereta "
+"ramani kazi katika makundi ya 80 x 80 x 80 fundo (5 x 5 x 5 MapBlocks).\n"
+"-Vikundi hivyo kuwa nje ya uwekaji wa-32,-32 fundo kutoka asili.\n"
+"-Tu vikundi vilivyo ndani ya map_generation_limit ni yanayotokana"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "Bendera ya Mwandishi ramani"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3257,56 +3590,71 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Ramani ya kimataifa kizazi sifa.\n"
+"Katika Mwandishi ramani v6 bendera ya 'kienyeji' udhibiti mapambo yote "
+"isipokuwa miti na junglegrass, katika mapgens mengine yote bendera hii "
+"udhibiti mapambo yote.\n"
+"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
+"kutoka chaguo-msingi.\n"
+"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
 
 #: src/settings_translation_file.cpp
 msgid "Chunk size"
-msgstr ""
+msgstr "Ukubwa wa fungu"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 "
 "nodes)."
 msgstr ""
+"Ukubwa wa kikidondoka kutengenezwa mara kwa mwandishi ramani, katika "
+"mapblocks (fundo 16)."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"
-msgstr ""
+msgstr "Utatuaji wa Mwandishi ramani"
 
 #: src/settings_translation_file.cpp
 msgid "Dump the mapgen debug infos."
-msgstr ""
+msgstr "Bwaga mwandishi ramani rekebishi infos."
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of emerge queues"
-msgstr ""
+msgstr "Kikomo halisi ya foleni ya emerge"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
+"Namba ya juu ya vitalu kwamba unaweza kwenye foleni kwa ajili ya kupakia."
 
 #: src/settings_translation_file.cpp
 msgid "Limit of emerge queues on disk"
-msgstr ""
+msgstr "Kikomo ya foleni emerge kwenye diski"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "Set to blank for an appropriate amount to be chosen automatically."
 msgstr ""
+"Namba ya juu ya vitalu kwa kuwa kwenye foleni kwamba ni kupakiwa kutoka "
+"faili.\n"
+"Seti kwa wazi kwa kiasi sahihi ili uweze kuchaguliwa moja kwa moja."
 
 #: src/settings_translation_file.cpp
 msgid "Limit of emerge queues to generate"
-msgstr ""
+msgstr "Kikomo ya foleni emerge kuzalisha"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "Set to blank for an appropriate amount to be chosen automatically."
 msgstr ""
+"Namba ya juu ya vitalu kwa kuwa kwenye foleni kwamba ni kutengenezwa.\n"
+"Seti kwa wazi kwa kiasi sahihi ili uweze kuchaguliwa moja kwa moja."
 
 #: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
-msgstr ""
+msgstr "Idadi ya nyuzi emerge"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3316,66 +3664,69 @@ msgid ""
 "speed greatly\n"
 "at the cost of slightly buggy caves."
 msgstr ""
+"Idadi ya nyuzi emerge kutumia. Kufanya hii shamba tupu, au kuongeza idadi "
+"hii kutumia nyuzi nyingi. Kwenye mifumo ya multiprocessor, hii itasaidia "
+"kuongeza kasi ya mwandishi ramani sana wanatengeneza mapango buggy kidogo."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome heat noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani biome joto kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Noise parameters for biome API temperature, humidity and biome blend."
-msgstr ""
+msgstr "Kelele vigezo vya biome API joto, unyevu na biome mchanganyiko."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen heat blend noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani joto mchanganyiko kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome humidity noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani biome unyevu kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome humidity blend noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani biome unyevu mchanganyiko kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5"
-msgstr ""
+msgstr "Mwandishi ramani v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave width"
-msgstr ""
+msgstr "Mwandishi ramani v5 pango upana"
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
+msgstr "Vidhibiti vya upana wa vichuguu, thamani ndogo huunda vichuguu pana."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 filler depth noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v5 filler kina kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 factor noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v5 sababu kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 height noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v5 urefu kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave1 noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v5 cave1 kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave2 noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v5 cave2 kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6"
-msgstr ""
+msgstr "Mwandishi ramani v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 flags"
-msgstr ""
+msgstr "Mwandishi ramani v6 bendera"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3386,72 +3737,80 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Ramani kizazi sifa maalum ya Mwandishi ramani v6.\n"
+"Wakati snowbiomes vimewezeshwa misitu otomatiki imewezeshwa, bendera ya "
+"'misitu' ni kupuuzwa.\n"
+"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
+"kutoka chaguo-msingi.\n"
+"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 desert frequency"
-msgstr ""
+msgstr "Mwandishi ramani v6 jangwa marudio"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Controls size of deserts and beaches in Mapgen v6.\n"
 "When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
 msgstr ""
+"Vidhibiti ukubwa wa majangwa na fukwe katika Mwandishi ramani v6.\n"
+"Wakati snowbiomes vimewezeshwa 'mgv6_freq_desert' ni kupuuzwa."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach frequency"
-msgstr ""
+msgstr "Mwandishi ramani v6 pwani marudio"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 terrain base noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 ardhi kelele msingi vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 terrain altitude noise parameters"
-msgstr ""
+msgstr "Mwinuko wa ardhi ya Mwandishi ramani v6 kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 steepness noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 mwinuko kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 height select noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 urefu Teua vigezo kelele"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 mud noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 matope kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 pwani kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 biome noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 biome kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 cave noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 pango kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 humidity noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 unyevu kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 trees noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 miti kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 apple trees noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v6 apple miti kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7"
-msgstr ""
+msgstr "Mwandishi ramani v7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 flags"
-msgstr ""
+msgstr "Mwandishi ramani v7 bendera"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3461,62 +3820,67 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Ramani kizazi sifa maalum kwa Mwandishi ramani v7.\n"
+"Bendera ya 'matuta' udhibiti mito.\n"
+"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
+"kutoka chaguo-msingi.\n"
+"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave width"
-msgstr ""
+msgstr "Mwandishi ramani v7 pango upana"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 terrain base noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 ardhi kelele msingi vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 terrain altitude noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 ardhi mwinuko kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 terrain persistation noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 ardhi persistation kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 height select noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 urefu Teua vigezo kelele"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 filler depth noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 filler kina kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 mount height noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 mlima urefu kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 ridge water noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 tuta maji kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 mountain noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 mlima kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 ridge noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 tuta kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave1 noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 cave1 kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave2 noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani v7 cave2 kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat"
-msgstr ""
+msgstr "Mwandishi ramani gorofa"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat flags"
-msgstr ""
+msgstr "Mwandishi ramani gorofa bendera"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3526,30 +3890,35 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Ramani kizazi sifa maalum kwa Mwandishi ramani gorofa.\n"
+"Maziwa mara kwa mara na vilima vinaweza kuongezwa kwa ulimwengu gorofa.\n"
+"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
+"kutoka chaguo-msingi.\n"
+"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat ground level"
-msgstr ""
+msgstr "Mwandishi ramani gorofa ngazi ya chini"
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
-msgstr ""
+msgstr "Y ya ardhi tambarare."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat large cave depth"
-msgstr ""
+msgstr "Mwandishi ramani pango kubwa gorofa kina"
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large pseudorandom caves."
-msgstr ""
+msgstr "Y ya upper kikomo ya kubwa pseudorandom cellars."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave width"
-msgstr ""
+msgstr "Mwandishi ramani pango gorofa upana"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat lake threshold"
-msgstr ""
+msgstr "Mwandishi ramani ziwa gorofa kizingiti"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3557,18 +3926,21 @@ msgid ""
 "Controls proportion of world area covered by lakes.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Ardhi kelele kizingiti kwa ajili ya maziwa.\n"
+"Vidhibiti vya uwiano wa dunia eneo lililofunikwa na maziwa.\n"
+"Rekebisha kuelekea 0.0 kwa sehemu kubwa."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat lake steepness"
-msgstr ""
+msgstr "Mwandishi ramani ziwa gorofa mwinuko"
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
-msgstr ""
+msgstr "Udhibiti mwinuko/kina cha ziwa depressions."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill threshold"
-msgstr ""
+msgstr "Kilele cha mlima gorofa Mwandishi ramani"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3576,18 +3948,21 @@ msgid ""
 "Controls proportion of world area covered by hills.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Ardhi kelele kizingiti kwa milima.\n"
+"Vidhibiti vya uwiano wa dunia eneo lililofunikwa na milima.\n"
+"Rekebisha kuelekea 0.0 kwa sehemu kubwa."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill steepness"
-msgstr ""
+msgstr "Mwandishi ramani gorofa kilima mwinuko"
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/height of hills."
-msgstr ""
+msgstr "Udhibiti mwinuko/urefu wa milima."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat terrain noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani ardhi tambarare kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3595,30 +3970,32 @@ msgid ""
 "The 3 numbers in brackets control the scale of the\n"
 "terrain, the 3 numbers should be identical."
 msgstr ""
+"Huamua umbo wa ardhi.\n"
+"Namba 3 katika mabano kudhibiti ukubwa wa ardhi, namba 3 lazima kufanana."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat filler depth noise parameters"
-msgstr ""
+msgstr "Filler wa gorofa ya Mwandishi ramani kina kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave1 noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani cave1 za gorofa kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave2 noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani cave2 za gorofa kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal"
-msgstr ""
+msgstr "Fractal ya Mwandishi ramani"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave width"
-msgstr ""
+msgstr "Mwandishi ramani fractal pango upana"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal fractal"
-msgstr ""
+msgstr "Mwandishi ramani fractal fractal"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3642,28 +4019,49 @@ msgid ""
 "17 = 4D \"Mandelbulb\" mandelbrot set.\n"
 "18 = 4D \"Mandelbulb\" julia set."
 msgstr ""
+"Uchaguzi wa fractals 18 kutoka fomula 9.\n"
+"1 = 4 D \"Roundy\" mandelbrot seti.\n"
+"2 = 4 D seti ya julia \"Roundy\".\n"
+"3 = 4 D \"Squarry\" mandelbrot seti.\n"
+"4 = 4 D seti ya julia \"Squarry\".\n"
+"5 = 4 D \"Binamu Mandy\" mandelbrot seti.\n"
+"6 = 4 D \"Binamu Mandy\" julia seti.\n"
+"7 = 4 D \"Tofauti\" mandelbrot seti.\n"
+"8 = 4 D seti ya julia \"Tofauti\".\n"
+"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot seti.\n"
+"10 = 3D julia \"Mandelbrot/Mandelbar\" seti.\n"
+"11 = 3D \"Mti wa Krismasi\" mandelbrot seti.\n"
+"12 = 3D \"Mti wa Krismasi\" julia seti.\n"
+"13 = 3D \"Mandelbulb\" mandelbrot seti.\n"
+"14 = 3D julia \"Mandelbulb\" seti.\n"
+"15 = 3D \"Kosaini Mandelbulb\" mandelbrot seti.\n"
+"16 = 3D julia \"Kosaini Mandelbulb\" seti.\n"
+"17 = 4 D \"Mandelbulb\" mandelbrot seti.\n"
+"18 = 4 D seti ya julia \"Mandelbulb\"."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal iterations"
-msgstr ""
+msgstr "Mwandishi ramani fractal Marudiorudio"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Iterations of the recursive function.\n"
 "Controls the amount of fine detail."
 msgstr ""
+"Marudiorudio ya kazi recursive.\n"
+"Udhibiti kiasi cha undani faini."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal scale"
-msgstr ""
+msgstr "Mwandishi ramani fractal kipimo"
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
-msgstr ""
+msgstr "Kukadiria (X, Y, Z) kipimo cha fractal katika fundo."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal offset"
-msgstr ""
+msgstr "Mwandishi ramani fractal Sawazisha"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3673,10 +4071,17 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X, Y, Z) fidia ya fractal kutoka kituo cha dunia katika vitengo vya "
+"'kipimo'.\n"
+"Kutumika ili kuhamisha eneo la spawn ya kufaa ya ardhi chini karibu (0, 0).\n"
+"Chaguo-msingi ni mzuri kwa ajili ya seti ya mandelbrot, inahitaji kuhaririwa "
+"kwa ajili ya julia seti.\n"
+"Masafa ya takribani-2 hadi 2. Kuzidisha kwa 'Skeli' kwa Sawazisha katika "
+"fundo."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal slice w"
-msgstr ""
+msgstr "Mwandishi ramani fractal kisu w"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3685,10 +4090,14 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"W kuratibu ya yanayotokana 3D kisu wa fractal wa 4 D.\n"
+"Huamua kisu ambayo 3D wa umbo 4D huundwa.\n"
+"Ina athari 3D fractals.\n"
+"Masafa ya takribani-2 hadi 2."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia x"
-msgstr ""
+msgstr "Mwandishi ramani fractal julia x"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3696,10 +4105,12 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Julia kuweka tu: X sehemu ya hypercomplex mara kwa mara umbo julia kukazia.\n"
+"Masafa ya takribani-2 hadi 2."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia y"
-msgstr ""
+msgstr "Mwandishi ramani fractal julia y"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3707,10 +4118,12 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Julia kuweka tu: sehemu Y ya hypercomplex mara kwa mara umbo julia kukazia.\n"
+"Masafa ya takribani-2 hadi 2."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia z"
-msgstr ""
+msgstr "Mwandishi ramani fractal julia z"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3718,10 +4131,12 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Julia kuweka tu: Z sehemu ya hypercomplex mara kwa mara umbo julia kukazia.\n"
+"Masafa ya takribani-2 hadi 2."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia w"
-msgstr ""
+msgstr "Mwandishi ramani fractal julia w"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3730,34 +4145,37 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Julia kuweka tu: W sehemu ya hypercomplex mara kwa mara umbo julia kukazia.\n"
+"Ina athari 3D fractals.\n"
+"Masafa ya takribani-2 hadi 2."
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal seabed noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani fractal seabed kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal filler depth noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani fractal filler kina kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave1 noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani fractal cave1 kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave2 noise parameters"
-msgstr ""
+msgstr "Mwandishi ramani fractal cave2 kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys"
-msgstr ""
+msgstr "Mwandishi ramani mabonde"
 
 #: src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "Mkuu"
 
 #: src/settings_translation_file.cpp
 msgid "Valleys C Flags"
-msgstr ""
+msgstr "Bendera ya mabonde C"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3771,186 +4189,204 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
+"Ramani kizazi sifa maalum kwa mabonde ya Mwandishi ramani.\n"
+"'altitude_chill' hufanya mwinuko wa juu baridi, ambayo inaweza kusababisha "
+"masuala ya biome.\n"
+"'humid_rivers' Inarekebisha unyevu kuzunguka mito na maeneo ambapo maji Je "
+"huwa na bwawa, inaweza kuingilia kati na biomes Imerekebisha maisha ya anasa."
+"\n"
+"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
+"kutoka chaguo-msingi.\n"
+"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
 
 #: src/settings_translation_file.cpp
 msgid "Altitude Chill"
-msgstr ""
+msgstr "Chill ya mwinuko"
 
 #: src/settings_translation_file.cpp
 msgid "The altitude at which temperature drops by 20C"
-msgstr ""
+msgstr "Mwinuko katika matone ambayo joto na 20C"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
-msgstr ""
+msgstr "Kina ya pango kubwa"
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find large caves."
-msgstr ""
+msgstr "Kina chini ambayo utapata mapango kubwa."
 
 #: src/settings_translation_file.cpp
 msgid "Lava Features"
-msgstr ""
+msgstr "Lava vipengele"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Creates unpredictable lava features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
+"Huunda lava haitabiriki sifa katika mapango.\n"
+"Haya kufanya madini vigumu. Sifuri Hulemaza yao. (0-10)"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave depth"
-msgstr ""
+msgstr "Kina ya pango mkubwa"
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find massive caves."
-msgstr ""
+msgstr "Kina chini ambayo utapata mapango mkubwa."
 
 #: src/settings_translation_file.cpp
 msgid "River Depth"
-msgstr ""
+msgstr "Kina wa mto"
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers"
-msgstr ""
+msgstr "Kina jinsi kufanya mito"
 
 #: src/settings_translation_file.cpp
 msgid "River Size"
-msgstr ""
+msgstr "Ukubwa wa mto"
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers"
-msgstr ""
+msgstr "Upana gani kufanya mito"
 
 #: src/settings_translation_file.cpp
 msgid "Water Features"
-msgstr ""
+msgstr "Vipengele vya maji"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Creates unpredictable water features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
+"Huunda maji haitabiriki sifa katika mapango.\n"
+"Haya kufanya madini vigumu. Sifuri Hulemaza yao. (0-10)"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "Pango upana"
 
 #: src/settings_translation_file.cpp
 msgid "Noises"
-msgstr ""
+msgstr "Kila"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #1"
-msgstr ""
+msgstr "Pango kelele #1"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
-msgstr ""
+msgstr "Fomu ya mapango na vichuguu katika makutano ya kila mbili"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #2"
-msgstr ""
+msgstr "Pango kelele #2"
 
 #: src/settings_translation_file.cpp
 msgid "Filler Depth"
-msgstr ""
+msgstr "Kina ya Filler"
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
-msgstr ""
+msgstr "Kina cha uchafu au filler nyingine"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave noise"
-msgstr ""
+msgstr "Kelele ya pango mkubwa"
 
 #: src/settings_translation_file.cpp
 msgid "Massive caves form here."
-msgstr ""
+msgstr "Fomu ya mapango mkubwa hapa."
 
 #: src/settings_translation_file.cpp
 msgid "River Noise"
-msgstr ""
+msgstr "Kelele za mto"
 
 #: src/settings_translation_file.cpp
 msgid "River noise -- rivers occur close to zero"
-msgstr ""
+msgstr "Kelele za mto - mito kutokea karibu na sifuri"
 
 #: src/settings_translation_file.cpp
 msgid "Terrain Height"
-msgstr ""
+msgstr "Urefu wa ardhi"
 
 #: src/settings_translation_file.cpp
 msgid "Base terrain height"
-msgstr ""
+msgstr "Mandhari ya msingi urefu"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Depth"
-msgstr ""
+msgstr "Kina wa Bonde"
 
 #: src/settings_translation_file.cpp
 msgid "Raises terrain to make valleys around the rivers"
-msgstr ""
+msgstr "Huwafufua ardhi kufanya mabonde kuzunguka mito"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Fill"
-msgstr ""
+msgstr "Jaza ya Bonde"
 
 #: src/settings_translation_file.cpp
 msgid "Slope and fill work together to modify the heights"
-msgstr ""
+msgstr "Mteremko na Jaza kazi pamoja kurekebisha urefu"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Profile"
-msgstr ""
+msgstr "Maelezo mafupi ya Bonde"
 
 #: src/settings_translation_file.cpp
 msgid "Amplifies the valleys"
-msgstr ""
+msgstr "Inaangazia mabonde"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Slope"
-msgstr ""
+msgstr "Mteremko wa Bonde"
 
 #: src/settings_translation_file.cpp
 msgid "Security"
-msgstr ""
+msgstr "Usalama"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod security"
-msgstr ""
+msgstr "Kuwezesha usalama Moduli"
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
-msgstr ""
+msgstr "Kuzuia mods kufanya mambo zisizo kama kuendesha amri ya Sheli."
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
-msgstr ""
+msgstr "Mods aminifu"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
+"Iliyotenganishwa orodha ya mods kuaminika kwamba wanaruhusiwa kufikia kazi "
+"zisizo hata wakati usalama Moduli ni juu (kupitia "
+"request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
 msgid "HTTP Mods"
-msgstr ""
+msgstr "HTTP Mods"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"Iliyotenganishwa orodha ya mods kwamba wanaruhusiwa kufikia HTTP APIs, "
+"ambayo kuwaruhusu kupakia na kupakua data/toka kwenye tovuti."
 
 #: src/settings_translation_file.cpp
 msgid "Profiling"
-msgstr ""
+msgstr "Ubainishaji wa"
 
 #: src/settings_translation_file.cpp
 msgid "Load the game profiler"
-msgstr ""
+msgstr "Kupakia profiler mchezo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3958,88 +4394,97 @@ msgid ""
 "Provides a /profiler command to access the compiled profile.\n"
 "Useful for mod developers and server operators."
 msgstr ""
+"Kupakia profiler mchezo kukusanya data ya ubainishaji wa mchezo.\n"
+"Hutoa amri /profiler kufikia umbo Kusanyo.\n"
+"Muhimu kwa watengenezaji Moduli na waendeshaji wa seva."
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Umbizo wa ripoti wa chaguo-msingi"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"Umbizo wa chaguo-msingi ambayo maumbo ni kuokoka, wakati wito '/ profiler "
+"Hifadhi [umbizo]' bila umbizo."
 
 #: src/settings_translation_file.cpp
 msgid "Report path"
-msgstr ""
+msgstr "Njia ya ripoti"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your worldpath in which profiles will be saved "
 "to.\n"
-msgstr ""
+msgstr "Kijia cha faili jamaa yako worldpath ambayo maumbo utaakibishwa kwenye."
 
 #: src/settings_translation_file.cpp
 msgid "Instrumentation"
-msgstr ""
+msgstr "Instrumentation"
 
 #: src/settings_translation_file.cpp
 msgid "Entity methods"
-msgstr ""
+msgstr "Mbinu ya chombo"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument the methods of entities on registration."
-msgstr ""
+msgstr "Instrument mbinu za vyombo kwenye usajili."
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
-msgstr ""
+msgstr "Modifiers fungu amilifu"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
-msgstr ""
+msgstr "Ala ya kazi hatua ya Modifiers Amilifu wa fungu kwenye usajili."
 
 #: src/settings_translation_file.cpp
 msgid "Loading Block Modifiers"
-msgstr ""
+msgstr "Inapakiza umbo Modifiers"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
-msgstr ""
+msgstr "Ala ya kazi hatua ya kupakia fungu Modifiers kwenye usajili."
 
 #: src/settings_translation_file.cpp
 msgid "Chatcommands"
-msgstr ""
+msgstr "Amri majadiliano"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument chatcommands on registration."
-msgstr ""
+msgstr "Chombo chatcommands kwenye usajili."
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
-msgstr ""
+msgstr "Callbacks ya kimataifa"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
+"Chombo mwito-rejeshi kimataifa kazi kwenye usajili.\n"
+"(kitu chochote unaweza kupita kwa kazi minetest.register_*())"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "Pamoja"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
+"Chombo builtin.\n"
+"Hii ni kawaida tu zinazohitajika kwa wachangiaji wa msingi/builtin"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler"
-msgstr ""
+msgstr "Profiler"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4049,14 +4494,18 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
+"Kuwa profiler instrument yenyewe: * Instrument kazi tupu.\n"
+"Hii makadirio vimezingirwa, kwamba instrumentation ni kuongeza (+ 1 kazi "
+"simu).\n"
+"* Chombo sampler kutumika ili kusasisha takwimu."
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
-msgstr ""
+msgstr "Mteja na seva"
 
 #: src/settings_translation_file.cpp
 msgid "Player name"
-msgstr ""
+msgstr "Jina la mchezaji"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4064,20 +4513,25 @@ msgid ""
 "When running a server, clients connecting with this name are admins.\n"
 "When starting from the main menu, this is overridden."
 msgstr ""
+"Jina la mchezaji.\n"
+"Wakati kuendesha seva, wateja kuunganisha kwa jina hili ni admins.\n"
+"Wakati kuanzia Menyu kuu, hii ni kuuharibu."
 
 #: src/settings_translation_file.cpp
 msgid "Language"
-msgstr ""
+msgstr "Lugha"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set the language. Leave empty to use the system language.\n"
 "A restart is required after changing this."
 msgstr ""
+"Seti lugha. Acha tupu kwa kutumia lugha ya mfumo.\n"
+"Kuanza upya inahitajika baada ya kubadilisha hii."
 
 #: src/settings_translation_file.cpp
 msgid "Debug log level"
-msgstr ""
+msgstr "Rekebisha kiwango cha logi"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4090,28 +4544,33 @@ msgid ""
 "-    info\n"
 "-    verbose"
 msgstr ""
+"Kiwango cha ufunguaji kuandikwa kwa debug.txt:- <nothing>(Hakuna ufunguaji) -"
+" Hakuna (ujumbe na hakuna kiwango) - kosa - tahadhari - hatua - taarifa - "
+"verbose</nothing>"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 support."
-msgstr ""
+msgstr "IPv6 msaada."
 
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"
-msgstr ""
+msgstr "muda wa kuisha wa cURL"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
 "Only has an effect if compiled with cURL."
 msgstr ""
+"Chaguo-msingi muda wa kuisha kwa cURL, alisema katika milisekunde.\n"
+"Tu ina athari kama alikusanya na Mkunjo."
 
 #: src/settings_translation_file.cpp
 msgid "cURL parallel limit"
-msgstr ""
+msgstr "cURL kikomo sambamba"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4121,57 +4580,66 @@ msgid ""
 "-    Downloads performed by main menu (e.g. mod manager).\n"
 "Only has an effect if compiled with cURL."
 msgstr ""
+"Mipaka idadi ya maombi HTTP sambamba. Huathiri: - vyombo vya habari kuchota "
+"kama seva hutumia kipimo cha remote_media.\n"
+"-Serverlist kupakua na seva tangazo.\n"
+"-Downloads zifanywe Menyu kuu (k.m Meneja Moduli).\n"
+"Tu ina athari kama alikusanya na Mkunjo."
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
-msgstr ""
+msgstr "cURL muda wa upakuzi wa faili"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
 msgstr ""
+"Muda wa juu zaidi katika ms kupakua faili (kwa mfano upakuaji na Moduli) "
+"inaweza kuchukua."
 
 #: src/settings_translation_file.cpp
 msgid "High-precision FPU"
-msgstr ""
+msgstr "FPU kuu-usahihi"
 
 #: src/settings_translation_file.cpp
 msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
-msgstr ""
+msgstr "Hufanya DirectX kazi na LuaJIT. Lemaza ikiwa husababisha matatizo."
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
-msgstr ""
+msgstr "Hati ya Menyu kuu"
 
 #: src/settings_translation_file.cpp
 msgid "Replaces the default main menu with a custom one."
-msgstr ""
+msgstr "Kinabadilisha chaguo-msingi Menyu kuu kwa moja maalum."
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
-msgstr ""
+msgstr "Meneja wa mchezo wa Menyu kuu"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu mod manager"
-msgstr ""
+msgstr "Menyu kuu Moduli Meneja"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore download URL"
-msgstr ""
+msgstr "Modstore kupakua URL"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore mods list URL"
-msgstr ""
+msgstr "Modstore mods orodha ya URL"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
-msgstr ""
+msgstr "Modstore maelezo URL"
 
 #: src/settings_translation_file.cpp
 msgid "Engine profiling data print interval"
-msgstr ""
+msgstr "Injini ubainishaji wa data ya uchapaji nafasi"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds). 0 = "
 "disable. Useful for developers."
 msgstr ""
+"Chapisha injini ya ubainishaji data katika vipindi vya kawaida (katika "
+"sekunde). 0 = Lemaza. Muhimu kwa watengenezaji."

From ec7e23d7802a0ec2cd6bd048a253d595728d906e Mon Sep 17 00:00:00 2001
From: Rui <rui.minetest@gmail.com>
Date: Sat, 1 Oct 2016 05:59:25 +0000
Subject: [PATCH 355/418] Translated using Weblate (Japanese)

Currently translated at 49.4% (454 of 918 strings)

This is a merger of 2 commits.
---
 po/ja/minetest.po | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/po/ja/minetest.po b/po/ja/minetest.po
index a73408c0a..59c647823 100644
--- a/po/ja/minetest.po
+++ b/po/ja/minetest.po
@@ -3,20 +3,20 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-08-17 07:33+0000\n"
+"PO-Revision-Date: 2016-11-16 13:08+0000\n"
 "Last-Translator: Rui <rui.minetest@gmail.com>\n"
-"Language-Team: Japanese <https://hosted.weblate.org/projects/minetest/"
-"minetest/ja/>\n"
+"Language-Team: Japanese "
+"<https://hosted.weblate.org/projects/minetest/minetest/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.8-dev\n"
+"X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "以下のModの、Luaスクリプトでエラーが発生しました:"
+msgstr "以下のModのLuaスクリプトでエラーが発生しました:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -44,16 +44,15 @@ msgstr "読み込み中..."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr "プロトコルバージョンが一致しません。 "
+msgstr "プロトコルのバージョンが一致していません。 "
 
 #: builtin/mainmenu/common.lua
-#, fuzzy
 msgid "Server enforces protocol version $1. "
-msgstr "サーバはプロトコルバージョン$1を要求します。 "
+msgstr "サーバはバージョン$1のプロトコルを強制しています。 "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "サーバは$1から$2までのプロトコルバージョンをサポートしています。 "
+msgstr "サーバは$1から$2までのプロトコルのバージョンをサポートしています。 "
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
@@ -61,11 +60,11 @@ msgstr "インターネット接続を確認し、公開サーバ一覧を再有
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr "プロトコルバージョンは$1のみをサポートします。"
+msgstr "プロトコルはバージョン$1のみをサポートしています。"
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr "プロトコルバージョンは$1から$2までをサポートします。"
+msgstr "バージョン$1から$2までのプロトコルをサポートしています。"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -121,7 +120,6 @@ msgid "World:"
 msgstr "ワールド:"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "enabled"
 msgstr "有効化"
 
@@ -135,8 +133,7 @@ msgstr "作成"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr ""
-"minetest.netから、minetest_gameなどのサブゲームをダウンロードしてください"
+msgstr "minetest.netからminetest_gameなどのサブゲームをダウンロードしてください"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
@@ -168,7 +165,7 @@ msgstr "ワールド名"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no subgames installed."
-msgstr "サブゲームをインストールしていません。"
+msgstr "サブゲームがインストールされていません。"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
@@ -186,7 +183,7 @@ msgstr "Modマネージャ: 「$1」の削除に失敗しました"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: invalid modpath \"$1\""
-msgstr "Modマネージャ: Mod「$1」の場所が不明です"
+msgstr "Modマネージャ: Mod「$1」の場所が無効です"
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
@@ -841,7 +838,7 @@ msgstr "KiB/秒"
 
 #: src/game.cpp
 msgid "Media..."
-msgstr "通信中..."
+msgstr "メディアを受信中..."
 
 #: src/game.cpp
 msgid "MiB/s"
@@ -1482,7 +1479,7 @@ msgstr "自動的にサーバ一覧に報告します。"
 
 #: src/settings_translation_file.cpp
 msgid "Autorun key"
-msgstr ""
+msgstr "オートランキー"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -1521,7 +1518,7 @@ msgstr "プレイヤーの位置に設置"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "ビルトイン"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
@@ -1554,7 +1551,7 @@ msgstr "洞窟ノイズ#2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "洞窟の幅"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4429,9 +4426,8 @@ msgid "Y of flat ground."
 msgstr "フラットマップの地面の高さ"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Y of upper limit of large pseudorandom caves."
-msgstr "大きい擬似ランダム洞窟の高さ(Y)の上限。"
+msgstr "擬似乱数による大きい洞窟の高さ(Y)の上限。"
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
@@ -4439,7 +4435,7 @@ msgstr "cURLファイルダウンロードタイムアウト"
 
 #: src/settings_translation_file.cpp
 msgid "cURL parallel limit"
-msgstr "cURLパラレル制限"
+msgstr "cURL並行処理制限"
 
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"

From f8c87a449603ed499ef04c3b4c1def1fa1979b78 Mon Sep 17 00:00:00 2001
From: "Alfonso R. Zepeda R" <ing.a.zepeda@gmx.com>
Date: Tue, 4 Oct 2016 03:39:44 +0000
Subject: [PATCH 356/418] Translated using Weblate (Spanish)

Currently translated at 57.8% (531 of 918 strings)
---
 po/es/minetest.po | 65 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/po/es/minetest.po b/po/es/minetest.po
index 1398377ee..8324ed251 100644
--- a/po/es/minetest.po
+++ b/po/es/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-06-14 21:57+0000\n"
-"Last-Translator: Roberto Mengíbar Fernández <rroobbeerr@gmail.com>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/minetest/"
-"minetest/es/>\n"
+"PO-Revision-Date: 2016-10-04 03:39+0000\n"
+"Last-Translator: Alfonso R. Zepeda R. <ing.a.zepeda@gmx.com>\n"
+"Language-Team: Spanish "
+"<https://hosted.weblate.org/projects/minetest/minetest/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -1162,7 +1162,7 @@ msgstr "Bloq Núm"
 
 #: src/keycode.cpp
 msgid "Numpad *"
-msgstr "Numpad *"
+msgstr "Teclado Numérico *"
 
 #: src/keycode.cpp
 msgid "Numpad +"
@@ -1486,7 +1486,7 @@ msgstr "Automáticamente informar a la lista del servidor."
 
 #: src/settings_translation_file.cpp
 msgid "Autorun key"
-msgstr ""
+msgstr "Tecla de Auto Ejecutar"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -1567,9 +1567,8 @@ msgid "Chat toggle key"
 msgstr "Tecla alternativa para el chat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Comando"
+msgstr "Comandos de Chat"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1838,7 +1837,7 @@ msgstr "Privilegios por defecto"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Formato de Reporte por defecto"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1863,8 +1862,9 @@ msgstr ""
 "límite)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Retraso en enviar bloques después de construir"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -1914,15 +1914,20 @@ msgstr "Desactivar Anticheat"
 
 #: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Desactivar secuencias de escape"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Disable escape sequences, e.g. chat coloring.\n"
 "Use this if you want to run a server with pre-0.4.14 clients and you want to "
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"Deshabilita las secuencias de escape, por ejemplo: colorear el chat.\n"
+"Usa esto si tu quieres correr un servidor con clientes pre-0.4.14  y quieres "
+"deshabilitar\n"
+"las secuencias de escape generadas por los mods."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
@@ -1950,8 +1955,9 @@ msgid "Dump the mapgen debug infos."
 msgstr "Imprimir información de depuración del generador de mapas."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "Activar Control"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
@@ -2062,7 +2068,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Entity methods"
-msgstr ""
+msgstr "Métodos de entidad"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2129,9 +2135,8 @@ msgid "Field of view"
 msgstr "Campo visual"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view for zoom"
-msgstr "Campo visual"
+msgstr "Campo visual del zoom"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
@@ -2321,7 +2326,7 @@ msgstr "HTTP Mods"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
-msgstr ""
+msgstr "Tecla de cambio del HUD"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2401,10 +2406,13 @@ msgid "IPv6 support."
 msgstr "soporte IPv6."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If FPS would go higher than this, limit it by sleeping\n"
 "to not waste CPU power for no benefit."
 msgstr ""
+"Si los FPS llegan a ser mas altos que esto, limítelos con interrupciones\n"
+"no gaste recursos del CPU en algo que no tiene beneficio."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2426,14 +2434,18 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
 msgstr ""
+"Si esta activiado, las accione son guardadas para un rollback.\n"
+"Esta opciones es de solo lectura cuando el servidor inicia."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "If enabled, disable cheat prevention in multiplayer."
-msgstr ""
+msgstr "Si esta habilitado, desactiva la prevención de trampas en multijugador"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2442,8 +2454,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "If enabled, new players cannot join with an empty password."
 msgstr ""
+"Si esta activado, los nuevos jugadores no pueden unirse con contraseñas "
+"vacías."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2453,25 +2468,27 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "If this is set, players will always (re)spawn at the given position."
-msgstr ""
+msgstr "Si se activa, los jugadores siempre reaparecerán en la posición dada."
 
 #: src/settings_translation_file.cpp
 msgid "Ignore world errors"
-msgstr ""
+msgstr "Ignora los errores del mundo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "In-Game"
-msgstr "Juego"
+msgstr "Dentro del Juego"
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
 msgstr ""
+"Valor alfa del fondo de la consola de chat durante el juego (opacidad, entre "
+"0 y 255)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background color (R,G,B)."
-msgstr ""
+msgstr "Color del fondo de la consola de chat durante el juego (R, G, B)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4389,7 +4406,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
-msgstr ""
+msgstr "Y de suelo plano."
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large pseudorandom caves."

From ab8fbd970f966993f79df31c6d6459cc3e437099 Mon Sep 17 00:00:00 2001
From: Roc Humet <roc.humet@gmail.com>
Date: Thu, 6 Oct 2016 17:55:09 +0000
Subject: [PATCH 357/418] Translated using Weblate (Catalan)

Currently translated at 43.6% (401 of 918 strings)
---
 po/ca/minetest.po | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/po/ca/minetest.po b/po/ca/minetest.po
index 54451ca68..918e44449 100644
--- a/po/ca/minetest.po
+++ b/po/ca/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-04-20 13:21+0000\n"
-"Last-Translator: Joan Ciprià Moreno Teodoro <joancipria@gmail.com>\n"
-"Language-Team: Catalan <https://hosted.weblate.org/projects/minetest/"
-"minetest/ca/>\n"
+"PO-Revision-Date: 2016-10-06 17:55+0000\n"
+"Last-Translator: Roc Humet <roc.humet@gmail.com>\n"
+"Language-Team: Catalan "
+"<https://hosted.weblate.org/projects/minetest/minetest/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.6-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -412,9 +412,8 @@ msgid "Uninstall selected modpack"
 msgstr "Desinstal·lar el paquet de mods seleccionat"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "Adreça / Port:"
+msgstr "Adreça / Port"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -434,16 +433,15 @@ msgstr "Dany activat"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr ""
+msgstr "Esborra preferit"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
-msgstr ""
+msgstr "Preferit"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "Nom / Contrasenya:"
+msgstr "Nom / Contrasenya"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -520,9 +518,8 @@ msgid "8x"
 msgstr "8x"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Advanced Settings"
-msgstr "Configuració"
+msgstr "Configuració avançada"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
@@ -604,14 +601,13 @@ msgid "Parallax Occlusion"
 msgstr "Oclusió de paral·laxi"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "Activar tot"
+msgstr "Partícules"
 
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Reset singleplayer world"
-msgstr "Esteu segur que voleu reiniciar el seu món d'un sol jugador?"
+msgstr "Reiniciar el mon individual"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"

From 5f41ae2a16e896313b6be9e78fe34caa5d8a6d1c Mon Sep 17 00:00:00 2001
From: tonibm19 <bennasar99@gmail.com>
Date: Wed, 26 Oct 2016 09:14:30 +0000
Subject: [PATCH 358/418] Translated using Weblate (Catalan)

Currently translated at 46.0% (423 of 918 strings)
---
 po/ca/minetest.po | 70 ++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/po/ca/minetest.po b/po/ca/minetest.po
index 918e44449..e97b069a2 100644
--- a/po/ca/minetest.po
+++ b/po/ca/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-06 17:55+0000\n"
-"Last-Translator: Roc Humet <roc.humet@gmail.com>\n"
+"PO-Revision-Date: 2016-10-26 09:14+0000\n"
+"Last-Translator: tonibm19 <bennasar99@gmail.com>\n"
 "Language-Team: Catalan "
 "<https://hosted.weblate.org/projects/minetest/minetest/ca/>\n"
 "Language: ca\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "S'ha produït un error en un script Lua, com per exemple un mod :"
+msgstr "S'ha produït un error en un script Lua, com per exemple un mod."
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -534,7 +534,6 @@ msgid "Bilinear Filter"
 msgstr "Filtre Bilineal"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
 msgstr "Mapat de relleu"
 
@@ -543,9 +542,8 @@ msgid "Change keys"
 msgstr "Configurar controls"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Connected Glass"
-msgstr "Connectar"
+msgstr "Vidres connectats"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Fancy Leaves"
@@ -586,7 +584,7 @@ msgstr "Ningun"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Normal Mapping"
-msgstr ""
+msgstr "Mapping normal."
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -986,7 +984,6 @@ msgid "Use"
 msgstr "Utilitzar"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
-#, fuzzy
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -1436,6 +1433,9 @@ msgid ""
 "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
 "This setting is for the client only and is ignored by the server."
 msgstr ""
+"Ajusta la codificació gamma per les taules de llum. Els nombrés nés petits "
+"n'augmentaràn la brillantor.\n"
+"Aquesta configuració només afecta al client, el servidor l'ignora."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -1554,7 +1554,7 @@ msgstr "Soroll de cova #2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "Amplada de les coves"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
@@ -1569,9 +1569,8 @@ msgid "Chat toggle key"
 msgstr "Tecla alternativa per al xat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Comandament"
+msgstr "Comands de xat"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1664,7 +1663,6 @@ msgid "Colored fog"
 msgstr "Boira de color"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
@@ -1753,6 +1751,7 @@ msgstr "Controla la pendent i alçada dels turons."
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 msgstr ""
+"Controla l'amplada dels túnels, un valor més petit crea túnels més amples."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -1862,7 +1861,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Retràs per enviar blocs després de col•locarlos"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -1874,11 +1873,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find large caves."
-msgstr ""
+msgstr "Profunditat davall la qual trobaràs grans coves."
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find massive caves."
-msgstr ""
+msgstr "Profunditat davall la qual podràs trobar coves gegants."
 
 #: src/settings_translation_file.cpp
 msgid "Descending speed"
@@ -1946,9 +1945,8 @@ msgid "Enable Joysticks"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable VBO"
-msgstr "Activar MP"
+msgstr "Activar VBO"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod security"
@@ -2107,13 +2105,12 @@ msgid "Field of view in degrees."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"Moviment ràpid (via utilitzar clau).\n"
-"Això requereix el \"privilegi\" ràpid en el servidor."
+"Camp de visió mentre s'usa el zoom (en graus)\n"
+"Això requereix el privilegi \"zoom\" en el servidor."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2272,9 +2269,8 @@ msgid "Gravity"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HTTP Mods"
-msgstr "Mods"
+msgstr "Mods HTTP"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
@@ -2534,15 +2530,15 @@ msgid "Jumping speed"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for decreasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla per obrir el inventari.\n"
-"Veure http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tecla per disminuir el rang de visió.\n"
+"Mira\n"
+"http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da"
+"1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2552,15 +2548,15 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for increasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla per obrir el inventari.\n"
-"Veure http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tecla per incrementar el rang de visió.\n"
+"Mira\n"
+"http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da"
+"1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3006,14 +3002,12 @@ msgid "Mapgen flags"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat"
-msgstr "Generador de mapes"
+msgstr "Generador de mapes plans"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave width"
-msgstr "Generador de mapes"
+msgstr "Amplada de les coves del generador de mapes plans"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave1 noise parameters"
@@ -3891,12 +3885,11 @@ msgid "Smooth lighting"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
-"Suavitza la càmera quan estiga movent-se i mirant al seu voltant.\n"
+"Suavitzat de càmara durant el seu moviment.\n"
 "Útil per a la gravació de vídeos."
 
 #: src/settings_translation_file.cpp
@@ -4214,9 +4207,8 @@ msgid "Walking speed"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Water Features"
-msgstr "Textures de objectes ..."
+msgstr "Característiques de l'aigua"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
@@ -4345,6 +4337,8 @@ msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
+"Directori del món (totes les seves dades es guarden aquí).\n"
+"No necessari si s'inicia des de el menú principal."
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."

From 593eaf3b8894137874f9fb29203ec364e292c036 Mon Sep 17 00:00:00 2001
From: Mingye Wang <arthur200126@gmail.com>
Date: Fri, 14 Oct 2016 16:29:41 +0000
Subject: [PATCH 359/418] Translated using Weblate (Chinese (Taiwan))

Currently translated at 97.0% (891 of 918 strings)
---
 po/zh_TW/minetest.po | 47 +++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po
index b078e9d6b..2e3bf3d71 100644
--- a/po/zh_TW/minetest.po
+++ b/po/zh_TW/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-07-13 08:25+0000\n"
-"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) <https://hosted.weblate.org/projects/"
-"minetest/minetest/zh_TW/>\n"
+"PO-Revision-Date: 2016-10-14 16:29+0000\n"
+"Last-Translator: Mingye Wang <arthur200126@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) "
+"<https://hosted.weblate.org/projects/minetest/minetest/zh_TW/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.8-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -1369,12 +1369,11 @@ msgstr "活動區塊管理間隔"
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifier interval"
-msgstr "活動區塊調整間隔"
+msgstr "活動方塊調整間隔"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifiers"
-msgstr "活動區塊調整間隔"
+msgstr "活動區塊調整器"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1459,7 +1458,7 @@ msgstr "自動回報到伺服器列表。"
 
 #: src/settings_translation_file.cpp
 msgid "Autorun key"
-msgstr ""
+msgstr "自動奔跑按鍵"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -1495,7 +1494,7 @@ msgstr "在玩家內構建"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "內建"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
@@ -1538,9 +1537,8 @@ msgid "Chat toggle key"
 msgstr "聊天切換按鍵"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "指令"
+msgstr "聊天指令"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1633,13 +1631,12 @@ msgid "Colored fog"
 msgstr "彩色迷霧"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
-"以逗號分隔的 mod 清單，讓您可以存取 HTTP API，\n"
-"其可從網際網路上傳及下載資料。"
+"以逗號分隔的 mod 清單，允許其存取 HTTP API，\n"
+"從而網際網路上傳及下載資料。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1804,7 +1801,7 @@ msgstr "預設特權"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "缺省報告格式"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1828,7 +1825,7 @@ msgstr "定義玩家最大可傳送的距離，以方塊計（0 = 不限制）
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "建造后發送區塊前延遲的時間"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -2018,13 +2015,12 @@ msgstr ""
 "必須啟用著色器。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine profiling data print interval"
-msgstr "分析列印間隔"
+msgstr "引擎性能資料印出間隔"
 
 #: src/settings_translation_file.cpp
 msgid "Entity methods"
-msgstr ""
+msgstr "主體方法"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2091,9 +2087,8 @@ msgid "Field of view"
 msgstr "視野"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view for zoom"
-msgstr "視野"
+msgstr "放大后的視野"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
@@ -3003,9 +2998,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Loading Block Modifiers"
-msgstr "活動區塊調整間隔"
+msgstr "正在載入方塊調整器"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
@@ -3800,11 +3794,10 @@ msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr "避免 mod 做出不安全的舉動，像是執行 shell 指令等。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds). 0 = "
 "disable. Useful for developers."
-msgstr "分析器資料印出間隔。0 = 停用。對開發者有用。"
+msgstr "引擎性能資料印出間隔的秒數。0 = 停用。對開發者有用。"
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
@@ -4255,7 +4248,7 @@ msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
 "Setting it to -1 disables the feature."
 msgstr ""
-"物品（丟棄的物品）可以存活多久，以秒計。\n"
+"物品物體（丟棄的物品）可以存活多久，以秒計。\n"
 "設定其為 -1 以停用這個功能。"
 
 #: src/settings_translation_file.cpp

From 715fba6f3927d30ba68c434dd9857d9dec18173d Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 15 Oct 2016 08:01:02 +0000
Subject: [PATCH 360/418] Translated using Weblate (Chinese (Taiwan))

Currently translated at 100.0% (918 of 918 strings)
---
 po/zh_TW/minetest.po | 71 ++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po
index 2e3bf3d71..8da48fd69 100644
--- a/po/zh_TW/minetest.po
+++ b/po/zh_TW/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-14 16:29+0000\n"
-"Last-Translator: Mingye Wang <arthur200126@gmail.com>\n"
+"PO-Revision-Date: 2016-10-15 08:04+0000\n"
+"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) "
 "<https://hosted.weblate.org/projects/minetest/minetest/zh_TW/>\n"
 "Language: zh_TW\n"
@@ -2095,13 +2095,12 @@ msgid "Field of view in degrees."
 msgstr "以度計算的視野。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"快速移動（透過使用鍵）。\n"
-"這需要伺服器上的「快速」特權。"
+"縮放視野。\n"
+"這需要伺服器上的「縮放」特權。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2244,7 +2243,7 @@ msgstr "生成一般地圖"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
-msgstr ""
+msgstr "全域回呼"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2297,6 +2296,10 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
+"使用分析器工具本身：\n"
+"* 分析空函數。\n"
+"這會讓消耗增加，儀表增加（+1 函式呼叫）。\n"
+"* 採樣工具會被用於更新統計。"
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
@@ -2438,34 +2441,38 @@ msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
+"內建工具。\n"
+"這通常僅被核心／內建貢獻者需要"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument chatcommands on registration."
-msgstr ""
+msgstr "分析登錄的聊天指令。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
+"在登錄上分析全域回呼。\n"
+"（任何您想要傳遞給 minetest.register_*() 函數的東西）"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
-msgstr ""
+msgstr "分析登錄的活躍區塊修飾器的動作函數。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
-msgstr ""
+msgstr "分析登錄的載入中區塊修飾器的動作函數。"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument the methods of entities on registration."
-msgstr ""
+msgstr "分析登錄的實體方法。"
 
 #: src/settings_translation_file.cpp
 msgid "Instrumentation"
-msgstr ""
+msgstr "儀表"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
@@ -2504,7 +2511,6 @@ msgstr ""
 "控制細節的品質。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick button repetition interval"
 msgstr "搖桿按鈕重覆間隔"
 
@@ -2735,15 +2741,14 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling autorun.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"切換快速模式的按鍵。\n"
-"請見 http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"切換自動奔跑的按鍵。\n"
+"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2796,15 +2801,14 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "切換視角更新的按鍵。僅對開發有用。\n"
-"請見 http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2988,7 +2992,7 @@ msgstr "液體更新 tick"
 
 #: src/settings_translation_file.cpp
 msgid "Load the game profiler"
-msgstr ""
+msgstr "載入遊戲分析器"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2996,6 +3000,9 @@ msgid ""
 "Provides a /profiler command to access the compiled profile.\n"
 "Useful for mod developers and server operators."
 msgstr ""
+"載入遊戲分析器以收集遊戲分析資料。\n"
+"提供一個 /profiler 指令以存取已編譯的設定檔。\n"
+"對 mod 開發者與伺服器提供者有用。"
 
 #: src/settings_translation_file.cpp
 msgid "Loading Block Modifiers"
@@ -3438,14 +3445,12 @@ msgid "Maximum hotbar width"
 msgstr "快捷列最大寬度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent in total."
-msgstr "最大可同時連線的玩家數。"
+msgstr "最大同時總傳送的區塊數量。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent per client."
-msgstr "可被放進佇列內等待載入的最大區塊數。"
+msgstr "每個客戶端可同時傳送的最大區塊數量。"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
@@ -3498,7 +3503,6 @@ msgid "Maximum number of statically stored objects in a block."
 msgstr "最大靜態儲存於一個區塊中的物件數量。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum objects per block"
 msgstr "每個區塊最大物件數"
 
@@ -3511,12 +3515,10 @@ msgstr ""
 "如果有東西要顯示在快捷列左邊或右邊時很有用。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends per client"
 msgstr "每個客戶端最大同時傳送區塊數"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends total"
 msgstr "總和最大同時傳送區塊數"
 
@@ -3804,18 +3806,16 @@ msgid "Privileges that players with basic_privs can grant"
 msgstr "有 basic_privs 的玩家可以提升特權"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Profiler"
-msgstr "山谷分析"
+msgstr "分析器"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "分析器切換鍵"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Profiling"
-msgstr "Mod 分析器"
+msgstr "分析"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3851,9 +3851,8 @@ msgid "Replaces the default main menu with a custom one."
 msgstr "以自訂選單取代預設主選單。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
-msgstr "字型路徑"
+msgstr "報告路徑"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
@@ -4028,7 +4027,6 @@ msgstr ""
 "必須同時啟用著色器。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
@@ -4164,6 +4162,8 @@ msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"設定被儲存為預設格式。\n"
+"當呼叫「/profiler save [格式]」但不包含格式時。"
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
@@ -4173,7 +4173,7 @@ msgstr "塵土或其他填充物的深度"
 msgid ""
 "The file path relative to your worldpath in which profiles will be saved "
 "to.\n"
-msgstr ""
+msgstr "設定檔將會被儲存到的，相對於您的全域路徑的檔案路徑。\n"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -4470,7 +4470,6 @@ msgstr ""
 "硬體（例如在物品欄中節點的繪圖至材質）。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"

From ef68a506aa373723ac3c13fc05e6ebf6f094e1bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20B=C4=9Blohl=C3=A1vek?= <TOMats@email.cz>
Date: Tue, 25 Oct 2016 11:37:03 +0000
Subject: [PATCH 361/418] Translated using Weblate (Czech)

Currently translated at 58.0% (533 of 918 strings)

This is a merger of 2 commits.
---
 po/cs/minetest.po | 173 ++++++++++++++++++++++------------------------
 1 file changed, 81 insertions(+), 92 deletions(-)

diff --git a/po/cs/minetest.po b/po/cs/minetest.po
index 17a223184..b5f3735d9 100644
--- a/po/cs/minetest.po
+++ b/po/cs/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-03-04 04:45+0000\n"
-"Last-Translator: Jakub Vaněk <vanek.jakub4@seznam.cz>\n"
-"Language-Team: Czech <https://hosted.weblate.org/projects/minetest/minetest/"
-"cs/>\n"
+"PO-Revision-Date: 2016-10-25 23:09+0000\n"
+"Last-Translator: Tomáš Bělohlávek <TOMats@email.cz>\n"
+"Language-Team: Czech "
+"<https://hosted.weblate.org/projects/minetest/minetest/cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 2.5-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -214,7 +214,7 @@ msgstr "(Nebyl zadán popis nastavení)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
-msgstr ""
+msgstr "< Zpět do Nastavení"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
@@ -406,9 +406,8 @@ msgid "Uninstall selected modpack"
 msgstr "Odinstalovat označený balíček"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "Adresa / Port :"
+msgstr "Adresa / Port"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -432,14 +431,12 @@ msgid "Del. Favorite"
 msgstr "Oblíbené:"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Favorite"
-msgstr "Oblíbené:"
+msgstr "Oblíbené"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "Jméno / Heslo :"
+msgstr "Jméno / Heslo"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -485,7 +482,7 @@ msgstr "Veřejný"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Select World:"
-msgstr "Vyber svět:"
+msgstr "Vyberte svět:"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Server"
@@ -501,20 +498,19 @@ msgstr "Spustit hru"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
-msgstr ""
+msgstr "2x"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "3D Clouds"
 msgstr "3D mraky"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
-msgstr ""
+msgstr "4x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "8x"
-msgstr ""
+msgstr "8x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Advanced Settings"
@@ -522,14 +518,13 @@ msgstr "Pokročilá nastavení"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr ""
+msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Are you sure to reset your singleplayer world?"
 msgstr "Jste si jisti, že chcete resetovat místní svět?"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bilinear Filter"
 msgstr "Bilineární filtrování"
 
@@ -565,7 +560,7 @@ msgstr "Ne"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
-msgstr "Žádné filtr"
+msgstr "Žádné filtrování"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
@@ -573,12 +568,11 @@ msgstr "Žádné Mipmapy"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr "Zvýraznění bloků"
+msgstr "Osvícení bloku"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Node Outlining"
-msgstr "Zvýraznění bloků"
+msgstr "Obrys bloku"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
@@ -599,12 +593,11 @@ msgstr "Neprůhledná voda"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Parallax Occlusion"
-msgstr "Parallax Occlusion"
+msgstr "Paralaxní okluze"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "Povolit částice"
+msgstr "Částice"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Reset singleplayer world"
@@ -623,7 +616,6 @@ msgid "Simple Leaves"
 msgstr "Jednoduché listí"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Smooth Lighting"
 msgstr "Plynulé osvětlení"
 
@@ -644,22 +636,18 @@ msgid "Touchthreshold (px)"
 msgstr "Dosah dotyku (px)"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Trilinear Filter"
 msgstr "Trilineární filtrování"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Leaves"
 msgstr "Vlnění listů"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Plants"
 msgstr "Vlnění rostlin"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Water"
 msgstr "Vlnění vody"
 
@@ -1451,7 +1439,7 @@ msgstr "Anizotropní filtrování"
 
 #: src/settings_translation_file.cpp
 msgid "Announce server"
-msgstr ""
+msgstr "Zveřejnit server"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1459,6 +1447,9 @@ msgid ""
 "If you want to announce your ipv6 address, use  serverlist_url = v6.servers."
 "minetest.net."
 msgstr ""
+"Zveřejnit do tohoto seznamu serverů.\n"
+"Jestliže chcete zveřejnit vaši ipv6 adresu, použijte  serverlist_url = "
+"v6.servers.minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
@@ -1489,9 +1480,8 @@ msgid "Basic"
 msgstr "Základní"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic Privileges"
-msgstr "Výchozí práva"
+msgstr "Základní práva"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
@@ -1538,9 +1528,8 @@ msgid "Cave noise #2"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cave width"
-msgstr "Šířka obrazovky"
+msgstr "Šířka jeskyně"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
@@ -1555,9 +1544,8 @@ msgid "Chat toggle key"
 msgstr "Klávesa zobrazení chatu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Příkaz"
+msgstr "Příkazy"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1635,15 +1623,16 @@ msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"Seznam modů, oddělených čárkami, které mohou přistupovat k HTTP API,\n"
+"které jim dovoluje nahrávat a stahovat data na/z internetu."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
-"Seznam důvěryhodných modů oddělených čárkami, které mohou používat "
-"potenciálně nebezpečné\n"
-"funkce ve chvílích, kdy je zapnuto zabezpečení modů (pomocí "
+"Seznam důvěryhodných modů, oddělených čárkami, které mohou používat\n"
+"nebezpečné funkce i když je zapnuto zabezpečení modů (pomocí "
 "request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
@@ -1676,11 +1665,11 @@ msgstr "Klávesa konzole"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward"
-msgstr ""
+msgstr "Neustálý pohyb vpřed"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward movement (only used for testing)."
-msgstr ""
+msgstr "Neustálý pohyb vpřed (jen pro testování)."
 
 #: src/settings_translation_file.cpp
 msgid "Controls"
@@ -1712,7 +1701,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
+msgstr "Ovládá šířku tunelů, menší hodnota vytváří širší tunely."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -1732,23 +1721,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
-msgstr ""
+msgstr "Průhlednost zaměřovače"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr ""
+msgstr "Průhlednost zaměřovače (mezi 0 a 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
-msgstr ""
+msgstr "Barva zaměřovače"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color (R,G,B)."
-msgstr ""
+msgstr "Barva zaměřovače (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Crouch speed"
-msgstr ""
+msgstr "Rychlost při plížení"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -1828,11 +1817,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find large caves."
-msgstr ""
+msgstr "Hloubka pod kterou najdete velké jeskyně."
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find massive caves."
-msgstr ""
+msgstr "Hloubka pod kterou najdete obrovské jeskyně."
 
 #: src/settings_translation_file.cpp
 msgid "Descending speed"
@@ -2069,13 +2058,12 @@ msgid "Field of view in degrees."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"Turbo režim pohybu (pomocí klávesy použít).\n"
-"Vyžaduje na serveru přidělené právo \"fast\"."
+"Zorné pole při postupném přibližování.\n"
+"Vyžaduje na serveru přidělené právo \"zoom\"."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2149,7 +2137,7 @@ msgstr "Velikost písma"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
-msgstr ""
+msgstr "Formát snímků obrazovky."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
@@ -2205,7 +2193,7 @@ msgstr "Gamma"
 
 #: src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "Hlavní"
 
 #: src/settings_translation_file.cpp
 msgid "Generate normalmaps"
@@ -2276,7 +2264,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers"
-msgstr ""
+msgstr "Jak hluboké dělat řeky"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2293,7 +2281,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers"
-msgstr ""
+msgstr "Jak široké dělat řeky"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
@@ -2361,7 +2349,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "If this is set, players will always (re)spawn at the given position."
-msgstr ""
+msgstr "Jestliže je toto nastaveno, hráči se budou oživovat na uvedeném místě."
 
 #: src/settings_translation_file.cpp
 msgid "Ignore world errors"
@@ -2431,7 +2419,7 @@ msgstr "Klávesa inventáře"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
-msgstr ""
+msgstr "Invertovat myš"
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
@@ -2490,7 +2478,7 @@ msgstr "Skok"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
-msgstr ""
+msgstr "Rychlost skákání"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2706,7 +2694,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
-msgstr ""
+msgstr "Klávesa Použít pro šplhání/slézání"
 
 #: src/settings_translation_file.cpp
 msgid "Language"
@@ -2714,15 +2702,15 @@ msgstr "Jazyk"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
-msgstr ""
+msgstr "Hloubka velké jeskyně"
 
 #: src/settings_translation_file.cpp
 msgid "Lava Features"
-msgstr ""
+msgstr "Vlastnosti lávy"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
-msgstr ""
+msgstr "Styl listí"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2894,7 +2882,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Map save interval"
-msgstr ""
+msgstr "Interval ukládání mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
@@ -3198,7 +3186,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave depth"
-msgstr ""
+msgstr "Hloubka obrovské jeskyně"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave noise"
@@ -3230,7 +3218,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
-msgstr ""
+msgstr "Maximální FPS"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS when game is paused."
@@ -3329,7 +3317,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day"
-msgstr ""
+msgstr "Zpráva dne"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day displayed to players connecting."
@@ -3341,7 +3329,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
-msgstr ""
+msgstr "Minimapa"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap key"
@@ -3353,7 +3341,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Minimum texture size for filters"
-msgstr ""
+msgstr "Minimální velikost textury k filtrování"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
@@ -3373,15 +3361,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
-msgstr ""
+msgstr "Cesta k neproporcionálnímu písmu"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font size"
-msgstr ""
+msgstr "Velikost neproporcionálního písma"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
-msgstr ""
+msgstr "Citlivost myši"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity multiplier."
@@ -3419,7 +3407,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Network"
-msgstr ""
+msgstr "Síť"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3628,19 +3616,19 @@ msgstr "Klávesa doprava"
 
 #: src/settings_translation_file.cpp
 msgid "Rightclick repetition interval"
-msgstr ""
+msgstr "Interval opakování pravého kliknutí"
 
 #: src/settings_translation_file.cpp
 msgid "River Depth"
-msgstr ""
+msgstr "Hloubka řeky"
 
 #: src/settings_translation_file.cpp
 msgid "River Noise"
-msgstr ""
+msgstr "Hlučnost řeky"
 
 #: src/settings_translation_file.cpp
 msgid "River Size"
-msgstr ""
+msgstr "Velikost řeky"
 
 #: src/settings_translation_file.cpp
 msgid "River noise -- rivers occur close to zero"
@@ -3688,14 +3676,12 @@ msgid "Screenshot folder"
 msgstr "Složka se snímky obrazovky"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "Složka se snímky obrazovky"
+msgstr "Formát snímků obrazovky"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "Snímek obrazovky"
+msgstr "Kvalita snímků obrazovky"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3703,6 +3689,9 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"Kvalita snímků obrazovky. Použito jen na formát JPEG.\n"
+"1 znamená nejhorší kvalita; 100 znamená nejlepší kvalita.\n"
+"Použijte 0 pro výchozí kvalitu."
 
 #: src/settings_translation_file.cpp
 msgid "Security"
@@ -3718,11 +3707,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Selection box color"
-msgstr ""
+msgstr "Barva obrysu bloku"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box width"
-msgstr ""
+msgstr "Šířka obrysu bloku"
 
 #: src/settings_translation_file.cpp
 msgid "Server / Singleplayer"
@@ -3801,7 +3790,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
-msgstr ""
+msgstr "Zpráva o vypnutí"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3849,7 +3838,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
-msgstr ""
+msgstr "Stálé místo oživení"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of generated normalmaps."
@@ -3865,7 +3854,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
-msgstr ""
+msgstr "Podpora starších serverů"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -3980,7 +3969,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Time speed"
-msgstr ""
+msgstr "Rychlost času"
 
 #: src/settings_translation_file.cpp
 msgid "Timeout for client to remove unused map data from memory."
@@ -4000,7 +3989,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Tooltip delay"
-msgstr ""
+msgstr "Zpoždění nápovědy"
 
 #: src/settings_translation_file.cpp
 msgid "Trilinear filtering"
@@ -4015,7 +4004,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
-msgstr ""
+msgstr "Důvěryhodné mody"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -4137,7 +4126,7 @@ msgstr "Vlastnosti vody"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
-msgstr ""
+msgstr "Hladina vody"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."

From a2c446725505f822b4bfe1f0dd3c652f127b20d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= <vanek.jakub4@seznam.cz>
Date: Tue, 25 Oct 2016 11:59:38 +0000
Subject: [PATCH 362/418] Translated using Weblate (Czech)

Currently translated at 51.0% (469 of 918 strings)
---
 po/cs/minetest.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/cs/minetest.po b/po/cs/minetest.po
index b5f3735d9..6280cf70b 100644
--- a/po/cs/minetest.po
+++ b/po/cs/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-25 23:09+0000\n"
-"Last-Translator: Tomáš Bělohlávek <TOMats@email.cz>\n"
+"PO-Revision-Date: 2016-10-25 11:59+0000\n"
+"Last-Translator: Jakub Vaněk <vanek.jakub4@seznam.cz>\n"
 "Language-Team: Czech "
 "<https://hosted.weblate.org/projects/minetest/minetest/cs/>\n"
 "Language: cs\n"
@@ -1509,11 +1509,11 @@ msgstr "Bump mapování"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
-msgstr ""
+msgstr "Plynulost pohybu kamery"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
-msgstr ""
+msgstr "Plynulost pohybu kamery ve filmovém režimu"
 
 #: src/settings_translation_file.cpp
 msgid "Camera update toggle key"

From ef4eb46b617d7602ef9aa91e777fd3a03cd6bd73 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere-weblate@hungry.com>
Date: Tue, 25 Oct 2016 21:36:17 +0000
Subject: [PATCH 363/418] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 1.4% (13 of 918 strings)
---
 po/nb/minetest.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index c3447b08b..4d72232b0 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -8,28 +8,28 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2015-09-20 17:15+0200\n"
-"Last-Translator: Christian Haug <christian@metaboks.org>\n"
-"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
-"minetest/minetest/nb/>\n"
+"PO-Revision-Date: 2016-10-25 21:36+0000\n"
+"Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
+"Language-Team: Norwegian Bokmål "
+"<https://hosted.weblate.org/projects/minetest/minetest/nb/>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.4-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr ""
+msgstr "Det skjedde en feil i et Lua-skript, f.eks. en mod:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
-msgstr ""
+msgstr "Det skjedde en feil:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
-msgstr ""
+msgstr "Hovedmeny"
 
 #: builtin/fstk/ui.lua builtin/mainmenu/store.lua
 msgid "Ok"

From 289cf93d4b469e3f1883d400a0d63e7cf287d4a7 Mon Sep 17 00:00:00 2001
From: Christian Haug <christian@metaboks.org>
Date: Tue, 25 Oct 2016 21:36:29 +0000
Subject: [PATCH 364/418] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 1.5% (14 of 918 strings)
---
 po/nb/minetest.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index 4d72232b0..40ea587b1 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-25 21:36+0000\n"
-"Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
+"Last-Translator: Christian Haug <christian@metaboks.org>\n"
 "Language-Team: Norwegian Bokmål "
 "<https://hosted.weblate.org/projects/minetest/minetest/nb/>\n"
 "Language: nb\n"
@@ -37,7 +37,7 @@ msgstr "Ok"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr ""
+msgstr "Koble til på nytt"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"

From f8456dde51b96f08605487ea8cfe463d27e0cc8d Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere-weblate@hungry.com>
Date: Tue, 25 Oct 2016 21:36:50 +0000
Subject: [PATCH 365/418] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 1.6% (15 of 918 strings)
---
 po/nb/minetest.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index 40ea587b1..7f23edfc2 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-25 21:36+0000\n"
-"Last-Translator: Christian Haug <christian@metaboks.org>\n"
+"Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
 "Language-Team: Norwegian Bokmål "
 "<https://hosted.weblate.org/projects/minetest/minetest/nb/>\n"
 "Language: nb\n"
@@ -41,7 +41,7 @@ msgstr "Koble til på nytt"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr ""
+msgstr "Tjeneren har bedt om ny tilkobling:"
 
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."

From 9f476fd66d101964cb689e9506f4c3bd018b54ad Mon Sep 17 00:00:00 2001
From: Christian Haug <christian@metaboks.org>
Date: Tue, 25 Oct 2016 21:36:59 +0000
Subject: [PATCH 366/418] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 1.7% (16 of 918 strings)
---
 po/nb/minetest.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index 7f23edfc2..3893a7c03 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-25 21:36+0000\n"
-"Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
+"Last-Translator: Christian Haug <christian@metaboks.org>\n"
 "Language-Team: Norwegian Bokmål "
 "<https://hosted.weblate.org/projects/minetest/minetest/nb/>\n"
 "Language: nb\n"
@@ -45,7 +45,7 @@ msgstr "Tjeneren har bedt om ny tilkobling:"
 
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
-msgstr ""
+msgstr "Laster..."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "

From 64969ef41a8b26f9a5d29ce1d0128aebeea1de25 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere-weblate@hungry.com>
Date: Tue, 25 Oct 2016 21:39:49 +0000
Subject: [PATCH 367/418] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 2.7% (25 of 918 strings)
---
 po/nb/minetest.po | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index 3893a7c03..2212bf2b1 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-25 21:36+0000\n"
-"Last-Translator: Christian Haug <christian@metaboks.org>\n"
+"PO-Revision-Date: 2016-10-25 21:39+0000\n"
+"Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
 "Language-Team: Norwegian Bokmål "
 "<https://hosted.weblate.org/projects/minetest/minetest/nb/>\n"
 "Language: nb\n"
@@ -49,15 +49,15 @@ msgstr "Laster..."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr ""
+msgstr "Avvikende protokollversjon. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr ""
+msgstr "Tjener krever protokollversjon $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr ""
+msgstr "Tjener støtter protokollversjoner mellom $1 og $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
@@ -65,11 +65,11 @@ msgstr ""
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr ""
+msgstr "Vi støtter kun protokollversjon $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr ""
+msgstr "Vi støtter protokollversjoner mellom versjon $1 og $2."
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -80,24 +80,20 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
-#, fuzzy
 msgid "Depends:"
-msgstr "Avhenger av:"
+msgstr "Avhengigheter:"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Disable MP"
-msgstr "Deaktiver Alle"
+msgstr "Koble ut MP"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Enable MP"
-msgstr "Aktiver Alle"
+msgstr "Aktiver MP"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Enable all"
-msgstr "Aktiver Alle"
+msgstr "Aktiver alle"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""

From 18a7d3e754f6b533f7094b34303c3528c748e23b Mon Sep 17 00:00:00 2001
From: Christian Haug <christian@metaboks.org>
Date: Tue, 25 Oct 2016 21:40:10 +0000
Subject: [PATCH 368/418] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 2.8% (26 of 918 strings)
---
 po/nb/minetest.po | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index 2212bf2b1..dcd418123 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-25 21:39+0000\n"
-"Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
+"PO-Revision-Date: 2016-10-25 21:40+0000\n"
+"Last-Translator: Christian Haug <christian@metaboks.org>\n"
 "Language-Team: Norwegian Bokmål "
 "<https://hosted.weblate.org/projects/minetest/minetest/nb/>\n"
 "Language: nb\n"
@@ -100,6 +100,8 @@ msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
+"Kunne ikke aktivere mod \"$1\" fordi  den inneholder ulovlige symboler. Kun "
+"symbolene [a-z0-9_] er tillatt."
 
 #: builtin/mainmenu/dlg_config_world.lua
 #, fuzzy

From a5ec1ddcac6f0d273257f72ea9e0f006319f069e Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere-weblate@hungry.com>
Date: Tue, 25 Oct 2016 21:41:21 +0000
Subject: [PATCH 369/418] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 3.3% (31 of 918 strings)
---
 po/nb/minetest.po | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index dcd418123..3a8027d62 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-25 21:40+0000\n"
-"Last-Translator: Christian Haug <christian@metaboks.org>\n"
+"PO-Revision-Date: 2016-10-25 21:41+0000\n"
+"Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
 "Language-Team: Norwegian Bokmål "
 "<https://hosted.weblate.org/projects/minetest/minetest/nb/>\n"
 "Language: nb\n"
@@ -100,21 +100,20 @@ msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
-"Kunne ikke aktivere mod \"$1\" fordi  den inneholder ulovlige symboler. Kun "
+"Kunne ikke aktivere mod \"$1\" fordi  den inneholder ulovlige tegn. Kun "
 "symbolene [a-z0-9_] er tillatt."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Hide Game"
-msgstr "Spill"
+msgstr "Skjul spill"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide mp content"
-msgstr ""
+msgstr "Skjul mp-innhold"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr ""
+msgstr "Mod:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
@@ -122,9 +121,8 @@ msgid "Save"
 msgstr "Lagre"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "World:"
-msgstr "Navnet på verdenen"
+msgstr "Verden:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
@@ -132,7 +130,7 @@ msgstr "aktivert"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr ""
+msgstr "En verden med navn \"$1\" eksisterer allerede"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"

From 428cebc25d1fb7a52e09943a8c3d36a922aee531 Mon Sep 17 00:00:00 2001
From: sorichan <2_0_2_0_@naver.com>
Date: Fri, 28 Oct 2016 06:40:30 +0000
Subject: [PATCH 370/418] Translated using Weblate (Korean)

Currently translated at 1.5% (14 of 918 strings)
---
 po/ko/minetest.po | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/po/ko/minetest.po b/po/ko/minetest.po
index 44b1960a9..8b4a85027 100644
--- a/po/ko/minetest.po
+++ b/po/ko/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2015-07-08 23:30+0200\n"
-"Last-Translator: Tae Lim Kook <tkook11@gmail.com>\n"
-"Language-Team: Korean <https://hosted.weblate.org/projects/minetest/minetest/"
-"ko/>\n"
+"PO-Revision-Date: 2016-10-28 06:40+0000\n"
+"Last-Translator: sorichan <2_0_2_0_@naver.com>\n"
+"Language-Team: Korean "
+"<https://hosted.weblate.org/projects/minetest/minetest/ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.4-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -25,11 +25,11 @@ msgstr ""
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
-msgstr ""
+msgstr "에러가 발생하였습니다."
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
-msgstr ""
+msgstr "메인 메뉴"
 
 #: builtin/fstk/ui.lua builtin/mainmenu/store.lua
 msgid "Ok"
@@ -37,27 +37,27 @@ msgstr "확인"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr ""
+msgstr "재연결"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr ""
+msgstr "재연결이 필요합니다."
 
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
-msgstr ""
+msgstr "로딩중..."
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr ""
+msgstr "프로토콜 버전이 맞지 않습니다. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr ""
+msgstr "서버는 프로토콜 버전 $1 을(를) 사용합니다. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr ""
+msgstr "서버는 프로토콜 버전 $1과(와) $2를(을) 제공합니다. "
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
@@ -85,11 +85,11 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable MP"
-msgstr ""
+msgstr "MP 미적용"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable MP"
-msgstr ""
+msgstr "MP 적용"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"

From 46ac92b1a1a5dbb13f367782413822c111c8ea72 Mon Sep 17 00:00:00 2001
From: Dongjin Han <djhan@cleinsoft.com>
Date: Fri, 28 Oct 2016 06:42:29 +0000
Subject: [PATCH 371/418] Translated using Weblate (Korean)

Currently translated at 1.5% (14 of 918 strings)
---
 po/ko/minetest.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/ko/minetest.po b/po/ko/minetest.po
index 8b4a85027..5e5850729 100644
--- a/po/ko/minetest.po
+++ b/po/ko/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-28 06:40+0000\n"
-"Last-Translator: sorichan <2_0_2_0_@naver.com>\n"
+"PO-Revision-Date: 2016-10-28 06:42+0000\n"
+"Last-Translator: Dongjin Han <djhan@cleinsoft.com>\n"
 "Language-Team: Korean "
 "<https://hosted.weblate.org/projects/minetest/minetest/ko/>\n"
 "Language: ko\n"
@@ -25,7 +25,7 @@ msgstr ""
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
-msgstr "에러가 발생하였습니다."
+msgstr "에러가 발생했습니다:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"

From 8785827990704943513e64bd44d602d4707ca64f Mon Sep 17 00:00:00 2001
From: sorichan <2_0_2_0_@naver.com>
Date: Fri, 28 Oct 2016 07:01:16 +0000
Subject: [PATCH 372/418] Translated using Weblate (Korean)

Currently translated at 5.6% (52 of 918 strings)
---
 po/ko/minetest.po | 84 +++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/po/ko/minetest.po b/po/ko/minetest.po
index 5e5850729..aff76bd58 100644
--- a/po/ko/minetest.po
+++ b/po/ko/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-28 06:42+0000\n"
-"Last-Translator: Dongjin Han <djhan@cleinsoft.com>\n"
+"PO-Revision-Date: 2016-10-28 07:01+0000\n"
+"Last-Translator: sorichan <2_0_2_0_@naver.com>\n"
 "Language-Team: Korean "
 "<https://hosted.weblate.org/projects/minetest/minetest/ko/>\n"
 "Language: ko\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr ""
+msgstr "모드 같은 Lua 스크립트에서 오류가 발생하였습니다."
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
-msgstr "에러가 발생했습니다:"
+msgstr "오류가 발생하였습니다."
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
@@ -57,7 +57,7 @@ msgstr "서버는 프로토콜 버전 $1 을(를) 사용합니다. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "서버는 프로토콜 버전 $1과(와) $2를(을) 제공합니다. "
+msgstr "서버는 프로토콜 버전 $1과(와) $2 사이를 제공합니다. "
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
@@ -65,11 +65,11 @@ msgstr ""
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr ""
+msgstr "프로토콜 버전 $1만 제공합니다."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr ""
+msgstr "프로토콜 버전 $1과(와) $2 사이를 제공합니다."
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -93,7 +93,7 @@ msgstr "MP 적용"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr ""
+msgstr "모두 적용"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
@@ -103,15 +103,15 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
-msgstr ""
+msgstr "숨겨진 게임"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide mp content"
-msgstr ""
+msgstr "숨겨진 맵 콘텐츠"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr ""
+msgstr "모드:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
@@ -120,31 +120,31 @@ msgstr "저장"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
-msgstr ""
+msgstr "월드:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
-msgstr ""
+msgstr "적용"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr ""
+msgstr "\"$1\" 는(은) 이미 존재합니다."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
-msgstr ""
+msgstr "만들기"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr ""
+msgstr "minetest.net 에서 minetest_game같은 서브게임을 다운로드 하세요."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr ""
+msgstr "minetest.net 에서 다운로드 하세요."
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
-msgstr ""
+msgstr "게임"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -152,7 +152,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No worldname given or no game selected"
-msgstr ""
+msgstr "게임을 선택하지 않았거나 게임 이름이 없습니다."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Seed"
@@ -164,41 +164,41 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
-msgstr ""
+msgstr "월드 이름"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no subgames installed."
-msgstr ""
+msgstr "서브게임을 설치하지 않았습니다."
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr ""
+msgstr "$1 를(을) 삭제하겠습니까?"
 
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 #: src/keycode.cpp
 msgid "Delete"
-msgstr ""
+msgstr "삭제"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: failed to delete \"$1\""
-msgstr ""
+msgstr "Modmgr: \"$1\"를(을) 삭제할 수 없습니다."
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: invalid modpath \"$1\""
-msgstr ""
+msgstr "Modmgr: \"$1\" 를(을) 인식할 수 없습니다."
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr ""
+msgstr "\"$1\"를(을) 삭제하겠습니까?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
 msgid "Accept"
-msgstr ""
+msgstr "수락"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr ""
+msgstr "모드팩 이름바꾸기:"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "\"$1\" is not a valid flag."
@@ -210,7 +210,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
-msgstr ""
+msgstr "설정 페이지로 돌아가기"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
@@ -222,7 +222,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Edit"
-msgstr ""
+msgstr "수정"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Enabled"
@@ -240,11 +240,11 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
-msgstr ""
+msgstr "게임"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
 msgid "Mods"
-msgstr ""
+msgstr "모드"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
@@ -260,7 +260,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid number."
-msgstr ""
+msgstr "유효한 숫자를 입력해주세요."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Possible values are: "
@@ -298,11 +298,11 @@ msgstr ""
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: file: \"$1\""
-msgstr ""
+msgstr "설치 모드: 파일: \"$1\""
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find real modname for: $1"
-msgstr ""
+msgstr "설치 모드: $1를(을) 찾을 수 없습니다."
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find suitable foldername for modpack $1"
@@ -314,23 +314,23 @@ msgstr ""
 
 #: builtin/mainmenu/store.lua
 msgid "Downloading $1, please wait..."
-msgstr ""
+msgstr "$1 를(을) 다운로드중입니다. 기다려주세요..."
 
 #: builtin/mainmenu/store.lua
 msgid "Install"
-msgstr ""
+msgstr "설치"
 
 #: builtin/mainmenu/store.lua
 msgid "Page $1 of $2"
-msgstr ""
+msgstr "$2페이지 중 $1"
 
 #: builtin/mainmenu/store.lua
 msgid "Rating"
-msgstr ""
+msgstr "순위"
 
 #: builtin/mainmenu/store.lua
 msgid "Search"
-msgstr ""
+msgstr "검색"
 
 #: builtin/mainmenu/store.lua
 msgid "Shortname:"
@@ -338,7 +338,7 @@ msgstr ""
 
 #: builtin/mainmenu/store.lua
 msgid "Successfully installed:"
-msgstr ""
+msgstr "설치 완료:"
 
 #: builtin/mainmenu/store.lua
 msgid "Unsorted"
@@ -346,7 +346,7 @@ msgstr ""
 
 #: builtin/mainmenu/store.lua
 msgid "re-Install"
-msgstr ""
+msgstr "재설치"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"

From faea229da78b7dfaae2271427d562bbf5a5ffb77 Mon Sep 17 00:00:00 2001
From: Dongjin Han <djhan@cleinsoft.com>
Date: Fri, 28 Oct 2016 07:01:21 +0000
Subject: [PATCH 373/418] Translated using Weblate (Korean)

Currently translated at 5.6% (52 of 918 strings)
---
 po/ko/minetest.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ko/minetest.po b/po/ko/minetest.po
index aff76bd58..28849328b 100644
--- a/po/ko/minetest.po
+++ b/po/ko/minetest.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-28 07:01+0000\n"
-"Last-Translator: sorichan <2_0_2_0_@naver.com>\n"
+"Last-Translator: Dongjin Han <djhan@cleinsoft.com>\n"
 "Language-Team: Korean "
 "<https://hosted.weblate.org/projects/minetest/minetest/ko/>\n"
 "Language: ko\n"
@@ -29,7 +29,7 @@ msgstr "오류가 발생하였습니다."
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
-msgstr "메인 메뉴"
+msgstr "주 메뉴"
 
 #: builtin/fstk/ui.lua builtin/mainmenu/store.lua
 msgid "Ok"

From eb1d7cdb3d618f37a1a700b0168e5900fc404370 Mon Sep 17 00:00:00 2001
From: Han So Ri <2_0_2_0_@naver.com>
Date: Sun, 30 Oct 2016 13:50:36 +0000
Subject: [PATCH 374/418] Translated using Weblate (Korean)

Currently translated at 53.8% (494 of 918 strings)

This is a merger of 2 commits.
---
 po/ko/minetest.po | 1153 +++++++++++++++++++++++++++------------------
 1 file changed, 696 insertions(+), 457 deletions(-)

diff --git a/po/ko/minetest.po b/po/ko/minetest.po
index 28849328b..9f1219d6e 100644
--- a/po/ko/minetest.po
+++ b/po/ko/minetest.po
@@ -2,14 +2,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-28 07:01+0000\n"
-"Last-Translator: Dongjin Han <djhan@cleinsoft.com>\n"
+"PO-Revision-Date: 2016-10-31 05:41+0000\n"
+"Last-Translator: Han So Ri <2_0_2_0_@naver.com>\n"
 "Language-Team: Korean "
 "<https://hosted.weblate.org/projects/minetest/minetest/ko/>\n"
 "Language: ko\n"
@@ -21,11 +20,11 @@ msgstr ""
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "모드 같은 Lua 스크립트에서 오류가 발생하였습니다."
+msgstr "Lua 스크립트에서 오류가 발생하였습니다. 해당 모드:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
-msgstr "오류가 발생하였습니다."
+msgstr "오류가 발생하였습니다:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
@@ -37,11 +36,11 @@ msgstr "확인"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr "재연결"
+msgstr "재접속"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "재연결이 필요합니다."
+msgstr "재연결이 필요합니다:"
 
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
@@ -61,7 +60,7 @@ msgstr "서버는 프로토콜 버전 $1과(와) $2 사이를 제공합니다. "
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
+msgstr "인터넷 연결을 확인한 후 서버 리스트를 확인하세요."
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
@@ -99,7 +98,7 @@ msgstr "모두 적용"
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
-msgstr ""
+msgstr "\"$1\"는(은) 허락되지 않은 캐릭터로 사용할 수 없습니다. [a-z0-9_]만 사용할 수 있습니다."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -128,7 +127,7 @@ msgstr "적용"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr "\"$1\" 는(은) 이미 존재합니다."
+msgstr "\"$1\" 는(은) 이미 존재합니다"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -136,11 +135,11 @@ msgstr "만들기"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "minetest.net 에서 minetest_game같은 서브게임을 다운로드 하세요."
+msgstr "minetest.net 에서 minetest_game같은 서브게임을 다운로드 하세요"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr "minetest.net 에서 다운로드 하세요."
+msgstr "minetest.net 에서 다운로드 하세요"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -148,19 +147,19 @@ msgstr "게임"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
-msgstr ""
+msgstr "맵젠"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No worldname given or no game selected"
-msgstr "게임을 선택하지 않았거나 게임 이름이 없습니다."
+msgstr "게임을 선택하지 않았거나 게임 이름이 없습니다"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Seed"
-msgstr ""
+msgstr "시드"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The minimal development test is meant for developers."
-msgstr ""
+msgstr "경고: 최소한의 개발 테스트는 개발자를 위한 것입니다."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -182,11 +181,11 @@ msgstr "삭제"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: failed to delete \"$1\""
-msgstr "Modmgr: \"$1\"를(을) 삭제할 수 없습니다."
+msgstr "Modmgr: \"$1\"를(을) 삭제할 수 없습니다"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: invalid modpath \"$1\""
-msgstr "Modmgr: \"$1\" 를(을) 인식할 수 없습니다."
+msgstr "Modmgr: \"$1\" 를(을) 인식할 수 없습니다"
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
@@ -194,7 +193,7 @@ msgstr "\"$1\"를(을) 삭제하겠습니까?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
 msgid "Accept"
-msgstr "수락"
+msgstr "확인"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
@@ -202,11 +201,11 @@ msgstr "모드팩 이름바꾸기:"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "\"$1\" is not a valid flag."
-msgstr ""
+msgstr "\"$1\" 는(은) 유효한 플래그가 아닙니다."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
-msgstr ""
+msgstr "(설정의 설명이 없습니다)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
@@ -214,11 +213,11 @@ msgstr "설정 페이지로 돌아가기"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
-msgstr ""
+msgstr "열기"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
-msgstr ""
+msgstr "적용 안함"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Edit"
@@ -226,17 +225,19 @@ msgstr "수정"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Enabled"
-msgstr ""
+msgstr "적용"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Format is 3 numbers separated by commas and inside brackets."
-msgstr ""
+msgstr "3개의 수가 쉼표와 괄호로 구분되는 형식입니다."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
+"형식: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, <octaves>, "
+"<persistence>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
@@ -252,11 +253,11 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a comma seperated list of flags."
-msgstr ""
+msgstr "플래그의 리스트를 쉼표로 구분하여 입력 하십시오."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
-msgstr ""
+msgstr "유효한 정수를 입력해주세요."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid number."
@@ -264,37 +265,39 @@ msgstr "유효한 숫자를 입력해주세요."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Possible values are: "
-msgstr ""
+msgstr "가능한 값: "
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
-msgstr ""
+msgstr "기본값 복원"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select path"
-msgstr ""
+msgstr "경로 선택"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
-msgstr ""
+msgstr "기술적 이름 보기"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be greater than $1."
-msgstr ""
+msgstr "값은 $1 (이)보다 커야 합니다."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be lower than $1."
-msgstr ""
+msgstr "값은 $1 (이)보다 더 낮아야합니다."
 
 #: builtin/mainmenu/modmgr.lua
 msgid ""
 "\n"
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
+"\n"
+"설치 모드: \"$1\"는(은) 지원 되지 않는 파일 형식 이거나 깨진 압축 파일입니다"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Failed to install $1 to $2"
-msgstr ""
+msgstr "$1에서 $2는(은) 설치 할 수 없습니다"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: file: \"$1\""
@@ -302,11 +305,11 @@ msgstr "설치 모드: 파일: \"$1\""
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find real modname for: $1"
-msgstr "설치 모드: $1를(을) 찾을 수 없습니다."
+msgstr "설치 모드: $1를(을) 찾을 수 없습니다"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find suitable foldername for modpack $1"
-msgstr ""
+msgstr "설치 모드: 모드 팩 $1 (이)의 올바른 폴더를 찾을 수 없습니다"
 
 #: builtin/mainmenu/store.lua
 msgid "Close store"
@@ -334,7 +337,7 @@ msgstr "검색"
 
 #: builtin/mainmenu/store.lua
 msgid "Shortname:"
-msgstr ""
+msgstr "짧은 이름:"
 
 #: builtin/mainmenu/store.lua
 msgid "Successfully installed:"
@@ -342,7 +345,7 @@ msgstr "설치 완료:"
 
 #: builtin/mainmenu/store.lua
 msgid "Unsorted"
-msgstr ""
+msgstr "기타"
 
 #: builtin/mainmenu/store.lua
 msgid "re-Install"
@@ -350,87 +353,87 @@ msgstr "재설치"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
-msgstr ""
+msgstr "활동적인 공헌자"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
-msgstr ""
+msgstr "코어 개발자"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
-msgstr ""
+msgstr "만든이"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
-msgstr ""
+msgstr "이전 공헌자들"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr ""
+msgstr "이전 코어 개발자들"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Installed Mods:"
-msgstr ""
+msgstr "설치한 모드:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Mod information:"
-msgstr ""
+msgstr "모드 정보:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "No mod description available"
-msgstr ""
+msgstr "모드 설명이 없습니다"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Rename"
-msgstr ""
+msgstr "이름 바꾸기"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Select Mod File:"
-msgstr ""
+msgstr "선택한 모드 파일:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected mod"
-msgstr ""
+msgstr "선택한 모드 삭제"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected modpack"
-msgstr ""
+msgstr "선택한 모드팩 삭제"
 
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port"
-msgstr ""
+msgstr "주소/포트"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
-msgstr ""
+msgstr "클라이언트"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Connect"
-msgstr ""
+msgstr "연결"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative mode"
-msgstr ""
+msgstr "크리에이티브 모드"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Damage enabled"
-msgstr ""
+msgstr "데미지를 입을 수 있습니다"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr ""
+msgstr "즐겨찾기 삭제"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
-msgstr ""
+msgstr "즐겨찾기"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Name / Password"
-msgstr ""
+msgstr "이름/비밀번호"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
-msgstr ""
+msgstr "PvP 가능"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Bind Address"
@@ -438,93 +441,93 @@ msgstr ""
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Configure"
-msgstr ""
+msgstr "환경설정"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Creative Mode"
-msgstr ""
+msgstr "크리에이티브 모드"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Enable Damage"
-msgstr ""
+msgstr "데미지를 받을 수 있습니다"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Name/Password"
-msgstr ""
+msgstr "이름/비밀번호"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "New"
-msgstr ""
+msgstr "새로 만들기"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "No world created or selected!"
-msgstr ""
+msgstr "월드를 만들거나 선택하지 않았습니다!"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Port"
-msgstr ""
+msgstr "포트"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Public"
-msgstr ""
+msgstr "일반"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Select World:"
-msgstr ""
+msgstr "비밀 월드:"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Server"
-msgstr ""
+msgstr "서버"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Server Port"
-msgstr ""
+msgstr "서버 포트"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Start Game"
-msgstr ""
+msgstr "게임 시작"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
-msgstr ""
+msgstr "2 x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "3D Clouds"
-msgstr ""
+msgstr "3D 구름 효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
-msgstr ""
+msgstr "4 x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "8x"
-msgstr ""
+msgstr "8 배속"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Advanced Settings"
-msgstr ""
+msgstr "고급 설정"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr ""
+msgstr "매끄럽게 표현하기:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
+msgstr "싱글 플레이어 월드를 다시 시작하겠습니까?"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
-msgstr ""
+msgstr "이중 선형 필터"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bump Mapping"
-msgstr ""
+msgstr "범프 매핑"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
-msgstr ""
+msgstr "키 변경"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Connected Glass"
@@ -532,11 +535,11 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Fancy Leaves"
-msgstr ""
+msgstr "아름다운 나무 효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
-msgstr ""
+msgstr "밉 맵"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
@@ -544,39 +547,39 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No"
-msgstr ""
+msgstr "아니오"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
-msgstr ""
+msgstr "필터 없음"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
-msgstr ""
+msgstr "밉 맵 없음"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr ""
+msgstr "Node 강조"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Outlining"
-msgstr ""
+msgstr "Node 설명"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
-msgstr ""
+msgstr "없음"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Normal Mapping"
-msgstr ""
+msgstr "노멀 매핑"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
-msgstr ""
+msgstr "불투명한 나뭇잎 효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Water"
-msgstr ""
+msgstr "불투명한 물 효과"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Parallax Occlusion"
@@ -584,147 +587,147 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
-msgstr ""
+msgstr "입자 효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Reset singleplayer world"
-msgstr ""
+msgstr "싱글 플레이어 월드 다시 시작"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
-msgstr ""
+msgstr "설정"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Shaders"
-msgstr ""
+msgstr "쉐이더"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Simple Leaves"
-msgstr ""
+msgstr "단순한 나뭇잎 효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Smooth Lighting"
-msgstr ""
+msgstr "부드러운 조명 효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Texturing:"
-msgstr ""
+msgstr "질감:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr ""
+msgstr "쉐이더를 사용하려면 OpenGL 드라이버를 사용할 필요가 있습니다."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr ""
+msgstr "톤 매핑"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold (px)"
-msgstr ""
+msgstr "터치임계값 (픽셀)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
-msgstr ""
+msgstr "선형 필터"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
-msgstr ""
+msgstr "움직이는 나뭇잎 효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Plants"
-msgstr ""
+msgstr "움직이는 식물 효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Water"
-msgstr ""
+msgstr "물결 효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Yes"
-msgstr ""
+msgstr "예"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Config mods"
-msgstr ""
+msgstr "모드 설정"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Main"
-msgstr ""
+msgstr "메인"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Start Singleplayer"
-msgstr ""
+msgstr "싱글 플레이어 시작"
 
 #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
 msgid "Play"
-msgstr ""
+msgstr "시작"
 
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Singleplayer"
-msgstr ""
+msgstr "싱글 플레이어"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "No information available"
-msgstr ""
+msgstr "정보가 없습니다"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Select texture pack:"
-msgstr ""
+msgstr "선택한 텍스쳐 팩:"
 
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Texturepacks"
-msgstr ""
+msgstr "텍스쳐 팩"
 
 #: src/client.cpp
 msgid "Connection timed out."
-msgstr ""
+msgstr "연결 시간이 초과했습니다."
 
 #: src/client.cpp
 msgid "Done!"
-msgstr ""
+msgstr "실행 중입니다!"
 
 #: src/client.cpp
 msgid "Initializing nodes"
-msgstr ""
+msgstr "node 초기값 설정중"
 
 #: src/client.cpp
 msgid "Initializing nodes..."
-msgstr ""
+msgstr "node 초기값 설정중..."
 
 #: src/client.cpp
 msgid "Loading textures..."
-msgstr ""
+msgstr "텍스쳐 로딩중..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr ""
+msgstr "쉐이더 개축중..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
-msgstr ""
+msgstr "연결 오류 (시간초과)"
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
-msgstr ""
+msgstr "게임을 찾지 못했거나 로딩할 수 없습니다\""
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
-msgstr ""
+msgstr "인식할 수 없는 게임 사양입니다."
 
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
-msgstr ""
+msgstr "주 메뉴"
 
 #: src/client/clientlauncher.cpp
 msgid "No world selected and no address provided. Nothing to do."
-msgstr ""
+msgstr "월드를 선택하지 않아 주소를 받을 수 없습니다."
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
-msgstr ""
+msgstr "이름이 너무 깁니다."
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr ""
+msgstr "월드가 존재하지 않습니다: "
 
 #: src/fontengine.cpp
 msgid "needs_fallback_font"
@@ -735,30 +738,32 @@ msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
+"\n"
+"자세한 내용은 debug.txt을 확인 합니다."
 
 #: src/game.cpp
 msgid "Change Keys"
-msgstr ""
+msgstr "키 변경"
 
 #: src/game.cpp
 msgid "Change Password"
-msgstr ""
+msgstr "비밀번호 변경"
 
 #: src/game.cpp
 msgid "Connecting to server..."
-msgstr ""
+msgstr "서버 연결중..."
 
 #: src/game.cpp
 msgid "Continue"
-msgstr ""
+msgstr "계속"
 
 #: src/game.cpp
 msgid "Creating client..."
-msgstr ""
+msgstr "클라이언트 만드는 중..."
 
 #: src/game.cpp
 msgid "Creating server..."
-msgstr ""
+msgstr "서버 만드는 중..."
 
 #: src/game.cpp
 msgid ""
@@ -774,6 +779,16 @@ msgid ""
 "- Mouse wheel: select item\n"
 "- T: chat\n"
 msgstr ""
+"기본 컨트롤:-WASD: 이동\n"
+"-스페이스: 점프/오르기\n"
+"-쉬프트:살금살금/내려가기\n"
+"-Q: 아이템 드롭\n"
+"-I: 인벤토리\n"
+"-마우스: 돌아보기/보기\n"
+"-마우스 왼쪽: 파내기/공격\n"
+"-마우스 오른쪽: 배치/사용\n"
+"-마우스 휠: 아이템 선택\n"
+"-T: 채팅\n"
 
 #: src/game.cpp
 msgid ""
@@ -790,86 +805,98 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
+"기본 컨트롤: \n"
+"표시가 없는 메뉴:\n"
+"- 단일 탭: 버튼 활성화\n"
+"- 더블 탭: 배치/사용\n"
+"- 드래그: 둘러보기\n"
+" 메뉴/인벤토리:\n"
+"- 더블 탭 (외부):\n"
+" -->닫기\n"
+"- 무더기(stack) 터치, 슬롯 터치: \n"
+" --> 무더기(stack) 이동 \n"
+"- 터치 및 드래그, 검지로 탭\n"
+" --> 슬롯에 한개의 아이템 배치\n"
 
 #: src/game.cpp
 msgid "Exit to Menu"
-msgstr ""
+msgstr "메뉴 나가기"
 
 #: src/game.cpp
 msgid "Exit to OS"
-msgstr ""
+msgstr "게임 종료"
 
 #: src/game.cpp
 msgid "Item definitions..."
-msgstr ""
+msgstr "아이템 정의중..."
 
 #: src/game.cpp
 msgid "KiB/s"
-msgstr ""
+msgstr "KiB/s"
 
 #: src/game.cpp
 msgid "Media..."
-msgstr ""
+msgstr "미디어..."
 
 #: src/game.cpp
 msgid "MiB/s"
-msgstr ""
+msgstr "MiB/s"
 
 #: src/game.cpp
 msgid "Node definitions..."
-msgstr ""
+msgstr "Node 정의중..."
 
 #: src/game.cpp
 msgid "Resolving address..."
-msgstr ""
+msgstr "주소 분석중..."
 
 #: src/game.cpp
 msgid "Respawn"
-msgstr ""
+msgstr "리스폰"
 
 #: src/game.cpp
 msgid "Shutting down..."
-msgstr ""
+msgstr "서버가 닫혔습니다..."
 
 #: src/game.cpp
 msgid "Sound Volume"
-msgstr ""
+msgstr "볼륨 조절"
 
 #: src/game.cpp
 msgid "You died."
-msgstr ""
+msgstr "당신은 죽었습니다."
 
 #: src/game.cpp src/guiFormSpecMenu.cpp
 msgid "ok"
-msgstr ""
+msgstr "확인"
 
 #: src/guiFormSpecMenu.cpp
 msgid "Enter "
-msgstr ""
+msgstr "들어가기 "
 
 #: src/guiFormSpecMenu.cpp
 msgid "Proceed"
-msgstr ""
+msgstr "계속하기"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "\"Use\" = climb down"
-msgstr ""
+msgstr "\"Use\" = 내려가기"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Backward"
-msgstr ""
+msgstr "뒤로"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Chat"
-msgstr ""
+msgstr "채팅"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Command"
-msgstr ""
+msgstr "명령어"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Console"
-msgstr ""
+msgstr "콘솔"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
@@ -877,31 +904,31 @@ msgstr ""
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Drop"
-msgstr ""
+msgstr "떨어뜨리기"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Forward"
-msgstr ""
+msgstr "앞으로"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Inventory"
-msgstr ""
+msgstr "인벤토리"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Jump"
-msgstr ""
+msgstr "점프"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Key already in use"
-msgstr ""
+msgstr "이미 사용하고 있는 키입니다"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
-msgstr ""
+msgstr "Keybindings. (이 메뉴를 고정하려면 minetest.cof에서 stuff를 제거해야합니다.)"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Left"
-msgstr ""
+msgstr "왼쪽"
 
 #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Print stacks"
@@ -909,87 +936,87 @@ msgstr ""
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Range select"
-msgstr ""
+msgstr "범위 선택"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Right"
-msgstr ""
+msgstr "오른쪽"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Sneak"
-msgstr ""
+msgstr "살금살금"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle Cinematic"
-msgstr ""
+msgstr "시네마틱 스위치"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
-msgstr ""
+msgstr "고속 스위치"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fly"
-msgstr ""
+msgstr "비행 스위치"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
-msgstr ""
+msgstr "자유시점 스위치"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Use"
-msgstr ""
+msgstr "사용"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Zoom"
-msgstr ""
+msgstr "확대/축소"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
-msgstr ""
+msgstr "키를 누르세요"
 
 #: src/guiPasswordChange.cpp
 msgid "Change"
-msgstr ""
+msgstr "변경"
 
 #: src/guiPasswordChange.cpp
 msgid "Confirm Password"
-msgstr ""
+msgstr "비밀번호 확인"
 
 #: src/guiPasswordChange.cpp
 msgid "New Password"
-msgstr ""
+msgstr "새로운 비밀번호"
 
 #: src/guiPasswordChange.cpp
 msgid "Old Password"
-msgstr ""
+msgstr "현재 비밀번호"
 
 #: src/guiPasswordChange.cpp
 msgid "Passwords do not match!"
-msgstr ""
+msgstr "비밀번호가 맞지 않습니다!"
 
 #: src/guiVolumeChange.cpp
 msgid "Exit"
-msgstr ""
+msgstr "나가기"
 
 #: src/guiVolumeChange.cpp
 msgid "Sound Volume: "
-msgstr ""
+msgstr "볼륨 조절: "
 
 #: src/keycode.cpp
 msgid "Apps"
-msgstr ""
+msgstr "애플 리 케이 션"
 
 #: src/keycode.cpp
 msgid "Attn"
-msgstr ""
+msgstr "담당자"
 
 #: src/keycode.cpp
 msgid "Back"
-msgstr ""
+msgstr "뒤로"
 
 #: src/keycode.cpp
 msgid "Capital"
-msgstr ""
+msgstr "자본"
 
 #: src/keycode.cpp
 msgid "Clear"
@@ -997,7 +1024,7 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Comma"
-msgstr ""
+msgstr "쉼표"
 
 #: src/keycode.cpp
 msgid "Control"
@@ -1005,7 +1032,7 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Convert"
-msgstr ""
+msgstr "변환"
 
 #: src/keycode.cpp
 msgid "CrSel"
@@ -1017,7 +1044,7 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "End"
-msgstr ""
+msgstr "끝"
 
 #: src/keycode.cpp
 msgid "Erase OEF"
@@ -1033,23 +1060,23 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Execute"
-msgstr ""
+msgstr "실행"
 
 #: src/keycode.cpp
 msgid "Final"
-msgstr ""
+msgstr "최종"
 
 #: src/keycode.cpp
 msgid "Help"
-msgstr ""
+msgstr "도움말"
 
 #: src/keycode.cpp
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #: src/keycode.cpp
 msgid "Insert"
-msgstr ""
+msgstr "Insert"
 
 #: src/keycode.cpp
 msgid "Junja"
@@ -1065,107 +1092,109 @@ msgstr ""
 
 #: src/keycode.cpp
 msgid "Left Button"
-msgstr ""
+msgstr "왼쪽된 버튼"
 
 #: src/keycode.cpp
 msgid "Left Control"
-msgstr ""
+msgstr "왼쪽 컨트롤"
 
 #: src/keycode.cpp
 msgid "Left Menu"
-msgstr ""
+msgstr "왼쪽 메뉴"
 
 #: src/keycode.cpp
 msgid "Left Shift"
-msgstr ""
+msgstr "왼쪽 쉬프트"
 
 #: src/keycode.cpp
 msgid "Left Windows"
-msgstr ""
+msgstr "왼쪽 창"
 
 #: src/keycode.cpp
 msgid "Menu"
-msgstr ""
+msgstr "메뉴"
 
 #: src/keycode.cpp
 msgid "Middle Button"
-msgstr ""
+msgstr "가운데 버튼"
 
 #: src/keycode.cpp
 msgid "Minus"
-msgstr ""
+msgstr "마이너스"
 
 #: src/keycode.cpp
 msgid "Mode Change"
-msgstr ""
+msgstr "모드 변경"
 
 #: src/keycode.cpp
 msgid "Next"
-msgstr ""
+msgstr "다음"
 
 #: src/keycode.cpp
+#, fuzzy
 msgid "Nonconvert"
-msgstr ""
+msgstr "변환 안함"
 
 #: src/keycode.cpp
+#, fuzzy
 msgid "Num Lock"
-msgstr ""
+msgstr "Num Lock"
 
 #: src/keycode.cpp
 msgid "Numpad *"
-msgstr ""
+msgstr "숫자 키패드 *"
 
 #: src/keycode.cpp
 msgid "Numpad +"
-msgstr ""
+msgstr "숫자 키패드 +"
 
 #: src/keycode.cpp
 msgid "Numpad -"
-msgstr ""
+msgstr "숫자 키패드 -"
 
 #: src/keycode.cpp
 msgid "Numpad /"
-msgstr ""
+msgstr "숫자 키패드 /"
 
 #: src/keycode.cpp
 msgid "Numpad 0"
-msgstr ""
+msgstr "숫자 키패드 0"
 
 #: src/keycode.cpp
 msgid "Numpad 1"
-msgstr ""
+msgstr "숫자 키패드 1"
 
 #: src/keycode.cpp
 msgid "Numpad 2"
-msgstr ""
+msgstr "숫자 키패드 2"
 
 #: src/keycode.cpp
 msgid "Numpad 3"
-msgstr ""
+msgstr "숫자 키패드 3"
 
 #: src/keycode.cpp
 msgid "Numpad 4"
-msgstr ""
+msgstr "숫자 키패드 4"
 
 #: src/keycode.cpp
 msgid "Numpad 5"
-msgstr ""
+msgstr "숫자 키패드 5"
 
 #: src/keycode.cpp
 msgid "Numpad 6"
-msgstr ""
+msgstr "숫자 키패드 6"
 
 #: src/keycode.cpp
 msgid "Numpad 7"
-msgstr ""
+msgstr "숫자 키패드 7"
 
 #: src/keycode.cpp
 msgid "Numpad 8"
-msgstr ""
+msgstr "숫자 키패드 8"
 
 #: src/keycode.cpp
 msgid "Numpad 9"
-msgstr ""
+msgstr "숫자 키패드 9"
 
 #: src/keycode.cpp
 msgid "OEM Clear"
@@ -1176,76 +1205,81 @@ msgid "PA1"
 msgstr ""
 
 #: src/keycode.cpp
+#, fuzzy
 msgid "Pause"
-msgstr ""
+msgstr "일시 중지"
 
 #: src/keycode.cpp
 msgid "Period"
-msgstr ""
+msgstr "기간"
 
 #: src/keycode.cpp
 msgid "Plus"
-msgstr ""
+msgstr "플러스"
 
 #: src/keycode.cpp
+#, fuzzy
 msgid "Print"
-msgstr ""
+msgstr "인쇄"
 
 #: src/keycode.cpp
 msgid "Prior"
-msgstr ""
+msgstr "이전"
 
 #: src/keycode.cpp
 msgid "Return"
-msgstr ""
+msgstr "되돌리기"
 
 #: src/keycode.cpp
 msgid "Right Button"
-msgstr ""
+msgstr "오른쪽 버튼"
 
 #: src/keycode.cpp
 msgid "Right Control"
-msgstr ""
+msgstr "오른쪽 컨트롤"
 
 #: src/keycode.cpp
 msgid "Right Menu"
-msgstr ""
+msgstr "오른쪽 메뉴"
 
 #: src/keycode.cpp
 msgid "Right Shift"
-msgstr ""
+msgstr "오른쪽 쉬프트"
 
 #: src/keycode.cpp
 msgid "Right Windows"
-msgstr ""
+msgstr "오른쪽 창"
 
 #: src/keycode.cpp
+#, fuzzy
 msgid "Scroll Lock"
-msgstr ""
+msgstr "스크롤 락"
 
 #: src/keycode.cpp
 msgid "Select"
-msgstr ""
+msgstr "선택"
 
 #: src/keycode.cpp
 msgid "Shift"
-msgstr ""
+msgstr "쉬프트"
 
 #: src/keycode.cpp
 msgid "Sleep"
-msgstr ""
+msgstr "잠자기"
 
 #: src/keycode.cpp
+#, fuzzy
 msgid "Snapshot"
-msgstr ""
+msgstr "스냅숏"
 
 #: src/keycode.cpp
+#, fuzzy
 msgid "Space"
-msgstr ""
+msgstr "스페이스"
 
 #: src/keycode.cpp
 msgid "Tab"
-msgstr ""
+msgstr "탭"
 
 #: src/keycode.cpp
 msgid "Up"
@@ -1276,13 +1310,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
-msgstr ""
+msgstr "3D 구름 효과"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode"
-msgstr ""
+msgstr "3D 모드"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -1293,20 +1328,30 @@ msgid ""
 "-    sidebyside: split screen side by side.\n"
 "-    pageflip: quadbuffer based 3d."
 msgstr ""
+"3D 지원.\n"
+"현재 지원되는 것:\n"
+"- 없음: 3d 출력 없음.\n"
+"- 입체 사진: 청록색/자홍색 3d.\n"
+"- interlaced: odd/even line based polarisation screen support.↵\n"
+"- topbottom: split screen top/bottom.↵\n"
+"- sidebyside: split screen side by side.↵\n"
+"- pageflip: quadbuffer based 3d."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "A chosen map seed for a new map, leave empty for random.\n"
 "Will be overridden when creating a new world in the main menu."
 msgstr ""
+"새로운 맵을 위해 선택한 맵 시드가 무작위로 비워져있다면\n"
+"메인메뉴에서 새로운 월드를 만들때 재정의 될 것입니다."
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server crashes."
-msgstr ""
+msgstr "서버 충돌 하는 경우 모든 사용자들에게 표시 될 메시지입니다."
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server shuts down."
-msgstr ""
+msgstr "서버가 닫힐 때 모든 사용자들에게 표시 될 메시지입니다."
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of emerge queues"
@@ -1326,11 +1371,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
-msgstr ""
+msgstr "블록 수식어 활성"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr ""
+msgstr "블록 범위 활성"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
@@ -1372,23 +1417,28 @@ msgid "Ambient occlusion gamma"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Amplifies the valleys"
-msgstr ""
+msgstr "계곡 증폭"
 
 #: src/settings_translation_file.cpp
 msgid "Anisotropic filtering"
-msgstr ""
+msgstr "이방성 필터링"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Announce server"
-msgstr ""
+msgstr "서버 발표"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Announce to this serverlist.\n"
 "If you want to announce your ipv6 address, use  serverlist_url = v6.servers."
 "minetest.net."
 msgstr ""
+"서버리스트에 발표합니다.\n"
+"만약 당신의 Ipv6 주소를 알리기 원한다면 serverlist_url = v6.servers.minetest.net 을 사용하세요."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
@@ -1396,7 +1446,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
-msgstr ""
+msgstr "충돌 후 재연결 요청"
 
 #: src/settings_translation_file.cpp
 msgid "Automaticaly report to the serverlist."
@@ -1408,23 +1458,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
-msgstr ""
+msgstr "뒤로 이동하는 키"
 
 #: src/settings_translation_file.cpp
 msgid "Base terrain height"
-msgstr ""
+msgstr "기본 지형 높이"
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
-msgstr ""
+msgstr "기본"
 
 #: src/settings_translation_file.cpp
 msgid "Basic Privileges"
-msgstr ""
+msgstr "기본 권한"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
-msgstr ""
+msgstr "이중 선형 필터링"
 
 #: src/settings_translation_file.cpp
 msgid "Bind address"
@@ -1460,15 +1510,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #1"
-msgstr ""
+msgstr "동굴 잡음 #1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #2"
-msgstr ""
+msgstr "동굴 잡음 #2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "동굴 너비"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
@@ -1476,15 +1526,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
-msgstr ""
+msgstr "채팅"
 
 #: src/settings_translation_file.cpp
 msgid "Chat toggle key"
-msgstr ""
+msgstr "채팅 스위치"
 
 #: src/settings_translation_file.cpp
 msgid "Chatcommands"
-msgstr ""
+msgstr "채팅 명렁어"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1510,40 +1560,42 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Chunk size"
-msgstr ""
+msgstr "덩어리 크기"
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode"
-msgstr ""
+msgstr "시네마틱 모드"
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode key"
-msgstr ""
+msgstr "시네마틱 모드 스위치"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Clean transparent textures"
-msgstr ""
+msgstr "깨끗하고 투명한 텍스처"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
-msgstr ""
+msgstr "클라이언트와 서버"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
-msgstr ""
+msgstr "오르기 속도"
 
 #: src/settings_translation_file.cpp
 msgid "Cloud height"
-msgstr ""
+msgstr "구름 높이"
 
 #: src/settings_translation_file.cpp
 msgid "Cloud radius"
-msgstr ""
+msgstr "구름 반지름"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds"
-msgstr ""
+msgstr "구름"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client side effect."
@@ -1555,13 +1607,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Colored fog"
-msgstr ""
+msgstr "색깔있는 안개"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"쉼표로 구분된 모드의 리스트는 HTTP API에 접근 할 수 있습니다.\n"
+"인터넷에서 데이터를 다운로드 하거나 업로드 할 수 있습니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1571,7 +1626,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Command key"
-msgstr ""
+msgstr "명령 키"
 
 #: src/settings_translation_file.cpp
 msgid "Connect glass"
@@ -1636,7 +1691,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
-msgstr ""
+msgstr "충돌 메시지"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1672,11 +1727,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
-msgstr ""
+msgstr "감도(DPI)"
 
 #: src/settings_translation_file.cpp
 msgid "Damage"
-msgstr ""
+msgstr "데미지"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
@@ -1696,21 +1751,24 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Default game"
-msgstr ""
+msgstr "기본 게임"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Default game when creating a new world.\n"
 "This will be overridden when creating a world from the main menu."
 msgstr ""
+"새로운 월드를 만들 때 기본 게임으로 시작합니다.\n"
+"주 메뉴에서 월드를 만들 때 재정의 될 것입니다."
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
-msgstr ""
+msgstr "기본 비밀 번호"
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
-msgstr ""
+msgstr "기본 권한"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
@@ -1723,18 +1781,22 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Defines sampling step of texture.\n"
 "A higher value results in smoother normal maps."
 msgstr ""
+"텍스처의 샘플링 단계를 정의합니다.\n"
+"일반 맵에 부드럽게 높은 값을 나타냅니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
-msgstr ""
+msgstr "블록에 최대 플레이어 전송 거리를 정의 합니다 (0 = 무제한)."
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "건축 후 블록 전송 지연"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -1791,11 +1853,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
-msgstr ""
+msgstr "비밀번호 없으면 불가"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "도메인 서버의 이름은 서버리스트에 표시 됩니다."
 
 #: src/settings_translation_file.cpp
 msgid "Double tap jump for fly"
@@ -1807,7 +1869,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Drop item key"
-msgstr ""
+msgstr "아이템 드랍 키"
 
 #: src/settings_translation_file.cpp
 msgid "Dump the mapgen debug infos."
@@ -1815,19 +1877,19 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "조이스틱 적용"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
-msgstr ""
+msgstr "VBO 적용"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod security"
-msgstr ""
+msgstr "보안 모드 적용"
 
 #: src/settings_translation_file.cpp
 msgid "Enable players getting damage and dying."
-msgstr ""
+msgstr "플레이어는 데미지를 받거나 죽을 수 있습니다."
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
@@ -1865,7 +1927,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enables animation of inventory items."
-msgstr ""
+msgstr "인벤토리 아이템의 애니메이션 적용."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1874,6 +1936,8 @@ msgid ""
 "or need to be auto-generated.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"텍스처에 bumpmapping을 할 수 있습니다. Normalmaps는 텍스쳐 팩에서 받거나 자동 생성될 필요가 있습니다.\n"
+"쉐이더를 활성화 해야 합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
@@ -1885,13 +1949,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enables minimap."
-msgstr ""
+msgstr "미니맵 적용."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Enables on the fly normalmap generation (Emboss effect).\n"
 "Requires bumpmapping to be enabled."
 msgstr ""
+"비행 노멀맵 생성 적용 (엠보스 효과).\n"
+"Bumpmapping를 활성화 해야 합니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2006,35 +2073,35 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Filtering"
-msgstr ""
+msgstr "필터링"
 
 #: src/settings_translation_file.cpp
 msgid "Fixed map seed"
-msgstr ""
+msgstr "수정된 맵 시드"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
-msgstr ""
+msgstr "비행 키"
 
 #: src/settings_translation_file.cpp
 msgid "Flying"
-msgstr ""
+msgstr "비행"
 
 #: src/settings_translation_file.cpp
 msgid "Fog"
-msgstr ""
+msgstr "안개"
 
 #: src/settings_translation_file.cpp
 msgid "Fog toggle key"
-msgstr ""
+msgstr "안개 스위치"
 
 #: src/settings_translation_file.cpp
 msgid "Font path"
-msgstr ""
+msgstr "글꼴 경로"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
-msgstr ""
+msgstr "글꼴 그림자"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha"
@@ -2050,7 +2117,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Font size"
-msgstr ""
+msgstr "글꼴 크기"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
@@ -2082,7 +2149,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
-msgstr ""
+msgstr "전체 화면"
 
 #: src/settings_translation_file.cpp
 msgid "Full screen BPP"
@@ -2090,7 +2157,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fullscreen mode."
-msgstr ""
+msgstr "전체 화면 모드."
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
@@ -2106,15 +2173,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Gamma"
-msgstr ""
+msgstr "감마"
 
 #: src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "일반"
 
 #: src/settings_translation_file.cpp
 msgid "Generate normalmaps"
-msgstr ""
+msgstr "Normalmaps 생성"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
@@ -2132,7 +2199,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
-msgstr ""
+msgstr "그래픽"
 
 #: src/settings_translation_file.cpp
 msgid "Gravity"
@@ -2140,7 +2207,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "HTTP Mods"
-msgstr ""
+msgstr "HTTP 모드"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
@@ -2177,11 +2244,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "서버의 홈페이지는 서버 리스트에 나타납니다."
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers"
-msgstr ""
+msgstr "얼마나 강을 깊게 만들건가요"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2202,11 +2269,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 server"
-msgstr ""
+msgstr "IPv6 서버"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 support."
@@ -2274,15 +2341,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "In-Game"
-msgstr ""
+msgstr "인게임"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
-msgstr ""
+msgstr "게임 내에서 채팅 콘솔 배경 알파 (불투명 함, 0와 255 사이)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background color (R,G,B)."
-msgstr ""
+msgstr "게임 내에서 채팅 콘솔 배경 색상 (빨,초,파)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2332,7 +2400,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Inventory key"
-msgstr ""
+msgstr "인벤토리 키"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
@@ -2391,11 +2459,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Jump key"
-msgstr ""
+msgstr "점프 키"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
-msgstr ""
+msgstr "점프 속도"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2403,6 +2471,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"보여지는 범위 감소에 대한 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2410,6 +2481,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"현재 선택된 아이템 드롭에 대한 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2417,6 +2491,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"보여지는 범위 증가에 대한 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2424,6 +2501,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"점프키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2431,6 +2511,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"고속 모드에서 빠르게 이동하는 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2438,6 +2521,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"플레이어가 뒤쪽으로 움직이는 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2445,6 +2531,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"플레이어가 앞으로 움직이는 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2452,6 +2541,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"플레이어가 왼쪽으로 움직이는 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2459,6 +2551,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"플레이어가 오른쪽으로 움직이는 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2466,6 +2561,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"채팅 창을 여는 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2473,6 +2571,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"명령어를 입력하기 위해 채팅창을 여는 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2480,6 +2581,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"채팅창을 여는 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2487,6 +2591,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"인벤토리를 여는 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2494,6 +2601,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"디버그 무더기(stacks) 인쇄 키. 개발을 위해 사용됨.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2503,6 +2613,10 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"살금살금걷기 키입니다.\n"
+"만약 aux1_descends를 사용할 수 없는 경우에 물에서 내려가거나 올라올 수 있습니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2510,6 +2624,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"1인칭에서 3인칭간 카메라 전환키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2517,6 +2634,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"스크린샷키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2531,6 +2651,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"시네마틱 모드 스위치 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2538,6 +2661,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"미니 맵 표시 설정/해제 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2545,6 +2671,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"고속 모드 스위치 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2552,6 +2681,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"비행 모드 스위치 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2559,6 +2691,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"자유시점 모드 스위치 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2566,6 +2701,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"카메라 업데이트 스위치 키입니다. 개발을 위해서만 사용됩니다. \n"
+"참조 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
+"3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2573,6 +2711,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"디버그 정보 표시 스위치 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2580,6 +2721,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"HUD 표시 스위치 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2587,6 +2731,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"채팅 스위치 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2594,6 +2741,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"안개 스위치 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2608,6 +2758,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"제한없이 보여지는 범위에 대한 스위치 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr.html#"
+"a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
@@ -2615,11 +2768,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Language"
-msgstr ""
+msgstr "언어"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
-msgstr ""
+msgstr "큰 동굴 깊이"
 
 #: src/settings_translation_file.cpp
 msgid "Lava Features"
@@ -2627,15 +2780,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
-msgstr ""
+msgstr "나뭇잎 스타일"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Leaves style:\n"
 "-   Fancy:  all faces visible\n"
 "-   Simple: only outer faces, if defined special_tiles are used\n"
 "-   Opaque: disable transparency"
 msgstr ""
+"나뭇잎 스타일:\n"
+"- 아름다운: 모든 면 표시\n"
+"- 간단: 외부 면만 표시, special_tiles를 정의 하는 경우만 사용\n"
+"- 불투명: 투명도 사용 안 함"
 
 #: src/settings_translation_file.cpp
 msgid "Left key"
@@ -2729,15 +2887,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
-msgstr ""
+msgstr "주 메뉴 게임 관리자"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu mod manager"
-msgstr ""
+msgstr "주 메뉴 모드 관리자"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
-msgstr ""
+msgstr "주 메뉴 스크립트"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2795,7 +2953,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
-msgstr ""
+msgstr "맵 생성 제한"
 
 #: src/settings_translation_file.cpp
 msgid "Map save interval"
@@ -3099,11 +3257,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave depth"
-msgstr ""
+msgstr "거대한 동굴 깊이"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave noise"
-msgstr ""
+msgstr "거대한 동굴 잡음"
 
 #: src/settings_translation_file.cpp
 msgid "Massive caves form here."
@@ -3115,7 +3273,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Max block send distance"
-msgstr ""
+msgstr "최대 블록 전송 거리"
 
 #: src/settings_translation_file.cpp
 msgid "Max liquids processed per step."
@@ -3131,11 +3289,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
-msgstr ""
+msgstr "최대 FPS"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS when game is paused."
-msgstr ""
+msgstr "최대 FPS는 게임이 일시정지될때 나타납니다."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -3143,7 +3301,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum hotbar width"
-msgstr ""
+msgstr "최대 hotbar 폭"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that are simultaneously sent in total."
@@ -3196,17 +3354,21 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum objects per block"
-msgstr ""
+msgstr "블록 당 최대 개체"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
 "Useful if there's something to be displayed right or left of hotbar."
 msgstr ""
+"현재 윈도우의 최대 부분은 hotbar를 사용할 것입니다.\n"
+"hotbar의 오른쪽이나 왼쪽에 무언가를 나타낼 때 유용합니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Maximum simultaneous block sends per client"
-msgstr ""
+msgstr "클라이언트 당 최대 동시 블록 전송"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneous block sends total"
@@ -3218,15 +3380,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
-msgstr ""
+msgstr "최대 사용자"
 
 #: src/settings_translation_file.cpp
 msgid "Menus"
-msgstr ""
+msgstr "메뉴"
 
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
-msgstr ""
+msgstr "메쉬 캐시"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day"
@@ -3242,47 +3404,48 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
-msgstr ""
+msgstr "미니맵"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap key"
-msgstr ""
+msgstr "미니맵 키"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap scan height"
-msgstr ""
+msgstr "미니맵 검색 높이"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Minimum texture size for filters"
-msgstr ""
+msgstr "필터 최소 텍스처 크기"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
-msgstr ""
+msgstr "밉매핑(Mipmapping)"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore details URL"
-msgstr ""
+msgstr "Modstore 정보 URL"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore download URL"
-msgstr ""
+msgstr "Modstore 다운로드 URL"
 
 #: src/settings_translation_file.cpp
 msgid "Modstore mods list URL"
-msgstr ""
+msgstr "Modstore 모드 리스트 URL"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
-msgstr ""
+msgstr "고정 폭 글꼴 경로"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font size"
-msgstr ""
+msgstr "고정 폭 글꼴 크기"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
-msgstr ""
+msgstr "마우스 감도"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity multiplier."
@@ -3301,10 +3464,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Name of map generator to be used when creating a new world.\n"
 "Creating a world in the main menu will override this."
 msgstr ""
+"맵 생성기의 이름은 새로운 월드를 만들때 사용됩니다.\n"
+"주 메뉴에서 새 월드를 만들면 이것은 무시될 것입니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3316,11 +3482,11 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Name of the server, to be displayed when players join and in the serverlist."
-msgstr ""
+msgstr "서버이름은 플레이어가 서버 리스트에 들어갈 때 나타납니다."
 
 #: src/settings_translation_file.cpp
 msgid "Network"
-msgstr ""
+msgstr "네트워크"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3330,23 +3496,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "New users need to input this password."
-msgstr ""
+msgstr "신규 사용자는 비밀번호를 입력하세요."
 
 #: src/settings_translation_file.cpp
 msgid "Noclip"
-msgstr ""
+msgstr "자유시점"
 
 #: src/settings_translation_file.cpp
 msgid "Noclip key"
-msgstr ""
+msgstr "자유시점 키"
 
 #: src/settings_translation_file.cpp
 msgid "Node highlighting"
-msgstr ""
+msgstr "Node 강조"
 
 #: src/settings_translation_file.cpp
 msgid "NodeTimer interval"
-msgstr ""
+msgstr "NodeTimer 간격"
 
 #: src/settings_translation_file.cpp
 msgid "Noise parameters for biome API temperature, humidity and biome blend."
@@ -3354,15 +3520,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Noises"
-msgstr ""
+msgstr "소리"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps sampling"
-msgstr ""
+msgstr "Normalmaps 샘플링"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps strength"
-msgstr ""
+msgstr "Normalmaps 강도"
 
 #: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
@@ -3393,16 +3559,18 @@ msgid "Overall bias of parallax occlusion effect, usually scale/2."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Overall scale of parallax occlusion effect."
-msgstr ""
+msgstr "시차 교합 효과의 전체 규모"
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion"
-msgstr ""
+msgstr "시차 교합"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Parallax occlusion Scale"
-msgstr ""
+msgstr "시차 교합 규모"
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion bias"
@@ -3413,38 +3581,42 @@ msgid "Parallax occlusion iterations"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Parallax occlusion mode"
-msgstr ""
+msgstr "시차 교합 모드"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Parallax occlusion strength"
-msgstr ""
+msgstr "시차 교합 강도"
 
 #: src/settings_translation_file.cpp
 msgid "Path to TrueTypeFont or bitmap."
-msgstr ""
+msgstr "TrueTypeFont 또는 비트맵의 경로입니다."
 
 #: src/settings_translation_file.cpp
 msgid "Path to save screenshots at."
-msgstr ""
+msgstr "스크린샷 저장 경로입니다."
 
 #: src/settings_translation_file.cpp
 msgid "Path to texture directory. All textures are first searched from here."
-msgstr ""
+msgstr "텍스처 디렉터리 경로입니다. 모든 텍스처는 여기에서 먼저 검색 됩니다."
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
-msgstr ""
+msgstr "물리학"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
 msgstr ""
+"플레이어는 중력에 의해 영향을 받지 않고 날 수 있습니다.\n"
+"서버에서 \"비행\" 권한이 필요로 합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Player name"
-msgstr ""
+msgstr "플레이어 이름"
 
 #: src/settings_translation_file.cpp
 msgid "Player transfer distance"
@@ -3452,17 +3624,21 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Player versus Player"
-msgstr ""
+msgstr "PVP"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Port to connect to (UDP).\n"
 "Note that the port field in the main menu overrides this setting."
 msgstr ""
+"(UDP)에 연결 하는 포트.\n"
+"참고 주 메뉴의 포트 필트는 이 설정으로 재정의 됩니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Prevent mods from doing insecure things like running shell commands."
-msgstr ""
+msgstr "shell 명령어 실행 같은 안전 하지 않은 것으로부터 모드를 보호합니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3476,15 +3652,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Profiler"
-msgstr ""
+msgstr "프로파일러"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
-msgstr ""
+msgstr "프로파일러 토글 키"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Profiling"
-msgstr ""
+msgstr "프로 파일링"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3494,72 +3671,78 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Raises terrain to make valleys around the rivers"
-msgstr ""
+msgstr "강 주변에 계곡을 만들기 위해 지형을 올립니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Random input"
-msgstr ""
+msgstr "임의 입력"
 
 #: src/settings_translation_file.cpp
 msgid "Range select key"
-msgstr ""
+msgstr "범위 선택 키"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
-msgstr ""
+msgstr "원격 미디어"
 
 #: src/settings_translation_file.cpp
 msgid "Remote port"
-msgstr ""
+msgstr "원격 포트"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Replaces the default main menu with a custom one."
-msgstr ""
+msgstr "기본 주 메뉴를 커스텀 메뉴로 바꿉니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Report path"
-msgstr ""
+msgstr "보고서 경로"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
-msgstr ""
+msgstr "오른쪽 키"
 
 #: src/settings_translation_file.cpp
 msgid "Rightclick repetition interval"
-msgstr ""
+msgstr "오른쪽 클릭 반복 간격"
 
 #: src/settings_translation_file.cpp
 msgid "River Depth"
-msgstr ""
+msgstr "강 깊이"
 
 #: src/settings_translation_file.cpp
 msgid "River Noise"
-msgstr ""
+msgstr "강 소리"
 
 #: src/settings_translation_file.cpp
 msgid "River Size"
-msgstr ""
+msgstr "강 크기"
 
 #: src/settings_translation_file.cpp
 msgid "River noise -- rivers occur close to zero"
-msgstr ""
+msgstr "강 소리 -- 강이 0에 가까울 때 발생"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Rollback recording"
-msgstr ""
+msgstr "롤백 레코딩"
 
 #: src/settings_translation_file.cpp
 msgid "Round minimap"
-msgstr ""
+msgstr "원형 미니맵"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Save the map received by the client on disk."
-msgstr ""
+msgstr "디스크에 클라이언트에서 받은 맵을 저장 합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
-msgstr ""
+msgstr "서버로부터 받은 맵을 저장"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3572,27 +3755,27 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
-msgstr ""
+msgstr "화면 높이"
 
 #: src/settings_translation_file.cpp
 msgid "Screen width"
-msgstr ""
+msgstr "화면 너비"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot"
-msgstr ""
+msgstr "스크린샷"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot folder"
-msgstr ""
+msgstr "스크린샷 폴더"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot format"
-msgstr ""
+msgstr "화면 캡처 형식"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot quality"
-msgstr ""
+msgstr "스크린샷 품질"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3600,105 +3783,120 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"화면 캡처 품질입니다. JPEG 형식에만 사용.\n"
+"1은 최악의 품질; 100은 최고의 품질을 의미합니다.\n"
+"기본 품질은 0을 사용 합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Security"
-msgstr ""
+msgstr "보안"
 
 #: src/settings_translation_file.cpp
 msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
-msgstr ""
+msgstr "Http://www.sqlite.org/pragma.html#pragma_synchronous 참조"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
-msgstr ""
+msgstr "선택 박스 테두리 색 (빨, 초, 파)."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box color"
-msgstr ""
+msgstr "선택 박스 컬러"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box width"
-msgstr ""
+msgstr "선택 박스 너비"
 
 #: src/settings_translation_file.cpp
 msgid "Server / Singleplayer"
-msgstr ""
+msgstr "서버 / 싱글 플레이어"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
-msgstr ""
+msgstr "서버 URL"
 
 #: src/settings_translation_file.cpp
 msgid "Server address"
-msgstr ""
+msgstr "서버 주소"
 
 #: src/settings_translation_file.cpp
 msgid "Server description"
-msgstr ""
+msgstr "서버 설명"
 
 #: src/settings_translation_file.cpp
 msgid "Server name"
-msgstr ""
+msgstr "서버 이름"
 
 #: src/settings_translation_file.cpp
 msgid "Server port"
-msgstr ""
+msgstr "서버 포트"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist URL"
-msgstr ""
+msgstr "서버리스트 URL"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist file"
-msgstr ""
+msgstr "서버리스트 파일"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set the language. Leave empty to use the system language.\n"
 "A restart is required after changing this."
 msgstr ""
+"언어 설정. 시스템 언어를 사용하려면 비워두세요.\n"
+"설정 적용 후 재시작이 필요합니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving leaves.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"True로 설정하면 흔들리는 나뭇잎 효과가 적용됩니다.\n"
+"쉐이더를 활성화 해야 합니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"True로 설정하면 흔들리는 식물 효과가 적용됩니다.\n"
+"쉐이더를 활성화 해야 합니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving water.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"True로 설정하면 물결효과가 적용됩니다.\n"
+"쉐이더를 활성화해야 합니다.."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
+"쉐이더는 확장된 시각 효과를 제공합니다 그래서 비디오 카드의 성능이 증가될 것입니다.\n"
+"Thy only work with the OpenGL video backend."
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr ""
+msgstr "미니맵 모양. 활성화 = 원형, 비활성화 = 정사각형."
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
-msgstr ""
+msgstr "디버그 정보 보기"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Show entity selection boxes"
-msgstr ""
+msgstr "개체 선택 상자 보기"
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
-msgstr ""
+msgstr "서버닫힘 메시지"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3707,34 +3905,38 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Slope and fill work together to modify the heights"
-msgstr ""
+msgstr "높이 수정을 위해 기울기와 채우기를 함께 작용합니다"
 
 #: src/settings_translation_file.cpp
 msgid "Smooth lighting"
-msgstr ""
+msgstr "부드러운 조명효과"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
+"주위를 돌아볼 때 카메라를 부드럽게 해줍니다. 보기 또는 부드러운 마우스라고도 합니다.\n"
+"비디오를 녹화하기에 유용합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
-msgstr ""
+msgstr "시네마틱 모드에서 카메라의 회전을 매끄럽게 만듭니다. 사용 하지 않으려면 0입니다."
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera. 0 to disable."
-msgstr ""
+msgstr "카메라의 회전을 매끄럽게 만듭니다. 사용 하지 않으려면 0입니다."
 
 #: src/settings_translation_file.cpp
 msgid "Sneak key"
-msgstr ""
+msgstr "살금살금걷기 키"
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
-msgstr ""
+msgstr "사운드"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3746,7 +3948,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
-msgstr ""
+msgstr "고정된 스폰포인트"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of generated normalmaps."
@@ -3758,7 +3960,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
-msgstr ""
+msgstr "엄격한 프로토콜 검사"
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
@@ -3770,7 +3972,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Terrain Height"
-msgstr ""
+msgstr "지형 높이"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3788,7 +3990,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
-msgstr ""
+msgstr "텍스처 경로"
 
 #: src/settings_translation_file.cpp
 msgid "The altitude at which temperature drops by 20C"
@@ -3801,8 +4003,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "The depth of dirt or other filler"
-msgstr ""
+msgstr "흙이나 다른 것의 깊이"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3859,7 +4062,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "This font will be used for certain languages."
-msgstr ""
+msgstr "이 글꼴은 특정 언어에 사용 됩니다."
 
 #: src/settings_translation_file.cpp
 msgid "Time in between active block management cycles"
@@ -3872,36 +4075,43 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Time send interval"
-msgstr ""
+msgstr "시간 전송 간격"
 
 #: src/settings_translation_file.cpp
 msgid "Time speed"
-msgstr ""
+msgstr "시간 속도"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Timeout for client to remove unused map data from memory."
-msgstr ""
+msgstr "메모리에서 사용 하지 않는 맵 데이터를 제거하기 위해 클라이언트에 대한 시간 제한입니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "To reduce lag, block transfers are slowed down when a player is building "
 "something.\n"
 "This determines how long they are slowed down after placing or removing a "
 "node."
 msgstr ""
+"플레이어가 무엇을 건설할 때 딜레이를 줄이기 위해 블럭 전송이 느려집니다.\n"
+"이것은 node가 배치되거나 제거된 후 얼마나 오래 느려지는지를 결정합니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Toggle camera mode key"
-msgstr ""
+msgstr "카메라모드 스위치 키"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Tooltip delay"
-msgstr ""
+msgstr "도구 설명 지연"
 
 #: src/settings_translation_file.cpp
 msgid "Trilinear filtering"
-msgstr ""
+msgstr "삼중 선형 필터링"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3909,54 +4119,60 @@ msgid ""
 "False = 128\n"
 "Useable to make minimap smoother on slower machines."
 msgstr ""
+"True = 256 \n"
+"False = 128 \n"
+"느린 컴퓨터에서 미니맵을 부드럽게 만들어줍니다."
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
-msgstr ""
+msgstr "신뢰할 수 있는 모드"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
-msgstr ""
+msgstr "멀티 탭에 표시 된 서버 목록 URL입니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Unlimited player transfer distance"
-msgstr ""
+msgstr "무제한 플레이어 전송 거리"
 
 #: src/settings_translation_file.cpp
 msgid "Unload unused server data"
-msgstr ""
+msgstr "사용하지 않은 서버 데이터 삭제"
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
-msgstr ""
+msgstr "평평하게 보는 대신에 3D 구름 효과를 사용합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Use a cloud animation for the main menu background."
-msgstr ""
+msgstr "주 메뉴 배경에 구름 애니메이션을 사용 합니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Use anisotropic filtering when viewing at textures from an angle."
-msgstr ""
+msgstr "각도에 따라 텍스처를 볼 때 이방성 필터링을 사용 합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Use bilinear filtering when scaling textures."
-msgstr ""
+msgstr "이중 선형 필터링은 질감 스케일링을 할 때 사용 합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Use key"
-msgstr ""
+msgstr "키 사용"
 
 #: src/settings_translation_file.cpp
 msgid "Use mip mapping to scale textures. May slightly increase performance."
-msgstr ""
+msgstr "텍스쳐를 크게하기 위해 mip mapping을 사용 합니다. 성능이 약간 증가할겁니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Use trilinear filtering when scaling textures."
-msgstr ""
+msgstr "삼중 선형 필터링은 질감 스케일링을 할 때 사용 합니다."
 
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
-msgstr ""
+msgstr "수직동기화 V-Sync"
 
 #: src/settings_translation_file.cpp
 msgid "VBO"
@@ -3964,57 +4180,64 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Valley Depth"
-msgstr ""
+msgstr "계곡 깊이"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Valley Fill"
-msgstr ""
+msgstr "계곡 채우기"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Valley Profile"
-msgstr ""
+msgstr "계곡 측면"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Slope"
-msgstr ""
+msgstr "계곡 경사"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Valleys C Flags"
-msgstr ""
+msgstr "계곡 C 플래그"
 
 #: src/settings_translation_file.cpp
 msgid "Vertical screen synchronization."
-msgstr ""
+msgstr "세로 화면 동기화."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
-msgstr ""
+msgstr "비디오 드라이버"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "View bobbing"
-msgstr ""
+msgstr "보기 만료"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "View distance in nodes.\n"
 "Min = 20"
 msgstr ""
+"node의 보여지는 거리\n"
+"최소 = 20"
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
-msgstr ""
+msgstr "보여지는 범위 감소 키"
 
 #: src/settings_translation_file.cpp
 msgid "View range increase key"
-msgstr ""
+msgstr "보여지는 범위 증가 키"
 
 #: src/settings_translation_file.cpp
 msgid "Viewing range"
-msgstr ""
+msgstr "보여지는 범위"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
-msgstr ""
+msgstr "볼륨"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4026,54 +4249,58 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
-msgstr ""
+msgstr "빠르게 걷기"
 
 #: src/settings_translation_file.cpp
 msgid "Water Features"
-msgstr ""
+msgstr "물 특징"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
-msgstr ""
+msgstr "물의 높이"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
-msgstr ""
+msgstr "월드의 물 표면 높이."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Waving Nodes"
-msgstr ""
+msgstr "움직이는 Node"
 
 #: src/settings_translation_file.cpp
 msgid "Waving leaves"
-msgstr ""
+msgstr "흔들리는 나뭇잎 효과"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
-msgstr ""
+msgstr "흔들리는 식물 효과"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water"
-msgstr ""
+msgstr "물결 효과"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water height"
-msgstr ""
+msgstr "물결 높이"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water length"
-msgstr ""
+msgstr "물결 길이"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water speed"
-msgstr ""
+msgstr "물결 속도"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "When gui_scaling_filter is true, all GUI images need to be\n"
 "filtered in software, but some images are generated directly\n"
 "to hardware (e.g. render-to-texture for nodes in inventory)."
 msgstr ""
+"Gui_scaling_filter이 true 이면 모든 GUI 이미지 소프트웨어에서 필터링 될 필요가 있습니다. 하지만 일부 이미지는 "
+"바로 하드웨어에 생성됩니다. (e.g. render-to-texture for nodes in inventory)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4084,6 +4311,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
 "can be blurred, so automatically upscale them with nearest-neighbor\n"
@@ -4093,6 +4321,12 @@ msgid ""
 "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
 "enabled."
 msgstr ""
+"이중선형/삼중선형/이방성 필터를 사용할 때 저해상도 택스쳐는 희미하게 보일 수 있습니다.so automatically upscale "
+"them with nearest-neighbor interpolation to preserve crisp pixels. This sets "
+"the minimum texture size for the upscaled textures; 값이 높을수록 선명하게 보입니다. 하지만 "
+"많은 메모리가 필요합니다. Powers of 2 are recommended. Setting this higher than 1 may "
+"not have a visible effect unless bilinear/trilinear/anisotropic filtering is "
+"enabled."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4147,18 +4381,23 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Width component of the initial window size."
-msgstr ""
+msgstr "폭은 초기 창 크기로 구성되어 있습니다."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Width of the selectionbox's lines around nodes."
 msgstr ""
+"node 주위 “selectionbox'” or (if UTF-8 supported) “selectionbox’” 라인의 너비입니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
+"월드 디렉토리 (월드의 모든 것은 여기에 저장됩니다).\n"
+"주 메뉴에서 시작 하는 경우 필요 하지 않습니다."
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."

From 66fe077d0739b0756eb87389ddd1498187b84bd7 Mon Sep 17 00:00:00 2001
From: nedzadarek <nedzadarek@gmail.com>
Date: Sun, 25 Sep 2016 20:41:59 +0000
Subject: [PATCH 375/418] Translated using Weblate (Polish)

Currently translated at 41.2% (379 of 918 strings)
---
 po/pl/minetest.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index 42d2fe3d1..a786912c6 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-07-29 19:02+0000\n"
-"Last-Translator: Mateusz Mendel <mendelm9@gmail.com>\n"
-"Language-Team: Polish <https://hosted.weblate.org/projects/minetest/minetest/"
-"pl/>\n"
+"PO-Revision-Date: 2016-09-25 20:41+0000\n"
+"Last-Translator: nedzadarek <nedzadarek@gmail.com>\n"
+"Language-Team: Polish "
+"<https://hosted.weblate.org/projects/minetest/minetest/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.8-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -1140,7 +1140,7 @@ msgstr "Zmiana Trybu"
 
 #: src/keycode.cpp
 msgid "Next"
-msgstr "Next"
+msgstr "Następny"
 
 #: src/keycode.cpp
 msgid "Nonconvert"

From e36ae4ec0a4d5df6b23a7e4d433961effa0ea544 Mon Sep 17 00:00:00 2001
From: red-001 <red-001@openmailbox.org>
Date: Tue, 8 Nov 2016 16:46:07 +0000
Subject: [PATCH 376/418] Translated using Weblate (Polish)

Currently translated at 41.6% (382 of 918 strings)
---
 po/pl/minetest.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index a786912c6..af5962b2d 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-09-25 20:41+0000\n"
-"Last-Translator: nedzadarek <nedzadarek@gmail.com>\n"
+"PO-Revision-Date: 2016-11-08 16:46+0000\n"
+"Last-Translator: red-001 <red-001@openmailbox.org>\n"
 "Language-Team: Polish "
 "<https://hosted.weblate.org/projects/minetest/minetest/pl/>\n"
 "Language: pl\n"
@@ -1503,7 +1503,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
-msgstr "Klawisz wstecz"
+msgstr "Wstecz"
 
 #: src/settings_translation_file.cpp
 #, fuzzy

From 735581bad13b6fa2921bfdb8ab902075e5b4e104 Mon Sep 17 00:00:00 2001
From: Jakub Mendel <jimikuba@o2.pl>
Date: Tue, 8 Nov 2016 16:43:42 +0000
Subject: [PATCH 377/418] Translated using Weblate (Polish)

Currently translated at 59.5% (547 of 918 strings)

This is a merger of 2 commits.
---
 po/pl/minetest.po | 329 ++++++++++++----------------------------------
 1 file changed, 82 insertions(+), 247 deletions(-)

diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index af5962b2d..19f18e73a 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-11-08 16:46+0000\n"
-"Last-Translator: red-001 <red-001@openmailbox.org>\n"
+"PO-Revision-Date: 2016-11-08 17:20+0000\n"
+"Last-Translator: Jakub Mendel <jimikuba@o2.pl>\n"
 "Language-Team: Polish "
 "<https://hosted.weblate.org/projects/minetest/minetest/pl/>\n"
 "Language: pl\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.9-dev\n"
+"X-Generator: Weblate 2.9\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -54,20 +54,21 @@ msgstr "Niezgodne wersje protokołów. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "Serwer narzuca wersję protokołu $1. "
+msgstr "Serwer żąda użycia protokołu w wersji $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "Serwer wspiera wersje protokołu od $1 do $2. "
+msgstr "Serwer wspiera protokoły w wersjach od $1 do $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
 msgstr ""
-"Spróbuj włączyć ponownie publiczną listę serwerów i sprawdź połączenie."
+"Spróbuj ponownie włączyć publiczną listę serwerów i sprawdź swoje połączenie "
+"internetowe."
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr "Wspieramy tylko protokół w wersji $1."
+msgstr "Wspieramy wyłącznie protokół w wersji $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
@@ -102,8 +103,8 @@ msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
-"Nie można włączyć moda \"$1\" gdyż nazwa zawiera niedozwolone znaki. "
-"Dozwolone są wyłącznie znaki  [a-z0-9_]."
+"Nie udało się aktywować moda \"$1\", ponieważ zawiera niedozwolone znaki. "
+"Tylko znaki [a-z0-9_] są dozwolone."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -144,7 +145,7 @@ msgstr "Pobierz tryb gry (np. minetest_game), z minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr "Pobierz z minetest.net"
+msgstr "Ściągnij taką z minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -165,8 +166,7 @@ msgstr "Ziarno losowości"
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The minimal development test is meant for developers."
 msgstr ""
-"Uwaga: Tryb minimal development test jest stworzony wyłącznie dla "
-"developerów."
+"Uwaga: Minimal development test jest przeznaczony tylko dla developerów."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -212,7 +212,7 @@ msgstr "\"$1\" nie jest poprawną flagą."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
-msgstr "(Nie podano opisu ustawienia)"
+msgstr "(brak opisu)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
@@ -264,15 +264,15 @@ msgstr "Wprowadź listę flag oddzielonych przecinkami."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
-msgstr "Wprowadź poprawną liczbę całkowitą."
+msgstr "Proszę wpisać prawidłową liczbę."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid number."
-msgstr "Wprowadź poprawną liczbę."
+msgstr "Proszę wpisać prawidłowy numer."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Possible values are: "
-msgstr "Możliwe wartości: "
+msgstr "Możliwe wartości to: "
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
@@ -284,15 +284,15 @@ msgstr "Wybierz ścieżkę"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
-msgstr "Pokaż nazwy ustawień"
+msgstr "Pokaż nazwy techniczne"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be greater than $1."
-msgstr "Wartość musi być większa od $1."
+msgstr "Wartość musi być większa niż $1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be lower than $1."
-msgstr "Wartość musi być mniejsza od $1."
+msgstr "Wartość musi być mniejsza niż $1."
 
 #: builtin/mainmenu/modmgr.lua
 msgid ""
@@ -321,7 +321,7 @@ msgstr ""
 
 #: builtin/mainmenu/store.lua
 msgid "Close store"
-msgstr "Zamknij sklep"
+msgstr "Zamknij"
 
 #: builtin/mainmenu/store.lua
 msgid "Downloading $1, please wait..."
@@ -345,11 +345,11 @@ msgstr "Szukaj"
 
 #: builtin/mainmenu/store.lua
 msgid "Shortname:"
-msgstr "Skrócona nazwa:"
+msgstr "Nazwa skrócona:"
 
 #: builtin/mainmenu/store.lua
 msgid "Successfully installed:"
-msgstr "Pomyślnie zainstalowano:"
+msgstr "Zainstalowano pomyślnie:"
 
 #: builtin/mainmenu/store.lua
 msgid "Unsorted"
@@ -377,7 +377,7 @@ msgstr "Byli współautorzy"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr "Poprzedni Główni Twórcy"
+msgstr "Poprzedni Główni Deweloperzy"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Installed Mods:"
@@ -445,7 +445,7 @@ msgstr "PvP włączone"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Bind Address"
-msgstr "Przypisz Adres"
+msgstr "Adres"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Configure"
@@ -471,7 +471,7 @@ msgstr "Nowy"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "No world created or selected!"
-msgstr "Nie stworzono lub nie wybrano świata!"
+msgstr "Nie wybrano bądź nie utworzono świata!"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Port"
@@ -655,7 +655,7 @@ msgstr "Tak"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Config mods"
-msgstr "Skonfiguruj mody"
+msgstr "Ustawienia modów"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Main"
@@ -687,7 +687,7 @@ msgstr "Paczki tekstur"
 
 #: src/client.cpp
 msgid "Connection timed out."
-msgstr "Przekroczono limit czasu połączenia."
+msgstr "Upłynął czas połączenia."
 
 #: src/client.cpp
 msgid "Done!"
@@ -707,7 +707,7 @@ msgstr "Ładowanie tekstur..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr "Kompilowanie shaderów..."
+msgstr "Przebudowywanie shaderów..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
@@ -959,7 +959,7 @@ msgstr "Skradanie"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle Cinematic"
-msgstr "Przełącz tryb Cinematic"
+msgstr "Przełącz na tryb Cinematic"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
@@ -1054,7 +1054,6 @@ msgid "Down"
 msgstr "Dół"
 
 #: src/keycode.cpp
-#, fuzzy
 msgid "End"
 msgstr "End"
 
@@ -1152,59 +1151,59 @@ msgstr "Num Lock"
 
 #: src/keycode.cpp
 msgid "Numpad *"
-msgstr "Numpad *"
+msgstr "Numeryczna *"
 
 #: src/keycode.cpp
 msgid "Numpad +"
-msgstr "Numpad +"
+msgstr "Numeryczna +"
 
 #: src/keycode.cpp
 msgid "Numpad -"
-msgstr "Numpad -"
+msgstr "Numeryczna -"
 
 #: src/keycode.cpp
 msgid "Numpad /"
-msgstr "Numpad /"
+msgstr "Numeryczna /"
 
 #: src/keycode.cpp
 msgid "Numpad 0"
-msgstr "Numpad 0"
+msgstr "Numeryczna 0"
 
 #: src/keycode.cpp
 msgid "Numpad 1"
-msgstr "Numpad 1"
+msgstr "Numeryczna 1"
 
 #: src/keycode.cpp
 msgid "Numpad 2"
-msgstr "Numpad 2"
+msgstr "Numeryczna 2"
 
 #: src/keycode.cpp
 msgid "Numpad 3"
-msgstr "Numpad 3"
+msgstr "Numeryczna 3"
 
 #: src/keycode.cpp
 msgid "Numpad 4"
-msgstr "Numpad 4"
+msgstr "Numeryczna 4"
 
 #: src/keycode.cpp
 msgid "Numpad 5"
-msgstr "Numpad 5"
+msgstr "Numeryczna 5"
 
 #: src/keycode.cpp
 msgid "Numpad 6"
-msgstr "Numpad 6"
+msgstr "Numeryczna 6"
 
 #: src/keycode.cpp
 msgid "Numpad 7"
-msgstr "Numpad 7"
+msgstr "Numeryczna 7"
 
 #: src/keycode.cpp
 msgid "Numpad 8"
-msgstr "Numpad 8"
+msgstr "Numeryczna 8"
 
 #: src/keycode.cpp
 msgid "Numpad 9"
-msgstr "Numpad 9"
+msgstr "Numeryczna 9"
 
 #: src/keycode.cpp
 msgid "OEM Clear"
@@ -1299,7 +1298,6 @@ msgid "X Button 2"
 msgstr "X Button 2"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
 "Used to move a suitable spawn area of low land close to (0, 0).\n"
@@ -1316,7 +1314,6 @@ msgstr ""
 "węzłech."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "0 = parallax occlusion with slope information (faster).\n"
 "1 = relief mapping (slower, more accurate)."
@@ -1333,7 +1330,6 @@ msgid "3D mode"
 msgstr "Modele 3D"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -1354,7 +1350,6 @@ msgstr ""
 "-    pageflip: bazujący na quadbuffer."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "A chosen map seed for a new map, leave empty for random.\n"
 "Will be overridden when creating a new world in the main menu."
@@ -1363,35 +1358,29 @@ msgstr ""
 "Będzie nadpisane kiedy tworzy się nowy świat w głównym menu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "A message to be displayed to all clients when the server crashes."
 msgstr ""
-"Wiadomość wyświetlana wszystkim klientom kiedy serwer zerwie połączenie"
+"Wiadomość wyświetlana wszystkim klientom kiedy serwer zerwie połączenie."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "A message to be displayed to all clients when the server shuts down."
 msgstr ""
 "Wiadomość, która będzie wyświetlona wszystkim klientom kiedy serwer zostanie "
 "wyłączony."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Absolute limit of emerge queues"
 msgstr "Bezwzględny limit kolejki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Acceleration in air"
 msgstr "Przyspieszenie w powietrzu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Management interval"
 msgstr "Interwał zarządzania aktywnym blokiem"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifier interval"
 msgstr "Interwał modyfikatora aktywnego bloku"
 
@@ -1401,12 +1390,10 @@ msgid "Active Block Modifiers"
 msgstr "Interwał modyfikatora aktywnego bloku"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active block range"
 msgstr "Zasięg aktywnego bloku"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active object send range"
 msgstr "Zasięg wysyłania aktywnego obiektu"
 
@@ -1417,26 +1404,24 @@ msgid ""
 "Leave this blank to start a local server.\n"
 "Note that the address field in the main menu overrides this setting."
 msgstr ""
-"Adres do połączenia.\n"
+"Adres połączenia.\n"
 "Pozostaw pusty aby utworzyć lokalny serwer.\n"
 "Zauważ że pole adresu w głównym menu nadpisuje te ustawienie."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
 "Ustaw konfiguracje DPI dla twojego ekranu (nie X11/Tylko Android) np. dla "
-"ekranów 4k"
+"ekranów 4k."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
 "This setting is for the client only and is ignored by the server."
 msgstr ""
-"Ustaw enkodowanie gamma dla tablic światła. Niższe wartości są jaśniejsze.\n"
+"Ustaw enkodowanie gamma dla tablic świateł. Niższe wartości są jaśniejsze.\n"
 "Te ustawienie jest tylko dla klientów i jest ignorowane przez serwer."
 
 #: src/settings_translation_file.cpp
@@ -1444,12 +1429,10 @@ msgid "Advanced"
 msgstr "Zaawansowane"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Altitude Chill"
 msgstr "Wysokość mrozu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Always fly and fast"
 msgstr "Zawsze lataj oraz poruszaj się szybko"
 
@@ -1458,7 +1441,6 @@ msgid "Ambient occlusion gamma"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Amplifies the valleys"
 msgstr "Wzmacnia doliny"
 
@@ -1467,33 +1449,28 @@ msgid "Anisotropic filtering"
 msgstr "Filtrowanie anizotropowe"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Announce server"
 msgstr "Rozgłoś serwer"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Announce to this serverlist.\n"
 "If you want to announce your ipv6 address, use  serverlist_url = v6.servers."
 "minetest.net."
 msgstr ""
 "Zgłoś do tej listy serwerów.\n"
-"Jeśli chcesz zgłosić twój adres ipv6, użyj serverlist_url = v6.servers."
-"minetest.net"
+"Jeśli chcesz zgłosić twój adres ipv6, użyj serverlist_url = "
+"v6.servers.minetest.net."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
 msgstr "Przybliżona (X,Y,Z) skala fraktali w węzłach."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ask to reconnect after crash"
 msgstr "Poproś o ponowne połączenie po awarii"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Automaticaly report to the serverlist."
 msgstr "Automatycznie zgłoś do listy serwerów."
 
@@ -1506,17 +1483,14 @@ msgid "Backward key"
 msgstr "Wstecz"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base terrain height"
 msgstr "Bazowa wysokość terenu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic"
 msgstr "Podstawowy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic Privileges"
 msgstr "Podstawowe uprawnienia"
 
@@ -1525,14 +1499,13 @@ msgid "Bilinear filtering"
 msgstr "Filtrowanie dwuliniowe"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bind address"
-msgstr "Sprawdzanie adresu..."
+msgstr "Sprawdzanie adresu"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr "Bity na pixel (aka głębia koloru) w trybie pełnoekranowym."
+msgstr "Bity na pixel (głębia koloru) w trybie pełnoekranowym."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1541,44 +1514,37 @@ msgstr "Gra wieloosobowa"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "Wbudowany"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
 msgstr "Mapowanie wypukłości"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Camera smoothing"
 msgstr "Wygładzanie kamery"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Camera smoothing in cinematic mode"
-msgstr "Wygładzanie kamery w trybie kinowym"
+msgstr "Wygładzanie kamery w trybie cinematic"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Camera update toggle key"
 msgstr "Klawisz przełączania kamery"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cave noise #1"
 msgstr "Szum jaskini #1"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cave noise #2"
 msgstr "Szum jaskini #2"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cave width"
 msgstr "Szerokość jaskini"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Caves and tunnels form at the intersection of the two noises"
 msgstr "Jaskinie i tunele tworzą się na przecięciu dwóch szumów"
 
@@ -1591,12 +1557,10 @@ msgid "Chat toggle key"
 msgstr "Klawisz przełączania czatu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
 msgstr "Komenda"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Choice of 18 fractals from 9 formulas.\n"
 "1 = 4D \"Roundy\" mandelbrot set.\n"
@@ -1639,42 +1603,34 @@ msgstr ""
 "18 = 4D \"Mandelbulb\" zbiór Julii."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chunk size"
 msgstr "Szerokość fragmentu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cinematic mode"
-msgstr "Tryb kreatywny"
+msgstr "Tryb Cinematic"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cinematic mode key"
-msgstr "Tryb kreatywny"
+msgstr "Klawisz trybu Cinematic"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clean transparent textures"
 msgstr "Czyste przeźroczyste tekstury"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client and Server"
 msgstr "Klient i Serwer"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Climbing speed"
 msgstr "Szybkość wspinania"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cloud height"
 msgstr "Wysokość chmur"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cloud radius"
 msgstr "Zasięg chmur"
 
@@ -1683,7 +1639,6 @@ msgid "Clouds"
 msgstr "Chmury 3D"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clouds are a client side effect."
 msgstr "Chmury są efektem po stronie klienta."
 
@@ -1692,12 +1647,10 @@ msgid "Clouds in menu"
 msgstr "Chmury w menu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Colored fog"
 msgstr "Kolorowa mgła"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
@@ -1706,13 +1659,12 @@ msgstr ""
 "API HTTP, które pozwala im wysyłać i pobierać dane do/z internetu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 "Lista oddzielona przecinkiem zaufanych modów które mają dostęp\n"
-"do niebezpiecznych funkcji nawet gdy zabezpieczenie modów jest włączone"
+"do niebezpiecznych funkcji nawet gdy zabezpieczenie modów jest włączone."
 
 #: src/settings_translation_file.cpp
 msgid "Command key"
@@ -1727,9 +1679,8 @@ msgid "Connect to external media server"
 msgstr "Łączenie z zewnętrznym serwerem mediów"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Connects glass if supported by node."
-msgstr "Połącz szkło jeśli wspierane przez blok"
+msgstr "Połącz szkło jeśli wspierane przez blok."
 
 #: src/settings_translation_file.cpp
 msgid "Console alpha"
@@ -1744,7 +1695,6 @@ msgid "Console key"
 msgstr "Klawisz konsoli"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Continuous forward"
 msgstr "Ciągle na przód"
 
@@ -1758,7 +1708,6 @@ msgid "Controls"
 msgstr "Control"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Controls length of day/night cycle.\n"
 "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
@@ -1769,36 +1718,30 @@ msgstr ""
 "zostaje niezmienione."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Controls size of deserts and beaches in Mapgen v6.\n"
 "When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
 msgstr ""
 "Kontrola szerokości pustyni i plaż w generatorze map v6.\n"
-"Kiedy śnieżne biomy są włączone to jest zostanie zignorowane."
+"Kiedy śnieżne biomy są włączone to 'mgv6_freq_desert'  zostanie zignorowane."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Controls steepness/depth of lake depressions."
 msgstr "Kontroluje stromość/głębokość depresji jeziora."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Controls steepness/height of hills."
 msgstr "Kontroluje stromość/wysokość gór."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 msgstr "Kontroluje szerokość tuneli, mniejsze wartości tworzą szersze tunele."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Crash message"
 msgstr "Wiadomość awarii"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Creates unpredictable lava features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
@@ -1807,7 +1750,6 @@ msgstr ""
 "Może zwiększyć trudność kopania. Zero wyłącza tę opcję. (0-10)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Creates unpredictable water features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
@@ -1816,50 +1758,42 @@ msgstr ""
 "Może zwiększyć trudność kopania. Zero wyłącza tę opcję. (0-10)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Crosshair alpha"
-msgstr "Przeźroczystość celownika"
+msgstr "Kanał alfa celownika"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Crosshair alpha (opaqueness, between 0 and 255)."
 msgstr "Kanał alfa celownika (pomiędzy 0 a 255)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Crosshair color"
 msgstr "Kolor celownika"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Crosshair color (R,G,B)."
 msgstr "Kolor celownika (R,G,B)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Crouch speed"
 msgstr "Szybkość podczas kucania"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
-msgstr ""
+msgstr "DPI"
 
 #: src/settings_translation_file.cpp
 msgid "Damage"
 msgstr "Włącz obrażenia"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Debug info toggle key"
 msgstr "Klawisz przełączania informacji debugowania"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Debug log level"
 msgstr "Poziom logowania debugowania"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Dedicated server step"
 msgstr "Krok serwera dedykowanego"
 
@@ -1872,7 +1806,6 @@ msgid "Default game"
 msgstr "Domyślna gra"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Default game when creating a new world.\n"
 "This will be overridden when creating a world from the main menu."
@@ -1885,16 +1818,14 @@ msgid "Default password"
 msgstr "Domyślne hasło"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default privileges"
 msgstr "Domyślne uprawnienia"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Domyślny format raportu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
 "Only has an effect if compiled with cURL."
@@ -1903,7 +1834,6 @@ msgstr ""
 "Ma znaczenie tylko gdy skompilowane z cURL."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Defines sampling step of texture.\n"
 "A higher value results in smoother normal maps."
@@ -1912,7 +1842,6 @@ msgstr ""
 "Wyższa wartość reprezentuje łagodniejszą mapę normalnych."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 "Definiuje maksymalną odległość przesyłania graczy w blokach (0 = "
@@ -1923,32 +1852,26 @@ msgid "Delay in sending blocks after building"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "Opóźnienie wyświetlania dymkmów, w milisekundach."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Deprecated Lua API handling"
 msgstr "Wsparcie przestarzałego API Lua"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Depth below which you'll find large caves."
-msgstr "Głębokość poniżej znajdziesz duże jaskinie."
+msgstr "Głębokość poniżej której znajdziesz duże jaskinie."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Depth below which you'll find massive caves."
-msgstr "Głębokość poniżej znajdziesz masywne jaskinie."
+msgstr "Głębokość poniżej której znajdziesz masywne jaskinie."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Descending speed"
 msgstr "Szybkość opadania"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
@@ -1957,12 +1880,10 @@ msgstr ""
 "serwerów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Desynchronize block animation"
 msgstr "Odsynchronizuj animację bloków"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Determines terrain shape.\n"
 "The 3 numbers in brackets control the scale of the\n"
@@ -1977,12 +1898,10 @@ msgid "Disable anticheat"
 msgstr "Wyłącz anticheat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Disable escape sequences"
 msgstr "Wyłącza sekwencję ucieczki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Disable escape sequences, e.g. chat coloring.\n"
 "Use this if you want to run a server with pre-0.4.14 clients and you want to "
@@ -1995,12 +1914,10 @@ msgstr ""
 "sekwencję ucieczki generowaną przez modyfikacje."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Disallow empty passwords"
 msgstr "Nie zezwalaj na puste hasła"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Domain name of server, to be displayed in the serverlist."
 msgstr "Serwer DNS, wyświetlany na liście serwerów."
 
@@ -2013,17 +1930,14 @@ msgid "Double-tapping the jump key toggles fly mode."
 msgstr "Wciśnij dwukrotnie \"Skok\" by włączyć tryb latania."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Drop item key"
 msgstr "Klawisz wyrzucenia przedmiotu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Dump the mapgen debug infos."
 msgstr "Zrzuć informacje debugowania generatora mapy."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable Joysticks"
 msgstr "Włącz joystick"
 
@@ -2032,22 +1946,18 @@ msgid "Enable VBO"
 msgstr "Włącz VBO"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable mod security"
 msgstr "Włącz tryb mod security"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable players getting damage and dying."
 msgstr "Włącz obrażenia i umieranie graczy."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable random user input (only used for testing)."
 msgstr "Włącz losowe wejście użytkownika (tylko dla testowania)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enable smooth lighting with simple ambient occlusion.\n"
 "Disable for speed or for different looks."
@@ -2056,7 +1966,6 @@ msgstr ""
 "Wyłącz dla szybkości lub wyglądu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enable to disallow old clients from connecting.\n"
 "Older clients are compatible in the sense that they will not crash when "
@@ -2071,7 +1980,6 @@ msgstr ""
 "spodziewanych funkcjonalności."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
 "Remote servers offer a significantly faster way to download media (e.g. "
@@ -2079,12 +1987,11 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 "Włącza używanie zdalnego serwera mediów (jeżeli dostarczany przez serwer).\n"
-"Zdalny serwer oferuje znacząco szybszy sposób pobierania mediów (np. "
-"tekstur)\n"
+"Zdalny serwer oferuje znacząco szybszy sposób pobierania mediów (np. tekstur)"
+"\n"
 "jeżeli następuje połączenie z serwerem."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enable/disable running an IPv6 server.  An IPv6 server may be restricted\n"
 "to IPv6 clients, depending on system configuration.\n"
@@ -2095,12 +2002,10 @@ msgstr ""
 "Ignorowane jeżeli bind_address jest ustawiony."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enables animation of inventory items."
 msgstr "Włącz animację inwentarza przedmiotów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
 "texture pack\n"
@@ -2113,7 +2018,6 @@ msgstr ""
 "Wymaga włączonych shaderów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Włącza cachowanie facedir obracanych meshów."
 
@@ -2134,7 +2038,6 @@ msgstr ""
 "Wymaga włączenia mapowania wypukłości."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enables parallax occlusion mapping.\n"
 "Requires shaders to be enabled."
@@ -2151,7 +2054,6 @@ msgid "Entity methods"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Experimental option, might cause visible spaces between blocks\n"
 "when set to higher number than 0."
@@ -2160,7 +2062,6 @@ msgstr ""
 "pomiędzy blokami kiedy ustawiona powyżej 0."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "FPS in pause menu"
 msgstr "FPS podczas pauzy w menu"
 
@@ -2173,47 +2074,38 @@ msgid "Fall bobbing"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fallback font"
 msgstr "Zastępcza czcionka"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fallback font shadow"
 msgstr "Zastępczy cień czcionki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fallback font shadow alpha"
 msgstr "Zastępcza przeźroczystość cienia czcionki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fallback font size"
 msgstr "Zastępczy rozmiar czcionki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fast key"
 msgstr "Klawisz szybkiego poruszania"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fast mode acceleration"
-msgstr "Tryb szybkiego przyspieszania"
+msgstr "Przyspieszenie trybu szybkiego"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fast mode speed"
-msgstr "Tryb szybkiego poruszania"
+msgstr "Prędkość trybu szybkiego"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fast movement"
 msgstr "Szybkie poruszanie"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Fast movement (via use key).\n"
 "This requires the \"fast\" privilege on the server."
@@ -2222,31 +2114,26 @@ msgstr ""
 "Wymaga przywileju \"fast\" na serwerze."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view"
 msgstr "Pole widzenia"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view for zoom"
-msgstr "Pole widzenia"
+msgstr "Pole widzenia dla zoomu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view in degrees."
 msgstr "Pole widzenia w stopniach."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"Szybkie poruszanie się (przez klawisz użycia).\n"
-"Wymaga przywileju \"fast\" na serwerze."
+"Pole widzenia podczas zoomowania w stopniach.\n"
+"wymaga przywileju \"zoom\" na serwerze."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
 "the Multiplayer Tab."
@@ -2263,7 +2150,6 @@ msgid "Filmic tone mapping"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Filtered textures can blend RGB values with fully-transparent neighbors,\n"
 "which PNG optimizers usually discard, sometimes resulting in a dark or\n"
@@ -2282,76 +2168,62 @@ msgid "Filtering"
 msgstr "Filtrowanie anizotropowe"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fixed map seed"
 msgstr "Stałe ziarno mapy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fly key"
 msgstr "Klawisz latania"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Flying"
 msgstr "Latanie"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fog"
 msgstr "Mgła"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fog toggle key"
 msgstr "Klawisz przełączania mgły"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Font path"
 msgstr "Ścieżka czcionki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Font shadow"
 msgstr "Cień czcionki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Font shadow alpha"
 msgstr "Przeźroczystość cienia czcionki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Font shadow alpha (opaqueness, between 0 and 255)."
-msgstr "Kanał alfa cienia czcionki (nieprzeźroczystość, od 0 do 255)"
+msgstr "Kanał alfa cienia czcionki (nieprzeźroczystość, od 0 do 255)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Font shadow offset, if 0 then shadow will not be drawn."
 msgstr "Offset cienia czcionki, jeżeli 0 to cień nie będzie rysowany."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Format of screenshots."
-msgstr "Format zrzutu ekranu"
+msgstr "Format zrzutu ekranu."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
 msgstr "Do przodu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Freetype fonts"
 msgstr "Czcionki Freetype"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "From how far blocks are generated for clients, stated in mapblocks (16 "
 "nodes)."
@@ -2359,12 +2231,11 @@ msgstr ""
 "Od jak daleka bloki są generowane dla klienta, w blokach mapy (16 węzłów)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
-"Z jakiej odległości bloki są przesyłane do klientów, zapisane w blokach "
-"map(16 jednostek)"
+"Z jakiej odległości bloki są przesyłane do klientów, zapisane w blokach map ("
+"16 węzłów)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2372,47 +2243,38 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Full screen"
 msgstr "Pełny ekran"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Full screen BPP"
 msgstr "Głębia koloru w trybie pełnoekranowym"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fullscreen mode."
 msgstr "Tryb pełnoekranowy."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "GUI scaling"
 msgstr "Skalowanie GUI"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "GUI scaling filter"
 msgstr "Filtr skalowania GUI"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "GUI scaling filter txr2img"
 msgstr "Filtr skalowania GUI txr2img"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Gamma"
 msgstr "Gamma"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "General"
 msgstr "Ogólne"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Generate normalmaps"
 msgstr "Generuj mapy normalnych"
 
@@ -2421,7 +2283,6 @@ msgid "Global callbacks"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -2439,12 +2300,10 @@ msgstr ""
 "Flagi rozpoczynające się od \"no\" są stosowane aby jawnie ją wyłączyć."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Graphics"
 msgstr "Grafika"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Gravity"
 msgstr "Grawitacja"
 
@@ -2453,12 +2312,10 @@ msgid "HTTP Mods"
 msgstr "Mody"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HUD toggle key"
 msgstr "Klawisz przełączania HUD"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Handling for deprecated lua api calls:\n"
 "-    legacy: (try to) mimic old behaviour (default for release).\n"
@@ -2467,8 +2324,8 @@ msgid ""
 msgstr ""
 "Obsługa przestarzałych wywołań lua api:\n"
 "- legacy: (próbuje) naśladuje stare zachowanie (domyślne dla wydań).\n"
-"- log: naśladuje i loguje przestarzałe wywołania (domyślne dla wersji "
-"debug).\n"
+"- log: naśladuje i loguje przestarzałe wywołania (domyślne dla wersji debug)."
+"\n"
 "- error: przerywa kiedy zostanie użyte przestarzałe api (sugerowane dla "
 "twórców modów)."
 
@@ -2482,32 +2339,26 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height component of the initial window size."
 msgstr "Wysokość początkowego rozmiaru okna."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height on which clouds are appearing."
 msgstr "Wysokość na której pojawiają się chmury."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "High-precision FPU"
 msgstr "FPU Wysokiej precyzji"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Homepage of server, to be displayed in the serverlist."
 msgstr "Główna strona serwera, wyświetlana na liście serwerów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "How deep to make rivers"
 msgstr "Jak głębokie robić rzeki"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How large area of blocks are subject to the active block stuff, stated in "
 "mapblocks (16 nodes).\n"
@@ -2515,10 +2366,9 @@ msgid ""
 msgstr ""
 "Jak duży obszar bloków jest przedmiotem aktywnego bloku, zapisane w blokach "
 "map(16 jednostek).\n"
-"Na aktywnych blokach obiekty są wczytywane i ABMs działa."
+"Na aktywnych blokach obiekty są wczytywane i ABM działa."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
 "Higher value is smoother, but will use more RAM."
@@ -2527,7 +2377,6 @@ msgstr ""
 "Wyższa wartość jest łagodniejsza ale używa więcej pamięci RAM."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "How wide to make rivers"
 msgstr "Jak szerokie są rzeki"
 
@@ -2536,17 +2385,14 @@ msgid "IPv6"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "IPv6 server"
 msgstr "Serwer IPv6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "IPv6 support."
 msgstr "Wsparcie IPv6."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If FPS would go higher than this, limit it by sleeping\n"
 "to not waste CPU power for no benefit."
@@ -2555,27 +2401,24 @@ msgstr ""
 "nie marnuj mocy CPU bez znaczących korzyści."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If disabled \"use\" key is used to fly fast if both fly and fast mode are "
 "enabled."
 msgstr ""
-"Jeśli wyłączone to klawisz \"używania\" jest użyty aby latać szybko podczas "
-"latania i przy włączonym trybie szybkiego poruszania."
+"Jeśli wyłączone to klawisz \"używania\" jest wykorzystany aby latać szybko "
+"oraz przy włączonym trybie szybkiego poruszania."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled together with fly mode, player is able to fly through solid "
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
-"Jeżeli włączone razem z trybem latania, gracz może latać przez solidne "
-"bloki.\n"
+"Jeżeli włączone razem z trybem latania, gracz może latać przez solidne bloki."
+"\n"
 "Wymaga przywileju \"noclip\" na serwerze."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
 "and descending."
@@ -2584,7 +2427,6 @@ msgstr ""
 "użyty do schodzenia w dół i opadania."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
@@ -2593,12 +2435,10 @@ msgstr ""
 "Ta opcja jest czytana tylko podczas startu serwera."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "If enabled, disable cheat prevention in multiplayer."
 msgstr "Jeśli włączone, wyłącza ograniczenie oszustw w trybie multiplayer."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, invalid world data won't cause the server to shut down.\n"
 "Only enable this if you know what you are doing."
@@ -2608,12 +2448,10 @@ msgstr ""
 "Włącz tylko jeżeli wiesz co robisz."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "If enabled, new players cannot join with an empty password."
 msgstr "Jeśli włączone, nowi gracze nie mogą dołączyć do gry z pustym hasłem."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, you can place blocks at the position (feet + eye level) where "
 "you stand.\n"
@@ -2623,12 +2461,10 @@ msgstr ""
 "Pomocne gdy pracujesz na małych powierzchniach."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "If this is set, players will always (re)spawn at the given position."
 msgstr "Jeśli ustawione, gracze zawsze będą się pojawiać w zadanej pozycji."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ignore world errors"
 msgstr "Ignoruj błędy świata"
 
@@ -2637,9 +2473,8 @@ msgid "In-Game"
 msgstr "Gra"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
-msgstr "Kanał alfa konsoli w grze (od 0 do 255)"
+msgstr "Kanał alfa konsoli w grze (od 0 do 255)."
 
 #: src/settings_translation_file.cpp
 #, fuzzy

From 3aabb6587d588008e3efc431f0400632442dee6b Mon Sep 17 00:00:00 2001
From: Onyx Steinheim <thevoxelmanonyx@gmail.com>
Date: Mon, 17 Oct 2016 08:41:00 +0000
Subject: [PATCH 378/418] Translated using Weblate (French)

Currently translated at 97.7% (897 of 918 strings)
---
 po/fr/minetest.po | 279 ++++++++++++++++++++++++++--------------------
 1 file changed, 157 insertions(+), 122 deletions(-)

diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index bb4f02255..d54348d47 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-07-13 16:41+0000\n"
-"Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/minetest/minetest/"
-"fr/>\n"
+"PO-Revision-Date: 2016-10-17 08:40+0000\n"
+"Last-Translator: Onyx Steinheim <thevoxelmanonyx@gmail.com>\n"
+"Language-Team: French "
+"<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.8-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -393,7 +393,7 @@ msgstr "Informations du mod :"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "No mod description available"
-msgstr "Pas de description disponible"
+msgstr "Pas de description du mod disponible"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Rename"
@@ -401,7 +401,7 @@ msgstr "Renommer"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Select Mod File:"
-msgstr "Sélectionner un fichier de mod :"
+msgstr "Sélectionner le fichier du mod :"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected mod"
@@ -409,11 +409,11 @@ msgstr "Désinstaller le mod"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected modpack"
-msgstr "Désinstaller le pack de mods"
+msgstr "Désinstaller le pack de mods sélectionné"
 
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port"
-msgstr "Adresse / Port"
+msgstr "Adresse / Port :"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -433,15 +433,15 @@ msgstr "Dégâts activés"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr "Supprimer favori"
+msgstr "Supprimer favori :"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
-msgstr "Favoris :"
+msgstr "Favori"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Name / Password"
-msgstr "Nom / Mot de passe :"
+msgstr "Nom / Mot de passe"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -743,7 +743,8 @@ msgstr "Le chemin du monde spécifié n'existe pas : "
 
 #: src/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr "yes"
+msgstr ""
+"needs_fallback_font (besoin ou pas des caractères spéciaux dans une police)"
 
 #: src/game.cpp
 msgid ""
@@ -1304,12 +1305,12 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"(X,Y,Z) décalage de fractale à partir du centre du monde en unités "
-"\"d'échelle\".\n"
-"Utilisé pour déplacer une zone de frai convenable dans les basses terres à "
-"proximité de (0, 0).\n"
-"La valeur par défaut est adaptée pour les réglages de Mandelbrot, elle doit "
-"être modifiée pour les réglages de julia.\n"
+"(X,Y,Z) décalage de fractale à partir du centre du monde en unités \"d'"
+"échelle\".\n"
+"Utilisé pour déplacer une zone de frai convenable à proximité des basses "
+"terres (0, 0).\n"
+"La valeur par défaut est adaptée pour les ensembles de Mandelbrot, elle doit "
+"être modifiée pour les ensembles de julia.\n"
 "Portée environ -2 à 2. A multiplier par \"l'échelle\" pour le décalage dans "
 "les nœuds."
 
@@ -1387,7 +1388,7 @@ msgstr "Intervalle du modificateur de bloc actif"
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Active Block Modifiers"
-msgstr "Intervalle du modificateur de bloc actif"
+msgstr "Modificateurs actifs de bloc"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1405,13 +1406,16 @@ msgid ""
 msgstr ""
 "Adresse où se connecter.\n"
 "Laisser vide pour démarrer un serveur local.\n"
-"Le champ de l'adresse dans le menu peut annuler cette option."
+"Notez que le champ de l'adresse dans le menu principal passe outre ce "
+"réglage."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
-msgstr "Ajuster le DPI de votre écran (non-X11 / Android seulement)."
+msgstr ""
+"Ajuster la résolution de votre écran (non-X11 / Android seulement) ex. pour "
+"les écrans 4k."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1473,8 +1477,9 @@ msgstr ""
 "Déclarer automatiquement votre serveur à la liste des serveurs publics."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Autorun key"
-msgstr ""
+msgstr "Touche d'exécution automatique"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -1510,7 +1515,7 @@ msgstr "Placement de bloc à la position du joueur"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "Intégré"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
@@ -1553,9 +1558,8 @@ msgid "Chat toggle key"
 msgstr "Afficher le chat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Commande"
+msgstr "Commandes de chat"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1648,12 +1652,11 @@ msgid "Colored fog"
 msgstr "Brume colorée"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
-"Liste séparée par des virgules des mods de confiance qui sont autorisés à "
+"Liste des mods de confiance séparés par des virgules qui sont autorisés à "
 "accéder\n"
 "aux API HTTP, leur permettant d'envoyer et de télécharger des données vers/"
 "depuis Internet."
@@ -1827,7 +1830,7 @@ msgstr "Privilèges par défaut"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Format de rapport par défaut"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1853,7 +1856,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Retard dans les blocs envoyés après la construction"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -1910,10 +1913,10 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
-"Désactive les séquences d'échappement, ex. tchat en couleurs.\n"
+"Désactive les séquences d'échappement. ex : chat coloré.\n"
 "Utilisez cette option si vous voulez exécuter un serveur avec des clients "
-"antérieurs à la 0.4.14 et que vous souhaitez désactiver\n"
-"les séquences d'échappement générés par les mods."
+"antérieurs à la 0. 4. 14 et que vous souhaitez désactiver\n"
+"les séquences d'échappement générées par les mods."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
@@ -2051,13 +2054,13 @@ msgstr ""
 "Nécessite les shaders pour être activé."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine profiling data print interval"
-msgstr "Délais d'intervale du profilage"
+msgstr "Intervalle d'impression des données du moteur de profil"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Entity methods"
-msgstr ""
+msgstr "Systèmes d'entité"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2124,22 +2127,20 @@ msgid "Field of view"
 msgstr "Champ de vision"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view for zoom"
-msgstr "Champ de vision"
+msgstr "Champ de vision du zoom"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Champ de vision en degrés."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"Mouvement rapide (via la touche utiliser).\n"
-"Nécessite le privilège \"fast\" sur un serveur."
+"Champ de vision en degrés pendant le zoom.  \n"
+"Ceci nécessite le privilège \"zoom\" sur le serveur."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2292,7 +2293,7 @@ msgstr "Normal mapping"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
-msgstr ""
+msgstr "Rappels globaux"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2338,11 +2339,13 @@ msgid ""
 msgstr ""
 "Traitement des appels d'API Lua obsolètes :\n"
 "- legacy : imite l'ancien comportement (par défaut en mode release).\n"
-"- log : imite et registre les appels obsolètes (par défaut en mode debug).\n"
+"- log : imite et enregistre les appels obsolètes (par défaut en mode debug)."
+"\n"
 "- error : interruption à l'usage d'un appel obsolète (recommandé pour les "
 "développeurs de mods)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Have the profiler instrument itself:\n"
 "* Instrument an empty function.\n"
@@ -2350,6 +2353,12 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
+"Avoir l'instrument de profilage lui-même:\n"
+"* Instrumentalise une fonction vide.\n"
+"Cela estime de manière supérieure, que l'instrumentation est ajoutée (+1 "
+"appel de fonction).\n"
+"* Instrumentalise l’échantillonneur utilisé pour mettre à jour les "
+"statistiques."
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
@@ -2503,34 +2512,47 @@ msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
+"Instrument d'intégration.\n"
+"Ceci est habituellement nécessaire pour les contributeurs d'intégration au "
+"noyau"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument chatcommands on registration."
-msgstr ""
+msgstr "Instrument d'enregistrement des commandes de chat."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
+"Instrument des fonctions de rappel global enregistrées.\n"
+"(tout ce que vous passez dans minetest.register_*() function)"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
 msgstr ""
+"Instrumentalise la fonction d'action des modificateurs actifs de bloc lors "
+"de l'enregistrement."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
 msgstr ""
+"Instrumentalise les fonctions d'action du chargement des modificateurs de "
+"blocs enregistrés."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Instrument the methods of entities on registration."
-msgstr ""
+msgstr "Instrumentalise les systèmes d'entités enregistrés."
 
 #: src/settings_translation_file.cpp
 msgid "Instrumentation"
-msgstr ""
+msgstr "Instrumentalisation"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
@@ -2539,8 +2561,9 @@ msgstr ""
 "en secondes."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Interval of sending time of day to clients."
-msgstr "Intervalle d'envoi de l'heure de jeu aux clients."
+msgstr "Intervalle d'envoi de l'heure aux clients."
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
@@ -2548,7 +2571,7 @@ msgstr "Animation des items d'inventaire"
 
 #: src/settings_translation_file.cpp
 msgid "Inventory key"
-msgstr "Inventaire"
+msgstr "Touche d'inventaire"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
@@ -2567,7 +2590,7 @@ msgid ""
 "Iterations of the recursive function.\n"
 "Controls the amount of fine detail."
 msgstr ""
-"Série Julia : itérations de la fonction récursive.\n"
+"Itérations de la fonction récursive.\n"
 "Contrôle la quantité de détails fins."
 
 #: src/settings_translation_file.cpp
@@ -2607,8 +2630,9 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Série Julia uniquement: valeur Y déterminant la forme 4D.\n"
-"La portée est environ entre -2 et 2."
+"Série Julia uniquement: composante Y de la constante \"hypercomplex\" "
+"determinant la forme Julia.\n"
+"La portée est d'environ -2 à 2."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2616,8 +2640,9 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Série Julia uniquement: valeur Z déterminant la forme 4D.\n"
-"La portée est environ entre -2 et 2."
+"Série Julia uniquement: composante Z de la constante \"hypercomplex\" "
+"déterminant la forme Julia.\n"
+"La portée est d'environ -2 à 2."
 
 #: src/settings_translation_file.cpp
 msgid "Jump key"
@@ -2723,9 +2748,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche pour ouvrir la console de jeu.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Touche pour ouvrir la console de chat.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
+"5e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2733,9 +2758,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche pour ouvrir la fenêtre de chat pour entrer des commandes.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Touche pour ouvrir la fenêtre du chat pour entrer des commandes.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
+"5e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2775,10 +2800,11 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche pour se déplacer lentement.\n"
-"Utilisé pour descendre si aux1_descends est désactivé.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Touche pour se faufiler.\n"
+"Egalement utilisée pour descendre et plonger dans l'eau si aux1_descends est "
+"désactivé.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
+"5e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2807,9 +2833,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche pour passer en mode rapide.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Touche pour basculer en automatique.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
+"5e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2862,16 +2888,15 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche de mise à jour de la caméra. Seulement utilisé pour le "
-"développement.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Touche de mise à jour de la caméra. Seulement utilisé pour le développement."
+"\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
+"5e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2889,9 +2914,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche pour afficher/cacher le HUD.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Touche pour afficher/masquer le HUD ( Affichage tête haute).\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
+"5e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2968,7 +2993,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Left key"
-msgstr "Gauche"
+msgstr "Touche gauche"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3056,7 +3081,7 @@ msgstr "Intervalle de mise-à-jour des liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Load the game profiler"
-msgstr ""
+msgstr "Charger le profil de jeu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3064,30 +3089,32 @@ msgid ""
 "Provides a /profiler command to access the compiled profile.\n"
 "Useful for mod developers and server operators."
 msgstr ""
+"Charge le profil du jeu pour collecter des données de profil du jeu.\n"
+"Fournit une commande /profiler pour accéder au profil compilé.\n"
+"Utile pour les développeurs de mod et les opérateurs de serveurs."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Loading Block Modifiers"
-msgstr "Intervalle du modificateur de bloc actif"
+msgstr "Chargement des modificateurs de blocs"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
-msgstr "Gestionnaire de jeux du menu"
+msgstr "Gestionnaire du menu principal du jeu"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu mod manager"
-msgstr "Gestionnaire de mods du menu"
+msgstr "Gestionnaire du menu principal du mod"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
-msgstr "Script de menu personnalisé"
+msgstr "Script du menu principal"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
-"Rendre la couleur de la brume et du ciel différente selon l'heure du jour et "
-"la direction du regard."
+"Rendre la couleur de la brume et du ciel différents selon l'heure du jour "
+"(aube/crépuscule) et la direction du regard."
 
 #: src/settings_translation_file.cpp
 msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
@@ -3097,7 +3124,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Map directory"
-msgstr "Chemin du monde"
+msgstr "Répertoire de la carte du monde"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3135,7 +3162,7 @@ msgstr ""
 "Des lacs et des collines occasionnels peuvent être ajoutés au monde plat.\n"
 "Les drapeaux qui ne sont spécifiés dans le champ ne sont pas modifiés par "
 "défaut.\n"
-"Les drapeaux commençant par \"non\" sont désactivés."
+"Les drapeaux commençant par \"non\" sont désactivés explicitement."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3147,11 +3174,11 @@ msgid ""
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
 "Attributs spécifiques à Mapgen V6.\n"
-"Quand les terrains neigeux sont activés, les jungles sont activés "
+"Quand les terrains neigeux sont activés, les jungles sont activées "
 "automatiquement, les drapeaux \"jungles\" sont ignorés.\n"
 "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
 "défaut.\n"
-"Les drapeaux commençant par \"non\" sont désactivés."
+"Les drapeaux commençant par \"non\" sont désactivés explicitement."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3165,7 +3192,7 @@ msgstr ""
 "Le drapeau 'des crêtes' contrôle les rivières.\n"
 "Les drapeaux qui ne sont pas spécifiés dans la chaîne de drapeau ne sont pas "
 "modifiés par rapport à la valeur par défaut.\n"
-"Les drapeaux commençant par \"non\" sont désactivés."
+"Les drapeaux commençant par \"non\" sont désactivés explicitement."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -3237,7 +3264,7 @@ msgstr "Niveau du sol du générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill steepness"
-msgstr "Élévation des collines plates"
+msgstr "Élévation des collines dans le générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill threshold"
@@ -3261,7 +3288,7 @@ msgstr "Paramètres de bruit du générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal"
-msgstr "Fractales de la génération de terrain"
+msgstr "Fractales du générateur de terrain"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave width"
@@ -3284,8 +3311,9 @@ msgid "Mapgen fractal fractal"
 msgstr "Drapeaux des fractales de la génération de terrain"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen fractal iterations"
-msgstr "Générateur de terrain Julia: itérations fractales"
+msgstr "Itérations du générateur de terrain Julia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia w"
@@ -3312,16 +3340,21 @@ msgid "Mapgen fractal scale"
 msgstr "Générateur de terrain Julia: échelles fractales"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen fractal seabed noise parameters"
-msgstr "Mapgen : paramètres de bruit du fond de l'eau"
+msgstr ""
+"Paramètres du bruit pour le fond des mers du générateur de terrain julia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal slice w"
 msgstr "Générateur de terrain Julia: couche fractale W"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen heat blend noise parameters"
-msgstr "Mapgen : paramètres de mélange de la température"
+msgstr ""
+"Paramètres du bruit  pour le mélange de la température du générateur de "
+"terrain"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
@@ -3329,39 +3362,47 @@ msgstr "Nom du générateur de carte"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5"
-msgstr "Mapgen V5"
+msgstr "Générateur de terrain V5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave width"
-msgstr "Ampleur des grottes du générateur de terrain: Mapgen V5"
+msgstr "Ampleur des grottes du générateur de terrain V5"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 cave1 noise parameters"
-msgstr "Mapgen V5 : paramètres de bruit cave1"
+msgstr "Paramètres du bruit cave1 du générateur de terrain V5"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 cave2 noise parameters"
-msgstr "Mapgen V5 : paramètre de bruit cave2"
+msgstr "Paramètres du bruit cave2 du générateur de terrain V5"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 factor noise parameters"
-msgstr "Mapgen V5 : paramètres de facteur de dispersion"
+msgstr "Paramètres du facteur de dispersion du générateur de terrain V5"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 filler depth noise parameters"
-msgstr "Mapgen V5 : paramètres de bruit sur la profondeur"
+msgstr ""
+"Paramètres du bruit de la profondeur de remplissage du générateur de terrain "
+"V5"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v5 height noise parameters"
-msgstr "Mapgen V5 : paramètres de bruit de la hauteur"
+msgstr "Paramètres du bruit en altitude du générateur de terrain V5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6"
-msgstr "Mapgen V6"
+msgstr "Générateur de terrain V6"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen v6 apple trees noise parameters"
-msgstr "Mapgen V6 : paramètres de bruit des pommiers"
+msgstr "Paramètres du bruit des pommiers du générateur de terrain V6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach frequency"
@@ -3520,14 +3561,12 @@ msgid "Maximum hotbar width"
 msgstr "Largeur maximale de la barre d'inventaire"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent in total."
-msgstr "Nombre maximal de joueurs qui peuvent être connectés en même temps."
+msgstr "Nombre maximal de blocs pouvant être envoyés simultanément."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent per client."
-msgstr "Nombre maximum de mapblocks qui peuvent être listés pour chargement."
+msgstr "Nombre maximal de blocs pouvant être envoyés simultanément par client."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
@@ -3583,9 +3622,8 @@ msgid "Maximum number of statically stored objects in a block."
 msgstr "Nombre maximum d'objets sauvegardés dans un mapblock (16^3 blocs)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum objects per block"
-msgstr "Nombre maximum d'objets par mapblock"
+msgstr "Nombre maximal d'objets par bloc"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3596,14 +3634,12 @@ msgstr ""
 "Utile quand il y a quelque chose à afficher à gauche ou à droite de la barre."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends per client"
-msgstr "Nombre maximum de mapblocks simultanés envoyés par client"
+msgstr "Nombre maximal de blocs simultanés envoyés par client"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends total"
-msgstr "Nombre maximum total de mapblocks simultanés envoyés"
+msgstr "Nombre maximal de blocs simultanés envoyés"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
@@ -3894,12 +3930,11 @@ msgstr ""
 "système)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds). 0 = "
 "disable. Useful for developers."
 msgstr ""
-"Délais d’intervalle d'affichage du profilage des données. 0 = "
+"Imprime les données de profilage du moteur à intervalles réguliers. 0 = "
 "désactivation.\n"
 "Utile pour les développeurs."
 
@@ -3910,18 +3945,16 @@ msgstr ""
 "accorder"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Profiler"
-msgstr "Profil des vallées"
+msgstr "Profileur"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "Profilage"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Profiling"
-msgstr "Profilage des mods"
+msgstr "Profilage"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3958,9 +3991,8 @@ msgid "Replaces the default main menu with a custom one."
 msgstr "Remplace le menu par défaut par un menu personnalisé."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
-msgstr "Chemin du fichier de police"
+msgstr "Chemin du rapport"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
@@ -4136,13 +4168,12 @@ msgstr ""
 "Nécessite les shaders pour être activé."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
-"Les shaders permettent des effets visuels avancés et peut améliorer les "
+"Les shaders permettent des effets visuels avancés et peuvent améliorer les "
 "performances sur certaines cartes graphiques.\n"
 "Fonctionne seulement avec OpenGL."
 
@@ -4276,6 +4307,8 @@ msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"Le format par défaut dans lequel les profils seront sauvegardés,\n"
+"lorsque la commande `/profiler save [format]` est entrée sans format."
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
@@ -4286,6 +4319,8 @@ msgid ""
 "The file path relative to your worldpath in which profiles will be saved "
 "to.\n"
 msgstr ""
+"Le chemin d'accès au fichier relatif au monde dans lequel les profils seront "
+"sauvegardés.\n"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."

From 68d24fb74be70406b4c38eb2d82189511fec5c2e Mon Sep 17 00:00:00 2001
From: AcidNinja <fabienwang@free.fr>
Date: Wed, 16 Nov 2016 12:19:12 +0000
Subject: [PATCH 379/418] Translated using Weblate (French)

Currently translated at 100.0% (918 of 918 strings)

This is a merger of 4 commits.
---
 po/fr/minetest.po | 111 ++++++++++++++++++----------------------------
 1 file changed, 43 insertions(+), 68 deletions(-)

diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index d54348d47..933c867fe 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-17 08:40+0000\n"
-"Last-Translator: Onyx Steinheim <thevoxelmanonyx@gmail.com>\n"
+"PO-Revision-Date: 2016-11-25 10:44+0000\n"
+"Last-Translator: AcidDragon (AcidNinjaFWHR) <fabienwang@free.fr>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
 "Language: fr\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.9-dev\n"
+"X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "Une erreur est survenue avec un script Lua, il peut s'agir d'un mod :"
+msgstr "Une erreur est survenue dans un script Lua, il peut s'agir d'un mod :"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -103,7 +103,7 @@ msgid ""
 msgstr ""
 "Échec du chargement du mod \"$1\" car il contient des caractères non-"
 "autorisés.\n"
-"Seulement les caractères alphanumériques [a-z0-9_] sont autorisés."
+"Seuls les caractères alphanumériques [a-z0-9_] sont autorisés."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -234,8 +234,7 @@ msgstr "Activé"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Format is 3 numbers separated by commas and inside brackets."
-msgstr ""
-"Le format est 3 nombres séparés par des virgules et entre les parenthèses."
+msgstr "Le format est 3 nombres séparés par des virgules et entre parenthèses."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid ""
@@ -341,7 +340,7 @@ msgstr "Page $1 de $2"
 
 #: builtin/mainmenu/store.lua
 msgid "Rating"
-msgstr "Note"
+msgstr "Évaluation"
 
 #: builtin/mainmenu/store.lua
 msgid "Search"
@@ -361,7 +360,7 @@ msgstr "Non-trié"
 
 #: builtin/mainmenu/store.lua
 msgid "re-Install"
-msgstr "Ré-installer"
+msgstr "Réinstaller"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
@@ -405,7 +404,7 @@ msgstr "Sélectionner le fichier du mod :"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected mod"
-msgstr "Désinstaller le mod"
+msgstr "Désinstaller le mod sélectionné"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected modpack"
@@ -1386,9 +1385,8 @@ msgid "Active Block Modifier interval"
 msgstr "Intervalle du modificateur de bloc actif"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifiers"
-msgstr "Modificateurs actifs de bloc"
+msgstr "Modificateurs de bloc actif"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1477,9 +1475,8 @@ msgstr ""
 "Déclarer automatiquement votre serveur à la liste des serveurs publics."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Autorun key"
-msgstr "Touche d'exécution automatique"
+msgstr "Touche pour courir"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -2058,9 +2055,8 @@ msgid "Engine profiling data print interval"
 msgstr "Intervalle d'impression des données du moteur de profil"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Entity methods"
-msgstr "Systèmes d'entité"
+msgstr "Méthodes d'entité"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2345,7 +2341,6 @@ msgstr ""
 "développeurs de mods)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Have the profiler instrument itself:\n"
 "* Instrument an empty function.\n"
@@ -2353,12 +2348,11 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
-"Avoir l'instrument de profilage lui-même:\n"
-"* Instrumentalise une fonction vide.\n"
-"Cela estime de manière supérieure, que l'instrumentation est ajoutée (+1 "
-"appel de fonction).\n"
-"* Instrumentalise l’échantillonneur utilisé pour mettre à jour les "
-"statistiques."
+"Auto-instrumenter le profileur:\n"
+"* Instrumente une fonction vide.\n"
+"La surcharge sera évaluée. (l'auto-instrumentation ajoute 1 appel de "
+"fonction à chaque fois).\n"
+"* Instrumente l’échantillonneur utilisé pour mettre à jour les statistiques."
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
@@ -2521,34 +2515,30 @@ msgid "Instrument chatcommands on registration."
 msgstr "Instrument d'enregistrement des commandes de chat."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
-"Instrument des fonctions de rappel global enregistrées.\n"
-"(tout ce que vous passez dans minetest.register_*() function)"
+"Instrumenter globalement les fonctions de rappel enregistrées.\n"
+"(tout ce que vous passez dans les fonctions minetest.register_* )"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
 msgstr ""
-"Instrumentalise la fonction d'action des modificateurs actifs de bloc lors "
-"de l'enregistrement."
+"Instrumente la fonction d'action des modificateurs actifs de bloc lors de "
+"l'enregistrement."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
 msgstr ""
-"Instrumentalise les fonctions d'action du chargement des modificateurs de "
-"blocs enregistrés."
+"Instrumenter les fonctions d'action du chargement des modificateurs de blocs "
+"enregistrés."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Instrument the methods of entities on registration."
-msgstr "Instrumentalise les systèmes d'entités enregistrés."
+msgstr "Instrumenter les méthodes d'entités à l'enregistrement."
 
 #: src/settings_translation_file.cpp
 msgid "Instrumentation"
@@ -2561,7 +2551,6 @@ msgstr ""
 "en secondes."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Interval of sending time of day to clients."
 msgstr "Intervalle d'envoi de l'heure aux clients."
 
@@ -2594,9 +2583,8 @@ msgstr ""
 "Contrôle la quantité de détails fins."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick button repetition interval"
-msgstr "Intervalle de répétition du clic droit"
+msgstr "Intervalle de répétition du bouton du Joystick"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
@@ -2827,13 +2815,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling autorun.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche pour basculer en automatique.\n"
+"Touche pour courir automatiquement.\n"
 "Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
 "5e3da1b0edf72eb3"
 
@@ -3311,9 +3298,8 @@ msgid "Mapgen fractal fractal"
 msgstr "Drapeaux des fractales de la génération de terrain"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal iterations"
-msgstr "Itérations du générateur de terrain Julia"
+msgstr "Itérations du générateur de terrain julia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia w"
@@ -3340,21 +3326,17 @@ msgid "Mapgen fractal scale"
 msgstr "Générateur de terrain Julia: échelles fractales"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal seabed noise parameters"
-msgstr ""
-"Paramètres du bruit pour le fond des mers du générateur de terrain julia"
+msgstr "Paramètres de bruit du fond marin pour le générateur de terrain julia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal slice w"
 msgstr "Générateur de terrain Julia: couche fractale W"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen heat blend noise parameters"
 msgstr ""
-"Paramètres du bruit  pour le mélange de la température du générateur de "
-"terrain"
+"Paramètres de bruit du mélange de température pour le générateur de terrain"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
@@ -3369,40 +3351,34 @@ msgid "Mapgen v5 cave width"
 msgstr "Ampleur des grottes du générateur de terrain V5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave1 noise parameters"
-msgstr "Paramètres du bruit cave1 du générateur de terrain V5"
+msgstr "Paramètres du bruit cave1 du générateur de terrain v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave2 noise parameters"
-msgstr "Paramètres du bruit cave2 du générateur de terrain V5"
+msgstr "Paramètres du bruit cave2 du générateur de terrain v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 factor noise parameters"
-msgstr "Paramètres du facteur de dispersion du générateur de terrain V5"
+msgstr "Paramètres du facteur de dispersion du générateur de terrain v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 filler depth noise parameters"
 msgstr ""
 "Paramètres du bruit de la profondeur de remplissage du générateur de terrain "
-"V5"
+"v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 height noise parameters"
-msgstr "Paramètres du bruit en altitude du générateur de terrain V5"
+msgstr "Paramètres du bruit en altitude du générateur de terrain v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6"
 msgstr "Générateur de terrain V6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 apple trees noise parameters"
-msgstr "Paramètres du bruit des pommiers du générateur de terrain V6"
+msgstr "Paramètres du bruit des pommiers du générateur de terrain v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach frequency"
@@ -4164,7 +4140,7 @@ msgid ""
 "Set to true enables waving water.\n"
 "Requires shaders to be enabled."
 msgstr ""
-"Mettre sur \"true\" active les liquides mouvants.\n"
+"Mettre sur \"true\" active les vagues.\n"
 "Nécessite les shaders pour être activé."
 
 #: src/settings_translation_file.cpp
@@ -4604,11 +4580,11 @@ msgstr "Plantes mouvantes"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water"
-msgstr "Liquides mouvants"
+msgstr "Vagues"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water height"
-msgstr "Hauteur des liquides mouvants"
+msgstr "Hauteur des vagues"
 
 #: src/settings_translation_file.cpp
 msgid "Waving water length"
@@ -4629,18 +4605,17 @@ msgstr ""
 "par le matériel (ex.: textures des blocs dans l'inventaire)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
 "to the old scaling method, for video drivers that don't\n"
 "properly support downloading textures back from hardware."
 msgstr ""
-"Quand gui_scaling_filter_txr2img est activé, cela copie les images depuis\n"
-"votre matériel vers Minetest pour mise à l'échelle. Si désactivé, retour à "
-"la méthode par défaut\n"
-"pour les pilotes vidéo qui ne supportent pas le chargement des textures "
-"depuis le matériel."
+"Si gui_scaling_filter_txr2img est activé, c'est Minetest qui s'occupe de\n"
+"la mise à l'échelle des images et non votre matériel. Si désactivé,\n"
+"l'ancienne méthode de mise à l'échelle est utilisée, pour les pilotes "
+"vidéos\n"
+"qui ne supportent pas le chargement des textures depuis le matériel."
 
 #: src/settings_translation_file.cpp
 msgid ""

From f18cebdd0704884444dc241ef58f349f40398579 Mon Sep 17 00:00:00 2001
From: Onyx Steinheim <thevoxelmanonyx@gmail.com>
Date: Sun, 27 Nov 2016 10:39:47 +0000
Subject: [PATCH 380/418] Translated using Weblate (French)

Currently translated at 100.0% (918 of 918 strings)
---
 po/fr/minetest.po | 117 ++++++++++++++++++++++++----------------------
 1 file changed, 61 insertions(+), 56 deletions(-)

diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index 933c867fe..113d50dd8 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-11-25 10:44+0000\n"
-"Last-Translator: AcidDragon (AcidNinjaFWHR) <fabienwang@free.fr>\n"
+"PO-Revision-Date: 2016-11-27 10:39+0000\n"
+"Last-Translator: Onyx Steinheim <thevoxelmanonyx@gmail.com>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
 "Language: fr\n"
@@ -234,7 +234,9 @@ msgstr "Activé"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Format is 3 numbers separated by commas and inside brackets."
-msgstr "Le format est 3 nombres séparés par des virgules et entre parenthèses."
+msgstr ""
+"Le format est composé de 3 nombres séparés par des virgules et entre "
+"parenthèses."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid ""
@@ -626,7 +628,7 @@ msgstr "Textures :"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé."
+msgstr "Pour activer les textures nuancées, le pilote OpenGL doit être utilisé."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
@@ -662,7 +664,7 @@ msgstr "Configurer les mods"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Main"
-msgstr "Menu principal"
+msgstr "Principal"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Start Singleplayer"
@@ -710,7 +712,7 @@ msgstr "Chargement des textures..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr "Reconstruction des shaders..."
+msgstr "Reconstruction des textures nuancées..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
@@ -718,7 +720,7 @@ msgstr "Erreur de connexion (perte de connexion ?)"
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
-msgstr "Le jeu \" n'a pas pu être trouvé"
+msgstr "Impossible de trouver ou charger le jeu"
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
@@ -826,7 +828,7 @@ msgstr ""
 "Menu / Inventaire visible :\n"
 "- double-appui (en dehors) : fermeture\n"
 "- objet(s) dans l'inventaire : déplacement\n"
-"- appui, glissement et appui : placement d'un seul item par slot\n"
+"- appui, glissement et appui : pose d'un seul item par emplacement\n"
 
 #: src/game.cpp
 msgid "Exit to Menu"
@@ -2056,7 +2058,7 @@ msgstr "Intervalle d'impression des données du moteur de profil"
 
 #: src/settings_translation_file.cpp
 msgid "Entity methods"
-msgstr "Méthodes d'entité"
+msgstr "Systèmes d'entité"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2076,7 +2078,7 @@ msgstr "FSAA"
 
 #: src/settings_translation_file.cpp
 msgid "Fall bobbing"
-msgstr "Fréquence du mouvement du bras en tombant"
+msgstr "Fréquence de mouvement du bras en tombant"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font"
@@ -2348,11 +2350,12 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
-"Auto-instrumenter le profileur:\n"
-"* Instrumente une fonction vide.\n"
-"La surcharge sera évaluée. (l'auto-instrumentation ajoute 1 appel de "
+"Auto-instrumentaliser le profileur:\n"
+"* Instrumentalise une fonction vide.\n"
+"La surcharge sera évaluée. (l'auto-instrumentalisation ajoute 1 appel de "
 "fonction à chaque fois).\n"
-"* Instrumente l’échantillonneur utilisé pour mettre à jour les statistiques."
+"* Instrumentalise l’échantillonneur utilisé pour mettre à jour les "
+"statistiques."
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
@@ -2519,26 +2522,26 @@ msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
-"Instrumenter globalement les fonctions de rappel enregistrées.\n"
-"(tout ce que vous passez dans les fonctions minetest.register_* )"
+"Instrument des fonctions de rappel global enregistrées.\n"
+"(tout ce que vous passez dans une fonction minetest.register_*())"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
 msgstr ""
-"Instrumente la fonction d'action des modificateurs actifs de bloc lors de "
-"l'enregistrement."
+"Instrumentalise la fonction d'action des modificateurs actifs de bloc lors "
+"de l'enregistrement."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
 msgstr ""
-"Instrumenter les fonctions d'action du chargement des modificateurs de blocs "
-"enregistrés."
+"Instrumentalise la fonction d'action des modificateurs de blocs chargés lors "
+"de l'enregistrement."
 
 #: src/settings_translation_file.cpp
 msgid "Instrument the methods of entities on registration."
-msgstr "Instrumenter les méthodes d'entités à l'enregistrement."
+msgstr "Instrumentalise les systèmes d'entités lors de l'enregistrement."
 
 #: src/settings_translation_file.cpp
 msgid "Instrumentation"
@@ -2820,7 +2823,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche pour courir automatiquement.\n"
+"Touche d’exécution automatique.\n"
 "Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
 "5e3da1b0edf72eb3"
 
@@ -3295,7 +3298,7 @@ msgstr "Mapgen V5 : paramètres de bruit sur la profondeur"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal fractal"
-msgstr "Drapeaux des fractales de la génération de terrain"
+msgstr "Drapeaux des fractales du générateur de terrain"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal iterations"
@@ -3763,7 +3766,7 @@ msgstr "Mode sans collision"
 
 #: src/settings_translation_file.cpp
 msgid "Node highlighting"
-msgstr "Eclairage des blocs"
+msgstr "Surbrillance des blocs"
 
 #: src/settings_translation_file.cpp
 msgid "NodeTimer interval"
@@ -3772,7 +3775,7 @@ msgstr "Intervalle de temps d'un nœud"
 #: src/settings_translation_file.cpp
 msgid "Noise parameters for biome API temperature, humidity and biome blend."
 msgstr ""
-"Paramètres de mélange pour la température, humidité et mélange de biomes."
+"Paramètres de bruit pour la température, l'humidité et le mélange de biomes."
 
 #: src/settings_translation_file.cpp
 msgid "Noises"
@@ -3822,12 +3825,11 @@ msgstr "Nombre d'itérations sur l'occlusion parallaxe."
 
 #: src/settings_translation_file.cpp
 msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-"Bias général de l'occlusion parallaxe, habituellement échelle divisée par 2."
+msgstr "Bias général de l'occlusion parallaxe, habituellement échelle/2."
 
 #: src/settings_translation_file.cpp
 msgid "Overall scale of parallax occlusion effect."
-msgstr "Echelle générale de l'occlusion parallaxe."
+msgstr "Echelle générale de l'effet de l'occlusion parallaxe."
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion"
@@ -3897,7 +3899,7 @@ msgid ""
 "Note that the port field in the main menu overrides this setting."
 msgstr ""
 "Port où se connecter (UDP).\n"
-"Le champ de port dans le menu va annuler ce paramètre."
+"Notez que le champ de port dans le menu principal passe outre ce réglage."
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
@@ -3938,7 +3940,7 @@ msgid ""
 "Values larger than 26 will start to produce sharp cutoffs at cloud area "
 "corners."
 msgstr ""
-"Rayon de l'aire des nuages où se trouve 64 blocs de nuage.\n"
+"Rayon de l'aire des nuages où se trouve 64 blocs carrés de nuages.\n"
 "Les valeurs plus grandes que 26 entraînent une \"coupure\" nette des nuages "
 "aux coins de l'aire."
 
@@ -3992,7 +3994,7 @@ msgstr "Taille des rivières"
 
 #: src/settings_translation_file.cpp
 msgid "River noise -- rivers occur close to zero"
-msgstr "Bruit des rivières"
+msgstr "Bruit des rivières -- les rivières se forment près de zéro"
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
@@ -4155,7 +4157,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr "Forme de la mini-carte. Activé = ronde, désactivé = carré."
+msgstr "Forme de la mini-carte. Activé = ronde, désactivé = carrée."
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
@@ -4217,14 +4219,15 @@ msgid ""
 msgstr ""
 "Spécifie l'URL à laquelle les clients obtiennent les fichiers média au lieu "
 "d'utiliser le port UDP.\n"
-"$filename doit être accessible depuis $remote_media$filename via cURL "
-"(évidemment, remote_media devrait\n"
+"$filename doit être accessible depuis $remote_media$filename via cURL ("
+"évidemment, remote_media devrait\n"
 "se terminer avec un slash).\n"
-"Les fichiers qui ne sont pas présents seront obtenus avec le moyen usuel."
+"Les fichiers qui ne sont pas présents seront récupérés de la manière "
+"habituelle."
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
-msgstr "Emplacement du spawn"
+msgstr "Emplacement du spawn statique"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of generated normalmaps."
@@ -4344,9 +4347,9 @@ msgid ""
 msgstr ""
 "Le temps (en secondes) où la file des liquides peut s'agrandir au-delà de "
 "sa\n"
-"capacité de traitement jusqu'à ce qu'une tentative est faite pour réduire sa "
-"taille en vidant\n"
-"l'ancienne file d'items. Une valeur de 0 désactive cette fonctionnalité."
+"capacité de traitement jusqu'à ce qu'une tentative soit faite pour réduire "
+"sa taille en vidant\n"
+"l'ancienne file d'articles. Une valeur de 0 désactive cette fonctionnalité."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4377,8 +4380,8 @@ msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
 "Setting it to -1 disables the feature."
 msgstr ""
-"Durée de visibilité des objets jetés.\n"
-"Définir ceci à -1 pour désactiver cette fonctionnalité."
+"Durée en secondes pendant laquelle les objets jetés sont présents.\n"
+"Définir à -1 pour désactiver cette fonctionnalité."
 
 #: src/settings_translation_file.cpp
 msgid "Time send interval"
@@ -4391,7 +4394,7 @@ msgstr "Vitesse du temps"
 #: src/settings_translation_file.cpp
 msgid "Timeout for client to remove unused map data from memory."
 msgstr ""
-"Temps de délais pour le client pour supprimer les données de la carte de sa "
+"Délai pendant lequel le client supprime les données de la carte de sa "
 "mémoire."
 
 #: src/settings_translation_file.cpp
@@ -4401,7 +4404,7 @@ msgid ""
 "This determines how long they are slowed down after placing or removing a "
 "node."
 msgstr ""
-"Pour réduire le lag, le transfert des mapblocks sont ralentis quand un "
+"Pour réduire le lag, les transferts des mapblocks sont ralentis quand un "
 "joueur\n"
 "est en train de construire quelque chose.\n"
 "Cela détermine la durée du ralentissement après placement ou destruction "
@@ -4409,7 +4412,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Toggle camera mode key"
-msgstr "Changer de caméra"
+msgstr "Basculement en mode caméra"
 
 #: src/settings_translation_file.cpp
 msgid "Tooltip delay"
@@ -4448,15 +4451,17 @@ msgstr "Purger les données de serveur inutiles"
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
-msgstr "Activation des nuages 3D au lieu des nuages 2D (plats)."
+msgstr "Activer les nuages 3D au lieu des nuages 2D (plats)."
 
 #: src/settings_translation_file.cpp
 msgid "Use a cloud animation for the main menu background."
-msgstr "Mouvement des nuages dans le menu."
+msgstr "Utiliser une animation de nuages pour l'arrière-plan du menu principal."
 
 #: src/settings_translation_file.cpp
 msgid "Use anisotropic filtering when viewing at textures from an angle."
-msgstr "Utilisation du filtrage anisotrope."
+msgstr ""
+"Utilisation du filtrage anisotrope lors de la visualisation des textures de "
+"biais."
 
 #: src/settings_translation_file.cpp
 msgid "Use bilinear filtering when scaling textures."
@@ -4468,7 +4473,7 @@ msgstr "Utiliser"
 
 #: src/settings_translation_file.cpp
 msgid "Use mip mapping to scale textures. May slightly increase performance."
-msgstr "Utilisation du mip-mapping. Peut impacter les performances."
+msgstr "Utilisation du mip-mapping. Peut augmenter légèrement les performances."
 
 #: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
@@ -4564,7 +4569,7 @@ msgstr "Niveau de l'eau"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
-msgstr "Niveau de la surface de l'eau dans le monde."
+msgstr "Niveau de la surface de l'eau du monde."
 
 #: src/settings_translation_file.cpp
 msgid "Waving Nodes"
@@ -4611,7 +4616,7 @@ msgid ""
 "to the old scaling method, for video drivers that don't\n"
 "properly support downloading textures back from hardware."
 msgstr ""
-"Si gui_scaling_filter_txr2img est activé, c'est Minetest qui s'occupe de\n"
+"Quand gui_scaling_filter_txr2img est activé, c'est Minetest qui s'occupe de\n"
 "la mise à l'échelle des images et non votre matériel. Si désactivé,\n"
 "l'ancienne méthode de mise à l'échelle est utilisée, pour les pilotes "
 "vidéos\n"
@@ -4629,16 +4634,16 @@ msgid ""
 msgstr ""
 "En utilisant le filtrage bilinéaire / trilinéaire / anisotrope, les textures "
 "de basse résolution\n"
-"peuvent être floues en agrandissat automatiquement les textures avec une "
+"peuvent être floues en agrandissant automatiquement les textures avec une "
 "interpolation précise\n"
 "pour préserver les pixels hasardeux.\n"
 "\n"
-"Ceci détermine la taille de la texture minimale pour les textures agrandie. "
+"Ceci détermine la taille de la texture minimale pour les textures agrandies. "
 "Les valeurs plus hautes rendent\n"
 "les textures plus détaillées, mais nécessitent plus de mémoire.\n"
 "Les valeurs en puissance de 2 sont recommandées. Définir une valeur "
 "supérieure à 1 peut ne pas\n"
-"avoir un effet visible sauf le filtrage bilinéaire / trilinéaire / "
+"avoir un effet visible sauf si le filtrage bilinéaire / trilinéaire / "
 "anisotrope est activé."
 
 #: src/settings_translation_file.cpp
@@ -4687,9 +4692,9 @@ msgid ""
 "Whether to ask clients to reconnect after a (Lua) crash.\n"
 "Set this to true if your server is set up to restart automatically."
 msgstr ""
-"Détermine la possibilité des clients de se re-connecter après une "
-"interruption de serveur.\n"
-"Activé-le si votre serveur est paramétré pour redémarrer automatiquement."
+"Détermine la possibilité des clients à se reconnecter après une extinction "
+"du serveur.\n"
+"Activez-le si votre serveur est paramétré pour redémarrer automatiquement."
 
 #: src/settings_translation_file.cpp
 msgid "Whether to fog out the end of the visible area."

From 51210d317dbec82795d778b1cad7b550085fd77f Mon Sep 17 00:00:00 2001
From: Yana Agun Siswanto <yana.developer@gmail.com>
Date: Sat, 22 Oct 2016 07:19:46 +0000
Subject: [PATCH 381/418] Translated using Weblate (Indonesian)

Currently translated at 58.6% (538 of 918 strings)
---
 po/id/minetest.po | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/po/id/minetest.po b/po/id/minetest.po
index 28f264ebc..1ce751c6f 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -7,17 +7,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-06-23 16:06+0000\n"
-"Last-Translator: Muhammad Rifqi Priyo Susanto "
-"<muhammadrifqipriyosusanto@gmail.com>\n"
-"Language-Team: Indonesian <https://hosted.weblate.org/projects/minetest/"
-"minetest/id/>\n"
+"PO-Revision-Date: 2016-10-22 07:19+0000\n"
+"Last-Translator: Yana Agun Siswanto <yana.developer@gmail.com>\n"
+"Language-Team: Indonesian "
+"<https://hosted.weblate.org/projects/minetest/minetest/id/>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.9-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -2243,11 +2242,11 @@ msgstr "Mode layar penuh."
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
-msgstr "Skala antarmuka"
+msgstr "Skala GUI"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter"
-msgstr "Filter skala antarmuka"
+msgstr "Filter skala GUI"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter txr2img"
@@ -4034,9 +4033,8 @@ msgid "Static spawnpoint"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Strength of generated normalmaps."
-msgstr "Gunakan Normalmaps"
+msgstr "Gunakan Normalmaps."
 
 #: src/settings_translation_file.cpp
 msgid "Strength of parallax."

From 47b1a118effc6d0d553cf572fc3b3706a2fa7832 Mon Sep 17 00:00:00 2001
From: Alvin Hikmawan <alvin.hikmawan@gmail.com>
Date: Fri, 2 Dec 2016 07:30:27 +0000
Subject: [PATCH 382/418] Translated using Weblate (Indonesian)

Currently translated at 58.6% (538 of 918 strings)
---
 po/id/minetest.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/id/minetest.po b/po/id/minetest.po
index 1ce751c6f..1ba4e16d6 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-10-22 07:19+0000\n"
-"Last-Translator: Yana Agun Siswanto <yana.developer@gmail.com>\n"
+"PO-Revision-Date: 2016-12-02 07:30+0000\n"
+"Last-Translator: Alvin Hikmawan <alvin.hikmawan@gmail.com>\n"
 "Language-Team: Indonesian "
 "<https://hosted.weblate.org/projects/minetest/minetest/id/>\n"
 "Language: id\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.9-dev\n"
+"X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "Sebuah kesalahan terjadi di sebuah skrip Lua, seperti sebuah mod:"
+msgstr "Sebuah kesalahan terjadi di salah satu skrip Lua, misalnya sebuah mod:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"

From 728909284a2ffa2decb543a9dea53a95e839bdcf Mon Sep 17 00:00:00 2001
From: Muhammad Rifqi Priyo Susanto <muhammadrifqipriyosusanto@gmail.com>
Date: Thu, 8 Dec 2016 15:40:14 +0000
Subject: [PATCH 383/418] Translated using Weblate (Indonesian)

Currently translated at 58.6% (538 of 918 strings)

This is a merger of 2 commits.
---
 po/id/minetest.po | 453 ++++++++++++++++++++++++----------------------
 1 file changed, 233 insertions(+), 220 deletions(-)

diff --git a/po/id/minetest.po b/po/id/minetest.po
index 1ba4e16d6..ef03b5a87 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -7,8 +7,9 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-12-02 07:30+0000\n"
-"Last-Translator: Alvin Hikmawan <alvin.hikmawan@gmail.com>\n"
+"PO-Revision-Date: 2016-12-08 15:51+0000\n"
+"Last-Translator: Muhammad Rifqi Priyo Susanto "
+"<muhammadrifqipriyosusanto@gmail.com>\n"
 "Language-Team: Indonesian "
 "<https://hosted.weblate.org/projects/minetest/minetest/id/>\n"
 "Language: id\n"
@@ -52,7 +53,7 @@ msgstr "Versi protokol tidak cocok. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "Server memberlakukan protokol versi $1. "
+msgstr "Server menjalankan protokol versi $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
@@ -142,7 +143,7 @@ msgstr "Buat"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "Unduh sebuah sub-permainan, seperti minetest_game, dari minetest.net"
+msgstr "Unduh sebuah sub-permainan, misalnya minetest_game, dari minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
@@ -240,7 +241,6 @@ msgstr ""
 "Format adalah 3 angka yang dipisahkan oleh koma dan di dalam tanda kurung."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
@@ -598,7 +598,6 @@ msgid "Opaque Water"
 msgstr "Air Buram"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-#, fuzzy
 msgid "Parallax Occlusion"
 msgstr "Parallax Occlusion"
 
@@ -632,7 +631,7 @@ msgstr "Penteksturan:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr "Untuk mengaktifkan shaders OpenGL driver harus digunakan."
+msgstr "Untuk mengaktifkan shader, driver OpenGL harus digunakan."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
@@ -716,7 +715,7 @@ msgstr "Memuat tekstur..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr "Membangun ulang shaders..."
+msgstr "Membangun ulang shader..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
@@ -1314,6 +1313,11 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"Pergeseran (X,Y,Z) fraktal dari tengah dunia dalam satuan 'scale'.\n"
+"Digunakan untuk memindahkan daerah bangkit dataran rendah mendekati (0, 0).\n"
+"Nilai bawaan cocok untuk mandelbrot sets, butuh diganti untuk julia sets.\n"
+"Berjangkauan sekitar -2 ke 2. Kalikan dengan 'scale' untuk pergeseran dalam "
+"node."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1348,7 +1352,7 @@ msgstr ""
 "-    anaglyph: 3d berwarna cyan/magenta.\n"
 "-    interlaced: garis ganjil/genap berdasarkan polarisasi dukungan layar.\n"
 "-    topbottom: pisahkan layar atas/bawah.\n"
-"-    sidebyside: pisahkan layar berdampingan."
+"-    sidebyside: pisahkan layar kiri/kanan."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1377,19 +1381,16 @@ msgid "Acceleration in air"
 msgstr "Percepatan di udara"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Management interval"
-msgstr "Batas blok aktif"
+msgstr "Jarak Pengelola Blok Aktif"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifier interval"
-msgstr "Batas blok aktif"
+msgstr "Jarak Pengubah Blok Aktif"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifiers"
-msgstr "Batas blok aktif"
+msgstr "Pengubah Blok Aktif"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1405,7 +1406,7 @@ msgid ""
 "Leave this blank to start a local server.\n"
 "Note that the address field in the main menu overrides this setting."
 msgstr ""
-"Alamat untuk menghubungkan.\n"
+"Alamat tujuan.\n"
 "Biarkan kosong untuk memulai sebuah server lokal.\n"
 "Perhatikan bahwa bidang alamat dalam menu utama menimpa pengaturan ini."
 
@@ -1463,12 +1464,12 @@ msgid ""
 "minetest.net."
 msgstr ""
 "Mengumumkan kepada daftar server ini.\n"
-"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = v6."
-"servers.minetest.net."
+"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = "
+"v6.servers.minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
-msgstr "Memperkirakan skala (X,Y,Z) dari fraktal pada node."
+msgstr "Memperkirakan skala (X,Y,Z) fraktal pada node."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
@@ -1516,7 +1517,7 @@ msgstr "Bangun di dalam pemain"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "Terpasang bawaan"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
@@ -1559,9 +1560,8 @@ msgid "Chat toggle key"
 msgstr "Tombol beralih obrolan"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Perintah"
+msgstr "Perintah obrolan"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1654,7 +1654,6 @@ msgid "Colored fog"
 msgstr "Kabut berwarna"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
@@ -1682,7 +1681,7 @@ msgstr "Sambungkan kaca"
 
 #: src/settings_translation_file.cpp
 msgid "Connect to external media server"
-msgstr "Menyambungkan ke server media eksternal"
+msgstr "Sambungkan ke server media eksternal"
 
 #: src/settings_translation_file.cpp
 msgid "Connects glass if supported by node."
@@ -1690,7 +1689,7 @@ msgstr "Sambungkan kaca jika didukung oleh node."
 
 #: src/settings_translation_file.cpp
 msgid "Console alpha"
-msgstr "Alpha konsol"
+msgstr "Keburaman konsol"
 
 #: src/settings_translation_file.cpp
 msgid "Console color"
@@ -1728,15 +1727,15 @@ msgid ""
 "When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
 msgstr ""
 "Mengatur ukuran padang gurun dan pantai dalam Mapgen v6.\n"
-"Jika snowbiomes di aktifkan 'mgv6_freq_desert' akan dihiraukan."
+"Jika snowbiomes di aktifkan 'mgv6_freq_desert' akan diabaikan."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
-msgstr "Mengatur kecuraman/kedalaman dari lekukan danau."
+msgstr "Mengatur kecuraman/kedalaman lekukan danau."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/height of hills."
-msgstr "Mengatur kecuraman/ketinggian dari bukit."
+msgstr "Mengatur kecuraman/ketinggian bukit."
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
@@ -1752,7 +1751,7 @@ msgid ""
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
 "Membuat lava yang tidak dapat diprediksi di dalam gua.\n"
-"Ini dapat menyebabkan menambang menjadi sulit. Nol menonaktifkannya. (0-10)"
+"Ini dapat menyebabkan penambangan menjadi sulit. Nol menonaktifkannya. (0-10)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1760,7 +1759,7 @@ msgid ""
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
 "Membuat air yang tidak dapat diprediksi di dalam gua.\n"
-"Ini dapat menyebabkan menambang menjadi sulit. Nol menonaktifkannya. (0-10)"
+"Ini dapat menyebabkan penambangan menjadi sulit. Nol menonaktifkannya. (0-10)"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
@@ -1776,7 +1775,7 @@ msgstr "Warna crosshair"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color (R,G,B)."
-msgstr "Warna crosshair (merah,hijau,biru atau R,G,B)."
+msgstr "Warna crosshair: (merah,hijau,biru) atau (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Crouch speed"
@@ -1828,7 +1827,7 @@ msgstr "Izin bawaan"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Format laporan bawaan"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1850,11 +1849,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Jeda dalam mengirim blok setelah membangun"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
+msgstr "Jeda menampilkan tooltip, dalam milidetik."
 
 #: src/settings_translation_file.cpp
 msgid "Deprecated Lua API handling"
@@ -1877,12 +1876,12 @@ msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
 msgstr ""
-"Deskripsi dari server yang akan ditampilkan saat pemain bergabung dan pada "
-"daftar server."
+"Deskripsi dari server, ditampilkan saat pemain bergabung dan dalam daftar "
+"server."
 
 #: src/settings_translation_file.cpp
 msgid "Desynchronize block animation"
-msgstr ""
+msgstr "Putuskan sinkronasi animasi blok"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1900,7 +1899,7 @@ msgstr "Nonaktifkan anticurang (anticheat)"
 
 #: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Nonaktifkan karakter kabur"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1909,6 +1908,9 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"Nonaktifkan karakter kabur (escape sequences), misal: pewarnaan obrolan.\n"
+"Gunakan ini jika Anda ingin menjalankan server dengan klien pre-0.4.14 dan\n"
+"Anda ingin menonaktifkan karakter kabur yang dihasilkan oleh mods."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
@@ -1936,7 +1938,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "Aktifkan Joystick"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
@@ -1955,7 +1957,6 @@ msgid "Enable random user input (only used for testing)."
 msgstr "Aktifkan masukan acak dari pengguna (hanya digunakan untuk pengujian)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enable smooth lighting with simple ambient occlusion.\n"
 "Disable for speed or for different looks."
@@ -1971,7 +1972,7 @@ msgid ""
 "to new servers, but they may not support all new features that you are "
 "expecting."
 msgstr ""
-"Membolehkan untuk melarang klien lawas untuk terhubung.\n"
+"Aktifkan untuk melarang klien lawas untuk terhubung.\n"
 "Klien-klien lawas dianggap sesuai jika mereka tidak rusak saat "
 "menghubungkan\n"
 "ke server-server baru, tetapi mereka mungkin tidak mendukung semua fitur "
@@ -1985,8 +1986,9 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
-"Membolehkan penggunaan server media asing (jika diberikan oleh server).\n"
-"Server asing menawarkan cara lebih cepat untuk mengunduh media (misal.: "
+"Membolehkan penggunaan server media jarak jauh (jika diberikan oleh server)."
+"\n"
+"Server jarak jauh menawarkan cara lebih cepat untuk mengunduh media (misal: "
 "tekstur)\n"
 "saat terhubung ke server."
 
@@ -2038,6 +2040,8 @@ msgid ""
 "Enables parallax occlusion mapping.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Mengaktifkan pemetaan parallax occlusion.\n"
+"Membutuhkan shader diaktifkan."
 
 #: src/settings_translation_file.cpp
 msgid "Engine profiling data print interval"
@@ -2098,13 +2102,15 @@ msgstr "Mode cepat"
 
 #: src/settings_translation_file.cpp
 msgid "Fast movement"
-msgstr ""
+msgstr "Gerakan cepat"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Fast movement (via use key).\n"
 "This requires the \"fast\" privilege on the server."
 msgstr ""
+"Gerakan cepat (lewat tombol gunakan).\n"
+"Membutuhkan izin \"fast\" pada server."
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
@@ -2119,14 +2125,10 @@ msgid "Field of view in degrees."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node "
-"padat.\n"
-"Hal ini memerlukan hak istimewa \"noclip\" pada server."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2177,19 +2179,19 @@ msgstr "Tombol beralih kabut"
 
 #: src/settings_translation_file.cpp
 msgid "Font path"
-msgstr ""
+msgstr "Jalur font"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
-msgstr ""
+msgstr "Bayangan font"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha"
-msgstr ""
+msgstr "Keburaman bayangan font"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha (opaqueness, between 0 and 255)."
-msgstr ""
+msgstr "Keburaman bayangan font (keopakan, antara 0 sampai 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow offset, if 0 then shadow will not be drawn."
@@ -2201,10 +2203,9 @@ msgstr "Ukuran font"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
-msgstr ""
+msgstr "Format tangkapan layar."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Forward key"
 msgstr "Tombol maju"
 
@@ -2301,6 +2302,12 @@ msgid ""
 "-    log: mimic and log backtrace of deprecated call (default for debug).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
+"Penanganan panggilan lua api usang:\n"
+"-    legacy: (mencoba untuk) menyerupai aturan lawas (bawaan untuk rilis).\n"
+"-    log: menyerupai dan mencatat asal-usul panggilan usang (bawaan untuk "
+"debug).\n"
+"-    error: batalkan penggunaan panggilan usang (disarankan untuk pengembang "
+"mod)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2321,15 +2328,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "High-precision FPU"
-msgstr ""
+msgstr "FPU (satuan titik mengambang) berketelitian tinggi"
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "Halaman awal server, ditampilkan di daftar server."
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers"
-msgstr ""
+msgstr "Seberapa dalam sungai yang dibuat"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2346,7 +2353,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers"
-msgstr ""
+msgstr "Seberapa lebar sungai yang dibuat"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
@@ -2354,7 +2361,7 @@ msgstr "IPv6"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 server"
-msgstr ""
+msgstr "Server IPv6"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 support."
@@ -2383,8 +2390,8 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
-"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node "
-"padat.\n"
+"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node padat."
+"\n"
 "Hal ini memerlukan hak istimewa \"noclip\" pada server."
 
 #: src/settings_translation_file.cpp
@@ -2424,7 +2431,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "If this is set, players will always (re)spawn at the given position."
-msgstr ""
+msgstr "Jika diatur, pemain akan bangkit (ulang) pada posisi yang diberikan."
 
 #: src/settings_translation_file.cpp
 msgid "Ignore world errors"
@@ -2437,10 +2444,11 @@ msgstr "Dalam Permainan"
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
 msgstr ""
+"Keburaman konsol obrolan dalam permainan (keopakan, antara 0 sampai 255)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background color (R,G,B)."
-msgstr ""
+msgstr "Warna latar belakang konsol obrolan dalam permainan (R,G,B)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2482,11 +2490,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Interval of sending time of day to clients."
-msgstr ""
+msgstr "Jarak pengiriman waktu ke klien."
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
-msgstr ""
+msgstr "Animasi barang inventaris"
 
 #: src/settings_translation_file.cpp
 msgid "Inventory key"
@@ -2553,7 +2561,7 @@ msgstr "Tombol lompat"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
-msgstr ""
+msgstr "Kecepatan lompat"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2562,8 +2570,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengurangi jarak pandang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2572,8 +2580,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk menjatuhkan barang yang sedang dipilih.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2582,8 +2590,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk menambah jarak pandang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2592,8 +2600,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk lompat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2602,8 +2610,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak cepat dalam mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2612,8 +2620,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak mundur.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2622,8 +2630,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak maju.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2632,8 +2640,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak ke kiri.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2642,8 +2650,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak ke kanan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2652,8 +2660,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka konsol obrolan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2662,8 +2670,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka jendela obrolan untuk mengetik perintah.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2672,8 +2680,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka jendela obrolan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2682,8 +2690,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka inventaris.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2701,8 +2709,10 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk menyelinap.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Juga digunakan untuk turun dan menyelam dalam air jika aux1_descends "
+"dinonaktifkan.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2711,8 +2721,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengganti kamera antara orang pertama dan ketiga.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2721,19 +2731,18 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengambil tangkapan layar.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling autorun.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tombol untuk beralih mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tombol untuk beralih lari otomatis.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2742,8 +2751,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode sinema.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2751,9 +2760,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tombol untuk mennganti tampilan peta mini.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tombol untuk mengganti tampilan peta mini.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2762,8 +2771,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2772,8 +2781,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih terbang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2782,19 +2791,18 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode tembus blok.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tombol untuk bergerak ke kiri.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tombol untuk beralih pembaruan kamera. Hanya digunakan dalam pengembangan.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2803,8 +2811,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan info debug.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2813,8 +2821,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan HUD.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2823,8 +2831,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan obrolan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2833,8 +2841,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan kabut.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2850,8 +2858,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih menjadi jarak pandang tanpa batas.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
@@ -2863,7 +2871,7 @@ msgstr "Bahasa"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
-msgstr ""
+msgstr "Kedalaman gua besar"
 
 #: src/settings_translation_file.cpp
 msgid "Lava Features"
@@ -2880,6 +2888,11 @@ msgid ""
 "-   Simple: only outer faces, if defined special_tiles are used\n"
 "-   Opaque: disable transparency"
 msgstr ""
+"Gaya daun:\n"
+"-   Fancy:  semua sisi terlihat\n"
+"-   Simple: hanya sisi terluar, jika special_tiles yang didefinisikan "
+"digunakan\n"
+"-   Opaque: menonaktifkan transparansi"
 
 #: src/settings_translation_file.cpp
 msgid "Left key"
@@ -2910,6 +2923,14 @@ msgid ""
 "-    info\n"
 "-    verbose"
 msgstr ""
+"Tingkatan pencatatan yang ditulis ke debug.txt:\n"
+"-    <nothing> (tanpa pencatatan)\n"
+"-    none (pesan tanpa tingkatan)\n"
+"-    error\n"
+"-    warning\n"
+"-    action\n"
+"-    info\n"
+"-    verbose"
 
 #: src/settings_translation_file.cpp
 msgid "Limit of emerge queues on disk"
@@ -2968,13 +2989,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Loading Block Modifiers"
-msgstr "Batas blok aktif"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
-msgstr ""
+msgstr "Pengelola permainan menu utama"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu mod manager"
@@ -2988,10 +3008,13 @@ msgstr "Skrip menu utama"
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
+"Buat warna kabut dan langit tergantung pada waktu (fajar/matahari tenggelam)"
+"\n"
+"dan arah melihat."
 
 #: src/settings_translation_file.cpp
 msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
-msgstr ""
+msgstr "Buat DirectX bekerja dengan LuaJIT. Nonaktifkan jika bermasalah."
 
 #: src/settings_translation_file.cpp
 msgid "Map directory"
@@ -3044,11 +3067,11 @@ msgstr "Batas generasi peta"
 
 #: src/settings_translation_file.cpp
 msgid "Map save interval"
-msgstr ""
+msgstr "Jarak menyimpan peta"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
-msgstr ""
+msgstr "Batas mapblock"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
@@ -3075,19 +3098,16 @@ msgid "Mapgen debug"
 msgstr "Debug generator peta"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flags"
-msgstr "Generator peta"
+msgstr "Flag generator peta"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat"
-msgstr "Generator peta"
+msgstr "Generator peta flat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave width"
-msgstr "Generator peta"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave1 noise parameters"
@@ -3102,14 +3122,12 @@ msgid "Mapgen flat filler depth noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat flags"
-msgstr "Generator peta"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat ground level"
-msgstr "Generator peta"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill steepness"
@@ -3120,14 +3138,12 @@ msgid "Mapgen flat hill threshold"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat lake steepness"
-msgstr "Parallax Occlusion"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat lake threshold"
-msgstr "Generator peta"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat large cave depth"
@@ -3142,9 +3158,8 @@ msgid "Mapgen fractal"
 msgstr "Generator peta fraktal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal cave width"
-msgstr "Generator peta"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave1 noise parameters"
@@ -3159,14 +3174,12 @@ msgid "Mapgen fractal filler depth noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal fractal"
-msgstr "Generator peta"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal iterations"
-msgstr "Parallax Occlusion"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia w"
@@ -3185,23 +3198,20 @@ msgid "Mapgen fractal julia z"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal offset"
-msgstr "Generator peta"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal scale"
-msgstr "Generator peta"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal seabed noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal slice w"
-msgstr "Generator peta"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen heat blend noise parameters"
@@ -3216,9 +3226,8 @@ msgid "Mapgen v5"
 msgstr "Generator peta v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave width"
-msgstr "Generator peta v5"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave1 noise parameters"
@@ -3250,7 +3259,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach frequency"
-msgstr ""
+msgstr "Frekuensi pantai pada generator peta v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach noise parameters"
@@ -3270,7 +3279,7 @@ msgstr "Frekuensi padang gurun pada generator peta v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 flags"
-msgstr ""
+msgstr "Flag pada generator peta v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 height select noise parameters"
@@ -3305,9 +3314,8 @@ msgid "Mapgen v7"
 msgstr "Generator peta v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 cave width"
-msgstr "Generator peta v7"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave1 noise parameters"
@@ -3359,7 +3367,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave depth"
-msgstr ""
+msgstr "Kedalaman gua raksasa"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave noise"
@@ -3406,14 +3414,12 @@ msgid "Maximum hotbar width"
 msgstr "Lebar maksimal hotbar"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent in total."
-msgstr "Jumlah maksimal pemain yang dapat terhubung serentak."
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent per client."
-msgstr "Jumlah maksimal blok yang dapat diantrikan untuk dimuat."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
@@ -3467,7 +3473,6 @@ msgid "Maximum number of statically stored objects in a block."
 msgstr "Jumlah maksimal objek yang disimpan secara statis dalam satu blok."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum objects per block"
 msgstr "Jumlah objek maksimal tiap blok"
 
@@ -3480,14 +3485,12 @@ msgstr ""
 "Berguna jika ada sesuatu yang akan ditampilkan di kanan atau kiri hotbar."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends per client"
-msgstr "Jumlah maksimal blok yang dikirim serentak tiap klien"
+msgstr "Jumlah maksimal blok yang dikirim serentak ke tiap klien"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends total"
-msgstr "Jumlah maksimal total blok yang dikirim"
+msgstr "Jumlah maksimal total blok yang dikirim serentak"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
@@ -3517,7 +3520,7 @@ msgstr "Pesan hari ini yang ditampilkan ke pemain yang terhubung."
 
 #: src/settings_translation_file.cpp
 msgid "Method used to highlight selected object."
-msgstr ""
+msgstr "Metode yang digunakan untuk memilih objek."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
@@ -3553,19 +3556,19 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
-msgstr ""
+msgstr "Jalur font monospace"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font size"
-msgstr ""
+msgstr "Ukuran font monospace"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
-msgstr ""
+msgstr "Sensitivitas mouse"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity multiplier."
-msgstr ""
+msgstr "Pengali sensitivitas mouse"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3591,15 +3594,18 @@ msgid ""
 "When running a server, clients connecting with this name are admins.\n"
 "When starting from the main menu, this is overridden."
 msgstr ""
+"Nama pemain.\n"
+"Saat menjalankan server, klien yang terhubung dengan nama ini adalah admin.\n"
+"Saat menjalankan dari menu utama, nilai ini ditimpa."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Name of the server, to be displayed when players join and in the serverlist."
-msgstr ""
+msgstr "Nama server, ditampilkan saat pemain bergabung dan di daftar server."
 
 #: src/settings_translation_file.cpp
 msgid "Network"
-msgstr ""
+msgstr "Jaringan"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3609,7 +3615,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "New users need to input this password."
-msgstr ""
+msgstr "Pengguna baru butuh memasukkan kata sandi."
 
 #: src/settings_translation_file.cpp
 msgid "Noclip"
@@ -3684,23 +3690,20 @@ msgid "Parallax occlusion Scale"
 msgstr "Skala parallax occlusion"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Parallax occlusion bias"
-msgstr "Parallax Occlusion"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Parallax occlusion iterations"
-msgstr "Parallax Occlusion"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion mode"
 msgstr "Mode parallax occlusion"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Parallax occlusion strength"
-msgstr "Parallax Occlusion"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Path to TrueTypeFont or bitmap."
@@ -3708,7 +3711,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Path to save screenshots at."
-msgstr ""
+msgstr "Jalur untuk menyimpan tangkapan layar."
 
 #: src/settings_translation_file.cpp
 msgid "Path to texture directory. All textures are first searched from here."
@@ -3781,7 +3784,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Random input"
-msgstr ""
+msgstr "Masukan acak"
 
 #: src/settings_translation_file.cpp
 msgid "Range select key"
@@ -3789,20 +3792,19 @@ msgstr "Tombol memilih jarak pandang"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
-msgstr ""
+msgstr "Media jarak jauh"
 
 #: src/settings_translation_file.cpp
 msgid "Remote port"
-msgstr ""
+msgstr "Port server jarak jauh"
 
 #: src/settings_translation_file.cpp
 msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
-msgstr "Pilih jalur"
+msgstr "Jalur laporan"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
@@ -3814,7 +3816,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "River Depth"
-msgstr ""
+msgstr "Kedalaman Sungai"
 
 #: src/settings_translation_file.cpp
 msgid "River Noise"
@@ -3822,7 +3824,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "River Size"
-msgstr ""
+msgstr "Ukuran sungai"
 
 #: src/settings_translation_file.cpp
 msgid "River noise -- rivers occur close to zero"
@@ -3834,7 +3836,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Round minimap"
-msgstr ""
+msgstr "Peta mini bundar"
 
 #: src/settings_translation_file.cpp
 msgid "Save the map received by the client on disk."
@@ -3855,11 +3857,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
-msgstr ""
+msgstr "Tinggi layar"
 
 #: src/settings_translation_file.cpp
 msgid "Screen width"
-msgstr ""
+msgstr "Lebar layar"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot"
@@ -3867,7 +3869,7 @@ msgstr "Tangkapan layar"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot folder"
-msgstr ""
+msgstr "Folder tangkapan layar"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot format"
@@ -3883,14 +3885,17 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"Kualitas tangkapan layar. Hanya digunakan untuk format JPEG.\n"
+"1 berarti kualitas terburuk; 100 berarti kualitas terbaik.\n"
+"Gunakan 0 untuk kualitas bawaan."
 
 #: src/settings_translation_file.cpp
 msgid "Security"
-msgstr ""
+msgstr "Keamanan"
 
 #: src/settings_translation_file.cpp
 msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
-msgstr ""
+msgstr "Lihat http://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
@@ -3941,24 +3946,32 @@ msgid ""
 "Set the language. Leave empty to use the system language.\n"
 "A restart is required after changing this."
 msgstr ""
+"Atur bahasa. Biarkan kosong untuk menggunakan bahasa sistem.\n"
+"Diharuskan mulai ulang setelah mengganti ini."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving leaves.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Atur ke true untuk mengaktifkan daun melambai.\n"
+"Membutuhkan shader diaktifkan."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Atur ke true untuk mengaktifkan tanaman berayun.\n"
+"Membutuhkan shader diaktifkan."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true enables waving water.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Atur ke true untuk mengaktifkan air berombak.\n"
+"Membutuhkan shader diaktifkan."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3969,11 +3982,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr ""
+msgstr "Bentuk dari peta mini. Aktifkan = bundar, nonaktifkan = persegi."
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
-msgstr ""
+msgstr "Tampilkan info debug"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
@@ -3981,7 +3994,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
-msgstr ""
+msgstr "Pesan server mati"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4002,6 +4015,8 @@ msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
+"Memperhalus kamera saat melihat sekeliling. Juga disebut penghalusan mouse.\n"
+"Berguna untuk perekaman video."
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
@@ -4009,16 +4024,15 @@ msgstr "Menghaluskan rotasi kamera dalam modus sinema. 0 untuk menonaktifkan."
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera. 0 to disable."
-msgstr ""
+msgstr "Penghalusan perputaran kamera. 0 untuk menonaktifkan."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Sneak key"
 msgstr "Tombol menyelinap"
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
-msgstr ""
+msgstr "Suara"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4042,11 +4056,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
-msgstr ""
+msgstr "Pengecekan protokol ketat"
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
-msgstr ""
+msgstr "Dukung server lawas"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -4071,13 +4085,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Texture path"
-msgstr "Paket Tekstur"
+msgstr "Jalur tekstur"
 
 #: src/settings_translation_file.cpp
 msgid "The altitude at which temperature drops by 20C"
-msgstr ""
+msgstr "Ketinggian saat suhu turun sebesar 20C"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4087,7 +4100,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
-msgstr ""
+msgstr "Kedalaman dari tanah atau pengisi lainnya"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4158,11 +4171,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Time send interval"
-msgstr ""
+msgstr "Jarak pengiriman waktu"
 
 #: src/settings_translation_file.cpp
 msgid "Time speed"
-msgstr ""
+msgstr "Kecepatan waktu"
 
 #: src/settings_translation_file.cpp
 msgid "Timeout for client to remove unused map data from memory."
@@ -4182,7 +4195,7 @@ msgstr "Tombol beralih mode kamera"
 
 #: src/settings_translation_file.cpp
 msgid "Tooltip delay"
-msgstr ""
+msgstr "Jeda tooltip"
 
 #: src/settings_translation_file.cpp
 msgid "Trilinear filtering"
@@ -4197,7 +4210,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
-msgstr ""
+msgstr "Mod terpercaya"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."

From bb9fe6eb2b32548e66d62b64e949b058ec7856fc Mon Sep 17 00:00:00 2001
From: Alvin Hikmawan <alvin.hikmawan@gmail.com>
Date: Sat, 10 Dec 2016 10:03:21 +0000
Subject: [PATCH 384/418] Translated using Weblate (Indonesian)

Currently translated at 69.4% (638 of 918 strings)
---
 po/id/minetest.po | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/po/id/minetest.po b/po/id/minetest.po
index ef03b5a87..80230a76e 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -7,9 +7,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-12-08 15:51+0000\n"
-"Last-Translator: Muhammad Rifqi Priyo Susanto "
-"<muhammadrifqipriyosusanto@gmail.com>\n"
+"PO-Revision-Date: 2016-12-10 10:03+0000\n"
+"Last-Translator: Alvin Hikmawan <alvin.hikmawan@gmail.com>\n"
 "Language-Team: Indonesian "
 "<https://hosted.weblate.org/projects/minetest/minetest/id/>\n"
 "Language: id\n"
@@ -1842,10 +1841,14 @@ msgid ""
 "Defines sampling step of texture.\n"
 "A higher value results in smoother normal maps."
 msgstr ""
+"Menentukan tahap sampling atas tekstur\n"
+"Nilai yg lebih tinggi menghasilkan peta yg lebih halus"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
+"Menentukan jarak maksimal perpindahan pemain dalam blok (0 = tak terhingga)"
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"

From 3a0ded274e171366b559bb14e4208caba3fea496 Mon Sep 17 00:00:00 2001
From: Stas Kies <stask85@gmail.com>
Date: Wed, 31 Aug 2016 21:36:05 +0000
Subject: [PATCH 385/418] Translated using Weblate (Russian)

Currently translated at 56.1% (515 of 918 strings)
---
 po/ru/minetest.po | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index a488c9ce5..ad9e696df 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-05-20 15:18+0000\n"
-"Last-Translator: Andrey K. <contact@libnaru.so>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/minetest/"
-"minetest/ru/>\n"
+"PO-Revision-Date: 2016-08-31 21:36+0000\n"
+"Last-Translator: Stas Kies <stask85@gmail.com>\n"
+"Language-Team: Russian "
+"<https://hosted.weblate.org/projects/minetest/minetest/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.8\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -410,9 +410,8 @@ msgid "Uninstall selected modpack"
 msgstr "Удалить выбранный мод-пак"
 
 #: builtin/mainmenu/tab_multiplayer.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "Адрес / Порт:"
+msgstr "Адрес / Порт"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -427,24 +426,20 @@ msgid "Creative mode"
 msgstr "Режим творчества"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Damage enabled"
-msgstr "Разрешить увечья"
+msgstr "Ущерб включен"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Del. Favorite"
-msgstr "Избранное:"
+msgstr "Удалить  фаворит"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Favorite"
-msgstr "Избранное:"
+msgstr "фаворит"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Name / Password"
-msgstr "Имя / Пароль:"
+msgstr "Имя / Пароль"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
@@ -605,9 +600,8 @@ msgid "Parallax Occlusion"
 msgstr "Parallax Occlusion"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "Включить частицы"
+msgstr "частицы"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Reset singleplayer world"

From 571ed96c8ea76d4cfc97dea6df49029a7842c72e Mon Sep 17 00:00:00 2001
From: Maksim Gamarnik <MoNTE48@mail.ua>
Date: Tue, 6 Dec 2016 10:17:38 +0000
Subject: [PATCH 386/418] Translated using Weblate (Russian)

Currently translated at 56.2% (516 of 918 strings)
---
 po/ru/minetest.po | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index ad9e696df..a1c3a3791 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-08-31 21:36+0000\n"
-"Last-Translator: Stas Kies <stask85@gmail.com>\n"
+"PO-Revision-Date: 2016-12-06 10:17+0000\n"
+"Last-Translator: Maksim Gamarnik <MoNTE48@mail.ua>\n"
 "Language-Team: Russian "
 "<https://hosted.weblate.org/projects/minetest/minetest/ru/>\n"
 "Language: ru\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.8\n"
+"X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -583,9 +583,8 @@ msgid "None"
 msgstr "Ничего"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Normal Mapping"
-msgstr "Mip-текстурирование (Мип-маппинг)"
+msgstr "Mip-текстурирование"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"

From eac6323e80d048ca6f70c4cff50c442b9aeda74e Mon Sep 17 00:00:00 2001
From: Andrey <lordofmist@mail.ru>
Date: Tue, 13 Dec 2016 03:10:43 +0000
Subject: [PATCH 387/418] Translated using Weblate (Russian)

Currently translated at 56.3% (517 of 918 strings)
---
 po/ru/minetest.po | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index a1c3a3791..9a5ac2674 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-12-06 10:17+0000\n"
-"Last-Translator: Maksim Gamarnik <MoNTE48@mail.ua>\n"
+"PO-Revision-Date: 2016-12-13 03:10+0000\n"
+"Last-Translator: Andrey <lordofmist@mail.ru>\n"
 "Language-Team: Russian "
 "<https://hosted.weblate.org/projects/minetest/minetest/ru/>\n"
 "Language: ru\n"
@@ -98,14 +98,13 @@ msgid "Enable all"
 msgstr "Включить всё"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
-"Ошибка при попытке включения мода \"$1\" поскольку он содержит недопустимые "
-"символы. Допускается использование строчных букв латинского алфавита, цифр, "
-"и знака подчёркивания."
+"Ошибка при попытке подключения мода \"$1\", поскольку он содержит "
+"недопустимые символы. Допускается использование строчных букв латинского "
+"алфавита, цифр, и знака подчёркивания."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -142,7 +141,7 @@ msgstr "Создать"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "Скачайте мини-игры, такие как minetest_game, на minetest.net"
+msgstr "Скачивайте мини-игры, такие как minetest_game, на minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
@@ -194,7 +193,7 @@ msgstr "Modmgr: невозможно удалить \"$1\""
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: invalid modpath \"$1\""
-msgstr "Modmgr: неправильный путь \"$1\""
+msgstr "Modmgr: неправильный путь к \"$1\""
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
@@ -218,7 +217,7 @@ msgstr "(Отсутствует описание настройки)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
-msgstr "< Назад к странице Настройки"
+msgstr "< Назад к странице Настроек"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"

From b898ab64866d492300a01e6d1028cae304087e2f Mon Sep 17 00:00:00 2001
From: Zygi Mantus <zygimantus@gmail.com>
Date: Sat, 10 Dec 2016 20:29:11 +0000
Subject: [PATCH 388/418] Translated using Weblate (Lithuanian)

Currently translated at 26.2% (241 of 918 strings)
---
 po/lt/minetest.po | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/po/lt/minetest.po b/po/lt/minetest.po
index 1a347ab34..468dbbae0 100644
--- a/po/lt/minetest.po
+++ b/po/lt/minetest.po
@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2015-11-19 05:14+0000\n"
-"Last-Translator: Liudas Ališauskas <liudas@akmc.lt>\n"
-"Language-Team: Lithuanian <https://hosted.weblate.org/projects/minetest/"
-"minetest/lt/>\n"
+"PO-Revision-Date: 2016-12-10 20:29+0000\n"
+"Last-Translator: Zygi Mantus <zygimantus@gmail.com>\n"
+"Language-Team: Lithuanian "
+"<https://hosted.weblate.org/projects/minetest/minetest/lt/>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.5-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -68,7 +68,7 @@ msgstr ""
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr ""
+msgstr "Mes palaikome tik $1 protokolo versiją."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
@@ -219,7 +219,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
-msgstr ""
+msgstr "Naršyti"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 #, fuzzy

From 1c4bc0d46c6c6f4ca3c1bdf43b55be824abf6187 Mon Sep 17 00:00:00 2001
From: Jan Sbrz <janschuetz.jst@gmail.com>
Date: Sat, 3 Dec 2016 12:57:21 +0000
Subject: [PATCH 389/418] Translated using Weblate (German)

Currently translated at 94.7% (870 of 918 strings)
---
 po/de/minetest.po | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/po/de/minetest.po b/po/de/minetest.po
index b68f3c894..3bbd05270 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-08-09 07:40+0000\n"
-"Last-Translator: bse666 <bse666@gmail.com>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/minetest/minetest/"
-"de/>\n"
+"PO-Revision-Date: 2016-12-03 12:57+0000\n"
+"Last-Translator: Jan Sbrz <janschuetz.jst@gmail.com>\n"
+"Language-Team: German "
+"<https://hosted.weblate.org/projects/minetest/minetest/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.8-dev\n"
+"X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -1483,8 +1483,9 @@ msgid "Automaticaly report to the serverlist."
 msgstr "Automatisch bei der Serverliste melden."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Autorun key"
-msgstr ""
+msgstr "Autosprint-Taste"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -1563,9 +1564,8 @@ msgid "Chat toggle key"
 msgstr "Taste zum Umschalten des Chatprotokolls"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Befehl"
+msgstr "Chatbefehle"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1658,13 +1658,12 @@ msgid "Colored fog"
 msgstr "Gefärbter Nebel"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
-"Kommagetrente Liste von Mods, welche auf HTTP-APIs zugreifen dürfen, was\n"
-"es ihnen erlaubt, Daten aus und Daten zum Internet herunter- und hochzuladen."
+"Kommagetrennte Liste von Mods, welche auf HTTP-APIs zugreifen dürfen, was\n"
+"es ihnen erlaubt, Daten aus dem/in das Internet herunter-/hochzuladen."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1836,7 +1835,7 @@ msgstr "Standardprivilegien"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Standard-Meldungsformat"
 
 #: src/settings_translation_file.cpp
 msgid ""

From 55cb5a1983aa58e22d6dc5348d2716d788c67a70 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sun, 11 Dec 2016 09:22:15 +0000
Subject: [PATCH 390/418] Translated using Weblate (German)

Currently translated at 98.9% (908 of 918 strings)
---
 po/de/minetest.po | 196 ++++++++++++++++++++--------------------------
 1 file changed, 84 insertions(+), 112 deletions(-)

diff --git a/po/de/minetest.po b/po/de/minetest.po
index 3bbd05270..993dec137 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-12-03 12:57+0000\n"
-"Last-Translator: Jan Sbrz <janschuetz.jst@gmail.com>\n"
+"PO-Revision-Date: 2016-12-11 09:22+0000\n"
+"Last-Translator: Wuzzy <almikes@aol.com>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/minetest/minetest/de/>\n"
 "Language: de\n"
@@ -260,8 +260,8 @@ msgstr "Mods"
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
 msgstr ""
-"Optional kann die Lacunarity, mit einem weiteren Komma abgetrennt, angehängt "
-"werden."
+"Optional kann die Lückenhaftigkeit, mit einem weiteren Komma abgetrennt, "
+"angehängt werden."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a comma seperated list of flags."
@@ -333,7 +333,7 @@ msgstr "Schließen"
 
 #: builtin/mainmenu/store.lua
 msgid "Downloading $1, please wait..."
-msgstr "$1 wird heruntergeladen, bitte warten ..."
+msgstr "$1 wird heruntergeladen, bitte warten …"
 
 #: builtin/mainmenu/store.lua
 msgid "Install"
@@ -707,15 +707,15 @@ msgstr "Initialisiere Blöcke"
 
 #: src/client.cpp
 msgid "Initializing nodes..."
-msgstr "Initialisiere Blöcke..."
+msgstr "Initialisiere Blöcke …"
 
 #: src/client.cpp
 msgid "Loading textures..."
-msgstr "Lade Texturen..."
+msgstr "Lade Texturen …"
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr "Shader wiederherstellen..."
+msgstr "Shader wiederherstellen …"
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
@@ -767,7 +767,7 @@ msgstr "Passwort ändern"
 
 #: src/game.cpp
 msgid "Connecting to server..."
-msgstr "Verbinde mit Server..."
+msgstr "Verbinde mit Server …"
 
 #: src/game.cpp
 msgid "Continue"
@@ -775,11 +775,11 @@ msgstr "Weiter"
 
 #: src/game.cpp
 msgid "Creating client..."
-msgstr "Client erstellen ..."
+msgstr "Client erstellen …"
 
 #: src/game.cpp
 msgid "Creating server..."
-msgstr "Erstelle Server..."
+msgstr "Erstelle Server …"
 
 #: src/game.cpp
 msgid ""
@@ -845,7 +845,7 @@ msgstr "Programm beenden"
 
 #: src/game.cpp
 msgid "Item definitions..."
-msgstr "Item-Definitionen..."
+msgstr "Item-Definitionen …"
 
 #: src/game.cpp
 msgid "KiB/s"
@@ -853,7 +853,7 @@ msgstr "KiB/s"
 
 #: src/game.cpp
 msgid "Media..."
-msgstr "Medien..."
+msgstr "Medien …"
 
 #: src/game.cpp
 msgid "MiB/s"
@@ -861,11 +861,11 @@ msgstr "MiB/s"
 
 #: src/game.cpp
 msgid "Node definitions..."
-msgstr "Blockdefinitionen..."
+msgstr "Blockdefinitionen …"
 
 #: src/game.cpp
 msgid "Resolving address..."
-msgstr "Löse Adresse auf..."
+msgstr "Löse Adresse auf …"
 
 #: src/game.cpp
 msgid "Respawn"
@@ -873,7 +873,7 @@ msgstr "Wiederbeleben"
 
 #: src/game.cpp
 msgid "Shutting down..."
-msgstr "Herunterfahren..."
+msgstr "Herunterfahren …"
 
 #: src/game.cpp
 msgid "Sound Volume"
@@ -1396,9 +1396,8 @@ msgid "Active Block Modifier interval"
 msgstr "Active-Block-Modifier-Intervall"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifiers"
-msgstr "Active-Block-Modifier-Intervall"
+msgstr "Active Block Modifiers"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1483,9 +1482,8 @@ msgid "Automaticaly report to the serverlist."
 msgstr "Automatisch bei der Serverliste melden."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Autorun key"
-msgstr "Autosprint-Taste"
+msgstr "Automatisch-gehen-Taste"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -1521,7 +1519,7 @@ msgstr "Innerhalb des Spielers bauen"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "Builtin"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
@@ -1663,7 +1661,7 @@ msgid ""
 "allow them to upload and download data to/from the internet."
 msgstr ""
 "Kommagetrennte Liste von Mods, welche auf HTTP-APIs zugreifen dürfen, was\n"
-"es ihnen erlaubt, Daten aus dem/in das Internet herunter-/hochzuladen."
+"es ihnen erlaubt, Daten aus und Daten zum Internet herunter- und hochzuladen."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1835,7 +1833,7 @@ msgstr "Standardprivilegien"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr "Standard-Meldungsformat"
+msgstr "Standard-Berichtsformat"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1861,7 +1859,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Verzögerung beim Senden von Blöcken nach dem Bauen"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -1910,12 +1908,10 @@ msgid "Disable anticheat"
 msgstr "Anti-Cheat deaktivieren"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Disable escape sequences"
 msgstr "Escape-Sequenzen deaktivieren"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Disable escape sequences, e.g. chat coloring.\n"
 "Use this if you want to run a server with pre-0.4.14 clients and you want to "
@@ -1923,9 +1919,10 @@ msgid ""
 "the escape sequences generated by mods."
 msgstr ""
 "Escape-Sequenzen deaktivieren, z.B. Chat Farben.\n"
-"Bei einem Server der pre-0.4.14 Clients bedienen muss, sollte diese Option "
-"deaktiviert werden.\n"
-"Die Escape-Sequenzen werden von Mods generiert."
+"Benutzen Sie dies, falls Sie einen Server laufen lassen möchten, der Clients "
+"vor\n"
+"0.4.14 bedienen soll und Sie die von Mods generierten Escape-Sequenzen\n"
+"deaktivieren wollen."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
@@ -1953,7 +1950,7 @@ msgstr "Die Kartengenerator-Debuginformationen auf Konsole ausgeben."
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "Joysticks aktivieren"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
@@ -2065,13 +2062,12 @@ msgstr ""
 "Hierfür müssen Shader aktiviert sein."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine profiling data print interval"
-msgstr "Profiler-Ausgabeintervall"
+msgstr "Engine-Profiling-Datenausgabeintervall"
 
 #: src/settings_translation_file.cpp
 msgid "Entity methods"
-msgstr ""
+msgstr "Entity-Methoden"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2135,25 +2131,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
-msgstr "Gesichtsfeld"
+msgstr "Sichtfeld"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view for zoom"
-msgstr "Gesichtsfeld"
+msgstr "Sichtfeld für Zoom"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
-msgstr "Gesichtsfeld in Grad."
+msgstr "Sichtfeld in Grad."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"Schnelle Bewegung (mittels Benutzen-Taste).\n"
-"Dazu wird das „fast“-Privileg auf dem Server benötigt."
+"Sichtfeld beim Zoomen, in Grad.\n"
+"Dazu wird das „zoom“-Privileg auf dem Server benötigt."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2266,8 +2260,8 @@ msgstr ""
 msgid ""
 "From how far clients know about objects, stated in mapblocks (16 nodes)."
 msgstr ""
-"Maximale Entfernung, in der Clients über Objekte bescheid wissen, in\n"
-"Kartenblöcken (16 Blöcke) angegeben."
+"Maximale Entfernung, in der Clients über die Existenz von Objekte wissen,\n"
+"in Kartenblöcken (16 Blöcke) angegeben."
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
@@ -2307,10 +2301,9 @@ msgstr "Normalmaps generieren"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
-msgstr ""
+msgstr "Globale Rückruffunktionen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -2321,11 +2314,8 @@ msgid ""
 msgstr ""
 "Globale Kartengenerierungsattribute.\n"
 "Im Kartengenerator v6 wird das „decorations“-Flag alle Dekorationen außer\n"
-"Bäume und Dschungelgras aktivieren, in allen anderen Kartengeneratoren\n"
-"wird dieses Flag alle Dekorationen aktivieren.\n"
-"Die von der Engine standardmäßig gesetzten Flags lauten:\n"
-"„caves, light, decorations“.\n"
-"Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
+"Bäume und Dschungelgras beinflussen, in allen anderen Kartengeneratoren\n"
+"wird es alle Dekorationen beinflussen.\n"
 "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
 "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
@@ -2399,7 +2389,7 @@ msgid ""
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
 "Wie groß das Gebiet ist, in dem Kartenblöcke aktiv sind.\n"
-"In aktiven Blöcken werden Objekte geladen und ABMs ausgeführt.\n"
+"In aktiven Kartenblöcken werden Objekte geladen und ABMs ausgeführt.\n"
 "1 Kartenblock = 16×16×16 Blöcke."
 
 #: src/settings_translation_file.cpp
@@ -2600,9 +2590,8 @@ msgstr ""
 "Steuert die Skalierung mit einem sehr hohem Detailgrad."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick button repetition interval"
-msgstr "Rechtsklick-Wiederholungsrate"
+msgstr "Joystick-Button-Wiederholungsrate"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2834,15 +2823,14 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling autorun.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Taste zum Umschalten des Schnellmodus.\n"
-"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Taste zum Umschalten des automatischen Vorwärtsgehens.\n"
+"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2895,7 +2883,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -2903,8 +2890,8 @@ msgid ""
 msgstr ""
 "Taste zum Umschalten der Kameraaktualisierung. Nur für die Entwicklung "
 "benutzt.\n"
-"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
+"35e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3094,7 +3081,7 @@ msgstr "Flüssigkeitsaktualisierungstakt"
 
 #: src/settings_translation_file.cpp
 msgid "Load the game profiler"
-msgstr ""
+msgstr "Spielprofiler laden"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3102,11 +3089,13 @@ msgid ""
 "Provides a /profiler command to access the compiled profile.\n"
 "Useful for mod developers and server operators."
 msgstr ""
+"Den Spielprofiler laden, um Profilingdaten für das Spiel zu sammeln.\n"
+"Aktiviert den „/profiler“-Befehl, um auf das erzeugte Profil zuzugreifen.\n"
+"Nützlich für Modentwickler und Serverbetreiber."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Loading Block Modifiers"
-msgstr "Active-Block-Modifier-Intervall"
+msgstr "Loading Block Modifiers"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
@@ -3138,7 +3127,6 @@ msgid "Map directory"
 msgstr "Kartenordner"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -3156,8 +3144,6 @@ msgstr ""
 "„humid_rivers“ modifiert die Luftfeuchtigkeit um Flüssen und in Gebieten, wo "
 "sich Wasser\n"
 "ansammeln würde; es könnte fein abgestimmte Biomen beeinträchtigen.\n"
-"Die von der Engine standardmäßig gesetzten Flags lauten:\n"
-"„altitude_chill, humid_rivers“.\n"
 "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
 "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
@@ -3165,7 +3151,6 @@ msgstr ""
 "zu deaktivieren."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
@@ -3173,15 +3158,15 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Kartengenerierungsattribute speziell für Kartengenerator v7.\n"
-"„ridges“ sind die Flüsse.\n"
-"Flags, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
+"Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n"
+"Zu einer flachen Welt können gelegentliche Seen und Hügel hinzugefügt werden."
+"\n"
+"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
 "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
 "zu deaktivieren."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
@@ -3192,18 +3177,13 @@ msgid ""
 msgstr ""
 "Kartengenerierungsattribute speziell für den Kartengenerator v6.\n"
 "Falls Schneebiome aktiviert, werden Dschungel aktiviert und das „jungles“-"
-"Flag\n"
-"wird ignoriert.\n"
-"Die von der Engine standardmäßig gesetzten Flags lauten:\n"
-"„biomeblend, mudflow“.\n"
-"Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
+"Flag wird ignoriert.\n"
 "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
 "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
 "zu deaktivieren."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
@@ -3212,8 +3192,8 @@ msgid ""
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
 "Kartengenerierungsattribute speziell für Kartengenerator v7.\n"
-"„ridges“ sind die Flüsse.\n"
-"Flags, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
+"Das „ridges“-Flag steuert die Flüsse.\n"
+"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
 "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
 "zu deaktivieren."
@@ -3571,14 +3551,12 @@ msgid "Maximum hotbar width"
 msgstr "Max. Breite der Schnellzugriffsleiste"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent in total."
-msgstr "Maximale Anzahl der Spieler, die sich simultan verbinden können."
+msgstr "Maximale Gesamtanzahl der Blöcke, die gleichzeitig gesendet werden."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent per client."
-msgstr "Maximale Anzahl der Kartenblöcke in der Ladewarteschlange."
+msgstr "Maximale Anzahl der Blöcke, die gleichzeitig je Client gesendet werden."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
@@ -3638,9 +3616,8 @@ msgstr ""
 "Maximale Anzahl der statisch gespeicherten Objekte in einem Kartenblock."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum objects per block"
-msgstr "Maximale Objekte pro Kartenblock"
+msgstr "Maximale Objekte pro Block"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3652,14 +3629,12 @@ msgstr ""
 "etwas gibt, was links oder rechts von ihr angezeigt werden soll."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends per client"
-msgstr "Max. gleichzeitig versendete Kartenblöcke pro Client"
+msgstr "Max. gleichzeitig versendete Blöcke pro Client"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends total"
-msgstr "Max. gleichzeitig versendete Kartenblöcke"
+msgstr "Max. gleichzeitig versendete Blöcke (gesamt)"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
@@ -3958,30 +3933,28 @@ msgstr ""
 "Shell-Kommandos, benutzen können."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds). 0 = "
 "disable. Useful for developers."
 msgstr ""
-"Profiler-Datenausgabeintervall. 0 = deaktivieren. Nützlich für Entwickler."
+"Gibt die Profiling-Daten der Engine in regelmäßigen Abständen aus (in "
+"Sekunden). „0“ deaktiviert das Profiling. Nützlich für Entwickler."
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr "Privilegien, die Spieler mit basic_privs gewähren können"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Profiler"
-msgstr "Talprofil"
+msgstr "Profiler"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "Profiler-Umschalten-Taste"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Profiling"
-msgstr "Mod-Profiling"
+msgstr "Profiling"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3989,7 +3962,7 @@ msgid ""
 "Values larger than 26 will start to produce sharp cutoffs at cloud area "
 "corners."
 msgstr ""
-"Radius des Wolkenbereichs; In Einheiten von 64 Blöcken.\n"
+"Radius des Wolkenbereichs; In Einheiten von 64 Wolkenquadraten.\n"
 "Werte größer als 26 werden scharfe Schnittkanten an den Ecken des Wolken-\n"
 "bereichs erzeugen."
 
@@ -4018,9 +3991,8 @@ msgid "Replaces the default main menu with a custom one."
 msgstr "Ersetzt das Standardhauptmenü mit einem benutzerdefinierten Hauptmenü."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
-msgstr "Schriftpfad"
+msgstr "Berichtspfad"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
@@ -4196,16 +4168,14 @@ msgstr ""
 "Dafür müssen Shader aktiviert sein."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
 "Shader werden für fortgeschrittene visuelle Effekte benötigt und können die "
-"Performanz\n"
-"auf einigen Grafikkarten erhöhen.\n"
-"Funktioniert nur mit dem OpenGL-Backend."
+"Performanz auf einigen Grafikkarten erhöhen.\n"
+"Sie funktionieren nur mit dem OpenGL-Grafik-Backend."
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
@@ -4240,13 +4210,13 @@ msgid "Smooth lighting"
 msgstr "Geglättetes Licht"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
-"Glättet Kamerabewegungen bei der Fortbewegung und\n"
-"beim Umsehen. Nützlich zum Aufnehmen von Videos."
+"Glättet Kamerabewegungen bei der Fortbewegung und beim Umsehen. Auch bekannt "
+"als „Look Smoothing“ oder „Mouse Smoothing“.\n"
+"Nützlich zum Aufnehmen von Videos."
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
@@ -4340,6 +4310,8 @@ msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"Das Standardformat, in dem Profile gespeichert werden,\n"
+"wenn „/profiler save [Format]“ ohne Format aufgerufen wird."
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
@@ -4350,6 +4322,8 @@ msgid ""
 "The file path relative to your worldpath in which profiles will be saved "
 "to.\n"
 msgstr ""
+"Der Dateipfad relativ zu Ihrem Weltpfad, in dem Profile abgespeichert werden."
+"\n"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -4402,14 +4376,12 @@ msgstr ""
 "diese Funktion."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
-"Das Intervall in Sekunden, in dem Rechtsklicks wiederholt werden, wenn die "
-"rechte\n"
-"Maustaste gedrückt gehalten wird."
+"Das Intervall in Sekunden, in dem Ereignisse wiederholt werden,\n"
+"wenn eine Joystick-Tastenkombination gedrückt gehalten wird."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4667,7 +4639,6 @@ msgstr ""
 "die Inventarbilder von Blöcken)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
@@ -4676,9 +4647,10 @@ msgid ""
 msgstr ""
 "Falls gui_scaling_filter_txr2img auf „wahr“ gesetzt ist, werden\n"
 "diese Bilder von der Hardware zur Software für die Skalierung\n"
-"kopiert. Falls es auf „falsch“ gesetzt ist, wird für alte Videotreiber,\n"
-"die das Herunterladen von Texturen zurück von der Hardware\n"
-"nicht vernünftig unterstützen."
+"kopiert. Falls es auf „falsch“ gesetzt ist, wird die alte Skalierungs-\n"
+"methode angewandt, für Grafiktreiber, welche das\n"
+"Herunterladen von Texturen zurück von der Hardware nicht\n"
+"korrekt unterstützen."
 
 #: src/settings_translation_file.cpp
 msgid ""

From 646159159f4d1c13aeac820569b34e0108683f42 Mon Sep 17 00:00:00 2001
From: Fixer <artem.brz@gmail.com>
Date: Tue, 13 Dec 2016 22:32:51 +0000
Subject: [PATCH 391/418] Translated using Weblate (Ukrainian)

Currently translated at 38.1% (350 of 918 strings)
---
 po/uk/minetest.po | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/po/uk/minetest.po b/po/uk/minetest.po
index 0c30153d7..c4187c7a8 100644
--- a/po/uk/minetest.po
+++ b/po/uk/minetest.po
@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-05-12 01:10+0000\n"
+"PO-Revision-Date: 2016-12-13 22:32+0000\n"
 "Last-Translator: Fixer <artem.brz@gmail.com>\n"
-"Language-Team: Ukrainian <https://hosted.weblate.org/projects/minetest/"
-"minetest/uk/>\n"
+"Language-Team: Ukrainian "
+"<https://hosted.weblate.org/projects/minetest/minetest/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -1538,7 +1538,7 @@ msgstr "Чат"
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chatcommands"
-msgstr "Команда"
+msgstr "Команди чату"
 
 #: src/settings_translation_file.cpp
 msgid ""

From 211d919b546e25e798982dd8df24ec82ecee2d6b Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 14 Dec 2016 00:15:11 +0100
Subject: [PATCH 392/418] Update minetest.conf.example and
 settings_translation_file.cpp

---
 minetest.conf.example             | 35 ++++++++++---------------------
 src/settings_translation_file.cpp | 22 +++++++++++++++----
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/minetest.conf.example b/minetest.conf.example
index e372e5833..bdd28cda6 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -615,7 +615,7 @@
 # inventory_items_animations = false
 
 #    Fraction of the visible distance at which fog starts to be rendered
-#    Range 0 - 0.99
+#    type: float min: 0 max: 0.99
 # fog_start = 0.4
 
 ### Menus
@@ -936,26 +936,6 @@
 #    type: float
 # server_map_save_interval = 5.3
 
-#    Set the maximum character length of a chat message sent by clients. (0 to disable)
-#    type: integer
-# chat_message_max_size = 500
-
-#    Limit a single player to send X messages per 10 seconds. (0 to disable)
-#    type: float
-# chat_message_limit_per_10sec = 8.0
-
-#    Kick player if send more than X messages per 10 seconds. (0 to disable)
-#    type: integer
-# chat_message_limit_trigger_kick = 50
-
-#    At this distance the server will aggressively optimize which blocks are sent to clients.
-#    Small values potentially improve performance a lot, at the expense of visible rendering glitches.
-#    (some blocks will not be rendered under water and in caves, as well as sometimes on land)
-#    Setting this to a value greater than max_block_send_distance disables this optimization.
-#    Stated in mapblocks (16 nodes)
-#    type: int
-# block_send_optimize_distance = 4
-
 ### Physics
 
 #    type: float
@@ -1060,6 +1040,14 @@
 #    type: float
 # liquid_update = 1.0
 
+#    At this distance the server will aggressively optimize which blocks are sent to clients.
+#    Small values potentially improve performance a lot, at the expense of visible rendering glitches.
+#    (some blocks will not be rendered under water and in caves, as well as sometimes on land)
+#    Setting this to a value greater than max_block_send_distance disables this optimization.
+#    Stated in mapblocks (16 nodes)
+#    type: int min: 2
+# block_send_optimize_distance = 4
+
 ## Mapgen
 
 #    Name of map generator to be used when creating a new world.
@@ -1246,8 +1234,7 @@
 #    Floatlands are currently experimental and subject to change.
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
-#    type: flags possible values: mountains, ridges, floatlands,
-#    nomountains, noridges, nofloatlands
+#    type: flags possible values: mountains, ridges, floatlands, nomountains, noridges, nofloatlands
 # mgv7_spflags = mountains,ridges
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
@@ -1571,7 +1558,7 @@
 # profiler.default_report_format = txt
 
 #    The file path relative to your worldpath in which profiles will be saved to.
-#
+#    
 #    type: string
 # profiler.report_path = ""
 
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index bebada2f8..39223d9ce 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -196,7 +196,7 @@ fake_function() {
 	gettext("FPS in pause menu");
 	gettext("Maximum FPS when game is paused.");
 	gettext("Viewing range");
-	gettext("View distance in nodes.\nMin = 20");
+	gettext("View distance in nodes.");
 	gettext("Screen width");
 	gettext("Width component of the initial window size.");
 	gettext("Screen height");
@@ -257,6 +257,8 @@ fake_function() {
 	gettext("The strength (darkness) of node ambient-occlusion shading.\nLower is darker, Higher is lighter. The valid range of values for this\nsetting is 0.25 to 4.0 inclusive. If the value is out of range it will be\nset to the nearest valid value.");
 	gettext("Inventory items animations");
 	gettext("Enables animation of inventory items.");
+	gettext("Fog Start");
+	gettext("Fraction of the visible distance at which fog starts to be rendered");
 	gettext("Menus");
 	gettext("Clouds in menu");
 	gettext("Use a cloud animation for the main menu background.");
@@ -434,6 +436,8 @@ fake_function() {
 	gettext("The time (in seconds) that the liquids queue may grow beyond processing\ncapacity until an attempt is made to decrease its size by dumping old queue\nitems.  A value of 0 disables the functionality.");
 	gettext("Liquid update tick");
 	gettext("Liquid update interval in seconds.");
+	gettext("block send optimize distance");
+	gettext("At this distance the server will aggressively optimize which blocks are sent to clients.\nSmall values potentially improve performance a lot, at the expense of visible rendering glitches.\n(some blocks will not be rendered under water and in caves, as well as sometimes on land)\nSetting this to a value greater than max_block_send_distance disables this optimization.\nStated in mapblocks (16 nodes)");
 	gettext("Mapgen");
 	gettext("Mapgen name");
 	gettext("Name of map generator to be used when creating a new world.\nCreating a world in the main menu will override this.");
@@ -490,18 +494,28 @@ fake_function() {
 	gettext("Mapgen v6 apple trees noise parameters");
 	gettext("Mapgen v7");
 	gettext("Mapgen v7 flags");
-	gettext("Map generation attributes specific to Mapgen v7.\nThe 'ridges' flag controls the rivers.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
+	gettext("Map generation attributes specific to Mapgen v7.\nThe 'ridges' flag enables the rivers.\nFloatlands are currently experimental and subject to change.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them.");
 	gettext("Mapgen v7 cave width");
 	gettext("Controls width of tunnels, a smaller value creates wider tunnels.");
+	gettext("Mapgen v7 floatland mountain density");
+	gettext("Controls the density of floatland mountain terrain.\nIs an offset added to the 'np_mountain' noise value.");
+	gettext("Mapgen v7 floatland mountain height");
+	gettext("Typical maximum height, above and below midpoint, of floatland mountain terrain.");
+	gettext("Mapgen v7 floatland level");
+	gettext("Y-level of floatland midpoint and lake surface.");
+	gettext("Mapgen v7 shadow limit");
+	gettext("Y-level to which floatland shadows extend.");
 	gettext("Mapgen v7 terrain base noise parameters");
 	gettext("Mapgen v7 terrain altitude noise parameters");
 	gettext("Mapgen v7 terrain persistation noise parameters");
 	gettext("Mapgen v7 height select noise parameters");
 	gettext("Mapgen v7 filler depth noise parameters");
 	gettext("Mapgen v7 mount height noise parameters");
-	gettext("Mapgen v7 ridge water noise parameters");
+	gettext("Mapgen v7 river course noise parameters");
+	gettext("Mapgen v7 floatland base terrain noise parameters");
+	gettext("Mapgen v7 floatland base terrain height noise parameters");
 	gettext("Mapgen v7 mountain noise parameters");
-	gettext("Mapgen v7 ridge noise parameters");
+	gettext("Mapgen v7 river channel wall noise parameters");
 	gettext("Mapgen v7 cave1 noise parameters");
 	gettext("Mapgen v7 cave2 noise parameters");
 	gettext("Mapgen flat");

From c67f2b29651eb98aaaf14649560d91ce5963223d Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 14 Dec 2016 00:31:12 +0100
Subject: [PATCH 393/418] Run updatepo.sh

---
 po/ca/minetest.po    |   26 +-
 po/cs/minetest.po    |  188 +-
 po/da/minetest.po    |  316 +-
 po/de/minetest.po    |  785 ++---
 po/eo/minetest.po    |   60 +-
 po/es/minetest.po    |   96 +-
 po/et/minetest.po    |  216 +-
 po/fr/minetest.po    |  813 ++---
 po/he/minetest.po    |    6 +-
 po/hu/minetest.po    |  342 +-
 po/id/minetest.po    |  202 +-
 po/it/minetest.po    |  264 +-
 po/ja/minetest.po    |   93 +-
 po/jbo/minetest.po   |   16 +-
 po/ky/minetest.po    |  122 +-
 po/lt/minetest.po    |  120 +-
 po/nb/minetest.po    |   42 +-
 po/nl/minetest.po    |  672 ++--
 po/pl/minetest.po    |  312 +-
 po/pt/minetest.po    |  290 +-
 po/pt_BR/minetest.po |  434 +--
 po/ro/minetest.po    |  156 +-
 po/ru/minetest.po    |  380 +--
 po/sw/minetest.po    | 7405 +++++++++++++++++++++---------------------
 po/tr/minetest.po    |   94 +-
 po/uk/minetest.po    |  162 +-
 po/zh_CN/minetest.po |  250 +-
 po/zh_TW/minetest.po |  158 +-
 28 files changed, 7015 insertions(+), 7005 deletions(-)

diff --git a/po/ca/minetest.po b/po/ca/minetest.po
index e97b069a2..eaf350f89 100644
--- a/po/ca/minetest.po
+++ b/po/ca/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-26 09:14+0000\n"
 "Last-Translator: tonibm19 <bennasar99@gmail.com>\n"
-"Language-Team: Catalan "
-"<https://hosted.weblate.org/projects/minetest/minetest/ca/>\n"
+"Language-Team: Catalan <https://hosted.weblate.org/projects/minetest/"
+"minetest/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2537,8 +2537,8 @@ msgid ""
 msgstr ""
 "Tecla per disminuir el rang de visió.\n"
 "Mira\n"
-"http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da"
-"1b0edf72eb3"
+"http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2555,8 +2555,8 @@ msgid ""
 msgstr ""
 "Tecla per incrementar el rang de visió.\n"
 "Mira\n"
-"http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da"
-"1b0edf72eb3"
+"http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4360,14 +4360,14 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "No!!!"
-#~ msgstr "No!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generar Mapes Normals"
+#~ msgid "No of course not!"
+#~ msgstr "No, per descomptat que no!"
 
 #~ msgid "Public Serverlist"
 #~ msgstr "Llista de servidors públics"
 
-#~ msgid "No of course not!"
-#~ msgstr "No, per descomptat que no!"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generar Mapes Normals"
+
+#~ msgid "No!!!"
+#~ msgstr "No!!!"
diff --git a/po/cs/minetest.po b/po/cs/minetest.po
index 6280cf70b..c7d1720f0 100644
--- a/po/cs/minetest.po
+++ b/po/cs/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-25 11:59+0000\n"
 "Last-Translator: Jakub Vaněk <vanek.jakub4@seznam.cz>\n"
-"Language-Team: Czech "
-"<https://hosted.weblate.org/projects/minetest/minetest/cs/>\n"
+"Language-Team: Czech <https://hosted.weblate.org/projects/minetest/minetest/"
+"cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1448,8 +1448,8 @@ msgid ""
 "minetest.net."
 msgstr ""
 "Zveřejnit do tohoto seznamu serverů.\n"
-"Jestliže chcete zveřejnit vaši ipv6 adresu, použijte  serverlist_url = "
-"v6.servers.minetest.net."
+"Jestliže chcete zveřejnit vaši ipv6 adresu, použijte  serverlist_url = v6."
+"servers.minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
@@ -4272,120 +4272,120 @@ msgstr "cURL limit paralelních stahování"
 msgid "cURL timeout"
 msgstr "cURL timeout"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "Přednačíst inventářové textury"
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "Detailní profilovací data modů. Užitečné pro vývojáře modů."
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Měřítko aplikované na prvky menu: "
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Detailní profilování modů"
 
-#~ msgid "Touch free target"
-#~ msgstr "Středový kurzor"
+#~ msgid "Useful for mod developers."
+#~ msgstr "Užitečné pro vývojáře modů."
 
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
+#~ msgid "No of course not!"
+#~ msgstr "Jistě že ne!"
 
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
+#~ msgid "Public Serverlist"
+#~ msgstr "Seznam veřejných serverů"
 
-#~ msgid "Downloading"
-#~ msgstr "Stahuji"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generovat normálové mapy"
 
-#~ msgid "Game Name"
-#~ msgstr "Název hry"
+#~ msgid "No!!!"
+#~ msgstr "Ne!!!"
 
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\""
+#~ msgid "\""
+#~ msgstr "\""
 
-#~ msgid "GAMES"
-#~ msgstr "HRY"
+#~ msgid "If disabled "
+#~ msgstr "Je-li zakázáno "
 
-#~ msgid "Mods:"
-#~ msgstr "Mody:"
+#~ msgid "If enabled, "
+#~ msgstr "Je-li povoleno, "
 
-#~ msgid "new game"
-#~ msgstr "nová hra"
+#~ msgid "Rendering:"
+#~ msgstr "Renderování:"
 
-#~ msgid "EDIT GAME"
-#~ msgstr "UPRAVIT HRU"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Odstranit vybraný mod"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Přidat mod"
-
-#~ msgid "CLIENT"
-#~ msgstr "KLIENT"
-
-#~ msgid "START SERVER"
-#~ msgstr "MÍSTNÍ SERVER"
-
-#~ msgid "Name"
-#~ msgstr "Jméno"
-
-#~ msgid "Password"
-#~ msgstr "Heslo"
-
-#~ msgid "SETTINGS"
-#~ msgstr "NASTAVENÍ"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Přednačíst textury předmětů"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Konečná voda"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "HRA JEDNOHO HRÁČE"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "BALÍČKY TEXTUR"
-
-#~ msgid "MODS"
-#~ msgstr "MODY"
-
-#~ msgid "Add mod:"
-#~ msgstr "Přidat mod:"
-
-#~ msgid "Local install"
-#~ msgstr "Místní instalace"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest"
 
 #~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
 #~ "Levý klik: Přesunout všechny předměty, Pravý klik: Přesunout jeden předmět"
 
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest"
+#~ msgid "Local install"
+#~ msgstr "Místní instalace"
 
-#~ msgid "Rendering:"
-#~ msgstr "Renderování:"
+#~ msgid "Add mod:"
+#~ msgstr "Přidat mod:"
 
-#~ msgid "If enabled, "
-#~ msgstr "Je-li povoleno, "
+#~ msgid "MODS"
+#~ msgstr "MODY"
 
-#~ msgid "If disabled "
-#~ msgstr "Je-li zakázáno "
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "BALÍČKY TEXTUR"
 
-#~ msgid "\""
-#~ msgstr "\""
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "HRA JEDNOHO HRÁČE"
 
-#~ msgid "No!!!"
-#~ msgstr "Ne!!!"
+#~ msgid "Finite Liquid"
+#~ msgstr "Konečná voda"
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generovat normálové mapy"
+#~ msgid "Preload item visuals"
+#~ msgstr "Přednačíst textury předmětů"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Seznam veřejných serverů"
+#~ msgid "SETTINGS"
+#~ msgstr "NASTAVENÍ"
 
-#~ msgid "No of course not!"
-#~ msgstr "Jistě že ne!"
+#~ msgid "Password"
+#~ msgstr "Heslo"
 
-#~ msgid "Useful for mod developers."
-#~ msgstr "Užitečné pro vývojáře modů."
+#~ msgid "Name"
+#~ msgstr "Jméno"
 
-#~ msgid "Detailed mod profiling"
-#~ msgstr "Detailní profilování modů"
+#~ msgid "START SERVER"
+#~ msgstr "MÍSTNÍ SERVER"
 
-#~ msgid "Detailed mod profile data. Useful for mod developers."
-#~ msgstr "Detailní profilovací data modů. Užitečné pro vývojáře modů."
+#~ msgid "CLIENT"
+#~ msgstr "KLIENT"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Přidat mod"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Odstranit vybraný mod"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "UPRAVIT HRU"
+
+#~ msgid "new game"
+#~ msgstr "nová hra"
+
+#~ msgid "Mods:"
+#~ msgstr "Mody:"
+
+#~ msgid "GAMES"
+#~ msgstr "HRY"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\""
+
+#~ msgid "Game Name"
+#~ msgstr "Název hry"
+
+#~ msgid "Downloading"
+#~ msgstr "Stahuji"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid "Touch free target"
+#~ msgstr "Středový kurzor"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Měřítko aplikované na prvky menu: "
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Přednačíst inventářové textury"
diff --git a/po/da/minetest.po b/po/da/minetest.po
index cc7e17993..b1aa649ba 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 20:49+0200\n"
+"POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-11-24 16:48+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
-"Language-Team: Danish "
-"<https://hosted.weblate.org/projects/minetest/minetest/da/>\n"
+"Language-Team: Danish <https://hosted.weblate.org/projects/minetest/minetest/"
+"da/>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1459,8 +1459,8 @@ msgid ""
 "minetest.net."
 msgstr ""
 "Meddel på denne serverliste\n"
-"Hvis du ønsker at annoncere din ipv6-adresse, så brug serverlist_url = "
-"v6.servers.minetest.net."
+"Hvis du ønsker at annoncere din ipv6-adresse, så brug serverlist_url = v6."
+"servers.minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
@@ -1923,7 +1923,8 @@ msgstr "Tryk to gange på »hop« for at flyve"
 
 #: src/settings_translation_file.cpp
 msgid "Double-tapping the jump key toggles fly mode."
-msgstr "Tryk på »hop« to gange for at skifte frem og tilbage fra flyvetilstand."
+msgstr ""
+"Tryk på »hop« to gange for at skifte frem og tilbage fra flyvetilstand."
 
 #: src/settings_translation_file.cpp
 msgid "Drop item key"
@@ -1982,8 +1983,8 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 "Aktiver brug af ekstern medieserver (hvis tilbudt af server).\n"
-"Eksterne servere tilbyder en signifikant hurtigere måde at hente medier ("
-"f.eks. teksturer\n"
+"Eksterne servere tilbyder en signifikant hurtigere måde at hente medier (f."
+"eks. teksturer\n"
 "ved forbindelse til serveren."
 
 #: src/settings_translation_file.cpp
@@ -2153,8 +2154,8 @@ msgid ""
 "at texture load time."
 msgstr ""
 "Filtrerede teksturer kan blande RGB-værdier med fuldt gennemsigtige naboer,\n"
-"som PNG-optimeringsprogrammer normalt fjerner, undertiden resulterende i en "
-"\n"
+"som PNG-optimeringsprogrammer normalt fjerner, undertiden resulterende i "
+"en \n"
 "mørk eller lys kant  for gennemsigtige teksturer. Anvend dette filter for at "
 "rydde\n"
 "op i dette på indlæsningstidspunktet for tekstur."
@@ -2530,7 +2531,8 @@ msgstr "Instrumentering"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
-msgstr "Interval for lagring af vigtige ændringer i verden, angivet i sekunder."
+msgstr ""
+"Interval for lagring af vigtige ændringer i verden, angivet i sekunder."
 
 #: src/settings_translation_file.cpp
 msgid "Interval of sending time of day to clients."
@@ -2579,8 +2581,8 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Kun Juliasæt: W-komponent for hyperkompleks konstant der bestemmer Juliaform."
-"\n"
+"Kun Juliasæt: W-komponent for hyperkompleks konstant der bestemmer "
+"Juliaform.\n"
 "Har ingen effekt på 3D-fraktaler.\n"
 "Interval cirka -2 til 2."
 
@@ -2590,8 +2592,8 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Kun Juliasæt: X-komponent for hyperkompleks konstant der bestemmer Juliaform."
-"\n"
+"Kun Juliasæt: X-komponent for hyperkompleks konstant der bestemmer "
+"Juliaform.\n"
 "Interval cirka -2 til 2."
 
 #: src/settings_translation_file.cpp
@@ -2600,8 +2602,8 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Kun Juliasæt: Y-komponent for hyperkompleks konstant der bestemmer Juliaform."
-"\n"
+"Kun Juliasæt: Y-komponent for hyperkompleks konstant der bestemmer "
+"Juliaform.\n"
 "Interval cirka -2 til 2."
 
 #: src/settings_translation_file.cpp
@@ -2610,8 +2612,8 @@ msgid ""
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Kun Juliasæt: Z-komponent for hyperkompleks konstant der bestemmer Juliaform."
-"\n"
+"Kun Juliasæt: Z-komponent for hyperkompleks konstant der bestemmer "
+"Juliaform.\n"
 "Interval cirka -2 til 2."
 
 #: src/settings_translation_file.cpp
@@ -2629,8 +2631,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast for mindskning af den sete afstand.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2639,8 +2641,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast som smider det nuværende valgte element.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2649,8 +2651,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast for øgning af den sete afstand.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2659,8 +2661,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast for hop.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2669,8 +2671,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at bevæge sig hurtigt i tilstanden hurtig.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2679,8 +2681,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at bevæge spilleren baglæns.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2689,8 +2691,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at bevæge spilleren fremad.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2699,8 +2701,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at bevæge spilleren mod venstre.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2709,8 +2711,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at bevæge spilleren mod højre.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2719,8 +2721,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at åbne snakkekonsollen (chat).\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2729,8 +2731,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at åbne snakkevinduet for at indtaste kommandoer.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2739,8 +2741,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at åbne snakkevinduet (chat).\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2749,8 +2751,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at åbne lageret.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2759,8 +2761,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at udskrive fejlsøgningsstakke. Brugt til udvikling.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2773,8 +2775,8 @@ msgstr ""
 "Tast til snigning.\n"
 "Bruges også til at klatre ned og synke ned i vand hvis aux1_descends er "
 "deaktiveret.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2783,8 +2785,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte mellem første- og tredjepersons kamera.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2793,8 +2795,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at lave skærmbilleder.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2803,8 +2805,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte til automatisk løb.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2813,8 +2815,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte til biograftilstand.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2823,8 +2825,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte til visning af minikort.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2833,8 +2835,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte til hurtig tilstand.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2843,8 +2845,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte til flyvning.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2853,8 +2855,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte til noclip-tilstand.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2863,8 +2865,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast for at skifte kameraopdateringen. Bruges kun til udvikling\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2873,8 +2875,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte til visning af fejlsøgningsinformation.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2883,8 +2885,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til skift af visningen for HUD'en.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2893,8 +2895,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte visningen af snakken (chat).\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2903,8 +2905,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte visningen af tåge.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2912,10 +2914,10 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tast til at skifte visningen af profileringsprogrammet. Brugt til udvikling."
-"\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Tast til at skifte visningen af profileringsprogrammet. Brugt til "
+"udvikling.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2924,8 +2926,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tast til at skifte til ubegrænset se-afstand.\n"
-"Se http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
@@ -4555,54 +4557,47 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "cURL-tidsudløb"
 
+#~ msgid "No of course not!"
+#~ msgstr "Nej selvfølgelig ikke!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Offentlig serverliste"
+
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Ned"
+#~ msgid "If disabled "
+#~ msgstr "Deaktivér alle"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "aktiveret"
 
-#~ msgid "is required by:"
-#~ msgstr "er påkrævet af:"
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Spil"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguration gemt.  "
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Gammelt kodeord"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende.  "
+#~ msgid "Preload item visuals"
+#~ msgstr "For-indlæs elementernes grafik"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver"
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n"
+#~ "De vil blive aktiveret som standard når du gemmer konfigurationen.  "
 
-#~ msgid "Show Public"
-#~ msgstr "Vis offentlig"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n"
+#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen.  "
 
-#~ msgid "Show Favorites"
-#~ msgstr "Vis favoritter"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server."
-
-#~ msgid "Create world"
-#~ msgstr "Skab verden"
-
-#~ msgid "Address required."
-#~ msgstr "Adresse påkrævet."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Kan ikke slette verden: ingenting valgt"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Filer som slettes"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Kan ikke skabe verden: ingen spil fundet"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Kan ikke konfigurere verden: ingenting valgt"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Mislykkedes i at slette alle verdenens filer"
+#~ msgid "Delete map"
+#~ msgstr "Slet mappen"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4629,44 +4624,51 @@ msgstr "cURL-tidsudløb"
 #~ "- ESC: denne menu\n"
 #~ "- T: snak\n"
 
-#~ msgid "Delete map"
-#~ msgstr "Slet mappen"
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Mislykkedes i at slette alle verdenens filer"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n"
-#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen.  "
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Kan ikke konfigurere verden: ingenting valgt"
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n"
-#~ "De vil blive aktiveret som standard når du gemmer konfigurationen.  "
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Kan ikke skabe verden: ingen spil fundet"
 
-#~ msgid "Preload item visuals"
-#~ msgstr "For-indlæs elementernes grafik"
+#~ msgid "Files to be deleted"
+#~ msgstr "Filer som slettes"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Kan ikke slette verden: ingenting valgt"
+
+#~ msgid "Address required."
+#~ msgstr "Adresse påkrævet."
+
+#~ msgid "Create world"
+#~ msgstr "Skab verden"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Vis favoritter"
+
+#~ msgid "Show Public"
+#~ msgstr "Vis offentlig"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguration gemt.  "
+
+#~ msgid "is required by:"
+#~ msgstr "er påkrævet af:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed"
 
 #, fuzzy
-#~ msgid "Password"
-#~ msgstr "Gammelt kodeord"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Spil"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "aktiveret"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Deaktivér alle"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Offentlig serverliste"
-
-#~ msgid "No of course not!"
-#~ msgstr "Nej selvfølgelig ikke!"
+#~ msgid "Downloading"
+#~ msgstr "Ned"
diff --git a/po/de/minetest.po b/po/de/minetest.po
index 993dec137..6a60ef24f 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-12-11 09:22+0000\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
-"Language-Team: German "
-"<https://hosted.weblate.org/projects/minetest/minetest/de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/minetest/minetest/"
+"de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2829,8 +2829,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Taste zum Umschalten des automatischen Vorwärtsgehens.\n"
-"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2890,8 +2890,8 @@ msgid ""
 msgstr ""
 "Taste zum Umschalten der Kameraaktualisierung. Nur für die Entwicklung "
 "benutzt.\n"
-"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3159,8 +3159,8 @@ msgid ""
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
 "Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n"
-"Zu einer flachen Welt können gelegentliche Seen und Hügel hinzugefügt werden."
-"\n"
+"Zu einer flachen Welt können gelegentliche Seen und Hügel hinzugefügt "
+"werden.\n"
 "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
 "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
@@ -3556,7 +3556,8 @@ msgstr "Maximale Gesamtanzahl der Blöcke, die gleichzeitig gesendet werden."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that are simultaneously sent per client."
-msgstr "Maximale Anzahl der Blöcke, die gleichzeitig je Client gesendet werden."
+msgstr ""
+"Maximale Anzahl der Blöcke, die gleichzeitig je Client gesendet werden."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
@@ -4322,8 +4323,8 @@ msgid ""
 "The file path relative to your worldpath in which profiles will be saved "
 "to.\n"
 msgstr ""
-"Der Dateipfad relativ zu Ihrem Weltpfad, in dem Profile abgespeichert werden."
-"\n"
+"Der Dateipfad relativ zu Ihrem Weltpfad, in dem Profile abgespeichert "
+"werden.\n"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -4786,307 +4787,127 @@ msgstr "cURL-Parallel-Begrenzung"
 msgid "cURL timeout"
 msgstr "cURL-Zeitüberschreitung"
 
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "Detaillierte Mod-Profildaten. Nützlich für Mod-Entwickler."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Detailliertes Mod-Profiling"
+
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr ""
+#~ "Wie viele Kartenblöcke gleichzeitig für den gesamten Server auf der "
+#~ "Leitung unterwegs sind."
+
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr ""
+#~ "Wie viele Kartenblöcke gleichzeitig pro Client auf der Leitung unterwegs "
+#~ "sind."
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Nützlich für Mod-Entwickler."
+
+#~ msgid "No of course not!"
+#~ msgstr "Nein, natürlich nicht!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Öffentliche Serverliste"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normalmaps generieren"
+
+#~ msgid "No!!!"
+#~ msgstr "Nein!!!"
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n"
-#~ "Gelegentlich werden Seen und Hügel zur flachen Welt hinzugefügt.\n"
-#~ "Die von der Engine standardmäßig gesetzten Flags sind: keine.\n"
-#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
+#~ "Kartengenerierungsattribute speziell für den Täler-Kartengenerator.\n"
 #~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 #~ "werden von der Standardeinstellung unverändert gelassen.\n"
 #~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren."
+#~ "zu deaktivieren.\n"
+#~ "„altitude_chill“ macht höhere Höhen kälter, was zu einigen Biomproblemen "
+#~ "führen könnte.\n"
+#~ "„humid_rivers“ modifiziert die Luftfeuchtigkeit um Flüssen und in "
+#~ "Gebieten, in denen das Wasser sich in Pfützen ansammeln würde.\n"
+#~ "Dies könnte mit fein abgestimmten Biomen zu Konflikten führen."
 
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "Kartengenerierungsattribute speziell für den Kartengenerator v7.\n"
-#~ "Das „ridges“-Flag steuert die Flüsse.\n"
-#~ "Die von der Engine standardmäßig gesetzten Flags lauten:\n"
-#~ "„mountains, ridges“.\n"
-#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
-#~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
-#~ "werden von der Standardeinstellung unverändert gelassen.\n"
-#~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren."
+#, fuzzy
+#~ msgid "\""
+#~ msgstr "”"
 
-#~ msgid "Item textures..."
-#~ msgstr "Inventarbilder ..."
+#~ msgid "Enable a bit lower water surface, so it doesn't "
+#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht "
 
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n"
-#~ "nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n"
-#~ "optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n"
-#~ "nicht mit dieser Einstellung funktioniert."
+#~ msgid "If disabled "
+#~ msgstr "Wenn deaktiviert "
 
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)."
+#~ msgid "If enabled, "
+#~ msgstr "Wenn aktiviert, "
 
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
-#~ "Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n"
-#~ "Nodes multipliziert."
+#~ msgid "Rendering:"
+#~ msgstr "Rendering:"
 
-#~ msgid ""
-#~ "Julia set: W value determining the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Julia-Menge: W-Wert, der die 4D-Form festlegt.\n"
-#~ "Weite liegt grob zwischen -2 und 2."
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Neustart nach Ändern des Treibers erforderlich"
 
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n"
-#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgid "Downloading"
+#~ msgstr "Lade herunter"
 
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n"
-#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen"
 
-#~ msgid ""
-#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
-#~ "Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n"
-#~ "Versätze in Nodes multipliziert."
+#~ msgid "is required by:"
+#~ msgstr "wird benötigt von:"
 
-#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
-#~ msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes."
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguration gespeichert.  "
 
-#~ msgid ""
-#~ "Mandelbrot set: Iterations of the recursive function.\n"
-#~ "Controls scale of finest detail."
-#~ msgstr ""
-#~ "Mandelbrotmenge: Iterationen der rekursiven Funktion.\n"
-#~ "Steuert die Skalierung mit einem sehr hohem Detailgrad."
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Warnung: Konfiguration nicht konsistent.  "
 
-#~ msgid ""
-#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-"
-#~ "Form.\n"
-#~ "Die Weite liegt grob zwischen -2 und 2."
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen"
 
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen fractal.\n"
-#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
-#~ msgstr ""
-#~ "Kartengenerierungsattribute, die speziell für den Fraktale-\n"
-#~ "Kartenerzeuger sind.\n"
-#~ "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n"
-#~ "Mandelbrotmenge aus.\n"
-#~ "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
-#~ "werden von der Standardeinstellung unverändert gelassen.\n"
-#~ "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren."
+#~ msgid "Show Public"
+#~ msgstr "Zeige öffentliche"
 
-#~ msgid "Mapgen fractal mandelbrot iterations"
-#~ msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger"
+#~ msgid "Show Favorites"
+#~ msgstr "Zeige Favoriten"
 
-#~ msgid "Mapgen fractal mandelbrot offset"
-#~ msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten."
 
-#~ msgid "Mapgen fractal mandelbrot scale"
-#~ msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger"
+#~ msgid "Create world"
+#~ msgstr "Welt erstellen"
 
-#~ msgid "Mapgen fractal mandelbrot slice w"
-#~ msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger"
+#~ msgid "Address required."
+#~ msgstr "Adresse benötigt."
 
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Höchstabstand über dem Meeresspiegel für den Spieler-\n"
-#~ "startpunkt. Größere Werte führen zu Startpunkten näher an\n"
-#~ "(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n"
-#~ "brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n"
-#~ "Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n"
-#~ "eingegraben ist."
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt"
 
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Minimal gewünschte Bildwiederholrate.\n"
-#~ "Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch "
-#~ "angepasst; auch\n"
-#~ "die minimale und maximale Sichtweite werden angepasst."
+#~ msgid "Files to be deleted"
+#~ msgstr "Zu löschende Dateien"
 
-#~ msgid "New style water"
-#~ msgstr "Wasser im neuen Stil"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden"
 
-#~ msgid ""
-#~ "Pre-generate all item visuals used in the inventory.\n"
-#~ "This increases startup time, but runs smoother in-game.\n"
-#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
-#~ "the inventory."
-#~ msgstr ""
-#~ "Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n"
-#~ "Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel "
-#~ "führen.\n"
-#~ "Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte "
-#~ "im Inventar\n"
-#~ "verursachen kann."
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "Texturen vorgenerieren"
-
-#~ msgid ""
-#~ "The allowed adjustment range for the automatic rendering range "
-#~ "adjustment.\n"
-#~ "Set this to be equal to viewing range minimum to disable the auto-"
-#~ "adjustment algorithm."
-#~ msgstr ""
-#~ "Die erlaubte Anpassungsreichweite für die automatische Render-"
-#~ "Reichweitenanpassung.\n"
-#~ "Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um "
-#~ "den automatischen\n"
-#~ "Anpassungsalgorithmus zu deaktivieren."
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Anfängliche Fensterhöhe."
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Vertikaler Startpunktbereich"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Minimale Sichtweite"
-
-#~ msgid "Wanted FPS"
-#~ msgstr "Gewünschte Bildwiederholrate"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: "
-
-#~ msgid "Touch free target"
-#~ msgstr "Berührungsfreies Ziel"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
-
-#~ msgid "Game Name"
-#~ msgstr "Spielname"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren"
-
-#~ msgid "GAMES"
-#~ msgstr "SPIELE"
-
-#~ msgid "Mods:"
-#~ msgstr "Mods:"
-
-#~ msgid "new game"
-#~ msgstr "neues Spiel"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "SPIEL ÄNDERN"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Ausgewählte Mod löschen"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Mod hinzufügen"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "START SERVER"
-#~ msgstr "SERVER STARTEN"
-
-#~ msgid "Name"
-#~ msgstr "Name"
-
-#~ msgid "Password"
-#~ msgstr "Passwort"
-
-#~ msgid "SETTINGS"
-#~ msgstr "EINSTELLUNGEN"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Lade Inventarbilder vor"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Endliches Wasser"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "EINZELSPIELER"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "TEXTUREN PAKETE"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "Add mod:"
-#~ msgstr "Modifikation hinzufügen:"
-
-#~ msgid "Local install"
-#~ msgstr "Lokale Install."
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n"
-#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird.  "
-
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Warnung: Einige konfigurierte Mods fehlen.\n"
-#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert "
-#~ "wird.  "
-
-#~ msgid "KEYBINDINGS"
-#~ msgstr "TASTEN EINST."
-
-#~ msgid "Delete map"
-#~ msgstr "Karte löschen"
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -5112,124 +4933,304 @@ msgstr "cURL-Zeitüberschreitung"
 #~ "- I: Inventar\n"
 #~ "- T: Chat\n"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden"
+#~ msgid "Delete map"
+#~ msgstr "Karte löschen"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Zu löschende Dateien"
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt"
-
-#~ msgid "Address required."
-#~ msgstr "Adresse benötigt."
-
-#~ msgid "Create world"
-#~ msgstr "Welt erstellen"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten."
-
-#~ msgid "Show Favorites"
-#~ msgstr "Zeige Favoriten"
-
-#~ msgid "Show Public"
-#~ msgstr "Zeige öffentliche"
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen"
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Warnung: Konfiguration nicht konsistent.  "
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguration gespeichert.  "
-
-#~ msgid "is required by:"
-#~ msgstr "wird benötigt von:"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen"
-
-#~ msgid "Downloading"
-#~ msgstr "Lade herunter"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Neustart nach Ändern des Treibers erforderlich"
-
-#~ msgid "Rendering:"
-#~ msgstr "Rendering:"
-
-#~ msgid "If enabled, "
-#~ msgstr "Wenn aktiviert, "
-
-#~ msgid "If disabled "
-#~ msgstr "Wenn deaktiviert "
-
-#~ msgid "Enable a bit lower water surface, so it doesn't "
-#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht "
-
-#, fuzzy
-#~ msgid "\""
-#~ msgstr "”"
+#~ msgid "KEYBINDINGS"
+#~ msgstr "TASTEN EINST."
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Warnung: Einige konfigurierte Mods fehlen.\n"
+#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert "
+#~ "wird.  "
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n"
+#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird.  "
+
+#~ msgid "Local install"
+#~ msgstr "Lokale Install."
+
+#~ msgid "Add mod:"
+#~ msgstr "Modifikation hinzufügen:"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "TEXTUREN PAKETE"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "EINZELSPIELER"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Endliches Wasser"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Lade Inventarbilder vor"
+
+#~ msgid "SETTINGS"
+#~ msgstr "EINSTELLUNGEN"
+
+#~ msgid "Password"
+#~ msgstr "Passwort"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "START SERVER"
+#~ msgstr "SERVER STARTEN"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Mod hinzufügen"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Ausgewählte Mod löschen"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "SPIEL ÄNDERN"
+
+#~ msgid "new game"
+#~ msgstr "neues Spiel"
+
+#~ msgid "Mods:"
+#~ msgstr "Mods:"
+
+#~ msgid "GAMES"
+#~ msgstr "SPIELE"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren"
+
+#~ msgid "Game Name"
+#~ msgstr "Spielname"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid "Touch free target"
+#~ msgstr "Berührungsfreies Ziel"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: "
+
+#~ msgid "Wanted FPS"
+#~ msgstr "Gewünschte Bildwiederholrate"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Minimale Sichtweite"
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Vertikaler Startpunktbereich"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Anfängliche Fensterhöhe."
+
+#~ msgid ""
+#~ "The allowed adjustment range for the automatic rendering range "
+#~ "adjustment.\n"
+#~ "Set this to be equal to viewing range minimum to disable the auto-"
+#~ "adjustment algorithm."
+#~ msgstr ""
+#~ "Die erlaubte Anpassungsreichweite für die automatische Render-"
+#~ "Reichweitenanpassung.\n"
+#~ "Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um "
+#~ "den automatischen\n"
+#~ "Anpassungsalgorithmus zu deaktivieren."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Texturen vorgenerieren"
+
+#~ msgid ""
+#~ "Pre-generate all item visuals used in the inventory.\n"
+#~ "This increases startup time, but runs smoother in-game.\n"
+#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
+#~ "the inventory."
+#~ msgstr ""
+#~ "Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n"
+#~ "Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel "
+#~ "führen.\n"
+#~ "Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte "
+#~ "im Inventar\n"
+#~ "verursachen kann."
+
+#~ msgid "New style water"
+#~ msgstr "Wasser im neuen Stil"
+
+#~ msgid ""
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Minimal gewünschte Bildwiederholrate.\n"
+#~ "Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch "
+#~ "angepasst; auch\n"
+#~ "die minimale und maximale Sichtweite werden angepasst."
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Höchstabstand über dem Meeresspiegel für den Spieler-\n"
+#~ "startpunkt. Größere Werte führen zu Startpunkten näher an\n"
+#~ "(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n"
+#~ "brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n"
+#~ "Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n"
+#~ "eingegraben ist."
+
+#~ msgid "Mapgen fractal mandelbrot slice w"
+#~ msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger"
+
+#~ msgid "Mapgen fractal mandelbrot scale"
+#~ msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger"
+
+#~ msgid "Mapgen fractal mandelbrot offset"
+#~ msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger"
+
+#~ msgid "Mapgen fractal mandelbrot iterations"
+#~ msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger"
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen fractal.\n"
+#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with \"no\" are used to explicitly disable them."
 #~ msgstr ""
-#~ "Kartengenerierungsattribute speziell für den Täler-Kartengenerator.\n"
+#~ "Kartengenerierungsattribute, die speziell für den Fraktale-\n"
+#~ "Kartenerzeuger sind.\n"
+#~ "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n"
+#~ "Mandelbrotmenge aus.\n"
+#~ "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
+#~ "werden von der Standardeinstellung unverändert gelassen.\n"
+#~ "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
+#~ "zu deaktivieren."
+
+#~ msgid ""
+#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-"
+#~ "Form.\n"
+#~ "Die Weite liegt grob zwischen -2 und 2."
+
+#~ msgid ""
+#~ "Mandelbrot set: Iterations of the recursive function.\n"
+#~ "Controls scale of finest detail."
+#~ msgstr ""
+#~ "Mandelbrotmenge: Iterationen der rekursiven Funktion.\n"
+#~ "Steuert die Skalierung mit einem sehr hohem Detailgrad."
+
+#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+#~ msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes."
+
+#~ msgid ""
+#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
+#~ "Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n"
+#~ "Versätze in Nodes multipliziert."
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n"
+#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n"
+#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Julia set: W value determining the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Julia-Menge: W-Wert, der die 4D-Form festlegt.\n"
+#~ "Weite liegt grob zwischen -2 und 2."
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
+#~ "Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n"
+#~ "Nodes multipliziert."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n"
+#~ "nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n"
+#~ "optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n"
+#~ "nicht mit dieser Einstellung funktioniert."
+
+#~ msgid "Item textures..."
+#~ msgstr "Inventarbilder ..."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Kartengenerierungsattribute speziell für den Kartengenerator v7.\n"
+#~ "Das „ridges“-Flag steuert die Flüsse.\n"
+#~ "Die von der Engine standardmäßig gesetzten Flags lauten:\n"
+#~ "„mountains, ridges“.\n"
+#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
 #~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 #~ "werden von der Standardeinstellung unverändert gelassen.\n"
 #~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
-#~ "zu deaktivieren.\n"
-#~ "„altitude_chill“ macht höhere Höhen kälter, was zu einigen Biomproblemen "
-#~ "führen könnte.\n"
-#~ "„humid_rivers“ modifiziert die Luftfeuchtigkeit um Flüssen und in "
-#~ "Gebieten, in denen das Wasser sich in Pfützen ansammeln würde.\n"
-#~ "Dies könnte mit fein abgestimmten Biomen zu Konflikten führen."
-
-#~ msgid "No!!!"
-#~ msgstr "Nein!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normalmaps generieren"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Öffentliche Serverliste"
-
-#~ msgid "No of course not!"
-#~ msgstr "Nein, natürlich nicht!"
-
-#~ msgid "Useful for mod developers."
-#~ msgstr "Nützlich für Mod-Entwickler."
-
-#~ msgid "How many blocks are flying in the wire simultaneously per client."
-#~ msgstr ""
-#~ "Wie viele Kartenblöcke gleichzeitig pro Client auf der Leitung unterwegs "
-#~ "sind."
+#~ "zu deaktivieren."
 
 #~ msgid ""
-#~ "How many blocks are flying in the wire simultaneously for the whole "
-#~ "server."
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Wie viele Kartenblöcke gleichzeitig für den gesamten Server auf der "
-#~ "Leitung unterwegs sind."
-
-#~ msgid "Detailed mod profiling"
-#~ msgstr "Detailliertes Mod-Profiling"
-
-#~ msgid "Detailed mod profile data. Useful for mod developers."
-#~ msgstr "Detaillierte Mod-Profildaten. Nützlich für Mod-Entwickler."
+#~ "Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n"
+#~ "Gelegentlich werden Seen und Hügel zur flachen Welt hinzugefügt.\n"
+#~ "Die von der Engine standardmäßig gesetzten Flags sind: keine.\n"
+#~ "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
+#~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
+#~ "werden von der Standardeinstellung unverändert gelassen.\n"
+#~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
+#~ "zu deaktivieren."
diff --git a/po/eo/minetest.po b/po/eo/minetest.po
index 254b686ff..adf29a0b6 100644
--- a/po/eo/minetest.po
+++ b/po/eo/minetest.po
@@ -4306,42 +4306,42 @@ msgid "cURL timeout"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Ŝargi teksturojn…"
+#~ msgid "Useful for mod developers."
+#~ msgstr "Eksaj kernprogramistoj"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Skala faktoro por menuoj "
+#~ msgid "No of course not!"
+#~ msgstr "Ne, memkompreneble!"
 
-#~ msgid "Touch free target"
-#~ msgstr "Sentuŝa celo"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon"
-
-#~ msgid "Rendering:"
-#~ msgstr "Bildigo:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "ŝaltita"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Malŝaltu modifaron"
-
-#~ msgid "No!!!"
-#~ msgstr "Ne!!!"
+#~ msgid "Public Serverlist"
+#~ msgstr "Publika servilolisto"
 
 #, fuzzy
 #~ msgid "Generate Normalmaps"
 #~ msgstr "Generi Normalmapojn"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Publika servilolisto"
-
-#~ msgid "No of course not!"
-#~ msgstr "Ne, memkompreneble!"
+#~ msgid "No!!!"
+#~ msgstr "Ne!!!"
 
 #, fuzzy
-#~ msgid "Useful for mod developers."
-#~ msgstr "Eksaj kernprogramistoj"
+#~ msgid "If disabled "
+#~ msgstr "Malŝaltu modifaron"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "ŝaltita"
+
+#~ msgid "Rendering:"
+#~ msgstr "Bildigo:"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon"
+
+#~ msgid "Touch free target"
+#~ msgstr "Sentuŝa celo"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Skala faktoro por menuoj "
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Ŝargi teksturojn…"
diff --git a/po/es/minetest.po b/po/es/minetest.po
index 8324ed251..72438dc26 100644
--- a/po/es/minetest.po
+++ b/po/es/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-04 03:39+0000\n"
 "Last-Translator: Alfonso R. Zepeda R. <ing.a.zepeda@gmx.com>\n"
-"Language-Team: Spanish "
-"<https://hosted.weblate.org/projects/minetest/minetest/es/>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/minetest/"
+"minetest/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4424,59 +4424,59 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "Tiempo de espera de cURL"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "Precarga de las texturas del inventario"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Factor de escala aplicado a los elementos del menú: "
-
-#~ msgid "Touch free target"
-#~ msgstr "Tocar para interactuar"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
-
-#~ msgid "Restart minetest for driver change to take effect"
+#~ msgid "Detailed mod profile data. Useful for mod developers."
 #~ msgstr ""
-#~ "Reinicia minetest para que los cambios en el controlador tengan efecto"
+#~ "Datos detallados de perfilación de mod. Útil para desarrolladores de mods."
 
-#~ msgid "Rendering:"
-#~ msgstr "Renderizado:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Activado"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Desactivar paquete"
-
-#~ msgid "No!!!"
-#~ msgstr "¡¡¡No!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generar mapas normales"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista de servidores públicos"
-
-#~ msgid "No of course not!"
-#~ msgstr "¡No, claro que no!"
-
-#~ msgid "Useful for mod developers."
-#~ msgstr "Útil para los desarrolladores de mods."
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Perfilador detallado de los mods"
 
 #~ msgid ""
 #~ "How many blocks are flying in the wire simultaneously for the whole "
 #~ "server."
 #~ msgstr "Cantidad de bloques que flotan simultáneamente en todo el servidor."
 
-#~ msgid "Detailed mod profiling"
-#~ msgstr "Perfilador detallado de los mods"
+#~ msgid "Useful for mod developers."
+#~ msgstr "Útil para los desarrolladores de mods."
 
-#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgid "No of course not!"
+#~ msgstr "¡No, claro que no!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista de servidores públicos"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generar mapas normales"
+
+#~ msgid "No!!!"
+#~ msgstr "¡¡¡No!!!"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Desactivar paquete"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Activado"
+
+#~ msgid "Rendering:"
+#~ msgstr "Renderizado:"
+
+#~ msgid "Restart minetest for driver change to take effect"
 #~ msgstr ""
-#~ "Datos detallados de perfilación de mod. Útil para desarrolladores de mods."
+#~ "Reinicia minetest para que los cambios en el controlador tengan efecto"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid "Touch free target"
+#~ msgstr "Tocar para interactuar"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Factor de escala aplicado a los elementos del menú: "
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Precarga de las texturas del inventario"
diff --git a/po/et/minetest.po b/po/et/minetest.po
index c17658374..94c9c7207 100644
--- a/po/et/minetest.po
+++ b/po/et/minetest.po
@@ -4304,55 +4304,70 @@ msgid "cURL timeout"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Alla"
+#~ msgid "Useful for mod developers."
+#~ msgstr "Põhiline arendaja"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgid "Public Serverlist"
+#~ msgstr "Avalikud serverid"
+
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Lülita kõik välja"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Sisse lülitatud"
+
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Mäng"
+
+#~ msgid "GAMES"
+#~ msgstr "MÄNGUD"
+
+#~ msgid "new game"
+#~ msgstr "uus mängu"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MUUDA MÄNGU"
+
+#, fuzzy
+#~ msgid "Remove selected mod"
+#~ msgstr "Eemalda valitud muutus"
+
+#, fuzzy
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Lisama muutus"
+
+#~ msgid "Name"
+#~ msgstr "Nimi"
+
+#~ msgid "Password"
+#~ msgstr "Parool"
+
+#~ msgid "SETTINGS"
+#~ msgstr "Seaded"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Lae asjade visuaale"
+
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Löppev vedelik"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut "
-#~ "asja"
+#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n"
+#~ "Need lülitatakse sisse kohe pärast sätete salvestamist."
 
-#~ msgid "is required by:"
-#~ msgstr "Seda vajavad:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguratsioon salvestatud. "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Hoiatus: Konfiguratsioon pole kindel."
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti"
-
-#~ msgid "Show Public"
-#~ msgstr "Näita avalikke"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Näita lemmikuid"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit."
-
-#~ msgid "Create world"
-#~ msgstr "Loo maailm"
-
-#~ msgid "Address required."
-#~ msgstr "IP on vajalkik."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Failid mida kustutada"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n"
+#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon."
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4379,68 +4394,53 @@ msgstr ""
 #~ "- ESC: Menüü\n"
 #~ "- T: Jututupa\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Failid mida kustutada"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud"
+
+#~ msgid "Address required."
+#~ msgstr "IP on vajalkik."
+
+#~ msgid "Create world"
+#~ msgstr "Loo maailm"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Näita lemmikuid"
+
+#~ msgid "Show Public"
+#~ msgstr "Näita avalikke"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Hoiatus: Konfiguratsioon pole kindel."
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguratsioon salvestatud. "
+
+#~ msgid "is required by:"
+#~ msgstr "Seda vajavad:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
-#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n"
-#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon."
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n"
-#~ "Need lülitatakse sisse kohe pärast sätete salvestamist."
+#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut "
+#~ "asja"
 
 #, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Löppev vedelik"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Lae asjade visuaale"
-
-#~ msgid "SETTINGS"
-#~ msgstr "Seaded"
-
-#~ msgid "Password"
-#~ msgstr "Parool"
-
-#~ msgid "Name"
-#~ msgstr "Nimi"
-
-#, fuzzy
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Lisama muutus"
-
-#, fuzzy
-#~ msgid "Remove selected mod"
-#~ msgstr "Eemalda valitud muutus"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MUUDA MÄNGU"
-
-#~ msgid "new game"
-#~ msgstr "uus mängu"
-
-#~ msgid "GAMES"
-#~ msgstr "MÄNGUD"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Mäng"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Sisse lülitatud"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Lülita kõik välja"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Avalikud serverid"
-
-#, fuzzy
-#~ msgid "Useful for mod developers."
-#~ msgstr "Põhiline arendaja"
+#~ msgid "Downloading"
+#~ msgstr "Alla"
diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index 113d50dd8..f3aec72a6 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-11-27 10:39+0000\n"
 "Last-Translator: Onyx Steinheim <thevoxelmanonyx@gmail.com>\n"
-"Language-Team: French "
-"<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/minetest/minetest/"
+"fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -628,7 +628,8 @@ msgstr "Textures :"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr "Pour activer les textures nuancées, le pilote OpenGL doit être utilisé."
+msgstr ""
+"Pour activer les textures nuancées, le pilote OpenGL doit être utilisé."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
@@ -1306,8 +1307,8 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"(X,Y,Z) décalage de fractale à partir du centre du monde en unités \"d'"
-"échelle\".\n"
+"(X,Y,Z) décalage de fractale à partir du centre du monde en unités "
+"\"d'échelle\".\n"
 "Utilisé pour déplacer une zone de frai convenable à proximité des basses "
 "terres (0, 0).\n"
 "La valeur par défaut est adaptée pour les ensembles de Mandelbrot, elle doit "
@@ -2337,8 +2338,8 @@ msgid ""
 msgstr ""
 "Traitement des appels d'API Lua obsolètes :\n"
 "- legacy : imite l'ancien comportement (par défaut en mode release).\n"
-"- log : imite et enregistre les appels obsolètes (par défaut en mode debug)."
-"\n"
+"- log : imite et enregistre les appels obsolètes (par défaut en mode "
+"debug).\n"
 "- error : interruption à l'usage d'un appel obsolète (recommandé pour les "
 "développeurs de mods)."
 
@@ -2740,8 +2741,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Touche pour ouvrir la console de chat.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
-"5e3da1b0edf72eb3"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2750,8 +2751,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Touche pour ouvrir la fenêtre du chat pour entrer des commandes.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
-"5e3da1b0edf72eb3"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2794,8 +2795,8 @@ msgstr ""
 "Touche pour se faufiler.\n"
 "Egalement utilisée pour descendre et plonger dans l'eau si aux1_descends est "
 "désactivé.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
-"5e3da1b0edf72eb3"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2824,8 +2825,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Touche d’exécution automatique.\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
-"5e3da1b0edf72eb3"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2883,10 +2884,10 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Touche de mise à jour de la caméra. Seulement utilisé pour le développement."
-"\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
-"5e3da1b0edf72eb3"
+"Touche de mise à jour de la caméra. Seulement utilisé pour le "
+"développement.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2905,8 +2906,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Touche pour afficher/masquer le HUD ( Affichage tête haute).\n"
-"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173"
-"5e3da1b0edf72eb3"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4219,8 +4220,8 @@ msgid ""
 msgstr ""
 "Spécifie l'URL à laquelle les clients obtiennent les fichiers média au lieu "
 "d'utiliser le port UDP.\n"
-"$filename doit être accessible depuis $remote_media$filename via cURL ("
-"évidemment, remote_media devrait\n"
+"$filename doit être accessible depuis $remote_media$filename via cURL "
+"(évidemment, remote_media devrait\n"
 "se terminer avec un slash).\n"
 "Les fichiers qui ne sont pas présents seront récupérés de la manière "
 "habituelle."
@@ -4455,7 +4456,8 @@ msgstr "Activer les nuages 3D au lieu des nuages 2D (plats)."
 
 #: src/settings_translation_file.cpp
 msgid "Use a cloud animation for the main menu background."
-msgstr "Utiliser une animation de nuages pour l'arrière-plan du menu principal."
+msgstr ""
+"Utiliser une animation de nuages pour l'arrière-plan du menu principal."
 
 #: src/settings_translation_file.cpp
 msgid "Use anisotropic filtering when viewing at textures from an angle."
@@ -4473,7 +4475,8 @@ msgstr "Utiliser"
 
 #: src/settings_translation_file.cpp
 msgid "Use mip mapping to scale textures. May slightly increase performance."
-msgstr "Utilisation du mip-mapping. Peut augmenter légèrement les performances."
+msgstr ""
+"Utilisation du mip-mapping. Peut augmenter légèrement les performances."
 
 #: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
@@ -4758,268 +4761,150 @@ msgstr "Limite parallèle de cURL"
 msgid "cURL timeout"
 msgstr "Délais d'interruption de cURL"
 
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr ""
+#~ "Profil détaillé des données du mod. Utile pour les développeurs de mods."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Profil détaillé des mods"
+
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr "Nombre maximum de mapblocks simultanés envoyés sur le serveur."
+
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "Nombre maximum de mapblocks simultanés envoyés par client."
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Utile pour les développeurs de mods."
+
+#~ msgid "No of course not!"
+#~ msgstr "Non, bien sûr que non !"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Liste de serveurs publics"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normal Mapping"
+
+#~ msgid "No!!!"
+#~ msgstr "Non !"
+
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Attributs de terrain spécifiques au générateur de carte plate.\n"
-#~ "Lacs et collines peuvent partiellement être ajoutés à un monde plat.\n"
-#~ "Aucun drapeau par défaut défini dans le moteur.\n"
-#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
-#~ "Les drapeaux qui ne sont pas spécifiés dans le champ gardent leurs "
-#~ "valeurs par défaut.\n"
-#~ "Les drapeaux commençant par \"non\" sont désactivés."
+#~ "Attributs généraux de la génération de terrain.\n"
+#~ "Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent "
+#~ "leurs valeurs par défaut."
+
+#~ msgid "\""
+#~ msgstr "\""
+
+#~ msgid "Enable a bit lower water surface, so it doesn't "
+#~ msgstr ""
+#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas "
+#~ "le bloc complètement.\n"
+#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux "
+#~ "ne fonctionne pas dessus. "
+
+#~ msgid "If disabled "
+#~ msgstr "Si désactivé "
+
+#~ msgid "If enabled, "
+#~ msgstr "Si activé, "
+
+#~ msgid "Rendering:"
+#~ msgstr "Affichage :"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet"
+
+#~ msgid "Game Name"
+#~ msgstr "Nom du jeu"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\""
+
+#~ msgid "GAMES"
+#~ msgstr "JEUX"
+
+#~ msgid "Mods:"
+#~ msgstr "Mods :"
+
+#~ msgid "new game"
+#~ msgstr "nouveau jeu"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MODIFIER LE JEU"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Supprimer le mod sélectionné"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Ajouter un mod"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "DÉMARRER LE SERVEUR"
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "SETTINGS"
+#~ msgstr "PARAMÈTRES"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Précharger les objets"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Liquides limités"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "PARTIE SOLO"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACKS DE TEXTURES"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "Add mod:"
+#~ msgstr "Ajouter un mod :"
+
+#~ msgid "Local install"
+#~ msgstr "Installation locale"
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Attributs spécifiques à Mapgen V7.\n"
-#~ "Le drapeau 'des crêtes' contrôle les rivières.\n"
-#~ "Les drapeaux par défaut définis dans le moteur sont: montagnes, crêtes.\n"
-#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
-#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
-#~ "par défaut.\n"
-#~ "Les drapeaux commençant par \"non\" sont désactivés."
-
-#~ msgid "Item textures..."
-#~ msgstr "Textures d'items..."
+#~ "Attention : certains mods ne sont pas encore configurés.\n"
+#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. "
 
 #~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
 #~ msgstr ""
-#~ "Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne "
-#~ "submerge pas\n"
-#~ "entièrement le bloc voisin.\n"
-#~ "Cette fonctionnalité est encore expérimentale et la lumière douce "
-#~ "n’apparaît pas à la\n"
-#~ "surface de l'eau."
+#~ "Attention : certains mods configurés sont introuvables.\n"
+#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. "
 
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr ""
-#~ "Active l'éclairage des blocs pointés (et supprime les bordures noires de "
-#~ "sélection)."
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n"
-#~ "La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler "
-#~ "en nombre de blocs."
-
-#~ msgid ""
-#~ "Julia set: W value determining the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Série Julia : valeur W déterminant la forme 4D.\n"
-#~ "La portée est environ entre -2 et 2."
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Touche pour réduire la distance de vue. Modifie la distance de vue "
-#~ "minimale.\n"
-#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Touche pour augmenter la distance de vue. Modifie la distance de vue "
-#~ "minimale.\n"
-#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n"
-#~ "La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler "
-#~ "en nombre de blocs."
-
-#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
-#~ msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs."
-
-#~ msgid ""
-#~ "Mandelbrot set: Iterations of the recursive function.\n"
-#~ "Controls scale of finest detail."
-#~ msgstr ""
-#~ "Série Mandelbrot : itérations de la fonction récursive.\n"
-#~ "Contrôle l'échelle du détail le plus subtil."
-
-#~ msgid ""
-#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n"
-#~ "La portée est environ entre -2 et 2."
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen fractal.\n"
-#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
-#~ msgstr ""
-#~ "Attributs de terrain spécifiques à Mapgen V7.\n"
-#~ "'ridges' sont les rivières.\n"
-#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
-#~ "par défaut.\n"
-#~ "Les drapeaux commençant par \"non\" sont désactivés."
-
-#~ msgid "Mapgen fractal mandelbrot iterations"
-#~ msgstr "Mapgen Mandelbrot : itérations fractales"
-
-#~ msgid "Mapgen fractal mandelbrot offset"
-#~ msgstr "Mapgen Mandelbrot : décalages fractals"
-
-#~ msgid "Mapgen fractal mandelbrot scale"
-#~ msgstr "Mapgen Mandelbrot : échelles fractales"
-
-#~ msgid "Mapgen fractal mandelbrot slice w"
-#~ msgstr "Mapgen Mandelbrot : couche fractale W"
-
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n"
-#~ "Des valeurs plus grandes aboutissent à des locations plus proches de (x = "
-#~ "0, z = 0).\n"
-#~ "Des valeurs plus petites peut résulter à une location de spawn non-"
-#~ "trouvée, résultant\n"
-#~ "à une location située à (0, 0, 0) probablement enterrée sous le sol."
-
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Images par seconde (FPS) minimum.\n"
-#~ "Le niveau de rendu est dynamiquement adapté selon ce paramètre et la "
-#~ "distance de vue (minimale et maximale)."
-
-#~ msgid "New style water"
-#~ msgstr "Nouveau style de liquide"
-
-#~ msgid ""
-#~ "Pre-generate all item visuals used in the inventory.\n"
-#~ "This increases startup time, but runs smoother in-game.\n"
-#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
-#~ "the inventory."
-#~ msgstr ""
-#~ "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n"
-#~ "Cela augmente le temps de démarrage, mais rend les inventaires plus "
-#~ "fluides.\n"
-#~ "Les textures générées peuvent facilement déborder votre VRAM, causant des "
-#~ "bugs dans votre inventaire."
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Pré-chargement des textures d'inventaire"
-
-#~ msgid ""
-#~ "The allowed adjustment range for the automatic rendering range "
-#~ "adjustment.\n"
-#~ "Set this to be equal to viewing range minimum to disable the auto-"
-#~ "adjustment algorithm."
-#~ msgstr ""
-#~ "Distance d'affichage maximum.\n"
-#~ "Définir cette valeur égale à la distance de vue minimum pour désactiver\n"
-#~ "l'auto-ajustement dynamique de la distance d'affichage."
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Largeur initiale de la fenêtre de jeu."
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Portée verticale du spawn"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Distance de vue minimum"
-
-#~ msgid "Wanted FPS"
-#~ msgstr "FPS minimum"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Taille appliquée aux menus : "
-
-#~ msgid "Downloading"
-#~ msgstr "Téléchargement"
-
-#~ msgid " KB/s"
-#~ msgstr " Ko/s"
-
-#~ msgid " MB/s"
-#~ msgstr " Mo/s"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr ""
-#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet"
-
-#~ msgid "is required by:"
-#~ msgstr "est requis par :"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Configuration enregistrée. "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Attention : configuration incorrecte. "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr ""
-#~ "Impossible de créer le monde : le nom contient des caractères invalides"
-
-#~ msgid "Show Public"
-#~ msgstr "Voir les serveurs publics"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Voir les serveurs favoris"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Laisser l'adresse vide pour lancer un serveur local."
-
-#~ msgid "Create world"
-#~ msgstr "Créer un monde"
-
-#~ msgid "Address required."
-#~ msgstr "Adresse requise."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Fichiers à supprimer"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Impossible de configurer ce monde : aucune sélection active"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés"
+#~ msgid "Delete map"
+#~ msgstr "Supprimer la carte"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -5046,147 +4931,265 @@ msgstr "Délais d'interruption de cURL"
 #~ "- Échap : ce menu\n"
 #~ "- T : discuter\n"
 
-#~ msgid "Delete map"
-#~ msgstr "Supprimer la carte"
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Impossible de configurer ce monde : aucune sélection active"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Fichiers à supprimer"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné"
+
+#~ msgid "Address required."
+#~ msgstr "Adresse requise."
+
+#~ msgid "Create world"
+#~ msgstr "Créer un monde"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Laisser l'adresse vide pour lancer un serveur local."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Voir les serveurs favoris"
+
+#~ msgid "Show Public"
+#~ msgstr "Voir les serveurs publics"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr ""
+#~ "Impossible de créer le monde : le nom contient des caractères invalides"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Attention : configuration incorrecte. "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Configuration enregistrée. "
+
+#~ msgid "is required by:"
+#~ msgstr "est requis par :"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr ""
+#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet"
+
+#~ msgid " MB/s"
+#~ msgstr " Mo/s"
+
+#~ msgid " KB/s"
+#~ msgstr " Ko/s"
+
+#~ msgid "Downloading"
+#~ msgstr "Téléchargement"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Taille appliquée aux menus : "
+
+#~ msgid "Wanted FPS"
+#~ msgstr "FPS minimum"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Distance de vue minimum"
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Portée verticale du spawn"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Largeur initiale de la fenêtre de jeu."
 
 #~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ "The allowed adjustment range for the automatic rendering range "
+#~ "adjustment.\n"
+#~ "Set this to be equal to viewing range minimum to disable the auto-"
+#~ "adjustment algorithm."
 #~ msgstr ""
-#~ "Attention : certains mods configurés sont introuvables.\n"
-#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. "
+#~ "Distance d'affichage maximum.\n"
+#~ "Définir cette valeur égale à la distance de vue minimum pour désactiver\n"
+#~ "l'auto-ajustement dynamique de la distance d'affichage."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Pré-chargement des textures d'inventaire"
 
 #~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
+#~ "Pre-generate all item visuals used in the inventory.\n"
+#~ "This increases startup time, but runs smoother in-game.\n"
+#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
+#~ "the inventory."
 #~ msgstr ""
-#~ "Attention : certains mods ne sont pas encore configurés.\n"
-#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. "
+#~ "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n"
+#~ "Cela augmente le temps de démarrage, mais rend les inventaires plus "
+#~ "fluides.\n"
+#~ "Les textures générées peuvent facilement déborder votre VRAM, causant des "
+#~ "bugs dans votre inventaire."
 
-#~ msgid "Local install"
-#~ msgstr "Installation locale"
+#~ msgid "New style water"
+#~ msgstr "Nouveau style de liquide"
 
-#~ msgid "Add mod:"
-#~ msgstr "Ajouter un mod :"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACKS DE TEXTURES"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "PARTIE SOLO"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Liquides limités"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Précharger les objets"
-
-#~ msgid "SETTINGS"
-#~ msgstr "PARAMÈTRES"
-
-#~ msgid "Password"
-#~ msgstr "Mot de passe"
-
-#~ msgid "Name"
-#~ msgstr "Nom"
-
-#~ msgid "START SERVER"
-#~ msgstr "DÉMARRER LE SERVEUR"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Ajouter un mod"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Supprimer le mod sélectionné"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MODIFIER LE JEU"
-
-#~ msgid "new game"
-#~ msgstr "nouveau jeu"
-
-#~ msgid "Mods:"
-#~ msgstr "Mods :"
-
-#~ msgid "GAMES"
-#~ msgstr "JEUX"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Nom du jeu"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet"
-
-#~ msgid "Rendering:"
-#~ msgstr "Affichage :"
-
-#~ msgid "If enabled, "
-#~ msgstr "Si activé, "
-
-#~ msgid "If disabled "
-#~ msgstr "Si désactivé "
-
-#~ msgid "Enable a bit lower water surface, so it doesn't "
-#~ msgstr ""
-#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas "
-#~ "le bloc complètement.\n"
-#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux "
-#~ "ne fonctionne pas dessus. "
-
-#~ msgid "\""
-#~ msgstr "\""
-
-#, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Images par seconde (FPS) minimum.\n"
+#~ "Le niveau de rendu est dynamiquement adapté selon ce paramètre et la "
+#~ "distance de vue (minimale et maximale)."
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n"
+#~ "Des valeurs plus grandes aboutissent à des locations plus proches de (x = "
+#~ "0, z = 0).\n"
+#~ "Des valeurs plus petites peut résulter à une location de spawn non-"
+#~ "trouvée, résultant\n"
+#~ "à une location située à (0, 0, 0) probablement enterrée sous le sol."
+
+#~ msgid "Mapgen fractal mandelbrot slice w"
+#~ msgstr "Mapgen Mandelbrot : couche fractale W"
+
+#~ msgid "Mapgen fractal mandelbrot scale"
+#~ msgstr "Mapgen Mandelbrot : échelles fractales"
+
+#~ msgid "Mapgen fractal mandelbrot offset"
+#~ msgstr "Mapgen Mandelbrot : décalages fractals"
+
+#~ msgid "Mapgen fractal mandelbrot iterations"
+#~ msgstr "Mapgen Mandelbrot : itérations fractales"
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen fractal.\n"
+#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with \"no\" are used to explicitly disable them."
 #~ msgstr ""
-#~ "Attributs généraux de la génération de terrain.\n"
-#~ "Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent "
-#~ "leurs valeurs par défaut."
-
-#~ msgid "No!!!"
-#~ msgstr "Non !"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normal Mapping"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Liste de serveurs publics"
-
-#~ msgid "No of course not!"
-#~ msgstr "Non, bien sûr que non !"
-
-#~ msgid "Useful for mod developers."
-#~ msgstr "Utile pour les développeurs de mods."
-
-#~ msgid "How many blocks are flying in the wire simultaneously per client."
-#~ msgstr "Nombre maximum de mapblocks simultanés envoyés par client."
+#~ "Attributs de terrain spécifiques à Mapgen V7.\n"
+#~ "'ridges' sont les rivières.\n"
+#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
+#~ "par défaut.\n"
+#~ "Les drapeaux commençant par \"non\" sont désactivés."
 
 #~ msgid ""
-#~ "How many blocks are flying in the wire simultaneously for the whole "
-#~ "server."
-#~ msgstr "Nombre maximum de mapblocks simultanés envoyés sur le serveur."
-
-#~ msgid "Detailed mod profiling"
-#~ msgstr "Profil détaillé des mods"
-
-#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
+#~ "Range roughly -2 to 2."
 #~ msgstr ""
-#~ "Profil détaillé des données du mod. Utile pour les développeurs de mods."
+#~ "Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n"
+#~ "La portée est environ entre -2 et 2."
+
+#~ msgid ""
+#~ "Mandelbrot set: Iterations of the recursive function.\n"
+#~ "Controls scale of finest detail."
+#~ msgstr ""
+#~ "Série Mandelbrot : itérations de la fonction récursive.\n"
+#~ "Contrôle l'échelle du détail le plus subtil."
+
+#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+#~ msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs."
+
+#~ msgid ""
+#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n"
+#~ "La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler "
+#~ "en nombre de blocs."
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Touche pour augmenter la distance de vue. Modifie la distance de vue "
+#~ "minimale.\n"
+#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Touche pour réduire la distance de vue. Modifie la distance de vue "
+#~ "minimale.\n"
+#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Julia set: W value determining the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Série Julia : valeur W déterminant la forme 4D.\n"
+#~ "La portée est environ entre -2 et 2."
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n"
+#~ "La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler "
+#~ "en nombre de blocs."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr ""
+#~ "Active l'éclairage des blocs pointés (et supprime les bordures noires de "
+#~ "sélection)."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne "
+#~ "submerge pas\n"
+#~ "entièrement le bloc voisin.\n"
+#~ "Cette fonctionnalité est encore expérimentale et la lumière douce "
+#~ "n’apparaît pas à la\n"
+#~ "surface de l'eau."
+
+#~ msgid "Item textures..."
+#~ msgstr "Textures d'items..."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Attributs spécifiques à Mapgen V7.\n"
+#~ "Le drapeau 'des crêtes' contrôle les rivières.\n"
+#~ "Les drapeaux par défaut définis dans le moteur sont: montagnes, crêtes.\n"
+#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
+#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs "
+#~ "par défaut.\n"
+#~ "Les drapeaux commençant par \"non\" sont désactivés."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Attributs de terrain spécifiques au générateur de carte plate.\n"
+#~ "Lacs et collines peuvent partiellement être ajoutés à un monde plat.\n"
+#~ "Aucun drapeau par défaut défini dans le moteur.\n"
+#~ "La chaîne de drapeaux modifie les paramètres par défaut du moteur.\n"
+#~ "Les drapeaux qui ne sont pas spécifiés dans le champ gardent leurs "
+#~ "valeurs par défaut.\n"
+#~ "Les drapeaux commençant par \"non\" sont désactivés."
diff --git a/po/he/minetest.po b/po/he/minetest.po
index 6e238bbeb..2e5367a9d 100644
--- a/po/he/minetest.po
+++ b/po/he/minetest.po
@@ -4185,8 +4185,8 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Public Serverlist"
-#~ msgstr "רשימת שרתים פומבי"
-
 #~ msgid "No of course not!"
 #~ msgstr "לא ברור שלא!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "רשימת שרתים פומבי"
diff --git a/po/hu/minetest.po b/po/hu/minetest.po
index 6534266c0..a461b6a6b 100644
--- a/po/hu/minetest.po
+++ b/po/hu/minetest.po
@@ -4580,170 +4580,23 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Item textures..."
-#~ msgstr "Elem textúrák..."
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "Részletes mod profil adat. Mod fejlesztőknek hasznos."
 
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg "
-#~ "teljesen a blokkot.\n"
-#~ "Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n"
-#~ "így nem működik a víz felszínén."
+#~ msgid "Useful for mod developers."
+#~ msgstr "Mod fejlesztőknek hasznos."
 
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr ""
-#~ "Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a "
-#~ "kijelölődobozt)."
+#~ msgid "No of course not!"
+#~ msgstr "Persze, hogy nem!"
 
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n"
-#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgid "Public Serverlist"
+#~ msgstr "Nyilvános szerverlista"
 
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n"
-#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Normálfelületek generálása"
 
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Maximum távolság a vízszinttől, ahol a játékosok újraéledhetnek/"
-#~ "megjelenhetnek csatlakozáskor (spawn).\n"
-#~ "Magasabb értékek közelebb visznek az (x = 0, z = 0)-hoz.\n"
-#~ "Alacsonyabb értékek azt eredményezhetik, hogy nem lesz megfelelő pont a "
-#~ "feléledéshez,\n"
-#~ "(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz."
-
-#, fuzzy
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Minimum kívánt FPS.\n"
-#~ "A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a "
-#~ "látórerület min és max)."
-
-#~ msgid "New style water"
-#~ msgstr "Új stílusú víz"
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Eszköztár textúráinak előtöltése"
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Függőleges kezdeti ablak méret."
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Az (újra)éledés függőleges irányú területe"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Minimum látóterület"
-
-#~ msgid "Wanted FPS"
-#~ msgstr "Kívánt FPS"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "A méretarány alkalmazva a menü elemekre: "
-
-#, fuzzy
-#~ msgid "Touch free target"
-#~ msgstr "Touch free target"
-
-#, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Le"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat"
-
-#~ msgid "is required by:"
-#~ msgstr "kell neki:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Beállítások mentve.  "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Figyelem: A beállítások nem egyformák.  "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak"
-
-#~ msgid "Show Public"
-#~ msgstr "Publikus mutatása"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Kedvencek mutatása"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts."
-
-#~ msgid "Create world"
-#~ msgstr "Világ létrehozása"
-
-#~ msgid "Address required."
-#~ msgstr "Cím szükséges."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Nem törölhető a világ: Nincs kiválasztva"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "A fájl törölve lett"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Hiba az összes világ törlése közben"
-
-#, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Végtelen folyadék"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Előretöltött tárgy láthatóság"
-
-#, fuzzy
-#~ msgid "Password"
-#~ msgstr "Régi jelszó"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Játék"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet"
-
-#~ msgid "Rendering:"
-#~ msgstr "Renderelés:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Engedélyez"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Csomag letiltás"
+#~ msgid "No!!!"
+#~ msgstr "Nem!!!"
 
 #, fuzzy
 #~ msgid ""
@@ -4767,20 +4620,167 @@ msgstr ""
 #~ "water would tend to pool. It may interfere with delicately adjusted "
 #~ "biomes."
 
-#~ msgid "No!!!"
-#~ msgstr "Nem!!!"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Csomag letiltás"
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Normálfelületek generálása"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Engedélyez"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Nyilvános szerverlista"
+#~ msgid "Rendering:"
+#~ msgstr "Renderelés:"
 
-#~ msgid "No of course not!"
-#~ msgstr "Persze, hogy nem!"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet"
 
-#~ msgid "Useful for mod developers."
-#~ msgstr "Mod fejlesztőknek hasznos."
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Játék"
 
-#~ msgid "Detailed mod profile data. Useful for mod developers."
-#~ msgstr "Részletes mod profil adat. Mod fejlesztőknek hasznos."
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Régi jelszó"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Előretöltött tárgy láthatóság"
+
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Végtelen folyadék"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Hiba az összes világ törlése közben"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "A fájl törölve lett"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Nem törölhető a világ: Nincs kiválasztva"
+
+#~ msgid "Address required."
+#~ msgstr "Cím szükséges."
+
+#~ msgid "Create world"
+#~ msgstr "Világ létrehozása"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Kedvencek mutatása"
+
+#~ msgid "Show Public"
+#~ msgstr "Publikus mutatása"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Figyelem: A beállítások nem egyformák.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Beállítások mentve.  "
+
+#~ msgid "is required by:"
+#~ msgstr "kell neki:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat"
+
+#, fuzzy
+#~ msgid "Downloading"
+#~ msgstr "Le"
+
+#, fuzzy
+#~ msgid "Touch free target"
+#~ msgstr "Touch free target"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "A méretarány alkalmazva a menü elemekre: "
+
+#~ msgid "Wanted FPS"
+#~ msgstr "Kívánt FPS"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Minimum látóterület"
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Az (újra)éledés függőleges irányú területe"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Függőleges kezdeti ablak méret."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Eszköztár textúráinak előtöltése"
+
+#~ msgid "New style water"
+#~ msgstr "Új stílusú víz"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Minimum kívánt FPS.\n"
+#~ "A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a "
+#~ "látórerület min és max)."
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Maximum távolság a vízszinttől, ahol a játékosok újraéledhetnek/"
+#~ "megjelenhetnek csatlakozáskor (spawn).\n"
+#~ "Magasabb értékek közelebb visznek az (x = 0, z = 0)-hoz.\n"
+#~ "Alacsonyabb értékek azt eredményezhetik, hogy nem lesz megfelelő pont a "
+#~ "feléledéshez,\n"
+#~ "(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz."
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n"
+#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n"
+#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr ""
+#~ "Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a "
+#~ "kijelölődobozt)."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg "
+#~ "teljesen a blokkot.\n"
+#~ "Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n"
+#~ "így nem működik a víz felszínén."
+
+#~ msgid "Item textures..."
+#~ msgstr "Elem textúrák..."
diff --git a/po/id/minetest.po b/po/id/minetest.po
index 80230a76e..137caaff8 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -9,8 +9,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-12-10 10:03+0000\n"
 "Last-Translator: Alvin Hikmawan <alvin.hikmawan@gmail.com>\n"
-"Language-Team: Indonesian "
-"<https://hosted.weblate.org/projects/minetest/minetest/id/>\n"
+"Language-Team: Indonesian <https://hosted.weblate.org/projects/minetest/"
+"minetest/id/>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1463,8 +1463,8 @@ msgid ""
 "minetest.net."
 msgstr ""
 "Mengumumkan kepada daftar server ini.\n"
-"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = "
-"v6.servers.minetest.net."
+"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = v6."
+"servers.minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
@@ -1989,8 +1989,8 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
-"Membolehkan penggunaan server media jarak jauh (jika diberikan oleh server)."
-"\n"
+"Membolehkan penggunaan server media jarak jauh (jika diberikan oleh "
+"server).\n"
 "Server jarak jauh menawarkan cara lebih cepat untuk mengunduh media (misal: "
 "tekstur)\n"
 "saat terhubung ke server."
@@ -2393,8 +2393,8 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
-"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node padat."
-"\n"
+"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node "
+"padat.\n"
 "Hal ini memerlukan hak istimewa \"noclip\" pada server."
 
 #: src/settings_translation_file.cpp
@@ -2573,8 +2573,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengurangi jarak pandang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2583,8 +2583,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk menjatuhkan barang yang sedang dipilih.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2593,8 +2593,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk menambah jarak pandang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2603,8 +2603,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk lompat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2613,8 +2613,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak cepat dalam mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2623,8 +2623,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak mundur.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2633,8 +2633,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak maju.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2643,8 +2643,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak ke kiri.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2653,8 +2653,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk bergerak ke kanan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2663,8 +2663,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka konsol obrolan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2673,8 +2673,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka jendela obrolan untuk mengetik perintah.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2683,8 +2683,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka jendela obrolan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2693,8 +2693,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk membuka inventaris.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2714,8 +2714,8 @@ msgstr ""
 "Tombol untuk menyelinap.\n"
 "Juga digunakan untuk turun dan menyelam dalam air jika aux1_descends "
 "dinonaktifkan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2724,8 +2724,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengganti kamera antara orang pertama dan ketiga.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2734,8 +2734,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengambil tangkapan layar.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2744,8 +2744,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih lari otomatis.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2754,8 +2754,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode sinema.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2764,8 +2764,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk mengganti tampilan peta mini.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2774,8 +2774,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode cepat.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2784,8 +2784,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih terbang.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2794,8 +2794,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih mode tembus blok.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2804,8 +2804,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih pembaruan kamera. Hanya digunakan dalam pengembangan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2814,8 +2814,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan info debug.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2824,8 +2824,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan HUD.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2834,8 +2834,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan obrolan.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2844,8 +2844,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih tampilan kabut.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2861,8 +2861,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tombol untuk beralih menjadi jarak pandang tanpa batas.\n"
-"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017"
-"35e3da1b0edf72eb3"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
@@ -3011,8 +3011,8 @@ msgstr "Skrip menu utama"
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
-"Buat warna kabut dan langit tergantung pada waktu (fajar/matahari tenggelam)"
-"\n"
+"Buat warna kabut dan langit tergantung pada waktu (fajar/matahari "
+"tenggelam)\n"
 "dan arah melihat."
 
 #: src/settings_translation_file.cpp
@@ -4481,53 +4481,53 @@ msgstr "Batas cURL paralel"
 msgid "cURL timeout"
 msgstr "Batas waktu cURL"
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Memuat tekstur..."
+#~ msgid "Useful for mod developers."
+#~ msgstr "Berguna untuk pengembang mod."
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Faktor skala yang diatur untuk elemen menu: "
+#~ msgid "No of course not!"
+#~ msgstr "Tentu tidak!"
 
-#~ msgid "Touch free target"
-#~ msgstr "Bebas sentuhan"
+#~ msgid "Public Serverlist"
+#~ msgstr "Daftar Server Publik"
 
-#~ msgid "Downloading"
-#~ msgstr "Mengunduh"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Hasilkan Normalmaps"
 
-#~ msgid " KB/s"
-#~ msgstr " KB/detik"
+#~ msgid "No!!!"
+#~ msgstr "Tidak!!!"
 
-#~ msgid " MB/s"
-#~ msgstr " MB/detik"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih"
-
-#~ msgid "Rendering:"
-#~ msgstr "Rendering:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "diaktifkan"
+#~ msgid "\""
+#~ msgstr "\""
 
 #, fuzzy
 #~ msgid "If disabled "
 #~ msgstr "Nonaktifkan PM"
 
-#~ msgid "\""
-#~ msgstr "\""
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "diaktifkan"
 
-#~ msgid "No!!!"
-#~ msgstr "Tidak!!!"
+#~ msgid "Rendering:"
+#~ msgstr "Rendering:"
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Hasilkan Normalmaps"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Daftar Server Publik"
+#~ msgid " MB/s"
+#~ msgstr " MB/detik"
 
-#~ msgid "No of course not!"
-#~ msgstr "Tentu tidak!"
+#~ msgid " KB/s"
+#~ msgstr " KB/detik"
 
-#~ msgid "Useful for mod developers."
-#~ msgstr "Berguna untuk pengembang mod."
+#~ msgid "Downloading"
+#~ msgstr "Mengunduh"
+
+#~ msgid "Touch free target"
+#~ msgstr "Bebas sentuhan"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Faktor skala yang diatur untuk elemen menu: "
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Memuat tekstur..."
diff --git a/po/it/minetest.po b/po/it/minetest.po
index 17d297dda..a6f49efb0 100644
--- a/po/it/minetest.po
+++ b/po/it/minetest.po
@@ -4774,126 +4774,35 @@ msgstr "Limite cURL parallelo"
 msgid "cURL timeout"
 msgstr "Tempo di scadenza cURL"
 
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgid "Detailed mod profile data. Useful for mod developers."
 #~ msgstr ""
-#~ "Attributi di generazione della mappa specifici per Generatore mappa "
-#~ "piatto.\n"
-#~ "Laghi e colline occasionali possono essere aggiunti al mondo piatto.\n"
-#~ "Le impostazioni predefinite impostate nel motore sono: nessuna\n"
-#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
-#~ "motore.\n"
-#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
-#~ "valori predefiniti.\n"
-#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
-#~ "esplicitamente."
+#~ "Dati di profilo del mod. dettagliati. Utile per gli sviluppatori di mod."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Profilo dettagliato del mod."
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "Attributi di generazione della mappa specifici per Generatore mappa v. "
-#~ "6.\n"
-#~ "L'impostazione 'ridges' controlla i fiumi.\n"
-#~ "Le impostazioni predefinite impostate nel motore sono: mountains, ridges\n"
-#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
-#~ "motore.\n"
-#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
-#~ "valori predefiniti.\n"
-#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
-#~ "esplicitamente."
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr "Quanti blocchi vengono inviati simultaneamente per l'intero server."
 
-#~ msgid "Item textures..."
-#~ msgstr "Immagini degli oggetti..."
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "Quanti blocchi volano nel cavo simultaneamente per ogni client."
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "Precaricamento delle textures dell'inventario"
+#~ msgid "Useful for mod developers."
+#~ msgstr "Utile per gli sviluppatori di mod."
 
-#~ msgid "Viewing range minimum"
-#~ msgstr "Distanza minima di visibilità"
+#~ msgid "No of course not!"
+#~ msgstr "No, certo che no!"
 
-#~ msgid "Wanted FPS"
-#~ msgstr "FPS desiderati"
+#~ msgid "Public Serverlist"
+#~ msgstr "Elenco dei server pubblici"
 
-#~ msgid "Local install"
-#~ msgstr "Installazione locale"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generare normalmap"
 
-#~ msgid "Add mod:"
-#~ msgstr "Aggiungere un modulo:"
-
-#~ msgid "MODS"
-#~ msgstr "MODULI"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACCH. DI IMM."
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "GIOC. SING."
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Liquido limitato"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Precaricare le immagini"
-
-#~ msgid "SETTINGS"
-#~ msgstr "IMPOSTAZIONI"
-
-#~ msgid "Password"
-#~ msgstr "Password"
-
-#~ msgid "Name"
-#~ msgstr "Nome"
-
-#~ msgid "START SERVER"
-#~ msgstr "AVVIO SERVER"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Aggiungere il modulo"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Rimuovere il modulo selezionato"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MODIFICARE IL GIOCO"
-
-#~ msgid "new game"
-#~ msgstr "nuovo gioco"
-
-#~ msgid "Mods:"
-#~ msgstr "Moduli:"
-
-#~ msgid "GAMES"
-#~ msgstr "GIOCHI"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Nome del gioco"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Riavviare minetest per rendere effettive le modifiche"
-
-#~ msgid "If enabled, "
-#~ msgstr "attivata"
-
-#~ msgid "If disabled "
-#~ msgstr "Disatt. pacch."
+#~ msgid "No!!!"
+#~ msgstr "No!!!"
 
 #~ msgid ""
 #~ "Map generation attributes specific to Mapgen Valleys.\n"
@@ -4917,32 +4826,123 @@ msgstr "Tempo di scadenza cURL"
 #~ "\"humid_rivers\" modifica l'umidità attorno ai fiumi e nelle aree in cui "
 #~ "l'acqua tenderebbe a stagnare. Potrebbe interferire con biomi"
 
-#~ msgid "No!!!"
-#~ msgstr "No!!!"
+#~ msgid "If disabled "
+#~ msgstr "Disatt. pacch."
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generare normalmap"
+#~ msgid "If enabled, "
+#~ msgstr "attivata"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Elenco dei server pubblici"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Riavviare minetest per rendere effettive le modifiche"
 
-#~ msgid "No of course not!"
-#~ msgstr "No, certo che no!"
+#~ msgid "Game Name"
+#~ msgstr "Nome del gioco"
 
-#~ msgid "Useful for mod developers."
-#~ msgstr "Utile per gli sviluppatori di mod."
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\""
 
-#~ msgid "How many blocks are flying in the wire simultaneously per client."
-#~ msgstr "Quanti blocchi volano nel cavo simultaneamente per ogni client."
+#~ msgid "GAMES"
+#~ msgstr "GIOCHI"
+
+#~ msgid "Mods:"
+#~ msgstr "Moduli:"
+
+#~ msgid "new game"
+#~ msgstr "nuovo gioco"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MODIFICARE IL GIOCO"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Rimuovere il modulo selezionato"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Aggiungere il modulo"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "AVVIO SERVER"
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "Password"
+#~ msgstr "Password"
+
+#~ msgid "SETTINGS"
+#~ msgstr "IMPOSTAZIONI"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Precaricare le immagini"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Liquido limitato"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "GIOC. SING."
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACCH. DI IMM."
+
+#~ msgid "MODS"
+#~ msgstr "MODULI"
+
+#~ msgid "Add mod:"
+#~ msgstr "Aggiungere un modulo:"
+
+#~ msgid "Local install"
+#~ msgstr "Installazione locale"
+
+#~ msgid "Wanted FPS"
+#~ msgstr "FPS desiderati"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Distanza minima di visibilità"
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Precaricamento delle textures dell'inventario"
+
+#~ msgid "Item textures..."
+#~ msgstr "Immagini degli oggetti..."
 
 #~ msgid ""
-#~ "How many blocks are flying in the wire simultaneously for the whole "
-#~ "server."
-#~ msgstr "Quanti blocchi vengono inviati simultaneamente per l'intero server."
-
-#~ msgid "Detailed mod profiling"
-#~ msgstr "Profilo dettagliato del mod."
-
-#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Dati di profilo del mod. dettagliati. Utile per gli sviluppatori di mod."
+#~ "Attributi di generazione della mappa specifici per Generatore mappa v. "
+#~ "6.\n"
+#~ "L'impostazione 'ridges' controlla i fiumi.\n"
+#~ "Le impostazioni predefinite impostate nel motore sono: mountains, ridges\n"
+#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
+#~ "motore.\n"
+#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
+#~ "valori predefiniti.\n"
+#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
+#~ "esplicitamente."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Attributi di generazione della mappa specifici per Generatore mappa "
+#~ "piatto.\n"
+#~ "Laghi e colline occasionali possono essere aggiunti al mondo piatto.\n"
+#~ "Le impostazioni predefinite impostate nel motore sono: nessuna\n"
+#~ "La stringa delle impostazioni modifica le impostazioni predefinite del "
+#~ "motore.\n"
+#~ "Le impostazioni che non sono specificate nella stringa mantengono i "
+#~ "valori predefiniti.\n"
+#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle "
+#~ "esplicitamente."
diff --git a/po/ja/minetest.po b/po/ja/minetest.po
index 59c647823..f26036749 100644
--- a/po/ja/minetest.po
+++ b/po/ja/minetest.po
@@ -5,8 +5,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-11-16 13:08+0000\n"
 "Last-Translator: Rui <rui.minetest@gmail.com>\n"
-"Language-Team: Japanese "
-"<https://hosted.weblate.org/projects/minetest/minetest/ja/>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/minetest/"
+"minetest/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -133,7 +133,8 @@ msgstr "作成"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "minetest.netからminetest_gameなどのサブゲームをダウンロードしてください"
+msgstr ""
+"minetest.netからminetest_gameなどのサブゲームをダウンロードしてください"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
@@ -4442,52 +4443,52 @@ msgid "cURL timeout"
 msgstr "cURLタイムアウト"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "テクスチャ読み込み中..."
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "メニューの大きさとして設定されている数値: "
-
-#~ msgid "Touch free target"
-#~ msgstr "タッチ位置を自由にする"
-
-#~ msgid " KB/s"
-#~ msgstr " KB/秒"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/秒"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "ドライバーを変更するためMinetestを再起動します"
-
-#~ msgid "Rendering:"
-#~ msgstr "レンダリング:"
-
-#~ msgid "If enabled, "
-#~ msgstr "有効化の場合 "
-
-#~ msgid "If disabled "
-#~ msgstr "無効化の場合 "
-
-#~ msgid "No!!!"
-#~ msgstr "いいえ！！！"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "ノーマルマップの生成"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "公開サーバ一覧"
-
-#~ msgid "No of course not!"
-#~ msgstr "いいえ！"
-
-#~ msgid "Useful for mod developers."
-#~ msgstr "Mod開発に便利。"
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "詳細なModのプロファイルデータです。Mod開発者に便利です。"
 
 #, fuzzy
 #~ msgid "Detailed mod profiling"
 #~ msgstr "詳細なModのプロファイル化"
 
+#~ msgid "Useful for mod developers."
+#~ msgstr "Mod開発に便利。"
+
+#~ msgid "No of course not!"
+#~ msgstr "いいえ！"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "公開サーバ一覧"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "ノーマルマップの生成"
+
+#~ msgid "No!!!"
+#~ msgstr "いいえ！！！"
+
+#~ msgid "If disabled "
+#~ msgstr "無効化の場合 "
+
+#~ msgid "If enabled, "
+#~ msgstr "有効化の場合 "
+
+#~ msgid "Rendering:"
+#~ msgstr "レンダリング:"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "ドライバーを変更するためMinetestを再起動します"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/秒"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/秒"
+
+#~ msgid "Touch free target"
+#~ msgstr "タッチ位置を自由にする"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "メニューの大きさとして設定されている数値: "
+
 #, fuzzy
-#~ msgid "Detailed mod profile data. Useful for mod developers."
-#~ msgstr "詳細なModのプロファイルデータです。Mod開発者に便利です。"
+#~ msgid "Preload inventory textures"
+#~ msgstr "テクスチャ読み込み中..."
diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po
index 0f91987e3..12ac80a39 100644
--- a/po/jbo/minetest.po
+++ b/po/jbo/minetest.po
@@ -4249,16 +4249,16 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr ".i ca'o samymo'i le tengu datnyvei"
+#~ msgid "No of course not!"
+#~ msgstr "nasai go'i"
+
+#~ msgid "No!!!"
+#~ msgstr "nasai go'i"
 
 #, fuzzy
 #~ msgid "If enabled, "
 #~ msgstr "selpli"
 
-#~ msgid "No!!!"
-#~ msgstr "nasai go'i"
-
-#~ msgid "No of course not!"
-#~ msgstr "nasai go'i"
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr ".i ca'o samymo'i le tengu datnyvei"
diff --git a/po/ky/minetest.po b/po/ky/minetest.po
index 3933c7fb8..72c729f8d 100644
--- a/po/ky/minetest.po
+++ b/po/ky/minetest.po
@@ -4303,54 +4303,28 @@ msgid "cURL timeout"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Жүктөлүүдө..."
+#~ msgid "Public Serverlist"
+#~ msgstr "Жалпылык серверлердин тизмеси:"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Ылдый"
+#~ msgid "If disabled "
+#~ msgstr "Баарын өчүрүү"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "күйгүзүлгөн"
 
-#~ msgid "is required by:"
-#~ msgstr "талап кылынганы:"
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Оюн"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Конфигурация сакталды.  "
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Эски сырсөз"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Эскертүү: Туура эмес конфигурация.  "
-
-#~ msgid "Show Public"
-#~ msgstr "Жалпылыкты көрсөтүү"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Тандалмаларды көрсөтүү"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз."
-
-#~ msgid "Create world"
-#~ msgstr "Дүйнөнү жаратуу"
-
-#~ msgid "Address required."
-#~ msgstr "Дареги талап кылынат."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Өчүрүлө турган файлдар"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок"
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Чектүү суюктук"
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4377,26 +4351,52 @@ msgstr ""
 #~ "- ESC: бул меню\n"
 #~ "- T: маек\n"
 
-#, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Чектүү суюктук"
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Өчүрүлө турган файлдар"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок"
+
+#~ msgid "Address required."
+#~ msgstr "Дареги талап кылынат."
+
+#~ msgid "Create world"
+#~ msgstr "Дүйнөнү жаратуу"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Тандалмаларды көрсөтүү"
+
+#~ msgid "Show Public"
+#~ msgstr "Жалпылыкты көрсөтүү"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Эскертүү: Туура эмес конфигурация.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Конфигурация сакталды.  "
+
+#~ msgid "is required by:"
+#~ msgstr "талап кылынганы:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу"
 
 #, fuzzy
-#~ msgid "Password"
-#~ msgstr "Эски сырсөз"
+#~ msgid "Downloading"
+#~ msgstr "Ылдый"
 
 #, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Оюн"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "күйгүзүлгөн"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Баарын өчүрүү"
-
-#, fuzzy
-#~ msgid "Public Serverlist"
-#~ msgstr "Жалпылык серверлердин тизмеси:"
+#~ msgid "Preload inventory textures"
+#~ msgstr "Жүктөлүүдө..."
diff --git a/po/lt/minetest.po b/po/lt/minetest.po
index 468dbbae0..ed31a75c8 100644
--- a/po/lt/minetest.po
+++ b/po/lt/minetest.po
@@ -10,14 +10,14 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-12-10 20:29+0000\n"
 "Last-Translator: Zygi Mantus <zygimantus@gmail.com>\n"
-"Language-Team: Lithuanian "
-"<https://hosted.weblate.org/projects/minetest/minetest/lt/>\n"
+"Language-Team: Lithuanian <https://hosted.weblate.org/projects/minetest/"
+"minetest/lt/>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"(n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
@@ -4281,69 +4281,69 @@ msgid "cURL timeout"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Įkeliama..."
+#~ msgid "Useful for mod developers."
+#~ msgstr "Pagrindiniai kūrėjai"
 
-#~ msgid "Add mod:"
-#~ msgstr "Pridėti papildinį:"
+#~ msgid "No of course not!"
+#~ msgstr "Ne, tikrai ne!"
 
-#~ msgid "MODS"
-#~ msgstr "PAPILDINIAI"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "VIENAS ŽAIDĖJAS"
-
-#~ msgid "SETTINGS"
-#~ msgstr "NUSTATYMAI"
-
-#~ msgid "Password"
-#~ msgstr "Slaptažodis"
-
-#~ msgid "Name"
-#~ msgstr "Vardas"
-
-#~ msgid "START SERVER"
-#~ msgstr "PALEISTI SERVERĮ"
-
-#~ msgid "CLIENT"
-#~ msgstr "ŽAISTI TINKLE"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Pridėti papildinį"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Pašalinti pasirinktą papildinį"
-
-#, fuzzy
-#~ msgid "EDIT GAME"
-#~ msgstr "KEISTI ŽAIDIMĄ"
-
-#~ msgid "new game"
-#~ msgstr "naujas žaidimas"
-
-#~ msgid "Mods:"
-#~ msgstr "Papildiniai:"
-
-#~ msgid "GAMES"
-#~ msgstr "ŽAIDIMAI"
-
-#~ msgid "Game Name"
-#~ msgstr "Žaidimo pavadinimas"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "įjungtas"
+#~ msgid "Public Serverlist"
+#~ msgstr "Viešų serverių sąrašas"
 
 #, fuzzy
 #~ msgid "If disabled "
 #~ msgstr "Išjungti papildinį"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Viešų serverių sąrašas"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "įjungtas"
 
-#~ msgid "No of course not!"
-#~ msgstr "Ne, tikrai ne!"
+#~ msgid "Game Name"
+#~ msgstr "Žaidimo pavadinimas"
+
+#~ msgid "GAMES"
+#~ msgstr "ŽAIDIMAI"
+
+#~ msgid "Mods:"
+#~ msgstr "Papildiniai:"
+
+#~ msgid "new game"
+#~ msgstr "naujas žaidimas"
 
 #, fuzzy
-#~ msgid "Useful for mod developers."
-#~ msgstr "Pagrindiniai kūrėjai"
+#~ msgid "EDIT GAME"
+#~ msgstr "KEISTI ŽAIDIMĄ"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Pašalinti pasirinktą papildinį"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Pridėti papildinį"
+
+#~ msgid "CLIENT"
+#~ msgstr "ŽAISTI TINKLE"
+
+#~ msgid "START SERVER"
+#~ msgstr "PALEISTI SERVERĮ"
+
+#~ msgid "Name"
+#~ msgstr "Vardas"
+
+#~ msgid "Password"
+#~ msgstr "Slaptažodis"
+
+#~ msgid "SETTINGS"
+#~ msgstr "NUSTATYMAI"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "VIENAS ŽAIDĖJAS"
+
+#~ msgid "MODS"
+#~ msgstr "PAPILDINIAI"
+
+#~ msgid "Add mod:"
+#~ msgstr "Pridėti papildinį:"
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Įkeliama..."
diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index 3a8027d62..990783744 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-25 21:41+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
-"Language-Team: Norwegian Bokmål "
-"<https://hosted.weblate.org/projects/minetest/minetest/nb/>\n"
+"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
+"minetest/minetest/nb/>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4196,18 +4196,17 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "is required by:"
-#~ msgstr "trengs av:"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Deaktiver Alle"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfigurasjon lagret. "
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "aktivert"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Advarsel: Noen konfigurerte modifikasjoner mangler. \n"
-#~ "Instillingene deres vil bli fjernet når du lagrer konfigurasjonen."
+#, fuzzy
+#~ msgid "Game Name"
+#~ msgstr "Spill"
 
 #~ msgid ""
 #~ "Warning: Some mods are not configured yet.\n"
@@ -4216,14 +4215,15 @@ msgstr ""
 #~ "Advarsel: Noen modifikasjoner er ikke konfigurert enda. \n"
 #~ "De vil bli aktivert som standard når du lagrer konfigurasjonen."
 
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Spill"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Advarsel: Noen konfigurerte modifikasjoner mangler. \n"
+#~ "Instillingene deres vil bli fjernet når du lagrer konfigurasjonen."
 
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "aktivert"
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfigurasjon lagret. "
 
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Deaktiver Alle"
+#~ msgid "is required by:"
+#~ msgstr "trengs av:"
diff --git a/po/nl/minetest.po b/po/nl/minetest.po
index d33154947..c11bf46bc 100644
--- a/po/nl/minetest.po
+++ b/po/nl/minetest.po
@@ -4678,239 +4678,141 @@ msgstr "Maximaal parallellisme in cURL"
 msgid "cURL timeout"
 msgstr "cURL timeout"
 
-#, fuzzy
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgid "Detailed mod profile data. Useful for mod developers."
 #~ msgstr ""
-#~ "Wereldgenerator instellingen specified voor generator v7.\n"
-#~ "\"ridges\" zijn rivieren.\n"
-#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
-#~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+#~ "Gedetailleerde profiling-data voor mods. Nuttig voor mod-ontwikkelaars."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Gedetailleerde profiling van mods"
+
+#~ msgid ""
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr ""
+#~ "Het aantal blokken dat totaal tegelijk onderweg kan zijn, voor de hele "
+#~ "server."
+
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "Het aantal blokken dat per cliënt tegelijk onderweg kan zijn."
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Nuttig voor mod-ontwikkelaars."
+
+#~ msgid "No of course not!"
+#~ msgstr "Nee, natuurlijk niet!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Publieke Serverlijst"
+
+#~ msgid "No!!!"
+#~ msgstr "Nee!!!"
 
 #, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Wereldgenerator instellingen specified voor generator v6.\n"
-#~ "Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en "
-#~ "wordt de \"jungles\" vlag genegeerd.\n"
+#~ "Algemene wereldgenerator instellingen.\n"
 #~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 #~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
-
-#~ msgid "Item textures..."
-#~ msgstr "Voorwerp-texturen..."
-
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n"
-#~ "Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n"
-#~ "wateroppervlakte werkt niet als dit is aangeschakeld."
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr "Laat geselecteerde nodes oplichten (schakelt selectie-randen uit)."
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Juliaverzameling: (X,Y,X) afstanden van wereld-centrum.\n"
-#~ "Bereik is ongeveer -2 tot 2. Vermenigvuldig met j_scale voor de afstand "
-#~ "in nodes."
-
-#~ msgid ""
-#~ "Julia set: W value determining the 4D shape.\n"
-#~ "Range roughly -2 to 2."
-#~ msgstr ""
-#~ "Juliaverzameling: W-waarde van de 4D vorm.\n"
-#~ "Bereik is ongeveer -2 tot 2."
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Toets voor het verkleinen van de zichtafstand. Dit verandert de minimale "
-#~ "zichtafstand.\n"
-#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Toets voor het vergroten van de zichtafstand. Dit verandert de minimale "
-#~ "zichtafstand.\n"
-#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Mandelbrot verzameling: (X,Y,Z) afstanden vanaf wereld-centrum.\n"
-#~ " Bereik is ongeveer -2 tot 2. Vermenigvuldig met m_scale voor de afstand "
-#~ "in nodes."
-
-#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
-#~ msgstr "Mandelbrot verzameling: (X,Y,Z) schaal, in nodes (bij benadering)."
-
-#~ msgid ""
-#~ "Mandelbrot set: Iterations of the recursive function.\n"
-#~ "Controls scale of finest detail."
-#~ msgstr ""
-#~ "Mandelbrot verzameling: Aantal iteraties van de recursieve functie.\n"
-#~ "Bepaalt de schaal van de kleinste details."
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen fractal.\n"
-#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them."
-#~ msgstr ""
-#~ "Wereldgeneratie instellingen voor de fractal generator.\n"
-#~ "'julia' selecterd een julia-verzameling in plaats van een mandebrot-"
-#~ "verzameling.\n"
-#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
-#~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
-
-#~ msgid "Mapgen fractal mandelbrot iterations"
-#~ msgstr "Fractal wereldgenerator mandelbrot iteraties"
-
-#~ msgid "Mapgen fractal mandelbrot offset"
-#~ msgstr "Fractal wereldgenerator mandelbrot centrum-afstand"
-
-#~ msgid "Mapgen fractal mandelbrot scale"
-#~ msgstr "Fractal wereldgenerator mandelbrot schaal"
-
-#~ msgid "Mapgen fractal mandelbrot slice w"
-#~ msgstr "Fractal wereldgenerator mandelbrot w-doorsnede"
-
-#~ msgid ""
-#~ "Maximum distance above water level for player spawn.\n"
-#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
-#~ "Smaller values may result in a suitable spawn point not being found,\n"
-#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
-#~ msgstr ""
-#~ "Maximum hoogte boven waterniveau waar een speler geboren wordt.\n"
-#~ "Bij hogere waarden zullen de plaatsen dichter bij (x = 0, z = 0) liggen.\n"
-#~ "Bij lagere waarden kan het zijn dat een geschikte plek niet gevonden "
-#~ "wordt,\n"
-#~ "in dat geval wordt de speler geboren op (0, 0, 0), mogelijk onder de "
-#~ "grond."
-
-#~ msgid ""
-#~ "Minimum wanted FPS.\n"
-#~ "The amount of rendered stuff is dynamically set according to this. and "
-#~ "viewing range min and max."
-#~ msgstr ""
-#~ "Minimaal gewenste FPS.\n"
-#~ "De hoeveelheid gerenderd materiaal wordt aangepast afhankelijk van deze "
-#~ "waarde, en van de min en max zichtafstanden."
-
-#~ msgid "New style water"
-#~ msgstr "Nieuw water"
-
-#~ msgid ""
-#~ "Pre-generate all item visuals used in the inventory.\n"
-#~ "This increases startup time, but runs smoother in-game.\n"
-#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
-#~ "the inventory."
-#~ msgstr ""
-#~ "Genereer beelden van objecten in de rugzak vooraf.\n"
-#~ "De start-tijd wordt hierdoor langer, maar het spel wordt vloeiender.\n"
-#~ "Dit kost veel geheugen op de videokaart. Als die onvoldoende geheugen "
-#~ "heeft kan dit resulteren in vreemde effecten."
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Laad rugzak-texturen vooraf"
-
-#~ msgid "Vertical initial window size."
-#~ msgstr "Aanvangshoogte van het window."
-
-#~ msgid "Vertical spawn range"
-#~ msgstr "Vertikaal geboortegebied"
-
-#~ msgid "Viewing range minimum"
-#~ msgstr "Minimale zichtafstand"
-
-#~ msgid "Wanted FPS"
-#~ msgstr "Gewenste FPS"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Schaal-factor toegepast op menu elementen: "
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten.\n"
+#~ "'trees' en 'flat' zijn enkel van toepassing in mgv6."
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Downloaden"
+#~ msgid "If disabled "
+#~ msgstr "MP uitschakelen"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "ingeschakeld"
+
+#~ msgid "Rendering:"
+#~ msgstr "Rendering:"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Herstart minetest om de driver te activeren"
+
+#~ msgid "Game Name"
+#~ msgstr "Spel"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren"
+
+#~ msgid "GAMES"
+#~ msgstr "SPELLEN"
+
+#~ msgid "Mods:"
+#~ msgstr "Mods:"
+
+#~ msgid "new game"
+#~ msgstr "nieuw spel"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "SPEL AANPASSEN"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Geselecteerde mod verwijderen"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Mod toevoegen"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "START SERVER"
+
+#~ msgid "Name"
+#~ msgstr "Naam"
+
+#~ msgid "Password"
+#~ msgstr "Wachtwoord"
+
+#~ msgid "SETTINGS"
+#~ msgstr "INSTELLINGEN"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Voorwerpen vooraf laden"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Eindige vloeistoffen"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "SINGLEPLAYER"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "TEXTUREN"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "Add mod:"
+#~ msgstr "Mod toevoegen:"
+
+#~ msgid "Local install"
+#~ msgstr "Plaatselijk installeren"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item"
+#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n"
+#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie "
+#~ "bewaard. "
 
-#~ msgid "is required by:"
-#~ msgstr "is benodigd voor:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Instellingen bewaard. "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Waarschuwing: Instellingen niet consistent. "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens"
-
-#~ msgid "Show Public"
-#~ msgstr "Publieke server"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Favourieten"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Laat het adres leeg om een lokale server te starten."
-
-#~ msgid "Create world"
-#~ msgstr "Maak wereld aan"
-
-#~ msgid "Address required."
-#~ msgstr "IP-adres nodig."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Deze bestanden worden verwijderd"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Niet alle bestanden zijn verwijderd"
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "LEt op: Sommige ingestelde mods zijn vermist.\n"
+#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4937,138 +4839,236 @@ msgstr "cURL timeout"
 #~ "- ESC: Menu\n"
 #~ "- T: Chat\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Niet alle bestanden zijn verwijderd"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Deze bestanden worden verwijderd"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd"
+
+#~ msgid "Address required."
+#~ msgstr "IP-adres nodig."
+
+#~ msgid "Create world"
+#~ msgstr "Maak wereld aan"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Laat het adres leeg om een lokale server te starten."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Favourieten"
+
+#~ msgid "Show Public"
+#~ msgstr "Publieke server"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Waarschuwing: Instellingen niet consistent. "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Instellingen bewaard. "
+
+#~ msgid "is required by:"
+#~ msgstr "is benodigd voor:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
-#~ "LEt op: Sommige ingestelde mods zijn vermist.\n"
-#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. "
+#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item"
+
+#, fuzzy
+#~ msgid "Downloading"
+#~ msgstr "Downloaden"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Schaal-factor toegepast op menu elementen: "
+
+#~ msgid "Wanted FPS"
+#~ msgstr "Gewenste FPS"
+
+#~ msgid "Viewing range minimum"
+#~ msgstr "Minimale zichtafstand"
+
+#~ msgid "Vertical spawn range"
+#~ msgstr "Vertikaal geboortegebied"
+
+#~ msgid "Vertical initial window size."
+#~ msgstr "Aanvangshoogte van het window."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Laad rugzak-texturen vooraf"
 
 #~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
+#~ "Pre-generate all item visuals used in the inventory.\n"
+#~ "This increases startup time, but runs smoother in-game.\n"
+#~ "The generated textures can easily exceed your VRAM, causing artifacts in "
+#~ "the inventory."
 #~ msgstr ""
-#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n"
-#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie "
-#~ "bewaard. "
+#~ "Genereer beelden van objecten in de rugzak vooraf.\n"
+#~ "De start-tijd wordt hierdoor langer, maar het spel wordt vloeiender.\n"
+#~ "Dit kost veel geheugen op de videokaart. Als die onvoldoende geheugen "
+#~ "heeft kan dit resulteren in vreemde effecten."
 
-#~ msgid "Local install"
-#~ msgstr "Plaatselijk installeren"
+#~ msgid "New style water"
+#~ msgstr "Nieuw water"
 
-#~ msgid "Add mod:"
-#~ msgstr "Mod toevoegen:"
-
-#~ msgid "MODS"
-#~ msgstr "MODS"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "TEXTUREN"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "SINGLEPLAYER"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Eindige vloeistoffen"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Voorwerpen vooraf laden"
-
-#~ msgid "SETTINGS"
-#~ msgstr "INSTELLINGEN"
-
-#~ msgid "Password"
-#~ msgstr "Wachtwoord"
-
-#~ msgid "Name"
-#~ msgstr "Naam"
-
-#~ msgid "START SERVER"
-#~ msgstr "START SERVER"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Mod toevoegen"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Geselecteerde mod verwijderen"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "SPEL AANPASSEN"
-
-#~ msgid "new game"
-#~ msgstr "nieuw spel"
-
-#~ msgid "Mods:"
-#~ msgstr "Mods:"
-
-#~ msgid "GAMES"
-#~ msgstr "SPELLEN"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren"
-
-#~ msgid "Game Name"
-#~ msgstr "Spel"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Herstart minetest om de driver te activeren"
-
-#~ msgid "Rendering:"
-#~ msgstr "Rendering:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "ingeschakeld"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "MP uitschakelen"
-
-#, fuzzy
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Minimum wanted FPS.\n"
+#~ "The amount of rendered stuff is dynamically set according to this. and "
+#~ "viewing range min and max."
+#~ msgstr ""
+#~ "Minimaal gewenste FPS.\n"
+#~ "De hoeveelheid gerenderd materiaal wordt aangepast afhankelijk van deze "
+#~ "waarde, en van de min en max zichtafstanden."
+
+#~ msgid ""
+#~ "Maximum distance above water level for player spawn.\n"
+#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n"
+#~ "Smaller values may result in a suitable spawn point not being found,\n"
+#~ "resulting in a spawn at (0, 0, 0) possibly buried underground."
+#~ msgstr ""
+#~ "Maximum hoogte boven waterniveau waar een speler geboren wordt.\n"
+#~ "Bij hogere waarden zullen de plaatsen dichter bij (x = 0, z = 0) liggen.\n"
+#~ "Bij lagere waarden kan het zijn dat een geschikte plek niet gevonden "
+#~ "wordt,\n"
+#~ "in dat geval wordt de speler geboren op (0, 0, 0), mogelijk onder de "
+#~ "grond."
+
+#~ msgid "Mapgen fractal mandelbrot slice w"
+#~ msgstr "Fractal wereldgenerator mandelbrot w-doorsnede"
+
+#~ msgid "Mapgen fractal mandelbrot scale"
+#~ msgstr "Fractal wereldgenerator mandelbrot schaal"
+
+#~ msgid "Mapgen fractal mandelbrot offset"
+#~ msgstr "Fractal wereldgenerator mandelbrot centrum-afstand"
+
+#~ msgid "Mapgen fractal mandelbrot iterations"
+#~ msgstr "Fractal wereldgenerator mandelbrot iteraties"
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen fractal.\n"
+#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with \"no\" are used to explicitly disable them."
 #~ msgstr ""
-#~ "Algemene wereldgenerator instellingen.\n"
+#~ "Wereldgeneratie instellingen voor de fractal generator.\n"
+#~ "'julia' selecterd een julia-verzameling in plaats van een mandebrot-"
+#~ "verzameling.\n"
 #~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 #~ "waarde.\n"
-#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten.\n"
-#~ "'trees' en 'flat' zijn enkel van toepassing in mgv6."
-
-#~ msgid "No!!!"
-#~ msgstr "Nee!!!"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Publieke Serverlijst"
-
-#~ msgid "No of course not!"
-#~ msgstr "Nee, natuurlijk niet!"
-
-#~ msgid "Useful for mod developers."
-#~ msgstr "Nuttig voor mod-ontwikkelaars."
-
-#~ msgid "How many blocks are flying in the wire simultaneously per client."
-#~ msgstr "Het aantal blokken dat per cliënt tegelijk onderweg kan zijn."
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
 
 #~ msgid ""
-#~ "How many blocks are flying in the wire simultaneously for the whole "
-#~ "server."
+#~ "Mandelbrot set: Iterations of the recursive function.\n"
+#~ "Controls scale of finest detail."
 #~ msgstr ""
-#~ "Het aantal blokken dat totaal tegelijk onderweg kan zijn, voor de hele "
-#~ "server."
+#~ "Mandelbrot verzameling: Aantal iteraties van de recursieve functie.\n"
+#~ "Bepaalt de schaal van de kleinste details."
 
-#~ msgid "Detailed mod profiling"
-#~ msgstr "Gedetailleerde profiling van mods"
+#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+#~ msgstr "Mandelbrot verzameling: (X,Y,Z) schaal, in nodes (bij benadering)."
 
-#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgid ""
+#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
 #~ msgstr ""
-#~ "Gedetailleerde profiling-data voor mods. Nuttig voor mod-ontwikkelaars."
+#~ "Mandelbrot verzameling: (X,Y,Z) afstanden vanaf wereld-centrum.\n"
+#~ " Bereik is ongeveer -2 tot 2. Vermenigvuldig met m_scale voor de afstand "
+#~ "in nodes."
+
+#~ msgid ""
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Toets voor het vergroten van de zichtafstand. Dit verandert de minimale "
+#~ "zichtafstand.\n"
+#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Toets voor het verkleinen van de zichtafstand. Dit verandert de minimale "
+#~ "zichtafstand.\n"
+#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Julia set: W value determining the 4D shape.\n"
+#~ "Range roughly -2 to 2."
+#~ msgstr ""
+#~ "Juliaverzameling: W-waarde van de 4D vorm.\n"
+#~ "Bereik is ongeveer -2 tot 2."
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Juliaverzameling: (X,Y,X) afstanden van wereld-centrum.\n"
+#~ "Bereik is ongeveer -2 tot 2. Vermenigvuldig met j_scale voor de afstand "
+#~ "in nodes."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr "Laat geselecteerde nodes oplichten (schakelt selectie-randen uit)."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n"
+#~ "Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n"
+#~ "wateroppervlakte werkt niet als dit is aangeschakeld."
+
+#~ msgid "Item textures..."
+#~ msgstr "Voorwerp-texturen..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Wereldgenerator instellingen specified voor generator v6.\n"
+#~ "Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en "
+#~ "wordt de \"jungles\" vlag genegeerd.\n"
+#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
+#~ "waarde.\n"
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Wereldgenerator instellingen specified voor generator v7.\n"
+#~ "\"ridges\" zijn rivieren.\n"
+#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
+#~ "waarde.\n"
+#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index 19f18e73a..b767a560a 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-11-08 17:20+0000\n"
 "Last-Translator: Jakub Mendel <jimikuba@o2.pl>\n"
-"Language-Team: Polish "
-"<https://hosted.weblate.org/projects/minetest/minetest/pl/>\n"
+"Language-Team: Polish <https://hosted.weblate.org/projects/minetest/minetest/"
+"pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1459,8 +1459,8 @@ msgid ""
 "minetest.net."
 msgstr ""
 "Zgłoś do tej listy serwerów.\n"
-"Jeśli chcesz zgłosić twój adres ipv6, użyj serverlist_url = "
-"v6.servers.minetest.net."
+"Jeśli chcesz zgłosić twój adres ipv6, użyj serverlist_url = v6.servers."
+"minetest.net."
 
 #: src/settings_translation_file.cpp
 msgid "Approximate (X,Y,Z) scale of fractal in nodes."
@@ -1987,8 +1987,8 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 "Włącza używanie zdalnego serwera mediów (jeżeli dostarczany przez serwer).\n"
-"Zdalny serwer oferuje znacząco szybszy sposób pobierania mediów (np. tekstur)"
-"\n"
+"Zdalny serwer oferuje znacząco szybszy sposób pobierania mediów (np. "
+"tekstur)\n"
 "jeżeli następuje połączenie z serwerem."
 
 #: src/settings_translation_file.cpp
@@ -2234,8 +2234,8 @@ msgstr ""
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
-"Z jakiej odległości bloki są przesyłane do klientów, zapisane w blokach map ("
-"16 węzłów)."
+"Z jakiej odległości bloki są przesyłane do klientów, zapisane w blokach map "
+"(16 węzłów)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2324,8 +2324,8 @@ msgid ""
 msgstr ""
 "Obsługa przestarzałych wywołań lua api:\n"
 "- legacy: (próbuje) naśladuje stare zachowanie (domyślne dla wydań).\n"
-"- log: naśladuje i loguje przestarzałe wywołania (domyślne dla wersji debug)."
-"\n"
+"- log: naśladuje i loguje przestarzałe wywołania (domyślne dla wersji "
+"debug).\n"
 "- error: przerywa kiedy zostanie użyte przestarzałe api (sugerowane dla "
 "twórców modów)."
 
@@ -2414,8 +2414,8 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
-"Jeżeli włączone razem z trybem latania, gracz może latać przez solidne bloki."
-"\n"
+"Jeżeli włączone razem z trybem latania, gracz może latać przez solidne "
+"bloki.\n"
 "Wymaga przywileju \"noclip\" na serwerze."
 
 #: src/settings_translation_file.cpp
@@ -4604,59 +4604,119 @@ msgid "cURL timeout"
 msgstr "Limit czasu cURL"
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Ładowanie..."
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "Szczegółowe dane profilowania. Przydatne dla twórców modyfikacji."
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Ściągnij"
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Szczegółowe profilowanie modyfikacji"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
+#, fuzzy
+#~ msgid ""
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
 #~ msgstr ""
-#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: "
-#~ "przenieś pojedynczy przedmiot"
+#~ "Jak dużo bloków może jednocześnie być przesyłana przez sieć dla całego "
+#~ "serwera."
 
-#~ msgid "is required by:"
-#~ msgstr "wymagane przez:"
+#~ msgid "Useful for mod developers."
+#~ msgstr "Przydatne dla twórców modyfikacji."
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Konfiguracja zapisana.  "
+#~ msgid "No of course not!"
+#~ msgstr "Oczywiście, że nie!"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny.  "
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista publicznych serwerów"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Generuj mapy normalnych"
 
-#~ msgid "Show Public"
-#~ msgstr "Pokaż publiczne"
+#~ msgid "No!!!"
+#~ msgstr "Nie!!"
 
-#~ msgid "Show Favorites"
-#~ msgstr "Pokaż ulubione"
+#, fuzzy
+#~ msgid "If disabled "
+#~ msgstr "Wyłącz wszystkie"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny."
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "włączone"
 
-#~ msgid "Create world"
-#~ msgstr "Stwórz świat"
+#~ msgid "Game Name"
+#~ msgstr "Nazwa Gry"
 
-#~ msgid "Address required."
-#~ msgstr "Wymagany adres."
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Nie można skasować świata: nic nie zaznaczono"
+#~ msgid "GAMES"
+#~ msgstr "GRY"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "Pliki do skasowania"
+#~ msgid "Mods:"
+#~ msgstr "Mody:"
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry"
+#~ msgid "new game"
+#~ msgstr "nowa gra"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono"
+#~ msgid "EDIT GAME"
+#~ msgstr "EDYTUJ GRĘ"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Nie udało się skasować wszystkich plików świata"
+#~ msgid "Remove selected mod"
+#~ msgstr "Usuń zaznaczony mod"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<--Dodaj mod"
+
+#~ msgid "CLIENT"
+#~ msgstr "KLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "URUCHOM SERWER"
+
+#~ msgid "Name"
+#~ msgstr "Nazwa"
+
+#~ msgid "Password"
+#~ msgstr "Hasło"
+
+#~ msgid "SETTINGS"
+#~ msgstr "USTAWIENIA"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Ładuj obrazy przedmiotów"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Realistyczne ciecze"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "TRYB JEDNOOSOBOWY"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACZKI TEKSTUR"
+
+#~ msgid "MODS"
+#~ msgstr "MODY"
+
+#, fuzzy
+#~ msgid "Add mod:"
+#~ msgstr "<<--Dodaj mod"
+
+#, fuzzy
+#~ msgid "Local install"
+#~ msgstr "Instaluj"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n"
+#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację.  "
+
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n"
+#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację.  "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4683,117 +4743,57 @@ msgstr "Limit czasu cURL"
 #~ "- ESC: to menu\n"
 #~ "- T: czat\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Nie udało się skasować wszystkich plików świata"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Pliki do skasowania"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Nie można skasować świata: nic nie zaznaczono"
+
+#~ msgid "Address required."
+#~ msgstr "Wymagany adres."
+
+#~ msgid "Create world"
+#~ msgstr "Stwórz świat"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Pokaż ulubione"
+
+#~ msgid "Show Public"
+#~ msgstr "Pokaż publiczne"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Konfiguracja zapisana.  "
+
+#~ msgid "is required by:"
+#~ msgstr "wymagane przez:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
 #~ msgstr ""
-#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n"
-#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację.  "
-
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n"
-#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację.  "
+#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: "
+#~ "przenieś pojedynczy przedmiot"
 
 #, fuzzy
-#~ msgid "Local install"
-#~ msgstr "Instaluj"
+#~ msgid "Downloading"
+#~ msgstr "Ściągnij"
 
 #, fuzzy
-#~ msgid "Add mod:"
-#~ msgstr "<<--Dodaj mod"
-
-#~ msgid "MODS"
-#~ msgstr "MODY"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACZKI TEKSTUR"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "TRYB JEDNOOSOBOWY"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Realistyczne ciecze"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Ładuj obrazy przedmiotów"
-
-#~ msgid "SETTINGS"
-#~ msgstr "USTAWIENIA"
-
-#~ msgid "Password"
-#~ msgstr "Hasło"
-
-#~ msgid "Name"
-#~ msgstr "Nazwa"
-
-#~ msgid "START SERVER"
-#~ msgstr "URUCHOM SERWER"
-
-#~ msgid "CLIENT"
-#~ msgstr "KLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<--Dodaj mod"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Usuń zaznaczony mod"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "EDYTUJ GRĘ"
-
-#~ msgid "new game"
-#~ msgstr "nowa gra"
-
-#~ msgid "Mods:"
-#~ msgstr "Mody:"
-
-#~ msgid "GAMES"
-#~ msgstr "GRY"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się"
-
-#~ msgid "Game Name"
-#~ msgstr "Nazwa Gry"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "włączone"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Wyłącz wszystkie"
-
-#~ msgid "No!!!"
-#~ msgstr "Nie!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Generuj mapy normalnych"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista publicznych serwerów"
-
-#~ msgid "No of course not!"
-#~ msgstr "Oczywiście, że nie!"
-
-#~ msgid "Useful for mod developers."
-#~ msgstr "Przydatne dla twórców modyfikacji."
-
-#, fuzzy
-#~ msgid ""
-#~ "How many blocks are flying in the wire simultaneously for the whole "
-#~ "server."
-#~ msgstr ""
-#~ "Jak dużo bloków może jednocześnie być przesyłana przez sieć dla całego "
-#~ "serwera."
-
-#, fuzzy
-#~ msgid "Detailed mod profiling"
-#~ msgstr "Szczegółowe profilowanie modyfikacji"
-
-#, fuzzy
-#~ msgid "Detailed mod profile data. Useful for mod developers."
-#~ msgstr "Szczegółowe dane profilowania. Przydatne dla twórców modyfikacji."
+#~ msgid "Preload inventory textures"
+#~ msgstr "Ładowanie..."
diff --git a/po/pt/minetest.po b/po/pt/minetest.po
index d1fc17115..cef144845 100644
--- a/po/pt/minetest.po
+++ b/po/pt/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-11-08 00:48+0000\n"
 "Last-Translator: João Rodrigues <joaoadriano3@gmail.com>\n"
-"Language-Team: Portuguese "
-"<https://hosted.weblate.org/projects/minetest/minetest/pt/>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/minetest/"
+"minetest/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1984,8 +1984,8 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
-"Ativar a utilização de um servidor media remoto (se fornecido pelo servidor)."
-"\n"
+"Ativar a utilização de um servidor media remoto (se fornecido pelo "
+"servidor).\n"
 "Servidores remotos oferecem uma maneira mais rápida de descarregar media\n"
 "(ex. texturas) quando se estiver a conectar ao servidor."
 
@@ -2713,8 +2713,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tecla para ativar auto-corrida.\n"
-"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319"
-"01735e3da1b0edf72eb3"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2761,8 +2761,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tecla para ativar a atualização da câmara. Usado para desenvolvimento.\n"
-"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319"
-"01735e3da1b0edf72eb3"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4432,58 +4432,113 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "A carregar..."
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr ""
+#~ "Dados de perfil detalhados do extra. Útil para desenvolvedores de extras."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Dados de perfil detalhados do extra"
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Útil para desenvolvedores de extras."
+
+#~ msgid "No of course not!"
+#~ msgstr "Não, é claro que não!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista de Servidores Públicos"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Gerar Normalmaps"
+
+#~ msgid "No!!!"
+#~ msgstr "Não!!!"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Descarregar"
+#~ msgid "If disabled "
+#~ msgstr "Desativar Tudo"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Botão esq: Mover todos os itens  Botão dir: Mover um item"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "ativo"
 
-#~ msgid "is required by:"
-#~ msgstr "é necessário pelo:"
+#~ msgid "Game Name"
+#~ msgstr "Nome do Jogo"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "Configuração gravada.  "
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr ""
+#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo "
+#~ "\"$2\""
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Atenção: Configuração não compatível.  "
+#~ msgid "GAMES"
+#~ msgstr "JOGOS"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos"
+#~ msgid "Mods:"
+#~ msgstr "Extras:"
 
-#~ msgid "Show Public"
-#~ msgstr "Mostrar Públicos"
+#~ msgid "new game"
+#~ msgstr "novo jogo"
 
-#~ msgid "Show Favorites"
-#~ msgstr "Mostrar Favoritos"
+#~ msgid "EDIT GAME"
+#~ msgstr "EDITAR JOGO"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Deixe endereço em branco para iniciar servidor local."
+#~ msgid "Remove selected mod"
+#~ msgstr "Remover extra selecionado"
 
-#~ msgid "Create world"
-#~ msgstr "Criar mundo"
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Adicionar extra"
 
-#~ msgid "Address required."
-#~ msgstr "Endereço necessário."
+#~ msgid "CLIENT"
+#~ msgstr "CLIENTE"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado"
+#~ msgid "START SERVER"
+#~ msgstr "INICIAR SERVIDOR"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "Ficheiros para eliminar"
+#~ msgid "Name"
+#~ msgstr "Nome"
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos"
+#~ msgid "Password"
+#~ msgstr "Senha"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Não foi possível configurar mundo: Nada seleccionado"
+#~ msgid "SETTINGS"
+#~ msgstr "DEFINIÇÕES"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos"
+#~ msgid "Preload item visuals"
+#~ msgstr "Pré-carregamento dos itens"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Líquido Finito"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "Um Jogador"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACOTES DE TEXTURAS"
+
+#~ msgid "MODS"
+#~ msgstr "EXTRAS"
+
+#, fuzzy
+#~ msgid "Add mod:"
+#~ msgstr "<<-- Adicionar extra"
+
+#, fuzzy
+#~ msgid "Local install"
+#~ msgstr "Instalar"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods ainda não estão configurados.\n"
+#~ "Eles vão ser ativados por predefinição quando guardar a configuração.  "
+
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods configurados estão em falta.\n"
+#~ "As suas definições vão ser removidas quando gravar a configuração.  "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4510,110 +4565,55 @@ msgstr ""
 #~ "- ESC: Este menu\n"
 #~ "- T: Chat\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods configurados estão em falta.\n"
-#~ "As suas definições vão ser removidas quando gravar a configuração.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos"
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods ainda não estão configurados.\n"
-#~ "Eles vão ser ativados por predefinição quando guardar a configuração.  "
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Não foi possível configurar mundo: Nada seleccionado"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Ficheiros para eliminar"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado"
+
+#~ msgid "Address required."
+#~ msgstr "Endereço necessário."
+
+#~ msgid "Create world"
+#~ msgstr "Criar mundo"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Deixe endereço em branco para iniciar servidor local."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Mostrar Favoritos"
+
+#~ msgid "Show Public"
+#~ msgstr "Mostrar Públicos"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Atenção: Configuração não compatível.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Configuração gravada.  "
+
+#~ msgid "is required by:"
+#~ msgstr "é necessário pelo:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Botão esq: Mover todos os itens  Botão dir: Mover um item"
 
 #, fuzzy
-#~ msgid "Local install"
-#~ msgstr "Instalar"
+#~ msgid "Downloading"
+#~ msgstr "Descarregar"
 
 #, fuzzy
-#~ msgid "Add mod:"
-#~ msgstr "<<-- Adicionar extra"
-
-#~ msgid "MODS"
-#~ msgstr "EXTRAS"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACOTES DE TEXTURAS"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "Um Jogador"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Líquido Finito"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Pré-carregamento dos itens"
-
-#~ msgid "SETTINGS"
-#~ msgstr "DEFINIÇÕES"
-
-#~ msgid "Password"
-#~ msgstr "Senha"
-
-#~ msgid "Name"
-#~ msgstr "Nome"
-
-#~ msgid "START SERVER"
-#~ msgstr "INICIAR SERVIDOR"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENTE"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Adicionar extra"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Remover extra selecionado"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "EDITAR JOGO"
-
-#~ msgid "new game"
-#~ msgstr "novo jogo"
-
-#~ msgid "Mods:"
-#~ msgstr "Extras:"
-
-#~ msgid "GAMES"
-#~ msgstr "JOGOS"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr ""
-#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo "
-#~ "\"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Nome do Jogo"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "ativo"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Desativar Tudo"
-
-#~ msgid "No!!!"
-#~ msgstr "Não!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Gerar Normalmaps"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista de Servidores Públicos"
-
-#~ msgid "No of course not!"
-#~ msgstr "Não, é claro que não!"
-
-#~ msgid "Useful for mod developers."
-#~ msgstr "Útil para desenvolvedores de extras."
-
-#~ msgid "Detailed mod profiling"
-#~ msgstr "Dados de perfil detalhados do extra"
-
-#~ msgid "Detailed mod profile data. Useful for mod developers."
-#~ msgstr ""
-#~ "Dados de perfil detalhados do extra. Útil para desenvolvedores de extras."
+#~ msgid "Preload inventory textures"
+#~ msgstr "A carregar..."
diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index 9814261a5..28c5d8890 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-09-27 17:51+0000\n"
 "Last-Translator: José Henrique Luckmann <joseh.luckmann@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) "
-"<https://hosted.weblate.org/projects/minetest/minetest/pt_BR/>\n"
+"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
+"minetest/minetest/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4846,138 +4846,140 @@ msgstr "limite paralelo de cURL"
 msgid "cURL timeout"
 msgstr "Tempo de cURL"
 
-#, fuzzy
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr ""
+#~ "Dados detalhados do perfil do mod . Útil para desenvolvedores de mods."
+
+#~ msgid "Detailed mod profiling"
+#~ msgstr "Perfilamento detalhado do mod"
+
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr ""
+#~ "Quantos blocos podem ser enviados simultaneamente para todo o servidor."
+
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "Quantos blocos podem ser enviados simultaneamente por cliente."
+
+#~ msgid "Useful for mod developers."
+#~ msgstr "Útil para desenvolvedores de mods."
+
+#~ msgid "No of course not!"
+#~ msgstr "Claro que não!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Lista de servidores públicos"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Gerar Normalmaps"
+
+#~ msgid "No!!!"
+#~ msgstr "Não!!!"
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen Valleys.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
+#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
+#~ "issues.\n"
+#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
+#~ "water would tend to pool. It may interfere with delicately adjusted "
+#~ "biomes."
 #~ msgstr ""
-#~ "Atributos de mapgen específicos para Mapgen plano.\n"
-#~ "Alguns lagos e colinas são ocasionalmente adicionados num mundo plano.\n"
+#~ "Atributos de mapgen específicos para vales (Mapgen Valleys).\n"
 #~ "Flags que não estão especificadas na string de flags não são modificados "
 #~ "a partir do padrão.\n"
 #~ "Flags começando com \"no\" (não) são usadas para desativá-los "
-#~ "explicitamente."
+#~ "explicitamente.\n"
+#~ "\"altitude_chill\" torna terrenos de elevada altitude mais frios, o que "
+#~ "pode causar algumas falhas nos biomas.\n"
+#~ "\"humid_rivers\" modifica a umidade ao redor dos rios e em áreas onde a "
+#~ "água tende a ser represada em poças. Pode interferir em biomas que são "
+#~ "sensíveis a mudanças."
 
 #, fuzzy
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "Atributos para o gerador de mapas específico para o Mapgen v6.\n"
-#~ "Quando biomas de neve estão habilitados, pântanos ficam habilitados e a "
-#~ "flag de pântanos é ignorada.\n"
-#~ "Flags que não são especificadas na string da flag não são modificadas por "
-#~ "padrão.\n"
-#~ "Flags começando com \"no\" (não) são usadas para explicitamente "
-#~ "desabilitá-las."
-
-#~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Habilita recurso permitindo que o nível da água seja um pouco menor, "
-#~ "portando não preenche todo o espaço disponível para bloco.\n"
-#~ "Note que isso não está bem otimizado e que suavização da iluminação na "
-#~ "superfície da água não funciona bem com esse recurso."
-
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr ""
-#~ "Habilitar destaque de bloco selecionado (desabilita o modo de destaque "
-#~ "selectionbox [Padrão])."
-
-#~ msgid ""
-#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
-#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
-#~ msgstr ""
-#~ "Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n"
-#~ "Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos "
-#~ "em nós."
-
-#~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Tecla para diminuir o intervalo de visualização. Modifica o intervalo "
-#~ "mínimo de visualização.\n"
-#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-#~ msgstr ""
-#~ "Tecla para aumentar o intervalo de visualização. Modifica o mínimo "
-#~ "intervalo de visualização.\n"
-#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "pré-carregando texturas de inventário"
+#~ msgid "If disabled "
+#~ msgstr "Desabilitar PMs"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Baixar"
+#~ msgid "If enabled, "
+#~ msgstr "habilitado"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item"
+#~ msgid "Game Name"
+#~ msgstr "Nome do jogo"
 
-#~ msgid "is required by:"
-#~ msgstr "é necessário para:"
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\""
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "A configuração foi salva. "
+#~ msgid "GAMES"
+#~ msgstr "JOGOS"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Atenção: A configuração não está consistente."
+#~ msgid "Mods:"
+#~ msgstr "Módulos:"
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos"
+#~ msgid "new game"
+#~ msgstr "novo jogo"
 
-#~ msgid "Show Public"
-#~ msgstr "Exibir públicos"
+#~ msgid "EDIT GAME"
+#~ msgstr "EDITAR JOGO"
 
-#~ msgid "Show Favorites"
-#~ msgstr "Exibir favoritos"
+#~ msgid "Remove selected mod"
+#~ msgstr "Remover o módulo selecionado"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Deixe o endereço em branco para iniciar um servidor local."
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Adicionar módulo"
 
-#~ msgid "Create world"
-#~ msgstr "Criar o mundo"
+#~ msgid "CLIENT"
+#~ msgstr "CLIENTE"
 
-#~ msgid "Address required."
-#~ msgstr "É necessário um endereço."
+#~ msgid "START SERVER"
+#~ msgstr "SERVIDOR"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado"
+#~ msgid "Name"
+#~ msgstr "Nome"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "Arquivos a serem excluídos"
+#~ msgid "Password"
+#~ msgstr "Senha"
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo"
+#~ msgid "SETTINGS"
+#~ msgstr "CONFIGURAÇÕES"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado"
+#~ msgid "Preload item visuals"
+#~ msgstr "Precarga de elementos visuais"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Não foi possível excluir todos os arquivos do mundo"
+#~ msgid "Finite Liquid"
+#~ msgstr "Líquido finito"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "UM JOGADOR"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "TEXTURAS"
+
+#~ msgid "MODS"
+#~ msgstr "MÓDULOS"
+
+#~ msgid "Add mod:"
+#~ msgstr "Adicionar módulo:"
+
+#~ msgid "Local install"
+#~ msgstr "Instalação local"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods ainda não foram configurados.\n"
+#~ "E eles serão ativados por padrão, quando você salvar a configuração."
+
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "Atenção: Alguns mods configurados não foram encontrados.\n"
+#~ "Suas definições serão removidas quando você salvar a configuração."
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -5004,137 +5006,135 @@ msgstr "Tempo de cURL"
 #~ "- ESC: este menu\n"
 #~ "- T: bate-papo\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods configurados não foram encontrados.\n"
-#~ "Suas definições serão removidas quando você salvar a configuração."
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Não foi possível excluir todos os arquivos do mundo"
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Atenção: Alguns mods ainda não foram configurados.\n"
-#~ "E eles serão ativados por padrão, quando você salvar a configuração."
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado"
 
-#~ msgid "Local install"
-#~ msgstr "Instalação local"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo"
 
-#~ msgid "Add mod:"
-#~ msgstr "Adicionar módulo:"
+#~ msgid "Files to be deleted"
+#~ msgstr "Arquivos a serem excluídos"
 
-#~ msgid "MODS"
-#~ msgstr "MÓDULOS"
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado"
 
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "TEXTURAS"
+#~ msgid "Address required."
+#~ msgstr "É necessário um endereço."
 
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "UM JOGADOR"
+#~ msgid "Create world"
+#~ msgstr "Criar o mundo"
 
-#~ msgid "Finite Liquid"
-#~ msgstr "Líquido finito"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Deixe o endereço em branco para iniciar um servidor local."
 
-#~ msgid "Preload item visuals"
-#~ msgstr "Precarga de elementos visuais"
+#~ msgid "Show Favorites"
+#~ msgstr "Exibir favoritos"
 
-#~ msgid "SETTINGS"
-#~ msgstr "CONFIGURAÇÕES"
+#~ msgid "Show Public"
+#~ msgstr "Exibir públicos"
 
-#~ msgid "Password"
-#~ msgstr "Senha"
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos"
 
-#~ msgid "Name"
-#~ msgstr "Nome"
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Atenção: A configuração não está consistente."
 
-#~ msgid "START SERVER"
-#~ msgstr "SERVIDOR"
+#~ msgid "Configuration saved.  "
+#~ msgstr "A configuração foi salva. "
 
-#~ msgid "CLIENT"
-#~ msgstr "CLIENTE"
+#~ msgid "is required by:"
+#~ msgstr "é necessário para:"
 
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Adicionar módulo"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Remover o módulo selecionado"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "EDITAR JOGO"
-
-#~ msgid "new game"
-#~ msgstr "novo jogo"
-
-#~ msgid "Mods:"
-#~ msgstr "Módulos:"
-
-#~ msgid "GAMES"
-#~ msgstr "JOGOS"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Nome do jogo"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item"
 
 #, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "habilitado"
+#~ msgid "Downloading"
+#~ msgstr "Baixar"
 
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Desabilitar PMs"
+#~ msgid "Preload inventory textures"
+#~ msgstr "pré-carregando texturas de inventário"
 
 #~ msgid ""
-#~ "Map generation attributes specific to Mapgen Valleys.\n"
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Tecla para aumentar o intervalo de visualização. Modifica o mínimo "
+#~ "intervalo de visualização.\n"
+#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Tecla para diminuir o intervalo de visualização. Modifica o intervalo "
+#~ "mínimo de visualização.\n"
+#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Julia set: (X,Y,Z) offsets from world centre.\n"
+#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+#~ msgstr ""
+#~ "Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n"
+#~ "Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos "
+#~ "em nós."
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr ""
+#~ "Habilitar destaque de bloco selecionado (desabilita o modo de destaque "
+#~ "selectionbox [Padrão])."
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Habilita recurso permitindo que o nível da água seja um pouco menor, "
+#~ "portando não preenche todo o espaço disponível para bloco.\n"
+#~ "Note que isso não está bem otimizado e que suavização da iluminação na "
+#~ "superfície da água não funciona bem com esse recurso."
+
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
 #~ "Flags that are not specified in the flag string are not modified from the "
 #~ "default.\n"
-#~ "Flags starting with \"no\" are used to explicitly disable them.\n"
-#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome "
-#~ "issues.\n"
-#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where "
-#~ "water would tend to pool. It may interfere with delicately adjusted "
-#~ "biomes."
+#~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
-#~ "Atributos de mapgen específicos para vales (Mapgen Valleys).\n"
+#~ "Atributos para o gerador de mapas específico para o Mapgen v6.\n"
+#~ "Quando biomas de neve estão habilitados, pântanos ficam habilitados e a "
+#~ "flag de pântanos é ignorada.\n"
+#~ "Flags que não são especificadas na string da flag não são modificadas por "
+#~ "padrão.\n"
+#~ "Flags começando com \"no\" (não) são usadas para explicitamente "
+#~ "desabilitá-las."
+
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "Atributos de mapgen específicos para Mapgen plano.\n"
+#~ "Alguns lagos e colinas são ocasionalmente adicionados num mundo plano.\n"
 #~ "Flags que não estão especificadas na string de flags não são modificados "
 #~ "a partir do padrão.\n"
 #~ "Flags começando com \"no\" (não) são usadas para desativá-los "
-#~ "explicitamente.\n"
-#~ "\"altitude_chill\" torna terrenos de elevada altitude mais frios, o que "
-#~ "pode causar algumas falhas nos biomas.\n"
-#~ "\"humid_rivers\" modifica a umidade ao redor dos rios e em áreas onde a "
-#~ "água tende a ser represada em poças. Pode interferir em biomas que são "
-#~ "sensíveis a mudanças."
-
-#~ msgid "No!!!"
-#~ msgstr "Não!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Gerar Normalmaps"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Lista de servidores públicos"
-
-#~ msgid "No of course not!"
-#~ msgstr "Claro que não!"
-
-#~ msgid "Useful for mod developers."
-#~ msgstr "Útil para desenvolvedores de mods."
-
-#~ msgid "How many blocks are flying in the wire simultaneously per client."
-#~ msgstr "Quantos blocos podem ser enviados simultaneamente por cliente."
-
-#~ msgid ""
-#~ "How many blocks are flying in the wire simultaneously for the whole "
-#~ "server."
-#~ msgstr ""
-#~ "Quantos blocos podem ser enviados simultaneamente para todo o servidor."
-
-#~ msgid "Detailed mod profiling"
-#~ msgstr "Perfilamento detalhado do mod"
-
-#~ msgid "Detailed mod profile data. Useful for mod developers."
-#~ msgstr ""
-#~ "Dados detalhados do perfil do mod . Útil para desenvolvedores de mods."
+#~ "explicitamente."
diff --git a/po/ro/minetest.po b/po/ro/minetest.po
index a40633409..a9efb035f 100644
--- a/po/ro/minetest.po
+++ b/po/ro/minetest.po
@@ -4336,91 +4336,91 @@ msgid "cURL timeout"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Se încarcă..."
+#~ msgid "Useful for mod developers."
+#~ msgstr "Dezvoltatori de bază"
 
-#, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Descarcă"
+#~ msgid "No of course not!"
+#~ msgstr "Nu, sigur că nu!"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr ""
-#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect"
-
-#~ msgid "Local install"
-#~ msgstr "Instalare locală"
-
-#~ msgid "Add mod:"
-#~ msgstr "Adăugaţi mod:"
-
-#~ msgid "MODS"
-#~ msgstr "MODURI"
-
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "PACHETE DE TEXTURĂ"
-
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "SINGLE PLAYER"
-
-#~ msgid "Finite Liquid"
-#~ msgstr "Lichid finit"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Pre-încarcă imaginile obiectelor"
-
-#~ msgid "SETTINGS"
-#~ msgstr "SETĂRI"
-
-#~ msgid "Password"
-#~ msgstr "Parolă"
-
-#~ msgid "Name"
-#~ msgstr "Nume"
-
-#~ msgid "START SERVER"
-#~ msgstr "DESCHIDE SERVERUL"
-
-#~ msgid "CLIENT"
-#~ msgstr "CLIENT"
-
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Adaugă modul"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Șterge modul selectat"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "MODIFICĂ JOCUL"
-
-#~ msgid "new game"
-#~ msgstr "joc nou"
-
-#~ msgid "Mods:"
-#~ msgstr "Moduri:"
-
-#~ msgid "GAMES"
-#~ msgstr "JOCURI"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Numele jocului"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "activat"
+#~ msgid "Public Serverlist"
+#~ msgstr "Listă de servere publică"
 
 #, fuzzy
 #~ msgid "If disabled "
 #~ msgstr "Dezactivează MP"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Listă de servere publică"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "activat"
 
-#~ msgid "No of course not!"
-#~ msgstr "Nu, sigur că nu!"
+#~ msgid "Game Name"
+#~ msgstr "Numele jocului"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\""
+
+#~ msgid "GAMES"
+#~ msgstr "JOCURI"
+
+#~ msgid "Mods:"
+#~ msgstr "Moduri:"
+
+#~ msgid "new game"
+#~ msgstr "joc nou"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "MODIFICĂ JOCUL"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Șterge modul selectat"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Adaugă modul"
+
+#~ msgid "CLIENT"
+#~ msgstr "CLIENT"
+
+#~ msgid "START SERVER"
+#~ msgstr "DESCHIDE SERVERUL"
+
+#~ msgid "Name"
+#~ msgstr "Nume"
+
+#~ msgid "Password"
+#~ msgstr "Parolă"
+
+#~ msgid "SETTINGS"
+#~ msgstr "SETĂRI"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Pre-încarcă imaginile obiectelor"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Lichid finit"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "SINGLE PLAYER"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "PACHETE DE TEXTURĂ"
+
+#~ msgid "MODS"
+#~ msgstr "MODURI"
+
+#~ msgid "Add mod:"
+#~ msgstr "Adăugaţi mod:"
+
+#~ msgid "Local install"
+#~ msgstr "Instalare locală"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr ""
+#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect"
 
 #, fuzzy
-#~ msgid "Useful for mod developers."
-#~ msgstr "Dezvoltatori de bază"
+#~ msgid "Downloading"
+#~ msgstr "Descarcă"
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Se încarcă..."
diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index 9a5ac2674..1ef80854c 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -10,14 +10,14 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-12-13 03:10+0000\n"
 "Last-Translator: Andrey <lordofmist@mail.ru>\n"
-"Language-Team: Russian "
-"<https://hosted.weblate.org/projects/minetest/minetest/ru/>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/minetest/"
+"minetest/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
@@ -4625,107 +4625,117 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "cURL тайм-аут"
 
+#, fuzzy
 #~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "Включите немного более низкую поверхность воды, чтобы она\n"
-#~ "не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n"
-#~ "и мягкое освещение на поверхности воды не работает с этим."
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr "Количество блоков, передаваемых одновременно для всего сервера."
+
+#, fuzzy
+#~ msgid "Useful for mod developers."
+#~ msgstr "Разработчики в отставке"
+
+#~ msgid "No of course not!"
+#~ msgstr "Нет, конечно нет!"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "Список публичных серверов"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Генерировать карты нормалей"
+
+#~ msgid "No!!!"
+#~ msgstr "Нет!"
+
+#~ msgid "\""
+#~ msgstr "\""
+
+#~ msgid "If disabled "
+#~ msgstr "Если выключено "
+
+#~ msgid "If enabled, "
+#~ msgstr "Если включено "
+
+#~ msgid "Rendering:"
+#~ msgstr "Рендеринг:"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Перезапустите Minetest для принятия изменений"
+
+#~ msgid "Game Name"
+#~ msgstr "Название"
+
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\""
+
+#~ msgid "GAMES"
+#~ msgstr "ИГРЫ"
+
+#~ msgid "Mods:"
+#~ msgstr "Моды:"
+
+#~ msgid "new game"
+#~ msgstr "Создать игру"
+
+#~ msgid "EDIT GAME"
+#~ msgstr "РЕДАКТИРОВАНИЕ"
+
+#~ msgid "Remove selected mod"
+#~ msgstr "Удалить мод"
+
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- Добавить мод"
+
+#~ msgid "CLIENT"
+#~ msgstr "КЛИЕНТ"
+
+#~ msgid "START SERVER"
+#~ msgstr "СЕРВЕР"
+
+#~ msgid "Name"
+#~ msgstr "Имя"
+
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#~ msgid "SETTINGS"
+#~ msgstr "НАСТРОЙКИ"
+
+#~ msgid "Preload item visuals"
+#~ msgstr "Предзагрузка изображений"
+
+#~ msgid "Finite Liquid"
+#~ msgstr "Конечные жидкости"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "ОДИНОЧНАЯ ИГРА"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "ПАКЕТЫ ТЕКСТУР"
+
+#~ msgid "MODS"
+#~ msgstr "МОДЫ"
+
+#~ msgid "Add mod:"
+#~ msgstr "Добавить мод:"
+
+#~ msgid "Local install"
+#~ msgstr "Локальная установка"
 
 #~ msgid ""
-#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
 #~ msgstr ""
-#~ "Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность "
-#~ "отображения.\n"
-#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ "Предупреждение: Некоторые моды еще не настроены.\n"
+#~ "Их стандартные настройки будут установлены, когда вы сохраните "
+#~ "конфигурацию.  "
 
 #~ msgid ""
-#~ "Key for increasing the viewing range. Modifies the minimum viewing "
-#~ "range.\n"
-#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
 #~ msgstr ""
-#~ "Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность "
-#~ "отображения.\n"
-#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
-#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
-
-#, fuzzy
-#~ msgid "New style water"
-#~ msgstr "Новый стиль воды"
-
-#~ msgid "Preload inventory textures"
-#~ msgstr "Предзагрузка текстур..."
-
-#, fuzzy
-#~ msgid "Viewing range minimum"
-#~ msgstr "Минимальная граница дальности отрисовки."
-
-#, fuzzy
-#~ msgid "Wanted FPS"
-#~ msgstr "Ожидаемый FPS"
-
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Коэффициент масштаба интерфейса: "
-
-#~ msgid "Touch free target"
-#~ msgstr "Свободный выбор цели"
-
-#, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Загрузить"
-
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет"
-
-#~ msgid "is required by:"
-#~ msgstr "требуется для:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Настройки сохранены.  "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Предупреждение: Неверная конфигурация.  "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы"
-
-#~ msgid "Show Public"
-#~ msgstr "Публичные"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Избранные"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Оставьте адрес пустым для запуска локального сервера."
-
-#~ msgid "Create world"
-#~ msgstr "Создать мир"
-
-#~ msgid "Address required."
-#~ msgstr "Нужно ввести адрес."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Невозможно удалить мир: Ничего не выбрано"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Следующие файлы будут удалены"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Невозможно создать мир: Ни одной игры не найдено"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Невозможно настроить мир: ничего не выбрано"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Ошибка при удалении файлов мира"
+#~ "Предупреждение: Некоторые моды не найдены.\n"
+#~ "Их настройки будут удалены, когда вы сохраните конфигурацию.  "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4752,114 +4762,104 @@ msgstr "cURL тайм-аут"
 #~ "- ESC: это меню\n"
 #~ "- T: чат\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "Предупреждение: Некоторые моды не найдены.\n"
-#~ "Их настройки будут удалены, когда вы сохраните конфигурацию.  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Ошибка при удалении файлов мира"
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "Предупреждение: Некоторые моды еще не настроены.\n"
-#~ "Их стандартные настройки будут установлены, когда вы сохраните "
-#~ "конфигурацию.  "
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Невозможно настроить мир: ничего не выбрано"
 
-#~ msgid "Local install"
-#~ msgstr "Локальная установка"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Невозможно создать мир: Ни одной игры не найдено"
 
-#~ msgid "Add mod:"
-#~ msgstr "Добавить мод:"
+#~ msgid "Files to be deleted"
+#~ msgstr "Следующие файлы будут удалены"
 
-#~ msgid "MODS"
-#~ msgstr "МОДЫ"
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Невозможно удалить мир: Ничего не выбрано"
 
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "ПАКЕТЫ ТЕКСТУР"
+#~ msgid "Address required."
+#~ msgstr "Нужно ввести адрес."
 
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "ОДИНОЧНАЯ ИГРА"
+#~ msgid "Create world"
+#~ msgstr "Создать мир"
 
-#~ msgid "Finite Liquid"
-#~ msgstr "Конечные жидкости"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Оставьте адрес пустым для запуска локального сервера."
 
-#~ msgid "Preload item visuals"
-#~ msgstr "Предзагрузка изображений"
+#~ msgid "Show Favorites"
+#~ msgstr "Избранные"
 
-#~ msgid "SETTINGS"
-#~ msgstr "НАСТРОЙКИ"
+#~ msgid "Show Public"
+#~ msgstr "Публичные"
 
-#~ msgid "Password"
-#~ msgstr "Пароль"
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы"
 
-#~ msgid "Name"
-#~ msgstr "Имя"
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Предупреждение: Неверная конфигурация.  "
 
-#~ msgid "START SERVER"
-#~ msgstr "СЕРВЕР"
+#~ msgid "Configuration saved.  "
+#~ msgstr "Настройки сохранены.  "
 
-#~ msgid "CLIENT"
-#~ msgstr "КЛИЕНТ"
+#~ msgid "is required by:"
+#~ msgstr "требуется для:"
 
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- Добавить мод"
-
-#~ msgid "Remove selected mod"
-#~ msgstr "Удалить мод"
-
-#~ msgid "EDIT GAME"
-#~ msgstr "РЕДАКТИРОВАНИЕ"
-
-#~ msgid "new game"
-#~ msgstr "Создать игру"
-
-#~ msgid "Mods:"
-#~ msgstr "Моды:"
-
-#~ msgid "GAMES"
-#~ msgstr "ИГРЫ"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\""
-
-#~ msgid "Game Name"
-#~ msgstr "Название"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Перезапустите Minetest для принятия изменений"
-
-#~ msgid "Rendering:"
-#~ msgstr "Рендеринг:"
-
-#~ msgid "If enabled, "
-#~ msgstr "Если включено "
-
-#~ msgid "If disabled "
-#~ msgstr "Если выключено "
-
-#~ msgid "\""
-#~ msgstr "\""
-
-#~ msgid "No!!!"
-#~ msgstr "Нет!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Генерировать карты нормалей"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "Список публичных серверов"
-
-#~ msgid "No of course not!"
-#~ msgstr "Нет, конечно нет!"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет"
 
 #, fuzzy
-#~ msgid "Useful for mod developers."
-#~ msgstr "Разработчики в отставке"
+#~ msgid "Downloading"
+#~ msgstr "Загрузить"
+
+#~ msgid "Touch free target"
+#~ msgstr "Свободный выбор цели"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Коэффициент масштаба интерфейса: "
 
 #, fuzzy
+#~ msgid "Wanted FPS"
+#~ msgstr "Ожидаемый FPS"
+
+#, fuzzy
+#~ msgid "Viewing range minimum"
+#~ msgstr "Минимальная граница дальности отрисовки."
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "Предзагрузка текстур..."
+
+#, fuzzy
+#~ msgid "New style water"
+#~ msgstr "Новый стиль воды"
+
 #~ msgid ""
-#~ "How many blocks are flying in the wire simultaneously for the whole "
-#~ "server."
-#~ msgstr "Количество блоков, передаваемых одновременно для всего сервера."
+#~ "Key for increasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность "
+#~ "отображения.\n"
+#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Key for decreasing the viewing range. Modifies the minimum viewing "
+#~ "range.\n"
+#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+#~ msgstr ""
+#~ "Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность "
+#~ "отображения.\n"
+#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr."
+#~ "html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#~ msgid ""
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "Включите немного более низкую поверхность воды, чтобы она\n"
+#~ "не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n"
+#~ "и мягкое освещение на поверхности воды не работает с этим."
diff --git a/po/sw/minetest.po b/po/sw/minetest.po
index 3b851e057..82d704b07 100644
--- a/po/sw/minetest.po
+++ b/po/sw/minetest.po
@@ -5,8 +5,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-03 05:13+0000\n"
 "Last-Translator: Eidy <JulianBiddle@practicalcybernetics.com>\n"
-"Language-Team: Swahili "
-"<https://hosted.weblate.org/projects/minetest/minetest/sw/>\n"
+"Language-Team: Swahili <https://hosted.weblate.org/projects/minetest/"
+"minetest/sw/>\n"
 "Language: sw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,18 +14,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.9-dev\n"
 
-#: builtin/fstk/ui.lua
-msgid "The server has requested a reconnect:"
-msgstr "Seva imeomba na Unganisha upya:"
-
-#: builtin/fstk/ui.lua
-msgid "Main menu"
-msgstr "Menyu kuu"
-
-#: builtin/fstk/ui.lua
-msgid "Reconnect"
-msgstr "Unganisha upya"
-
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
 msgstr "Kosa limetokea katika hati Lua, kama vile Moduli na:"
@@ -34,62 +22,49 @@ msgstr "Kosa limetokea katika hati Lua, kama vile Moduli na:"
 msgid "An error occured:"
 msgstr "Kosa limetokea:"
 
+#: builtin/fstk/ui.lua
+msgid "Main menu"
+msgstr "Menyu kuu"
+
 #: builtin/fstk/ui.lua builtin/mainmenu/store.lua
 msgid "Ok"
 msgstr "Sawa kabisa"
 
+#: builtin/fstk/ui.lua
+msgid "Reconnect"
+msgstr "Unganisha upya"
+
+#: builtin/fstk/ui.lua
+msgid "The server has requested a reconnect:"
+msgstr "Seva imeomba na Unganisha upya:"
+
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
 msgstr "Inapakia..."
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "Jaribu reenabling serverlist umma na Kagua muunganisho wako wa tovuti."
-
-#: builtin/mainmenu/common.lua
-msgid "Server supports protocol versions between $1 and $2. "
-msgstr "Seva inasaidia matoleo ya itifaki kati ya $1 na $2."
+msgid "Protocol version mismatch. "
+msgstr "Itifaki ya toleo haifanani."
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
 msgstr "Seva anahimiza itifaki toleo dola 1."
 
 #: builtin/mainmenu/common.lua
-msgid "We support protocol versions between version $1 and $2."
-msgstr "Tunaunga mkono matoleo ya itifaki kati ya toleo la $1 na $2."
+msgid "Server supports protocol versions between $1 and $2. "
+msgstr "Seva inasaidia matoleo ya itifaki kati ya $1 na $2."
+
+#: builtin/mainmenu/common.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "Jaribu reenabling serverlist umma na Kagua muunganisho wako wa tovuti."
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Sisi tu mkono itifaki toleo la $1."
 
 #: builtin/mainmenu/common.lua
-msgid "Protocol version mismatch. "
-msgstr "Itifaki ya toleo haifanani."
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "World:"
-msgstr "Ulimwengu:"
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Hide Game"
-msgstr "Ficha mchezo"
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Hide mp content"
-msgstr "Ficha maudhui ya mbunge"
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Mod:"
-msgstr "Moduli:"
-
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
-msgid "Depends:"
-msgstr "Inategemea:"
-
-#: builtin/mainmenu/dlg_config_world.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
-msgid "Save"
-msgstr "Hifadhi"
+msgid "We support protocol versions between version $1 and $2."
+msgstr "Tunaunga mkono matoleo ya itifaki kati ya toleo la $1 na $2."
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -99,17 +74,17 @@ msgstr "Hifadhi"
 msgid "Cancel"
 msgstr "Katisha"
 
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Enable MP"
-msgstr "Wezesha MP"
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
+msgid "Depends:"
+msgstr "Inategemea:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable MP"
 msgstr "Lemaza MP"
 
 #: builtin/mainmenu/dlg_config_world.lua
-msgid "enabled"
-msgstr "kuwezeshwa"
+msgid "Enable MP"
+msgstr "Wezesha MP"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -123,50 +98,75 @@ msgstr ""
 "Ilishindwa kuwezesha Moduli \"dola 1\" kama lina vibambo ilipopiga. Tu "
 "chararacters [kwa-z0-9_] wanaruhusiwa."
 
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "World name"
-msgstr "Jina la ulimwengu"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Hide Game"
+msgstr "Ficha mchezo"
 
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Seed"
-msgstr "Mbegu"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Hide mp content"
+msgstr "Ficha maudhui ya mbunge"
 
-#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-msgid "Mapgen"
-msgstr "Mwandishi ramani"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Mod:"
+msgstr "Moduli:"
 
-#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-msgid "Game"
-msgstr "Mchezo"
+#: builtin/mainmenu/dlg_config_world.lua
+#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
+msgid "Save"
+msgstr "Hifadhi"
 
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Create"
-msgstr "Kuunda"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "World:"
+msgstr "Ulimwengu:"
 
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "You have no subgames installed."
-msgstr "Una subgames hakuna imewekwa."
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Download one from minetest.net"
-msgstr "Pakua moja kutoka minetest.net"
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Warning: The minimal development test is meant for developers."
-msgstr "Tahadhari: Mtihani wa maendeleo ndogo ni maana kwa watengenezaji."
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "Pakua subgame, kama vile minetest_game, kutoka minetest.net"
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "enabled"
+msgstr "kuwezeshwa"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
 msgstr "Ulimwengu inayoitwa \"dola 1\" tayari ipo"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Create"
+msgstr "Kuunda"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Download a subgame, such as minetest_game, from minetest.net"
+msgstr "Pakua subgame, kama vile minetest_game, kutoka minetest.net"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Download one from minetest.net"
+msgstr "Pakua moja kutoka minetest.net"
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Game"
+msgstr "Mchezo"
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Mapgen"
+msgstr "Mwandishi ramani"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No worldname given or no game selected"
 msgstr "Hakuna worldname kupewa au mchezo hakuna iliyoteuliwa"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Seed"
+msgstr "Mbegu"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Warning: The minimal development test is meant for developers."
+msgstr "Tahadhari: Mtihani wa maendeleo ndogo ni maana kwa watengenezaji."
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "World name"
+msgstr "Jina la ulimwengu"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "You have no subgames installed."
+msgstr "Una subgames hakuna imewekwa."
+
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
 msgstr "Una uhakika unataka kufuta \"dola 1\"?"
@@ -189,33 +189,47 @@ msgstr "Modmgr: batili modpath \"dola 1\""
 msgid "Delete World \"$1\"?"
 msgstr "Futa ulimwengu \"dola 1\"?"
 
-#: builtin/mainmenu/dlg_rename_modpack.lua
-msgid "Rename Modpack:"
-msgstr "Ita jina jipya Modpack:"
-
 #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
 msgid "Accept"
 msgstr "Kukubali"
 
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Games"
-msgstr "Michezo"
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid "Rename Modpack:"
+msgstr "Ita jina jipya Modpack:"
 
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
-msgid "Mods"
-msgstr "Mods"
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "\"$1\" is not a valid flag."
+msgstr "\"dola 1\" si bendera halali."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
 msgstr "(Hakuna maelezo ya kuweka kupewa)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Please enter a comma seperated list of flags."
-msgstr "Tafadhali ingiza mkato seperated orodha ya bendera."
+msgid "< Back to Settings page"
+msgstr ""
+"< Back to Settings page back=\"\" to=\"\" settings=\"\"></ Back to Settings "
+"page>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Possible values are: "
-msgstr "Thamani inayofaa ni:"
+msgid "Browse"
+msgstr "Vinjari"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Disabled"
+msgstr "Walemavu"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Edit"
+msgstr "Hariri"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Enabled"
+msgstr "Kuwezeshwa"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Format is 3 numbers separated by commas and inside brackets."
+msgstr "Umbizo ni namba 3 limegawanywa na mikato na ndani ya mabano."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid ""
@@ -226,30 +240,46 @@ msgstr ""
 "<octaves>, <persistence></persistence></octaves></seed></spreadZ></spreadY></"
 "spreadX></scale></offset>"
 
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Games"
+msgstr "Michezo"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
+msgid "Mods"
+msgstr "Mods"
+
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
 msgstr "Hiari ya lacunarity unaweza umeongezewa na mkato kuongoza."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Format is 3 numbers separated by commas and inside brackets."
-msgstr "Umbizo ni namba 3 limegawanywa na mikato na ndani ya mabano."
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Disabled"
-msgstr "Walemavu"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Enabled"
-msgstr "Kuwezeshwa"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Browse"
-msgstr "Vinjari"
+msgid "Please enter a comma seperated list of flags."
+msgstr "Tafadhali ingiza mkato seperated orodha ya bendera."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
 msgstr "Tafadhali ingiza namba kamili halali."
 
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a valid number."
+msgstr "Tafadhali ingiza namba halali."
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Possible values are: "
+msgstr "Thamani inayofaa ni:"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Restore Default"
+msgstr "Rejesha chaguo-msingi"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Select path"
+msgstr "Teua njia"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Show technical names"
+msgstr "Onyesha majina ya kiufundi"
+
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be greater than $1."
 msgstr "Thamani lazima iwe kubwa kuliko dola 1."
@@ -258,40 +288,6 @@ msgstr "Thamani lazima iwe kubwa kuliko dola 1."
 msgid "The value must be lower than $1."
 msgstr "Thamani lazima iwe chini kuliko dola 1."
 
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Please enter a valid number."
-msgstr "Tafadhali ingiza namba halali."
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "\"$1\" is not a valid flag."
-msgstr "\"dola 1\" si bendera halali."
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Select path"
-msgstr "Teua njia"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "< Back to Settings page"
-msgstr ""
-"< Back to Settings page back=\"\" to=\"\" settings=\"\"></ Back to Settings "
-"page>"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Edit"
-msgstr "Hariri"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Restore Default"
-msgstr "Rejesha chaguo-msingi"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Show technical names"
-msgstr "Onyesha majina ya kiufundi"
-
-#: builtin/mainmenu/modmgr.lua
-msgid "Install Mod: file: \"$1\""
-msgstr "Sakinisha Moduli: faili: \"dola 1\""
-
 #: builtin/mainmenu/modmgr.lua
 msgid ""
 "\n"
@@ -304,122 +300,118 @@ msgid "Failed to install $1 to $2"
 msgstr "Imeshindwa kusakinisha dola 1 hadi $2"
 
 #: builtin/mainmenu/modmgr.lua
-msgid "Install Mod: unable to find suitable foldername for modpack $1"
-msgstr ""
-"Sakinisha Moduli: haiwezi kupata foldername ya kufaa kwa ajili ya modpack $1"
+msgid "Install Mod: file: \"$1\""
+msgstr "Sakinisha Moduli: faili: \"dola 1\""
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find real modname for: $1"
 msgstr "Sakinisha Moduli: haiwezi kupata modname halisi kwa: $1"
 
-#: builtin/mainmenu/store.lua
-msgid "Unsorted"
-msgstr "Zisizochambuliwa"
-
-#: builtin/mainmenu/store.lua
-msgid "Search"
-msgstr "Utafutaji"
-
-#: builtin/mainmenu/store.lua
-msgid "Downloading $1, please wait..."
-msgstr "Inapakua $1, Tafadhali subiri..."
-
-#: builtin/mainmenu/store.lua
-msgid "Successfully installed:"
-msgstr "Imefanikiwa kusakinisha:"
-
-#: builtin/mainmenu/store.lua
-msgid "Shortname:"
-msgstr "Shortname:"
-
-#: builtin/mainmenu/store.lua
-msgid "Rating"
-msgstr "Makadirio"
-
-#: builtin/mainmenu/store.lua
-msgid "re-Install"
-msgstr "Sakinisha upya"
-
-#: builtin/mainmenu/store.lua
-msgid "Install"
-msgstr "Sakinisha"
+#: builtin/mainmenu/modmgr.lua
+msgid "Install Mod: unable to find suitable foldername for modpack $1"
+msgstr ""
+"Sakinisha Moduli: haiwezi kupata foldername ya kufaa kwa ajili ya modpack $1"
 
 #: builtin/mainmenu/store.lua
 msgid "Close store"
 msgstr "Duka la karibu"
 
+#: builtin/mainmenu/store.lua
+msgid "Downloading $1, please wait..."
+msgstr "Inapakua $1, Tafadhali subiri..."
+
+#: builtin/mainmenu/store.lua
+msgid "Install"
+msgstr "Sakinisha"
+
 #: builtin/mainmenu/store.lua
 msgid "Page $1 of $2"
 msgstr "Ukurasa dola 1 ya $2"
 
-#: builtin/mainmenu/tab_credits.lua
-msgid "Credits"
-msgstr "Mikopo"
+#: builtin/mainmenu/store.lua
+msgid "Rating"
+msgstr "Makadirio"
 
-#: builtin/mainmenu/tab_credits.lua
-msgid "Core Developers"
-msgstr "Watengenezaji wa msingi"
+#: builtin/mainmenu/store.lua
+msgid "Search"
+msgstr "Utafutaji"
+
+#: builtin/mainmenu/store.lua
+msgid "Shortname:"
+msgstr "Shortname:"
+
+#: builtin/mainmenu/store.lua
+msgid "Successfully installed:"
+msgstr "Imefanikiwa kusakinisha:"
+
+#: builtin/mainmenu/store.lua
+msgid "Unsorted"
+msgstr "Zisizochambuliwa"
+
+#: builtin/mainmenu/store.lua
+msgid "re-Install"
+msgstr "Sakinisha upya"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
 msgstr "Wachangiaji amilifu"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Previous Core Developers"
-msgstr "Awali msingi watengenezaji"
+msgid "Core Developers"
+msgstr "Watengenezaji wa msingi"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Credits"
+msgstr "Mikopo"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
 msgstr "Wachangiaji wa awali"
 
+#: builtin/mainmenu/tab_credits.lua
+msgid "Previous Core Developers"
+msgstr "Awali msingi watengenezaji"
+
 #: builtin/mainmenu/tab_mods.lua
 msgid "Installed Mods:"
 msgstr "Mods zilizosakinishwa:"
 
-#: builtin/mainmenu/tab_mods.lua
-msgid "No mod description available"
-msgstr "Hakuna maelezo Moduli inapatikana"
-
 #: builtin/mainmenu/tab_mods.lua
 msgid "Mod information:"
 msgstr "Taarifa Moduli:"
 
+#: builtin/mainmenu/tab_mods.lua
+msgid "No mod description available"
+msgstr "Hakuna maelezo Moduli inapatikana"
+
 #: builtin/mainmenu/tab_mods.lua
 msgid "Rename"
 msgstr "Ita jina jipya"
 
 #: builtin/mainmenu/tab_mods.lua
-msgid "Uninstall selected modpack"
-msgstr "Sakinusha modpack teuliwa"
+msgid "Select Mod File:"
+msgstr "Teua faili ya Moduli:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Uninstall selected mod"
 msgstr "Sakinusha Moduli teuliwa"
 
 #: builtin/mainmenu/tab_mods.lua
-msgid "Select Mod File:"
-msgstr "Teua faili ya Moduli:"
+msgid "Uninstall selected modpack"
+msgstr "Sakinusha modpack teuliwa"
 
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port"
 msgstr "Kushughulikia / bandari"
 
-#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Name / Password"
-msgstr "Jina / nenosiri"
+#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
+msgid "Client"
+msgstr "Mteja"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Connect"
 msgstr "Kuunganisha"
 
-#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Del. Favorite"
-msgstr "Del. kipendwa"
-
-#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Favorite"
-msgstr "Kipendwa"
-
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative mode"
 msgstr "Hali ya ubunifu"
@@ -428,30 +420,30 @@ msgstr "Hali ya ubunifu"
 msgid "Damage enabled"
 msgstr "Uharibifu kuwezeshwa"
 
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Del. Favorite"
+msgstr "Del. kipendwa"
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Favorite"
+msgstr "Kipendwa"
+
+#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
+msgid "Name / Password"
+msgstr "Jina / nenosiri"
+
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "PvP enabled"
 msgstr "PvP kuwezeshwa"
 
-#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
-msgid "Client"
-msgstr "Mteja"
-
-#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
-msgid "New"
-msgstr "Mpya"
+#: builtin/mainmenu/tab_server.lua
+msgid "Bind Address"
+msgstr "Kumfunga anwani"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Configure"
 msgstr "Sanidi"
 
-#: builtin/mainmenu/tab_server.lua
-msgid "Start Game"
-msgstr "Anzisha mchezo"
-
-#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
-msgid "Select World:"
-msgstr "Teua ulimwengu:"
-
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Creative Mode"
@@ -462,86 +454,50 @@ msgstr "Hali ya ubunifu"
 msgid "Enable Damage"
 msgstr "Wezesha uharibifu"
 
-#: builtin/mainmenu/tab_server.lua
-msgid "Public"
-msgstr "Umma"
-
 #: builtin/mainmenu/tab_server.lua
 msgid "Name/Password"
 msgstr "Jina/nenosiri"
 
-#: builtin/mainmenu/tab_server.lua
-msgid "Bind Address"
-msgstr "Kumfunga anwani"
-
-#: builtin/mainmenu/tab_server.lua
-msgid "Port"
-msgstr "Bandari"
-
-#: builtin/mainmenu/tab_server.lua
-msgid "Server Port"
-msgstr "Kituo tarishi cha seva"
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "New"
+msgstr "Mpya"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "No world created or selected!"
 msgstr "Duniani hakuna kuundwa au kuteuliwa!"
 
+#: builtin/mainmenu/tab_server.lua
+msgid "Port"
+msgstr "Bandari"
+
+#: builtin/mainmenu/tab_server.lua
+msgid "Public"
+msgstr "Umma"
+
+#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
+msgid "Select World:"
+msgstr "Teua ulimwengu:"
+
 #: builtin/mainmenu/tab_server.lua
 msgid "Server"
 msgstr "Seva"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Opaque Leaves"
-msgstr "Majani opaque"
+#: builtin/mainmenu/tab_server.lua
+msgid "Server Port"
+msgstr "Kituo tarishi cha seva"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Simple Leaves"
-msgstr "Rahisi majani"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Fancy Leaves"
-msgstr "Majani ya dhana"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Node Outlining"
-msgstr "Fundo Ufupisho"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Node Highlighting"
-msgstr "Fundo udhulisho"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No Filter"
-msgstr "Kichujio hakuna"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bilinear Filter"
-msgstr "Kichujio bilinear"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Trilinear Filter"
-msgstr "Kichujio trilinear"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No Mipmap"
-msgstr "Hakuna Mipmap"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Mipmap"
-msgstr "Mipmap"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Mipmap + Aniso. Filter"
-msgstr "Mipmap + Aniso. Kichujio"
-
-#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
-msgid "None"
-msgstr "Hakuna"
+#: builtin/mainmenu/tab_server.lua
+msgid "Start Game"
+msgstr "Anzisha mchezo"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
 msgstr "2 x"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "3D Clouds"
+msgstr "Mawingu ya 3D"
+
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
 msgstr "4 x"
@@ -551,84 +507,128 @@ msgid "8x"
 msgstr "8 x"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Je, una hakika upya ulimwengu wako singleplayer?"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ndio"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "La"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Smooth Lighting"
-msgstr "Taa laini"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Particles"
-msgstr "Chembe"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "3D Clouds"
-msgstr "Mawingu ya 3D"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Opaque Water"
-msgstr "Maji opaque"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Connected Glass"
-msgstr "Kioo kushikamana"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Texturing:"
-msgstr "Texturing:"
+msgid "Advanced Settings"
+msgstr "Vipimo pevu"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Shaders"
-msgstr "Shaders"
+#: builtin/mainmenu/tab_settings.lua
+msgid "Are you sure to reset your singleplayer world?"
+msgstr "Je, una hakika upya ulimwengu wako singleplayer?"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Weka upya singleplayer ulimwengu"
+msgid "Bilinear Filter"
+msgstr "Kichujio bilinear"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Bump Mapping"
+msgstr "Mapema ramani"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Change keys"
 msgstr "Badilisha funguo"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Advanced Settings"
-msgstr "Vipimo pevu"
+msgid "Connected Glass"
+msgstr "Kioo kushikamana"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Touchthreshold (px)"
-msgstr "Touchthreshold (px)"
+msgid "Fancy Leaves"
+msgstr "Majani ya dhana"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Mapema ramani"
+msgid "Mipmap"
+msgstr "Mipmap"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Tone Mapping"
-msgstr "Ramani ya toni"
+#: builtin/mainmenu/tab_settings.lua
+msgid "Mipmap + Aniso. Filter"
+msgstr "Mipmap + Aniso. Kichujio"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No"
+msgstr "La"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No Filter"
+msgstr "Kichujio hakuna"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "No Mipmap"
+msgstr "Hakuna Mipmap"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Node Highlighting"
+msgstr "Fundo udhulisho"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Node Outlining"
+msgstr "Fundo Ufupisho"
+
+#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
+msgid "None"
+msgstr "Hakuna"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Normal Mapping"
 msgstr "Ramani ya kawaida"
 
+#: builtin/mainmenu/tab_settings.lua
+msgid "Opaque Leaves"
+msgstr "Majani opaque"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Opaque Water"
+msgstr "Maji opaque"
+
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Parallax Occlusion"
 msgstr "Parallax Occlusion"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Waving Water"
-msgstr "Waving maji"
+msgid "Particles"
+msgstr "Chembe"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Reset singleplayer world"
+msgstr "Weka upya singleplayer ulimwengu"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Settings"
+msgstr "Vipimo vya"
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Shaders"
+msgstr "Shaders"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Simple Leaves"
+msgstr "Rahisi majani"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Smooth Lighting"
+msgstr "Taa laini"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Texturing:"
+msgstr "Texturing:"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "To enable shaders the OpenGL driver needs to be used."
+msgstr "Ili kuwezesha shaders OpenGL ya kiendeshaji inahitaji kutumiwa."
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Tone Mapping"
+msgstr "Ramani ya toni"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Touchthreshold (px)"
+msgstr "Touchthreshold (px)"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Trilinear Filter"
+msgstr "Kichujio trilinear"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
@@ -639,16 +639,12 @@ msgid "Waving Plants"
 msgstr "Waving mimea"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr "Ili kuwezesha shaders OpenGL ya kiendeshaji inahitaji kutumiwa."
+msgid "Waving Water"
+msgstr "Waving maji"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Settings"
-msgstr "Vipimo vya"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Kuanza Singleplayer"
+msgid "Yes"
+msgstr "Ndio"
 
 #: builtin/mainmenu/tab_simple_main.lua
 msgid "Config mods"
@@ -658,6 +654,10 @@ msgstr "Mods Now"
 msgid "Main"
 msgstr "Kuu"
 
+#: builtin/mainmenu/tab_simple_main.lua
+msgid "Start Singleplayer"
+msgstr "Kuanza Singleplayer"
+
 #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
 msgid "Play"
 msgstr "Kucheza"
@@ -666,14 +666,14 @@ msgstr "Kucheza"
 msgid "Singleplayer"
 msgstr "Singleplayer"
 
-#: builtin/mainmenu/tab_texturepacks.lua
-msgid "Select texture pack:"
-msgstr "Chagua Kipeto cha unamu:"
-
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "No information available"
 msgstr "Hakuna taarifa zilizopo"
 
+#: builtin/mainmenu/tab_texturepacks.lua
+msgid "Select texture pack:"
+msgstr "Chagua Kipeto cha unamu:"
+
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Texturepacks"
 msgstr "Texturepacks"
@@ -682,6 +682,18 @@ msgstr "Texturepacks"
 msgid "Connection timed out."
 msgstr "Muunganisho limekatika."
 
+#: src/client.cpp
+msgid "Done!"
+msgstr "Kufanyika!"
+
+#: src/client.cpp
+msgid "Initializing nodes"
+msgstr "Inaanzilisha fundo"
+
+#: src/client.cpp
+msgid "Initializing nodes..."
+msgstr "Inaanzilisha fundo..."
+
 #: src/client.cpp
 msgid "Loading textures..."
 msgstr "Kupakia unamu..."
@@ -690,39 +702,10 @@ msgstr "Kupakia unamu..."
 msgid "Rebuilding shaders..."
 msgstr "Kuijenga upya shaders..."
 
-#: src/client.cpp
-msgid "Initializing nodes..."
-msgstr "Inaanzilisha fundo..."
-
-#: src/client.cpp
-msgid "Initializing nodes"
-msgstr "Inaanzilisha fundo"
-
-#: src/client.cpp
-msgid "Done!"
-msgstr "Kufanyika!"
-
-#: src/client/clientlauncher.cpp
-msgid "Main Menu"
-msgstr "Menyu kuu"
-
-#: src/client/clientlauncher.cpp
-msgid "Player name too long."
-msgstr "Mchezaji jina refu."
-
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
 msgstr "Kosa la muunganisho (wakati muafaka?)"
 
-#: src/client/clientlauncher.cpp
-msgid "No world selected and no address provided. Nothing to do."
-msgstr ""
-"Duniani hakuna iliyoteuliwa na hakuna anwani iliyotolewa. Kitu cha kufanya."
-
-#: src/client/clientlauncher.cpp
-msgid "Provided world path doesn't exist: "
-msgstr "Njia ya dunia iliyotolewa haipo:"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
 msgstr "Haikuweza kupata wala kupakia mchezo\""
@@ -731,18 +714,76 @@ msgstr "Haikuweza kupata wala kupakia mchezo\""
 msgid "Invalid gamespec."
 msgstr "Gamespec batili."
 
+#: src/client/clientlauncher.cpp
+msgid "Main Menu"
+msgstr "Menyu kuu"
+
+#: src/client/clientlauncher.cpp
+msgid "No world selected and no address provided. Nothing to do."
+msgstr ""
+"Duniani hakuna iliyoteuliwa na hakuna anwani iliyotolewa. Kitu cha kufanya."
+
+#: src/client/clientlauncher.cpp
+msgid "Player name too long."
+msgstr "Mchezaji jina refu."
+
+#: src/client/clientlauncher.cpp
+msgid "Provided world path doesn't exist: "
+msgstr "Njia ya dunia iliyotolewa haipo:"
+
 #: src/fontengine.cpp
 #, fuzzy
 msgid "needs_fallback_font"
 msgstr "Maalum Alphabet Inahitajika"
 
 #: src/game.cpp
-msgid "You died."
-msgstr "Alikufa."
+msgid ""
+"\n"
+"Check debug.txt for details."
+msgstr "Angalia debug.txt kwa maelezo."
 
 #: src/game.cpp
-msgid "Respawn"
-msgstr "Respawn"
+msgid "Change Keys"
+msgstr "Badilisha funguo"
+
+#: src/game.cpp
+msgid "Change Password"
+msgstr "Badilisha nywila"
+
+#: src/game.cpp
+msgid "Connecting to server..."
+msgstr "Inaunganisha seva..."
+
+#: src/game.cpp
+msgid "Continue"
+msgstr "Kuendelea"
+
+#: src/game.cpp
+msgid "Creating client..."
+msgstr "Inaunda mteja..."
+
+#: src/game.cpp
+msgid "Creating server..."
+msgstr "Inaunda seva..."
+
+#: src/game.cpp
+msgid ""
+"Default Controls:\n"
+"- WASD: move\n"
+"- Space: jump/climb\n"
+"- Shift: sneak/go down\n"
+"- Q: drop item\n"
+"- I: inventory\n"
+"- Mouse: turn/look\n"
+"- Mouse left: dig/punch\n"
+"- Mouse right: place/use\n"
+"- Mouse wheel: select item\n"
+"- T: chat\n"
+msgstr ""
+"Vidhibiti vya chaguo-msingi:-WASD: hoja - nafasi: kuruka/kupanda - Hamisha: "
+"taarifa/kwenda chini - q: tone kipengee - nikasema hesabu - kipanya: kugeuka/"
+"kuangalia - kipanya kushoto: kuchimba/punch - kipanya kulia: mahali/matumizi "
+"- kipanya gurudumu: Teua kipengee - T: mazungumzo"
 
 #: src/game.cpp
 msgid ""
@@ -765,41 +806,6 @@ msgstr ""
 "mpororo, kugusa mpenyo:--> hoja mpororo - kugusa & buruta, bomba kidole 2--> "
 "kipengee kimoja mahali kwa yanayopangwa"
 
-#: src/game.cpp
-msgid ""
-"Default Controls:\n"
-"- WASD: move\n"
-"- Space: jump/climb\n"
-"- Shift: sneak/go down\n"
-"- Q: drop item\n"
-"- I: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
-"- Mouse wheel: select item\n"
-"- T: chat\n"
-msgstr ""
-"Vidhibiti vya chaguo-msingi:-WASD: hoja - nafasi: kuruka/kupanda - Hamisha: "
-"taarifa/kwenda chini - q: tone kipengee - nikasema hesabu - kipanya: kugeuka/"
-"kuangalia - kipanya kushoto: kuchimba/punch - kipanya kulia: mahali/matumizi "
-"- kipanya gurudumu: Teua kipengee - T: mazungumzo"
-
-#: src/game.cpp
-msgid "Continue"
-msgstr "Kuendelea"
-
-#: src/game.cpp
-msgid "Change Password"
-msgstr "Badilisha nywila"
-
-#: src/game.cpp
-msgid "Sound Volume"
-msgstr "Kiwango cha sauti"
-
-#: src/game.cpp
-msgid "Change Keys"
-msgstr "Badilisha funguo"
-
 #: src/game.cpp
 msgid "Exit to Menu"
 msgstr "Toka kwenye menyu"
@@ -808,120 +814,66 @@ msgstr "Toka kwenye menyu"
 msgid "Exit to OS"
 msgstr "Toka kwa OS"
 
-#: src/game.cpp
-msgid "Shutting down..."
-msgstr "Inazima..."
-
-#: src/game.cpp
-msgid "Creating server..."
-msgstr "Inaunda seva..."
-
-#: src/game.cpp
-msgid "Creating client..."
-msgstr "Inaunda mteja..."
-
-#: src/game.cpp
-msgid "Resolving address..."
-msgstr "Kusuluhisha anwani..."
-
-#: src/game.cpp
-msgid "Connecting to server..."
-msgstr "Inaunganisha seva..."
-
 #: src/game.cpp
 msgid "Item definitions..."
 msgstr "Fasili ya kipengele..."
 
-#: src/game.cpp
-msgid "Node definitions..."
-msgstr "Fundo Fasili..."
-
-#: src/game.cpp
-msgid "Media..."
-msgstr "Vyombo vya habari..."
-
 #: src/game.cpp
 msgid "KiB/s"
 msgstr "Kibu/s"
 
+#: src/game.cpp
+msgid "Media..."
+msgstr "Vyombo vya habari..."
+
 #: src/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
 
+#: src/game.cpp
+msgid "Node definitions..."
+msgstr "Fundo Fasili..."
+
+#: src/game.cpp
+msgid "Resolving address..."
+msgstr "Kusuluhisha anwani..."
+
+#: src/game.cpp
+msgid "Respawn"
+msgstr "Respawn"
+
+#: src/game.cpp
+msgid "Shutting down..."
+msgstr "Inazima..."
+
+#: src/game.cpp
+msgid "Sound Volume"
+msgstr "Kiwango cha sauti"
+
+#: src/game.cpp
+msgid "You died."
+msgstr "Alikufa."
+
 #: src/game.cpp src/guiFormSpecMenu.cpp
 msgid "ok"
 msgstr "Sawa kabisa"
 
-#: src/game.cpp
-msgid ""
-"\n"
-"Check debug.txt for details."
-msgstr "Angalia debug.txt kwa maelezo."
-
-#: src/guiFormSpecMenu.cpp
-msgid "Proceed"
-msgstr "Kuendelea"
-
 #: src/guiFormSpecMenu.cpp
 msgid "Enter "
 msgstr "Ingiza"
 
-#: src/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
-msgstr "Keybindings. (Kama Menyu hii screws, Ondoa vitu kutoka minetest.conf)"
+#: src/guiFormSpecMenu.cpp
+msgid "Proceed"
+msgstr "Kuendelea"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "\"Use\" = climb down"
 msgstr "\"Matumizi\" = kupanda chini"
 
-#: src/guiKeyChangeMenu.cpp
-msgid "Double tap \"jump\" to toggle fly"
-msgstr "Mara mbili bomba \"Ruka\" hadi Togo kuruka"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Key already in use"
-msgstr "Muhimu tayari katika matumizi"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "press key"
-msgstr "Bonyeza Kibonye"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Forward"
-msgstr "Mbele"
-
 #: src/guiKeyChangeMenu.cpp
 msgid "Backward"
 msgstr "Nyuma"
 
-#: src/guiKeyChangeMenu.cpp src/keycode.cpp
-msgid "Left"
-msgstr "Kushoto"
-
-#: src/guiKeyChangeMenu.cpp src/keycode.cpp
-msgid "Right"
-msgstr "Kulia"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Use"
-msgstr "Matumizi"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Jump"
-msgstr "Kuruka"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Sneak"
-msgstr "Taarifa"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Drop"
-msgstr "Achia"
-
-#: src/guiKeyChangeMenu.cpp
-msgid "Inventory"
-msgstr "Hesabu"
-
 #: src/guiKeyChangeMenu.cpp
 msgid "Chat"
 msgstr "Kuzungumza"
@@ -935,153 +887,229 @@ msgid "Console"
 msgstr "Kiweko"
 
 #: src/guiKeyChangeMenu.cpp
-msgid "Toggle fly"
-msgstr "Togoa kuruka"
+msgid "Double tap \"jump\" to toggle fly"
+msgstr "Mara mbili bomba \"Ruka\" hadi Togo kuruka"
 
 #: src/guiKeyChangeMenu.cpp
-msgid "Toggle fast"
-msgstr "Togoa haraka"
+msgid "Drop"
+msgstr "Achia"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Forward"
+msgstr "Mbele"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Inventory"
+msgstr "Hesabu"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Jump"
+msgstr "Kuruka"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Key already in use"
+msgstr "Muhimu tayari katika matumizi"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgstr "Keybindings. (Kama Menyu hii screws, Ondoa vitu kutoka minetest.conf)"
+
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Left"
+msgstr "Kushoto"
+
+#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
+msgid "Print stacks"
+msgstr "Chapisha mipororo"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Range select"
+msgstr "Teua masafa"
+
+#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+msgid "Right"
+msgstr "Kulia"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Sneak"
+msgstr "Taarifa"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle Cinematic"
 msgstr "Togoa Cinematic"
 
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle fast"
+msgstr "Togoa haraka"
+
+#: src/guiKeyChangeMenu.cpp
+msgid "Toggle fly"
+msgstr "Togoa kuruka"
+
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
 msgstr "Togoa noclip"
 
 #: src/guiKeyChangeMenu.cpp
-msgid "Range select"
-msgstr "Teua masafa"
-
-#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
-msgid "Print stacks"
-msgstr "Chapisha mipororo"
+msgid "Use"
+msgstr "Matumizi"
 
 #: src/guiKeyChangeMenu.cpp src/keycode.cpp
 msgid "Zoom"
 msgstr "Kuza"
 
-#: src/guiPasswordChange.cpp
-msgid "Old Password"
-msgstr "Nywila ya zamani"
-
-#: src/guiPasswordChange.cpp
-msgid "New Password"
-msgstr "Nywila mpya"
-
-#: src/guiPasswordChange.cpp
-msgid "Confirm Password"
-msgstr "Thibitisha nywila"
+#: src/guiKeyChangeMenu.cpp
+msgid "press key"
+msgstr "Bonyeza Kibonye"
 
 #: src/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Mabadiliko"
 
+#: src/guiPasswordChange.cpp
+msgid "Confirm Password"
+msgstr "Thibitisha nywila"
+
+#: src/guiPasswordChange.cpp
+msgid "New Password"
+msgstr "Nywila mpya"
+
+#: src/guiPasswordChange.cpp
+msgid "Old Password"
+msgstr "Nywila ya zamani"
+
 #: src/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "MaNenotambulishi hayaoani!"
 
-#: src/guiVolumeChange.cpp
-msgid "Sound Volume: "
-msgstr "Kiwango sauti:"
-
 #: src/guiVolumeChange.cpp
 msgid "Exit"
 msgstr "Toka"
 
-#: src/keycode.cpp
-msgid "Left Button"
-msgstr "Kitufe kushoto"
+#: src/guiVolumeChange.cpp
+msgid "Sound Volume: "
+msgstr "Kiwango sauti:"
 
 #: src/keycode.cpp
-msgid "Middle Button"
-msgstr "Kitufe kati"
+msgid "Apps"
+msgstr "Programu"
 
 #: src/keycode.cpp
-msgid "Right Button"
-msgstr "Kitufe kulia"
-
-#: src/keycode.cpp
-msgid "X Button 1"
-msgstr "X kitufe 1"
+msgid "Attn"
+msgstr "Attn"
 
 #: src/keycode.cpp
 msgid "Back"
 msgstr "Nyuma"
 
+#: src/keycode.cpp
+msgid "Capital"
+msgstr "Mji mkuu"
+
 #: src/keycode.cpp
 msgid "Clear"
 msgstr "Wazi"
 
 #: src/keycode.cpp
-msgid "Return"
-msgstr "Kurudi"
-
-#: src/keycode.cpp
-msgid "Tab"
-msgstr "Kichupo"
-
-#: src/keycode.cpp
-msgid "X Button 2"
-msgstr "X kitufe 2"
-
-#: src/keycode.cpp
-msgid "Capital"
-msgstr "Mji mkuu"
+msgid "Comma"
+msgstr "Mkato"
 
 #: src/keycode.cpp
 msgid "Control"
 msgstr "Udhibiti"
 
-#: src/keycode.cpp
-msgid "Kana"
-msgstr "Kana"
-
-#: src/keycode.cpp
-msgid "Menu"
-msgstr "Menyu"
-
-#: src/keycode.cpp
-msgid "Pause"
-msgstr "Sitisha"
-
-#: src/keycode.cpp
-msgid "Shift"
-msgstr "Shift"
-
 #: src/keycode.cpp
 msgid "Convert"
 msgstr "Geuza"
 
 #: src/keycode.cpp
-msgid "Escape"
-msgstr "Kutoroka"
+msgid "CrSel"
+msgstr "CrSel"
 
 #: src/keycode.cpp
-msgid "Final"
-msgstr "Mwisho"
-
-#: src/keycode.cpp
-msgid "Junja"
-msgstr "Junja"
-
-#: src/keycode.cpp
-msgid "Kanji"
-msgstr "KanJi"
-
-#: src/keycode.cpp
-msgid "Nonconvert"
-msgstr "Nonconvert"
+msgid "Down"
+msgstr "Chini"
 
 #: src/keycode.cpp
 msgid "End"
 msgstr "Mwisho"
 
+#: src/keycode.cpp
+msgid "Erase OEF"
+msgstr "Futa OEF"
+
+#: src/keycode.cpp
+msgid "Escape"
+msgstr "Kutoroka"
+
+#: src/keycode.cpp
+msgid "ExSel"
+msgstr "ExSel"
+
+#: src/keycode.cpp
+msgid "Execute"
+msgstr "Kutekeleza"
+
+#: src/keycode.cpp
+msgid "Final"
+msgstr "Mwisho"
+
+#: src/keycode.cpp
+msgid "Help"
+msgstr "Msaada"
+
 #: src/keycode.cpp
 msgid "Home"
 msgstr "Nyumbani"
 
+#: src/keycode.cpp
+msgid "Insert"
+msgstr "Chomeka"
+
+#: src/keycode.cpp
+msgid "Junja"
+msgstr "Junja"
+
+#: src/keycode.cpp
+msgid "Kana"
+msgstr "Kana"
+
+#: src/keycode.cpp
+msgid "Kanji"
+msgstr "KanJi"
+
+#: src/keycode.cpp
+msgid "Left Button"
+msgstr "Kitufe kushoto"
+
+#: src/keycode.cpp
+msgid "Left Control"
+msgstr "Udhibiti wa kushoto"
+
+#: src/keycode.cpp
+msgid "Left Menu"
+msgstr "Menyu ya kushoto"
+
+#: src/keycode.cpp
+msgid "Left Shift"
+msgstr "Kisogezi kushoto"
+
+#: src/keycode.cpp
+msgid "Left Windows"
+msgstr "Windows kushoto"
+
+#: src/keycode.cpp
+msgid "Menu"
+msgstr "Menyu"
+
+#: src/keycode.cpp
+msgid "Middle Button"
+msgstr "Kitufe kati"
+
+#: src/keycode.cpp
+msgid "Minus"
+msgstr "Alama ya kutoa"
+
 #: src/keycode.cpp
 msgid "Mode Change"
 msgstr "Mabadiliko ya hali ya"
@@ -1091,52 +1119,28 @@ msgid "Next"
 msgstr "Ijayo"
 
 #: src/keycode.cpp
-msgid "Prior"
-msgstr "Awali"
+msgid "Nonconvert"
+msgstr "Nonconvert"
 
 #: src/keycode.cpp
-msgid "Space"
-msgstr "Nafasi"
+msgid "Num Lock"
+msgstr "Num Lock"
 
 #: src/keycode.cpp
-msgid "Down"
-msgstr "Chini"
+msgid "Numpad *"
+msgstr "Kinanda *"
 
 #: src/keycode.cpp
-msgid "Execute"
-msgstr "Kutekeleza"
+msgid "Numpad +"
+msgstr "Kinanda +"
 
 #: src/keycode.cpp
-msgid "Print"
-msgstr "Chapa"
+msgid "Numpad -"
+msgstr "Numpad-"
 
 #: src/keycode.cpp
-msgid "Select"
-msgstr "Teua"
-
-#: src/keycode.cpp
-msgid "Up"
-msgstr "Juu"
-
-#: src/keycode.cpp
-msgid "Help"
-msgstr "Msaada"
-
-#: src/keycode.cpp
-msgid "Insert"
-msgstr "Chomeka"
-
-#: src/keycode.cpp
-msgid "Snapshot"
-msgstr "Taswira tuli"
-
-#: src/keycode.cpp
-msgid "Left Windows"
-msgstr "Windows kushoto"
-
-#: src/keycode.cpp
-msgid "Apps"
-msgstr "Programu"
+msgid "Numpad /"
+msgstr "Kinanda /"
 
 #: src/keycode.cpp
 msgid "Numpad 0"
@@ -1146,14 +1150,6 @@ msgstr "Kinanda 0"
 msgid "Numpad 1"
 msgstr "Kinanda 1"
 
-#: src/keycode.cpp
-msgid "Right Windows"
-msgstr "Windows kulia"
-
-#: src/keycode.cpp
-msgid "Sleep"
-msgstr "Usingizi"
-
 #: src/keycode.cpp
 msgid "Numpad 2"
 msgstr "Kinanda 2"
@@ -1178,22 +1174,6 @@ msgstr "Kinanda 6"
 msgid "Numpad 7"
 msgstr "Kinanda 7"
 
-#: src/keycode.cpp
-msgid "Numpad *"
-msgstr "Kinanda *"
-
-#: src/keycode.cpp
-msgid "Numpad +"
-msgstr "Kinanda +"
-
-#: src/keycode.cpp
-msgid "Numpad -"
-msgstr "Numpad-"
-
-#: src/keycode.cpp
-msgid "Numpad /"
-msgstr "Kinanda /"
-
 #: src/keycode.cpp
 msgid "Numpad 8"
 msgstr "Kinanda 8"
@@ -1203,44 +1183,16 @@ msgid "Numpad 9"
 msgstr "Kinanda 9"
 
 #: src/keycode.cpp
-msgid "Num Lock"
-msgstr "Num Lock"
+msgid "OEM Clear"
+msgstr "Wazi ya OEM"
 
 #: src/keycode.cpp
-msgid "Scroll Lock"
-msgstr "Scroll Lock"
+msgid "PA1"
+msgstr "PA1"
 
 #: src/keycode.cpp
-msgid "Left Shift"
-msgstr "Kisogezi kushoto"
-
-#: src/keycode.cpp
-msgid "Right Shift"
-msgstr "Kisogezi kulia"
-
-#: src/keycode.cpp
-msgid "Left Control"
-msgstr "Udhibiti wa kushoto"
-
-#: src/keycode.cpp
-msgid "Left Menu"
-msgstr "Menyu ya kushoto"
-
-#: src/keycode.cpp
-msgid "Right Control"
-msgstr "Udhibiti sahihi"
-
-#: src/keycode.cpp
-msgid "Right Menu"
-msgstr "Menyu kulia"
-
-#: src/keycode.cpp
-msgid "Comma"
-msgstr "Mkato"
-
-#: src/keycode.cpp
-msgid "Minus"
-msgstr "Alama ya kutoa"
+msgid "Pause"
+msgstr "Sitisha"
 
 #: src/keycode.cpp
 msgid "Period"
@@ -1251,985 +1203,92 @@ msgid "Plus"
 msgstr "Plus"
 
 #: src/keycode.cpp
-msgid "Attn"
-msgstr "Attn"
+msgid "Print"
+msgstr "Chapa"
 
 #: src/keycode.cpp
-msgid "CrSel"
-msgstr "CrSel"
+msgid "Prior"
+msgstr "Awali"
 
 #: src/keycode.cpp
-msgid "Erase OEF"
-msgstr "Futa OEF"
+msgid "Return"
+msgstr "Kurudi"
 
 #: src/keycode.cpp
-msgid "ExSel"
-msgstr "ExSel"
+msgid "Right Button"
+msgstr "Kitufe kulia"
 
 #: src/keycode.cpp
-msgid "OEM Clear"
-msgstr "Wazi ya OEM"
+msgid "Right Control"
+msgstr "Udhibiti sahihi"
 
 #: src/keycode.cpp
-msgid "PA1"
-msgstr "PA1"
+msgid "Right Menu"
+msgstr "Menyu kulia"
 
-#: src/settings_translation_file.cpp
-msgid "Controls"
-msgstr "Vidhibiti"
+#: src/keycode.cpp
+msgid "Right Shift"
+msgstr "Kisogezi kulia"
 
-#: src/settings_translation_file.cpp
-msgid "Build inside player"
-msgstr "Kujenga ndani ya mchezaji"
+#: src/keycode.cpp
+msgid "Right Windows"
+msgstr "Windows kulia"
+
+#: src/keycode.cpp
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: src/keycode.cpp
+msgid "Select"
+msgstr "Teua"
+
+#: src/keycode.cpp
+msgid "Shift"
+msgstr "Shift"
+
+#: src/keycode.cpp
+msgid "Sleep"
+msgstr "Usingizi"
+
+#: src/keycode.cpp
+msgid "Snapshot"
+msgstr "Taswira tuli"
+
+#: src/keycode.cpp
+msgid "Space"
+msgstr "Nafasi"
+
+#: src/keycode.cpp
+msgid "Tab"
+msgstr "Kichupo"
+
+#: src/keycode.cpp
+msgid "Up"
+msgstr "Juu"
+
+#: src/keycode.cpp
+msgid "X Button 1"
+msgstr "X kitufe 1"
+
+#: src/keycode.cpp
+msgid "X Button 2"
+msgstr "X kitufe 2"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"If enabled, you can place blocks at the position (feet + eye level) where "
-"you stand.\n"
-"This is helpful when working with nodeboxes in small areas."
+"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
+"Used to move a suitable spawn area of low land close to (0, 0).\n"
+"The default is suitable for mandelbrot sets, it needs to be edited for julia "
+"sets.\n"
+"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"Ikiwa imewezeshwa, unaweza mahali vitalu katika nafasi (miguu + jicho "
-"kiwango) ambako kusimama.\n"
-"Hii ni kusaidia unapofanya kazi na nodeboxes katika maeneo madogo."
-
-#: src/settings_translation_file.cpp
-msgid "Flying"
-msgstr "Kuruka"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Player is able to fly without being affected by gravity.\n"
-"This requires the \"fly\" privilege on the server."
-msgstr ""
-"Mchezaji ni uwezo wa kuruka bila kuwa walioathirika na mvuto.\n"
-"Hii inahitaji upendeleo \"kuruka\" kwenye seva."
-
-#: src/settings_translation_file.cpp
-msgid "Fast movement"
-msgstr "Kutembea haraka"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Fast movement (via use key).\n"
-"This requires the \"fast\" privilege on the server."
-msgstr ""
-"Harakati haraka (kupitia matumizi muhimu).\n"
-"Hii inahitaji upendeleo \"haraka\" kwenye seva."
-
-#: src/settings_translation_file.cpp
-msgid "Noclip"
-msgstr "Noclip"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled together with fly mode, player is able to fly through solid "
-"nodes.\n"
-"This requires the \"noclip\" privilege on the server."
-msgstr ""
-"Kama kuwezeshwa pamoja na hali ya kuruka, mchezaji ni uwezo wa kuruka kwa "
-"fundo imara.\n"
-"Hii inahitaji upendeleo wa \"noclip\" kwenye seva."
-
-#: src/settings_translation_file.cpp
-msgid "Cinematic mode"
-msgstr "Hali ya cinematic"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Smooths camera when looking around. Also called look or mouse smoothing.\n"
-"Useful for recording videos."
-msgstr ""
-"Smooths kamera wakati wa kutafuta karibu. Pia huitwa kuangalia au kipanya "
-"unyooshaji.\n"
-"Muhimu kwa ajili ya kurekodi video."
-
-#: src/settings_translation_file.cpp
-msgid "Camera smoothing"
-msgstr "Kamera unyooshaji"
-
-#: src/settings_translation_file.cpp
-msgid "Smooths rotation of camera. 0 to disable."
-msgstr "Smooths mzunguko wa kamera. 0 kulemaza."
-
-#: src/settings_translation_file.cpp
-msgid "Camera smoothing in cinematic mode"
-msgstr "Kamera unyooshaji hali cinematic"
-
-#: src/settings_translation_file.cpp
-msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
-msgstr "Smooths mzunguko wa kamera katika hali-tumizi cinematic. 0 kulemaza."
-
-#: src/settings_translation_file.cpp
-msgid "Invert mouse"
-msgstr "Pindua kipanya"
-
-#: src/settings_translation_file.cpp
-msgid "Invert vertical mouse movement."
-msgstr "Pindua harakati ya kipanya wima."
-
-#: src/settings_translation_file.cpp
-msgid "Mouse sensitivity"
-msgstr "Unyeti wa kipanya"
-
-#: src/settings_translation_file.cpp
-msgid "Mouse sensitivity multiplier."
-msgstr "Mengi ya unyeti wa kipanya."
-
-#: src/settings_translation_file.cpp
-msgid "Key use for climbing/descending"
-msgstr "Matumizi muhimu kwa ajili ya kupanda/kushuka"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
-"and descending."
-msgstr ""
-"Ikiwa imewezeshwa, ufunguo wa \"kutumia\" badala ya \"sneak\" ufunguo ni "
-"kutumika kwa ajili ya kupanda na kushuka."
-
-#: src/settings_translation_file.cpp
-msgid "Double tap jump for fly"
-msgstr "Mara mbili ya bomba kuruka kwa kuruka"
-
-#: src/settings_translation_file.cpp
-msgid "Double-tapping the jump key toggles fly mode."
-msgstr "Mbili-tapping ufunguo wa kuruka Inatogoa hali ya kuruka."
-
-#: src/settings_translation_file.cpp
-msgid "Always fly and fast"
-msgstr "Daima kuruka na kufunga"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If disabled \"use\" key is used to fly fast if both fly and fast mode are "
-"enabled."
-msgstr ""
-"Ikiwa kimelemazwa \"kutumia\" ufunguo ni kutumika kwa kuruka haraka kama "
-"hali-tumizi ya kuruka na ya haraka ni kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Bofya kulia marudio nafasi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right mouse button."
-msgstr ""
-"Wakati katika sekunde inachukua kati ya vibonyezo mara kwa mara sahihi "
-"wakati wa kufanya kitufe cha kulia."
-
-#: src/settings_translation_file.cpp
-msgid "Random input"
-msgstr "Ingizo la nasibu"
-
-#: src/settings_translation_file.cpp
-msgid "Enable random user input (only used for testing)."
-msgstr "Wezesha ingizo la mtumiaji nasibu (kutumika tu kwa ajili ya kupima)."
-
-#: src/settings_translation_file.cpp
-msgid "Continuous forward"
-msgstr "Kuendelea mbele"
-
-#: src/settings_translation_file.cpp
-msgid "Continuous forward movement (only used for testing)."
-msgstr "Harakati endelevu mbele (kutumika tu kwa ajili ya kupima)."
-
-#: src/settings_translation_file.cpp
-msgid "Enable Joysticks"
-msgstr "Wezesha vifimbocheza"
-
-#: src/settings_translation_file.cpp
-msgid "Joystick button repetition interval"
-msgstr "Kifimbocheza kitufe marudio nafasi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The time in seconds it takes between repeated events\n"
-"when holding down a joystick button combination."
-msgstr ""
-"Wakati katika sekunde inachukua kati ya matukio ya mara kwa mara wakati "
-"kushikilia chini kifimbocheza kitufe mchanganyiko."
-
-#: src/settings_translation_file.cpp
-msgid "Joystick frustum sensitivity"
-msgstr "Kifimbocheza frustum unyeti"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The sensitivity of the joystick axes for moving the\n"
-"ingame view frustum around."
-msgstr "Unyeti wa Jira kifimbocheza kwa kuzunguka Mwoneko ingame frustum."
-
-#: src/settings_translation_file.cpp
-msgid "Forward key"
-msgstr "Ufunguo wa mbele"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player forward.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kuhamia mchezaji mbele.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Backward key"
-msgstr "Ufunguo wa nyuma"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player backward.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kuhamia mchezaji nyuma.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Left key"
-msgstr "Ufunguo wa kushoto"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player left.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kuhamia mchezaji kushoto.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Right key"
-msgstr "Ufunguo sahihi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player right.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kusonga mchezaji haki.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Jump key"
-msgstr "Ufunguo wa kuruka"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for jumping.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kuruka.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Sneak key"
-msgstr "Zawadi muhimu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for sneaking.\n"
-"Also used for climbing down and descending in water if aux1_descends is "
-"disabled.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya sneaking.\n"
-"Pia kutumika kwa ajili ya kupanda na kushuka katika maji kama aux1_descends "
-"imelemazwa.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Inventory key"
-msgstr "Ufunguo wa hesabu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the inventory.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kufungua hesabu.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Use key"
-msgstr "Ufunguo wa matumizi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving fast in fast mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kusonga haraka katika hali ya haraka.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Chat key"
-msgstr "Ufunguo wa mazungumzo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the chat window.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kufungua dirisha la soga.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Command key"
-msgstr "Ufunguo wa amri"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the chat window to type commands.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kufungua dirisha la soga kuchapa amri.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Console key"
-msgstr "Muhimu ya Kiweko"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the chat console.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kufungua muano wa mazungumzo.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Range select key"
-msgstr "Kibonye Teua masafa"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling unlimited view range.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling masafa ya Mwoneko ukomo.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Fly key"
-msgstr "Kuruka ufunguo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling flying.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling kuruka.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Fast key"
-msgstr "Ufunguo kasi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling fast mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling hali ya haraka.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Noclip key"
-msgstr "Ufunguo wa Noclip"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling noclip mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling hali ya noclip.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Autorun key"
-msgstr "Autorun ufunguo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling autorun.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling autorun.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Cinematic mode key"
-msgstr "Hali ya cinematic ufunguo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling cinematic mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling hali ya cinematic.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Minimap key"
-msgstr "Ufunguo wa minimap"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling display of minimap.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling onyesho la minimap.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot"
-msgstr "Screenshot"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for taking screenshots.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kuchukua viwambo.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Drop item key"
-msgstr "Tone kipengee muhimu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for dropping the currently selected item.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kuacha kipengee kilichoteuliwa kwa sasa.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "HUD toggle key"
-msgstr "HUD kibonye"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the HUD.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling onyesho la ya HUD.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Chat toggle key"
-msgstr "Kibonye guro wa mazungumzo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the chat.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling onyesho la kuzungumza.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Fog toggle key"
-msgstr "Kibonye guro wa ukungu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the fog.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling onyesho la ukungu.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Camera update toggle key"
-msgstr "Kibonye guro Usasishaji wa kamera"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the camera update. Only used for development\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling sasaishi ya kamera. Tu kutumika kwa ajili ya "
-"maendeleo ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0"
-"e231901735e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Debug info toggle key"
-msgstr "Rekebisha taarifa kibonye"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of debug info.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling onyesho la maelezo kuhusu marekebisho.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Profiler toggle key"
-msgstr "Profiler kibonye"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the profiler. Used for development.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya toggling onyesho la profiler ya. Kutumika kwa ajili ya "
-"maendeleo.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Toggle camera mode key"
-msgstr "Togoa kamera hali muhimu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for switching between first- and third-person camera.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kubadili kati ya kamera ya kwanza - na -mtu wa tatu.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "View range increase key"
-msgstr "Mwoneko masafa ongezeko muhimu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for increasing the viewing range.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kuongeza kiwango cha kuonyesha.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "View range decrease key"
-msgstr "Mwoneko masafa Punguza ufunguo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for decreasing the viewing range.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya kupunguza kiwango cha kuonyesha.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for printing debug stacks. Used for development.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-"Muhimu kwa ajili ya uchapishaji mipororo rekebishi. Kutumika kwa ajili ya "
-"maendeleo.\n"
-"Ona http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
-"e3da1b0edf72eb3"
-
-#: src/settings_translation_file.cpp
-msgid "Network"
-msgstr "Mtandao"
-
-#: src/settings_translation_file.cpp
-msgid "Server address"
-msgstr "Anwani ya seva"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Address to connect to.\n"
-"Leave this blank to start a local server.\n"
-"Note that the address field in the main menu overrides this setting."
-msgstr ""
-"Anwani ya kuunganishwa.\n"
-"Acha hii wazi kuanzisha seva ya ndani.\n"
-"Kumbuka kwamba uga wa anwani katika Menyu kuu Puuza kipimo hiki."
-
-#: src/settings_translation_file.cpp
-msgid "Remote port"
-msgstr "Bandari ya mbali"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Port to connect to (UDP).\n"
-"Note that the port field in the main menu overrides this setting."
-msgstr ""
-"Bandari ya kuunganishwa (UDP).\n"
-"Kumbuka kwamba uwanja wa bandari katika Menyu kuu Puuza kipimo hiki."
-
-#: src/settings_translation_file.cpp
-msgid "Support older servers"
-msgstr "Msaada mkubwa seva"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether to support older servers before protocol version 25.\n"
-"Enable if you want to connect to 0.4.12 servers and before.\n"
-"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
-"Disabling this option will protect your password better."
-msgstr ""
-"Kama kusaidia seva za zamani kabla ya Itifaki ya toleo la 25.\n"
-"Wezesha kama unataka kuunganishwa 0.4.12 seva na kabla.\n"
-"Seva kuanzia na 0.4.13 kazi, 0.4.12-dev seva huenda kazi.\n"
-"Mlemavu chaguo hili kulinda nywila yako bora."
-
-#: src/settings_translation_file.cpp
-msgid "Saving map received from server"
-msgstr "Ramani kuokoa kupokea kutoka seva"
-
-#: src/settings_translation_file.cpp
-msgid "Save the map received by the client on disk."
-msgstr "Hifadhi ramani kupokelewa na mteja kwenye diski."
-
-#: src/settings_translation_file.cpp
-msgid "Show entity selection boxes"
-msgstr "Onyesha chombo masanduku ya uteuzi"
-
-#: src/settings_translation_file.cpp
-msgid "Connect to external media server"
-msgstr "Unganisha kwenye seva ya midia za nje"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable usage of remote media server (if provided by server).\n"
-"Remote servers offer a significantly faster way to download media (e.g. "
-"textures)\n"
-"when connecting to the server."
-msgstr ""
-"Kuwezesha matumizi ya seva ya midia ya mbali (kama zinazotolewa na seva).\n"
-"Seva ya mbali kutoa njia kwa kiasi kikubwa kasi ya kupakua midia (k.m unamu) "
-"wakati wa kuunganisha kwenye seva."
-
-#: src/settings_translation_file.cpp
-msgid "Serverlist URL"
-msgstr "URL ya Serverlist"
-
-#: src/settings_translation_file.cpp
-msgid "URL to the server list displayed in the Multiplayer Tab."
-msgstr "URL kwenye orodha ya seva iliyoonyeshwa katika kichupo cha Multiplayer."
-
-#: src/settings_translation_file.cpp
-msgid "Serverlist file"
-msgstr "Faili ya Serverlist"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"File in client/serverlist/ that contains your favorite servers displayed in "
-"the Multiplayer Tab."
-msgstr ""
-"Faili katika mteja/serverlist/yenye seva zako Pendwa kuonyeshwa katika "
-"kichupo cha Multiplayer."
-
-#: src/settings_translation_file.cpp
-msgid "Graphics"
-msgstr "Michoro"
-
-#: src/settings_translation_file.cpp
-msgid "In-Game"
-msgstr "Katika mchezo"
-
-#: src/settings_translation_file.cpp
-msgid "Basic"
-msgstr "Msingi"
-
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
-#: src/settings_translation_file.cpp
-msgid "Enable VBO"
-msgstr "Wezesha VBO"
-
-#: src/settings_translation_file.cpp
-msgid "Fog"
-msgstr "Ukungu"
-
-#: src/settings_translation_file.cpp
-msgid "Whether to fog out the end of the visible area."
-msgstr "Kama ukungu nje mwisho wa eneo hili dhahiri."
-
-#: src/settings_translation_file.cpp
-msgid "Leaves style"
-msgstr "Mtindo wa majani"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Leaves style:\n"
-"-   Fancy:  all faces visible\n"
-"-   Simple: only outer faces, if defined special_tiles are used\n"
-"-   Opaque: disable transparency"
-msgstr ""
-"Majani mtindo: - dhana: nyuso zote kuonekana - rahisi: tu nyuso nje, kama "
-"inavyoelezwa special_tiles ni kutumika - Opaque: Lemaza uwazi"
-
-#: src/settings_translation_file.cpp
-msgid "Connect glass"
-msgstr "Kuunganisha kioo"
-
-#: src/settings_translation_file.cpp
-msgid "Connects glass if supported by node."
-msgstr "Huunganisha kioo kama mkono na fundo."
-
-#: src/settings_translation_file.cpp
-msgid "Smooth lighting"
-msgstr "Taa laini"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable smooth lighting with simple ambient occlusion.\n"
-"Disable for speed or for different looks."
-msgstr ""
-"Wezesha taa laini na rahisi iliyoko occlusion.\n"
-"Lemaza kwa kasi au kwa ajili ya inaonekana tofauti."
-
-#: src/settings_translation_file.cpp
-msgid "Clouds"
-msgstr "Mawingu"
-
-#: src/settings_translation_file.cpp
-msgid "Clouds are a client side effect."
-msgstr "Mawingu ni mteja upande athari."
-
-#: src/settings_translation_file.cpp
-msgid "3D clouds"
-msgstr "Mawingu ya 3D"
-
-#: src/settings_translation_file.cpp
-msgid "Use 3D cloud look instead of flat."
-msgstr "Matumizi wingu 3D kuangalia badala ya gorofa."
-
-#: src/settings_translation_file.cpp
-msgid "Node highlighting"
-msgstr "Fundo udhulisho"
-
-#: src/settings_translation_file.cpp
-msgid "Method used to highlight selected object."
-msgstr "Mbinu inayotumiwa kuonyesha kipengee kilichoteuliwa."
-
-#: src/settings_translation_file.cpp
-msgid "Filtering"
-msgstr "Uchujaji"
-
-#: src/settings_translation_file.cpp
-msgid "Mipmapping"
-msgstr "Mipmapping"
-
-#: src/settings_translation_file.cpp
-msgid "Use mip mapping to scale textures. May slightly increase performance."
-msgstr ""
-"Tumia ramani ya malaria kwa kipimo cha unamu. Huenda kidogo kuongeza "
-"utendaji."
-
-#: src/settings_translation_file.cpp
-msgid "Anisotropic filtering"
-msgstr "Uchujaji wa anisotropic"
-
-#: src/settings_translation_file.cpp
-msgid "Use anisotropic filtering when viewing at textures from an angle."
-msgstr "Tumia uchujaji anisotropic wakati unatazama katika unamu kutoka pembe."
-
-#: src/settings_translation_file.cpp
-msgid "Bilinear filtering"
-msgstr "Uchujaji wa bilinear"
-
-#: src/settings_translation_file.cpp
-msgid "Use bilinear filtering when scaling textures."
-msgstr "Tumia uchujaji bilinear wakati upimaji unamu."
-
-#: src/settings_translation_file.cpp
-msgid "Trilinear filtering"
-msgstr "Uchujaji wa trilinear"
-
-#: src/settings_translation_file.cpp
-msgid "Use trilinear filtering when scaling textures."
-msgstr "Tumia uchujaji trilinear wakati upimaji unamu."
-
-#: src/settings_translation_file.cpp
-msgid "Clean transparent textures"
-msgstr "Unamu angavu safi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Filtered textures can blend RGB values with fully-transparent neighbors,\n"
-"which PNG optimizers usually discard, sometimes resulting in a dark or\n"
-"light edge to transparent textures.  Apply this filter to clean that up\n"
-"at texture load time."
-msgstr ""
-"Unamu kuchujwa wanaweza kujichanganya RGB thamani na majirani kikamilifu-"
-"uwazi, ambayo PNG optimizers kawaida Tupa, wakati mwingine kusababisha "
-"katika ukingo wa giza au mwanga angavu ya unamu.  Tekeleza Kichujio hii "
-"kusafisha kwamba wakati mzigo, unamu."
-
-#: src/settings_translation_file.cpp
-msgid "Minimum texture size for filters"
-msgstr "Unamu wa kima cha chini cha ukubwa wa Vichujio"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
-"can be blurred, so automatically upscale them with nearest-neighbor\n"
-"interpolation to preserve crisp pixels.  This sets the minimum texture size\n"
-"for the upscaled textures; higher values look sharper, but require more\n"
-"memory.  Powers of 2 are recommended.  Setting this higher than 1 may not\n"
-"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
-"enabled."
-msgstr ""
-"Wakati wa kutumia Vichujio bilinear/trilinear/anisotropic, unamu low-"
-"resolution unaweza kizunguzungu, hivyo otomatiki upscale yao na karibu "
-"jirani interpolation kuhifadhi pikseli hubainisha.  Hii Seti Ukubwa wa unamu "
-"chini kwa ajili ya unamu upscaled; thamani ya juu kuangalia kali, lakini "
-"zinahitaji kumbukumbu zaidi.  Nguvu ya 2 ni ilipendekeza.  Kuweka hii zaidi "
-"1 usiwe na athari inayoonekana isipokuwa uchujaji wa bilinear/trilinear/"
-"anisotropic ni kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid "FSAA"
-msgstr "FSAA"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Chaguo majaribio, inaweza kusababisha nafasi inayoonekana kati ya vitalu "
-"wakati kuweka namba ya juu zaidi kuliko 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Shaders allow advanced visual effects and may increase performance on some "
-"video cards.\n"
-"Thy only work with the OpenGL video backend."
-msgstr ""
-"Shaders kuruhusu athari pevu onekana na inaweza kuongeza utendaji wa baadhi "
-"ya kadi ya video.\n"
-"Kazi yako tu na OpenGL video backend."
-
-#: src/settings_translation_file.cpp
-msgid "Filmic tone mapping"
-msgstr "Ramani ya toni filmic"
-
-#: src/settings_translation_file.cpp
-msgid "Enables filmic tone mapping"
-msgstr "Huwezesha toni filmic ramani"
-
-#: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bumpmapping"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Inawezesha bumpmapping kwa ajili ya unamu. Normalmaps haja iwekwe kwa pakiti "
-"ya unamu au haja ya kuwa yaliyozalishwa na otomatiki.\n"
-"Inahitaji shaders kwa kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Kuzalisha normalmaps"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Huwezesha kwenye kizazi cha normalmap kuruka (Emboss athari).\n"
-"Inahitaji bumpmapping kwa kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Nguvu ya Normalmaps"
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Nguvu ya normalmaps inayozalishwa."
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Sampuli ya Normalmaps"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Inafasili hatua ya sampuli ya unamu.\n"
-"Thamani ya juu zaidi matokeo katika ramani ya laini ya kawaida."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Parallax occlusion"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Huwezesha parallax occlusion uramanishi.\n"
-"Inahitaji shaders kwa kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Parallax occlusion hali"
+"(X, Y, Z) fidia ya fractal kutoka kituo cha dunia katika vitengo vya "
+"'kipimo'.\n"
+"Kutumika ili kuhamisha eneo la spawn ya kufaa ya ardhi chini karibu (0, 0).\n"
+"Chaguo-msingi ni mzuri kwa ajili ya seti ya mandelbrot, inahitaji kuhaririwa "
+"kwa ajili ya julia seti.\n"
+"Masafa ya takribani-2 hadi 2. Kuzidisha kwa 'Skeli' kwa Sawazisha katika "
+"fundo."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2240,260 +1299,8 @@ msgstr ""
 "1 = ramani ya misaada (polepole, sahihi zaidi)."
 
 #: src/settings_translation_file.cpp
-msgid "Parallax occlusion strength"
-msgstr "Parallax occlusion nguvu"
-
-#: src/settings_translation_file.cpp
-msgid "Strength of parallax."
-msgstr "Nguvu ya parallax."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Parallax occlusion Marudiorudio"
-
-#: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Idadi ya parallax occlusion Marudiorudio."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion Scale"
-msgstr "Parallax occlusion wadogo"
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Kipimo cha jumla ya parallax occlusion athari."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Parallax occlusion upendeleo"
-
-#: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Upendeleo wa jumla wa parallax occlusion athari, kawaida kipimo/2."
-
-#: src/settings_translation_file.cpp
-msgid "Waving Nodes"
-msgstr "Waving fundo"
-
-#: src/settings_translation_file.cpp
-msgid "Waving water"
-msgstr "Waving maji"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set to true enables waving water.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Kuweka huwezesha kweli waving maji.\n"
-"Inahitaji shaders kwa kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid "Waving water height"
-msgstr "Waving maji urefu"
-
-#: src/settings_translation_file.cpp
-msgid "Waving water length"
-msgstr "Waving maji urefu"
-
-#: src/settings_translation_file.cpp
-msgid "Waving water speed"
-msgstr "Waving kasi ya maji"
-
-#: src/settings_translation_file.cpp
-msgid "Waving leaves"
-msgstr "Waving majani"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set to true enables waving leaves.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Kuweka huwezesha kweli waving majani.\n"
-"Inahitaji shaders kwa kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid "Waving plants"
-msgstr "Waving mimea"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set to true enables waving plants.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Kuweka huwezesha kweli waving mimea.\n"
-"Inahitaji shaders kwa kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid "Advanced"
-msgstr "Pevu"
-
-#: src/settings_translation_file.cpp
-msgid "Maximum FPS"
-msgstr "Ramprogrammen juu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If FPS would go higher than this, limit it by sleeping\n"
-"to not waste CPU power for no benefit."
-msgstr ""
-"Kama Ramprogrammen angekwenda juu kuliko hii, kikomo kwa kulala si kupoteza "
-"nguvu ya CPU kwa faida yoyote."
-
-#: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "Ramprogrammen katika Menyu ya mapumziko"
-
-#: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "Ramprogrammen juu wakati mchezo umesitishwa."
-
-#: src/settings_translation_file.cpp
-msgid "Viewing range"
-msgstr "Kuonyesha masafa"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"View distance in nodes.\n"
-"Min = 20"
-msgstr ""
-"Onyesha umbali katika fundo.\n"
-"Min = 20"
-
-#: src/settings_translation_file.cpp
-msgid "Screen width"
-msgstr "Upana wa kiwamba"
-
-#: src/settings_translation_file.cpp
-msgid "Width component of the initial window size."
-msgstr "Upana sehemu ya ukubwa cha kidirisha awali."
-
-#: src/settings_translation_file.cpp
-msgid "Screen height"
-msgstr "Urefu wa kiwamba"
-
-#: src/settings_translation_file.cpp
-msgid "Height component of the initial window size."
-msgstr "Kijenzi cha urefu wa ukubwa cha kidirisha awali."
-
-#: src/settings_translation_file.cpp
-msgid "Full screen"
-msgstr "Kiwamba kizima"
-
-#: src/settings_translation_file.cpp
-msgid "Fullscreen mode."
-msgstr "Hali-tumizi ya skrini nzima."
-
-#: src/settings_translation_file.cpp
-msgid "Full screen BPP"
-msgstr "Skrini BPP"
-
-#: src/settings_translation_file.cpp
-msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr "Biti kwa pikseli (a.k.a rangi kina) katika hali-tumizi ya skrini nzima."
-
-#: src/settings_translation_file.cpp
-msgid "V-Sync"
-msgstr "V-ulandanishi"
-
-#: src/settings_translation_file.cpp
-msgid "Vertical screen synchronization."
-msgstr "Ulandanishi wa kiwamba wima."
-
-#: src/settings_translation_file.cpp
-msgid "Field of view"
-msgstr "Uga wa Mwoneko"
-
-#: src/settings_translation_file.cpp
-msgid "Field of view in degrees."
-msgstr "Uga wa Mwoneko katika nyuzi."
-
-#: src/settings_translation_file.cpp
-msgid "Field of view for zoom"
-msgstr "Uga wa Mwoneko kwa ajili ya Kuza"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Field of view while zooming in degrees.\n"
-"This requires the \"zoom\" privilege on the server."
-msgstr ""
-"Uga wa Mwoneko ukikuza katika nyuzi.\n"
-"Hii inahitaji nafasi \"Kuza\" kwenye seva."
-
-#: src/settings_translation_file.cpp
-msgid "Gamma"
-msgstr "Gamma"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
-"This setting is for the client only and is ignored by the server."
-msgstr ""
-"Rekebisha simbiko gamma kwa majedwali mwanga. Idadi ya chini ni mkali.\n"
-"Kipimo hiki ni kwa ajili ya mteja tu na ni kupuuzwa na seva."
-
-#: src/settings_translation_file.cpp
-msgid "Texture path"
-msgstr "Njia ya unamu"
-
-#: src/settings_translation_file.cpp
-msgid "Path to texture directory. All textures are first searched from here."
-msgstr "Njia ya orodha ya unamu. Unamu wote vinatafutizwa kwanza kutoka hapa."
-
-#: src/settings_translation_file.cpp
-msgid "Video driver"
-msgstr "Kiendeshaji video"
-
-#: src/settings_translation_file.cpp
-msgid "The rendering back-end for Irrlicht."
-msgstr "Utungulizaji nyuma-mwisho wa Irrlicht."
-
-#: src/settings_translation_file.cpp
-msgid "Cloud height"
-msgstr "Urefu wa wingu"
-
-#: src/settings_translation_file.cpp
-msgid "Height on which clouds are appearing."
-msgstr "Urefu ambayo mawingu ni kuonekana."
-
-#: src/settings_translation_file.cpp
-msgid "Cloud radius"
-msgstr "Wingu eneo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Radius of cloud area stated in number of 64 node cloud squares.\n"
-"Values larger than 26 will start to produce sharp cutoffs at cloud area "
-"corners."
-msgstr ""
-"Eneo la eneo la wingu alisema katika idadi ya 64 fundo wingu miraba.\n"
-"Thamani kubwa kuliko 26 itaanza kuzalisha cutoffs mkali katika wingu eneo la "
-"pembe."
-
-#: src/settings_translation_file.cpp
-msgid "View bobbing"
-msgstr "Mwoneko kando"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Multiplier for view bobbing.\n"
-"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
-msgstr ""
-"Mengi kwa ajili ya Mwoneko kando.\n"
-"Kwa mfano: 0 kwa ajili ya Mwoneko hakuna kando; 1.0 kwa ajili ya kawaida; "
-"2.0 kwa mara mbili."
-
-#: src/settings_translation_file.cpp
-msgid "Fall bobbing"
-msgstr "Kuanguka bobbing"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Multiplier for fall bobbing.\n"
-"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
-msgstr ""
-"Mengi kwa ajili ya kuanguka kando.\n"
-"Kwa mfano: 0 kwa ajili ya Mwoneko hakuna kando; 1.0 kwa ajili ya kawaida; "
-"2.0 kwa mara mbili."
+msgid "3D clouds"
+msgstr "Mawingu ya 3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode"
@@ -2519,315 +1326,59 @@ msgstr ""
 "-pageflip: quadbuffer msingi 3d."
 
 #: src/settings_translation_file.cpp
-msgid "Console color"
-msgstr "Rangi ya Kiweko"
-
-#: src/settings_translation_file.cpp
-msgid "In-game chat console background color (R,G,B)."
-msgstr "Mazungumzo katika mchezo console mandharinyuma rangi (R, G, B)."
-
-#: src/settings_translation_file.cpp
-msgid "Console alpha"
-msgstr "Alfa ya Kiweko"
-
-#: src/settings_translation_file.cpp
-msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
+msgid ""
+"A chosen map seed for a new map, leave empty for random.\n"
+"Will be overridden when creating a new world in the main menu."
 msgstr ""
-"Mazungumzo katika mchezo console mandharinyuma Alfa (opaqueness kati ya 0 na "
-"255)."
+"Mbegu ramani waliochaguliwa kwa ajili ya ramani mpya, kuondoka tupu kwa "
+"nasibu.\n"
+"Itakuwa kuuharibu wakati wa kuunda dunia mpya katika Menyu kuu."
 
 #: src/settings_translation_file.cpp
-msgid "Selection box color"
-msgstr "Uteuzi kikasha rangi"
+msgid "A message to be displayed to all clients when the server crashes."
+msgstr "Ujumbe kuonyeshwa kwa wateja wote wakati seva yaanguka."
 
 #: src/settings_translation_file.cpp
-msgid "Selection box border color (R,G,B)."
-msgstr "Uteuzi kikasha mpaka rangi (R, G, B)."
+msgid "A message to be displayed to all clients when the server shuts down."
+msgstr "Ujumbe kuonyeshwa kwa wateja wote wakati seva huzima."
 
 #: src/settings_translation_file.cpp
-msgid "Selection box width"
-msgstr "Uteuzi kikasha upana"
+msgid "Absolute limit of emerge queues"
+msgstr "Kikomo halisi ya foleni ya emerge"
 
 #: src/settings_translation_file.cpp
-msgid "Width of the selectionbox's lines around nodes."
-msgstr "Upana wa mistari ya selectionbox karibu fundo."
+msgid "Acceleration in air"
+msgstr "Kuongeza kasi katika hewa"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color"
-msgstr "Rangi ya crosshair"
+msgid "Active Block Management interval"
+msgstr "Nafasi kazi ya usimamizi wa umbo"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Rangi ya crosshair (R, G, B)."
+msgid "Active Block Modifier interval"
+msgstr "Amilifu fungu Kigeuza nafasi"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha"
-msgstr "Crosshair Alfa"
+msgid "Active Block Modifiers"
+msgstr "Modifiers fungu amilifu"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Crosshair Alfa (opaqueness kati ya 0 na 255)."
+msgid "Active block range"
+msgstr "Masafa ya fungu amilifu"
 
 #: src/settings_translation_file.cpp
-msgid "Desynchronize block animation"
-msgstr "Desynchronize umbo la uhuishaji"
-
-#: src/settings_translation_file.cpp
-msgid "Whether node texture animations should be desynchronized per mapblock."
-msgstr "Kama fundo unamu uhuishaji lazima desynchronized kwa mapblock."
-
-#: src/settings_translation_file.cpp
-msgid "Maximum hotbar width"
-msgstr "Hotbar kiwango cha juu cha upana"
+msgid "Active object send range"
+msgstr "Kiolwa amilifu Tuma masafa"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Maximum proportion of current window to be used for hotbar.\n"
-"Useful if there's something to be displayed right or left of hotbar."
+"Address to connect to.\n"
+"Leave this blank to start a local server.\n"
+"Note that the address field in the main menu overrides this setting."
 msgstr ""
-"Uwiano juu ya dirisha la sasa kutumika kwa ajili ya hotbar.\n"
-"Muhimu kama kuna kitu cha kuonyeshwa kulia au kushoto wa hotbar."
-
-#: src/settings_translation_file.cpp
-msgid "Mesh cache"
-msgstr "Kirudufu cha matundu"
-
-#: src/settings_translation_file.cpp
-msgid "Enables caching of facedir rotated meshes."
-msgstr "Huwezesha uwekaji kache kwa facedir Iliyozungushwa meshes."
-
-#: src/settings_translation_file.cpp
-msgid "Minimap"
-msgstr "Ramani"
-
-#: src/settings_translation_file.cpp
-msgid "Enables minimap."
-msgstr "Inawezesha minimap."
-
-#: src/settings_translation_file.cpp
-msgid "Round minimap"
-msgstr "Ramani pande zote"
-
-#: src/settings_translation_file.cpp
-msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr "Sura ya minimap ya. Kuwezeshwa = pande zote, walemavu = mraba."
-
-#: src/settings_translation_file.cpp
-msgid "Minimap scan height"
-msgstr "Ramani tambazo urefu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"True = 256\n"
-"False = 128\n"
-"Useable to make minimap smoother on slower machines."
-msgstr ""
-"Kweli = 256 bandia = Useable 128 kufanya minimap laini juu ya mashine "
-"polepole."
-
-#: src/settings_translation_file.cpp
-msgid "Colored fog"
-msgstr "Ukungu wa rangi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
-msgstr ""
-"Kufanya rangi wa ukungu na anga hutegemea mchana (alfajiri/machweo) na "
-"kuonyesha mwelekeo."
-
-#: src/settings_translation_file.cpp
-msgid "Ambient occlusion gamma"
-msgstr "Occlusion iliyoko gamma"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The strength (darkness) of node ambient-occlusion shading.\n"
-"Lower is darker, Higher is lighter. The valid range of values for this\n"
-"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
-"set to the nearest valid value."
-msgstr ""
-"Nguvu (giza) ya fundo iliyoko occlusion kivuli.\n"
-"Chini ni nyeusi, juu ni hafifu. Masafa halali ya thamani kwa ajili ya kipimo "
-"hiki ni 0.25 kwa 4.0 jumuishi. Kama thamani iko nje ya masafa ni itasetiwa "
-"kwenye ya karibu Thamani halali."
-
-#: src/settings_translation_file.cpp
-msgid "Inventory items animations"
-msgstr "Hesabu vitu uhuishaji"
-
-#: src/settings_translation_file.cpp
-msgid "Enables animation of inventory items."
-msgstr "Huwezesha uhuishaji wa vitu inventering."
-
-#: src/settings_translation_file.cpp
-msgid "Menus"
-msgstr "Menyu"
-
-#: src/settings_translation_file.cpp
-msgid "Clouds in menu"
-msgstr "Mawingu katika Menyu"
-
-#: src/settings_translation_file.cpp
-msgid "Use a cloud animation for the main menu background."
-msgstr "Tumia uhuishaji wa wingu ya mandharinyuma ya Menyu kuu."
-
-#: src/settings_translation_file.cpp
-msgid "GUI scaling"
-msgstr "GUI kurekebisha"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Scale gui by a user specified value.\n"
-"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
-"This will smooth over some of the rough edges, and blend\n"
-"pixels when scaling down, at the cost of blurring some\n"
-"edge pixels when images are scaled by non-integer sizes."
-msgstr ""
-"Rekebisha gui kwa mtumiaji maalum thamani.\n"
-"Tumia kichujio karibu-jirani-Waanti-Lakabu Rekebisha GUI ya.\n"
-"Hii laini baadhi ya kingo mbaya, na mchanganyiko pikseli wakati upimaji "
-"chini, wanatengeneza ukungu wa jinsia pikseli baadhi makali wakati picha ni "
-"yamesimamisha na ukubwa wa yasiyo ya takwimu."
-
-#: src/settings_translation_file.cpp
-msgid "GUI scaling filter"
-msgstr "GUI kipimo Kichujio"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"When gui_scaling_filter is true, all GUI images need to be\n"
-"filtered in software, but some images are generated directly\n"
-"to hardware (e.g. render-to-texture for nodes in inventory)."
-msgstr ""
-"Wakati gui_scaling_filter ni kweli, yote GUI picha haja ya kuchujwa katika "
-"programu, lakini taswira zingine hutolewa moja kwa moja kwa maunzi (k.m "
-"kutoa-kwa-unamu kwa fundo katika hesabu)."
-
-#: src/settings_translation_file.cpp
-msgid "GUI scaling filter txr2img"
-msgstr "GUI kipimo Kichujio txr2img"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"When gui_scaling_filter_txr2img is true, copy those images\n"
-"from hardware to software for scaling.  When false, fall back\n"
-"to the old scaling method, for video drivers that don't\n"
-"properly support downloading textures back from hardware."
-msgstr ""
-"Wakati gui_scaling_filter_txr2img ni kweli, kunakili picha hizo kutoka "
-"maunzi na programu kwa ajili ya kurekebisha.  Wakati uongo, kuanguka nyuma "
-"kwa mbinu ya zamani ya kipimo, kwa madereva video vizuri siungi mkono unamu "
-"Inapakua nyuma kutoka maunzi."
-
-#: src/settings_translation_file.cpp
-msgid "Tooltip delay"
-msgstr "Kidokezozana kuchelewa"
-
-#: src/settings_translation_file.cpp
-msgid "Delay showing tooltips, stated in milliseconds."
-msgstr "Kuchelewa kuonyesha vidokezozana, alisema katika milisekunde."
-
-#: src/settings_translation_file.cpp
-msgid "Freetype fonts"
-msgstr "Fonti Freetype"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether freetype fonts are used, requires freetype support to be compiled in."
-msgstr ""
-"Kama freetype fonti hutumiwa, inahitaji msaada wa freetype kuwa alikusanya "
-"katika."
-
-#: src/settings_translation_file.cpp
-msgid "Font path"
-msgstr "Njia ya fonti"
-
-#: src/settings_translation_file.cpp
-msgid "Path to TrueTypeFont or bitmap."
-msgstr "Njia ya TrueTypeFont au vitone michoro."
-
-#: src/settings_translation_file.cpp
-msgid "Font size"
-msgstr "Ukubwa wa fonti"
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow"
-msgstr "Kivuli cha fonti"
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow offset, if 0 then shadow will not be drawn."
-msgstr "Fonti kivuli Sawazisha, kama 0 basi kivuli itakuwa kuchukuliwa."
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow alpha"
-msgstr "Fonti kivuli Alfa"
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow alpha (opaqueness, between 0 and 255)."
-msgstr "Fonti kivuli Alfa (opaqueness kati ya 0 na 255)."
-
-#: src/settings_translation_file.cpp
-msgid "Monospace font path"
-msgstr "Monospace njia ya fonti"
-
-#: src/settings_translation_file.cpp
-msgid "Monospace font size"
-msgstr "Ukubwa wa fonti wa Monospace"
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font"
-msgstr "Fonti amebadilisha"
-
-#: src/settings_translation_file.cpp
-msgid "This font will be used for certain languages."
-msgstr "Fonti hii itatumika kwa lugha fulani."
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font size"
-msgstr "Ukubwa fonti amebadilisha"
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font shadow"
-msgstr "Fonti amebadilisha kivuli"
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font shadow alpha"
-msgstr "Fonti amebadilisha kivuli Alfa"
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot folder"
-msgstr "Screenshot kabrasha"
-
-#: src/settings_translation_file.cpp
-msgid "Path to save screenshots at."
-msgstr "Njia ya kuokoa viwambo katika."
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot format"
-msgstr "Screenshot umbizo"
-
-#: src/settings_translation_file.cpp
-msgid "Format of screenshots."
-msgstr "Umbizo la viwambo."
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot quality"
-msgstr "Screenshot ubora"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Screenshot quality. Only used for JPEG format.\n"
-"1 means worst quality; 100 means best quality.\n"
-"Use 0 for default quality."
-msgstr ""
-"Screenshot ubora. Tu kutumika kwa ajili ya Umbiza JPEG.\n"
-"1 maana ubora mbaya; 100 humaanisha ubora.\n"
-"Tumia 0 kwa ubora wa chaguo-msingi."
-
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
+"Anwani ya kuunganishwa.\n"
+"Acha hii wazi kuanzisha seva ya ndani.\n"
+"Kumbuka kwamba uga wa anwani katika Menyu kuu Puuza kipimo hiki."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2837,92 +1388,42 @@ msgstr ""
 "Rekebisha usakinishaji wa dpi kwenye kiwamba chako (yasiyo X11/Android tu) "
 "mfano kwa 4 k skrini."
 
-#: src/settings_translation_file.cpp
-msgid "Sound"
-msgstr "Sauti"
-
-#: src/settings_translation_file.cpp
-msgid "Volume"
-msgstr "Kiasi"
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock unload timeout"
-msgstr "Mkatiko Muda Mapblock wakipakua"
-
-#: src/settings_translation_file.cpp
-msgid "Timeout for client to remove unused map data from memory."
-msgstr ""
-"Muda wa kuisha kwa mteja kuondoa data ya ramani zisizotumika kutoka kwa "
-"kumbukumbu."
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock limit"
-msgstr "Kikomo cha Mapblock"
-
 #: src/settings_translation_file.cpp
 msgid ""
-"Maximum number of mapblocks for client to be kept in memory.\n"
-"Set to -1 for unlimited amount."
+"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
+"This setting is for the client only and is ignored by the server."
 msgstr ""
-"Namba ya juu ya mapblocks kwa mteja kwa kuwekwa katika kumbukumbu.\n"
-"Seti -1 kwa kiasi ukomo."
+"Rekebisha simbiko gamma kwa majedwali mwanga. Idadi ya chini ni mkali.\n"
+"Kipimo hiki ni kwa ajili ya mteja tu na ni kupuuzwa na seva."
 
 #: src/settings_translation_file.cpp
-msgid "Show debug info"
-msgstr "Onyesha maelezo kuhusu marekebisho"
+msgid "Advanced"
+msgstr "Pevu"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Whether to show the client debug info (has the same effect as hitting F5)."
-msgstr ""
-"Kama kuonyesha mteja Rekebisha taarifa (ina athari sawa kama kupiga F5)."
+msgid "Altitude Chill"
+msgstr "Chill ya mwinuko"
 
 #: src/settings_translation_file.cpp
-msgid "Server / Singleplayer"
-msgstr "Seva / Singleplayer"
+msgid "Always fly and fast"
+msgstr "Daima kuruka na kufunga"
 
 #: src/settings_translation_file.cpp
-msgid "Server name"
-msgstr "Jina la seva"
+msgid "Ambient occlusion gamma"
+msgstr "Occlusion iliyoko gamma"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Name of the server, to be displayed when players join and in the serverlist."
-msgstr ""
-"Jina la seva, kuonyeshwa wakati wachezaji kujiunga na katika serverlist ya."
+msgid "Amplifies the valleys"
+msgstr "Inaangazia mabonde"
 
 #: src/settings_translation_file.cpp
-msgid "Server description"
-msgstr "Maelezo ya seva"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Description of server, to be displayed when players join and in the "
-"serverlist."
-msgstr ""
-"Maelezo ya seva, kuonyeshwa wakati wachezaji kujiunga na katika serverlist "
-"ya."
-
-#: src/settings_translation_file.cpp
-msgid "Domain name of server, to be displayed in the serverlist."
-msgstr "Kikoa jina la seva, kuonyeshwa katika serverlist ya."
-
-#: src/settings_translation_file.cpp
-msgid "Server URL"
-msgstr "URL ya seva"
-
-#: src/settings_translation_file.cpp
-msgid "Homepage of server, to be displayed in the serverlist."
-msgstr "Homepage ya seva, kuonyeshwa katika serverlist ya."
+msgid "Anisotropic filtering"
+msgstr "Uchujaji wa anisotropic"
 
 #: src/settings_translation_file.cpp
 msgid "Announce server"
 msgstr "Kutangaza seva"
 
-#: src/settings_translation_file.cpp
-msgid "Automaticaly report to the serverlist."
-msgstr "Automaticaly ripoti ya serverlist."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Announce to this serverlist.\n"
@@ -2930,1072 +1431,105 @@ msgid ""
 "minetest.net."
 msgstr ""
 "Kutangaza kwa serverlist hii.\n"
-"Kama unataka kutangaza anwani yako ya ipv6, kutumia serverlist_url = "
-"v6.servers.minetest.net."
+"Kama unataka kutangaza anwani yako ya ipv6, kutumia serverlist_url = v6."
+"servers.minetest.net."
 
 #: src/settings_translation_file.cpp
-msgid "Disable escape sequences"
-msgstr "Lemaza kutoroka mwandamano"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Disable escape sequences, e.g. chat coloring.\n"
-"Use this if you want to run a server with pre-0.4.14 clients and you want to "
-"disable\n"
-"the escape sequences generated by mods."
-msgstr ""
-"Lemaza mwandamano wa kutoroka, k.m kuzungumza kuchorea.\n"
-"Tumia hii kama unataka kuendesha seva na wateja wa awali-0.4.14 na unataka "
-"kulemaza mwandamano kutoroka yanayotokana na mods."
-
-#: src/settings_translation_file.cpp
-msgid "Server port"
-msgstr "Kituo tarishi cha seva"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Network port to listen (UDP).\n"
-"This value will be overridden when starting from the main menu."
-msgstr ""
-"Mtandao bandari kusikiliza (UDP).\n"
-"Thamani hii itakuwa kuuharibu wakati kuanzia Menyu kuu."
-
-#: src/settings_translation_file.cpp
-msgid "Bind address"
-msgstr "Kumfunga anwani"
-
-#: src/settings_translation_file.cpp
-msgid "The network interface that the server listens on."
-msgstr "Interface mtandao kwamba seva husikiliza juu."
-
-#: src/settings_translation_file.cpp
-msgid "Strict protocol checking"
-msgstr "Itifaki ya kali kukagua"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable to disallow old clients from connecting.\n"
-"Older clients are compatible in the sense that they will not crash when "
-"connecting\n"
-"to new servers, but they may not support all new features that you are "
-"expecting."
-msgstr ""
-"Wezesha Usiruhusu wateja wa zamani kutoka kuunganisha.\n"
-"Wateja wakubwa ni patanifu katika maana ya kwamba wao si mapenzi ajali "
-"wakati wa kuunganisha kwenye seva mpya, lakini inaweza kusaidia nduni zote "
-"mpya ambayo ni kutarajia."
-
-#: src/settings_translation_file.cpp
-msgid "Remote media"
-msgstr "Midia ya mbali"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Specifies URL from which client fetches media instead of using UDP.\n"
-"$filename should be accessible from $remote_media$filename via cURL\n"
-"(obviously, remote_media should end with a slash).\n"
-"Files that are not present will be fetched the usual way."
-msgstr ""
-"Inabainisha URL kutoka ambayo mteja fetches vyombo vya habari badala ya "
-"kutumia UDP.\n"
-"$filename lazima kupatikana kutoka $remote_media$ JinaFaili kupitia cURL (ni "
-"wazi, remote_media lazima kumaliza na kufyeka na).\n"
-"Faili ambayo sasa itakuwa kuwa fetched njia ya kawaida."
-
-#: src/settings_translation_file.cpp
-msgid "IPv6 server"
-msgstr "IPv6 Seva"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable/disable running an IPv6 server.  An IPv6 server may be restricted\n"
-"to IPv6 clients, depending on system configuration.\n"
-"Ignored if bind_address is set."
-msgstr ""
-"Wezesha/Lemaza kuendesha seva ya IPv6.  Seva ya IPv6 unaweza kuzuiliwa kwa "
-"wateja IPv6, kutegemea usanidi mfumo.\n"
-"Kupuuzwa kama bind_address kuweka."
-
-#: src/settings_translation_file.cpp
-msgid "Maximum simultaneous block sends per client"
-msgstr "Fungu juu ya samtidiga hutuma kwa mteja"
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of blocks that are simultaneously sent per client."
-msgstr "Namba ya juu ya vitalu kwamba ni wakati huo huo uliotumwa kwa mteja."
-
-#: src/settings_translation_file.cpp
-msgid "Maximum simultaneous block sends total"
-msgstr "Fungu juu ya samtidiga hutuma jumla"
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of blocks that are simultaneously sent in total."
-msgstr "Namba ya juu ya vitalu kwamba wakati huo huo hutumwa kwa jumla."
-
-#: src/settings_translation_file.cpp
-msgid "Delay in sending blocks after building"
-msgstr "Kuchelewa katika kutuma vitalu baada ya jengo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"To reduce lag, block transfers are slowed down when a player is building "
-"something.\n"
-"This determines how long they are slowed down after placing or removing a "
-"node."
-msgstr ""
-"Kupunguza bakia, uhamisho wa fungu ni sjunkit wakati mchezaji ni kujenga "
-"kitu.\n"
-"Hii huamua lini wao ni sjunkit baada ya kuweka au kuondoa fundo."
-
-#: src/settings_translation_file.cpp
-msgid "Max. packets per iteration"
-msgstr "Max. pakiti kila Marudiorudio"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of packets sent per send step, if you have a slow connection\n"
-"try reducing it, but don't reduce it to a number below double of targeted\n"
-"client number."
-msgstr ""
-"Namba ya juu ya pakiti iliyotumwa kwa hatua ya kutuma, kama una muunganisho "
-"polepole jaribu kupunguza ni, lakini si ya kupunguza kadhaa chini ya mara "
-"mbili ya idadi ya mteja lengwa."
-
-#: src/settings_translation_file.cpp
-msgid "Default game"
-msgstr "Chaguo-msingi mchezo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Default game when creating a new world.\n"
-"This will be overridden when creating a world from the main menu."
-msgstr ""
-"Chaguo-msingi mchezo wakati wa kuunda dunia mpya.\n"
-"Hii itakuwa kuwa kuuharibu wakati kutengeneza ulimwengu kutoka kwenye menyu "
-"kuu."
-
-#: src/settings_translation_file.cpp
-msgid "Message of the day"
-msgstr "Ujumbe wa siku ya"
-
-#: src/settings_translation_file.cpp
-msgid "Message of the day displayed to players connecting."
-msgstr "Ujumbe wa siku ya kuonyeshwa kwa wachezaji kuunganisha."
-
-#: src/settings_translation_file.cpp
-msgid "Maximum users"
-msgstr "Watumiaji wa kiwango cha juu"
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of players that can connect simultaneously."
-msgstr "Namba ya juu ya wachezaji ambao wanaweza kuunganisha wakati huo huo."
-
-#: src/settings_translation_file.cpp
-msgid "Map directory"
-msgstr "Orodha ya ramani"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"World directory (everything in the world is stored here).\n"
-"Not needed if starting from the main menu."
-msgstr ""
-"Mpangilio orodha ulimwengu (kila kitu ulimwenguni kuhifadhiwa hapa).\n"
-"Si zinahitajika kama kuanzia Menyu kuu."
-
-#: src/settings_translation_file.cpp
-msgid "Item entity TTL"
-msgstr "Kipengee chombo TTL"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Time in seconds for item entity (dropped items) to live.\n"
-"Setting it to -1 disables the feature."
-msgstr ""
-"Wakati katika sekunde kwa kipengee chombo (vitu chopo) kuishi.\n"
-"Kuweka kwa -1 Hulemaza kipengele."
-
-#: src/settings_translation_file.cpp
-msgid "Damage"
-msgstr "Uharibifu"
-
-#: src/settings_translation_file.cpp
-msgid "Enable players getting damage and dying."
-msgstr "Wezesha wachezaji kupata uharibifu na kufa."
-
-#: src/settings_translation_file.cpp
-msgid "Fixed map seed"
-msgstr "Mbegu ya ramani fasta"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"A chosen map seed for a new map, leave empty for random.\n"
-"Will be overridden when creating a new world in the main menu."
-msgstr ""
-"Mbegu ramani waliochaguliwa kwa ajili ya ramani mpya, kuondoka tupu kwa "
-"nasibu.\n"
-"Itakuwa kuuharibu wakati wa kuunda dunia mpya katika Menyu kuu."
-
-#: src/settings_translation_file.cpp
-msgid "Default password"
-msgstr "Nywila ya chaguo-msingi"
-
-#: src/settings_translation_file.cpp
-msgid "New users need to input this password."
-msgstr "Watumiaji wapya haja Ingiza nywila hii."
-
-#: src/settings_translation_file.cpp
-msgid "Default privileges"
-msgstr "Upendeleo wa chaguo-msingi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The privileges that new users automatically get.\n"
-"See /privs in game for a full list on your server and mod configuration."
-msgstr ""
-"Upendeleo kwamba watumiaji wapya otomatiki kupata.\n"
-"Ona /privs katika mchezo kwa ajili ya orodha kamili kwenye msabidi wa seva "
-"na Moduli."
-
-#: src/settings_translation_file.cpp
-msgid "Basic Privileges"
-msgstr "Haki za msingi"
-
-#: src/settings_translation_file.cpp
-msgid "Privileges that players with basic_privs can grant"
-msgstr "Marupurupu ya wachezaji na basic_privs unaweza ruzuku"
-
-#: src/settings_translation_file.cpp
-msgid "Unlimited player transfer distance"
-msgstr "Umbali wa uhamisho wa mchezaji ukomo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether players are shown to clients without any range limit.\n"
-"Deprecated, use the setting player_transfer_distance instead."
-msgstr ""
-"Kama wachezaji huonyeshwa kwa wateja bila kikomo yoyote mbalimbali.\n"
-"Deprecated, Tumia kipimo player_transfer_distance badala yake."
-
-#: src/settings_translation_file.cpp
-msgid "Player transfer distance"
-msgstr "Umbali wa uhamisho wa mchezaji"
-
-#: src/settings_translation_file.cpp
-msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
-msgstr ""
-"Inafasili umbali wa uhamisho wa mchezaji maximal katika vitalu (0 = ukomo)."
-
-#: src/settings_translation_file.cpp
-msgid "Player versus Player"
-msgstr "Mchezaji dhidi ya mchezaji"
-
-#: src/settings_translation_file.cpp
-msgid "Whether to allow players to damage and kill each other."
-msgstr "Kama kuruhusu wachezaji kuharibu na kuua kila mmoja."
-
-#: src/settings_translation_file.cpp
-msgid "Static spawnpoint"
-msgstr "Spawnpoint tuli"
-
-#: src/settings_translation_file.cpp
-msgid "If this is set, players will always (re)spawn at the given position."
-msgstr "Kama hii ni kuweka, wachezaji mapenzi daima (re) spawn mahali fulani."
-
-#: src/settings_translation_file.cpp
-msgid "Disallow empty passwords"
-msgstr "Usiruhusu nywila tupu"
-
-#: src/settings_translation_file.cpp
-msgid "If enabled, new players cannot join with an empty password."
-msgstr "Ikiwa imewezeshwa, wachezaji wapya haiwezi kujiunga na nywila wazi."
-
-#: src/settings_translation_file.cpp
-msgid "Disable anticheat"
-msgstr "Lemaza anticheat"
-
-#: src/settings_translation_file.cpp
-msgid "If enabled, disable cheat prevention in multiplayer."
-msgstr "Ikiwa imewezeshwa, kulemaza uzuiaji wa soka katika multiplayer."
-
-#: src/settings_translation_file.cpp
-msgid "Rollback recording"
-msgstr "Mserereko kurekodi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, actions are recorded for rollback.\n"
-"This option is only read when server starts."
-msgstr ""
-"Ikiwa imewezeshwa, matendo ni kumbukumbu kwa ajili ya mserereko.\n"
-"Chaguo hili ni soma tu wakati wa kuanza kwa seva."
-
-#: src/settings_translation_file.cpp
-msgid "Shutdown message"
-msgstr "Uzimaji ujumbe"
-
-#: src/settings_translation_file.cpp
-msgid "A message to be displayed to all clients when the server shuts down."
-msgstr "Ujumbe kuonyeshwa kwa wateja wote wakati seva huzima."
-
-#: src/settings_translation_file.cpp
-msgid "Crash message"
-msgstr "Ajali ujumbe"
-
-#: src/settings_translation_file.cpp
-msgid "A message to be displayed to all clients when the server crashes."
-msgstr "Ujumbe kuonyeshwa kwa wateja wote wakati seva yaanguka."
+msgid "Approximate (X,Y,Z) scale of fractal in nodes."
+msgstr "Kukadiria (X, Y, Z) kipimo cha fractal katika fundo."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
 msgstr "Uliza kuunganisha baada ya ajali"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Whether to ask clients to reconnect after a (Lua) crash.\n"
-"Set this to true if your server is set up to restart automatically."
+msgid "Automaticaly report to the serverlist."
+msgstr "Automaticaly ripoti ya serverlist."
+
+#: src/settings_translation_file.cpp
+msgid "Autorun key"
+msgstr "Autorun ufunguo"
+
+#: src/settings_translation_file.cpp
+msgid "Backward key"
+msgstr "Ufunguo wa nyuma"
+
+#: src/settings_translation_file.cpp
+msgid "Base terrain height"
+msgstr "Mandhari ya msingi urefu"
+
+#: src/settings_translation_file.cpp
+msgid "Basic"
+msgstr "Msingi"
+
+#: src/settings_translation_file.cpp
+msgid "Basic Privileges"
+msgstr "Haki za msingi"
+
+#: src/settings_translation_file.cpp
+msgid "Bilinear filtering"
+msgstr "Uchujaji wa bilinear"
+
+#: src/settings_translation_file.cpp
+msgid "Bind address"
+msgstr "Kumfunga anwani"
+
+#: src/settings_translation_file.cpp
+msgid "Bits per pixel (aka color depth) in fullscreen mode."
 msgstr ""
-"Kama kuuliza wateja kuunganisha baada (Lua) ajali.\n"
-"Seti hii kweli kama seva yako ni kuanzisha kuwasha upya otomatiki."
+"Biti kwa pikseli (a.k.a rangi kina) katika hali-tumizi ya skrini nzima."
 
 #: src/settings_translation_file.cpp
-msgid "Active object send range"
-msgstr "Kiolwa amilifu Tuma masafa"
+msgid "Build inside player"
+msgstr "Kujenga ndani ya mchezaji"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"From how far clients know about objects, stated in mapblocks (16 nodes)."
-msgstr ""
-"Kutoka wateja mbali kiasi gani kujua kuhusu vitu, alisema katika mapblocks ("
-"fundo 16)."
+msgid "Builtin"
+msgstr "Pamoja"
 
 #: src/settings_translation_file.cpp
-msgid "Active block range"
-msgstr "Masafa ya fungu amilifu"
+msgid "Bumpmapping"
+msgstr "Bumpmapping"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"How large area of blocks are subject to the active block stuff, stated in "
-"mapblocks (16 nodes).\n"
-"In active blocks objects are loaded and ABMs run."
-msgstr ""
-"Jinsi ya eneo kubwa la vitalu ni chini ya fungu amilifu mambo, alisema "
-"katika mapblocks (fundo 16).\n"
-"Katika vitalu amilifu vitu ni kupakiwa na ABMs kukimbia."
+msgid "Camera smoothing"
+msgstr "Kamera unyooshaji"
 
 #: src/settings_translation_file.cpp
-msgid "Max block send distance"
-msgstr "Umbo la Max Tuma umbali"
+msgid "Camera smoothing in cinematic mode"
+msgstr "Kamera unyooshaji hali cinematic"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
-msgstr ""
-"Kutoka vitalu mbali jinsi hutumwa kwa wateja, alisema katika mapblocks ("
-"fundo 16)."
+msgid "Camera update toggle key"
+msgstr "Kibonye guro Usasishaji wa kamera"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum forceloaded blocks"
-msgstr "Forceloaded upeo vitalu"
+msgid "Cave noise #1"
+msgstr "Pango kelele #1"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum number of forceloaded mapblocks."
-msgstr "Namba ya juu ya forceloaded mapblocks."
+msgid "Cave noise #2"
+msgstr "Pango kelele #2"
 
 #: src/settings_translation_file.cpp
-msgid "Time send interval"
-msgstr "Wakati kutuma nafasi"
+msgid "Cave width"
+msgstr "Pango upana"
 
 #: src/settings_translation_file.cpp
-msgid "Interval of sending time of day to clients."
-msgstr "Muda wa kutuma wakati wa siku kwa wateja."
+msgid "Caves and tunnels form at the intersection of the two noises"
+msgstr "Fomu ya mapango na vichuguu katika makutano ya kila mbili"
 
 #: src/settings_translation_file.cpp
-msgid "Time speed"
-msgstr "Kasi ya muda"
+msgid "Chat key"
+msgstr "Ufunguo wa mazungumzo"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Controls length of day/night cycle.\n"
-"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
-"unchanged."
-msgstr ""
-"Vidhibiti vya urefu wa mzunguko wa siku/usiku.\n"
-"Mifano: 72 = 20 min, 360 = 4 min, 1 = 24 saa, 0 = anakaa siku/usiku/whatever "
-"unchanged."
+msgid "Chat toggle key"
+msgstr "Kibonye guro wa mazungumzo"
 
 #: src/settings_translation_file.cpp
-msgid "Map save interval"
-msgstr "Ramani hifadhi muda"
-
-#: src/settings_translation_file.cpp
-msgid "Interval of saving important changes in the world, stated in seconds."
-msgstr ""
-"Muda wa kuhifadhi mabadiliko muhimu katika ulimwengu, alisema katika sekunde."
-
-#: src/settings_translation_file.cpp
-msgid "Physics"
-msgstr "Fizikia"
-
-#: src/settings_translation_file.cpp
-msgid "Default acceleration"
-msgstr "Kichapuzi Chaguo-msingi"
-
-#: src/settings_translation_file.cpp
-msgid "Acceleration in air"
-msgstr "Kuongeza kasi katika hewa"
-
-#: src/settings_translation_file.cpp
-msgid "Fast mode acceleration"
-msgstr "Kuongeza kasi hali ya haraka"
-
-#: src/settings_translation_file.cpp
-msgid "Walking speed"
-msgstr "Kutembea kasi"
-
-#: src/settings_translation_file.cpp
-msgid "Crouch speed"
-msgstr "Ingia kasi"
-
-#: src/settings_translation_file.cpp
-msgid "Fast mode speed"
-msgstr "Kasi ya hali ya haraka"
-
-#: src/settings_translation_file.cpp
-msgid "Climbing speed"
-msgstr "Kasi ya upandaji"
-
-#: src/settings_translation_file.cpp
-msgid "Jumping speed"
-msgstr "Kuruka kasi"
-
-#: src/settings_translation_file.cpp
-msgid "Descending speed"
-msgstr "Kushuka kasi"
-
-#: src/settings_translation_file.cpp
-msgid "Liquid fluidity"
-msgstr "Fluidity kioevu"
-
-#: src/settings_translation_file.cpp
-msgid "Liquid fluidity smoothing"
-msgstr "Fluidity kioevu unyooshaji"
-
-#: src/settings_translation_file.cpp
-msgid "Liquid sink"
-msgstr "Kuzama kioevu"
-
-#: src/settings_translation_file.cpp
-msgid "Gravity"
-msgstr "Mvutano"
-
-#: src/settings_translation_file.cpp
-msgid "Deprecated Lua API handling"
-msgstr "Deprecated Lua API utunzaji"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Handling for deprecated lua api calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
-"-    error: abort on usage of deprecated call (suggested for mod developers)."
-msgstr ""
-"Utunzaji kwa deprecated lua ya API: - Rithi: (jaribu kwa) mimic zamani tabia "
-"(chaguo-msingi kwa ajili ya kutolewa).\n"
-"-logi: kuiga na kuingia backtrace wa deprecated wito (chaguo-msingi kwa "
-"ajili ya rekebishi).\n"
-"-Kosa: tusiseme juu ya matumizi ya simu deprecated (alipendekeza kwa "
-"watengenezaji Moduli)."
-
-#: src/settings_translation_file.cpp
-msgid "Max. clearobjects extra blocks"
-msgstr "Max. clearobjects vitalu vya ziada"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Number of extra blocks that can be loaded by /clearobjects at once.\n"
-"This is a trade-off between sqlite transaction overhead and\n"
-"memory consumption (4096=100MB, as a rule of thumb)."
-msgstr ""
-"Idadi ya vitalu ziada ambayo inaweza kupakiwa na /clearobjects mara moja.\n"
-"Hii ni mikinzano kati sqlite shughuli uendeshaji na matumizi ya kumbukumbu ("
-"4096 = 100 MB, kama kanuni ya thumb)."
-
-#: src/settings_translation_file.cpp
-msgid "Unload unused server data"
-msgstr "Wakipakua zisizotumika seva ya data"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"How much the server will wait before unloading unused mapblocks.\n"
-"Higher value is smoother, but will use more RAM."
-msgstr ""
-"Seva kiasi kusubiri kabla ya kupakua mapblocks zisizotumika.\n"
-"Thamani ya juu zaidi ni laini, lakini kutumia RAM zaidi."
-
-#: src/settings_translation_file.cpp
-msgid "Maximum objects per block"
-msgstr "Vipengee juu kwa kila fungu"
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of statically stored objects in a block."
-msgstr "Namba ya juu ya vipengee statically kuhifadhiwa katika umbo la."
-
-#: src/settings_translation_file.cpp
-msgid "Synchronous SQLite"
-msgstr "SQLite Uvingirizi"
-
-#: src/settings_translation_file.cpp
-msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
-msgstr "Ona http://www.sqlite.org/pragma.html#pragma_synchronous"
-
-#: src/settings_translation_file.cpp
-msgid "Dedicated server step"
-msgstr "Hatua ya seva ya kujitolea"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over network."
-msgstr ""
-"Urefu wa alama ya tiki seva na nafasi ambayo vitu ni kwa ujumla kusasaishwa "
-"kwenye mtandao."
-
-#: src/settings_translation_file.cpp
-msgid "Active Block Management interval"
-msgstr "Nafasi kazi ya usimamizi wa umbo"
-
-#: src/settings_translation_file.cpp
-msgid "Time in between active block management cycles"
-msgstr "Muda kati ya mizunguko ya usimamizi ya fungu amilifu"
-
-#: src/settings_translation_file.cpp
-msgid "Active Block Modifier interval"
-msgstr "Amilifu fungu Kigeuza nafasi"
-
-#: src/settings_translation_file.cpp
-msgid "Length of time between ABM execution cycles"
-msgstr "Urefu wa muda kati ya ABM utekelezaji mizunguko"
-
-#: src/settings_translation_file.cpp
-msgid "NodeTimer interval"
-msgstr "Nafasi ya NodeTimer"
-
-#: src/settings_translation_file.cpp
-msgid "Length of time between NodeTimer execution cycles"
-msgstr "Urefu wa muda kati ya mzunguko wa utekelezaji wa NodeTimer"
-
-#: src/settings_translation_file.cpp
-msgid "Ignore world errors"
-msgstr "Kupuuza makosa ya ulimwengu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, invalid world data won't cause the server to shut down.\n"
-"Only enable this if you know what you are doing."
-msgstr ""
-"Ikiwa imewezeshwa, data ya dunia batili si kusababisha seva kuzima.\n"
-"Tu kuwezesha hii kama unajua nini unafanya."
-
-#: src/settings_translation_file.cpp
-msgid "Liquid loop max"
-msgstr "Kitanzi kioevu upeo"
-
-#: src/settings_translation_file.cpp
-msgid "Max liquids processed per step."
-msgstr "Max viowevu kusindika kwa kila hatua."
-
-#: src/settings_translation_file.cpp
-msgid "Liquid queue purge time"
-msgstr "Wakati wa usafishaji wa foleni ya kioevu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The time (in seconds) that the liquids queue may grow beyond processing\n"
-"capacity until an attempt is made to decrease its size by dumping old queue\n"
-"items.  A value of 0 disables the functionality."
-msgstr ""
-"Muda (katika sekunde) kuwa foleni ya viowevu inaweza kukua zaidi usindikaji "
-"uwezo hadi jaribio ni alifanya kupungua ukubwa wake na utupaji vipengee "
-"kongwe ya foleni.  Thamani ya 0 Hulemaza utendaji."
-
-#: src/settings_translation_file.cpp
-msgid "Liquid update tick"
-msgstr "Pata sasishi kioevu"
-
-#: src/settings_translation_file.cpp
-msgid "Liquid update interval in seconds."
-msgstr "Sasisha kioevu nafasi katika sekunde."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen name"
-msgstr "Mwandishi ramani jina"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Name of map generator to be used when creating a new world.\n"
-"Creating a world in the main menu will override this."
-msgstr ""
-"Jina la ramani jenereta kutumika wakati wa kuunda dunia mpya.\n"
-"Kujenga ulimwengu katika Menyu kuu itakuwa vinabatilisha hii."
-
-#: src/settings_translation_file.cpp
-msgid "Water level"
-msgstr "Kiwango cha maji"
-
-#: src/settings_translation_file.cpp
-msgid "Water surface level of the world."
-msgstr "Maji ngazi ya uso wa dunia."
-
-#: src/settings_translation_file.cpp
-msgid "Max block generate distance"
-msgstr "Umbo la Max kuzalisha umbali"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"From how far blocks are generated for clients, stated in mapblocks (16 "
-"nodes)."
-msgstr ""
-"Kutoka vitalu mbali kiasi gani hutolewa kwa wateja, alisema katika mapblocks "
-"(fundo 16)."
-
-#: src/settings_translation_file.cpp
-msgid "Map generation limit"
-msgstr "Kikomo cha kizazi cha ramani"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Where the map generator stops.\n"
-"Please note:\n"
-"-    Limited to 31000 (setting above has no effect)\n"
-"-    The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n"
-"-    Those groups have an offset of -32, -32 nodes from the origin.\n"
-"-    Only groups which are within the map_generation_limit are generated"
-msgstr ""
-"Ambapo jenereta ramani hukomesha.\n"
-"Tafadhali kumbuka: - mdogo kwa 31000 (kipimo hapo juu ina athari) - jenereta "
-"ramani kazi katika makundi ya 80 x 80 x 80 fundo (5 x 5 x 5 MapBlocks).\n"
-"-Vikundi hivyo kuwa nje ya uwekaji wa-32,-32 fundo kutoka asili.\n"
-"-Tu vikundi vilivyo ndani ya map_generation_limit ni yanayotokana"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flags"
-msgstr "Bendera ya Mwandishi ramani"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Global map generation attributes.\n"
-"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
-"and junglegrass, in all other mapgens this flag controls all decorations.\n"
-"Flags that are not specified in the flag string are not modified from the "
-"default.\n"
-"Flags starting with 'no' are used to explicitly disable them."
-msgstr ""
-"Ramani ya kimataifa kizazi sifa.\n"
-"Katika Mwandishi ramani v6 bendera ya 'kienyeji' udhibiti mapambo yote "
-"isipokuwa miti na junglegrass, katika mapgens mengine yote bendera hii "
-"udhibiti mapambo yote.\n"
-"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
-"kutoka chaguo-msingi.\n"
-"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
-
-#: src/settings_translation_file.cpp
-msgid "Chunk size"
-msgstr "Ukubwa wa fungu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 "
-"nodes)."
-msgstr ""
-"Ukubwa wa kikidondoka kutengenezwa mara kwa mwandishi ramani, katika "
-"mapblocks (fundo 16)."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen debug"
-msgstr "Utatuaji wa Mwandishi ramani"
-
-#: src/settings_translation_file.cpp
-msgid "Dump the mapgen debug infos."
-msgstr "Bwaga mwandishi ramani rekebishi infos."
-
-#: src/settings_translation_file.cpp
-msgid "Absolute limit of emerge queues"
-msgstr "Kikomo halisi ya foleni ya emerge"
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of blocks that can be queued for loading."
-msgstr ""
-"Namba ya juu ya vitalu kwamba unaweza kwenye foleni kwa ajili ya kupakia."
-
-#: src/settings_translation_file.cpp
-msgid "Limit of emerge queues on disk"
-msgstr "Kikomo ya foleni emerge kwenye diski"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of blocks to be queued that are to be loaded from file.\n"
-"Set to blank for an appropriate amount to be chosen automatically."
-msgstr ""
-"Namba ya juu ya vitalu kwa kuwa kwenye foleni kwamba ni kupakiwa kutoka "
-"faili.\n"
-"Seti kwa wazi kwa kiasi sahihi ili uweze kuchaguliwa moja kwa moja."
-
-#: src/settings_translation_file.cpp
-msgid "Limit of emerge queues to generate"
-msgstr "Kikomo ya foleni emerge kuzalisha"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of blocks to be queued that are to be generated.\n"
-"Set to blank for an appropriate amount to be chosen automatically."
-msgstr ""
-"Namba ya juu ya vitalu kwa kuwa kwenye foleni kwamba ni kutengenezwa.\n"
-"Seti kwa wazi kwa kiasi sahihi ili uweze kuchaguliwa moja kwa moja."
-
-#: src/settings_translation_file.cpp
-msgid "Number of emerge threads"
-msgstr "Idadi ya nyuzi emerge"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Number of emerge threads to use. Make this field blank, or increase this "
-"number\n"
-"to use multiple threads. On multiprocessor systems, this will improve mapgen "
-"speed greatly\n"
-"at the cost of slightly buggy caves."
-msgstr ""
-"Idadi ya nyuzi emerge kutumia. Kufanya hii shamba tupu, au kuongeza idadi "
-"hii kutumia nyuzi nyingi. Kwenye mifumo ya multiprocessor, hii itasaidia "
-"kuongeza kasi ya mwandishi ramani sana wanatengeneza mapango buggy kidogo."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen biome heat noise parameters"
-msgstr "Mwandishi ramani biome joto kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Noise parameters for biome API temperature, humidity and biome blend."
-msgstr "Kelele vigezo vya biome API joto, unyevu na biome mchanganyiko."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen heat blend noise parameters"
-msgstr "Mwandishi ramani joto mchanganyiko kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen biome humidity noise parameters"
-msgstr "Mwandishi ramani biome unyevu kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen biome humidity blend noise parameters"
-msgstr "Mwandishi ramani biome unyevu mchanganyiko kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5"
-msgstr "Mwandishi ramani v5"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 cave width"
-msgstr "Mwandishi ramani v5 pango upana"
-
-#: src/settings_translation_file.cpp
-msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr "Vidhibiti vya upana wa vichuguu, thamani ndogo huunda vichuguu pana."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 filler depth noise parameters"
-msgstr "Mwandishi ramani v5 filler kina kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 factor noise parameters"
-msgstr "Mwandishi ramani v5 sababu kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 height noise parameters"
-msgstr "Mwandishi ramani v5 urefu kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 cave1 noise parameters"
-msgstr "Mwandishi ramani v5 cave1 kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v5 cave2 noise parameters"
-msgstr "Mwandishi ramani v5 cave2 kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6"
-msgstr "Mwandishi ramani v6"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 flags"
-msgstr "Mwandishi ramani v6 bendera"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen v6.\n"
-"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
-"flag is ignored.\n"
-"Flags that are not specified in the flag string are not modified from the "
-"default.\n"
-"Flags starting with 'no' are used to explicitly disable them."
-msgstr ""
-"Ramani kizazi sifa maalum ya Mwandishi ramani v6.\n"
-"Wakati snowbiomes vimewezeshwa misitu otomatiki imewezeshwa, bendera ya "
-"'misitu' ni kupuuzwa.\n"
-"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
-"kutoka chaguo-msingi.\n"
-"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 desert frequency"
-msgstr "Mwandishi ramani v6 jangwa marudio"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Controls size of deserts and beaches in Mapgen v6.\n"
-"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
-msgstr ""
-"Vidhibiti ukubwa wa majangwa na fukwe katika Mwandishi ramani v6.\n"
-"Wakati snowbiomes vimewezeshwa 'mgv6_freq_desert' ni kupuuzwa."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 beach frequency"
-msgstr "Mwandishi ramani v6 pwani marudio"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 terrain base noise parameters"
-msgstr "Mwandishi ramani v6 ardhi kelele msingi vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 terrain altitude noise parameters"
-msgstr "Mwinuko wa ardhi ya Mwandishi ramani v6 kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 steepness noise parameters"
-msgstr "Mwandishi ramani v6 mwinuko kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 height select noise parameters"
-msgstr "Mwandishi ramani v6 urefu Teua vigezo kelele"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 mud noise parameters"
-msgstr "Mwandishi ramani v6 matope kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 beach noise parameters"
-msgstr "Mwandishi ramani v6 pwani kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 biome noise parameters"
-msgstr "Mwandishi ramani v6 biome kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 cave noise parameters"
-msgstr "Mwandishi ramani v6 pango kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 humidity noise parameters"
-msgstr "Mwandishi ramani v6 unyevu kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 trees noise parameters"
-msgstr "Mwandishi ramani v6 miti kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v6 apple trees noise parameters"
-msgstr "Mwandishi ramani v6 apple miti kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7"
-msgstr "Mwandishi ramani v7"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 flags"
-msgstr "Mwandishi ramani v7 bendera"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen v7.\n"
-"The 'ridges' flag controls the rivers.\n"
-"Flags that are not specified in the flag string are not modified from the "
-"default.\n"
-"Flags starting with 'no' are used to explicitly disable them."
-msgstr ""
-"Ramani kizazi sifa maalum kwa Mwandishi ramani v7.\n"
-"Bendera ya 'matuta' udhibiti mito.\n"
-"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
-"kutoka chaguo-msingi.\n"
-"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 cave width"
-msgstr "Mwandishi ramani v7 pango upana"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 terrain base noise parameters"
-msgstr "Mwandishi ramani v7 ardhi kelele msingi vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 terrain altitude noise parameters"
-msgstr "Mwandishi ramani v7 ardhi mwinuko kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 terrain persistation noise parameters"
-msgstr "Mwandishi ramani v7 ardhi persistation kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 height select noise parameters"
-msgstr "Mwandishi ramani v7 urefu Teua vigezo kelele"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 filler depth noise parameters"
-msgstr "Mwandishi ramani v7 filler kina kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 mount height noise parameters"
-msgstr "Mwandishi ramani v7 mlima urefu kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 ridge water noise parameters"
-msgstr "Mwandishi ramani v7 tuta maji kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 mountain noise parameters"
-msgstr "Mwandishi ramani v7 mlima kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 ridge noise parameters"
-msgstr "Mwandishi ramani v7 tuta kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 cave1 noise parameters"
-msgstr "Mwandishi ramani v7 cave1 kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen v7 cave2 noise parameters"
-msgstr "Mwandishi ramani v7 cave2 kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat"
-msgstr "Mwandishi ramani gorofa"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat flags"
-msgstr "Mwandishi ramani gorofa bendera"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen flat.\n"
-"Occasional lakes and hills can be added to the flat world.\n"
-"Flags that are not specified in the flag string are not modified from the "
-"default.\n"
-"Flags starting with 'no' are used to explicitly disable them."
-msgstr ""
-"Ramani kizazi sifa maalum kwa Mwandishi ramani gorofa.\n"
-"Maziwa mara kwa mara na vilima vinaweza kuongezwa kwa ulimwengu gorofa.\n"
-"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
-"kutoka chaguo-msingi.\n"
-"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat ground level"
-msgstr "Mwandishi ramani gorofa ngazi ya chini"
-
-#: src/settings_translation_file.cpp
-msgid "Y of flat ground."
-msgstr "Y ya ardhi tambarare."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat large cave depth"
-msgstr "Mwandishi ramani pango kubwa gorofa kina"
-
-#: src/settings_translation_file.cpp
-msgid "Y of upper limit of large pseudorandom caves."
-msgstr "Y ya upper kikomo ya kubwa pseudorandom cellars."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat cave width"
-msgstr "Mwandishi ramani pango gorofa upana"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat lake threshold"
-msgstr "Mwandishi ramani ziwa gorofa kizingiti"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Terrain noise threshold for lakes.\n"
-"Controls proportion of world area covered by lakes.\n"
-"Adjust towards 0.0 for a larger proportion."
-msgstr ""
-"Ardhi kelele kizingiti kwa ajili ya maziwa.\n"
-"Vidhibiti vya uwiano wa dunia eneo lililofunikwa na maziwa.\n"
-"Rekebisha kuelekea 0.0 kwa sehemu kubwa."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat lake steepness"
-msgstr "Mwandishi ramani ziwa gorofa mwinuko"
-
-#: src/settings_translation_file.cpp
-msgid "Controls steepness/depth of lake depressions."
-msgstr "Udhibiti mwinuko/kina cha ziwa depressions."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat hill threshold"
-msgstr "Kilele cha mlima gorofa Mwandishi ramani"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Terrain noise threshold for hills.\n"
-"Controls proportion of world area covered by hills.\n"
-"Adjust towards 0.0 for a larger proportion."
-msgstr ""
-"Ardhi kelele kizingiti kwa milima.\n"
-"Vidhibiti vya uwiano wa dunia eneo lililofunikwa na milima.\n"
-"Rekebisha kuelekea 0.0 kwa sehemu kubwa."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat hill steepness"
-msgstr "Mwandishi ramani gorofa kilima mwinuko"
-
-#: src/settings_translation_file.cpp
-msgid "Controls steepness/height of hills."
-msgstr "Udhibiti mwinuko/urefu wa milima."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat terrain noise parameters"
-msgstr "Mwandishi ramani ardhi tambarare kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Determines terrain shape.\n"
-"The 3 numbers in brackets control the scale of the\n"
-"terrain, the 3 numbers should be identical."
-msgstr ""
-"Huamua umbo wa ardhi.\n"
-"Namba 3 katika mabano kudhibiti ukubwa wa ardhi, namba 3 lazima kufanana."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat filler depth noise parameters"
-msgstr "Filler wa gorofa ya Mwandishi ramani kina kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat cave1 noise parameters"
-msgstr "Mwandishi ramani cave1 za gorofa kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen flat cave2 noise parameters"
-msgstr "Mwandishi ramani cave2 za gorofa kelele vigezo"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal"
-msgstr "Fractal ya Mwandishi ramani"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal cave width"
-msgstr "Mwandishi ramani fractal pango upana"
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal fractal"
-msgstr "Mwandishi ramani fractal fractal"
+msgid "Chatcommands"
+msgstr "Amri majadiliano"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4040,8 +1574,951 @@ msgstr ""
 "18 = 4 D seti ya julia \"Mandelbulb\"."
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal iterations"
-msgstr "Mwandishi ramani fractal Marudiorudio"
+msgid "Chunk size"
+msgstr "Ukubwa wa fungu"
+
+#: src/settings_translation_file.cpp
+msgid "Cinematic mode"
+msgstr "Hali ya cinematic"
+
+#: src/settings_translation_file.cpp
+msgid "Cinematic mode key"
+msgstr "Hali ya cinematic ufunguo"
+
+#: src/settings_translation_file.cpp
+msgid "Clean transparent textures"
+msgstr "Unamu angavu safi"
+
+#: src/settings_translation_file.cpp
+msgid "Client and Server"
+msgstr "Mteja na seva"
+
+#: src/settings_translation_file.cpp
+msgid "Climbing speed"
+msgstr "Kasi ya upandaji"
+
+#: src/settings_translation_file.cpp
+msgid "Cloud height"
+msgstr "Urefu wa wingu"
+
+#: src/settings_translation_file.cpp
+msgid "Cloud radius"
+msgstr "Wingu eneo"
+
+#: src/settings_translation_file.cpp
+msgid "Clouds"
+msgstr "Mawingu"
+
+#: src/settings_translation_file.cpp
+msgid "Clouds are a client side effect."
+msgstr "Mawingu ni mteja upande athari."
+
+#: src/settings_translation_file.cpp
+msgid "Clouds in menu"
+msgstr "Mawingu katika Menyu"
+
+#: src/settings_translation_file.cpp
+msgid "Colored fog"
+msgstr "Ukungu wa rangi"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+"Iliyotenganishwa orodha ya mods kwamba wanaruhusiwa kufikia HTTP APIs, "
+"ambayo kuwaruhusu kupakia na kupakua data/toka kwenye tovuti."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
+msgstr ""
+"Iliyotenganishwa orodha ya mods kuaminika kwamba wanaruhusiwa kufikia kazi "
+"zisizo hata wakati usalama Moduli ni juu (kupitia "
+"request_insecure_environment())."
+
+#: src/settings_translation_file.cpp
+msgid "Command key"
+msgstr "Ufunguo wa amri"
+
+#: src/settings_translation_file.cpp
+msgid "Connect glass"
+msgstr "Kuunganisha kioo"
+
+#: src/settings_translation_file.cpp
+msgid "Connect to external media server"
+msgstr "Unganisha kwenye seva ya midia za nje"
+
+#: src/settings_translation_file.cpp
+msgid "Connects glass if supported by node."
+msgstr "Huunganisha kioo kama mkono na fundo."
+
+#: src/settings_translation_file.cpp
+msgid "Console alpha"
+msgstr "Alfa ya Kiweko"
+
+#: src/settings_translation_file.cpp
+msgid "Console color"
+msgstr "Rangi ya Kiweko"
+
+#: src/settings_translation_file.cpp
+msgid "Console key"
+msgstr "Muhimu ya Kiweko"
+
+#: src/settings_translation_file.cpp
+msgid "Continuous forward"
+msgstr "Kuendelea mbele"
+
+#: src/settings_translation_file.cpp
+msgid "Continuous forward movement (only used for testing)."
+msgstr "Harakati endelevu mbele (kutumika tu kwa ajili ya kupima)."
+
+#: src/settings_translation_file.cpp
+msgid "Controls"
+msgstr "Vidhibiti"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls length of day/night cycle.\n"
+"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
+"unchanged."
+msgstr ""
+"Vidhibiti vya urefu wa mzunguko wa siku/usiku.\n"
+"Mifano: 72 = 20 min, 360 = 4 min, 1 = 24 saa, 0 = anakaa siku/usiku/whatever "
+"unchanged."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls size of deserts and beaches in Mapgen v6.\n"
+"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
+msgstr ""
+"Vidhibiti ukubwa wa majangwa na fukwe katika Mwandishi ramani v6.\n"
+"Wakati snowbiomes vimewezeshwa 'mgv6_freq_desert' ni kupuuzwa."
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/depth of lake depressions."
+msgstr "Udhibiti mwinuko/kina cha ziwa depressions."
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/height of hills."
+msgstr "Udhibiti mwinuko/urefu wa milima."
+
+#: src/settings_translation_file.cpp
+msgid "Controls width of tunnels, a smaller value creates wider tunnels."
+msgstr "Vidhibiti vya upana wa vichuguu, thamani ndogo huunda vichuguu pana."
+
+#: src/settings_translation_file.cpp
+msgid "Crash message"
+msgstr "Ajali ujumbe"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable lava features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+"Huunda lava haitabiriki sifa katika mapango.\n"
+"Haya kufanya madini vigumu. Sifuri Hulemaza yao. (0-10)"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable water features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+"Huunda maji haitabiriki sifa katika mapango.\n"
+"Haya kufanya madini vigumu. Sifuri Hulemaza yao. (0-10)"
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha"
+msgstr "Crosshair Alfa"
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgstr "Crosshair Alfa (opaqueness kati ya 0 na 255)."
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color"
+msgstr "Rangi ya crosshair"
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color (R,G,B)."
+msgstr "Rangi ya crosshair (R, G, B)."
+
+#: src/settings_translation_file.cpp
+msgid "Crouch speed"
+msgstr "Ingia kasi"
+
+#: src/settings_translation_file.cpp
+msgid "DPI"
+msgstr "DPI"
+
+#: src/settings_translation_file.cpp
+msgid "Damage"
+msgstr "Uharibifu"
+
+#: src/settings_translation_file.cpp
+msgid "Debug info toggle key"
+msgstr "Rekebisha taarifa kibonye"
+
+#: src/settings_translation_file.cpp
+msgid "Debug log level"
+msgstr "Rekebisha kiwango cha logi"
+
+#: src/settings_translation_file.cpp
+msgid "Dedicated server step"
+msgstr "Hatua ya seva ya kujitolea"
+
+#: src/settings_translation_file.cpp
+msgid "Default acceleration"
+msgstr "Kichapuzi Chaguo-msingi"
+
+#: src/settings_translation_file.cpp
+msgid "Default game"
+msgstr "Chaguo-msingi mchezo"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default game when creating a new world.\n"
+"This will be overridden when creating a world from the main menu."
+msgstr ""
+"Chaguo-msingi mchezo wakati wa kuunda dunia mpya.\n"
+"Hii itakuwa kuwa kuuharibu wakati kutengeneza ulimwengu kutoka kwenye menyu "
+"kuu."
+
+#: src/settings_translation_file.cpp
+msgid "Default password"
+msgstr "Nywila ya chaguo-msingi"
+
+#: src/settings_translation_file.cpp
+msgid "Default privileges"
+msgstr "Upendeleo wa chaguo-msingi"
+
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr "Umbizo wa ripoti wa chaguo-msingi"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default timeout for cURL, stated in milliseconds.\n"
+"Only has an effect if compiled with cURL."
+msgstr ""
+"Chaguo-msingi muda wa kuisha kwa cURL, alisema katika milisekunde.\n"
+"Tu ina athari kama alikusanya na Mkunjo."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines sampling step of texture.\n"
+"A higher value results in smoother normal maps."
+msgstr ""
+"Inafasili hatua ya sampuli ya unamu.\n"
+"Thamani ya juu zaidi matokeo katika ramani ya laini ya kawaida."
+
+#: src/settings_translation_file.cpp
+msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
+msgstr ""
+"Inafasili umbali wa uhamisho wa mchezaji maximal katika vitalu (0 = ukomo)."
+
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr "Kuchelewa katika kutuma vitalu baada ya jengo"
+
+#: src/settings_translation_file.cpp
+msgid "Delay showing tooltips, stated in milliseconds."
+msgstr "Kuchelewa kuonyesha vidokezozana, alisema katika milisekunde."
+
+#: src/settings_translation_file.cpp
+msgid "Deprecated Lua API handling"
+msgstr "Deprecated Lua API utunzaji"
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find large caves."
+msgstr "Kina chini ambayo utapata mapango kubwa."
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find massive caves."
+msgstr "Kina chini ambayo utapata mapango mkubwa."
+
+#: src/settings_translation_file.cpp
+msgid "Descending speed"
+msgstr "Kushuka kasi"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Description of server, to be displayed when players join and in the "
+"serverlist."
+msgstr ""
+"Maelezo ya seva, kuonyeshwa wakati wachezaji kujiunga na katika serverlist "
+"ya."
+
+#: src/settings_translation_file.cpp
+msgid "Desynchronize block animation"
+msgstr "Desynchronize umbo la uhuishaji"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Determines terrain shape.\n"
+"The 3 numbers in brackets control the scale of the\n"
+"terrain, the 3 numbers should be identical."
+msgstr ""
+"Huamua umbo wa ardhi.\n"
+"Namba 3 katika mabano kudhibiti ukubwa wa ardhi, namba 3 lazima kufanana."
+
+#: src/settings_translation_file.cpp
+msgid "Disable anticheat"
+msgstr "Lemaza anticheat"
+
+#: src/settings_translation_file.cpp
+msgid "Disable escape sequences"
+msgstr "Lemaza kutoroka mwandamano"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Disable escape sequences, e.g. chat coloring.\n"
+"Use this if you want to run a server with pre-0.4.14 clients and you want to "
+"disable\n"
+"the escape sequences generated by mods."
+msgstr ""
+"Lemaza mwandamano wa kutoroka, k.m kuzungumza kuchorea.\n"
+"Tumia hii kama unataka kuendesha seva na wateja wa awali-0.4.14 na unataka "
+"kulemaza mwandamano kutoroka yanayotokana na mods."
+
+#: src/settings_translation_file.cpp
+msgid "Disallow empty passwords"
+msgstr "Usiruhusu nywila tupu"
+
+#: src/settings_translation_file.cpp
+msgid "Domain name of server, to be displayed in the serverlist."
+msgstr "Kikoa jina la seva, kuonyeshwa katika serverlist ya."
+
+#: src/settings_translation_file.cpp
+msgid "Double tap jump for fly"
+msgstr "Mara mbili ya bomba kuruka kwa kuruka"
+
+#: src/settings_translation_file.cpp
+msgid "Double-tapping the jump key toggles fly mode."
+msgstr "Mbili-tapping ufunguo wa kuruka Inatogoa hali ya kuruka."
+
+#: src/settings_translation_file.cpp
+msgid "Drop item key"
+msgstr "Tone kipengee muhimu"
+
+#: src/settings_translation_file.cpp
+msgid "Dump the mapgen debug infos."
+msgstr "Bwaga mwandishi ramani rekebishi infos."
+
+#: src/settings_translation_file.cpp
+msgid "Enable Joysticks"
+msgstr "Wezesha vifimbocheza"
+
+#: src/settings_translation_file.cpp
+msgid "Enable VBO"
+msgstr "Wezesha VBO"
+
+#: src/settings_translation_file.cpp
+msgid "Enable mod security"
+msgstr "Kuwezesha usalama Moduli"
+
+#: src/settings_translation_file.cpp
+msgid "Enable players getting damage and dying."
+msgstr "Wezesha wachezaji kupata uharibifu na kufa."
+
+#: src/settings_translation_file.cpp
+msgid "Enable random user input (only used for testing)."
+msgstr "Wezesha ingizo la mtumiaji nasibu (kutumika tu kwa ajili ya kupima)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable smooth lighting with simple ambient occlusion.\n"
+"Disable for speed or for different looks."
+msgstr ""
+"Wezesha taa laini na rahisi iliyoko occlusion.\n"
+"Lemaza kwa kasi au kwa ajili ya inaonekana tofauti."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable to disallow old clients from connecting.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting."
+msgstr ""
+"Wezesha Usiruhusu wateja wa zamani kutoka kuunganisha.\n"
+"Wateja wakubwa ni patanifu katika maana ya kwamba wao si mapenzi ajali "
+"wakati wa kuunganisha kwenye seva mpya, lakini inaweza kusaidia nduni zote "
+"mpya ambayo ni kutarajia."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable usage of remote media server (if provided by server).\n"
+"Remote servers offer a significantly faster way to download media (e.g. "
+"textures)\n"
+"when connecting to the server."
+msgstr ""
+"Kuwezesha matumizi ya seva ya midia ya mbali (kama zinazotolewa na seva).\n"
+"Seva ya mbali kutoa njia kwa kiasi kikubwa kasi ya kupakua midia (k.m unamu) "
+"wakati wa kuunganisha kwenye seva."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable/disable running an IPv6 server.  An IPv6 server may be restricted\n"
+"to IPv6 clients, depending on system configuration.\n"
+"Ignored if bind_address is set."
+msgstr ""
+"Wezesha/Lemaza kuendesha seva ya IPv6.  Seva ya IPv6 unaweza kuzuiliwa kwa "
+"wateja IPv6, kutegemea usanidi mfumo.\n"
+"Kupuuzwa kama bind_address kuweka."
+
+#: src/settings_translation_file.cpp
+msgid "Enables animation of inventory items."
+msgstr "Huwezesha uhuishaji wa vitu inventering."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+"texture pack\n"
+"or need to be auto-generated.\n"
+"Requires shaders to be enabled."
+msgstr ""
+"Inawezesha bumpmapping kwa ajili ya unamu. Normalmaps haja iwekwe kwa pakiti "
+"ya unamu au haja ya kuwa yaliyozalishwa na otomatiki.\n"
+"Inahitaji shaders kwa kuwezeshwa."
+
+#: src/settings_translation_file.cpp
+msgid "Enables caching of facedir rotated meshes."
+msgstr "Huwezesha uwekaji kache kwa facedir Iliyozungushwa meshes."
+
+#: src/settings_translation_file.cpp
+msgid "Enables filmic tone mapping"
+msgstr "Huwezesha toni filmic ramani"
+
+#: src/settings_translation_file.cpp
+msgid "Enables minimap."
+msgstr "Inawezesha minimap."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables on the fly normalmap generation (Emboss effect).\n"
+"Requires bumpmapping to be enabled."
+msgstr ""
+"Huwezesha kwenye kizazi cha normalmap kuruka (Emboss athari).\n"
+"Inahitaji bumpmapping kwa kuwezeshwa."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables parallax occlusion mapping.\n"
+"Requires shaders to be enabled."
+msgstr ""
+"Huwezesha parallax occlusion uramanishi.\n"
+"Inahitaji shaders kwa kuwezeshwa."
+
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr "Injini ubainishaji wa data ya uchapaji nafasi"
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr "Mbinu ya chombo"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Experimental option, might cause visible spaces between blocks\n"
+"when set to higher number than 0."
+msgstr ""
+"Chaguo majaribio, inaweza kusababisha nafasi inayoonekana kati ya vitalu "
+"wakati kuweka namba ya juu zaidi kuliko 0."
+
+#: src/settings_translation_file.cpp
+msgid "FPS in pause menu"
+msgstr "Ramprogrammen katika Menyu ya mapumziko"
+
+#: src/settings_translation_file.cpp
+msgid "FSAA"
+msgstr "FSAA"
+
+#: src/settings_translation_file.cpp
+msgid "Fall bobbing"
+msgstr "Kuanguka bobbing"
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font"
+msgstr "Fonti amebadilisha"
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font shadow"
+msgstr "Fonti amebadilisha kivuli"
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font shadow alpha"
+msgstr "Fonti amebadilisha kivuli Alfa"
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font size"
+msgstr "Ukubwa fonti amebadilisha"
+
+#: src/settings_translation_file.cpp
+msgid "Fast key"
+msgstr "Ufunguo kasi"
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode acceleration"
+msgstr "Kuongeza kasi hali ya haraka"
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode speed"
+msgstr "Kasi ya hali ya haraka"
+
+#: src/settings_translation_file.cpp
+msgid "Fast movement"
+msgstr "Kutembea haraka"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Fast movement (via use key).\n"
+"This requires the \"fast\" privilege on the server."
+msgstr ""
+"Harakati haraka (kupitia matumizi muhimu).\n"
+"Hii inahitaji upendeleo \"haraka\" kwenye seva."
+
+#: src/settings_translation_file.cpp
+msgid "Field of view"
+msgstr "Uga wa Mwoneko"
+
+#: src/settings_translation_file.cpp
+msgid "Field of view for zoom"
+msgstr "Uga wa Mwoneko kwa ajili ya Kuza"
+
+#: src/settings_translation_file.cpp
+msgid "Field of view in degrees."
+msgstr "Uga wa Mwoneko katika nyuzi."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Field of view while zooming in degrees.\n"
+"This requires the \"zoom\" privilege on the server."
+msgstr ""
+"Uga wa Mwoneko ukikuza katika nyuzi.\n"
+"Hii inahitaji nafasi \"Kuza\" kwenye seva."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"File in client/serverlist/ that contains your favorite servers displayed in "
+"the Multiplayer Tab."
+msgstr ""
+"Faili katika mteja/serverlist/yenye seva zako Pendwa kuonyeshwa katika "
+"kichupo cha Multiplayer."
+
+#: src/settings_translation_file.cpp
+msgid "Filler Depth"
+msgstr "Kina ya Filler"
+
+#: src/settings_translation_file.cpp
+msgid "Filmic tone mapping"
+msgstr "Ramani ya toni filmic"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Filtered textures can blend RGB values with fully-transparent neighbors,\n"
+"which PNG optimizers usually discard, sometimes resulting in a dark or\n"
+"light edge to transparent textures.  Apply this filter to clean that up\n"
+"at texture load time."
+msgstr ""
+"Unamu kuchujwa wanaweza kujichanganya RGB thamani na majirani kikamilifu-"
+"uwazi, ambayo PNG optimizers kawaida Tupa, wakati mwingine kusababisha "
+"katika ukingo wa giza au mwanga angavu ya unamu.  Tekeleza Kichujio hii "
+"kusafisha kwamba wakati mzigo, unamu."
+
+#: src/settings_translation_file.cpp
+msgid "Filtering"
+msgstr "Uchujaji"
+
+#: src/settings_translation_file.cpp
+msgid "Fixed map seed"
+msgstr "Mbegu ya ramani fasta"
+
+#: src/settings_translation_file.cpp
+msgid "Fly key"
+msgstr "Kuruka ufunguo"
+
+#: src/settings_translation_file.cpp
+msgid "Flying"
+msgstr "Kuruka"
+
+#: src/settings_translation_file.cpp
+msgid "Fog"
+msgstr "Ukungu"
+
+#: src/settings_translation_file.cpp
+msgid "Fog toggle key"
+msgstr "Kibonye guro wa ukungu"
+
+#: src/settings_translation_file.cpp
+msgid "Font path"
+msgstr "Njia ya fonti"
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow"
+msgstr "Kivuli cha fonti"
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha"
+msgstr "Fonti kivuli Alfa"
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha (opaqueness, between 0 and 255)."
+msgstr "Fonti kivuli Alfa (opaqueness kati ya 0 na 255)."
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow offset, if 0 then shadow will not be drawn."
+msgstr "Fonti kivuli Sawazisha, kama 0 basi kivuli itakuwa kuchukuliwa."
+
+#: src/settings_translation_file.cpp
+msgid "Font size"
+msgstr "Ukubwa wa fonti"
+
+#: src/settings_translation_file.cpp
+msgid "Format of screenshots."
+msgstr "Umbizo la viwambo."
+
+#: src/settings_translation_file.cpp
+msgid "Forward key"
+msgstr "Ufunguo wa mbele"
+
+#: src/settings_translation_file.cpp
+msgid "Freetype fonts"
+msgstr "Fonti Freetype"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are generated for clients, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+"Kutoka vitalu mbali kiasi gani hutolewa kwa wateja, alisema katika mapblocks "
+"(fundo 16)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
+msgstr ""
+"Kutoka vitalu mbali jinsi hutumwa kwa wateja, alisema katika mapblocks "
+"(fundo 16)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far clients know about objects, stated in mapblocks (16 nodes)."
+msgstr ""
+"Kutoka wateja mbali kiasi gani kujua kuhusu vitu, alisema katika mapblocks "
+"(fundo 16)."
+
+#: src/settings_translation_file.cpp
+msgid "Full screen"
+msgstr "Kiwamba kizima"
+
+#: src/settings_translation_file.cpp
+msgid "Full screen BPP"
+msgstr "Skrini BPP"
+
+#: src/settings_translation_file.cpp
+msgid "Fullscreen mode."
+msgstr "Hali-tumizi ya skrini nzima."
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling"
+msgstr "GUI kurekebisha"
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter"
+msgstr "GUI kipimo Kichujio"
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter txr2img"
+msgstr "GUI kipimo Kichujio txr2img"
+
+#: src/settings_translation_file.cpp
+msgid "Gamma"
+msgstr "Gamma"
+
+#: src/settings_translation_file.cpp
+msgid "General"
+msgstr "Mkuu"
+
+#: src/settings_translation_file.cpp
+msgid "Generate normalmaps"
+msgstr "Kuzalisha normalmaps"
+
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr "Callbacks ya kimataifa"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Global map generation attributes.\n"
+"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
+"and junglegrass, in all other mapgens this flag controls all decorations.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+"Ramani ya kimataifa kizazi sifa.\n"
+"Katika Mwandishi ramani v6 bendera ya 'kienyeji' udhibiti mapambo yote "
+"isipokuwa miti na junglegrass, katika mapgens mengine yote bendera hii "
+"udhibiti mapambo yote.\n"
+"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
+"kutoka chaguo-msingi.\n"
+"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
+
+#: src/settings_translation_file.cpp
+msgid "Graphics"
+msgstr "Michoro"
+
+#: src/settings_translation_file.cpp
+msgid "Gravity"
+msgstr "Mvutano"
+
+#: src/settings_translation_file.cpp
+msgid "HTTP Mods"
+msgstr "HTTP Mods"
+
+#: src/settings_translation_file.cpp
+msgid "HUD toggle key"
+msgstr "HUD kibonye"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Handling for deprecated lua api calls:\n"
+"-    legacy: (try to) mimic old behaviour (default for release).\n"
+"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    error: abort on usage of deprecated call (suggested for mod developers)."
+msgstr ""
+"Utunzaji kwa deprecated lua ya API: - Rithi: (jaribu kwa) mimic zamani tabia "
+"(chaguo-msingi kwa ajili ya kutolewa).\n"
+"-logi: kuiga na kuingia backtrace wa deprecated wito (chaguo-msingi kwa "
+"ajili ya rekebishi).\n"
+"-Kosa: tusiseme juu ya matumizi ya simu deprecated (alipendekeza kwa "
+"watengenezaji Moduli)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+"Kuwa profiler instrument yenyewe: * Instrument kazi tupu.\n"
+"Hii makadirio vimezingirwa, kwamba instrumentation ni kuongeza (+ 1 kazi "
+"simu).\n"
+"* Chombo sampler kutumika ili kusasisha takwimu."
+
+#: src/settings_translation_file.cpp
+msgid "Height component of the initial window size."
+msgstr "Kijenzi cha urefu wa ukubwa cha kidirisha awali."
+
+#: src/settings_translation_file.cpp
+msgid "Height on which clouds are appearing."
+msgstr "Urefu ambayo mawingu ni kuonekana."
+
+#: src/settings_translation_file.cpp
+msgid "High-precision FPU"
+msgstr "FPU kuu-usahihi"
+
+#: src/settings_translation_file.cpp
+msgid "Homepage of server, to be displayed in the serverlist."
+msgstr "Homepage ya seva, kuonyeshwa katika serverlist ya."
+
+#: src/settings_translation_file.cpp
+msgid "How deep to make rivers"
+msgstr "Kina jinsi kufanya mito"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How large area of blocks are subject to the active block stuff, stated in "
+"mapblocks (16 nodes).\n"
+"In active blocks objects are loaded and ABMs run."
+msgstr ""
+"Jinsi ya eneo kubwa la vitalu ni chini ya fungu amilifu mambo, alisema "
+"katika mapblocks (fundo 16).\n"
+"Katika vitalu amilifu vitu ni kupakiwa na ABMs kukimbia."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How much the server will wait before unloading unused mapblocks.\n"
+"Higher value is smoother, but will use more RAM."
+msgstr ""
+"Seva kiasi kusubiri kabla ya kupakua mapblocks zisizotumika.\n"
+"Thamani ya juu zaidi ni laini, lakini kutumia RAM zaidi."
+
+#: src/settings_translation_file.cpp
+msgid "How wide to make rivers"
+msgstr "Upana gani kufanya mito"
+
+#: src/settings_translation_file.cpp
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 server"
+msgstr "IPv6 Seva"
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 support."
+msgstr "IPv6 msaada."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If FPS would go higher than this, limit it by sleeping\n"
+"to not waste CPU power for no benefit."
+msgstr ""
+"Kama Ramprogrammen angekwenda juu kuliko hii, kikomo kwa kulala si kupoteza "
+"nguvu ya CPU kwa faida yoyote."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If disabled \"use\" key is used to fly fast if both fly and fast mode are "
+"enabled."
+msgstr ""
+"Ikiwa kimelemazwa \"kutumia\" ufunguo ni kutumika kwa kuruka haraka kama "
+"hali-tumizi ya kuruka na ya haraka ni kuwezeshwa."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled together with fly mode, player is able to fly through solid "
+"nodes.\n"
+"This requires the \"noclip\" privilege on the server."
+msgstr ""
+"Kama kuwezeshwa pamoja na hali ya kuruka, mchezaji ni uwezo wa kuruka kwa "
+"fundo imara.\n"
+"Hii inahitaji upendeleo wa \"noclip\" kwenye seva."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
+"and descending."
+msgstr ""
+"Ikiwa imewezeshwa, ufunguo wa \"kutumia\" badala ya \"sneak\" ufunguo ni "
+"kutumika kwa ajili ya kupanda na kushuka."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, actions are recorded for rollback.\n"
+"This option is only read when server starts."
+msgstr ""
+"Ikiwa imewezeshwa, matendo ni kumbukumbu kwa ajili ya mserereko.\n"
+"Chaguo hili ni soma tu wakati wa kuanza kwa seva."
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, disable cheat prevention in multiplayer."
+msgstr "Ikiwa imewezeshwa, kulemaza uzuiaji wa soka katika multiplayer."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, invalid world data won't cause the server to shut down.\n"
+"Only enable this if you know what you are doing."
+msgstr ""
+"Ikiwa imewezeshwa, data ya dunia batili si kusababisha seva kuzima.\n"
+"Tu kuwezesha hii kama unajua nini unafanya."
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, new players cannot join with an empty password."
+msgstr "Ikiwa imewezeshwa, wachezaji wapya haiwezi kujiunga na nywila wazi."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, you can place blocks at the position (feet + eye level) where "
+"you stand.\n"
+"This is helpful when working with nodeboxes in small areas."
+msgstr ""
+"Ikiwa imewezeshwa, unaweza mahali vitalu katika nafasi (miguu + jicho "
+"kiwango) ambako kusimama.\n"
+"Hii ni kusaidia unapofanya kazi na nodeboxes katika maeneo madogo."
+
+#: src/settings_translation_file.cpp
+msgid "If this is set, players will always (re)spawn at the given position."
+msgstr "Kama hii ni kuweka, wachezaji mapenzi daima (re) spawn mahali fulani."
+
+#: src/settings_translation_file.cpp
+msgid "Ignore world errors"
+msgstr "Kupuuza makosa ya ulimwengu"
+
+#: src/settings_translation_file.cpp
+msgid "In-Game"
+msgstr "Katika mchezo"
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
+msgstr ""
+"Mazungumzo katika mchezo console mandharinyuma Alfa (opaqueness kati ya 0 na "
+"255)."
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background color (R,G,B)."
+msgstr "Mazungumzo katika mchezo console mandharinyuma rangi (R, G, B)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+"Chombo builtin.\n"
+"Hii ni kawaida tu zinazohitajika kwa wachangiaji wa msingi/builtin"
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chatcommands on registration."
+msgstr "Chombo chatcommands kwenye usajili."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+"Chombo mwito-rejeshi kimataifa kazi kwenye usajili.\n"
+"(kitu chochote unaweza kupita kwa kazi minetest.register_*())"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr "Ala ya kazi hatua ya Modifiers Amilifu wa fungu kwenye usajili."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr "Ala ya kazi hatua ya kupakia fungu Modifiers kwenye usajili."
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr "Instrument mbinu za vyombo kwenye usajili."
+
+#: src/settings_translation_file.cpp
+msgid "Instrumentation"
+msgstr "Instrumentation"
+
+#: src/settings_translation_file.cpp
+msgid "Interval of saving important changes in the world, stated in seconds."
+msgstr ""
+"Muda wa kuhifadhi mabadiliko muhimu katika ulimwengu, alisema katika sekunde."
+
+#: src/settings_translation_file.cpp
+msgid "Interval of sending time of day to clients."
+msgstr "Muda wa kutuma wakati wa siku kwa wateja."
+
+#: src/settings_translation_file.cpp
+msgid "Inventory items animations"
+msgstr "Hesabu vitu uhuishaji"
+
+#: src/settings_translation_file.cpp
+msgid "Inventory key"
+msgstr "Ufunguo wa hesabu"
+
+#: src/settings_translation_file.cpp
+msgid "Invert mouse"
+msgstr "Pindua kipanya"
+
+#: src/settings_translation_file.cpp
+msgid "Invert vertical mouse movement."
+msgstr "Pindua harakati ya kipanya wima."
+
+#: src/settings_translation_file.cpp
+msgid "Item entity TTL"
+msgstr "Kipengee chombo TTL"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4052,91 +2529,12 @@ msgstr ""
 "Udhibiti kiasi cha undani faini."
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal scale"
-msgstr "Mwandishi ramani fractal kipimo"
+msgid "Joystick button repetition interval"
+msgstr "Kifimbocheza kitufe marudio nafasi"
 
 #: src/settings_translation_file.cpp
-msgid "Approximate (X,Y,Z) scale of fractal in nodes."
-msgstr "Kukadiria (X, Y, Z) kipimo cha fractal katika fundo."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal offset"
-msgstr "Mwandishi ramani fractal Sawazisha"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
-"Used to move a suitable spawn area of low land close to (0, 0).\n"
-"The default is suitable for mandelbrot sets, it needs to be edited for julia "
-"sets.\n"
-"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
-msgstr ""
-"(X, Y, Z) fidia ya fractal kutoka kituo cha dunia katika vitengo vya "
-"'kipimo'.\n"
-"Kutumika ili kuhamisha eneo la spawn ya kufaa ya ardhi chini karibu (0, 0).\n"
-"Chaguo-msingi ni mzuri kwa ajili ya seti ya mandelbrot, inahitaji kuhaririwa "
-"kwa ajili ya julia seti.\n"
-"Masafa ya takribani-2 hadi 2. Kuzidisha kwa 'Skeli' kwa Sawazisha katika "
-"fundo."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal slice w"
-msgstr "Mwandishi ramani fractal kisu w"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"W co-ordinate of the generated 3D slice of a 4D fractal.\n"
-"Determines which 3D slice of the 4D shape is generated.\n"
-"Has no effect on 3D fractals.\n"
-"Range roughly -2 to 2."
-msgstr ""
-"W kuratibu ya yanayotokana 3D kisu wa fractal wa 4 D.\n"
-"Huamua kisu ambayo 3D wa umbo 4D huundwa.\n"
-"Ina athari 3D fractals.\n"
-"Masafa ya takribani-2 hadi 2."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia x"
-msgstr "Mwandishi ramani fractal julia x"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only: X component of hypercomplex constant determining julia "
-"shape.\n"
-"Range roughly -2 to 2."
-msgstr ""
-"Julia kuweka tu: X sehemu ya hypercomplex mara kwa mara umbo julia kukazia.\n"
-"Masafa ya takribani-2 hadi 2."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia y"
-msgstr "Mwandishi ramani fractal julia y"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only: Y component of hypercomplex constant determining julia "
-"shape.\n"
-"Range roughly -2 to 2."
-msgstr ""
-"Julia kuweka tu: sehemu Y ya hypercomplex mara kwa mara umbo julia kukazia.\n"
-"Masafa ya takribani-2 hadi 2."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia z"
-msgstr "Mwandishi ramani fractal julia z"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only: Z component of hypercomplex constant determining julia "
-"shape.\n"
-"Range roughly -2 to 2."
-msgstr ""
-"Julia kuweka tu: Z sehemu ya hypercomplex mara kwa mara umbo julia kukazia.\n"
-"Masafa ya takribani-2 hadi 2."
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia w"
-msgstr "Mwandishi ramani fractal julia w"
+msgid "Joystick frustum sensitivity"
+msgstr "Kifimbocheza frustum unyeti"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4150,32 +2548,505 @@ msgstr ""
 "Masafa ya takribani-2 hadi 2."
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal seabed noise parameters"
-msgstr "Mwandishi ramani fractal seabed kelele vigezo"
+msgid ""
+"Julia set only: X component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
+msgstr ""
+"Julia kuweka tu: X sehemu ya hypercomplex mara kwa mara umbo julia kukazia.\n"
+"Masafa ya takribani-2 hadi 2."
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal filler depth noise parameters"
-msgstr "Mwandishi ramani fractal filler kina kelele vigezo"
+msgid ""
+"Julia set only: Y component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
+msgstr ""
+"Julia kuweka tu: sehemu Y ya hypercomplex mara kwa mara umbo julia kukazia.\n"
+"Masafa ya takribani-2 hadi 2."
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal cave1 noise parameters"
-msgstr "Mwandishi ramani fractal cave1 kelele vigezo"
+msgid ""
+"Julia set only: Z component of hypercomplex constant determining julia "
+"shape.\n"
+"Range roughly -2 to 2."
+msgstr ""
+"Julia kuweka tu: Z sehemu ya hypercomplex mara kwa mara umbo julia kukazia.\n"
+"Masafa ya takribani-2 hadi 2."
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal cave2 noise parameters"
-msgstr "Mwandishi ramani fractal cave2 kelele vigezo"
+msgid "Jump key"
+msgstr "Ufunguo wa kuruka"
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen Valleys"
-msgstr "Mwandishi ramani mabonde"
+msgid "Jumping speed"
+msgstr "Kuruka kasi"
 
 #: src/settings_translation_file.cpp
-msgid "General"
-msgstr "Mkuu"
+msgid ""
+"Key for decreasing the viewing range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kupunguza kiwango cha kuonyesha.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-msgid "Valleys C Flags"
-msgstr "Bendera ya mabonde C"
+msgid ""
+"Key for dropping the currently selected item.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kuacha kipengee kilichoteuliwa kwa sasa.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for increasing the viewing range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kuongeza kiwango cha kuonyesha.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for jumping.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kuruka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving fast in fast mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kusonga haraka katika hali ya haraka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player backward.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kuhamia mchezaji nyuma.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player forward.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kuhamia mchezaji mbele.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player left.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kuhamia mchezaji kushoto.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for moving the player right.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kusonga mchezaji haki.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat console.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kufungua muano wa mazungumzo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat window to type commands.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kufungua dirisha la soga kuchapa amri.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the chat window.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kufungua dirisha la soga.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for opening the inventory.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kufungua hesabu.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for printing debug stacks. Used for development.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya uchapishaji mipororo rekebishi. Kutumika kwa ajili ya "
+"maendeleo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for sneaking.\n"
+"Also used for climbing down and descending in water if aux1_descends is "
+"disabled.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya sneaking.\n"
+"Pia kutumika kwa ajili ya kupanda na kushuka katika maji kama aux1_descends "
+"imelemazwa.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for switching between first- and third-person camera.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kubadili kati ya kamera ya kwanza - na -mtu wa tatu.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for taking screenshots.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kuchukua viwambo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling autorun.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling autorun.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling cinematic mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling hali ya cinematic.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling display of minimap.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la minimap.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling fast mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling hali ya haraka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling flying.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling kuruka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling noclip mode.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling hali ya noclip.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the camera update. Only used for development\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling sasaishi ya kamera. Tu kutumika kwa ajili ya "
+"maendeleo ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of debug info.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la maelezo kuhusu marekebisho.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the HUD.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la ya HUD.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the chat.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la kuzungumza.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the fog.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la ukungu.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling the display of the profiler. Used for development.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling onyesho la profiler ya. Kutumika kwa ajili ya "
+"maendeleo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for toggling unlimited view range.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya toggling masafa ya Mwoneko ukomo.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid "Key use for climbing/descending"
+msgstr "Matumizi muhimu kwa ajili ya kupanda/kushuka"
+
+#: src/settings_translation_file.cpp
+msgid "Language"
+msgstr "Lugha"
+
+#: src/settings_translation_file.cpp
+msgid "Large cave depth"
+msgstr "Kina ya pango kubwa"
+
+#: src/settings_translation_file.cpp
+msgid "Lava Features"
+msgstr "Lava vipengele"
+
+#: src/settings_translation_file.cpp
+msgid "Leaves style"
+msgstr "Mtindo wa majani"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Leaves style:\n"
+"-   Fancy:  all faces visible\n"
+"-   Simple: only outer faces, if defined special_tiles are used\n"
+"-   Opaque: disable transparency"
+msgstr ""
+"Majani mtindo: - dhana: nyuso zote kuonekana - rahisi: tu nyuso nje, kama "
+"inavyoelezwa special_tiles ni kutumika - Opaque: Lemaza uwazi"
+
+#: src/settings_translation_file.cpp
+msgid "Left key"
+msgstr "Ufunguo wa kushoto"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of a server tick and the interval at which objects are generally "
+"updated over network."
+msgstr ""
+"Urefu wa alama ya tiki seva na nafasi ambayo vitu ni kwa ujumla kusasaishwa "
+"kwenye mtandao."
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between ABM execution cycles"
+msgstr "Urefu wa muda kati ya ABM utekelezaji mizunguko"
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between NodeTimer execution cycles"
+msgstr "Urefu wa muda kati ya mzunguko wa utekelezaji wa NodeTimer"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Level of logging to be written to debug.txt:\n"
+"-    <nothing> (no logging)\n"
+"-    none (messages with no level)\n"
+"-    error\n"
+"-    warning\n"
+"-    action\n"
+"-    info\n"
+"-    verbose"
+msgstr ""
+"Kiwango cha ufunguaji kuandikwa kwa debug.txt:- <nothing>(Hakuna ufunguaji) "
+"- Hakuna (ujumbe na hakuna kiwango) - kosa - tahadhari - hatua - taarifa - "
+"verbose</nothing>"
+
+#: src/settings_translation_file.cpp
+msgid "Limit of emerge queues on disk"
+msgstr "Kikomo ya foleni emerge kwenye diski"
+
+#: src/settings_translation_file.cpp
+msgid "Limit of emerge queues to generate"
+msgstr "Kikomo ya foleni emerge kuzalisha"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Limits number of parallel HTTP requests. Affects:\n"
+"-    Media fetch if server uses remote_media setting.\n"
+"-    Serverlist download and server announcement.\n"
+"-    Downloads performed by main menu (e.g. mod manager).\n"
+"Only has an effect if compiled with cURL."
+msgstr ""
+"Mipaka idadi ya maombi HTTP sambamba. Huathiri: - vyombo vya habari kuchota "
+"kama seva hutumia kipimo cha remote_media.\n"
+"-Serverlist kupakua na seva tangazo.\n"
+"-Downloads zifanywe Menyu kuu (k.m Meneja Moduli).\n"
+"Tu ina athari kama alikusanya na Mkunjo."
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity"
+msgstr "Fluidity kioevu"
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity smoothing"
+msgstr "Fluidity kioevu unyooshaji"
+
+#: src/settings_translation_file.cpp
+msgid "Liquid loop max"
+msgstr "Kitanzi kioevu upeo"
+
+#: src/settings_translation_file.cpp
+msgid "Liquid queue purge time"
+msgstr "Wakati wa usafishaji wa foleni ya kioevu"
+
+#: src/settings_translation_file.cpp
+msgid "Liquid sink"
+msgstr "Kuzama kioevu"
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update interval in seconds."
+msgstr "Sasisha kioevu nafasi katika sekunde."
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update tick"
+msgstr "Pata sasishi kioevu"
+
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr "Kupakia profiler mchezo"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+"Kupakia profiler mchezo kukusanya data ya ubainishaji wa mchezo.\n"
+"Hutoa amri /profiler kufikia umbo Kusanyo.\n"
+"Muhimu kwa watengenezaji Moduli na waendeshaji wa seva."
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr "Inapakiza umbo Modifiers"
+
+#: src/settings_translation_file.cpp
+msgid "Main menu game manager"
+msgstr "Meneja wa mchezo wa Menyu kuu"
+
+#: src/settings_translation_file.cpp
+msgid "Main menu mod manager"
+msgstr "Menyu kuu Moduli Meneja"
+
+#: src/settings_translation_file.cpp
+msgid "Main menu script"
+msgstr "Hati ya Menyu kuu"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
+msgstr ""
+"Kufanya rangi wa ukungu na anga hutegemea mchana (alfajiri/machweo) na "
+"kuonyesha mwelekeo."
+
+#: src/settings_translation_file.cpp
+msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
+msgstr "Hufanya DirectX kazi na LuaJIT. Lemaza ikiwa husababisha matatizo."
+
+#: src/settings_translation_file.cpp
+msgid "Map directory"
+msgstr "Orodha ya ramani"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4193,104 +3064,364 @@ msgstr ""
 "'altitude_chill' hufanya mwinuko wa juu baridi, ambayo inaweza kusababisha "
 "masuala ya biome.\n"
 "'humid_rivers' Inarekebisha unyevu kuzunguka mito na maeneo ambapo maji Je "
-"huwa na bwawa, inaweza kuingilia kati na biomes Imerekebisha maisha ya anasa."
-"\n"
+"huwa na bwawa, inaweza kuingilia kati na biomes Imerekebisha maisha ya "
+"anasa.\n"
 "Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
 "kutoka chaguo-msingi.\n"
 "Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
 
 #: src/settings_translation_file.cpp
-msgid "Altitude Chill"
-msgstr "Chill ya mwinuko"
-
-#: src/settings_translation_file.cpp
-msgid "The altitude at which temperature drops by 20C"
-msgstr "Mwinuko katika matone ambayo joto na 20C"
-
-#: src/settings_translation_file.cpp
-msgid "Large cave depth"
-msgstr "Kina ya pango kubwa"
-
-#: src/settings_translation_file.cpp
-msgid "Depth below which you'll find large caves."
-msgstr "Kina chini ambayo utapata mapango kubwa."
-
-#: src/settings_translation_file.cpp
-msgid "Lava Features"
-msgstr "Lava vipengele"
+msgid ""
+"Map generation attributes specific to Mapgen flat.\n"
+"Occasional lakes and hills can be added to the flat world.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+"Ramani kizazi sifa maalum kwa Mwandishi ramani gorofa.\n"
+"Maziwa mara kwa mara na vilima vinaweza kuongezwa kwa ulimwengu gorofa.\n"
+"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
+"kutoka chaguo-msingi.\n"
+"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Creates unpredictable lava features in caves.\n"
-"These can make mining difficult. Zero disables them. (0-10)"
+"Map generation attributes specific to Mapgen v6.\n"
+"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
+"flag is ignored.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Huunda lava haitabiriki sifa katika mapango.\n"
-"Haya kufanya madini vigumu. Sifuri Hulemaza yao. (0-10)"
+"Ramani kizazi sifa maalum ya Mwandishi ramani v6.\n"
+"Wakati snowbiomes vimewezeshwa misitu otomatiki imewezeshwa, bendera ya "
+"'misitu' ni kupuuzwa.\n"
+"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
+"kutoka chaguo-msingi.\n"
+"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v7.\n"
+"The 'ridges' flag controls the rivers.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with 'no' are used to explicitly disable them."
+msgstr ""
+"Ramani kizazi sifa maalum kwa Mwandishi ramani v7.\n"
+"Bendera ya 'matuta' udhibiti mito.\n"
+"Bendera ambayo haijabainishwa katika Tungo ya bendera ni hayakubadilishwa "
+"kutoka chaguo-msingi.\n"
+"Bendera kuanzia na 'hapana' hutumiwa kidhahiri Lemaza yao."
+
+#: src/settings_translation_file.cpp
+msgid "Map generation limit"
+msgstr "Kikomo cha kizazi cha ramani"
+
+#: src/settings_translation_file.cpp
+msgid "Map save interval"
+msgstr "Ramani hifadhi muda"
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock limit"
+msgstr "Kikomo cha Mapblock"
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock unload timeout"
+msgstr "Mkatiko Muda Mapblock wakipakua"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Valleys"
+msgstr "Mwandishi ramani mabonde"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome heat noise parameters"
+msgstr "Mwandishi ramani biome joto kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome humidity blend noise parameters"
+msgstr "Mwandishi ramani biome unyevu mchanganyiko kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen biome humidity noise parameters"
+msgstr "Mwandishi ramani biome unyevu kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen debug"
+msgstr "Utatuaji wa Mwandishi ramani"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flags"
+msgstr "Bendera ya Mwandishi ramani"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat"
+msgstr "Mwandishi ramani gorofa"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave width"
+msgstr "Mwandishi ramani pango gorofa upana"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave1 noise parameters"
+msgstr "Mwandishi ramani cave1 za gorofa kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave2 noise parameters"
+msgstr "Mwandishi ramani cave2 za gorofa kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat filler depth noise parameters"
+msgstr "Filler wa gorofa ya Mwandishi ramani kina kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat flags"
+msgstr "Mwandishi ramani gorofa bendera"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat ground level"
+msgstr "Mwandishi ramani gorofa ngazi ya chini"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat hill steepness"
+msgstr "Mwandishi ramani gorofa kilima mwinuko"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat hill threshold"
+msgstr "Kilele cha mlima gorofa Mwandishi ramani"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat lake steepness"
+msgstr "Mwandishi ramani ziwa gorofa mwinuko"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat lake threshold"
+msgstr "Mwandishi ramani ziwa gorofa kizingiti"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat large cave depth"
+msgstr "Mwandishi ramani pango kubwa gorofa kina"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat terrain noise parameters"
+msgstr "Mwandishi ramani ardhi tambarare kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal"
+msgstr "Fractal ya Mwandishi ramani"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave width"
+msgstr "Mwandishi ramani fractal pango upana"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave1 noise parameters"
+msgstr "Mwandishi ramani fractal cave1 kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal cave2 noise parameters"
+msgstr "Mwandishi ramani fractal cave2 kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal filler depth noise parameters"
+msgstr "Mwandishi ramani fractal filler kina kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal fractal"
+msgstr "Mwandishi ramani fractal fractal"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal iterations"
+msgstr "Mwandishi ramani fractal Marudiorudio"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia w"
+msgstr "Mwandishi ramani fractal julia w"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia x"
+msgstr "Mwandishi ramani fractal julia x"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia y"
+msgstr "Mwandishi ramani fractal julia y"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal julia z"
+msgstr "Mwandishi ramani fractal julia z"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal offset"
+msgstr "Mwandishi ramani fractal Sawazisha"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal scale"
+msgstr "Mwandishi ramani fractal kipimo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal seabed noise parameters"
+msgstr "Mwandishi ramani fractal seabed kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal slice w"
+msgstr "Mwandishi ramani fractal kisu w"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen heat blend noise parameters"
+msgstr "Mwandishi ramani joto mchanganyiko kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen name"
+msgstr "Mwandishi ramani jina"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5"
+msgstr "Mwandishi ramani v5"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave width"
+msgstr "Mwandishi ramani v5 pango upana"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave1 noise parameters"
+msgstr "Mwandishi ramani v5 cave1 kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 cave2 noise parameters"
+msgstr "Mwandishi ramani v5 cave2 kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 factor noise parameters"
+msgstr "Mwandishi ramani v5 sababu kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 filler depth noise parameters"
+msgstr "Mwandishi ramani v5 filler kina kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v5 height noise parameters"
+msgstr "Mwandishi ramani v5 urefu kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6"
+msgstr "Mwandishi ramani v6"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 apple trees noise parameters"
+msgstr "Mwandishi ramani v6 apple miti kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 beach frequency"
+msgstr "Mwandishi ramani v6 pwani marudio"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 beach noise parameters"
+msgstr "Mwandishi ramani v6 pwani kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 biome noise parameters"
+msgstr "Mwandishi ramani v6 biome kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 cave noise parameters"
+msgstr "Mwandishi ramani v6 pango kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 desert frequency"
+msgstr "Mwandishi ramani v6 jangwa marudio"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 flags"
+msgstr "Mwandishi ramani v6 bendera"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 height select noise parameters"
+msgstr "Mwandishi ramani v6 urefu Teua vigezo kelele"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 humidity noise parameters"
+msgstr "Mwandishi ramani v6 unyevu kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 mud noise parameters"
+msgstr "Mwandishi ramani v6 matope kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 steepness noise parameters"
+msgstr "Mwandishi ramani v6 mwinuko kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 terrain altitude noise parameters"
+msgstr "Mwinuko wa ardhi ya Mwandishi ramani v6 kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 terrain base noise parameters"
+msgstr "Mwandishi ramani v6 ardhi kelele msingi vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v6 trees noise parameters"
+msgstr "Mwandishi ramani v6 miti kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7"
+msgstr "Mwandishi ramani v7"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave width"
+msgstr "Mwandishi ramani v7 pango upana"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave1 noise parameters"
+msgstr "Mwandishi ramani v7 cave1 kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 cave2 noise parameters"
+msgstr "Mwandishi ramani v7 cave2 kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 filler depth noise parameters"
+msgstr "Mwandishi ramani v7 filler kina kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 flags"
+msgstr "Mwandishi ramani v7 bendera"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 height select noise parameters"
+msgstr "Mwandishi ramani v7 urefu Teua vigezo kelele"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 mount height noise parameters"
+msgstr "Mwandishi ramani v7 mlima urefu kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 mountain noise parameters"
+msgstr "Mwandishi ramani v7 mlima kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 ridge noise parameters"
+msgstr "Mwandishi ramani v7 tuta kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 ridge water noise parameters"
+msgstr "Mwandishi ramani v7 tuta maji kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain altitude noise parameters"
+msgstr "Mwandishi ramani v7 ardhi mwinuko kelele vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain base noise parameters"
+msgstr "Mwandishi ramani v7 ardhi kelele msingi vigezo"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen v7 terrain persistation noise parameters"
+msgstr "Mwandishi ramani v7 ardhi persistation kelele vigezo"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave depth"
 msgstr "Kina ya pango mkubwa"
 
-#: src/settings_translation_file.cpp
-msgid "Depth below which you'll find massive caves."
-msgstr "Kina chini ambayo utapata mapango mkubwa."
-
-#: src/settings_translation_file.cpp
-msgid "River Depth"
-msgstr "Kina wa mto"
-
-#: src/settings_translation_file.cpp
-msgid "How deep to make rivers"
-msgstr "Kina jinsi kufanya mito"
-
-#: src/settings_translation_file.cpp
-msgid "River Size"
-msgstr "Ukubwa wa mto"
-
-#: src/settings_translation_file.cpp
-msgid "How wide to make rivers"
-msgstr "Upana gani kufanya mito"
-
-#: src/settings_translation_file.cpp
-msgid "Water Features"
-msgstr "Vipengele vya maji"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Creates unpredictable water features in caves.\n"
-"These can make mining difficult. Zero disables them. (0-10)"
-msgstr ""
-"Huunda maji haitabiriki sifa katika mapango.\n"
-"Haya kufanya madini vigumu. Sifuri Hulemaza yao. (0-10)"
-
-#: src/settings_translation_file.cpp
-msgid "Cave width"
-msgstr "Pango upana"
-
-#: src/settings_translation_file.cpp
-msgid "Noises"
-msgstr "Kila"
-
-#: src/settings_translation_file.cpp
-msgid "Cave noise #1"
-msgstr "Pango kelele #1"
-
-#: src/settings_translation_file.cpp
-msgid "Caves and tunnels form at the intersection of the two noises"
-msgstr "Fomu ya mapango na vichuguu katika makutano ya kila mbili"
-
-#: src/settings_translation_file.cpp
-msgid "Cave noise #2"
-msgstr "Pango kelele #2"
-
-#: src/settings_translation_file.cpp
-msgid "Filler Depth"
-msgstr "Kina ya Filler"
-
-#: src/settings_translation_file.cpp
-msgid "The depth of dirt or other filler"
-msgstr "Kina cha uchafu au filler nyingine"
-
 #: src/settings_translation_file.cpp
 msgid "Massive cave noise"
 msgstr "Kelele ya pango mkubwa"
@@ -4300,212 +3431,224 @@ msgid "Massive caves form here."
 msgstr "Fomu ya mapango mkubwa hapa."
 
 #: src/settings_translation_file.cpp
-msgid "River Noise"
-msgstr "Kelele za mto"
+msgid "Max block generate distance"
+msgstr "Umbo la Max kuzalisha umbali"
 
 #: src/settings_translation_file.cpp
-msgid "River noise -- rivers occur close to zero"
-msgstr "Kelele za mto - mito kutokea karibu na sifuri"
+msgid "Max block send distance"
+msgstr "Umbo la Max Tuma umbali"
 
 #: src/settings_translation_file.cpp
-msgid "Terrain Height"
-msgstr "Urefu wa ardhi"
+msgid "Max liquids processed per step."
+msgstr "Max viowevu kusindika kwa kila hatua."
 
 #: src/settings_translation_file.cpp
-msgid "Base terrain height"
-msgstr "Mandhari ya msingi urefu"
+msgid "Max. clearobjects extra blocks"
+msgstr "Max. clearobjects vitalu vya ziada"
 
 #: src/settings_translation_file.cpp
-msgid "Valley Depth"
-msgstr "Kina wa Bonde"
+msgid "Max. packets per iteration"
+msgstr "Max. pakiti kila Marudiorudio"
 
 #: src/settings_translation_file.cpp
-msgid "Raises terrain to make valleys around the rivers"
-msgstr "Huwafufua ardhi kufanya mabonde kuzunguka mito"
+msgid "Maximum FPS"
+msgstr "Ramprogrammen juu"
 
 #: src/settings_translation_file.cpp
-msgid "Valley Fill"
-msgstr "Jaza ya Bonde"
+msgid "Maximum FPS when game is paused."
+msgstr "Ramprogrammen juu wakati mchezo umesitishwa."
 
 #: src/settings_translation_file.cpp
-msgid "Slope and fill work together to modify the heights"
-msgstr "Mteremko na Jaza kazi pamoja kurekebisha urefu"
+msgid "Maximum forceloaded blocks"
+msgstr "Forceloaded upeo vitalu"
 
 #: src/settings_translation_file.cpp
-msgid "Valley Profile"
-msgstr "Maelezo mafupi ya Bonde"
+msgid "Maximum hotbar width"
+msgstr "Hotbar kiwango cha juu cha upana"
 
 #: src/settings_translation_file.cpp
-msgid "Amplifies the valleys"
-msgstr "Inaangazia mabonde"
+msgid "Maximum number of blocks that are simultaneously sent in total."
+msgstr "Namba ya juu ya vitalu kwamba wakati huo huo hutumwa kwa jumla."
 
 #: src/settings_translation_file.cpp
-msgid "Valley Slope"
-msgstr "Mteremko wa Bonde"
+msgid "Maximum number of blocks that are simultaneously sent per client."
+msgstr "Namba ya juu ya vitalu kwamba ni wakati huo huo uliotumwa kwa mteja."
 
 #: src/settings_translation_file.cpp
-msgid "Security"
-msgstr "Usalama"
-
-#: src/settings_translation_file.cpp
-msgid "Enable mod security"
-msgstr "Kuwezesha usalama Moduli"
-
-#: src/settings_translation_file.cpp
-msgid "Prevent mods from doing insecure things like running shell commands."
-msgstr "Kuzuia mods kufanya mambo zisizo kama kuendesha amri ya Sheli."
-
-#: src/settings_translation_file.cpp
-msgid "Trusted mods"
-msgstr "Mods aminifu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-separated list of trusted mods that are allowed to access insecure\n"
-"functions even when mod security is on (via request_insecure_environment())."
+msgid "Maximum number of blocks that can be queued for loading."
 msgstr ""
-"Iliyotenganishwa orodha ya mods kuaminika kwamba wanaruhusiwa kufikia kazi "
-"zisizo hata wakati usalama Moduli ni juu (kupitia "
-"request_insecure_environment())."
-
-#: src/settings_translation_file.cpp
-msgid "HTTP Mods"
-msgstr "HTTP Mods"
+"Namba ya juu ya vitalu kwamba unaweza kwenye foleni kwa ajili ya kupakia."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
+"Maximum number of blocks to be queued that are to be generated.\n"
+"Set to blank for an appropriate amount to be chosen automatically."
 msgstr ""
-"Iliyotenganishwa orodha ya mods kwamba wanaruhusiwa kufikia HTTP APIs, "
-"ambayo kuwaruhusu kupakia na kupakua data/toka kwenye tovuti."
-
-#: src/settings_translation_file.cpp
-msgid "Profiling"
-msgstr "Ubainishaji wa"
-
-#: src/settings_translation_file.cpp
-msgid "Load the game profiler"
-msgstr "Kupakia profiler mchezo"
+"Namba ya juu ya vitalu kwa kuwa kwenye foleni kwamba ni kutengenezwa.\n"
+"Seti kwa wazi kwa kiasi sahihi ili uweze kuchaguliwa moja kwa moja."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Load the game profiler to collect game profiling data.\n"
-"Provides a /profiler command to access the compiled profile.\n"
-"Useful for mod developers and server operators."
+"Maximum number of blocks to be queued that are to be loaded from file.\n"
+"Set to blank for an appropriate amount to be chosen automatically."
 msgstr ""
-"Kupakia profiler mchezo kukusanya data ya ubainishaji wa mchezo.\n"
-"Hutoa amri /profiler kufikia umbo Kusanyo.\n"
-"Muhimu kwa watengenezaji Moduli na waendeshaji wa seva."
+"Namba ya juu ya vitalu kwa kuwa kwenye foleni kwamba ni kupakiwa kutoka "
+"faili.\n"
+"Seti kwa wazi kwa kiasi sahihi ili uweze kuchaguliwa moja kwa moja."
 
 #: src/settings_translation_file.cpp
-msgid "Default report format"
-msgstr "Umbizo wa ripoti wa chaguo-msingi"
+msgid "Maximum number of forceloaded mapblocks."
+msgstr "Namba ya juu ya forceloaded mapblocks."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The default format in which profiles are being saved,\n"
-"when calling `/profiler save [format]` without format."
+"Maximum number of mapblocks for client to be kept in memory.\n"
+"Set to -1 for unlimited amount."
 msgstr ""
-"Umbizo wa chaguo-msingi ambayo maumbo ni kuokoka, wakati wito '/ profiler "
-"Hifadhi [umbizo]' bila umbizo."
-
-#: src/settings_translation_file.cpp
-msgid "Report path"
-msgstr "Njia ya ripoti"
+"Namba ya juu ya mapblocks kwa mteja kwa kuwekwa katika kumbukumbu.\n"
+"Seti -1 kwa kiasi ukomo."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The file path relative to your worldpath in which profiles will be saved "
-"to.\n"
-msgstr "Kijia cha faili jamaa yako worldpath ambayo maumbo utaakibishwa kwenye."
-
-#: src/settings_translation_file.cpp
-msgid "Instrumentation"
-msgstr "Instrumentation"
-
-#: src/settings_translation_file.cpp
-msgid "Entity methods"
-msgstr "Mbinu ya chombo"
-
-#: src/settings_translation_file.cpp
-msgid "Instrument the methods of entities on registration."
-msgstr "Instrument mbinu za vyombo kwenye usajili."
-
-#: src/settings_translation_file.cpp
-msgid "Active Block Modifiers"
-msgstr "Modifiers fungu amilifu"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Instrument the action function of Active Block Modifiers on registration."
-msgstr "Ala ya kazi hatua ya Modifiers Amilifu wa fungu kwenye usajili."
-
-#: src/settings_translation_file.cpp
-msgid "Loading Block Modifiers"
-msgstr "Inapakiza umbo Modifiers"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Instrument the action function of Loading Block Modifiers on registration."
-msgstr "Ala ya kazi hatua ya kupakia fungu Modifiers kwenye usajili."
-
-#: src/settings_translation_file.cpp
-msgid "Chatcommands"
-msgstr "Amri majadiliano"
-
-#: src/settings_translation_file.cpp
-msgid "Instrument chatcommands on registration."
-msgstr "Chombo chatcommands kwenye usajili."
-
-#: src/settings_translation_file.cpp
-msgid "Global callbacks"
-msgstr "Callbacks ya kimataifa"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Instrument global callback functions on registration.\n"
-"(anything you pass to a minetest.register_*() function)"
+"Maximum number of packets sent per send step, if you have a slow connection\n"
+"try reducing it, but don't reduce it to a number below double of targeted\n"
+"client number."
 msgstr ""
-"Chombo mwito-rejeshi kimataifa kazi kwenye usajili.\n"
-"(kitu chochote unaweza kupita kwa kazi minetest.register_*())"
+"Namba ya juu ya pakiti iliyotumwa kwa hatua ya kutuma, kama una muunganisho "
+"polepole jaribu kupunguza ni, lakini si ya kupunguza kadhaa chini ya mara "
+"mbili ya idadi ya mteja lengwa."
 
 #: src/settings_translation_file.cpp
-msgid "Builtin"
-msgstr "Pamoja"
+msgid "Maximum number of players that can connect simultaneously."
+msgstr "Namba ya juu ya wachezaji ambao wanaweza kuunganisha wakati huo huo."
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of statically stored objects in a block."
+msgstr "Namba ya juu ya vipengee statically kuhifadhiwa katika umbo la."
+
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr "Vipengee juu kwa kila fungu"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Instrument builtin.\n"
-"This is usually only needed by core/builtin contributors"
+"Maximum proportion of current window to be used for hotbar.\n"
+"Useful if there's something to be displayed right or left of hotbar."
 msgstr ""
-"Chombo builtin.\n"
-"Hii ni kawaida tu zinazohitajika kwa wachangiaji wa msingi/builtin"
+"Uwiano juu ya dirisha la sasa kutumika kwa ajili ya hotbar.\n"
+"Muhimu kama kuna kitu cha kuonyeshwa kulia au kushoto wa hotbar."
 
 #: src/settings_translation_file.cpp
-msgid "Profiler"
-msgstr "Profiler"
+msgid "Maximum simultaneous block sends per client"
+msgstr "Fungu juu ya samtidiga hutuma kwa mteja"
+
+#: src/settings_translation_file.cpp
+msgid "Maximum simultaneous block sends total"
+msgstr "Fungu juu ya samtidiga hutuma jumla"
+
+#: src/settings_translation_file.cpp
+msgid "Maximum time in ms a file download (e.g. a mod download) may take."
+msgstr ""
+"Muda wa juu zaidi katika ms kupakua faili (kwa mfano upakuaji na Moduli) "
+"inaweza kuchukua."
+
+#: src/settings_translation_file.cpp
+msgid "Maximum users"
+msgstr "Watumiaji wa kiwango cha juu"
+
+#: src/settings_translation_file.cpp
+msgid "Menus"
+msgstr "Menyu"
+
+#: src/settings_translation_file.cpp
+msgid "Mesh cache"
+msgstr "Kirudufu cha matundu"
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day"
+msgstr "Ujumbe wa siku ya"
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day displayed to players connecting."
+msgstr "Ujumbe wa siku ya kuonyeshwa kwa wachezaji kuunganisha."
+
+#: src/settings_translation_file.cpp
+msgid "Method used to highlight selected object."
+msgstr "Mbinu inayotumiwa kuonyesha kipengee kilichoteuliwa."
+
+#: src/settings_translation_file.cpp
+msgid "Minimap"
+msgstr "Ramani"
+
+#: src/settings_translation_file.cpp
+msgid "Minimap key"
+msgstr "Ufunguo wa minimap"
+
+#: src/settings_translation_file.cpp
+msgid "Minimap scan height"
+msgstr "Ramani tambazo urefu"
+
+#: src/settings_translation_file.cpp
+msgid "Minimum texture size for filters"
+msgstr "Unamu wa kima cha chini cha ukubwa wa Vichujio"
+
+#: src/settings_translation_file.cpp
+msgid "Mipmapping"
+msgstr "Mipmapping"
+
+#: src/settings_translation_file.cpp
+msgid "Modstore details URL"
+msgstr "Modstore maelezo URL"
+
+#: src/settings_translation_file.cpp
+msgid "Modstore download URL"
+msgstr "Modstore kupakua URL"
+
+#: src/settings_translation_file.cpp
+msgid "Modstore mods list URL"
+msgstr "Modstore mods orodha ya URL"
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font path"
+msgstr "Monospace njia ya fonti"
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font size"
+msgstr "Ukubwa wa fonti wa Monospace"
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity"
+msgstr "Unyeti wa kipanya"
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity multiplier."
+msgstr "Mengi ya unyeti wa kipanya."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Have the profiler instrument itself:\n"
-"* Instrument an empty function.\n"
-"This estimates the overhead, that instrumentation is adding (+1 function "
-"call).\n"
-"* Instrument the sampler being used to update the statistics."
+"Multiplier for fall bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
-"Kuwa profiler instrument yenyewe: * Instrument kazi tupu.\n"
-"Hii makadirio vimezingirwa, kwamba instrumentation ni kuongeza (+ 1 kazi "
-"simu).\n"
-"* Chombo sampler kutumika ili kusasisha takwimu."
+"Mengi kwa ajili ya kuanguka kando.\n"
+"Kwa mfano: 0 kwa ajili ya Mwoneko hakuna kando; 1.0 kwa ajili ya kawaida; "
+"2.0 kwa mara mbili."
 
 #: src/settings_translation_file.cpp
-msgid "Client and Server"
-msgstr "Mteja na seva"
+msgid ""
+"Multiplier for view bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+"Mengi kwa ajili ya Mwoneko kando.\n"
+"Kwa mfano: 0 kwa ajili ya Mwoneko hakuna kando; 1.0 kwa ajili ya kawaida; "
+"2.0 kwa mara mbili."
 
 #: src/settings_translation_file.cpp
-msgid "Player name"
-msgstr "Jina la mchezaji"
+msgid ""
+"Name of map generator to be used when creating a new world.\n"
+"Creating a world in the main menu will override this."
+msgstr ""
+"Jina la ramani jenereta kutumika wakati wa kuunda dunia mpya.\n"
+"Kujenga ulimwengu katika Menyu kuu itakuwa vinabatilisha hii."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4518,8 +3661,370 @@ msgstr ""
 "Wakati kuanzia Menyu kuu, hii ni kuuharibu."
 
 #: src/settings_translation_file.cpp
-msgid "Language"
-msgstr "Lugha"
+msgid ""
+"Name of the server, to be displayed when players join and in the serverlist."
+msgstr ""
+"Jina la seva, kuonyeshwa wakati wachezaji kujiunga na katika serverlist ya."
+
+#: src/settings_translation_file.cpp
+msgid "Network"
+msgstr "Mtandao"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Network port to listen (UDP).\n"
+"This value will be overridden when starting from the main menu."
+msgstr ""
+"Mtandao bandari kusikiliza (UDP).\n"
+"Thamani hii itakuwa kuuharibu wakati kuanzia Menyu kuu."
+
+#: src/settings_translation_file.cpp
+msgid "New users need to input this password."
+msgstr "Watumiaji wapya haja Ingiza nywila hii."
+
+#: src/settings_translation_file.cpp
+msgid "Noclip"
+msgstr "Noclip"
+
+#: src/settings_translation_file.cpp
+msgid "Noclip key"
+msgstr "Ufunguo wa Noclip"
+
+#: src/settings_translation_file.cpp
+msgid "Node highlighting"
+msgstr "Fundo udhulisho"
+
+#: src/settings_translation_file.cpp
+msgid "NodeTimer interval"
+msgstr "Nafasi ya NodeTimer"
+
+#: src/settings_translation_file.cpp
+msgid "Noise parameters for biome API temperature, humidity and biome blend."
+msgstr "Kelele vigezo vya biome API joto, unyevu na biome mchanganyiko."
+
+#: src/settings_translation_file.cpp
+msgid "Noises"
+msgstr "Kila"
+
+#: src/settings_translation_file.cpp
+msgid "Normalmaps sampling"
+msgstr "Sampuli ya Normalmaps"
+
+#: src/settings_translation_file.cpp
+msgid "Normalmaps strength"
+msgstr "Nguvu ya Normalmaps"
+
+#: src/settings_translation_file.cpp
+msgid "Number of emerge threads"
+msgstr "Idadi ya nyuzi emerge"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of emerge threads to use. Make this field blank, or increase this "
+"number\n"
+"to use multiple threads. On multiprocessor systems, this will improve mapgen "
+"speed greatly\n"
+"at the cost of slightly buggy caves."
+msgstr ""
+"Idadi ya nyuzi emerge kutumia. Kufanya hii shamba tupu, au kuongeza idadi "
+"hii kutumia nyuzi nyingi. Kwenye mifumo ya multiprocessor, hii itasaidia "
+"kuongeza kasi ya mwandishi ramani sana wanatengeneza mapango buggy kidogo."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of extra blocks that can be loaded by /clearobjects at once.\n"
+"This is a trade-off between sqlite transaction overhead and\n"
+"memory consumption (4096=100MB, as a rule of thumb)."
+msgstr ""
+"Idadi ya vitalu ziada ambayo inaweza kupakiwa na /clearobjects mara moja.\n"
+"Hii ni mikinzano kati sqlite shughuli uendeshaji na matumizi ya kumbukumbu "
+"(4096 = 100 MB, kama kanuni ya thumb)."
+
+#: src/settings_translation_file.cpp
+msgid "Number of parallax occlusion iterations."
+msgstr "Idadi ya parallax occlusion Marudiorudio."
+
+#: src/settings_translation_file.cpp
+msgid "Overall bias of parallax occlusion effect, usually scale/2."
+msgstr "Upendeleo wa jumla wa parallax occlusion athari, kawaida kipimo/2."
+
+#: src/settings_translation_file.cpp
+msgid "Overall scale of parallax occlusion effect."
+msgstr "Kipimo cha jumla ya parallax occlusion athari."
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion"
+msgstr "Parallax occlusion"
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion Scale"
+msgstr "Parallax occlusion wadogo"
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion bias"
+msgstr "Parallax occlusion upendeleo"
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion iterations"
+msgstr "Parallax occlusion Marudiorudio"
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion mode"
+msgstr "Parallax occlusion hali"
+
+#: src/settings_translation_file.cpp
+msgid "Parallax occlusion strength"
+msgstr "Parallax occlusion nguvu"
+
+#: src/settings_translation_file.cpp
+msgid "Path to TrueTypeFont or bitmap."
+msgstr "Njia ya TrueTypeFont au vitone michoro."
+
+#: src/settings_translation_file.cpp
+msgid "Path to save screenshots at."
+msgstr "Njia ya kuokoa viwambo katika."
+
+#: src/settings_translation_file.cpp
+msgid "Path to texture directory. All textures are first searched from here."
+msgstr "Njia ya orodha ya unamu. Unamu wote vinatafutizwa kwanza kutoka hapa."
+
+#: src/settings_translation_file.cpp
+msgid "Physics"
+msgstr "Fizikia"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Player is able to fly without being affected by gravity.\n"
+"This requires the \"fly\" privilege on the server."
+msgstr ""
+"Mchezaji ni uwezo wa kuruka bila kuwa walioathirika na mvuto.\n"
+"Hii inahitaji upendeleo \"kuruka\" kwenye seva."
+
+#: src/settings_translation_file.cpp
+msgid "Player name"
+msgstr "Jina la mchezaji"
+
+#: src/settings_translation_file.cpp
+msgid "Player transfer distance"
+msgstr "Umbali wa uhamisho wa mchezaji"
+
+#: src/settings_translation_file.cpp
+msgid "Player versus Player"
+msgstr "Mchezaji dhidi ya mchezaji"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Port to connect to (UDP).\n"
+"Note that the port field in the main menu overrides this setting."
+msgstr ""
+"Bandari ya kuunganishwa (UDP).\n"
+"Kumbuka kwamba uwanja wa bandari katika Menyu kuu Puuza kipimo hiki."
+
+#: src/settings_translation_file.cpp
+msgid "Prevent mods from doing insecure things like running shell commands."
+msgstr "Kuzuia mods kufanya mambo zisizo kama kuendesha amri ya Sheli."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds). 0 = "
+"disable. Useful for developers."
+msgstr ""
+"Chapisha injini ya ubainishaji data katika vipindi vya kawaida (katika "
+"sekunde). 0 = Lemaza. Muhimu kwa watengenezaji."
+
+#: src/settings_translation_file.cpp
+msgid "Privileges that players with basic_privs can grant"
+msgstr "Marupurupu ya wachezaji na basic_privs unaweza ruzuku"
+
+#: src/settings_translation_file.cpp
+msgid "Profiler"
+msgstr "Profiler"
+
+#: src/settings_translation_file.cpp
+msgid "Profiler toggle key"
+msgstr "Profiler kibonye"
+
+#: src/settings_translation_file.cpp
+msgid "Profiling"
+msgstr "Ubainishaji wa"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Radius of cloud area stated in number of 64 node cloud squares.\n"
+"Values larger than 26 will start to produce sharp cutoffs at cloud area "
+"corners."
+msgstr ""
+"Eneo la eneo la wingu alisema katika idadi ya 64 fundo wingu miraba.\n"
+"Thamani kubwa kuliko 26 itaanza kuzalisha cutoffs mkali katika wingu eneo la "
+"pembe."
+
+#: src/settings_translation_file.cpp
+msgid "Raises terrain to make valleys around the rivers"
+msgstr "Huwafufua ardhi kufanya mabonde kuzunguka mito"
+
+#: src/settings_translation_file.cpp
+msgid "Random input"
+msgstr "Ingizo la nasibu"
+
+#: src/settings_translation_file.cpp
+msgid "Range select key"
+msgstr "Kibonye Teua masafa"
+
+#: src/settings_translation_file.cpp
+msgid "Remote media"
+msgstr "Midia ya mbali"
+
+#: src/settings_translation_file.cpp
+msgid "Remote port"
+msgstr "Bandari ya mbali"
+
+#: src/settings_translation_file.cpp
+msgid "Replaces the default main menu with a custom one."
+msgstr "Kinabadilisha chaguo-msingi Menyu kuu kwa moja maalum."
+
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr "Njia ya ripoti"
+
+#: src/settings_translation_file.cpp
+msgid "Right key"
+msgstr "Ufunguo sahihi"
+
+#: src/settings_translation_file.cpp
+msgid "Rightclick repetition interval"
+msgstr "Bofya kulia marudio nafasi"
+
+#: src/settings_translation_file.cpp
+msgid "River Depth"
+msgstr "Kina wa mto"
+
+#: src/settings_translation_file.cpp
+msgid "River Noise"
+msgstr "Kelele za mto"
+
+#: src/settings_translation_file.cpp
+msgid "River Size"
+msgstr "Ukubwa wa mto"
+
+#: src/settings_translation_file.cpp
+msgid "River noise -- rivers occur close to zero"
+msgstr "Kelele za mto - mito kutokea karibu na sifuri"
+
+#: src/settings_translation_file.cpp
+msgid "Rollback recording"
+msgstr "Mserereko kurekodi"
+
+#: src/settings_translation_file.cpp
+msgid "Round minimap"
+msgstr "Ramani pande zote"
+
+#: src/settings_translation_file.cpp
+msgid "Save the map received by the client on disk."
+msgstr "Hifadhi ramani kupokelewa na mteja kwenye diski."
+
+#: src/settings_translation_file.cpp
+msgid "Saving map received from server"
+msgstr "Ramani kuokoa kupokea kutoka seva"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Scale gui by a user specified value.\n"
+"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
+"This will smooth over some of the rough edges, and blend\n"
+"pixels when scaling down, at the cost of blurring some\n"
+"edge pixels when images are scaled by non-integer sizes."
+msgstr ""
+"Rekebisha gui kwa mtumiaji maalum thamani.\n"
+"Tumia kichujio karibu-jirani-Waanti-Lakabu Rekebisha GUI ya.\n"
+"Hii laini baadhi ya kingo mbaya, na mchanganyiko pikseli wakati upimaji "
+"chini, wanatengeneza ukungu wa jinsia pikseli baadhi makali wakati picha ni "
+"yamesimamisha na ukubwa wa yasiyo ya takwimu."
+
+#: src/settings_translation_file.cpp
+msgid "Screen height"
+msgstr "Urefu wa kiwamba"
+
+#: src/settings_translation_file.cpp
+msgid "Screen width"
+msgstr "Upana wa kiwamba"
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot"
+msgstr "Screenshot"
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot folder"
+msgstr "Screenshot kabrasha"
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot format"
+msgstr "Screenshot umbizo"
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot quality"
+msgstr "Screenshot ubora"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Screenshot quality. Only used for JPEG format.\n"
+"1 means worst quality; 100 means best quality.\n"
+"Use 0 for default quality."
+msgstr ""
+"Screenshot ubora. Tu kutumika kwa ajili ya Umbiza JPEG.\n"
+"1 maana ubora mbaya; 100 humaanisha ubora.\n"
+"Tumia 0 kwa ubora wa chaguo-msingi."
+
+#: src/settings_translation_file.cpp
+msgid "Security"
+msgstr "Usalama"
+
+#: src/settings_translation_file.cpp
+msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous"
+msgstr "Ona http://www.sqlite.org/pragma.html#pragma_synchronous"
+
+#: src/settings_translation_file.cpp
+msgid "Selection box border color (R,G,B)."
+msgstr "Uteuzi kikasha mpaka rangi (R, G, B)."
+
+#: src/settings_translation_file.cpp
+msgid "Selection box color"
+msgstr "Uteuzi kikasha rangi"
+
+#: src/settings_translation_file.cpp
+msgid "Selection box width"
+msgstr "Uteuzi kikasha upana"
+
+#: src/settings_translation_file.cpp
+msgid "Server / Singleplayer"
+msgstr "Seva / Singleplayer"
+
+#: src/settings_translation_file.cpp
+msgid "Server URL"
+msgstr "URL ya seva"
+
+#: src/settings_translation_file.cpp
+msgid "Server address"
+msgstr "Anwani ya seva"
+
+#: src/settings_translation_file.cpp
+msgid "Server description"
+msgstr "Maelezo ya seva"
+
+#: src/settings_translation_file.cpp
+msgid "Server name"
+msgstr "Jina la seva"
+
+#: src/settings_translation_file.cpp
+msgid "Server port"
+msgstr "Kituo tarishi cha seva"
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist URL"
+msgstr "URL ya Serverlist"
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist file"
+msgstr "Faili ya Serverlist"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4530,116 +4035,614 @@ msgstr ""
 "Kuanza upya inahitajika baada ya kubadilisha hii."
 
 #: src/settings_translation_file.cpp
-msgid "Debug log level"
-msgstr "Rekebisha kiwango cha logi"
+msgid ""
+"Set to true enables waving leaves.\n"
+"Requires shaders to be enabled."
+msgstr ""
+"Kuweka huwezesha kweli waving majani.\n"
+"Inahitaji shaders kwa kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Level of logging to be written to debug.txt:\n"
-"-    <nothing> (no logging)\n"
-"-    none (messages with no level)\n"
-"-    error\n"
-"-    warning\n"
-"-    action\n"
-"-    info\n"
-"-    verbose"
+"Set to true enables waving plants.\n"
+"Requires shaders to be enabled."
 msgstr ""
-"Kiwango cha ufunguaji kuandikwa kwa debug.txt:- <nothing>(Hakuna ufunguaji) -"
-" Hakuna (ujumbe na hakuna kiwango) - kosa - tahadhari - hatua - taarifa - "
-"verbose</nothing>"
-
-#: src/settings_translation_file.cpp
-msgid "IPv6"
-msgstr "IPv6"
-
-#: src/settings_translation_file.cpp
-msgid "IPv6 support."
-msgstr "IPv6 msaada."
-
-#: src/settings_translation_file.cpp
-msgid "cURL timeout"
-msgstr "muda wa kuisha wa cURL"
+"Kuweka huwezesha kweli waving mimea.\n"
+"Inahitaji shaders kwa kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Default timeout for cURL, stated in milliseconds.\n"
-"Only has an effect if compiled with cURL."
+"Set to true enables waving water.\n"
+"Requires shaders to be enabled."
 msgstr ""
-"Chaguo-msingi muda wa kuisha kwa cURL, alisema katika milisekunde.\n"
-"Tu ina athari kama alikusanya na Mkunjo."
-
-#: src/settings_translation_file.cpp
-msgid "cURL parallel limit"
-msgstr "cURL kikomo sambamba"
+"Kuweka huwezesha kweli waving maji.\n"
+"Inahitaji shaders kwa kuwezeshwa."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Limits number of parallel HTTP requests. Affects:\n"
-"-    Media fetch if server uses remote_media setting.\n"
-"-    Serverlist download and server announcement.\n"
-"-    Downloads performed by main menu (e.g. mod manager).\n"
-"Only has an effect if compiled with cURL."
+"Shaders allow advanced visual effects and may increase performance on some "
+"video cards.\n"
+"Thy only work with the OpenGL video backend."
 msgstr ""
-"Mipaka idadi ya maombi HTTP sambamba. Huathiri: - vyombo vya habari kuchota "
-"kama seva hutumia kipimo cha remote_media.\n"
-"-Serverlist kupakua na seva tangazo.\n"
-"-Downloads zifanywe Menyu kuu (k.m Meneja Moduli).\n"
-"Tu ina athari kama alikusanya na Mkunjo."
+"Shaders kuruhusu athari pevu onekana na inaweza kuongeza utendaji wa baadhi "
+"ya kadi ya video.\n"
+"Kazi yako tu na OpenGL video backend."
+
+#: src/settings_translation_file.cpp
+msgid "Shape of the minimap. Enabled = round, disabled = square."
+msgstr "Sura ya minimap ya. Kuwezeshwa = pande zote, walemavu = mraba."
+
+#: src/settings_translation_file.cpp
+msgid "Show debug info"
+msgstr "Onyesha maelezo kuhusu marekebisho"
+
+#: src/settings_translation_file.cpp
+msgid "Show entity selection boxes"
+msgstr "Onyesha chombo masanduku ya uteuzi"
+
+#: src/settings_translation_file.cpp
+msgid "Shutdown message"
+msgstr "Uzimaji ujumbe"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+"Ukubwa wa kikidondoka kutengenezwa mara kwa mwandishi ramani, katika "
+"mapblocks (fundo 16)."
+
+#: src/settings_translation_file.cpp
+msgid "Slope and fill work together to modify the heights"
+msgstr "Mteremko na Jaza kazi pamoja kurekebisha urefu"
+
+#: src/settings_translation_file.cpp
+msgid "Smooth lighting"
+msgstr "Taa laini"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Smooths camera when looking around. Also called look or mouse smoothing.\n"
+"Useful for recording videos."
+msgstr ""
+"Smooths kamera wakati wa kutafuta karibu. Pia huitwa kuangalia au kipanya "
+"unyooshaji.\n"
+"Muhimu kwa ajili ya kurekodi video."
+
+#: src/settings_translation_file.cpp
+msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
+msgstr "Smooths mzunguko wa kamera katika hali-tumizi cinematic. 0 kulemaza."
+
+#: src/settings_translation_file.cpp
+msgid "Smooths rotation of camera. 0 to disable."
+msgstr "Smooths mzunguko wa kamera. 0 kulemaza."
+
+#: src/settings_translation_file.cpp
+msgid "Sneak key"
+msgstr "Zawadi muhimu"
+
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Sauti"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Specifies URL from which client fetches media instead of using UDP.\n"
+"$filename should be accessible from $remote_media$filename via cURL\n"
+"(obviously, remote_media should end with a slash).\n"
+"Files that are not present will be fetched the usual way."
+msgstr ""
+"Inabainisha URL kutoka ambayo mteja fetches vyombo vya habari badala ya "
+"kutumia UDP.\n"
+"$filename lazima kupatikana kutoka $remote_media$ JinaFaili kupitia cURL (ni "
+"wazi, remote_media lazima kumaliza na kufyeka na).\n"
+"Faili ambayo sasa itakuwa kuwa fetched njia ya kawaida."
+
+#: src/settings_translation_file.cpp
+msgid "Static spawnpoint"
+msgstr "Spawnpoint tuli"
+
+#: src/settings_translation_file.cpp
+msgid "Strength of generated normalmaps."
+msgstr "Nguvu ya normalmaps inayozalishwa."
+
+#: src/settings_translation_file.cpp
+msgid "Strength of parallax."
+msgstr "Nguvu ya parallax."
+
+#: src/settings_translation_file.cpp
+msgid "Strict protocol checking"
+msgstr "Itifaki ya kali kukagua"
+
+#: src/settings_translation_file.cpp
+msgid "Support older servers"
+msgstr "Msaada mkubwa seva"
+
+#: src/settings_translation_file.cpp
+msgid "Synchronous SQLite"
+msgstr "SQLite Uvingirizi"
+
+#: src/settings_translation_file.cpp
+msgid "Terrain Height"
+msgstr "Urefu wa ardhi"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for hills.\n"
+"Controls proportion of world area covered by hills.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+"Ardhi kelele kizingiti kwa milima.\n"
+"Vidhibiti vya uwiano wa dunia eneo lililofunikwa na milima.\n"
+"Rekebisha kuelekea 0.0 kwa sehemu kubwa."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for lakes.\n"
+"Controls proportion of world area covered by lakes.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+"Ardhi kelele kizingiti kwa ajili ya maziwa.\n"
+"Vidhibiti vya uwiano wa dunia eneo lililofunikwa na maziwa.\n"
+"Rekebisha kuelekea 0.0 kwa sehemu kubwa."
+
+#: src/settings_translation_file.cpp
+msgid "Texture path"
+msgstr "Njia ya unamu"
+
+#: src/settings_translation_file.cpp
+msgid "The altitude at which temperature drops by 20C"
+msgstr "Mwinuko katika matone ambayo joto na 20C"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+"Umbizo wa chaguo-msingi ambayo maumbo ni kuokoka, wakati wito '/ profiler "
+"Hifadhi [umbizo]' bila umbizo."
+
+#: src/settings_translation_file.cpp
+msgid "The depth of dirt or other filler"
+msgstr "Kina cha uchafu au filler nyingine"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your worldpath in which profiles will be saved "
+"to.\n"
+msgstr ""
+"Kijia cha faili jamaa yako worldpath ambayo maumbo utaakibishwa kwenye."
+
+#: src/settings_translation_file.cpp
+msgid "The network interface that the server listens on."
+msgstr "Interface mtandao kwamba seva husikiliza juu."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The privileges that new users automatically get.\n"
+"See /privs in game for a full list on your server and mod configuration."
+msgstr ""
+"Upendeleo kwamba watumiaji wapya otomatiki kupata.\n"
+"Ona /privs katika mchezo kwa ajili ya orodha kamili kwenye msabidi wa seva "
+"na Moduli."
+
+#: src/settings_translation_file.cpp
+msgid "The rendering back-end for Irrlicht."
+msgstr "Utungulizaji nyuma-mwisho wa Irrlicht."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"ingame view frustum around."
+msgstr "Unyeti wa Jira kifimbocheza kwa kuzunguka Mwoneko ingame frustum."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The strength (darkness) of node ambient-occlusion shading.\n"
+"Lower is darker, Higher is lighter. The valid range of values for this\n"
+"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
+"set to the nearest valid value."
+msgstr ""
+"Nguvu (giza) ya fundo iliyoko occlusion kivuli.\n"
+"Chini ni nyeusi, juu ni hafifu. Masafa halali ya thamani kwa ajili ya kipimo "
+"hiki ni 0.25 kwa 4.0 jumuishi. Kama thamani iko nje ya masafa ni itasetiwa "
+"kwenye ya karibu Thamani halali."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time (in seconds) that the liquids queue may grow beyond processing\n"
+"capacity until an attempt is made to decrease its size by dumping old queue\n"
+"items.  A value of 0 disables the functionality."
+msgstr ""
+"Muda (katika sekunde) kuwa foleni ya viowevu inaweza kukua zaidi usindikaji "
+"uwezo hadi jaribio ni alifanya kupungua ukubwa wake na utupaji vipengee "
+"kongwe ya foleni.  Thamani ya 0 Hulemaza utendaji."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+"Wakati katika sekunde inachukua kati ya matukio ya mara kwa mara wakati "
+"kushikilia chini kifimbocheza kitufe mchanganyiko."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated right clicks when holding the "
+"right mouse button."
+msgstr ""
+"Wakati katika sekunde inachukua kati ya vibonyezo mara kwa mara sahihi "
+"wakati wa kufanya kitufe cha kulia."
+
+#: src/settings_translation_file.cpp
+msgid "This font will be used for certain languages."
+msgstr "Fonti hii itatumika kwa lugha fulani."
+
+#: src/settings_translation_file.cpp
+msgid "Time in between active block management cycles"
+msgstr "Muda kati ya mizunguko ya usimamizi ya fungu amilifu"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Time in seconds for item entity (dropped items) to live.\n"
+"Setting it to -1 disables the feature."
+msgstr ""
+"Wakati katika sekunde kwa kipengee chombo (vitu chopo) kuishi.\n"
+"Kuweka kwa -1 Hulemaza kipengele."
+
+#: src/settings_translation_file.cpp
+msgid "Time send interval"
+msgstr "Wakati kutuma nafasi"
+
+#: src/settings_translation_file.cpp
+msgid "Time speed"
+msgstr "Kasi ya muda"
+
+#: src/settings_translation_file.cpp
+msgid "Timeout for client to remove unused map data from memory."
+msgstr ""
+"Muda wa kuisha kwa mteja kuondoa data ya ramani zisizotumika kutoka kwa "
+"kumbukumbu."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"To reduce lag, block transfers are slowed down when a player is building "
+"something.\n"
+"This determines how long they are slowed down after placing or removing a "
+"node."
+msgstr ""
+"Kupunguza bakia, uhamisho wa fungu ni sjunkit wakati mchezaji ni kujenga "
+"kitu.\n"
+"Hii huamua lini wao ni sjunkit baada ya kuweka au kuondoa fundo."
+
+#: src/settings_translation_file.cpp
+msgid "Toggle camera mode key"
+msgstr "Togoa kamera hali muhimu"
+
+#: src/settings_translation_file.cpp
+msgid "Tooltip delay"
+msgstr "Kidokezozana kuchelewa"
+
+#: src/settings_translation_file.cpp
+msgid "Trilinear filtering"
+msgstr "Uchujaji wa trilinear"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"True = 256\n"
+"False = 128\n"
+"Useable to make minimap smoother on slower machines."
+msgstr ""
+"Kweli = 256 bandia = Useable 128 kufanya minimap laini juu ya mashine "
+"polepole."
+
+#: src/settings_translation_file.cpp
+msgid "Trusted mods"
+msgstr "Mods aminifu"
+
+#: src/settings_translation_file.cpp
+msgid "URL to the server list displayed in the Multiplayer Tab."
+msgstr ""
+"URL kwenye orodha ya seva iliyoonyeshwa katika kichupo cha Multiplayer."
+
+#: src/settings_translation_file.cpp
+msgid "Unlimited player transfer distance"
+msgstr "Umbali wa uhamisho wa mchezaji ukomo"
+
+#: src/settings_translation_file.cpp
+msgid "Unload unused server data"
+msgstr "Wakipakua zisizotumika seva ya data"
+
+#: src/settings_translation_file.cpp
+msgid "Use 3D cloud look instead of flat."
+msgstr "Matumizi wingu 3D kuangalia badala ya gorofa."
+
+#: src/settings_translation_file.cpp
+msgid "Use a cloud animation for the main menu background."
+msgstr "Tumia uhuishaji wa wingu ya mandharinyuma ya Menyu kuu."
+
+#: src/settings_translation_file.cpp
+msgid "Use anisotropic filtering when viewing at textures from an angle."
+msgstr "Tumia uchujaji anisotropic wakati unatazama katika unamu kutoka pembe."
+
+#: src/settings_translation_file.cpp
+msgid "Use bilinear filtering when scaling textures."
+msgstr "Tumia uchujaji bilinear wakati upimaji unamu."
+
+#: src/settings_translation_file.cpp
+msgid "Use key"
+msgstr "Ufunguo wa matumizi"
+
+#: src/settings_translation_file.cpp
+msgid "Use mip mapping to scale textures. May slightly increase performance."
+msgstr ""
+"Tumia ramani ya malaria kwa kipimo cha unamu. Huenda kidogo kuongeza "
+"utendaji."
+
+#: src/settings_translation_file.cpp
+msgid "Use trilinear filtering when scaling textures."
+msgstr "Tumia uchujaji trilinear wakati upimaji unamu."
+
+#: src/settings_translation_file.cpp
+msgid "V-Sync"
+msgstr "V-ulandanishi"
+
+#: src/settings_translation_file.cpp
+msgid "VBO"
+msgstr "VBO"
+
+#: src/settings_translation_file.cpp
+msgid "Valley Depth"
+msgstr "Kina wa Bonde"
+
+#: src/settings_translation_file.cpp
+msgid "Valley Fill"
+msgstr "Jaza ya Bonde"
+
+#: src/settings_translation_file.cpp
+msgid "Valley Profile"
+msgstr "Maelezo mafupi ya Bonde"
+
+#: src/settings_translation_file.cpp
+msgid "Valley Slope"
+msgstr "Mteremko wa Bonde"
+
+#: src/settings_translation_file.cpp
+msgid "Valleys C Flags"
+msgstr "Bendera ya mabonde C"
+
+#: src/settings_translation_file.cpp
+msgid "Vertical screen synchronization."
+msgstr "Ulandanishi wa kiwamba wima."
+
+#: src/settings_translation_file.cpp
+msgid "Video driver"
+msgstr "Kiendeshaji video"
+
+#: src/settings_translation_file.cpp
+msgid "View bobbing"
+msgstr "Mwoneko kando"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"View distance in nodes.\n"
+"Min = 20"
+msgstr ""
+"Onyesha umbali katika fundo.\n"
+"Min = 20"
+
+#: src/settings_translation_file.cpp
+msgid "View range decrease key"
+msgstr "Mwoneko masafa Punguza ufunguo"
+
+#: src/settings_translation_file.cpp
+msgid "View range increase key"
+msgstr "Mwoneko masafa ongezeko muhimu"
+
+#: src/settings_translation_file.cpp
+msgid "Viewing range"
+msgstr "Kuonyesha masafa"
+
+#: src/settings_translation_file.cpp
+msgid "Volume"
+msgstr "Kiasi"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"W co-ordinate of the generated 3D slice of a 4D fractal.\n"
+"Determines which 3D slice of the 4D shape is generated.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+"W kuratibu ya yanayotokana 3D kisu wa fractal wa 4 D.\n"
+"Huamua kisu ambayo 3D wa umbo 4D huundwa.\n"
+"Ina athari 3D fractals.\n"
+"Masafa ya takribani-2 hadi 2."
+
+#: src/settings_translation_file.cpp
+msgid "Walking speed"
+msgstr "Kutembea kasi"
+
+#: src/settings_translation_file.cpp
+msgid "Water Features"
+msgstr "Vipengele vya maji"
+
+#: src/settings_translation_file.cpp
+msgid "Water level"
+msgstr "Kiwango cha maji"
+
+#: src/settings_translation_file.cpp
+msgid "Water surface level of the world."
+msgstr "Maji ngazi ya uso wa dunia."
+
+#: src/settings_translation_file.cpp
+msgid "Waving Nodes"
+msgstr "Waving fundo"
+
+#: src/settings_translation_file.cpp
+msgid "Waving leaves"
+msgstr "Waving majani"
+
+#: src/settings_translation_file.cpp
+msgid "Waving plants"
+msgstr "Waving mimea"
+
+#: src/settings_translation_file.cpp
+msgid "Waving water"
+msgstr "Waving maji"
+
+#: src/settings_translation_file.cpp
+msgid "Waving water height"
+msgstr "Waving maji urefu"
+
+#: src/settings_translation_file.cpp
+msgid "Waving water length"
+msgstr "Waving maji urefu"
+
+#: src/settings_translation_file.cpp
+msgid "Waving water speed"
+msgstr "Waving kasi ya maji"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter is true, all GUI images need to be\n"
+"filtered in software, but some images are generated directly\n"
+"to hardware (e.g. render-to-texture for nodes in inventory)."
+msgstr ""
+"Wakati gui_scaling_filter ni kweli, yote GUI picha haja ya kuchujwa katika "
+"programu, lakini taswira zingine hutolewa moja kwa moja kwa maunzi (k.m "
+"kutoa-kwa-unamu kwa fundo katika hesabu)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter_txr2img is true, copy those images\n"
+"from hardware to software for scaling.  When false, fall back\n"
+"to the old scaling method, for video drivers that don't\n"
+"properly support downloading textures back from hardware."
+msgstr ""
+"Wakati gui_scaling_filter_txr2img ni kweli, kunakili picha hizo kutoka "
+"maunzi na programu kwa ajili ya kurekebisha.  Wakati uongo, kuanguka nyuma "
+"kwa mbinu ya zamani ya kipimo, kwa madereva video vizuri siungi mkono unamu "
+"Inapakua nyuma kutoka maunzi."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
+"can be blurred, so automatically upscale them with nearest-neighbor\n"
+"interpolation to preserve crisp pixels.  This sets the minimum texture size\n"
+"for the upscaled textures; higher values look sharper, but require more\n"
+"memory.  Powers of 2 are recommended.  Setting this higher than 1 may not\n"
+"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
+"enabled."
+msgstr ""
+"Wakati wa kutumia Vichujio bilinear/trilinear/anisotropic, unamu low-"
+"resolution unaweza kizunguzungu, hivyo otomatiki upscale yao na karibu "
+"jirani interpolation kuhifadhi pikseli hubainisha.  Hii Seti Ukubwa wa unamu "
+"chini kwa ajili ya unamu upscaled; thamani ya juu kuangalia kali, lakini "
+"zinahitaji kumbukumbu zaidi.  Nguvu ya 2 ni ilipendekeza.  Kuweka hii zaidi "
+"1 usiwe na athari inayoonekana isipokuwa uchujaji wa bilinear/trilinear/"
+"anisotropic ni kuwezeshwa."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Where the map generator stops.\n"
+"Please note:\n"
+"-    Limited to 31000 (setting above has no effect)\n"
+"-    The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n"
+"-    Those groups have an offset of -32, -32 nodes from the origin.\n"
+"-    Only groups which are within the map_generation_limit are generated"
+msgstr ""
+"Ambapo jenereta ramani hukomesha.\n"
+"Tafadhali kumbuka: - mdogo kwa 31000 (kipimo hapo juu ina athari) - jenereta "
+"ramani kazi katika makundi ya 80 x 80 x 80 fundo (5 x 5 x 5 MapBlocks).\n"
+"-Vikundi hivyo kuwa nje ya uwekaji wa-32,-32 fundo kutoka asili.\n"
+"-Tu vikundi vilivyo ndani ya map_generation_limit ni yanayotokana"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether freetype fonts are used, requires freetype support to be compiled in."
+msgstr ""
+"Kama freetype fonti hutumiwa, inahitaji msaada wa freetype kuwa alikusanya "
+"katika."
+
+#: src/settings_translation_file.cpp
+msgid "Whether node texture animations should be desynchronized per mapblock."
+msgstr "Kama fundo unamu uhuishaji lazima desynchronized kwa mapblock."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether players are shown to clients without any range limit.\n"
+"Deprecated, use the setting player_transfer_distance instead."
+msgstr ""
+"Kama wachezaji huonyeshwa kwa wateja bila kikomo yoyote mbalimbali.\n"
+"Deprecated, Tumia kipimo player_transfer_distance badala yake."
+
+#: src/settings_translation_file.cpp
+msgid "Whether to allow players to damage and kill each other."
+msgstr "Kama kuruhusu wachezaji kuharibu na kuua kila mmoja."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to ask clients to reconnect after a (Lua) crash.\n"
+"Set this to true if your server is set up to restart automatically."
+msgstr ""
+"Kama kuuliza wateja kuunganisha baada (Lua) ajali.\n"
+"Seti hii kweli kama seva yako ni kuanzisha kuwasha upya otomatiki."
+
+#: src/settings_translation_file.cpp
+msgid "Whether to fog out the end of the visible area."
+msgstr "Kama ukungu nje mwisho wa eneo hili dhahiri."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to show the client debug info (has the same effect as hitting F5)."
+msgstr ""
+"Kama kuonyesha mteja Rekebisha taarifa (ina athari sawa kama kupiga F5)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to support older servers before protocol version 25.\n"
+"Enable if you want to connect to 0.4.12 servers and before.\n"
+"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
+"Disabling this option will protect your password better."
+msgstr ""
+"Kama kusaidia seva za zamani kabla ya Itifaki ya toleo la 25.\n"
+"Wezesha kama unataka kuunganishwa 0.4.12 seva na kabla.\n"
+"Seva kuanzia na 0.4.13 kazi, 0.4.12-dev seva huenda kazi.\n"
+"Mlemavu chaguo hili kulinda nywila yako bora."
+
+#: src/settings_translation_file.cpp
+msgid "Width component of the initial window size."
+msgstr "Upana sehemu ya ukubwa cha kidirisha awali."
+
+#: src/settings_translation_file.cpp
+msgid "Width of the selectionbox's lines around nodes."
+msgstr "Upana wa mistari ya selectionbox karibu fundo."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"World directory (everything in the world is stored here).\n"
+"Not needed if starting from the main menu."
+msgstr ""
+"Mpangilio orodha ulimwengu (kila kitu ulimwenguni kuhifadhiwa hapa).\n"
+"Si zinahitajika kama kuanzia Menyu kuu."
+
+#: src/settings_translation_file.cpp
+msgid "Y of flat ground."
+msgstr "Y ya ardhi tambarare."
+
+#: src/settings_translation_file.cpp
+msgid "Y of upper limit of large pseudorandom caves."
+msgstr "Y ya upper kikomo ya kubwa pseudorandom cellars."
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL muda wa upakuzi wa faili"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum time in ms a file download (e.g. a mod download) may take."
-msgstr ""
-"Muda wa juu zaidi katika ms kupakua faili (kwa mfano upakuaji na Moduli) "
-"inaweza kuchukua."
+msgid "cURL parallel limit"
+msgstr "cURL kikomo sambamba"
 
 #: src/settings_translation_file.cpp
-msgid "High-precision FPU"
-msgstr "FPU kuu-usahihi"
-
-#: src/settings_translation_file.cpp
-msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
-msgstr "Hufanya DirectX kazi na LuaJIT. Lemaza ikiwa husababisha matatizo."
-
-#: src/settings_translation_file.cpp
-msgid "Main menu script"
-msgstr "Hati ya Menyu kuu"
-
-#: src/settings_translation_file.cpp
-msgid "Replaces the default main menu with a custom one."
-msgstr "Kinabadilisha chaguo-msingi Menyu kuu kwa moja maalum."
-
-#: src/settings_translation_file.cpp
-msgid "Main menu game manager"
-msgstr "Meneja wa mchezo wa Menyu kuu"
-
-#: src/settings_translation_file.cpp
-msgid "Main menu mod manager"
-msgstr "Menyu kuu Moduli Meneja"
-
-#: src/settings_translation_file.cpp
-msgid "Modstore download URL"
-msgstr "Modstore kupakua URL"
-
-#: src/settings_translation_file.cpp
-msgid "Modstore mods list URL"
-msgstr "Modstore mods orodha ya URL"
-
-#: src/settings_translation_file.cpp
-msgid "Modstore details URL"
-msgstr "Modstore maelezo URL"
-
-#: src/settings_translation_file.cpp
-msgid "Engine profiling data print interval"
-msgstr "Injini ubainishaji wa data ya uchapaji nafasi"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Print the engine's profiling data in regular intervals (in seconds). 0 = "
-"disable. Useful for developers."
-msgstr ""
-"Chapisha injini ya ubainishaji data katika vipindi vya kawaida (katika "
-"sekunde). 0 = Lemaza. Muhimu kwa watengenezaji."
+msgid "cURL timeout"
+msgstr "muda wa kuisha wa cURL"
diff --git a/po/tr/minetest.po b/po/tr/minetest.po
index 9d7b23e14..5348a0590 100644
--- a/po/tr/minetest.po
+++ b/po/tr/minetest.po
@@ -4343,60 +4343,60 @@ msgid "cURL timeout"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Dokular yükleniyor..."
+#~ msgid "Useful for mod developers."
+#~ msgstr "Ana geliştiriciler"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Ölçeklendirme menülere işlendi:"
+#~ msgid "No of course not!"
+#~ msgstr "Elbette hayır!"
 
-#~ msgid "Touch free target"
-#~ msgstr "Touch free target"
-
-#~ msgid "Downloading"
-#~ msgstr "İndiriliyor"
-
-#~ msgid "please wait..."
-#~ msgstr "lütfen bekleyin..."
-
-#~ msgid " KB/s"
-#~ msgstr " KB/s"
-
-#~ msgid " MB/s"
-#~ msgstr " MB/s"
-
-#~ msgid "Numpad "
-#~ msgstr "Numpad "
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın"
-
-#~ msgid "Rendering:"
-#~ msgstr "Kaplama:"
-
-#, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "Etkinleştirildi"
-
-#, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Paketi Kapat"
-
-#~ msgid "\""
-#~ msgstr "\""
-
-#~ msgid "No!!!"
-#~ msgstr "Hayır!!!"
+#~ msgid "Public Serverlist"
+#~ msgstr "Çevirimiçi Oyun Listesi"
 
 #, fuzzy
 #~ msgid "Generate Normalmaps"
 #~ msgstr "Normal haritalar oluştur"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Çevirimiçi Oyun Listesi"
+#~ msgid "No!!!"
+#~ msgstr "Hayır!!!"
 
-#~ msgid "No of course not!"
-#~ msgstr "Elbette hayır!"
+#~ msgid "\""
+#~ msgstr "\""
 
 #, fuzzy
-#~ msgid "Useful for mod developers."
-#~ msgstr "Ana geliştiriciler"
+#~ msgid "If disabled "
+#~ msgstr "Paketi Kapat"
+
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "Etkinleştirildi"
+
+#~ msgid "Rendering:"
+#~ msgstr "Kaplama:"
+
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın"
+
+#~ msgid "Numpad "
+#~ msgstr "Numpad "
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " KB/s"
+#~ msgstr " KB/s"
+
+#~ msgid "please wait..."
+#~ msgstr "lütfen bekleyin..."
+
+#~ msgid "Downloading"
+#~ msgstr "İndiriliyor"
+
+#~ msgid "Touch free target"
+#~ msgstr "Touch free target"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Ölçeklendirme menülere işlendi:"
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Dokular yükleniyor..."
diff --git a/po/uk/minetest.po b/po/uk/minetest.po
index c4187c7a8..0035c792f 100644
--- a/po/uk/minetest.po
+++ b/po/uk/minetest.po
@@ -10,14 +10,14 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-12-13 22:32+0000\n"
 "Last-Translator: Fixer <artem.brz@gmail.com>\n"
-"Language-Team: Ukrainian "
-"<https://hosted.weblate.org/projects/minetest/minetest/uk/>\n"
+"Language-Team: Ukrainian <https://hosted.weblate.org/projects/minetest/"
+"minetest/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.10-dev\n"
 
 #: builtin/fstk/ui.lua
@@ -4236,96 +4236,96 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "Завантаження текстур..."
+#~ msgid "No of course not!"
+#~ msgstr "Ні, звісно ні!"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "Масштабування елементів меню: "
+#~ msgid "Public Serverlist"
+#~ msgstr "Список публічних серверів"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "Вниз"
+#~ msgid "Generate Normalmaps"
+#~ msgstr "Генерувати карти нормалей"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr ""
-#~ "Ліва кнопка миші: Перемістити усі предмети, Права кнопка миші: "
-#~ "Перемістити один предмет"
-
-#~ msgid "is required by:"
-#~ msgstr "необхідний для:"
-
-#~ msgid "Configuration saved.  "
-#~ msgstr "Налаштування Збережено.  "
-
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "Попередження: Помилкова конфігурація.  "
-
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи"
-
-#~ msgid "Show Public"
-#~ msgstr "Показати Публічні"
-
-#~ msgid "Show Favorites"
-#~ msgstr "Показати Улюблені"
-
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Залишіть адресу незаповненою для створення локального серверу."
-
-#~ msgid "Create world"
-#~ msgstr "Створити світ"
-
-#~ msgid "Address required."
-#~ msgstr "Адреса необхідна."
-
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "Неможливо видалити світ: Нічого не вибрано"
-
-#~ msgid "Files to be deleted"
-#~ msgstr "Файлів, що підлягають видаленню"
-
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "Неможливо створити світ: Не знайдено жодної гри"
-
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано"
-
-#~ msgid "Failed to delete all world files"
-#~ msgstr "Помилка при видаленні файлів світу"
+#~ msgid "No!!!"
+#~ msgstr "Ні!!!"
 
 #, fuzzy
-#~ msgid "Finite Liquid"
-#~ msgstr "Кінцеві рідини"
-
-#~ msgid "Preload item visuals"
-#~ msgstr "Попереднє завантаження зображень"
-
-#, fuzzy
-#~ msgid "Password"
-#~ msgstr "Старий Пароль"
-
-#, fuzzy
-#~ msgid "Game Name"
-#~ msgstr "Гра"
+#~ msgid "If disabled "
+#~ msgstr "Вимкнути багатокористувацьку гру"
 
 #, fuzzy
 #~ msgid "If enabled, "
 #~ msgstr "Увімкнено"
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "Вимкнути багатокористувацьку гру"
-
-#~ msgid "No!!!"
-#~ msgstr "Ні!!!"
+#~ msgid "Game Name"
+#~ msgstr "Гра"
 
 #, fuzzy
-#~ msgid "Generate Normalmaps"
-#~ msgstr "Генерувати карти нормалей"
+#~ msgid "Password"
+#~ msgstr "Старий Пароль"
 
-#~ msgid "Public Serverlist"
-#~ msgstr "Список публічних серверів"
+#~ msgid "Preload item visuals"
+#~ msgstr "Попереднє завантаження зображень"
 
-#~ msgid "No of course not!"
-#~ msgstr "Ні, звісно ні!"
+#, fuzzy
+#~ msgid "Finite Liquid"
+#~ msgstr "Кінцеві рідини"
+
+#~ msgid "Failed to delete all world files"
+#~ msgstr "Помилка при видаленні файлів світу"
+
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано"
+
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "Неможливо створити світ: Не знайдено жодної гри"
+
+#~ msgid "Files to be deleted"
+#~ msgstr "Файлів, що підлягають видаленню"
+
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "Неможливо видалити світ: Нічого не вибрано"
+
+#~ msgid "Address required."
+#~ msgstr "Адреса необхідна."
+
+#~ msgid "Create world"
+#~ msgstr "Створити світ"
+
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Залишіть адресу незаповненою для створення локального серверу."
+
+#~ msgid "Show Favorites"
+#~ msgstr "Показати Улюблені"
+
+#~ msgid "Show Public"
+#~ msgstr "Показати Публічні"
+
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи"
+
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "Попередження: Помилкова конфігурація.  "
+
+#~ msgid "Configuration saved.  "
+#~ msgstr "Налаштування Збережено.  "
+
+#~ msgid "is required by:"
+#~ msgstr "необхідний для:"
+
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr ""
+#~ "Ліва кнопка миші: Перемістити усі предмети, Права кнопка миші: "
+#~ "Перемістити один предмет"
+
+#, fuzzy
+#~ msgid "Downloading"
+#~ msgstr "Вниз"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "Масштабування елементів меню: "
+
+#, fuzzy
+#~ msgid "Preload inventory textures"
+#~ msgstr "Завантаження текстур..."
diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po
index 446e169fe..cd70e573e 100644
--- a/po/zh_CN/minetest.po
+++ b/po/zh_CN/minetest.po
@@ -4317,70 +4317,108 @@ msgstr "cURL 并发限制"
 msgid "cURL timeout"
 msgstr "cURL 超时"
 
-#, fuzzy
-#~ msgid "Preload inventory textures"
-#~ msgstr "载入中..."
+#~ msgid "Detailed mod profiling"
+#~ msgstr "详细 mod 剖析"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "菜单元素应用缩放因子"
+#~ msgid "Useful for mod developers."
+#~ msgstr "适用 MOD 开发者。"
 
-#~ msgid "Touch free target"
-#~ msgstr "自由触摸目标"
+#~ msgid "No of course not!"
+#~ msgstr "当然不！"
+
+#~ msgid "Public Serverlist"
+#~ msgstr "公共服务器列表"
+
+#~ msgid "Generate Normalmaps"
+#~ msgstr "生成一般地图"
+
+#~ msgid "No!!!"
+#~ msgstr "不!!!"
 
 #, fuzzy
-#~ msgid "Downloading"
-#~ msgstr "下载中"
+#~ msgid "If disabled "
+#~ msgstr "禁用MOD包"
 
-#~ msgid " KB/s"
-#~ msgstr "千字节/秒"
+#, fuzzy
+#~ msgid "If enabled, "
+#~ msgstr "启用"
 
-#~ msgid " MB/s"
-#~ msgstr "兆字节/秒"
+#~ msgid "Restart minetest for driver change to take effect"
+#~ msgstr "重启minetest让驱动变化生效"
 
-#~ msgid "Left click: Move all items, Right click: Move single item"
-#~ msgstr "左键：移动所有物品，右键：移动单个物品"
+#~ msgid "Game Name"
+#~ msgstr "游戏名"
 
-#~ msgid "is required by:"
-#~ msgstr "被需要："
+#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
+#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”"
 
-#~ msgid "Configuration saved.  "
-#~ msgstr "配置已保存。  "
+#~ msgid "GAMES"
+#~ msgstr "游戏"
 
-#~ msgid "Warning: Configuration not consistent.  "
-#~ msgstr "警告：配置不一致。  "
+#~ msgid "Mods:"
+#~ msgstr "MODS："
 
-#~ msgid "Cannot create world: Name contains invalid characters"
-#~ msgstr "无法创建世界：名字包含非法字符"
+#~ msgid "new game"
+#~ msgstr "新建游戏"
 
-#~ msgid "Show Public"
-#~ msgstr "显示公共"
+#~ msgid "EDIT GAME"
+#~ msgstr "编辑游戏"
 
-#~ msgid "Show Favorites"
-#~ msgstr "显示最爱"
+#~ msgid "Remove selected mod"
+#~ msgstr "删除选中MOD"
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "地址栏留空可启动本地服务器。"
+#~ msgid "<<-- Add mod"
+#~ msgstr "<<-- 添加MOD"
 
-#~ msgid "Create world"
-#~ msgstr "创造世界"
+#~ msgid "CLIENT"
+#~ msgstr "客户端"
 
-#~ msgid "Address required."
-#~ msgstr "需要地址。"
+#~ msgid "START SERVER"
+#~ msgstr "启动服务器"
 
-#~ msgid "Cannot delete world: Nothing selected"
-#~ msgstr "无法删除世界：没有选择世界"
+#~ msgid "Name"
+#~ msgstr "名字"
 
-#~ msgid "Files to be deleted"
-#~ msgstr "将被删除的文件"
+#~ msgid "Password"
+#~ msgstr "密码"
 
-#~ msgid "Cannot create world: No games found"
-#~ msgstr "无法创造世界：未找到游戏模式"
+#~ msgid "SETTINGS"
+#~ msgstr "设置"
 
-#~ msgid "Cannot configure world: Nothing selected"
-#~ msgstr "无法配置世界：没有选择世界"
+#~ msgid "Preload item visuals"
+#~ msgstr "预先加载物品图像"
 
-#~ msgid "Failed to delete all world files"
-#~ msgstr "无法删除所有该世界的文件"
+#~ msgid "Finite Liquid"
+#~ msgstr "液体有限延伸"
+
+#~ msgid "SINGLE PLAYER"
+#~ msgstr "单人游戏"
+
+#~ msgid "TEXTURE PACKS"
+#~ msgstr "材质包"
+
+#~ msgid "MODS"
+#~ msgstr "MODS"
+
+#~ msgid "Add mod:"
+#~ msgstr "添加MOD："
+
+#~ msgid "Local install"
+#~ msgstr "本地安装"
+
+#~ msgid ""
+#~ "Warning: Some mods are not configured yet.\n"
+#~ "They will be enabled by default when you save the configuration.  "
+#~ msgstr ""
+#~ "警告：一些MOD仍未设定。\n"
+#~ "它们会在你保存配置的时候自动启用。  "
+
+#~ msgid ""
+#~ "Warning: Some configured mods are missing.\n"
+#~ "Their setting will be removed when you save the configuration.  "
+#~ msgstr ""
+#~ "警告：缺少一些设定了的MOD。\n"
+#~ "它们的设置会在你保存配置的时候被移除。  "
 
 #~ msgid ""
 #~ "Default Controls:\n"
@@ -4408,105 +4446,67 @@ msgstr "cURL 超时"
 #~ "ESC：菜单\n"
 #~ "T：聊天\n"
 
-#~ msgid ""
-#~ "Warning: Some configured mods are missing.\n"
-#~ "Their setting will be removed when you save the configuration.  "
-#~ msgstr ""
-#~ "警告：缺少一些设定了的MOD。\n"
-#~ "它们的设置会在你保存配置的时候被移除。  "
+#~ msgid "Failed to delete all world files"
+#~ msgstr "无法删除所有该世界的文件"
 
-#~ msgid ""
-#~ "Warning: Some mods are not configured yet.\n"
-#~ "They will be enabled by default when you save the configuration.  "
-#~ msgstr ""
-#~ "警告：一些MOD仍未设定。\n"
-#~ "它们会在你保存配置的时候自动启用。  "
+#~ msgid "Cannot configure world: Nothing selected"
+#~ msgstr "无法配置世界：没有选择世界"
 
-#~ msgid "Local install"
-#~ msgstr "本地安装"
+#~ msgid "Cannot create world: No games found"
+#~ msgstr "无法创造世界：未找到游戏模式"
 
-#~ msgid "Add mod:"
-#~ msgstr "添加MOD："
+#~ msgid "Files to be deleted"
+#~ msgstr "将被删除的文件"
 
-#~ msgid "MODS"
-#~ msgstr "MODS"
+#~ msgid "Cannot delete world: Nothing selected"
+#~ msgstr "无法删除世界：没有选择世界"
 
-#~ msgid "TEXTURE PACKS"
-#~ msgstr "材质包"
+#~ msgid "Address required."
+#~ msgstr "需要地址。"
 
-#~ msgid "SINGLE PLAYER"
-#~ msgstr "单人游戏"
+#~ msgid "Create world"
+#~ msgstr "创造世界"
 
-#~ msgid "Finite Liquid"
-#~ msgstr "液体有限延伸"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "地址栏留空可启动本地服务器。"
 
-#~ msgid "Preload item visuals"
-#~ msgstr "预先加载物品图像"
+#~ msgid "Show Favorites"
+#~ msgstr "显示最爱"
 
-#~ msgid "SETTINGS"
-#~ msgstr "设置"
+#~ msgid "Show Public"
+#~ msgstr "显示公共"
 
-#~ msgid "Password"
-#~ msgstr "密码"
+#~ msgid "Cannot create world: Name contains invalid characters"
+#~ msgstr "无法创建世界：名字包含非法字符"
 
-#~ msgid "Name"
-#~ msgstr "名字"
+#~ msgid "Warning: Configuration not consistent.  "
+#~ msgstr "警告：配置不一致。  "
 
-#~ msgid "START SERVER"
-#~ msgstr "启动服务器"
+#~ msgid "Configuration saved.  "
+#~ msgstr "配置已保存。  "
 
-#~ msgid "CLIENT"
-#~ msgstr "客户端"
+#~ msgid "is required by:"
+#~ msgstr "被需要："
 
-#~ msgid "<<-- Add mod"
-#~ msgstr "<<-- 添加MOD"
+#~ msgid "Left click: Move all items, Right click: Move single item"
+#~ msgstr "左键：移动所有物品，右键：移动单个物品"
 
-#~ msgid "Remove selected mod"
-#~ msgstr "删除选中MOD"
+#~ msgid " MB/s"
+#~ msgstr "兆字节/秒"
 
-#~ msgid "EDIT GAME"
-#~ msgstr "编辑游戏"
-
-#~ msgid "new game"
-#~ msgstr "新建游戏"
-
-#~ msgid "Mods:"
-#~ msgstr "MODS："
-
-#~ msgid "GAMES"
-#~ msgstr "游戏"
-
-#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
-#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”"
-
-#~ msgid "Game Name"
-#~ msgstr "游戏名"
-
-#~ msgid "Restart minetest for driver change to take effect"
-#~ msgstr "重启minetest让驱动变化生效"
+#~ msgid " KB/s"
+#~ msgstr "千字节/秒"
 
 #, fuzzy
-#~ msgid "If enabled, "
-#~ msgstr "启用"
+#~ msgid "Downloading"
+#~ msgstr "下载中"
+
+#~ msgid "Touch free target"
+#~ msgstr "自由触摸目标"
+
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "菜单元素应用缩放因子"
 
 #, fuzzy
-#~ msgid "If disabled "
-#~ msgstr "禁用MOD包"
-
-#~ msgid "No!!!"
-#~ msgstr "不!!!"
-
-#~ msgid "Generate Normalmaps"
-#~ msgstr "生成一般地图"
-
-#~ msgid "Public Serverlist"
-#~ msgstr "公共服务器列表"
-
-#~ msgid "No of course not!"
-#~ msgstr "当然不！"
-
-#~ msgid "Useful for mod developers."
-#~ msgstr "适用 MOD 开发者。"
-
-#~ msgid "Detailed mod profiling"
-#~ msgstr "详细 mod 剖析"
+#~ msgid "Preload inventory textures"
+#~ msgstr "载入中..."
diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po
index 8da48fd69..7718ae462 100644
--- a/po/zh_TW/minetest.po
+++ b/po/zh_TW/minetest.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-10-15 08:04+0000\n"
 "Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) "
-"<https://hosted.weblate.org/projects/minetest/minetest/zh_TW/>\n"
+"Language-Team: Chinese (Taiwan) <https://hosted.weblate.org/projects/"
+"minetest/minetest/zh_TW/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2747,8 +2747,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "切換自動奔跑的按鍵。\n"
-"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"請見 http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2807,8 +2807,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "切換視角更新的按鍵。僅對開發有用。\n"
-"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e"
-"3da1b0edf72eb3"
+"請見 http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4601,69 +4601,34 @@ msgstr "cURL 並行限制"
 msgid "cURL timeout"
 msgstr "cURL 逾時"
 
-#, fuzzy
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen flat.\n"
-#~ "Occasional lakes and hills can be added to the flat world.\n"
-#~ "The default flags set in the engine are: none\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "專用於 Mapgen flat 的地圖生成屬性。\n"
-#~ "偶而會在平坦的世界中加入湖泊與山丘。\n"
-#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
-#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"
+#~ msgid "Detailed mod profile data. Useful for mod developers."
+#~ msgstr "詳細的 mod 檔案資料。對 mod 開發者很有用。"
 
-#, fuzzy
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "The 'ridges' flag controls the rivers.\n"
-#~ "The default flags set in the engine are: mountains, ridges\n"
-#~ "The flags string modifies the engine defaults.\n"
-#~ "Flags that are not specified in the flag string are not modified from the "
-#~ "default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "專用於 Mapgen v6 的地圖生成屬性。\n"
-#~ "當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n"
-#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
-#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"
+#~ msgid "Detailed mod profiling"
+#~ msgstr "詳細的 mod 檔案"
 
 #~ msgid ""
-#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
-#~ "completely.\n"
-#~ "Note that this is not quite optimized and that smooth lighting on the\n"
-#~ "water surface doesn't work with this."
-#~ msgstr ""
-#~ "啟用略低的的水面，所以它就不會完全「填滿」節點。\n"
-#~ "注意，這個功能並未最佳化完成，水面的\n"
-#~ "柔和光功能無法與此功能一同運作。"
+#~ "How many blocks are flying in the wire simultaneously for the whole "
+#~ "server."
+#~ msgstr "整個伺服器有多少個區塊同時以線性方式飛行。"
 
-#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
-#~ msgstr "啟用節點選擇突顯（停用選取框）。"
+#~ msgid "How many blocks are flying in the wire simultaneously per client."
+#~ msgstr "每個客戶端有多少個區塊同時以線性方式飛行。"
 
-#~ msgid "Preload inventory textures"
-#~ msgstr "預先載入物品欄材質"
+#~ msgid "Useful for mod developers."
+#~ msgstr "對 mod 開發者很有用。"
 
-#~ msgid "Scaling factor applied to menu elements: "
-#~ msgstr "套用在選單元素的縮放係數： "
+#~ msgid "No of course not!"
+#~ msgstr "不，絕對不是！"
 
-#~ msgid "Touch free target"
-#~ msgstr "碰觸自由目標"
+#~ msgid "Public Serverlist"
+#~ msgstr "公共伺服器清單"
 
-#~ msgid "If enabled, "
-#~ msgstr "若啟用， "
+#~ msgid "Generate Normalmaps"
+#~ msgstr "生成一般地圖"
 
-#~ msgid "If disabled "
-#~ msgstr "若停用 "
-
-#~ msgid "Enable a bit lower water surface, so it doesn't "
-#~ msgstr "啟用較低的水面，所以它不會 "
-
-#~ msgid "\""
-#~ msgstr "\""
+#~ msgid "No!!!"
+#~ msgstr "否！！！"
 
 #~ msgid ""
 #~ "Map generation attributes specific to Mapgen Valleys.\n"
@@ -4683,31 +4648,66 @@ msgstr "cURL 逾時"
 #~ "「humid_rivers」會修改在河流附近的濕度，在那些區域附近水將會傾向變為一池。"
 #~ "這可能會對微妙調整過的生物群落造成干擾。"
 
-#~ msgid "No!!!"
-#~ msgstr "否！！！"
+#~ msgid "\""
+#~ msgstr "\""
 
-#~ msgid "Generate Normalmaps"
-#~ msgstr "生成一般地圖"
+#~ msgid "Enable a bit lower water surface, so it doesn't "
+#~ msgstr "啟用較低的水面，所以它不會 "
 
-#~ msgid "Public Serverlist"
-#~ msgstr "公共伺服器清單"
+#~ msgid "If disabled "
+#~ msgstr "若停用 "
 
-#~ msgid "No of course not!"
-#~ msgstr "不，絕對不是！"
+#~ msgid "If enabled, "
+#~ msgstr "若啟用， "
 
-#~ msgid "Useful for mod developers."
-#~ msgstr "對 mod 開發者很有用。"
+#~ msgid "Touch free target"
+#~ msgstr "碰觸自由目標"
 
-#~ msgid "How many blocks are flying in the wire simultaneously per client."
-#~ msgstr "每個客戶端有多少個區塊同時以線性方式飛行。"
+#~ msgid "Scaling factor applied to menu elements: "
+#~ msgstr "套用在選單元素的縮放係數： "
+
+#~ msgid "Preload inventory textures"
+#~ msgstr "預先載入物品欄材質"
+
+#~ msgid "Enable selection highlighting for nodes (disables selectionbox)."
+#~ msgstr "啟用節點選擇突顯（停用選取框）。"
 
 #~ msgid ""
-#~ "How many blocks are flying in the wire simultaneously for the whole "
-#~ "server."
-#~ msgstr "整個伺服器有多少個區塊同時以線性方式飛行。"
+#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node "
+#~ "completely.\n"
+#~ "Note that this is not quite optimized and that smooth lighting on the\n"
+#~ "water surface doesn't work with this."
+#~ msgstr ""
+#~ "啟用略低的的水面，所以它就不會完全「填滿」節點。\n"
+#~ "注意，這個功能並未最佳化完成，水面的\n"
+#~ "柔和光功能無法與此功能一同運作。"
 
-#~ msgid "Detailed mod profiling"
-#~ msgstr "詳細的 mod 檔案"
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "The 'ridges' flag controls the rivers.\n"
+#~ "The default flags set in the engine are: mountains, ridges\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "專用於 Mapgen v6 的地圖生成屬性。\n"
+#~ "當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n"
+#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
+#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"
 
-#~ msgid "Detailed mod profile data. Useful for mod developers."
-#~ msgstr "詳細的 mod 檔案資料。對 mod 開發者很有用。"
+#, fuzzy
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen flat.\n"
+#~ "Occasional lakes and hills can be added to the flat world.\n"
+#~ "The default flags set in the engine are: none\n"
+#~ "The flags string modifies the engine defaults.\n"
+#~ "Flags that are not specified in the flag string are not modified from the "
+#~ "default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "專用於 Mapgen flat 的地圖生成屬性。\n"
+#~ "偶而會在平坦的世界中加入湖泊與山丘。\n"
+#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n"
+#~ "以「no」開頭的旗標字串將會用於明確的停用它們。"

From f8408398f56b19ea277cb5921f0843ba06002574 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Tue, 13 Dec 2016 04:08:23 +0000
Subject: [PATCH 394/418] Cavegen: Wider tunnels in mgflat, mgfractal,
 mgvalleys

As mgv7 is now the default mapgen i re-checked its tunnel width on request,
discovered they needed to be wider, and have made this change.
This commit widens the identical 3D noise tunnels in the other mapgens in
exactly the same way.
---
 builtin/settingtypes.txt | 6 +++---
 minetest.conf.example    | 6 +++---
 src/mapgen_flat.cpp      | 2 +-
 src/mapgen_fractal.cpp   | 2 +-
 src/mapgen_valleys.cpp   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index df4484750..ea0ca9992 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -1016,7 +1016,7 @@ mgflat_ground_level (Mapgen flat ground level) int 8
 mgflat_large_cave_depth (Mapgen flat large cave depth) int -33
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
-mgflat_cave_width (Mapgen flat cave width) float 0.2
+mgflat_cave_width (Mapgen flat cave width) float 0.09
 
 #    Terrain noise threshold for lakes.
 #    Controls proportion of world area covered by lakes.
@@ -1046,7 +1046,7 @@ mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (67, 67
 [***Mapgen fractal]
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
-mgfractal_cave_width (Mapgen fractal cave width) float 0.2
+mgfractal_cave_width (Mapgen fractal cave width) float 0.09
 
 #    Choice of 18 fractals from 9 formulas.
 #    1 = 4D "Roundy" mandelbrot set.
@@ -1148,7 +1148,7 @@ mgvalleys_river_size (River Size) int 5
 mgvalleys_water_features (Water Features) int 0
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
-mgvalleys_cave_width (Cave width) float 0.2
+mgvalleys_cave_width (Cave width) float 0.09
 
 # Noise parameters
 [****Noises]
diff --git a/minetest.conf.example b/minetest.conf.example
index bdd28cda6..ff365466f 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1316,7 +1316,7 @@
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    type: float
-# mgflat_cave_width = 0.2
+# mgflat_cave_width = 0.09
 
 #    Terrain noise threshold for lakes.
 #    Controls proportion of world area covered by lakes.
@@ -1357,7 +1357,7 @@
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    type: float
-# mgfractal_cave_width = 0.2
+# mgfractal_cave_width = 0.09
 
 #    Choice of 18 fractals from 9 formulas.
 #    1 = 4D "Roundy" mandelbrot set.
@@ -1482,7 +1482,7 @@
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    type: float
-# mgvalleys_cave_width = 0.2
+# mgvalleys_cave_width = 0.09
 
 ##### Noises
 
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 2c1715e61..cc120b580 100644
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -82,7 +82,7 @@ MapgenFlatParams::MapgenFlatParams()
 	spflags          = 0;
 	ground_level     = 8;
 	large_cave_depth = -33;
-	cave_width       = 0.2;
+	cave_width       = 0.09;
 	lake_threshold   = -0.45;
 	lake_steepness   = 48.0;
 	hill_threshold   = 0.45;
diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index 0951a0afa..a6ed18ae7 100644
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -84,7 +84,7 @@ MapgenFractal::~MapgenFractal()
 MapgenFractalParams::MapgenFractalParams()
 {
 	spflags    = 0;
-	cave_width = 0.2;
+	cave_width = 0.09;
 	fractal    = 1;
 	iterations = 11;
 	scale      = v3f(4096.0, 1024.0, 4096.0);
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 456e6aa1a..ce7a95329 100644
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -143,7 +143,7 @@ MapgenValleysParams::MapgenValleysParams()
 	river_depth        = 4;  // How deep to carve river channels.
 	river_size         = 5;  // How wide to make rivers.
 	water_features     = 0;  // How often water will occur in caves.
-	cave_width         = 0.2;
+	cave_width         = 0.09;
 
 	np_cave1              = NoiseParams(0,     12,   v3f(61,   61,   61),   52534, 3, 0.5,   2.0);
 	np_cave2              = NoiseParams(0,     12,   v3f(67,   67,   67),   10325, 3, 0.5,   2.0);

From 0614da3afffb7657452ef4ca8c1f2e1e82067f86 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 14 Dec 2016 05:41:48 +0100
Subject: [PATCH 395/418] Fix build with gettext enabled

---
 po/sw/minetest.po | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/po/sw/minetest.po b/po/sw/minetest.po
index 82d704b07..a1601a79c 100644
--- a/po/sw/minetest.po
+++ b/po/sw/minetest.po
@@ -293,6 +293,7 @@ msgid ""
 "\n"
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
+"\n"
 "Sakinisha Moduli: filetype visivyotegemezwa \"dola 1\" au nyaraka kuvunjwa"
 
 #: builtin/mainmenu/modmgr.lua
@@ -740,7 +741,9 @@ msgstr "Maalum Alphabet Inahitajika"
 msgid ""
 "\n"
 "Check debug.txt for details."
-msgstr "Angalia debug.txt kwa maelezo."
+msgstr ""
+"\n"
+"Angalia debug.txt kwa maelezo."
 
 #: src/game.cpp
 msgid "Change Keys"
@@ -780,10 +783,17 @@ msgid ""
 "- Mouse wheel: select item\n"
 "- T: chat\n"
 msgstr ""
-"Vidhibiti vya chaguo-msingi:-WASD: hoja - nafasi: kuruka/kupanda - Hamisha: "
-"taarifa/kwenda chini - q: tone kipengee - nikasema hesabu - kipanya: kugeuka/"
-"kuangalia - kipanya kushoto: kuchimba/punch - kipanya kulia: mahali/matumizi "
-"- kipanya gurudumu: Teua kipengee - T: mazungumzo"
+"Vidhibiti vya chaguo-msingi:\n"
+"-WASD: hoja\n"
+"- nafasi: kuruka/kupanda\n"
+"- Hamisha:taarifa/kwenda chini\n"
+"- q: tone kipengee\n"
+"- nikasema hesabu\n"
+"- kipanya: kugeuka/kuangalia\n"
+"- kipanya kushoto: kuchimba/punch\n"
+"- kipanya kulia: mahali/matumizi\n"
+"- kipanya gurudumu: Teua kipengee\n"
+"- T: mazungumzo\n"
 
 #: src/game.cpp
 msgid ""
@@ -800,11 +810,16 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
-"Vidhibiti vya chaguo-msingi: Hakuna Menyu kuonekana:-bomba moja: kitufe "
-"kuamilisha - mara mbili bomba: mahali/matumizi - slaidi kidole: kuangalia "
-"kote Menyu/hesabu dhahiri: - mara mbili bomba (nje):--> Funga - kugusa "
-"mpororo, kugusa mpenyo:--> hoja mpororo - kugusa & buruta, bomba kidole 2--> "
-"kipengee kimoja mahali kwa yanayopangwa"
+"Vidhibiti vya chaguo-msingi:\n"
+"Hakuna Menyu kuonekana:\n"
+"- bomba moja: kitufe kuamilisha\n"
+"- mara mbili bomba: mahali/matumizi\n"
+"- slaidi kidole: kuangalia kote\n"
+"Menyu/hesabu dhahiri:\n"
+"- mara mbili bomba (nje):--> Funga - kugusa \n"
+"mpororo, kugusa mpenyo:--> hoja mpororo\n"
+"- kugusa & buruta, bomba kidole 2--> \n"
+"kipengee kimoja mahali kwa yanayopangwa\n"
 
 #: src/game.cpp
 msgid "Exit to Menu"
@@ -4199,7 +4214,7 @@ msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
-"Umbizo wa chaguo-msingi ambayo maumbo ni kuokoka, wakati wito '/ profiler "
+"Umbizo wa chaguo-msingi ambayo maumbo ni kuokoka, wakati wito '/ profiler\n"
 "Hifadhi [umbizo]' bila umbizo."
 
 #: src/settings_translation_file.cpp
@@ -4211,7 +4226,7 @@ msgid ""
 "The file path relative to your worldpath in which profiles will be saved "
 "to.\n"
 msgstr ""
-"Kijia cha faili jamaa yako worldpath ambayo maumbo utaakibishwa kwenye."
+"Kijia cha faili jamaa yako worldpath ambayo maumbo utaakibishwa kwenye.\n"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."

From 78bf7c46e5fe8845e9a9f65b98db32b0ff398ad3 Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar@foo-projects.org>
Date: Thu, 15 Dec 2016 20:55:41 -0800
Subject: [PATCH 396/418] Mapgen: Make mgv7 the default in UI

The actual menu default comes from defaultsettings.cpp.
---
 builtin/settingtypes.txt | 2 +-
 minetest.conf.example    | 2 +-
 src/defaultsettings.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index ea0ca9992..f0ddd5bc0 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -862,7 +862,7 @@ block_send_optimize_distance (block send optimize distance) int 4 2
 
 #    Name of map generator to be used when creating a new world.
 #    Creating a world in the main menu will override this.
-mg_name (Mapgen name) enum v6 v5,v6,v7,flat,valleys,fractal,singlenode
+mg_name (Mapgen name) enum v7 v5,v6,v7,flat,valleys,fractal,singlenode
 
 #    Water surface level of the world.
 water_level (Water level) int 1
diff --git a/minetest.conf.example b/minetest.conf.example
index ff365466f..6c7d1e66b 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1053,7 +1053,7 @@
 #    Name of map generator to be used when creating a new world.
 #    Creating a world in the main menu will override this.
 #    type: enum values: v5, v6, v7, flat, valleys, fractal, singlenode
-# mg_name = v6
+# mg_name = v7
 
 #    Water surface level of the world.
 #    type: int
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index bd88cf530..60a34cf63 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -327,7 +327,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("liquid_update", "1.0");
 
 	//mapgen stuff
-	settings->setDefault("mg_name", "v6");
+	settings->setDefault("mg_name", "v7");
 	settings->setDefault("water_level", "1");
 	settings->setDefault("chunksize", "5");
 	settings->setDefault("mg_flags", "dungeons");

From 6d4e7f223a8d79d820546ad750448ee4ecbb1e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20Juh=C3=A1sz?= <juhdanad@gmail.com>
Date: Sun, 18 Dec 2016 10:20:23 +0100
Subject: [PATCH 397/418] Fix unnecessary block loading (#4847)

This commit makes the game load blocks only if they are not in the
memory.
---
 src/emerge.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/emerge.cpp b/src/emerge.cpp
index bdb5e0729..25b2e924b 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -508,13 +508,15 @@ EmergeAction EmergeThread::getBlockOrStartGen(
 
 	// 1). Attempt to fetch block from memory
 	*block = m_map->getBlockNoCreateNoEx(pos);
-	if (*block && !(*block)->isDummy() && (*block)->isGenerated())
-		return EMERGE_FROM_MEMORY;
-
-	// 2). Attempt to load block from disk
-	*block = m_map->loadBlock(pos);
-	if (*block && (*block)->isGenerated())
-		return EMERGE_FROM_DISK;
+	if (*block && !(*block)->isDummy()) {
+		if ((*block)->isGenerated())
+			return EMERGE_FROM_MEMORY;
+	} else {
+		// 2). Attempt to load block from disk if it was not in the memory
+		*block = m_map->loadBlock(pos);
+		if (*block && (*block)->isGenerated())
+			return EMERGE_FROM_DISK;
+	}
 
 	// 3). Attempt to start generation
 	if (allow_gen && m_map->initBlockMake(pos, bmdata))

From e4f7ce1985bda1c37b62f24d028828c5d3851ca2 Mon Sep 17 00:00:00 2001
From: lhofhansl <lhofhansl@yahoo.com>
Date: Sun, 18 Dec 2016 04:25:42 -0800
Subject: [PATCH 398/418] Fix occlusing counting (#4922)

---
 src/clientmap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index 8691cc0b2..db71d4b57 100644
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -132,9 +132,9 @@ static bool isOccluded(Map *map, v3s16 p0, v3s16 p1, float step, float stepfac,
 		else
 			is_transparent = (f.solidness != 2);
 		if(!is_transparent){
-			if(count == needed_count)
-				return true;
 			count++;
+			if(count >= needed_count)
+				return true;
 		}
 		step *= stepfac;
 	}

From 24edfb77afbb631cb83d26a095b609850f997e5c Mon Sep 17 00:00:00 2001
From: lhofhansl <lhofhansl@yahoo.com>
Date: Sun, 18 Dec 2016 21:43:04 -0800
Subject: [PATCH 399/418] Fix occlusion culling, again (#4930)

---
 src/clientmap.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index db71d4b57..faa1461f6 100644
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -301,7 +301,10 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver)
 			float endoff = -BS * MAP_BLOCKSIZE * 1.732050807569;
 			v3s16 spn = cam_pos_nodes;
 			s16 bs2 = MAP_BLOCKSIZE / 2 + 1;
-			u32 needed_count = 1;
+			// to reduce the likelihood of falsely occluded blocks
+			// require at least two solid blocks
+			// this is a HACK, we should think of a more precise algorithm
+			u32 needed_count = 2;
 			if (occlusion_culling_enabled &&
 					// For the central point of the mapblock 'endoff' can be halved
 					isOccluded(this, spn, cpn,

From 59f84ca0a07e50dd5ce050d38ae1aeb529bd25ac Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Mon, 5 Dec 2016 19:59:15 +0000
Subject: [PATCH 400/418] Mod security: Allow read-only access to all mod paths

---
 src/script/cpp_api/s_security.cpp  | 84 +++++++++++++++++++++---------
 src/script/cpp_api/s_security.h    | 21 +++++---
 src/script/lua_api/l_areastore.cpp |  4 +-
 src/script/lua_api/l_mapgen.cpp    |  2 +-
 src/script/lua_api/l_settings.cpp  | 13 +++--
 src/script/lua_api/l_settings.h    |  3 +-
 src/script/lua_api/l_util.cpp      |  4 +-
 src/server.h                       |  1 +
 8 files changed, 90 insertions(+), 42 deletions(-)

diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index c9816f89b..b915747c6 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -336,8 +336,12 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
 }
 
 
-bool ScriptApiSecurity::checkPath(lua_State *L, const char *path)
+bool ScriptApiSecurity::checkPath(lua_State *L, const char *path,
+		bool write_required, bool *write_allowed)
 {
+	if (write_allowed)
+		*write_allowed = false;
+
 	std::string str;  // Transient
 
 	std::string norel_path = fs::RemoveRelativePathComponents(path);
@@ -380,32 +384,53 @@ bool ScriptApiSecurity::checkPath(lua_State *L, const char *path)
 
 		// Builtin can access anything
 		if (mod_name == BUILTIN_MOD_NAME) {
+			if (write_allowed) *write_allowed = true;
 			return true;
 		}
 
 		// Allow paths in mod path
-		const ModSpec *mod = server->getModSpec(mod_name);
-		if (mod) {
-			str = fs::AbsolutePath(mod->path);
-			if (!str.empty() && fs::PathStartsWith(abs_path, str)) {
-				return true;
+		// Don't bother if write access isn't important, since it will be handled later
+		if (write_required || write_allowed != NULL) {
+			const ModSpec *mod = server->getModSpec(mod_name);
+			if (mod) {
+				str = fs::AbsolutePath(mod->path);
+				if (!str.empty() && fs::PathStartsWith(abs_path, str)) {
+					if (write_allowed) *write_allowed = true;
+					return true;
+				}
 			}
 		}
 	}
 	lua_pop(L, 1);  // Pop mod name
 
-	str = fs::AbsolutePath(server->getWorldPath());
-	if (str.empty()) return false;
-	// Don't allow access to world mods.  We add to the absolute path
-	// of the world instead of getting the absolute paths directly
-	// because that won't work if they don't exist.
-	if (fs::PathStartsWith(abs_path, str + DIR_DELIM + "worldmods") ||
-			fs::PathStartsWith(abs_path, str + DIR_DELIM + "game")) {
-		return false;
+	// Allow read-only access to all mod directories
+	if (!write_required) {
+		const std::vector<ModSpec> mods = server->getMods();
+		for (size_t i = 0; i < mods.size(); ++i) {
+			str = fs::AbsolutePath(mods[i].path);
+			if (!str.empty() && fs::PathStartsWith(abs_path, str)) {
+				return true;
+			}
+		}
 	}
-	// Allow all other paths in world path
-	if (fs::PathStartsWith(abs_path, str)) {
-		return true;
+
+	str = fs::AbsolutePath(server->getWorldPath());
+	if (!str.empty()) {
+		// Don't allow access to other paths in the world mod/game path.
+		// These have to be blocked so you can't override a trusted mod
+		// by creating a mod with the same name in a world mod directory.
+		// We add to the absolute path of the world instead of getting
+		// the absolute paths directly because that won't work if they
+		// don't exist.
+		if (fs::PathStartsWith(abs_path, str + DIR_DELIM + "worldmods") ||
+				fs::PathStartsWith(abs_path, str + DIR_DELIM + "game")) {
+			return false;
+		}
+		// Allow all other paths in world path
+		if (fs::PathStartsWith(abs_path, str)) {
+			if (write_allowed) *write_allowed = true;
+			return true;
+		}
 	}
 
 	// Default to disallowing
@@ -476,7 +501,7 @@ int ScriptApiSecurity::sl_g_loadfile(lua_State *L)
 
 	if (lua_isstring(L, 1)) {
 		path = lua_tostring(L, 1);
-		CHECK_SECURE_PATH(L, path);
+		CHECK_SECURE_PATH_INTERNAL(L, path, false, NULL);
 	}
 
 	if (!safeLoadFile(L, path)) {
@@ -529,7 +554,16 @@ int ScriptApiSecurity::sl_io_open(lua_State *L)
 
 	luaL_checktype(L, 1, LUA_TSTRING);
 	const char *path = lua_tostring(L, 1);
-	CHECK_SECURE_PATH(L, path);
+
+	bool write_requested = false;
+	if (with_mode) {
+		luaL_checktype(L, 2, LUA_TSTRING);
+		const char *mode = lua_tostring(L, 2);
+		write_requested = strchr(mode, 'w') != NULL ||
+			strchr(mode, '+') != NULL ||
+			strchr(mode, 'a') != NULL;
+	}
+	CHECK_SECURE_PATH_INTERNAL(L, path, write_requested, NULL);
 
 	push_original(L, "io", "open");
 	lua_pushvalue(L, 1);
@@ -546,7 +580,7 @@ int ScriptApiSecurity::sl_io_input(lua_State *L)
 {
 	if (lua_isstring(L, 1)) {
 		const char *path = lua_tostring(L, 1);
-		CHECK_SECURE_PATH(L, path);
+		CHECK_SECURE_PATH_INTERNAL(L, path, false, NULL);
 	}
 
 	push_original(L, "io", "input");
@@ -560,7 +594,7 @@ int ScriptApiSecurity::sl_io_output(lua_State *L)
 {
 	if (lua_isstring(L, 1)) {
 		const char *path = lua_tostring(L, 1);
-		CHECK_SECURE_PATH(L, path);
+		CHECK_SECURE_PATH_INTERNAL(L, path, true, NULL);
 	}
 
 	push_original(L, "io", "output");
@@ -574,7 +608,7 @@ int ScriptApiSecurity::sl_io_lines(lua_State *L)
 {
 	if (lua_isstring(L, 1)) {
 		const char *path = lua_tostring(L, 1);
-		CHECK_SECURE_PATH(L, path);
+		CHECK_SECURE_PATH_INTERNAL(L, path, false, NULL);
 	}
 
 	int top_precall = lua_gettop(L);
@@ -591,11 +625,11 @@ int ScriptApiSecurity::sl_os_rename(lua_State *L)
 {
 	luaL_checktype(L, 1, LUA_TSTRING);
 	const char *path1 = lua_tostring(L, 1);
-	CHECK_SECURE_PATH(L, path1);
+	CHECK_SECURE_PATH_INTERNAL(L, path1, true, NULL);
 
 	luaL_checktype(L, 2, LUA_TSTRING);
 	const char *path2 = lua_tostring(L, 2);
-	CHECK_SECURE_PATH(L, path2);
+	CHECK_SECURE_PATH_INTERNAL(L, path2, true, NULL);
 
 	push_original(L, "os", "rename");
 	lua_pushvalue(L, 1);
@@ -609,7 +643,7 @@ int ScriptApiSecurity::sl_os_remove(lua_State *L)
 {
 	luaL_checktype(L, 1, LUA_TSTRING);
 	const char *path = lua_tostring(L, 1);
-	CHECK_SECURE_PATH(L, path);
+	CHECK_SECURE_PATH_INTERNAL(L, path, true, NULL);
 
 	push_original(L, "os", "remove");
 	lua_pushvalue(L, 1);
diff --git a/src/script/cpp_api/s_security.h b/src/script/cpp_api/s_security.h
index 97bc5c067..6876108e8 100644
--- a/src/script/cpp_api/s_security.h
+++ b/src/script/cpp_api/s_security.h
@@ -23,14 +23,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "cpp_api/s_base.h"
 
 
-#define CHECK_SECURE_PATH(L, path) \
-	if (!ScriptApiSecurity::checkPath(L, path)) { \
-		throw LuaError(std::string("Attempt to access external file ") + \
-					path + " with mod security on."); \
+#define CHECK_SECURE_PATH_INTERNAL(L, path, write_required, ptr) \
+	if (!ScriptApiSecurity::checkPath(L, path, write_required, ptr)) { \
+		throw LuaError(std::string("Mod security: Blocked attempted ") + \
+				(write_required ? "write to " : "read from ") + path); \
 	}
-#define CHECK_SECURE_PATH_OPTIONAL(L, path) \
+#define CHECK_SECURE_PATH(L, path, write_required) \
 	if (ScriptApiSecurity::isSecure(L)) { \
-		CHECK_SECURE_PATH(L, path); \
+		CHECK_SECURE_PATH_INTERNAL(L, path, write_required, NULL); \
+	}
+#define CHECK_SECURE_PATH_POSSIBLE_WRITE(L, path, ptr) \
+	if (ScriptApiSecurity::isSecure(L)) { \
+		CHECK_SECURE_PATH_INTERNAL(L, path, false, ptr); \
 	}
 
 
@@ -43,8 +47,9 @@ public:
 	static bool isSecure(lua_State *L);
 	// Loads a file as Lua code safely (doesn't allow bytecode).
 	static bool safeLoadFile(lua_State *L, const char *path);
-	// Checks if mods are allowed to read and write to the path
-	static bool checkPath(lua_State *L, const char *path);
+	// Checks if mods are allowed to read (and optionally write) to the path
+	static bool checkPath(lua_State *L, const char *path, bool write_required,
+			bool *write_allowed=NULL);
 
 private:
 	// Syntax: "sl_" <Library name or 'g' (global)> '_' <Function name>
diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp
index 0912e2ab0..09a5c78f9 100644
--- a/src/script/lua_api/l_areastore.cpp
+++ b/src/script/lua_api/l_areastore.cpp
@@ -263,7 +263,7 @@ int LuaAreaStore::l_to_file(lua_State *L)
 	AreaStore *ast = o->as;
 
 	const char *filename = luaL_checkstring(L, 2);
-	CHECK_SECURE_PATH_OPTIONAL(L, filename);
+	CHECK_SECURE_PATH(L, filename, true);
 
 	std::ostringstream os(std::ios_base::binary);
 	ast->serialize(os);
@@ -294,7 +294,7 @@ int LuaAreaStore::l_from_file(lua_State *L)
 	LuaAreaStore *o = checkobject(L, 1);
 
 	const char *filename = luaL_checkstring(L, 2);
-	CHECK_SECURE_PATH_OPTIONAL(L, filename);
+	CHECK_SECURE_PATH(L, filename, false);
 
 	std::ifstream is(filename, std::ios::binary);
 	return deserialization_helper(L, o->as, is);
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 281f68e46..bc1c32f03 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -1295,7 +1295,7 @@ int ModApiMapgen::l_create_schematic(lua_State *L)
 	INodeDefManager *ndef = getServer(L)->getNodeDefManager();
 
 	const char *filename = luaL_checkstring(L, 4);
-	CHECK_SECURE_PATH_OPTIONAL(L, filename);
+	CHECK_SECURE_PATH(L, filename, true);
 
 	Map *map = &(getEnv(L)->getMap());
 	Schematic schem;
diff --git a/src/script/lua_api/l_settings.cpp b/src/script/lua_api/l_settings.cpp
index 35b82b435..ea3d50857 100644
--- a/src/script/lua_api/l_settings.cpp
+++ b/src/script/lua_api/l_settings.cpp
@@ -118,6 +118,11 @@ int LuaSettings::l_write(lua_State* L)
 	NO_MAP_LOCK_REQUIRED;
 	LuaSettings* o = checkobject(L, 1);
 
+	if (!o->m_write_allowed) {
+		throw LuaError("Settings: writing " + o->m_filename +
+				" not allowed with mod security on.");
+	}
+
 	bool success = o->m_settings->updateConfigFile(o->m_filename.c_str());
 	lua_pushboolean(L, success);
 
@@ -142,8 +147,9 @@ int LuaSettings::l_to_table(lua_State* L)
 	return 1;
 }
 
-LuaSettings::LuaSettings(const char* filename)
+LuaSettings::LuaSettings(const char* filename, bool write_allowed)
 {
+	m_write_allowed = write_allowed;
 	m_filename = std::string(filename);
 
 	m_settings = new Settings();
@@ -188,9 +194,10 @@ void LuaSettings::Register(lua_State* L)
 int LuaSettings::create_object(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
+	bool write_allowed;
 	const char* filename = luaL_checkstring(L, 1);
-	CHECK_SECURE_PATH_OPTIONAL(L, filename);
-	LuaSettings* o = new LuaSettings(filename);
+	CHECK_SECURE_PATH_POSSIBLE_WRITE(L, filename, &write_allowed);
+	LuaSettings* o = new LuaSettings(filename, write_allowed);
 	*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
 	luaL_getmetatable(L, className);
 	lua_setmetatable(L, -2);
diff --git a/src/script/lua_api/l_settings.h b/src/script/lua_api/l_settings.h
index cb0c09a73..bca333e31 100644
--- a/src/script/lua_api/l_settings.h
+++ b/src/script/lua_api/l_settings.h
@@ -53,11 +53,12 @@ private:
 	// to_table(self) -> {[key1]=value1,...}
 	static int l_to_table(lua_State* L);
 
+	bool m_write_allowed;
 	Settings* m_settings;
 	std::string m_filename;
 
 public:
-	LuaSettings(const char* filename);
+	LuaSettings(const char* filename, bool write_allowed);
 	~LuaSettings();
 
 	// LuaSettings(filename)
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index 818c1aeeb..26e2b985c 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -388,7 +388,7 @@ int ModApiUtil::l_mkdir(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	const char *path = luaL_checkstring(L, 1);
-	CHECK_SECURE_PATH_OPTIONAL(L, path);
+	CHECK_SECURE_PATH(L, path, true);
 	lua_pushboolean(L, fs::CreateAllDirs(path));
 	return 1;
 }
@@ -400,7 +400,7 @@ int ModApiUtil::l_get_dir_list(lua_State *L)
 	const char *path = luaL_checkstring(L, 1);
 	short is_dir = lua_isboolean(L, 2) ? lua_toboolean(L, 2) : -1;
 
-	CHECK_SECURE_PATH_OPTIONAL(L, path);
+	CHECK_SECURE_PATH(L, path, false);
 
 	std::vector<fs::DirListNode> list = fs::GetDirListing(path);
 
diff --git a/src/server.h b/src/server.h
index cc2bcef25..4425d139b 100644
--- a/src/server.h
+++ b/src/server.h
@@ -298,6 +298,7 @@ public:
 	IWritableNodeDefManager* getWritableNodeDefManager();
 	IWritableCraftDefManager* getWritableCraftDefManager();
 
+	const std::vector<ModSpec> &getMods() const { return m_mods; }
 	const ModSpec* getModSpec(const std::string &modname) const;
 	void getModNames(std::vector<std::string> &modlist);
 	std::string getBuiltinLuaPath();

From f522e7351a1eaffcd4b0f1f06fab65a44281f972 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Fri, 16 Dec 2016 17:35:58 -0500
Subject: [PATCH 401/418] Fix RemoveRelatvePathComponents

This used to return "/foo" for "../foo" when it should return the enpty
string (i.e., error removing all relative components).
---
 src/filesys.cpp                | 35 ++++++++++++++++++----------------
 src/unittest/test_filepath.cpp |  5 ++++-
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/filesys.cpp b/src/filesys.cpp
index c718a9689..bd8b94aff 100644
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -617,48 +617,51 @@ std::string RemoveRelativePathComponents(std::string path)
 {
 	size_t pos = path.size();
 	size_t dotdot_count = 0;
-	while(pos != 0){
+	while (pos != 0) {
 		size_t component_with_delim_end = pos;
 		// skip a dir delimiter
-		while(pos != 0 && IsDirDelimiter(path[pos-1]))
+		while (pos != 0 && IsDirDelimiter(path[pos-1]))
 			pos--;
 		// strip a path component
 		size_t component_end = pos;
-		while(pos != 0 && !IsDirDelimiter(path[pos-1]))
+		while (pos != 0 && !IsDirDelimiter(path[pos-1]))
 			pos--;
 		size_t component_start = pos;
 
 		std::string component = path.substr(component_start,
 				component_end - component_start);
 		bool remove_this_component = false;
-		if(component == "." && component_start != 0){
+		if (component == ".") {
 			remove_this_component = true;
-		}
-		else if(component == ".."){
+		} else if (component == "..") {
 			remove_this_component = true;
 			dotdot_count += 1;
-		}
-		else if(dotdot_count != 0){
+		} else if (dotdot_count != 0) {
 			remove_this_component = true;
 			dotdot_count -= 1;
 		}
 
-		if(remove_this_component){
-			while(pos != 0 && IsDirDelimiter(path[pos-1]))
+		if (remove_this_component) {
+			while (pos != 0 && IsDirDelimiter(path[pos-1]))
 				pos--;
-			path = path.substr(0, pos) + DIR_DELIM +
-				path.substr(component_with_delim_end,
-						std::string::npos);
-			pos++;
+			if (component_start == 0) {
+				// We need to remove the delemiter too
+				path = path.substr(component_with_delim_end, std::string::npos);
+			} else {
+				path = path.substr(0, pos) + DIR_DELIM +
+					path.substr(component_with_delim_end, std::string::npos);
+			}
+			if (pos > 0)
+				pos++;
 		}
 	}
 
-	if(dotdot_count > 0)
+	if (dotdot_count > 0)
 		return "";
 
 	// remove trailing dir delimiters
 	pos = path.size();
-	while(pos != 0 && IsDirDelimiter(path[pos-1]))
+	while (pos != 0 && IsDirDelimiter(path[pos-1]))
 		pos--;
 	return path.substr(0, pos);
 }
diff --git a/src/unittest/test_filepath.cpp b/src/unittest/test_filepath.cpp
index 5e3cdcc08..ac2d69b5a 100644
--- a/src/unittest/test_filepath.cpp
+++ b/src/unittest/test_filepath.cpp
@@ -251,7 +251,10 @@ void TestFilePath::testRemoveRelativePathComponent()
 	UASSERT(result == p("/home/user/minetest/worlds/world1"));
 	path = p(".");
 	result = fs::RemoveRelativePathComponents(path);
-	UASSERT(result == ".");
+	UASSERT(result == "");
+	path = p("../a");
+	result = fs::RemoveRelativePathComponents(path);
+	UASSERT(result == "");
 	path = p("./subdir/../..");
 	result = fs::RemoveRelativePathComponents(path);
 	UASSERT(result == "");

From 0f0502109eac44128e87906fff30b5d049392f1d Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Fri, 16 Dec 2016 17:43:39 -0500
Subject: [PATCH 402/418] Security: Fix resolving of some relative paths

Trying to resolve a path with RemoveRelativePathComponents that can't
be resolved without leaving leading parent components (e.g. "../worlds/foo"
or "bar/../../worlds/foo") will fail.  To work around this, we leave
the relative components and simply remove the trailing components one
at a time, and bail out when we find a parent component.  This will
still fail for paths like "worlds/foo/noexist/../auth.txt" (the path
before the last parent component must not exist), but this is fine
since you won't be able to open a file with a path like that anyways
(the O.S. will determine that the path doesn't exist.
Try `cat /a/../etc/passwd`).
---
 src/script/cpp_api/s_security.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index b915747c6..1b1f148cd 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -344,8 +344,7 @@ bool ScriptApiSecurity::checkPath(lua_State *L, const char *path,
 
 	std::string str;  // Transient
 
-	std::string norel_path = fs::RemoveRelativePathComponents(path);
-	std::string abs_path = fs::AbsolutePath(norel_path);
+	std::string abs_path = fs::AbsolutePath(path);
 
 	if (!abs_path.empty()) {
 		// Don't allow accessing the settings file
@@ -356,18 +355,29 @@ bool ScriptApiSecurity::checkPath(lua_State *L, const char *path,
 	// If we couldn't find the absolute path (path doesn't exist) then
 	// try removing the last components until it works (to allow
 	// non-existent files/folders for mkdir).
-	std::string cur_path = norel_path;
+	std::string cur_path = path;
 	std::string removed;
 	while (abs_path.empty() && !cur_path.empty()) {
-		std::string tmp_rmed;
-		cur_path = fs::RemoveLastPathComponent(cur_path, &tmp_rmed);
-		removed = tmp_rmed + (removed.empty() ? "" : DIR_DELIM + removed);
+		std::string component;
+		cur_path = fs::RemoveLastPathComponent(cur_path, &component);
+		if (component == "..") {
+			// Parent components can't be allowed or we could allow something like
+			// /home/user/minetest/worlds/foo/noexist/../../../../../../etc/passwd.
+			// If we have previous non-relative elements in the path we might be
+			// able to remove them so that things like worlds/foo/noexist/../auth.txt
+			// could be allowed, but those paths will be interpreted as nonexistent
+			// by the operating system anyways.
+			return false;
+		}
+		removed = component + (removed.empty() ? "" : DIR_DELIM + removed);
 		abs_path = fs::AbsolutePath(cur_path);
 	}
-	if (abs_path.empty()) return false;
+	if (abs_path.empty())
+		return false;
 	// Add the removed parts back so that you can't, eg, create a
 	// directory in worldmods if worldmods doesn't exist.
-	if (!removed.empty()) abs_path += DIR_DELIM + removed;
+	if (!removed.empty())
+		abs_path += DIR_DELIM + removed;
 
 	// Get server from registry
 	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_SCRIPTAPI);

From bdf8f8549331270dc828289762c1de26d7e5e96e Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 20 Dec 2016 14:27:14 +0100
Subject: [PATCH 403/418] Limit drawing rect of selected item to viewport size
 (fixes #4341)

---
 src/guiFormSpecMenu.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 981a8edba..bfc7a9b79 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -2362,6 +2362,7 @@ void GUIFormSpecMenu::drawSelectedItem()
 
 	core::rect<s32> imgrect(0,0,imgsize.X,imgsize.Y);
 	core::rect<s32> rect = imgrect + (m_pointer - imgrect.getCenter());
+	rect.constrainTo(driver->getViewPort());
 	drawItemStack(driver, m_font, stack, rect, NULL, m_gamedef, IT_ROT_DRAGGED);
 }
 

From 04f68a87eecbde928e0dad7fcb9907657f75d457 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Wed, 21 Dec 2016 06:37:25 +0100
Subject: [PATCH 404/418] Correct Swahili translations (#4939)

---
 po/sw/minetest.po | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/po/sw/minetest.po b/po/sw/minetest.po
index a1601a79c..abf0da24d 100644
--- a/po/sw/minetest.po
+++ b/po/sw/minetest.po
@@ -48,7 +48,7 @@ msgstr "Itifaki ya toleo haifanani."
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "Seva anahimiza itifaki toleo dola 1."
+msgstr "Seva anahimiza itifaki toleo $1."
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
@@ -95,8 +95,8 @@ msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
-"Ilishindwa kuwezesha Moduli \"dola 1\" kama lina vibambo ilipopiga. Tu "
-"chararacters [kwa-z0-9_] wanaruhusiwa."
+"Ilishindwa kuwezesha Moduli \"$1\" kama lina vibambo ilipopiga. Tu "
+"chararacters [a-z0-9_] wanaruhusiwa."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -125,7 +125,7 @@ msgstr "kuwezeshwa"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr "Ulimwengu inayoitwa \"dola 1\" tayari ipo"
+msgstr "Ulimwengu inayoitwa \"$1\" tayari ipo"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -169,7 +169,7 @@ msgstr "Una subgames hakuna imewekwa."
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr "Una uhakika unataka kufuta \"dola 1\"?"
+msgstr "Una uhakika unataka kufuta \"$1\"?"
 
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
@@ -179,15 +179,15 @@ msgstr "Futa"
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: failed to delete \"$1\""
-msgstr "Modmgr: imeshindwa kufuta \"dola 1\""
+msgstr "Modmgr: imeshindwa kufuta \"$1\""
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Modmgr: invalid modpath \"$1\""
-msgstr "Modmgr: batili modpath \"dola 1\""
+msgstr "Modmgr: batili modpath \"$1\""
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr "Futa ulimwengu \"dola 1\"?"
+msgstr "Futa ulimwengu \"$1\"?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
 msgid "Accept"
@@ -199,7 +199,7 @@ msgstr "Ita jina jipya Modpack:"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "\"$1\" is not a valid flag."
-msgstr "\"dola 1\" si bendera halali."
+msgstr "\"$1\" si bendera halali."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
@@ -208,8 +208,6 @@ msgstr "(Hakuna maelezo ya kuweka kupewa)"
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
 msgstr ""
-"< Back to Settings page back=\"\" to=\"\" settings=\"\"></ Back to Settings "
-"page>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
@@ -236,9 +234,6 @@ msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
-"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
-"<octaves>, <persistence></persistence></octaves></seed></spreadZ></spreadY></"
-"spreadX></scale></offset>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
@@ -282,11 +277,11 @@ msgstr "Onyesha majina ya kiufundi"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be greater than $1."
-msgstr "Thamani lazima iwe kubwa kuliko dola 1."
+msgstr "Thamani lazima iwe kubwa kuliko $1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be lower than $1."
-msgstr "Thamani lazima iwe chini kuliko dola 1."
+msgstr "Thamani lazima iwe chini kuliko $1."
 
 #: builtin/mainmenu/modmgr.lua
 msgid ""
@@ -294,15 +289,15 @@ msgid ""
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
 "\n"
-"Sakinisha Moduli: filetype visivyotegemezwa \"dola 1\" au nyaraka kuvunjwa"
+"Sakinisha Moduli: filetype visivyotegemezwa \"$1\" au nyaraka kuvunjwa"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Failed to install $1 to $2"
-msgstr "Imeshindwa kusakinisha dola 1 hadi $2"
+msgstr "Imeshindwa kusakinisha $1 hadi $2"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: file: \"$1\""
-msgstr "Sakinisha Moduli: faili: \"dola 1\""
+msgstr "Sakinisha Moduli: faili: \"$1\""
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: unable to find real modname for: $1"
@@ -327,7 +322,7 @@ msgstr "Sakinisha"
 
 #: builtin/mainmenu/store.lua
 msgid "Page $1 of $2"
-msgstr "Ukurasa dola 1 ya $2"
+msgstr "Ukurasa $1 ya $2"
 
 #: builtin/mainmenu/store.lua
 msgid "Rating"
@@ -733,9 +728,8 @@ msgid "Provided world path doesn't exist: "
 msgstr "Njia ya dunia iliyotolewa haipo:"
 
 #: src/fontengine.cpp
-#, fuzzy
 msgid "needs_fallback_font"
-msgstr "Maalum Alphabet Inahitajika"
+msgstr "no"
 
 #: src/game.cpp
 msgid ""

From cc7c31a5bc44ab0010997e86c0a8c9f5f832b398 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Wed, 21 Dec 2016 10:20:06 +0100
Subject: [PATCH 405/418] Fix warning reported by clang (possible bug in
 Settings lua api)

---
 src/script/lua_api/l_settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/lua_api/l_settings.cpp b/src/script/lua_api/l_settings.cpp
index ea3d50857..d3fe03005 100644
--- a/src/script/lua_api/l_settings.cpp
+++ b/src/script/lua_api/l_settings.cpp
@@ -194,7 +194,7 @@ void LuaSettings::Register(lua_State* L)
 int LuaSettings::create_object(lua_State* L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	bool write_allowed;
+	bool write_allowed = true;
 	const char* filename = luaL_checkstring(L, 1);
 	CHECK_SECURE_PATH_POSSIBLE_WRITE(L, filename, &write_allowed);
 	LuaSettings* o = new LuaSettings(filename, write_allowed);

From 09f1a0c1ff8b5d73443603d85fccc3eb25cf4650 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Wed, 21 Dec 2016 14:04:46 +0100
Subject: [PATCH 406/418] Disable mod security by default (closes #4944)

---
 builtin/settingtypes.txt | 2 +-
 minetest.conf.example    | 2 +-
 src/defaultsettings.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index f0ddd5bc0..1818b5a18 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -1186,7 +1186,7 @@ mgvalleys_np_inter_valley_slope (Valley Slope) noise_params 0.5, 0.5, (128, 128,
 [*Security]
 
 #    Prevent mods from doing insecure things like running shell commands.
-secure.enable_security (Enable mod security) bool true
+secure.enable_security (Enable mod security) bool false
 
 #    Comma-separated list of trusted mods that are allowed to access insecure
 #    functions even when mod security is on (via request_insecure_environment()).
diff --git a/minetest.conf.example b/minetest.conf.example
index 6c7d1e66b..867d98584 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1530,7 +1530,7 @@
 
 #    Prevent mods from doing insecure things like running shell commands.
 #    type: bool
-# secure.enable_security = true
+# secure.enable_security = false
 
 #    Comma-separated list of trusted mods that are allowed to access insecure
 #    functions even when mod security is on (via request_insecure_environment()).
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 60a34cf63..0b4be6322 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -303,7 +303,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("emergequeue_limit_diskonly", "32");
 	settings->setDefault("emergequeue_limit_generate", "32");
 	settings->setDefault("num_emerge_threads", "1");
-	settings->setDefault("secure.enable_security", "true");
+	settings->setDefault("secure.enable_security", "false");
 	settings->setDefault("secure.trusted_mods", "");
 	settings->setDefault("secure.http_mods", "");
 

From ba52a34f94504e966ee3842e724561eec037cbc0 Mon Sep 17 00:00:00 2001
From: est31 <est31@users.noreply.github.com>
Date: Wed, 21 Dec 2016 14:15:48 +0100
Subject: [PATCH 407/418] Don't ship with broken languages (#4940)

---
 src/CMakeLists.txt | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d43e4133f..3aa645df9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -689,6 +689,28 @@ if(BUILD_SERVER)
 	endif()
 endif(BUILD_SERVER)
 
+# Blacklisted locales that don't work.
+# see issue #4638
+set(GETTEXT_BLACKLISTED_LOCALES
+	be
+	he
+	ko
+	ky
+	zh_CN
+	zh_TW
+)
+
+option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid broken locales" TRUE)
+
+if (GETTEXT_FOUND AND APPLY_LOCALE_BLACKLIST)
+	set(GETTEXT_USED_LOCALES "")
+	foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+		if (NOT ";${GETTEXT_BLACKLISTED_LOCALES};" MATCHES ";${LOCALE};")
+			list(APPEND GETTEXT_USED_LOCALES ${LOCALE})
+		endif()
+	endforeach()
+	message(STATUS "Locale blacklist applied; Locales used: ${GETTEXT_USED_LOCALES}")
+endif()
 
 # Set some optimizations and tweaks
 
@@ -807,7 +829,7 @@ if(BUILD_CLIENT)
 	endif()
 
 	if(USE_GETTEXT)
-		foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+		foreach(LOCALE ${GETTEXT_USED_LOCALES})
 			set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
 			set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
 			install(FILES ${MO_BUILD_PATH} DESTINATION ${MO_DEST_PATH})
@@ -836,7 +858,7 @@ endif()
 if (USE_GETTEXT)
 	set(MO_FILES)
 
-	foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+	foreach(LOCALE ${GETTEXT_USED_LOCALES})
 		set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/${PROJECT_NAME}.po")
 		set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
 		set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")

From 5e4d6468a3110d8879e80e51490c0717ce64d75c Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 21 Dec 2016 07:10:32 +0000
Subject: [PATCH 408/418] Builtin/../falling.lua: Avoid crash when object pos
 over limit

If the object pos is over limit, 'add entity' will not add an entity,
causing 'obj' to be nil.
---
 builtin/game/falling.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 8b88b68d8..4696ce481 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -113,7 +113,9 @@ core.register_entity(":__builtin:falling_node", {
 
 local function spawn_falling_node(p, node)
 	local obj = core.add_entity(p, "__builtin:falling_node")
-	obj:get_luaentity():set_node(node)
+	if obj then
+		obj:get_luaentity():set_node(node)
+	end
 end
 
 local function drop_attached_node(p)

From 1dd361f37c31d43556c51096078686345c0f76f5 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 21 Dec 2016 14:31:59 +0100
Subject: [PATCH 409/418] Android: update curl and libgmp

---
 build/android/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/android/Makefile b/build/android/Makefile
index 40520c5bf..dd62df7fb 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -99,14 +99,14 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp
 OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp
 OPENSSL_URL = https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
 
-CURL_VERSION = 7.51.0
+CURL_VERSION = 7.52.0
 CURL_DIR = $(ANDR_ROOT)/deps/curl-$(CURL_VERSION)
 CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
 CURL_TIMESTAMP = $(CURL_DIR)/timestamp
 CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp
 CURL_URL_HTTP = https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2
 
-GMP_VERSION = 6.1.1
+GMP_VERSION = 6.1.2
 GMP_DIR = $(ANDR_ROOT)/deps/gmp-$(GMP_VERSION)
 GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so
 GMP_TIMESTAMP = $(GMP_DIR)/timestamp

From 70579dc7c3e76da109d8f99eeeffccff6ea5713b Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 22 Dec 2016 14:45:53 +0100
Subject: [PATCH 410/418] Android: Workarounds for Googles completely broken
 NDK

---
 build/android/Makefile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/build/android/Makefile b/build/android/Makefile
index dd62df7fb..6e7a389c9 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -220,6 +220,8 @@ $(OPENAL_LIB): $(OPENAL_TIMESTAMP)
 	${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG}                                  \
 		NDK_MODULE_PATH=${NDK_MODULE_PATH} APP_ABI=${TARGET_ABI}               \
 		TARGET_ARCH_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM}             \
+		PRIVATE_CC=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}gcc \
+		PRIVATE_CXX=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}g++ \
 		TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                \
 		TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                              \
 		TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1;                 \
@@ -266,6 +268,8 @@ $(OGG_LIB): $(OGG_TIMESTAMP)
 	${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG}                                  \
 		NDK_MODULE_PATH=${NDK_MODULE_PATH}                                     \
 		APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM}                     \
+		PRIVATE_CC=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}gcc \
+		PRIVATE_CXX=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}g++ \
 		TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                \
 		TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                              \
 		TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1;                 \
@@ -313,6 +317,7 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP) $(GMP_LIB)
 	export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-openssl;                          \
 	${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh                    \
 		--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION}                     \
+		--platform=android-9                                                   \
 		--install-dir=$${TOOLCHAIN};                                           \
 	export PATH="$${TOOLCHAIN}/bin:$${PATH}";                                  \
 	CC=${CROSS_PREFIX}gcc ./Configure enable-gmp -DL_ENDIAN -I${GMP_DIR} -L${GMP_DIR}/usr/lib android-${TARGET_ARCH};\
@@ -363,6 +368,7 @@ $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP)
 	export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-leveldb;                          \
 	${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh                    \
 		--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION}                     \
+		--platform=android-9                                                   \
 		--install-dir=$${TOOLCHAIN};                                           \
 	export PATH="$${TOOLCHAIN}/bin:$${PATH}";                                  \
 	export CC=${CROSS_PREFIX}gcc;                                              \
@@ -416,6 +422,8 @@ $(FREETYPE_LIB) : $(FREETYPE_TIMESTAMP)
 	${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG}                                  \
 		NDK_MODULE_PATH=${NDK_MODULE_PATH}                                     \
 		APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}                     \
+		PRIVATE_CC=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}gcc \
+		PRIVATE_CXX=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}g++ \
 		TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                \
 		TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                              \
 		TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1;                 \
@@ -469,6 +477,7 @@ $(ICONV_LIB) : $(ICONV_TIMESTAMP)
 	export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-iconv;                            \
 	${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh                    \
 		--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION}                     \
+		--platform=android-9                                                   \
 		--install-dir=$${TOOLCHAIN};                                           \
 	export PATH="$${TOOLCHAIN}/bin:$${PATH}";                                  \
 	export CC=${CROSS_PREFIX}gcc;                                              \
@@ -531,6 +540,8 @@ $(IRRLICHT_LIB): $(IRRLICHT_TIMESTAMP) $(FREETYPE_LIB)
 	${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG}                                  \
 		NDK_MODULE_PATH=${NDK_MODULE_PATH}                                     \
 		APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM}                     \
+		PRIVATE_CC=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}gcc \
+		PRIVATE_CXX=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}g++ \
 		TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                \
 		TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                              \
 		TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1;                 \
@@ -581,6 +592,7 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
 	export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-curl;                             \
 	${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh                    \
 		--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION}                     \
+		--platform=android-9                                                   \
 		--install-dir=$${TOOLCHAIN};                                           \
 	export PATH="$${TOOLCHAIN}/bin:$${PATH}";                                  \
 	export CC=${CROSS_PREFIX}gcc;                                              \
@@ -640,6 +652,7 @@ $(GMP_LIB): $(GMP_TIMESTAMP)
 	export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-gmp;                              \
 	${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh                    \
 		--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION}                     \
+		--platform=android-9                                                   \
 		--install-dir=$${TOOLCHAIN};                                           \
 	export PATH="$${TOOLCHAIN}/bin:$${PATH}";                                  \
 	export CC=${CROSS_PREFIX}gcc;                                              \
@@ -757,6 +770,8 @@ apk: local.properties assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB)
 	+ @${ANDROID_NDK}/ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH}             \
 		GPROF=${GPROF} APP_ABI=${TARGET_ABI} HAVE_LEVELDB=${HAVE_LEVELDB}      \
 		APP_PLATFORM=${APP_PLATFORM}                                           \
+		PRIVATE_CC=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}gcc \
+		PRIVATE_CXX=${NDK_MODULE_PATH}/${TARGET_TOOLCHAIN}${COMPILER_VERSION}/prebuilt/linux-x86_64/bin/${TARGET_TOOLCHAIN}g++ \
 		TARGET_LIBDIR=${TARGET_LIBDIR}                                         \
 		TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                \
 		TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                              \

From 2acd3ad6630844809a91b1153564fe60e34ddd49 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Wed, 14 Dec 2016 02:06:54 +0000
Subject: [PATCH 411/418] Translated using Weblate (German)

Currently translated at 100.0% (918 of 918 strings)
---
 po/de/minetest.po | 95 ++++++++++++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 38 deletions(-)

diff --git a/po/de/minetest.po b/po/de/minetest.po
index 6a60ef24f..a81fd0d56 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-12-11 09:22+0000\n"
+"PO-Revision-Date: 2016-12-14 02:46+0000\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/minetest/minetest/"
-"de/>\n"
+"Language-Team: German "
+"<https://hosted.weblate.org/projects/minetest/minetest/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -246,8 +246,8 @@ msgid ""
 "<octaves>, <persistence>"
 msgstr ""
 "Format: <Offset>, <Skalierung>, (<AusbreitungX>, <AusbreitungY>, "
-"<AusbreitungZ>), <Seed>,\n"
-"<Oktaven>, <Persistenz>"
+"<AusbreitungZ>),\n"
+"<Seed>, <Oktaven>, <Persistenz>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
@@ -261,7 +261,8 @@ msgstr "Mods"
 msgid "Optionally the lacunarity can be appended with a leading comma."
 msgstr ""
 "Optional kann die Lückenhaftigkeit, mit einem weiteren Komma abgetrennt, "
-"angehängt werden."
+"angehängt\n"
+"werden."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a comma seperated list of flags."
@@ -1377,7 +1378,8 @@ msgstr ""
 msgid "A message to be displayed to all clients when the server shuts down."
 msgstr ""
 "Eine Nachricht, die an alle verbundene Clients gesendet wird, wenn der "
-"Server herunterfährt."
+"Server\n"
+"herunterfährt."
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of emerge queues"
@@ -1854,8 +1856,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
-"Setzt die maximale Distanz, in der die Spieler übertragen werden, in "
-"Kartenblöcken (0 = unbegrenzt)."
+"Setzt die maximale Distanz, in der die Spieler übertragen werden,\n"
+"in Kartenblöcken (0 = unbegrenzt)."
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
@@ -1918,7 +1920,7 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
-"Escape-Sequenzen deaktivieren, z.B. Chat Farben.\n"
+"Escape-Sequenzen deaktivieren, z.B. Chatfarben.\n"
 "Benutzen Sie dies, falls Sie einen Server laufen lassen möchten, der Clients "
 "vor\n"
 "0.4.14 bedienen soll und Sie die von Mods generierten Escape-Sequenzen\n"
@@ -2347,10 +2349,10 @@ msgstr ""
 "Handhabung für veraltete Lua-API-Aufrufe:\n"
 "- legacy: Versuchen, altes Verhalten zu imitieren (Standard für Release).\n"
 "- log: Imitieren, und den Backtrace des veralteten Funktionsaufrufs "
-"protokollieren (Standard für\n"
-"  Debug).\n"
-"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen "
-"(empfohlen für Mod-\n"
+"protokollieren\n"
+"  (Standard für Debug).\n"
+"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen ("
+"empfohlen für Mod-\n"
 "  Entwickler)."
 
 #: src/settings_translation_file.cpp
@@ -2361,6 +2363,12 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
+"Den Profiler sich selbst instrumentieren lassen:\n"
+"* Instrumentiert eine leere Funktion.\n"
+"Dies schätzt den Overhead, der von der Instrumentierung hinzugefügt wird, ab "
+"(+1 Funktionsaufruf).\n"
+"* Instrumentiert die Abtastfunktion, die zur Aktualisierung der Statistiken "
+"benutzt wird."
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
@@ -2522,34 +2530,42 @@ msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
+"„builtin“ instrumentieren.\n"
+"Dies wird normalerweise nur von Haupt-/builtin-Entwicklern benötigt"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument chatcommands on registration."
-msgstr ""
+msgstr "Chatbefehle bei ihrer Registrierung instrumentieren."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
+"Globale Rückruffunktionen bei ihrer Registrierung instrumentieren\n"
+"(alles, was man einer Funktion wie minetest.register_*() übergibt)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
 msgstr ""
+"Die action-Funktion von Active-Block-Modifiers bei ihrer Registrierung "
+"instrumentieren."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
 msgstr ""
+"Die action-Funktion von Loading-Block-Modifiers bei ihrer Registrierung "
+"instrumentieren."
 
 #: src/settings_translation_file.cpp
 msgid "Instrument the methods of entities on registration."
-msgstr ""
+msgstr "Die Methoden von Entitys bei ihrer Registrierung instrumentieren."
 
 #: src/settings_translation_file.cpp
 msgid "Instrumentation"
-msgstr ""
+msgstr "Instrumentierung"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
@@ -2594,9 +2610,8 @@ msgid "Joystick button repetition interval"
 msgstr "Joystick-Button-Wiederholungsrate"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick frustum sensitivity"
-msgstr "Mausempfindlichkeit"
+msgstr "Joystick-Pyramidenstumpf-Empfindlichkeit"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2606,8 +2621,8 @@ msgid ""
 "Range roughly -2 to 2."
 msgstr ""
 "Nur für Juliamenge: W-Komponente der hyperkomplexen Konstanten, welche die "
-"Juliaform festlegt.\n"
-"Hat keine Wirkung auf 3D-Fraktale.\n"
+"Juliaform\n"
+"festlegt. Hat keine Wirkung auf 3D-Fraktale.\n"
 "Reichweite liegt grob zwischen -2 und 2."
 
 #: src/settings_translation_file.cpp
@@ -2996,8 +3011,8 @@ msgid ""
 "updated over network."
 msgstr ""
 "Länge eines Servertakts und dem Zeitintervall, in dem Objekte über das "
-"Netzwerk üblicherweise\n"
-"aktualisiert werden."
+"Netzwerk\n"
+"üblicherweise aktualisiert werden."
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between ABM execution cycles"
@@ -3140,10 +3155,11 @@ msgid ""
 msgstr ""
 "Kartengenerierungsattribute speziell für den Kartengenerator „Täler“.\n"
 "„altitude_chill“ macht höhere Höhen kälter, was ein paar Biomprobleme "
-"hervorrufen könnte.\n"
+"hervorrufen\n"
+"könnte.\n"
 "„humid_rivers“ modifiert die Luftfeuchtigkeit um Flüssen und in Gebieten, wo "
-"sich Wasser\n"
-"ansammeln würde; es könnte fein abgestimmte Biomen beeinträchtigen.\n"
+"sich\n"
+"Wasser ansammeln würde; es könnte fein abgestimmte Biomen beeinträchtigen.\n"
 "Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n"
 "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
@@ -3177,7 +3193,8 @@ msgid ""
 msgstr ""
 "Kartengenerierungsattribute speziell für den Kartengenerator v6.\n"
 "Falls Schneebiome aktiviert, werden Dschungel aktiviert und das „jungles“-"
-"Flag wird ignoriert.\n"
+"Flag\n"
+"wird ignoriert.\n"
 "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n"
 "werden von der Standardeinstellung unverändert gelassen.\n"
 "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
@@ -3939,7 +3956,8 @@ msgid ""
 "disable. Useful for developers."
 msgstr ""
 "Gibt die Profiling-Daten der Engine in regelmäßigen Abständen aus (in "
-"Sekunden). „0“ deaktiviert das Profiling. Nützlich für Entwickler."
+"Sekunden).\n"
+"„0“ deaktiviert das Profiling. Nützlich für Entwickler."
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
@@ -4188,7 +4206,7 @@ msgstr "Debug-Info zeigen"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
-msgstr "Entitiy-Auswahlboxen zeigen"
+msgstr "Entity-Auswahlboxen zeigen"
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
@@ -4349,6 +4367,8 @@ msgid ""
 "The sensitivity of the joystick axes for moving the\n"
 "ingame view frustum around."
 msgstr ""
+"Die Empfindlichkeit der Joystick-Achsen, um den\n"
+"Pyramidenstumpf der Spielansicht herumzubewegen."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4430,11 +4450,10 @@ msgid ""
 "This determines how long they are slowed down after placing or removing a "
 "node."
 msgstr ""
-"Um Verzögerungen zu reduzieren, werden Kartenblockübertragungen verlangsamt, "
-"während\n"
-"ein Spieler etwas baut. Diese Einstellung bestimmt, wie lange sie "
-"verlangsamt sind,\n"
-"nachdem ein Block platziert oder entfernt wurde."
+"Um Verzögerungen zu reduzieren, werden Kartenblockübertragungen verlangsamt,"
+"\n"
+"wenn ein Spieler etwas baut. Diese Einstellung bestimmt, wie lange sie\n"
+"verlangsamt werden, nachdem ein Block platziert oder entfernt wurde."
 
 #: src/settings_translation_file.cpp
 msgid "Toggle camera mode key"
@@ -4686,12 +4705,12 @@ msgstr ""
 "Wo der Kartengenerator aufhört.\n"
 "Bitte beachten Sie:\n"
 "-    Begrenzt auf 31000 (größere Werte sind wirkungslos).\n"
-"-    Der Kartengenerator arbeitet in Gruppen von 80×80×80 Blöcken (5×5×5 "
-"Kartenblöcke).\n"
+"-    Der Kartengenerator arbeitet in Gruppen von 80×80×80 Blöcken\n"
+"     (5×5×5 Kartenblöcke).\n"
 "-    Diese Gruppen haben einen Abstand von [-32, -32] Blöcken vom Ursprung.\n"
 "-    Nur Gruppen, welche innerhalb der von map_generation_limit definierten "
-"Grenze liegen,\n"
-"     werden erzeugt."
+"Grenze\n"
+"     liegen, werden erzeugt."
 
 #: src/settings_translation_file.cpp
 msgid ""

From ab1d98bc8f120ce01224f33829674e72d5854ed1 Mon Sep 17 00:00:00 2001
From: Rogier <rogier777@gmail.com>
Date: Fri, 16 Dec 2016 10:28:03 +0000
Subject: [PATCH 412/418] Translated using Weblate (Dutch)

Currently translated at 85.2% (783 of 918 strings)
---
 po/nl/minetest.po | 844 +++++++++++++++++++++++++---------------------
 1 file changed, 464 insertions(+), 380 deletions(-)

diff --git a/po/nl/minetest.po b/po/nl/minetest.po
index c11bf46bc..68e3e7b6d 100644
--- a/po/nl/minetest.po
+++ b/po/nl/minetest.po
@@ -7,21 +7,20 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-07-08 10:32+0000\n"
-"Last-Translator: ikmaak <info@ikmaak.nl>\n"
-"Language-Team: Dutch <https://hosted.weblate.org/projects/minetest/minetest/"
-"nl/>\n"
+"PO-Revision-Date: 2016-12-16 10:49+0000\n"
+"Last-Translator: Rogier <rogier777@gmail.com>\n"
+"Language-Team: Dutch "
+"<https://hosted.weblate.org/projects/minetest/minetest/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.10\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr ""
-"Er is een fout opgetreden in een Lua script (bijvoorbeeld van een mod):"
+msgstr "Er is een fout opgetreden in een Lua script (bijvoorbeeld van een mod):"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -244,8 +243,9 @@ msgid ""
 "Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
 "<octaves>, <persistence>"
 msgstr ""
-"Formaat: <basiswaarde>, <schaal>, (<X-spreiding>, <Y-spreiding>, <Z-"
-"spreiding>), <kiemgetal>, <octaven>, <persistentie>"
+"Formaat: <basiswaarde>, <schaal>, (<X-spreiding>, <Y-spreiding>, "
+"<Z-spreiding>),\n"
+"<kiemgetal>, <octaven>, <persistentie>"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
@@ -280,7 +280,7 @@ msgstr "Mogelijke waarden zijn: "
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
-msgstr "Standaardwaarde herstellen"
+msgstr "Standaardwaarde"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select path"
@@ -571,11 +571,11 @@ msgstr "Geen Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr "Node Oplichten"
+msgstr "Node licht op"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Outlining"
-msgstr "Node omstrepen"
+msgstr "Node is omlijnd"
 
 #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
 msgid "None"
@@ -631,7 +631,7 @@ msgstr "Om schaduwen mogelijk te maken moet OpenGL worden gebruikt."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr "Toon Mapping"
+msgstr "Tone-mapping"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold (px)"
@@ -743,7 +743,7 @@ msgstr "Het gespecificeerde wereld-pad bestaat niet: "
 
 #: src/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr "needs_fallback_font"
+msgstr "no"
 
 #: src/game.cpp
 msgid ""
@@ -959,7 +959,7 @@ msgstr "Rechts"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Sneak"
-msgstr "sluipen"
+msgstr "Sluipen"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Toggle Cinematic"
@@ -1235,7 +1235,7 @@ msgstr "Print"
 
 #: src/keycode.cpp
 msgid "Prior"
-msgstr "Eerste"
+msgstr "Vorige"
 
 #: src/keycode.cpp
 msgid "Return"
@@ -1309,6 +1309,16 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X,Y,Z)-afstand van de fractal, vanaf het centrum van de wereld, als "
+"veelvoud van de schaal.\n"
+"Te gebruiken om een geschikt geboortegebied met laaggelegen land in de buurt "
+"van (0,0)\n"
+"te krijgen.\n"
+"De standaardwaarde is geschikt voor Mandelbrot fractals. Aanpassing is nodig "
+"voor\n"
+"Julia fractals.\n"
+"Bereik: circa -2 tot +2. Vermenigvuldig dit met de 'schaal' voor de afstand "
+"in nodes."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1327,7 +1337,6 @@ msgid "3D mode"
 msgstr "3D modus"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -1344,16 +1353,17 @@ msgstr ""
 "-    anaglyph: 3D met de kleuren cyaan en magenta.\n"
 "-    interlaced: 3D voor polariserend scherm (even/oneven beeldlijnen).\n"
 "-    topbottom: 3D met horizontaal gedeeld scherm (boven/onder).\n"
-"-    sidebyside: 3D met vertikaal gedeeld scherm (links/rechts)."
+"-    sidebyside: 3D met vertikaal gedeeld scherm (links/rechts).\n"
+"-    pageflip: 3D met vier buffers ('quad buffer')."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "A chosen map seed for a new map, leave empty for random.\n"
 "Will be overridden when creating a new world in the main menu."
 msgstr ""
-"Vooringesteld kiemgetal voor de wereld. Indien leeg, wordt een willekeurige "
+"Vooringesteld kiemgetal voor de wereld. Indien leeg, wordt een willekeurige\n"
 "waarde gekozen.\n"
-"Wanneer vanuit het hoofdmenu een nieuwe wereld gecreëerd wordt, kan een "
+"Wanneer vanuit het hoofdmenu een nieuwe wereld gecreëerd wordt, kan een\n"
 "ander kiemgetal gekozen worden."
 
 #: src/settings_translation_file.cpp
@@ -1382,12 +1392,11 @@ msgstr "Bereik waarbinnen blokken actief zijn"
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifier interval"
-msgstr "Bereik waarbinnen blok wijzigers actief zijn"
+msgstr "Actieve blokken wijzigers interval"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifiers"
-msgstr "Bereik waarbinnen blok wijzigers actief zijn"
+msgstr "Actieve blokken wijzigers (ABMs)"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1412,8 +1421,8 @@ msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
-"Aangepaste DPI (dots per inch) instelling voor het scherm, bijv. voor 4k "
-"schermen (niet voor X11 of Android)."
+"Aangepaste DPI (dots per inch) instelling voor het scherm.\n"
+"Bijv. voor 4k schermen (niet voor X11 of Android)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1430,7 +1439,7 @@ msgstr "Geavanceerd"
 
 #: src/settings_translation_file.cpp
 msgid "Altitude Chill"
-msgstr "Hoogte Koudheid"
+msgstr "Temperatuurverschil vanwege hoogte"
 
 #: src/settings_translation_file.cpp
 msgid "Always fly and fast"
@@ -1468,7 +1477,7 @@ msgstr "Ingeschatte (X,Y,Z) schaal van fractal in nodes."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
-msgstr "Vraag om de verbinding te herstellen na een server-crash"
+msgstr "verbinding herstellen na een server-crash"
 
 #: src/settings_translation_file.cpp
 msgid "Automaticaly report to the serverlist."
@@ -1476,7 +1485,7 @@ msgstr "Meldt de server automatisch aan bij de serverlijst."
 
 #: src/settings_translation_file.cpp
 msgid "Autorun key"
-msgstr ""
+msgstr "Toets voor automatisch lopen aan/uit"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -1492,7 +1501,7 @@ msgstr "Basis"
 
 #: src/settings_translation_file.cpp
 msgid "Basic Privileges"
-msgstr "Standaardvoorrechten"
+msgstr "Basisvoorrechten"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
@@ -1512,7 +1521,7 @@ msgstr "Bouwen op de plaats van de speler"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "Ingebouwd"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
@@ -1520,11 +1529,11 @@ msgstr "Bumpmapping"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
-msgstr "Vloeiender maken van de camerabeweging"
+msgstr "Vloeiender camerabeweging"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
-msgstr "Vloeiender maken van de camerabeweging (in cinematic modus)"
+msgstr "Vloeiender camerabeweging (in cinematic modus)"
 
 #: src/settings_translation_file.cpp
 msgid "Camera update toggle key"
@@ -1532,11 +1541,11 @@ msgstr "Toets voor cameraverversing aan/uit"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #1"
-msgstr "Grot noise patroon #1"
+msgstr "Grot ruispatroon #1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #2"
-msgstr "Grot noise patroon #2"
+msgstr "Grot ruispatroon #2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
@@ -1544,7 +1553,7 @@ msgstr "Grot breedte"
 
 #: src/settings_translation_file.cpp
 msgid "Caves and tunnels form at the intersection of the two noises"
-msgstr "Grotten en tunnels vormen bij het kruispunt van twee noise patronen"
+msgstr "Grotten en tunnels vormen bij het kruispunt van twee ruis patronen"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
@@ -1555,9 +1564,8 @@ msgid "Chat toggle key"
 msgstr "Toets voor tonen/verbergen chat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Opdracht"
+msgstr "Chat-commando's"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1581,6 +1589,25 @@ msgid ""
 "17 = 4D \"Mandelbulb\" mandelbrot set.\n"
 "18 = 4D \"Mandelbulb\" julia set."
 msgstr ""
+"Keuze uit 18 fractals op basis van 9 formules.\n"
+"1 = 4D \"Roundy\" mandelbrot verzameling.\n"
+"2 = 4D \"Roundy\" julia verzameling.\n"
+"3 = 4D \"Squarry\" mandelbrot verzameling.\n"
+"4 = 4D \"Squarry\" julia verzameling.\n"
+"5 = 4D \"Mandy Cousin\" mandelbrot verzameling.\n"
+"6 = 4D \"Mandy Cousin\" julia verzameling.\n"
+"7 = 4D \"Variatie\" mandelbrot verzameling.\n"
+"8 = 4D \"Variatie\" julia verzameling.\n"
+"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot verzameling.\n"
+"10 = 3D \"Mandelbrot/Mandelbar\" julia verzameling.\n"
+"11 = 3D \"Kerstboom\" mandelbrot verzameling.\n"
+"12 = 3D \"Kerstboom\" julia verzameling.\n"
+"13 = 3D \"Mandelbulb\" mandelbrot verzameling.\n"
+"14 = 3D \"Mandelbulb\" julia verzameling.\n"
+"15 = 3D \"Cosinus Mandelbulb\" mandelbrot verzameling.\n"
+"16 = 3D \"Cosinus Mandelbulb\" julia verzameling.\n"
+"17 = 4D \"Mandelbulb\" mandelbrot verzameling.\n"
+"18 = 4D \"Mandelbulb\" julia verzameling."
 
 #: src/settings_translation_file.cpp
 msgid "Chunk size"
@@ -1635,15 +1662,19 @@ msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"Lijst van mods die HTTP mogen gebruiken. Deze mods kunnen gegevens uploaden\n"
+"naar en downloaden van het internet.\n"
+"Gescheiden door komma's."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
-"Lijst, door komma's gescheiden, van vertrouwde mods die onveilige functies "
-"mogen gebruiken,\n"
+"Lijst van vertrouwde mods die onveilige functies mogen gebruiken,\n"
 "zelfs wanneer mod-beveiliging aan staat (via request_insecure_environment())."
+"\n"
+"Gescheiden door komma's."
 
 #: src/settings_translation_file.cpp
 msgid "Command key"
@@ -1692,30 +1723,32 @@ msgid ""
 "unchanged."
 msgstr ""
 "Bepaalt de lengte van de dag/nacht cyclus\n"
-"Voorbeeld: 72 = 20min, 360 = 4min, 1 = 24 uur, 0 = de kloktijd (dag, nacht, "
-"schemering) verandert niet."
+"Voorbeelden:\n"
+"72 = 20min\n"
+"360 = 4min\n"
+"1 = 24 uur\n"
+"0 = de kloktijd (dag, nacht, schemering) verandert niet."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Controls size of deserts and beaches in Mapgen v6.\n"
 "When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
 msgstr ""
-"Bepaalt de grootte van woestijnen en stranden in de wereld-generator "
-"(mapgen) v6.\n"
+"Bepaalt de grootte van woestijnen en stranden in de wereld-generator (mapgen)"
+" v6.\n"
 "Als 'snowbiomes' aan staat, wordt deze instelling genegeerd."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
-msgstr "Controleert steilheid/diepte van meer depressies."
+msgstr "Bepaalt steilheid/diepte van meer depressies."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/height of hills."
-msgstr "Controleert steilheid/hoogte van heuvels."
+msgstr "Bepaalt steilheid/hoogte van heuvels."
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr ""
-"Controleert breedte van tunnels, een kleinere waarde maakt bredere tunnels."
+msgstr "Bepaalt breedte van tunnels, een kleinere waarde maakt bredere tunnels."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -1726,12 +1759,16 @@ msgid ""
 "Creates unpredictable lava features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
+"Maakt onvoorspelbare lavabronnen in grotten.\n"
+"Dit kan het graven bemoeilijken. Waardes: 0-10; 0 = uit"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Creates unpredictable water features in caves.\n"
 "These can make mining difficult. Zero disables them. (0-10)"
 msgstr ""
+"Maakt onvoorspelbare waterbronnen in grotten.\n"
+"Dit kan het graven bemoeilijken. Waardes: 0-10; 0 = uit"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
@@ -1799,7 +1836,7 @@ msgstr "Standaardvoorrechten"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Standaardformaat voor rapport-bestanden"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1814,16 +1851,19 @@ msgid ""
 "Defines sampling step of texture.\n"
 "A higher value results in smoother normal maps."
 msgstr ""
+"Bemonsterings-interval voor texturen.\n"
+"Een hogere waarde geeft vloeiender normal maps."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 "Maximale afstand (in blokken van 16 nodes) waarbinnen andere spelers "
-"zichtbaar zijn (0 = oneindig ver)."
+"zichtbaar zijn\n"
+"(0 = oneindig ver)."
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Vertraging bij het versturen van blokken na het bouwen"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -1863,6 +1903,9 @@ msgid ""
 "The 3 numbers in brackets control the scale of the\n"
 "terrain, the 3 numbers should be identical."
 msgstr ""
+"Bepaalt de vorm van het terrein.\n"
+"De 3 getallen tussen vierkante haken bepalen de schaal\n"
+"van het terrein. Ze dienen alle drie hetzelfde te zijn."
 
 #: src/settings_translation_file.cpp
 msgid "Disable anticheat"
@@ -1870,7 +1913,7 @@ msgstr "Valsspeelbescherming uitschakelen"
 
 #: src/settings_translation_file.cpp
 msgid "Disable escape sequences"
-msgstr ""
+msgstr "Schakel ANSI-codes in text uit"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1879,6 +1922,10 @@ msgid ""
 "disable\n"
 "the escape sequences generated by mods."
 msgstr ""
+"Schakel ANSI-codes in text uit. ANSI codes worden bijvoorbeeld\n"
+" gebruikt voor kleuren in de chat.\n"
+"Gebruik dit voor een server met clienten met een versie vóór 0.4.14,\n"
+"indien ANSI-codes van mods uitgeschakeld moeten worden."
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
@@ -1906,7 +1953,7 @@ msgstr "Print wereldgenerator debug informatie."
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
-msgstr ""
+msgstr "Joysticks aanzetten"
 
 #: src/settings_translation_file.cpp
 msgid "Enable VBO"
@@ -1929,6 +1976,8 @@ msgid ""
 "Enable smooth lighting with simple ambient occlusion.\n"
 "Disable for speed or for different looks."
 msgstr ""
+"Vloeiende verlichting met eenvoudige ambient occlusion aanschakelen.\n"
+"Schakel dit uit voor minder vertraging, of voor een ander visueel effect."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1941,7 +1990,8 @@ msgstr ""
 "Zet dit aan om verbindingen van oudere cliënten te weigeren.\n"
 "Oudere cliënten zijn compatibel, in de zin dat ze niet crashen als ze "
 "verbinding \n"
-"maken met nieuwere servers, maar ze ondersteunen wellicht niet alle nieuwere "
+"maken met nieuwere servers, maar ze ondersteunen wellicht niet alle "
+"nieuwere\n"
 "mogelijkheden."
 
 #: src/settings_translation_file.cpp
@@ -1953,9 +2003,8 @@ msgid ""
 msgstr ""
 "Sta het gebruik van een externe media-server toe (indien opgegeven door de "
 "server).\n"
-"Het gebruik van externe media-servers versnelt het downloaden van media "
-"(bijv. texturen) aanzienlijk\n"
-"bij het maken van een verbinding met een server."
+"Het gebruik van externe media-servers versnelt het downloaden van media\n"
+"(bijv. texturen) aanzienlijk bij het maken van een verbinding met een server."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1978,7 +2027,7 @@ msgid ""
 "or need to be auto-generated.\n"
 "Requires shaders to be enabled."
 msgstr ""
-"bumpmapping aanzetten voor texturen. Normalmaps moeten al in de texture pack "
+"Bumpmapping aanzetten voor texturen. Normalmaps moeten al in de texture pack "
 "zitten\n"
 "of ze moeten automatisch gegenereerd worden.\n"
 "Schaduwen moeten aanstaan."
@@ -1989,7 +2038,7 @@ msgstr "Schakelt caching van facedir geroteerde meshes."
 
 #: src/settings_translation_file.cpp
 msgid "Enables filmic tone mapping"
-msgstr "Schakelt Filmisch Toon Mapping in"
+msgstr "Schakelt filmisch tone-mapping in"
 
 #: src/settings_translation_file.cpp
 msgid "Enables minimap."
@@ -2000,21 +2049,24 @@ msgid ""
 "Enables on the fly normalmap generation (Emboss effect).\n"
 "Requires bumpmapping to be enabled."
 msgstr ""
+"Schakelt het genereren van normal maps in (emboss effect).\n"
+"Dit vereist dat bumpmapping ook aan staat."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables parallax occlusion mapping.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Schakelt parallax occlusie mappen in.\n"
+"Dit vereist dat shaders ook aanstaan."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine profiling data print interval"
 msgstr "Profilergegevens print interval"
 
 #: src/settings_translation_file.cpp
 msgid "Entity methods"
-msgstr ""
+msgstr "Entiteit-functies"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2081,29 +2133,27 @@ msgid "Field of view"
 msgstr "Zichthoek"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view for zoom"
-msgstr "Zichthoek"
+msgstr "Zichthoek bij inzoomen"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Zichthoek in graden."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"Snelle beweging toestaan (met de \"gebruiken\" toets).\n"
-"Het \"fast\" voorrecht is vereist op de server."
+"Zichthoek bij inzoomen, in graden.\n"
+"Het \"zoom\" voorrecht is vereist op de server."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
 "the Multiplayer Tab."
 msgstr ""
-"Bestand in de map 'client/serverlist/' met favoriete servers die getoond "
+"Bestand in de map 'client/serverlist/' met favoriete servers die getoond\n"
 "worden in de multiplayer tab."
 
 #: src/settings_translation_file.cpp
@@ -2112,7 +2162,7 @@ msgstr "Filler Diepte"
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
-msgstr ""
+msgstr "Filmisch tone-mapping"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2121,6 +2171,11 @@ msgid ""
 "light edge to transparent textures.  Apply this filter to clean that up\n"
 "at texture load time."
 msgstr ""
+"Gefilterde texturen kunnen RGB-waarden vermengen met transparante buren,\n"
+"die door PNG-optimalisators vaak verwijderd worden. Dit kan donkere of "
+"lichte\n"
+"randen bij transparante texturen tot gevolg hebben.\n"
+"Gebruik dit filter om dat tijdens het laden van texturen te herstellen."
 
 #: src/settings_translation_file.cpp
 msgid "Filtering"
@@ -2187,8 +2242,8 @@ msgid ""
 "From how far blocks are generated for clients, stated in mapblocks (16 "
 "nodes)."
 msgstr ""
-"Tot welke afstand blokken gegenereerd worden voor cliënten. In mapblokken "
-"(16 nodes)."
+"Tot welke afstand blokken gegenereerd worden voor cliënten. In mapblokken ("
+"16 nodes)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2201,6 +2256,8 @@ msgstr ""
 msgid ""
 "From how far clients know about objects, stated in mapblocks (16 nodes)."
 msgstr ""
+"De afstand waarop clienten geïnformeerd worden over objecten. In blokken (16 "
+"nodes)."
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
@@ -2240,10 +2297,9 @@ msgstr "Genereer normaalmappen"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
-msgstr ""
+msgstr "Algemene callbacks"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -2252,9 +2308,11 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Wereldgenerator instellingen specified voor generator v6.\n"
-"Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en wordt "
-"de \"jungles\" vlag genegeerd.\n"
+"Algemene wereldgenerator instellingen.\n"
+"De vlag 'decorations' bepaalt de aanwezigheid van alle decoraties, behalve\n"
+"bij generator v6,\n"
+"waar de aanwezigheid van bomen en oerwoud-gras er niet\n"
+"door beïnvloed wordt.\n"
 "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 "waarde.\n"
 "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
@@ -2283,12 +2341,12 @@ msgid ""
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Behandeling van verouderde lua api aanroepen:\n"
-"-    legacy: (probeer) het oude gedrag na te bootsen (standaard voor een "
-"'release' versie).\n"
-"-    log: boots het oude gedrag na, en log een backtrace van de aanroep "
-"(standaard voor een 'debug' versie).\n"
-"-    error: stop de server bij gebruik van een verouderde aanroep "
-"(aanbevolen voor mod ontwikkelaars)."
+"-    legacy: (probeer) het oude gedrag na te bootsen\n"
+"     (standaard voor een 'release' versie).\n"
+"-    log: boots het oude gedrag na, en log een backtrace van de aanroep\n"
+"     (standaard voor een 'debug' versie).\n"
+"-    error: stop de server bij gebruik van een verouderde aanroep\n"
+"     (aanbevolen voor mod ontwikkelaars)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2298,10 +2356,16 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
+"Laat de profiler zichzelf profileren:\n"
+"* Profileer een lege functie.\n"
+"   Dit geeft een schatting van de CPU-tijd die door de profiler zelf "
+"gebruikt wordt,\n"
+"   ten koste van één extra functie-aanroep.\n"
+"* Profileer de code die de statistieken ververst."
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
-msgstr "Vertikale aanvangsgroote van het openingsvenster."
+msgstr "Aanvangshoogte van het venster."
 
 #: src/settings_translation_file.cpp
 msgid "Height on which clouds are appearing."
@@ -2317,7 +2381,7 @@ msgstr "Home-pagina van de server. Wordt getoond in de serverlijst."
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers"
-msgstr "Hoe diep rivieren te maken"
+msgstr "Diepte van de rivieren"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2325,10 +2389,11 @@ msgid ""
 "mapblocks (16 nodes).\n"
 "In active blocks objects are loaded and ABMs run."
 msgstr ""
-"Tot op welke afstand van actieve spelers blokken 'actief' zijn. In blokken "
-"(van 16 nodes).\n"
+"Tot op welke afstand van actieve spelers blokken 'actief' zijn. In blokken ("
+"van 16 nodes).\n"
 "In actieve blokken worden objecten geladen (bijv. dieren die rondlopen) en "
-"ABMs uitgevoerd (bijv. groeien van planten)."
+"ABMs uitgevoerd\n"
+"(bijv. groeien van planten)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2341,7 +2406,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers"
-msgstr "Hoe breed rivieren te maken"
+msgstr "Breedte van rivieren"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
@@ -2369,7 +2434,8 @@ msgid ""
 "enabled."
 msgstr ""
 "Indien uitgeschakeld, dan wordt met de \"gebruiken\" toets snel gevlogen "
-"wanneer de \"vliegen\" en de \"snel\" modus aanstaan."
+"wanneer\n"
+"de \"vliegen\" en de \"snel\" modus aanstaan."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2377,7 +2443,7 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
-"Indien deze optie aanstaat, in combinatie met \"vliegen\" modus, dan kan de "
+"Indien deze optie aanstaat, in combinatie met \"vliegen\" modus, dan kan de\n"
 "speler door vaste objecten heenvliegen.\n"
 "Dit vereist het \"noclip\" voorrecht op de server."
 
@@ -2386,8 +2452,8 @@ msgid ""
 "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
 "and descending."
 msgstr ""
-"Indien aangeschakeld, dan wordt de \"gebruiken\" toets gebruikt voor "
-"omlaagklimmen en dalen i.p.v. de \"kruipen\" toets."
+"Indien aangeschakeld, dan wordt de \"gebruiken\" toets gebruikt voor\n"
+"omlaagklimmen en dalen i.p.v. de \"sluipen\" toets."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2408,7 +2474,8 @@ msgid ""
 "Only enable this if you know what you are doing."
 msgstr ""
 "Zorg dat de server niet stopt in geval van ongeldige wereld-data.\n"
-"Alleen aan te schakelen indien bekend is wat de consequenties zijn."
+"Alleen aan te schakelen door spelers / server-beheerders die weten wat de "
+"consequenties zijn."
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, new players cannot join with an empty password."
@@ -2421,7 +2488,7 @@ msgid ""
 "you stand.\n"
 "This is helpful when working with nodeboxes in small areas."
 msgstr ""
-"Indien aangeschakeld, kan een speler blokken plaatsen op de eigen positie "
+"Indien aangeschakeld, kan een speler blokken plaatsen op de eigen positie\n"
 "(het niveau van de voeten en van de ogen).\n"
 "Dit vergemakkelijkt het werken in nauwe ruimtes."
 
@@ -2452,34 +2519,39 @@ msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
+"Profileer 'builtin'.\n"
+"Dit is normaal enkel nuttig voor gebruik door ontwikkelaars van\n"
+"het 'builtin'-gedeelte van de server"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument chatcommands on registration."
-msgstr ""
+msgstr "Profileer chat-commando's bij het registreren."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
+"Profileer algemene callback-functies bij het registreren.\n"
+"(alles dat mbv een van de minetest.register_*() functies geregistreerd wordt"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
-msgstr ""
+msgstr "Profileer de acties van ABMs bij het registreren."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
-msgstr ""
+msgstr "Profileer de acties van LBMs bij het registreren."
 
 #: src/settings_translation_file.cpp
 msgid "Instrument the methods of entities on registration."
-msgstr ""
+msgstr "Profileer de acties van objecten bij het registreren."
 
 #: src/settings_translation_file.cpp
 msgid "Instrumentation"
-msgstr ""
+msgstr "Per soort"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
@@ -2493,7 +2565,7 @@ msgstr "Interval voor het sturen van de kloktijd naar cliënten."
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
-msgstr "inventaris items animaties"
+msgstr "Inventaris items animaties"
 
 #: src/settings_translation_file.cpp
 msgid "Inventory key"
@@ -2501,7 +2573,7 @@ msgstr "Rugzak toets"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
-msgstr "Muibeweging omkeren"
+msgstr "Muisbeweging omkeren"
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
@@ -2512,23 +2584,20 @@ msgid "Item entity TTL"
 msgstr "Bestaansduur van objecten"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Iterations of the recursive function.\n"
 "Controls the amount of fine detail."
 msgstr ""
-"Juliaverzameling: Aantal iteraties van de recursieve functie.\n"
+"Aantal iteraties van de recursieve functie.\n"
 "Bepaalt de schaal van de kleinste details."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick button repetition interval"
-msgstr "Rechts-klik herhalingsinterval"
+msgstr "Joystick-knop herhalingsinterval"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick frustum sensitivity"
-msgstr "Muis-gevoeligheid"
+msgstr "Joystick frustrum gevoeligheid"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2537,35 +2606,35 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Juliaverzameling: W-waarde van de 4D vorm. Heeft geen effect voor 3D-"
+"fractals.\n"
+"Bereik is ongeveer -2 tot 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only: X component of hypercomplex constant determining julia "
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Juliaverzameling: X-waarde van de 4D vorm.\n"
+"Juliaverzameling: X-waarde van de vorm.\n"
 "Bereik is ongeveer -2 tot 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only: Y component of hypercomplex constant determining julia "
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Juliaverzameling: Y-waarde van de 4D vorm.\n"
+"Juliaverzameling: Y-waarde van de vorm.\n"
 "Bereik is ongeveer -2 tot 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only: Z component of hypercomplex constant determining julia "
 "shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Juliaverzameling: Z-waarde van de 4D-vorm.\n"
+"Juliaverzameling: Z-waarde van de vorm.\n"
 "Bereik is ongeveer -2 tot 2."
 
 #: src/settings_translation_file.cpp
@@ -2577,15 +2646,14 @@ msgid "Jumping speed"
 msgstr "Sprinsnelheid"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for decreasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om oneindige zichtastand aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Toets om de zichtastand te verminderen.\n"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2594,19 +2662,18 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets voor het weggooien van het geselecteerde object.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for increasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om oneindige zichtastand aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Toets om de zichtastand te vergroten.\n"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2615,8 +2682,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets voor springen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2625,8 +2692,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om snel te bewegen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2635,8 +2702,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om de speler achteruit te bewegen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2645,8 +2712,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om de speler vooruit te bewegen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2655,8 +2722,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om de speler naar links te bewegen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2665,8 +2732,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om de speler naar rechts te bewegen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2675,8 +2742,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om de chat-console te openen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2685,8 +2752,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om het chat-window te openen om commando's te typen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2695,8 +2762,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om het chat-window te openen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2705,8 +2772,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om het rugzak-window te openen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2714,9 +2781,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om debug-stapels te printen. Gebruikt voor ontwikkeling.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Toets om debug-stacks te printen. Gebruikt voor ontwikkeling.\n"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2726,11 +2793,11 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om te kruipen.\n"
+"Toets om te sluipen.\n"
 "Wordt ook gebruikt om naar beneden te klimmen en te dalen indien "
 "aux1_descends uitstaat.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2739,8 +2806,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om tussen 1e-persoon camera en 3e-persoon camera te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2749,19 +2816,18 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om screenshot te maken.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling autorun.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om snelle modus aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Toets om automatisch lopen aan/uit te schakelen.\n"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2770,8 +2836,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om cinematic modus aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2780,8 +2846,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om de mini-kaart aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2790,8 +2856,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om snelle modus aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2800,8 +2866,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om vliegen aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2810,11 +2876,10 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om 'noclip' modus aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -2822,8 +2887,8 @@ msgid ""
 msgstr ""
 "Toets om camera-verversing aan/uit te schakelen. Enkel gebruikt voor "
 "ontwikkeling.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2832,8 +2897,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om debug informatie aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2842,8 +2907,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om de HUD aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2852,8 +2917,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om het tonen van chatberichten aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2862,8 +2927,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om mist aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2873,8 +2938,8 @@ msgid ""
 msgstr ""
 "Toets om het tonen van de code-profiler aan/uit te schakelen. Gebruikt voor "
 "ontwikkeling.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2883,8 +2948,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om oneindige zichtastand aan/uit te schakelen.\n"
-"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735"
+"e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Key use for climbing/descending"
@@ -2896,7 +2961,7 @@ msgstr "Taal"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
-msgstr "Grote grotten diepte"
+msgstr "Diepte van grote grotten"
 
 #: src/settings_translation_file.cpp
 msgid "Lava Features"
@@ -2915,7 +2980,7 @@ msgid ""
 msgstr ""
 "Type bladeren:\n"
 "-   Fancy:  alle zijden zichtbaar\n"
-"-   Simple: enkel buitenzijden zichtbaar; special_tiles worden gebruikt "
+"-   Simple: enkel buitenzijden zichtbaar; special_tiles wordt gebruikt "
 "indien gedefiniëerd\n"
 "-   Opaque: geen doorzichtige bladeren"
 
@@ -2933,11 +2998,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between ABM execution cycles"
-msgstr "Tijd tussen ABM executie cycli"
+msgstr ""
+"Tijdsinterval waarmee actieve blokken wijzigers (ABMs) geactiveerd worden"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between NodeTimer execution cycles"
-msgstr "Tijd tussen NodeTimer executie cycli"
+msgstr "Tijdsinterval waarmee node timerd geactiveerd worden"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2953,9 +3019,11 @@ msgstr ""
 "Hoeveelheid logging die geschreven wordt naar debug.txt:\n"
 "-    <leeg> (geen logging)\n"
 "-    none (enkel berichten zonder gedefiniëerd niveau)\n"
-"-    error (alles van minstens fout-niveau)-    warning (alles van minstens "
-"waarschuwings-niveau)-    action (alles van minstens actie-niveau)-    info "
-"(alles van minstens informatie-niveau)-    verbose (alles)"
+"-    error (alles van minstens fout-niveau)\n"
+"-    warning (alles van minstens waarschuwings-niveau)\n"
+"-    action (alles van minstens actie-niveau)\n"
+"-    info (alles van minstens informatie-niveau)\n"
+"-    verbose (alles)"
 
 #: src/settings_translation_file.cpp
 msgid "Limit of emerge queues on disk"
@@ -2973,7 +3041,7 @@ msgid ""
 "-    Downloads performed by main menu (e.g. mod manager).\n"
 "Only has an effect if compiled with cURL."
 msgstr ""
-"Beperking van aantal parallele HTTP verzoeken. Van toepassing op:\n"
+"Beperking van het aantal parallele HTTP verzoeken. Van toepassing op:\n"
 "-    Laden van media indien een externe media-server gebruikt wordt.\n"
 "-    Laden van de serverlijst en server-aankondigingen.\n"
 "-    Downloads vanuit het hoofdmens (bijv. mods).\n"
@@ -3009,7 +3077,7 @@ msgstr "Vloeistof verspreidingssnelheid"
 
 #: src/settings_translation_file.cpp
 msgid "Load the game profiler"
-msgstr ""
+msgstr "Gebruik de spel-profiler"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3017,11 +3085,14 @@ msgid ""
 "Provides a /profiler command to access the compiled profile.\n"
 "Useful for mod developers and server operators."
 msgstr ""
+"Gebruik de spel-profiler om profileringsgegevens van het spel te verzamelen."
+"\n"
+"Hierbij komt ook het server-commando '/profiler' beschikbaar.\n"
+"Nuttig voor mod-ontwikkelaars en server-beheerders."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Loading Block Modifiers"
-msgstr "Bereik waarbinnen blok wijzigers actief zijn"
+msgstr "Geladen blokken aanpassers (LBMs)"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
@@ -3052,7 +3123,6 @@ msgid "Map directory"
 msgstr "Wereld map"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -3064,15 +3134,18 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Wereldgenerator instellingen specified voor generator v6.\n"
-"Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en wordt "
-"de \"jungles\" vlag genegeerd.\n"
+"Wereldgenerator instellingen specifiek voor generator 'valleys' (valleien).\n"
+"'altitude_chill' maakt hogere gebieden kouder. Dit kan gevolgen hebben voor "
+"de biomen.\n"
+"'humid_rivers' verhoogt de vochtigheidsgraad bij rivieren en andere "
+"gebieden\n"
+"met water. Dit kan gevolgen hebben voor de zorgvuldig geconfigureerde biomen."
+"\n"
 "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 "waarde.\n"
 "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
@@ -3080,14 +3153,13 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Wereldgenerator instellingen specified voor generator v7.\n"
-"\"ridges\" zijn rivieren.\n"
+"Wereldgenerator instellingen specifiek voor generator 'flat' (vlak).\n"
+"Verspreide meren en heuvels kunnen toegevoegd worden.\n"
 "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 "waarde.\n"
 "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
@@ -3096,15 +3168,14 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Wereldgenerator instellingen specified voor generator v6.\n"
-"Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en wordt "
+"Wereldgenerator instellingen specifiek voor generator v6.\n"
+"Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en wordt\n"
 "de \"jungles\" vlag genegeerd.\n"
 "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 "waarde.\n"
 "Zet \"no\" voor een vlag om hem expliciet uit te zetten."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
@@ -3112,7 +3183,7 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Wereldgenerator instellingen specified voor generator v7.\n"
+"Wereldgenerator instellingen specifiek voor generator v7.\n"
 "\"ridges\" zijn rivieren.\n"
 "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 "waarde.\n"
@@ -3140,15 +3211,15 @@ msgstr "Valleien Wereldgenerator"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome heat noise parameters"
-msgstr "Wereldgenerator landschapstemperatuur ruisparameters"
+msgstr "Wereldgenerator landschapstemperatuur"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome humidity blend noise parameters"
-msgstr "Wereldgenerator landschapsvochtigheidsovergangen ruisparameters"
+msgstr "Wereldgenerator landschapsvochtigheidsovergangen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen biome humidity noise parameters"
-msgstr "Wereldgenerator landschapsvochtigheid ruisparameters"
+msgstr "Wereldgenerator landschapsvochtigheid"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"
@@ -3164,51 +3235,51 @@ msgstr "Vlakke Wereldgenerator"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave width"
-msgstr "Vlakke wereldgenerator grot breedte"
+msgstr "Grot breedte"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave1 noise parameters"
-msgstr "Vlakke wereldgenerator grotten (1) ruisparameters"
+msgstr "Grotten (1) ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave2 noise parameters"
-msgstr "Vlakke wereldgenerator grotten (2) ruisparameters"
+msgstr "Grotten (2) ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat filler depth noise parameters"
-msgstr "Fractal wereldgenerator vuldiepte ruisparameters"
+msgstr "Vuldiepte ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat flags"
-msgstr "Vlakke wereldgenerator vlaggen"
+msgstr "Vlaggen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat ground level"
-msgstr "Vlakke wereldgenerator grondniveau"
+msgstr "Grondniveau"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill steepness"
-msgstr "Vlakke wereldgenerator heuvel steilheid"
+msgstr "Steilheid van de heuvels"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill threshold"
-msgstr "Vlakke wereldgenerator heuvel grenswaarde"
+msgstr "Heuvel-grenswaarde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat lake steepness"
-msgstr "Vlakke wereldgenerator meer steilheid"
+msgstr "Steilheid Van de meren"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat lake threshold"
-msgstr "Vlakke wereldgenerator meer grenswaarde"
+msgstr "Meren-grenswaarde"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat large cave depth"
-msgstr "Vlakke wereldgenerator grote grotten diepte"
+msgstr "Grote Grotten diepte"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat terrain noise parameters"
-msgstr "Vlakke Wereldgenerator basisterrein ruisparameters"
+msgstr "Terrein ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal"
@@ -3216,69 +3287,63 @@ msgstr "Fractal wereldgenerator"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave width"
-msgstr "Fractal wereldgenerator grot breedte"
+msgstr "Grot breedte"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave1 noise parameters"
-msgstr "Fractal wereldgenerator grotten (1) ruisparameters"
+msgstr "Grotten (1) ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave2 noise parameters"
-msgstr "Fractal wereldgenerator grotten (2) ruisparameters"
+msgstr "Grotten (2) ruisparameters"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal filler depth noise parameters"
-msgstr "Fractal wereldgenerator vuldiepte ruisparameters"
+msgstr "Vuldiepte ruisparameters"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal fractal"
-msgstr "Fractal wereldgenerator vlaggen"
+msgstr "Fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal iterations"
-msgstr "Fractal wereldgenerator julia iteraties"
+msgstr "Aantal iteraties"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia w"
-msgstr "Fractal wereldgenerator julia w"
+msgstr "Fractal W"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia x"
-msgstr "Fractal wereldgenerator julia x"
+msgstr "Fractal X"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia y"
-msgstr "Fractal wereldgenerator julia y"
+msgstr "Fractal Y"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia z"
-msgstr "Fractal wereldgenerator julia z"
+msgstr "Fractal Z"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal offset"
-msgstr "Fractal wereldgenerator julia centrum-afstand"
+msgstr "Centrum-positie"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal scale"
-msgstr "Fractal wereldgenerator julia schaal"
+msgstr "Schaal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal seabed noise parameters"
-msgstr "Fractal wereldgenerator zeebodem parameters"
+msgstr "Zeebodem ruisparameters"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal slice w"
-msgstr "Fractal wereldgenerator julia w-doorsnede"
+msgstr "W-doorsnede"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen heat blend noise parameters"
-msgstr "Wereldgenerator landschapstemperatuurovergangen ruisparameters"
+msgstr "Wereldgenerator landschapstemperatuurovergangen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
@@ -3289,30 +3354,28 @@ msgid "Mapgen v5"
 msgstr "Wereldgenerator v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave width"
-msgstr "Fractal wereldgenerator julia schaal"
+msgstr "Grot-breedte"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave1 noise parameters"
-msgstr "Wereldgenerator v5 grot 1 ruisparameters"
+msgstr "Grot 1 ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave2 noise parameters"
-msgstr "Wereldgenerator v5 grot 2 ruisparameters"
+msgstr "Grot 2 ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 factor noise parameters"
-msgstr "Wereldgenerator v5 ruisparameters factor"
+msgstr "Ruisparameters factor"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 filler depth noise parameters"
-msgstr "Wereldgenerator v5 vuldiepte ruisparameters"
+msgstr "Vuldiepte ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 height noise parameters"
-msgstr "Wereldgenerator v5 hoogte ruisparameters"
+msgstr "Hoogte ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6"
@@ -3320,130 +3383,127 @@ msgstr "Wereldgenerator v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 apple trees noise parameters"
-msgstr "Wereldgenerator v6 appelbomen ruisparameters"
+msgstr "Appelbomen ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach frequency"
-msgstr "Wereldgenerator v6 strand frequentie"
+msgstr "Strand frequentie"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach noise parameters"
-msgstr "Wereldgenerator v6 strand ruisparameters"
+msgstr "Strand ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 biome noise parameters"
-msgstr "Wereldgenerator v6 landschap ruisparameters"
+msgstr "Landschap ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 cave noise parameters"
-msgstr "Wereldgenerator v6 grotten ruisparameters"
+msgstr "Grotten ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 desert frequency"
-msgstr "Wereldgenerator v6 woestijn ruisparameters"
+msgstr "Woestijn frequentie"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 flags"
-msgstr "Wereldgenerator v6 vlaggen"
+msgstr "Vlaggen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 height select noise parameters"
-msgstr "Wereldgenerator v6 hoogte-selectie ruisparameters"
+msgstr "Hoogte-selectie ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 humidity noise parameters"
-msgstr "Wereldgenerator v6 vochtigheid ruisparameters"
+msgstr "Vochtigheid ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 mud noise parameters"
-msgstr "Wereldgenerator v6 modder ruisparameters"
+msgstr "Modder ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 steepness noise parameters"
-msgstr "Wereldgenerator v6 steilheid ruisparameters"
+msgstr "Steilheid ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 terrain altitude noise parameters"
-msgstr "Wereldgenerator v6 terrein-hoogte ruisparameters"
+msgstr "Terrein-hoogte ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 terrain base noise parameters"
-msgstr "Wereldgenerator v6 basisterrein ruisparameters"
+msgstr "Basisterrein ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 trees noise parameters"
-msgstr "Wereldgenerator v6 bomen ruisparameters"
+msgstr "Bomen ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7"
 msgstr "Wereldgenerator v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 cave width"
-msgstr "Fractal wereldgenerator julia schaal"
+msgstr "Grot-breedte"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave1 noise parameters"
-msgstr "Wereldgenerator v7 grotten (1) ruisparameters"
+msgstr "Grotten (1) ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave2 noise parameters"
-msgstr "Wereldgenerator v7 grotten (2) ruisparameters"
+msgstr "Grotten (2) ruisparameters"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 filler depth noise parameters"
-msgstr "Wereldgenerator v7 vuldiepte ruisparameters"
+msgstr "Vuldiepte ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 flags"
-msgstr "Wereldgenerator v7 vlaggen"
+msgstr "Vlaggen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 height select noise parameters"
-msgstr "Wereldgenerator v7 hoogte-selectie ruisparameters"
+msgstr "Hoogte-selectie ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 mount height noise parameters"
-msgstr "Wereldgenerator v7 heuvel-hoogte ruisparameters"
+msgstr "Heuvel-hoogte ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 mountain noise parameters"
-msgstr "Wereldgenerator v7 bergen ruisparameters"
+msgstr "Bergen ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 ridge noise parameters"
-msgstr "Wereldgenerator v7 richel ruisparameters"
+msgstr "Richel ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 ridge water noise parameters"
-msgstr "Wereldgenerator richel-water ruisparameters"
+msgstr "Ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 terrain altitude noise parameters"
-msgstr "Wereldgenerator v7 terrein-hoogte ruisparameters"
+msgstr "Terrein-hoogte ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 terrain base noise parameters"
-msgstr "Wereldgenerator v7 terrein basis ruisparameters"
+msgstr "Terrein basis ruisparameters"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 terrain persistation noise parameters"
-msgstr "Wereldgenerator v7 terrein-'persist' ruisparameters"
+msgstr "Terrein-'persist' ruisparameters"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave depth"
-msgstr ""
+msgstr "Zeer grote grotten: diepte"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave noise"
-msgstr ""
+msgstr "Zeer grote grotten: ruis"
 
 #: src/settings_translation_file.cpp
 msgid "Massive caves form here."
-msgstr ""
+msgstr "Zeer grote grotten ruis parameters."
 
 #: src/settings_translation_file.cpp
 msgid "Max block generate distance"
@@ -3456,8 +3516,8 @@ msgstr "Maximale afstand voor te versturen blokken"
 #: src/settings_translation_file.cpp
 msgid "Max liquids processed per step."
 msgstr ""
-"Maximaal aantal vloeistof-nodes te verwerken (dwz verspreiden) per server-"
-"stap."
+"Maximaal aantal vloeistof-nodes te verwerken (dwz verspreiden)\n"
+"per server-stap."
 
 #: src/settings_translation_file.cpp
 msgid "Max. clearobjects extra blocks"
@@ -3480,19 +3540,16 @@ msgid "Maximum forceloaded blocks"
 msgstr "Maximaal aantal geforceerd geladen blokken"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum hotbar width"
 msgstr "Maximale breedte van de 'hotbar'"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent in total."
-msgstr "Maximaal aantal spelers dat tegelijk verbonden kan zijn."
+msgstr "Maximaal aantal blokken dat in totaal tegelijk verzonden wordt."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent per client."
-msgstr "Maximaal aantal blokken in de wachtrij voor laden/genereren."
+msgstr "Maximaal aantal blokken per client dat tegelijk verzonden wordt."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
@@ -3545,31 +3602,28 @@ msgstr "Maximaal aantal spelers dat tegelijk verbonden kan zijn."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of statically stored objects in a block."
-msgstr "Maximaal aantal objecten per block."
+msgstr "Maximaal aantal objecten per blok dat wordt opgeslagen."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum objects per block"
 msgstr "Maximaal aantal objecten per blok"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum proportion of current window to be used for hotbar.\n"
 "Useful if there's something to be displayed right or left of hotbar."
 msgstr ""
-"Maximaal gedeelte van het window dat gebruikt mag worden voor de hotbar.\n"
+"Maximale fractie van de breedte het window dat gebruikt mag worden voor de "
+"hotbar.\n"
 "Dit is nuttig als er iets links of rechts ervan getoond moet worden."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends per client"
-msgstr "Maximaal aantal tegelijk te verzenden blokken per cliënt"
+msgstr "Maximaal simultaan verzonden blokken per cliënt"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends total"
-msgstr "Maximaal aantal tegelijk te verzenden blokken (totaal)"
+msgstr "Maximaal simultaan verzonden blokken (totaal)"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
@@ -3582,13 +3636,12 @@ msgid "Maximum users"
 msgstr "Maximaal aantal gebruikers"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Menus"
-msgstr "Menu"
+msgstr "Menus"
 
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
-msgstr ""
+msgstr "Cache voor meshes"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day"
@@ -3601,6 +3654,9 @@ msgstr "Toon bericht aan spelers die verbinding maken."
 #: src/settings_translation_file.cpp
 msgid "Method used to highlight selected object."
 msgstr ""
+"Manier waarop het geselecteerde object zichtbaar wordt gemaakt.\n"
+"* box: node wordt omlijnd.\n"
+"* halo: node licht op."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
@@ -3619,7 +3675,6 @@ msgid "Minimum texture size for filters"
 msgstr "Minimale textuur-grootte voor filters"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mipmapping"
 msgstr "Mip-Mapping"
 
@@ -3657,8 +3712,10 @@ msgid ""
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
 "Vermenigvuldigingsfactor van loopbeweging bij vallen.\n"
-"Bijvoorbeeld: 0 voor geen loopbeweging; 1.0 voor normale loopbeweging; 2.0 "
-"voor twee keer grotere loopbeweging."
+"Bijvoorbeeld:\n"
+"0 voor geen loopbeweging.\n"
+"1.0 voor normale loopbeweging.\n"
+"2.0 voor twee keer grotere loopbeweging."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3666,8 +3723,10 @@ msgid ""
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
 "Vermenigvuldigingsfactor van loopbeweging.\n"
-"Bijvoorbeeld: 0 voor geen loopbeweging; 1.0 voor normale loopbeweging; 2.0 "
-"voor twee keer grotere loopbeweging."
+"Bijvoorbeeld:\n"
+"0 voor geen loopbeweging.\n"
+"1.0 voor normale loopbeweging.\n"
+"2.0 voor twee keer grotere loopbeweging."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3717,18 +3776,16 @@ msgid "Noclip"
 msgstr "Noclip"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Noclip key"
 msgstr "Noclip-toets"
 
 #: src/settings_translation_file.cpp
 msgid "Node highlighting"
-msgstr "Oplichtende node"
+msgstr "Geselecteerde node indicatie"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "NodeTimer interval"
-msgstr "Kloktijd verstuur-interval"
+msgstr "Interval voor node-timers"
 
 #: src/settings_translation_file.cpp
 msgid "Noise parameters for biome API temperature, humidity and biome blend."
@@ -3737,15 +3794,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Noises"
-msgstr ""
+msgstr "Ruis"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps sampling"
-msgstr ""
+msgstr "Normal-maps bemonstering"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps strength"
-msgstr ""
+msgstr "Sterkte van normal-maps"
 
 #: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
@@ -3771,9 +3828,9 @@ msgid ""
 "This is a trade-off between sqlite transaction overhead and\n"
 "memory consumption (4096=100MB, as a rule of thumb)."
 msgstr ""
-"Aantal extra blokken (van 16x16x16 nodes) dat door het commando '/"
-"clearobjects' tegelijk\n"
-"geladen mag worden.\n"
+"Aantal extra blokken (van 16x16x16 nodes) dat door het commando "
+"'/clearobjects'\n"
+"tegelijk geladen mag worden.\n"
 "Dit aantal is een compromis tussen snelheid enerzijds (vanwege de overhead "
 "van een sqlite\n"
 "transactie), en geheugengebruik anderzijds (4096 = ca. 100MB)."
@@ -3784,11 +3841,11 @@ msgstr "Aantal parallax occlusie iteraties."
 
 #: src/settings_translation_file.cpp
 msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
+msgstr "Algemene afwijking van het parallax occlusie effect. Normaal: schaal/2."
 
 #: src/settings_translation_file.cpp
 msgid "Overall scale of parallax occlusion effect."
-msgstr ""
+msgstr "Algemene schaal van het parallax occlusie effect."
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion"
@@ -3799,9 +3856,8 @@ msgid "Parallax occlusion Scale"
 msgstr "Parallax occlusie schaal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Parallax occlusion bias"
-msgstr "Parallax occlusie"
+msgstr "Parallax occlusie afwijking"
 
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion iterations"
@@ -3812,9 +3868,8 @@ msgid "Parallax occlusion mode"
 msgstr "Parallax occlusie modus"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Parallax occlusion strength"
-msgstr "Parallax occlusie"
+msgstr "Parallax occlusie sterkte"
 
 #: src/settings_translation_file.cpp
 msgid "Path to TrueTypeFont or bitmap."
@@ -3858,8 +3913,8 @@ msgid ""
 "Port to connect to (UDP).\n"
 "Note that the port field in the main menu overrides this setting."
 msgstr ""
-"Netwerk-poort (UDP) waarmee verbinding gemaakt moet worden.In het hoofdmenu "
-"kan een andere waarde opgegeven worden."
+"Netwerk-poort (UDP) waarmee verbinding gemaakt moet worden.\n"
+"In het hoofdmenu kan een andere waarde opgegeven worden."
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
@@ -3867,7 +3922,6 @@ msgstr ""
 "Voorkom dat mods onveilige commando's uitvoeren, zoals shell commando's."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds). 0 = "
 "disable. Useful for developers."
@@ -3877,11 +3931,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
-msgstr ""
+msgstr "Voorrechten die spelers met 'basic_privs' mogen toekennen"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler"
-msgstr ""
+msgstr "Profiler"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
@@ -3889,7 +3943,7 @@ msgstr "Profiler aan/uit toets"
 
 #: src/settings_translation_file.cpp
 msgid "Profiling"
-msgstr ""
+msgstr "Profileren"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3902,7 +3956,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Raises terrain to make valleys around the rivers"
-msgstr ""
+msgstr "Verhoogt het terrein om rond de rivieren valleien te maken"
 
 #: src/settings_translation_file.cpp
 msgid "Random input"
@@ -3925,9 +3979,8 @@ msgid "Replaces the default main menu with a custom one."
 msgstr "Vervangt het standaard hoofdmenu door een ander."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
-msgstr "Font pad"
+msgstr "Rapport pad"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
@@ -3939,19 +3992,21 @@ msgstr "Rechts-klik herhalingsinterval"
 
 #: src/settings_translation_file.cpp
 msgid "River Depth"
-msgstr ""
+msgstr "Diepte van rivieren"
 
 #: src/settings_translation_file.cpp
 msgid "River Noise"
-msgstr ""
+msgstr "Rivier ruis parameters"
 
 #: src/settings_translation_file.cpp
 msgid "River Size"
-msgstr ""
+msgstr "Grootte van rivieren"
 
 #: src/settings_translation_file.cpp
 msgid "River noise -- rivers occur close to zero"
 msgstr ""
+"Rivier ruis parameters.\n"
+"Rivieren komen voor in de buurt van niveau 0"
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
@@ -4000,14 +4055,12 @@ msgid "Screenshot folder"
 msgstr "Map voor screenshots"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "Map voor screenshots"
+msgstr "Formaat voor screenshots"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "Screenshot"
+msgstr "Screenshot kwaliteit"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4015,6 +4068,9 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"Kwaliteit van screenshots. Enkel voot JPEG.\n"
+"Van 1 (slechtst) tot 100 (best).\n"
+"0 = een redelijke standaardwaarde."
 
 #: src/settings_translation_file.cpp
 msgid "Security"
@@ -4100,14 +4156,13 @@ msgstr ""
 "Golvend water staat aan indien 'true'Dit vereist dat 'shaders' ook aanstaan."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
-"Shaders maken bijzondere visuele effecten mogelijk, en kunnen op sommige "
-"videokaarten ook de snelheid verhogen.\n"
+"Shaders maken bijzondere visuele effecten mogelijk, en kunnen op sommige\n"
+"videokaarten ook sneller zijn.\n"
 "Alleen mogelijk met OpenGL."
 
 #: src/settings_translation_file.cpp
@@ -4120,7 +4175,7 @@ msgstr "Toon debug informatie"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
-msgstr ""
+msgstr "Toon selectie-box voor objecten"
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
@@ -4136,19 +4191,19 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Slope and fill work together to modify the heights"
-msgstr ""
+msgstr "Helling en vulling bepalen in combinatie de hoogte"
 
 #: src/settings_translation_file.cpp
 msgid "Smooth lighting"
 msgstr "Vloeiende verlichting"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
 "Maakt camerabewegingen vloeiender bij het rondkijken.\n"
+"Wordt ook wel zicht- of muis-smoothing genoemd.\n"
 "Nuttig bij het opnemen van videos."
 
 #: src/settings_translation_file.cpp
@@ -4162,7 +4217,7 @@ msgstr "Maakt camera-rotatie vloeiender. O om uit te zetten."
 
 #: src/settings_translation_file.cpp
 msgid "Sneak key"
-msgstr "Kruipen toets"
+msgstr "Sluipen toets"
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
@@ -4187,11 +4242,11 @@ msgstr "Vast geboortepunt"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of generated normalmaps."
-msgstr ""
+msgstr "Sterkte van de normal-maps."
 
 #: src/settings_translation_file.cpp
 msgid "Strength of parallax."
-msgstr ""
+msgstr "Sterkte van de parallax."
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
@@ -4199,7 +4254,7 @@ msgstr "Stricte protocolcontrole"
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
-msgstr ""
+msgstr "Ondersteuning voor oudere servers"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -4207,7 +4262,7 @@ msgstr "Sqlite synchrone modus"
 
 #: src/settings_translation_file.cpp
 msgid "Terrain Height"
-msgstr ""
+msgstr "Terrein hoogte"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4215,6 +4270,9 @@ msgid ""
 "Controls proportion of world area covered by hills.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Terrein ruis-grens voor heuvels.\n"
+"Bepaalt hoeveel van de wereld bedekt is met heuvels.\n"
+"Een lagere waarde (richting 0.0) geeft meer heuvels."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4222,6 +4280,9 @@ msgid ""
 "Controls proportion of world area covered by lakes.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Terrein ruis-grens voor meren.\n"
+"Bepaalt hoeveel van de wereld bedekt is met meren.\n"
+"Een lagere waarde (richting 0.0) geeft meer meren."
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
@@ -4229,23 +4290,27 @@ msgstr "Pad van texturen"
 
 #: src/settings_translation_file.cpp
 msgid "The altitude at which temperature drops by 20C"
-msgstr ""
+msgstr "Het hoogteverschil voor een termperatuurverschil van 20°C"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"Het standaardformaat waarin profileringsgegevens worden bewaard,\n"
+" als '/profiler save' wordt aangeroepen zonder expliciet formaat."
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
-msgstr ""
+msgstr "De diepte van aarde of andersoortige toplaag"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your worldpath in which profiles will be saved "
 "to.\n"
 msgstr ""
+"Het pad, ten opzichte van het wereld-pad, waar profilerings-gegevens worden "
+"opgeslagen.\n"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -4269,6 +4334,8 @@ msgid ""
 "The sensitivity of the joystick axes for moving the\n"
 "ingame view frustum around."
 msgstr ""
+"De gevoeligheid van de assen van de joystick voor het bewegen van de "
+"frustrum in het spel."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4277,6 +4344,10 @@ msgid ""
 "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
 "set to the nearest valid value."
 msgstr ""
+"De sterke van node ambient-occlusie shading effect.\n"
+"Lagere waarden geven een donkerder effect. Hoger is lichter.\n"
+"Geldige waarden zijn van 0.25 tot 4.0. Een ongeldige waarde wordt\n"
+"aangepast naar de dichtstbijzijnde geldige waarde."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4290,20 +4361,19 @@ msgstr ""
 "uit de rij verwijderd. Gebruik 0 om dit uit te zetten."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
-"De tijd in seconden tussen herhaalde rechts-klikken als de rechter muisknop "
-"ingedrukt gehouden wordt."
+"De tijd in seconden tussen herhaalde klikken als de joystick-knop ingedrukt "
+"gehouden wordt."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated right clicks when holding the "
 "right mouse button."
 msgstr ""
-"De tijd in seconden tussen herhaalde rechts-klikken als de rechter muisknop "
+"De tijd in seconden tussen herhaalde rechts-klikken als de rechter muisknop\n"
 "ingedrukt gehouden wordt."
 
 #: src/settings_translation_file.cpp
@@ -4312,7 +4382,7 @@ msgstr "Dit font wordt gebruikt voor bepaalde talen."
 
 #: src/settings_translation_file.cpp
 msgid "Time in between active block management cycles"
-msgstr ""
+msgstr "Tijd tussen ABM cycli"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4343,9 +4413,9 @@ msgid ""
 "This determines how long they are slowed down after placing or removing a "
 "node."
 msgstr ""
-"Om vertraging te verminderen worden blokken minder snel verstuurd als een "
+"Om vertraging te verminderen worden blokken minder snel verstuurd als een\n"
 "speler aan het bouwen is.\n"
-"Deze instelling bepaalt hoelang ze achtergehouden worden nadat een speler "
+"Deze instelling bepaalt hoelang ze achtergehouden worden nadat een speler\n"
 "een node geplaatst of verwijderd heeft."
 
 #: src/settings_translation_file.cpp
@@ -4422,27 +4492,27 @@ msgstr "V-Sync"
 
 #: src/settings_translation_file.cpp
 msgid "VBO"
-msgstr ""
+msgstr "VBO"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Depth"
-msgstr ""
+msgstr "Vallei-diepte"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Fill"
-msgstr ""
+msgstr "Vallei-vulling"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Profile"
-msgstr ""
+msgstr "Vallei-profiel"
 
 #: src/settings_translation_file.cpp
 msgid "Valley Slope"
-msgstr ""
+msgstr "Vallei-helling"
 
 #: src/settings_translation_file.cpp
 msgid "Valleys C Flags"
-msgstr ""
+msgstr "Valleien vlaggen"
 
 #: src/settings_translation_file.cpp
 msgid "Vertical screen synchronization."
@@ -4461,6 +4531,8 @@ msgid ""
 "View distance in nodes.\n"
 "Min = 20"
 msgstr ""
+"Zichtafstand in nodes.\n"
+"Minimaal: 20"
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
@@ -4471,23 +4543,23 @@ msgid "View range increase key"
 msgstr "Toets voor vergroten zichtafstand"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Viewing range"
-msgstr "Maximale zichtafstand"
+msgstr "Zichtafstand"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
 msgstr "Geluidsniveau"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "W co-ordinate of the generated 3D slice of a 4D fractal.\n"
 "Determines which 3D slice of the 4D shape is generated.\n"
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Juliaverzameling: W-coördinaat van de 3D doorsnede van de 4D vorm.\n"
+"W-coördinaat van de 3D doorsnede van de 4D vorm.\n"
+"Bepaalt welke 3D-doorsnelde van de 4D-vorm gegenereerd wordt.\n"
+"Heeft geen effect voor 3D-fractals.\n"
 "Bereik is ongeveer -2 tot 2."
 
 #: src/settings_translation_file.cpp
@@ -4495,9 +4567,8 @@ msgid "Walking speed"
 msgstr "Loopsnelheid"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Water Features"
-msgstr "Waterniveau"
+msgstr "Ondergronds water"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
@@ -4553,6 +4624,11 @@ msgid ""
 "to the old scaling method, for video drivers that don't\n"
 "properly support downloading textures back from hardware."
 msgstr ""
+"Als gui_scaling_filter_txr2img aan staat, worden plaatjes\n"
+"van de GPU naar het werkgeheugen gekopiëerd voor schalen.\n"
+"Anders wordt de oude methode gebruikt, voor video-kaarten\n"
+"die geen ondersteuning hebben voor het kopiëren van texturen\n"
+"terug naar het werkgeheugen."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4573,7 +4649,8 @@ msgstr ""
 "aanbevolen\n"
 "machten van 2 te gebruiken. Een waarde groter dan 1 heeft wellicht geen "
 "zichtbaar\n"
-"effect indien bi-lineaire, tri-lineaire of anisotropische niet aan staan."
+"effect indien bi-lineaire, tri-lineaire of anisotropische filtering niet aan "
+"staan."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4586,10 +4663,14 @@ msgid ""
 msgstr ""
 "Grenzen van de wereldgenerator.\n"
 "-    Maximale waarde: 31000 (hogere waarden worden niet gehonoreerd).\n"
-"-    De wereld wordt gegenereerd per gebied van 80x80x80 nodes (5x5x5 "
-"mapblokken).\n"
-"-    Het centrum-gebied begint op coördinaten (-32, -32, -32).\n"
-"-    Enkel groepen die vallen binnen map_generation_limit worden gegenereerd"
+"-    De wereld wordt standaard gegenereerd per gebied van 80x80x80 nodes\n"
+"     (5x5x5 mapblokken).\n"
+"-    Coordinaat (0,0,0) bevindt zich zoveel mogelijk in het centrum van een "
+"gebied.\n"
+"     Dat betekent dat standaard, het meest centrale gebied begint op "
+"coördinaat (-32,-32,-32)\n"
+"-    Enkel gebieden (van standaard 5x5x5 blokken) die geheel vallen binnen\n"
+"     map_generation_limit worden gegenereerd"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4622,8 +4703,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether to fog out the end of the visible area."
-msgstr ""
-"Maak het einde van het zichtbereik mistig, zodat het einde niet opvalt."
+msgstr "Maak het einde van het zichtbereik mistig, zodat het einde niet opvalt."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4639,11 +4719,15 @@ msgid ""
 "Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
 "Disabling this option will protect your password better."
 msgstr ""
+"Ondersteuning voor oudere servers (vóór protocol versie 25).\n"
+"Schakel dit in voor verbinden met servers versie 0.4.12 en eerder.\n"
+"Voor servers vanaf 0.4.13 is dit niet nodig. Dit geldt ook voor\n"
+"sommige servers versie 0.4.12-dev.\n"
+"Indien dit uit staat, wordt het wachtwoord op een veiligere manier verzonden."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width component of the initial window size."
-msgstr "Horizontale aanvangsgroote van het window."
+msgstr "Aanvangsbreedte van het venster."
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selectionbox's lines around nodes."
@@ -4660,11 +4744,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
-msgstr ""
+msgstr "Niveau van de oppervlakte (Y-coördinaat)."
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large pseudorandom caves."
-msgstr ""
+msgstr "Minimale diepte van grote semi-willekeurige grotten."
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
@@ -5051,8 +5135,8 @@ msgstr "cURL timeout"
 #~ "Flags starting with 'no' are used to explicitly disable them."
 #~ msgstr ""
 #~ "Wereldgenerator instellingen specified voor generator v6.\n"
-#~ "Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en "
-#~ "wordt de \"jungles\" vlag genegeerd.\n"
+#~ "Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en wordt "
+#~ "de \"jungles\" vlag genegeerd.\n"
 #~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
 #~ "waarde.\n"
 #~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten."

From 34e69e5479f139956caf38bfba9233628facb285 Mon Sep 17 00:00:00 2001
From: Cold Meson 06 <fernando.devmines@gmail.com>
Date: Tue, 20 Dec 2016 02:18:51 +0000
Subject: [PATCH 413/418] Translated using Weblate (Portuguese (Brazil))

Currently translated at 84.5% (776 of 918 strings)
---
 po/pt_BR/minetest.po | 403 ++++++++++++++++++-------------------------
 1 file changed, 171 insertions(+), 232 deletions(-)

diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index 28c5d8890..5827b6b51 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-09-27 17:51+0000\n"
-"Last-Translator: José Henrique Luckmann <joseh.luckmann@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
-"minetest/minetest/pt_BR/>\n"
+"PO-Revision-Date: 2016-12-20 04:19+0000\n"
+"Last-Translator: Cold Meson 06 <fernando.devmines@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) "
+"<https://hosted.weblate.org/projects/minetest/minetest/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.9-dev\n"
+"X-Generator: Weblate 2.10\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -41,7 +41,7 @@ msgstr "Reconectar"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "O servidor requisitou uma reconexão:"
+msgstr "O servidor solicitou uma reconexão:"
 
 #: builtin/mainmenu/common.lua src/game.cpp
 msgid "Loading..."
@@ -53,25 +53,25 @@ msgstr "Versão do protocolo incompatível. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "O servidor suporta o protocolo versão $1. "
+msgstr "O servidor obriga a versão de protocolo $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "O servidor suporta entre as versões $1 e $2 do protocolo. "
+msgstr "O servidor suporta versões de protocolo entre $1 e $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "Try reenabling public serverlist and check your internet connection."
 msgstr ""
-"Tente reabilitar a lista de servidores públicos e checar sua conexão de "
-"internet."
+"Tente reabilitar a lista de servidores públicos e verifique sua conexão com "
+"a internet."
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr "Nós apenas suportamos a versão $1 do protocolo."
+msgstr "Nós apenas suportamos a versão do protocolo $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr "Nós suportamos entre as versões $1 e $2 do protocolo."
+msgstr "Nós suportamos as versões de protocolo entre $1 e $2 ."
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
@@ -141,11 +141,11 @@ msgstr "Criar"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a subgame, such as minetest_game, from minetest.net"
-msgstr "Baixe um subgame, como o minetest_game, do site minetest.net"
+msgstr "Baixe um subgame, como minetest_game, do site minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr "Baixe um do site minetest.net"
+msgstr "Baixe um apartir do site minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -175,7 +175,7 @@ msgstr "Nome do mundo"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no subgames installed."
-msgstr "Você não possui nenhum subgame instalado."
+msgstr "Você não possui subgames instalados."
 
 #: builtin/mainmenu/dlg_delete_mod.lua
 msgid "Are you sure you want to delete \"$1\"?"
@@ -221,7 +221,7 @@ msgstr "< Voltar para as configurações"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
-msgstr "Navegar"
+msgstr "Procurar"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
@@ -253,7 +253,7 @@ msgstr "Jogos"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
 msgid "Mods"
-msgstr "Mods"
+msgstr "Modulos (Mods)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Optionally the lacunarity can be appended with a leading comma."
@@ -274,7 +274,7 @@ msgstr "Por favor, insira um número válido."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Possible values are: "
-msgstr "Os possíveis valores são: "
+msgstr "Valores possíveis são:"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
@@ -302,8 +302,7 @@ msgid ""
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
 "\n"
-"Instalação de módulo: o tipo de arquivo \"$1\" não é suportado ou o arquivo "
-"está corrompido"
+"Instalar Mod: tipo de arquivo \"$1\" não suportado ou arquivo corrompido"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Failed to install $1 to $2"
@@ -326,7 +325,7 @@ msgstr ""
 
 #: builtin/mainmenu/store.lua
 msgid "Close store"
-msgstr "Fechar Mod Store"
+msgstr "Fechar loja"
 
 #: builtin/mainmenu/store.lua
 msgid "Downloading $1, please wait..."
@@ -346,7 +345,7 @@ msgstr "Classificação"
 
 #: builtin/mainmenu/store.lua
 msgid "Search"
-msgstr "Procurar"
+msgstr "Buscar"
 
 #: builtin/mainmenu/store.lua
 msgid "Shortname:"
@@ -583,9 +582,8 @@ msgid "None"
 msgstr "Nenhum"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Normal Mapping"
-msgstr "Mapeamento Normal"
+msgstr "Mapeamento de Normais"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -604,9 +602,8 @@ msgid "Particles"
 msgstr "Partículas"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Reset singleplayer world"
-msgstr "Resetar mundo para um jogador"
+msgstr "Resetar mundo um-jogador"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -1306,7 +1303,6 @@ msgid "X Button 2"
 msgstr "Botão X 2"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
 "Used to move a suitable spawn area of low land close to (0, 0).\n"
@@ -1314,12 +1310,12 @@ msgid ""
 "sets.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"(X,Y,Z) compensador do fractal do centro do mundo em unidade da 'escala'.\n"
+"(X,Y,Z) Espaço do fractal apartir centro do mundo em unidades de 'escala'.\n"
 "Usado para mover uma área adequada de spawn de baixo da terra perto de (0, "
 "0).\n"
-"O padrão é adequado para configurações de mandelbrot, isso precisa ser "
-"editado por configurações de julia.\n"
-"Variam cerca de -2 a 2. Multiplique por \"escala\" para compensação de nodes."
+"O padrão é adequado para configurações de mandelbrot,Precisa ser editado "
+"para configurações de julia.\n"
+"Variam cerca de -2 a 2. Multiplica por \"escala\" para compensação de nós."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1389,14 +1385,12 @@ msgid "Active Block Management interval"
 msgstr "Intervalo de Gestão de Blocos Ativos"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifier interval"
-msgstr "Distância para blocos ativos"
+msgstr "Intervalo do \"Active Block Modifier\" (ABMs)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active Block Modifiers"
-msgstr "Distância para blocos ativos"
+msgstr "Modificadores de Bloco Ativo (ABM)"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -1485,16 +1479,15 @@ msgstr "Informar lista de servidores automaticamente."
 
 #: src/settings_translation_file.cpp
 msgid "Autorun key"
-msgstr ""
+msgstr "Chave de execução automática"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "Tecla para andar para trás"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base terrain height"
-msgstr "Altura da base do terreno"
+msgstr "Altura base do terreno"
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
@@ -1523,8 +1516,9 @@ msgid "Build inside player"
 msgstr "Construir com o jogador dentro do bloco"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Builtin"
-msgstr ""
+msgstr "Embutido"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
@@ -1568,9 +1562,8 @@ msgid "Chat toggle key"
 msgstr "Tecla comutadora de chat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chatcommands"
-msgstr "Comando"
+msgstr "Comandos de Chat"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1663,13 +1656,11 @@ msgid "Colored fog"
 msgstr "Névoa colorida"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
-"Lista de mods, separados por vírgulas, que podem usar APIs de requisição "
-"HTTP, que\n"
+"Lista de mods, separados por vírgulas, que tem acesso a APIs HTTP, que\n"
 "os permitem enviar e baixar informações para/da internet."
 
 #: src/settings_translation_file.cpp
@@ -1838,7 +1829,7 @@ msgstr "Privilégios por padrão"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Formato de reporte padrão"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1864,7 +1855,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Atraso em enviar blocos depois da construção"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -2062,13 +2053,12 @@ msgstr ""
 "Requer shaders a serem ativados."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine profiling data print interval"
-msgstr "Intervalo de impressão de perfil"
+msgstr "Intervalo de exibição dos dados das analizes do motor"
 
 #: src/settings_translation_file.cpp
 msgid "Entity methods"
-msgstr ""
+msgstr "Metodos de entidade"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2135,22 +2125,20 @@ msgid "Field of view"
 msgstr "Campo de visão"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Field of view for zoom"
-msgstr "Campo de visão"
+msgstr "Campo de visão para o zoom"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
 msgstr "Campo de visão em graus."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Field of view while zooming in degrees.\n"
 "This requires the \"zoom\" privilege on the server."
 msgstr ""
-"Movimento rápido (use a tecla).\n"
-"Isso requer o privilegio \"fast\" no servidor."
+"Campo de visão em durante o zoom em graus\n"
+"Isso requer o privilegio \"zoom\" no servidor."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2300,7 +2288,7 @@ msgstr "Gerar normalmaps"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
-msgstr ""
+msgstr "Chamadas de retorno Globais"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2353,6 +2341,7 @@ msgstr ""
 "desenvolvedores de mods)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Have the profiler instrument itself:\n"
 "* Instrument an empty function.\n"
@@ -2360,6 +2349,11 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
+"Tem o instrumento de registro em si:\n"
+"* Instrui uma função vazia.\n"
+"Isto estima a sobrecarga, que o istrumento está adicionando  (+1 Chamada de "
+"função).\n"
+"* Instrui o amostrador que está sendo usado para atualizar as estatísticas."
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
@@ -2508,38 +2502,49 @@ msgid "In-game chat console background color (R,G,B)."
 msgstr "Cor de fundo do Bate-papo no jogo (R,G,B)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
+"Instrumento imbutido.\n"
+"Isto é usualmente apenas nessesário por contribuidores core/builtin"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Instrument chatcommands on registration."
-msgstr ""
+msgstr "Instrução de comandos de chat no registo."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
+"Instrução de chamadas de retorno globais durante a registração.\n"
+"(qualquer coisa que você passar ao minetest.register_*() function)"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
-msgstr ""
+msgstr "Instruir a ação de ação do Active Block Modifiers no registro."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
-msgstr ""
+msgstr "Instruir a ação de ação do Loading Block Modifiers no registro."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Instrument the methods of entities on registration."
-msgstr ""
+msgstr "Instruir os métodos das entidades no registo."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Instrumentation"
-msgstr ""
+msgstr "Instrumentação"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
@@ -2580,7 +2585,6 @@ msgstr ""
 "Controles da escala de detalhes."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick button repetition interval"
 msgstr "Intervalo de repetição do botão do Joystick"
 
@@ -2590,20 +2594,18 @@ msgid "Joystick frustum sensitivity"
 msgstr "Sensibilidade do frustum do Joystick"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only: W component of hypercomplex constant determining julia "
 "shape.\n"
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Apenas para conjunto de Julia: Largura da constante hipercomplexa "
-"determinando o formato do conjunto.\n"
+"Apenas para a configuração de Julia: Componente W da constante hipercomplexa "
+"determinando o formato julia.\n"
 "Não tem nenhum efeito em fractais 3D.\n"
-"Intervalo rugoso entre -2 e 2."
+"Intervalo aproximadamente entre -2 e 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only: X component of hypercomplex constant determining julia "
 "shape.\n"
@@ -2611,10 +2613,9 @@ msgid ""
 msgstr ""
 "Apenas para conjunto de Julia: Componente X da constante hipercomplexa "
 "determinando o formato do conjunto.\n"
-"Intervalo rugoso entre -2 e 2."
+"Intervalo aproximadamente entre -2 e 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only: Y component of hypercomplex constant determining julia "
 "shape.\n"
@@ -2622,7 +2623,7 @@ msgid ""
 msgstr ""
 "Apenas para conjunto de Julia: Componente Y da constante hipercomplexa "
 "determinando o formato do conjunto.\n"
-"Intervalo rugoso entre -2 e 2."
+"Intervalo aproximadamente entre -2 e 2."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2878,7 +2879,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the camera update. Only used for development\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -2886,8 +2886,8 @@ msgid ""
 msgstr ""
 "Tecla para ativar/desativar a atualização da câmera. Usado somente para "
 "desenvolvimento\n"
-"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319"
+"01735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3074,15 +3074,20 @@ msgid "Liquid update tick"
 msgstr "Período de atualização dos Líquidos"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Load the game profiler"
-msgstr ""
+msgstr "Carregar o analizador do jogo"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Load the game profiler to collect game profiling data.\n"
 "Provides a /profiler command to access the compiled profile.\n"
 "Useful for mod developers and server operators."
 msgstr ""
+"Carregar o analizador do jogo para coletar dados de analize do jogo\n"
+"Providencia o comando /profiler para acessar o a analize compliada.\n"
+"Muito util para desenvolvedores de mods e operadores de servidores."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3117,7 +3122,6 @@ msgid "Map directory"
 msgstr "Diretório do mapa"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill' makes higher elevations colder, which may cause biome "
@@ -3129,16 +3133,19 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Atributos para o gerador de mapas específico para o Mapgen v6.\n"
-"Quando biomas de neve estão habilitados, pântanos ficam habilitados e a flag "
-"de pântanos é ignorada.\n"
-"Flags que não são especificadas na string da flag não são modificadas por "
+"Atributos para o gerador de mapas específico para o Gerador de mapa  Valleys."
+"\n"
+"'altitude_chill' faz elevações mais altas mais geladas, o que pode causar "
+"problemas em biomas.\n"
+"'humid_rivers' modifica a humidade ao redor de rios e em ares que a água "
+"tende a virar poças,\n"
+"Isto pode interferir como os biomas são delicadamente ajustados\n"
+"Flags que não são especificadas na linha da flag não são modificadas por "
 "padrão.\n"
-"Flags começando com \"no\" (não) são usadas para explicitamente desabilitá-"
-"las."
+"Flags começando com \"no\" (não) são usadas para desabilitá-las "
+"explicitamente."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen flat.\n"
 "Occasional lakes and hills can be added to the flat world.\n"
@@ -3146,14 +3153,13 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Atributos de geração de mapas específicos para o Mapgen v7.\n"
-"'ridges' são os rios.\n"
+"Atributos de geração de mapas específicos para o Gerador de mapa plano.\n"
+"Lagos ocasionais e colinas podem ser adicionados ao mundo plano.\n"
 "Flags que não estão especificadas na string da flag não são modificadas por "
 "padrão.\n"
-"Flags começando com \"no\" são usadas para explicitamente desabilitá-las."
+"Flags começando com \"no\" são usadas para desabilitá-las explicitamente."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' "
@@ -3163,15 +3169,13 @@ msgid ""
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
 "Atributos para o gerador de mapas específico para o Mapgen v6.\n"
-"Quando biomas de neve estão habilitados, pântanos ficam habilitados e a flag "
-"de pântanos é ignorada.\n"
+"Quando biomas de neve estão habilitadas, selvas são automaticamente  "
+"habilitadas, a flag 'jungles' é ignorada.\n"
 "Flags que não são especificadas na string da flag não são modificadas por "
 "padrão.\n"
-"Flags começando com \"no\" (não) são usadas para explicitamente desabilitá-"
-"las."
+"Flags começando com \"no\" são usadas para desabilitá-las explicitamente."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "The 'ridges' flag controls the rivers.\n"
@@ -3180,10 +3184,10 @@ msgid ""
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
 "Atributos de geração de mapas específicos para o Mapgen v7.\n"
-"'ridges' são os rios.\n"
+"A flag'ridges' controla os rios.\n"
 "Flags que não estão especificadas na string da flag não são modificadas por "
 "padrão.\n"
-"Flags começando com \"no\" são usadas para explicitamente desabilitá-las."
+"Flags começando com \"no\" são usadas para desabilitá-las explicitamente."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -3230,24 +3234,22 @@ msgid "Mapgen flat"
 msgstr "Mapgen plano"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave width"
-msgstr "Threshold dos lagos no Mapgen plano"
+msgstr "Largura das cavernas no gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave1 noise parameters"
-msgstr "Parâmetros noise do plano cave1 do Mapgen"
+msgstr "Parâmetros de ruido \"cave 1\" do gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat cave2 noise parameters"
-msgstr "Parâmetros noise do plano cave2 do Mapgen"
+msgstr "Parâmetros de ruido \"cave2\" do gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat filler depth noise parameters"
-msgstr "Parâmetros noise do plano da profundidade de preenchimento do mapgen"
+msgstr ""
+"Parâmetros da profundidade do ruido de preenchimento do gerador de mundo "
+"plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat flags"
@@ -3274,28 +3276,24 @@ msgid "Mapgen flat lake threshold"
 msgstr "Threshold dos lagos no Mapgen plano"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat large cave depth"
-msgstr "Profundidade de grande caverna plana do mapgen"
+msgstr "Largura das cavernas grandes no gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flat terrain noise parameters"
-msgstr "Parâmetros noise de terreno plano do mapgen"
+msgstr "Parâmetros de ruido de terreno do gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal"
 msgstr "Fractal do Mapgen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal cave width"
-msgstr "Componente W da fatia do fractal do Mapgen"
+msgstr "Largura das cavernas do gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal cave1 noise parameters"
-msgstr "Parâmetro noise do fractal do cave1 do mapgen"
+msgstr "Parâmetros de ruido \"cave1\" do gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3340,18 +3338,16 @@ msgid "Mapgen fractal scale"
 msgstr "Escala no fractal do Mapgen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal seabed noise parameters"
-msgstr "Parâmetros noise do fractal do leito oceânico do mapgen"
+msgstr "Parâmetros de ruido do leito oceânico do gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal slice w"
 msgstr "Componente W da fatia do fractal do Mapgen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen heat blend noise parameters"
-msgstr "Parâmetros noise de mistura de calor mapgen"
+msgstr "Parâmetros de mistura de ruido do gerador de mundo \"heat\""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
@@ -3362,126 +3358,104 @@ msgid "Mapgen v5"
 msgstr "Mapgen versão 5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave width"
-msgstr "Profundidade de cavernas grandes"
+msgstr "Largura das cavernas no gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave1 noise parameters"
-msgstr "Parâmetros noise do cave1 do mapgen v5"
+msgstr "Parâmetros de ruido \"cave1 \" do gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 cave2 noise parameters"
-msgstr "Parâmetros noise do cave2 do mapgen v5"
+msgstr "Parâmetros de ruido \"cave2\" do gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 factor noise parameters"
-msgstr "Parâmetros noise do fator do mapgen v5"
+msgstr "Parâmetros do fator de ruido do gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 filler depth noise parameters"
-msgstr "Parâmetros noise da profundidade de preenchimento do mapgen v5"
+msgstr "Parâmetros de ruido da profundidade de preenchimento do mapgen v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v5 height noise parameters"
-msgstr "Parâmetros noise da altura do mapgen v5"
+msgstr "Parâmetros de ruido de altura do gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6"
 msgstr "Mapgen versão 6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 apple trees noise parameters"
-msgstr "Parâmetros noise de macieiras do mapgen v6"
+msgstr "Parâmetros de ruido das macieiras no gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 beach frequency"
 msgstr "Frequência de praia do Mapgen v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 beach noise parameters"
-msgstr "Parâmetros noise de praia do Mapgen"
+msgstr "Parâmetros de ruido das praias no gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 biome noise parameters"
-msgstr "Parâmetros noise de bioma do mapgen v6"
+msgstr "Parâmetros de ruido de bioma do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 cave noise parameters"
-msgstr "Parâmetros noise de caverna do mapgen v6"
+msgstr "Parâmetros de ruido de caverna do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 desert frequency"
-msgstr "frequência de deserto do Mapgen v6"
+msgstr "Frequência de deserto do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 flags"
-msgstr "Flags do Mapgen v6"
+msgstr "Flags do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 height select noise parameters"
-msgstr "Parâmetros noise de seleção de altura do Mapgen v6"
+msgstr "Parâmetros de ruido de seleção de altura do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 humidity noise parameters"
-msgstr "Parâmetros noise de umidade do Mapgen v6"
+msgstr "Parâmetros de ruido de umidade do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 mud noise parameters"
-msgstr "Parâmetros noise de lama do Mapgen v6"
+msgstr "Parâmetros de ruido de lama do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 steepness noise parameters"
-msgstr "Parâmetros noise de inclinação do Mapgen v6"
+msgstr "Parâmetros de ruido de inclinação do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 terrain altitude noise parameters"
-msgstr "Parâmetros noise de altitude do terreno do Mapgen v6"
+msgstr "Parâmetros de ruido de altitude do terreno do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 terrain base noise parameters"
-msgstr "Parâmetros noise de base do terreno do Mapgen v6"
+msgstr "Parâmetros de ruido base do terreno do gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v6 trees noise parameters"
-msgstr "Parâmetros noise de árvores Mapgen v6"
+msgstr "Parâmetros de ruido das árvores no gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7"
 msgstr "Mapgen versão 7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 cave width"
-msgstr "Profundidade de cavernas grandes"
+msgstr "Largura das cavernas no gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 cave1 noise parameters"
-msgstr "Parâmetros noise do cave1 do Mapgen v7"
+msgstr "Parâmetros de ruido \"cave1\" do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 cave2 noise parameters"
-msgstr "Parâmetros noise do cave2 do Mapgen v7"
+msgstr "Parâmetros de ruido \"cave2\" do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3504,34 +3478,28 @@ msgid "Mapgen v7 mount height noise parameters"
 msgstr "Parâmetros noise da altura de montagem do Mapgen v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 mountain noise parameters"
-msgstr "Parâmetros noise de montanha do Mapgen v7"
+msgstr "Parâmetros de ruido das montanha do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 ridge noise parameters"
-msgstr "Parâmetros noise de cume do Mapgen v7"
+msgstr "Parâmetros de ruido de cume do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 ridge water noise parameters"
-msgstr "Parâmetros noise de cume de água do Mapgen v7"
+msgstr "Parâmetros de ruido de cume de água do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 terrain altitude noise parameters"
-msgstr "Parâmetros noise de altitude do terreno do Mapgen v7"
+msgstr "Parâmetros de ruido de altitude do terreno do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 terrain base noise parameters"
-msgstr "Parâmetros noise da base do terreno do Mapgen v7"
+msgstr "Parâmetros de ruido base do terreno do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 terrain persistation noise parameters"
-msgstr "Parâmetros noise de persistencia do terreno do Mapgen v7"
+msgstr "Parâmetros de ruido de persistencia do terreno do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave depth"
@@ -3559,9 +3527,8 @@ msgid "Max liquids processed per step."
 msgstr "Máximo de líquidos processados por etapa."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Max. clearobjects extra blocks"
-msgstr "Max. limpeza de objetos de blocos extra"
+msgstr "Max. clearobjects blocos extras."
 
 #: src/settings_translation_file.cpp
 msgid "Max. packets per iteration"
@@ -3589,10 +3556,9 @@ msgid "Maximum number of blocks that are simultaneously sent in total."
 msgstr "Número máximo de jogadores que podem se conectar simultaneamente."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent per client."
 msgstr ""
-"Número máximo de blocos que podem ser enfileirados para o carregamento."
+"Número máximo de blocos que podem ser simultaneamente enviados por cliente."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
@@ -3649,9 +3615,8 @@ msgid "Maximum number of statically stored objects in a block."
 msgstr "Número máximo de objetos estaticamente armazenados em um bloco."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum objects per block"
-msgstr "Limite de objetos por bloco"
+msgstr "Limite maximo de objetos por bloco."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3662,14 +3627,12 @@ msgstr ""
 "Útil se houver algo para ser exibido a direito ou esquerda do hotbar."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends per client"
-msgstr "Máximo de blocos enviados simultaneamente por cliente"
+msgstr "Máximo de blocos enviados simultaneamente por cliente."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends total"
-msgstr "Máximo de blocos enviados simultaneamente totais"
+msgstr "Máximo de blocos totais enviados simultaneamente."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
@@ -3734,14 +3697,12 @@ msgid "Modstore mods list URL"
 msgstr "URL da lista de modificadores da Modstore"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Monospace font path"
-msgstr "Caminho de fonte monoespaçada"
+msgstr "Caminho de fonte monoespaçada."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Monospace font size"
-msgstr "Tamanho da fonte monoespaçada"
+msgstr "Tamanho da fonte monoespaçada."
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
@@ -3828,15 +3789,13 @@ msgid "NodeTimer interval"
 msgstr "Intervalo de NodeTimer"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Noise parameters for biome API temperature, humidity and biome blend."
 msgstr ""
-"Parâmetros noise para a API de mistura de temperatura, umidade e bioma."
+"Parâmetros de ruido para a API de temperatura, umidade e mistura de bioma."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Noises"
-msgstr "Noises"
+msgstr "Ruidos"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps sampling"
@@ -3965,13 +3924,12 @@ msgstr ""
 "Impede que mods façam coisas inseguras como executar comandos do shell."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds). 0 = "
 "disable. Useful for developers."
 msgstr ""
-"Intervalo de impressão de dados do profiler. 0 = desabilitado. Útil para os "
-"desenvolvedores."
+"Intervalo de impressão de dados do analizador (em segundos). 0 = "
+"desabilitado. Útil para os desenvolvedores."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3979,27 +3937,24 @@ msgid "Privileges that players with basic_privs can grant"
 msgstr "Privilégios que jogadores com basic_privs podem conceder"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Profiler"
-msgstr "Perfil do vale"
+msgstr "Analizador"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
 msgstr "Tecla de alternância de Profiler"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Profiling"
-msgstr "criação de perfil do modificador"
+msgstr "Analizando"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
 "Values larger than 26 will start to produce sharp cutoffs at cloud area "
 "corners."
 msgstr ""
-"Raio da área de nuvem afirmada em número de 64 nodes de nuvem quadrados.\n"
+"Raio da área de nuvem afirmada em número de 64 nós de quadrados de nuvem.\n"
 "Valores maiores que 26 vão começar a produzir cortes afiados nos cantos de "
 "área de nuvem."
 
@@ -4046,18 +4001,16 @@ msgid "River Depth"
 msgstr "Profundidade do Rio"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River Noise"
-msgstr "Noise do Rio"
+msgstr "Ruido do Rio"
 
 #: src/settings_translation_file.cpp
 msgid "River Size"
 msgstr "Tamanho do Rio"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River noise -- rivers occur close to zero"
-msgstr "Noise do rio -- rios ocorrem perto de zero"
+msgstr "Ruido do rio -- rios ocorrem perto de zero"
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
@@ -4108,14 +4061,12 @@ msgid "Screenshot folder"
 msgstr "Pasta de screenshot"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "Captura de tela"
+msgstr "Formato da Captura de tela."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "Captura de tela"
+msgstr "Qualidade da Captura de tela;"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4281,16 +4232,15 @@ msgid "Sound"
 msgstr "Som"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
 "$filename should be accessible from $remote_media$filename via cURL\n"
 "(obviously, remote_media should end with a slash).\n"
 "Files that are not present will be fetched the usual way."
 msgstr ""
-"Especifica o URL no qual os clientes buscam a mídia ao em vez de usar o "
-"UDP.\n"
-"$filename deve ser acessível a partir de $remote_media$filename via cURL "
+"Especifica a URL no qual os clientes buscam a mídia ao em vez de usar o UDP."
+"\n"
+"$filename deve ser acessível a partir de $remote_media$filename via cURL \n"
 "(obviamente, remote_media deve terminar com uma barra \"/\").\n"
 "Arquivos que não estão presentes serão obtidos da maneira usual por UDP."
 
@@ -4324,24 +4274,22 @@ msgid "Terrain Height"
 msgstr "Altura do terreno"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Terrain noise threshold for hills.\n"
 "Controls proportion of world area covered by hills.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
-"Limite noise de terreno para colinas.\n"
+"Limite de ruido de terreno para colinas.\n"
 "Proporção de controles da área de mundo coberta pelas colinas.\n"
 "Ajuste no sentido 0,0 para uma proporção maior."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Terrain noise threshold for lakes.\n"
 "Controls proportion of world area covered by lakes.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
-"Limite noise de terreno para Lagos.\n"
+"Limite de ruido de terreno para Lagos.\n"
 "Proporção de controles da área de mundo coberta por lagos.\n"
 "Ajuste no sentido 0,0 para uma proporção maior."
 
@@ -4358,6 +4306,8 @@ msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"O formato padrão no qual as analises estão sendo salvas,\n"
+"Quando chamado `/profiler save [formato]` sem formato"
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
@@ -4368,6 +4318,8 @@ msgid ""
 "The file path relative to your worldpath in which profiles will be saved "
 "to.\n"
 msgstr ""
+"O caminho de arquivo relativo ao sua pasta do mundo no qual as analises "
+"serão salvas.\n"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -4410,14 +4362,13 @@ msgstr ""
 "definido o valor válido mais próximo."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The time (in seconds) that the liquids queue may grow beyond processing\n"
 "capacity until an attempt is made to decrease its size by dumping old queue\n"
 "items.  A value of 0 disables the functionality."
 msgstr ""
-"O tempo (em segundos) que a fila de líquidos pode crescer além da "
-"capacidade \n"
+"O tempo (em segundos) que a fila de líquidos pode crescer além da capacidade "
+"\n"
 "de processamento até que é feita uma tentativa para diminuir o seu tamanho "
 "pelo despejo \n"
 "de antigas filas de itens.  Um valor 0 desativa a funcionalidade."
@@ -4456,7 +4407,6 @@ msgstr ""
 "Definindo-o como -1 desabilita o recurso."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Time send interval"
 msgstr "Intervalo de tempo de envio"
 
@@ -4529,12 +4479,10 @@ msgid "Use a cloud animation for the main menu background."
 msgstr "Usar uma animação de nuvem para o fundo do menu principal."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use anisotropic filtering when viewing at textures from an angle."
 msgstr "Usar filtragem anisotrópica quando visualizar texturas de um ângulo."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
 msgstr "Usar filtragem bilinear ao dimensionamento de texturas."
 
@@ -4553,9 +4501,8 @@ msgid "Use trilinear filtering when scaling textures."
 msgstr "Use a filtragem trilinear ao dimensionamento de texturas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "V-Sync"
-msgstr "V-Sync"
+msgstr "Sincronização Vertical."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4579,7 +4526,6 @@ msgid "Valley Slope"
 msgstr "Encosta do vale"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valleys C Flags"
 msgstr "Flags C de vales"
 
@@ -4592,23 +4538,20 @@ msgid "Video driver"
 msgstr "Driver de vídeo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "View bobbing"
 msgstr "Visualização de balanço"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "View distance in nodes.\n"
 "Min = 20"
 msgstr ""
-"Distância de visão (em nodes).\n"
-"Min = 20"
+"Distância de visão (em nós).\n"
+"Minimo = 20"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "View range decrease key"
-msgstr "Tecla de diminuição do intervalo de exibição"
+msgstr "Tecla de diminuição do raio de exibição"
 
 #: src/settings_translation_file.cpp
 msgid "View range increase key"
@@ -4652,9 +4595,8 @@ msgid "Water surface level of the world."
 msgstr "Nível de superfície de água do mundo."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving Nodes"
-msgstr "Nodes de balanço"
+msgstr "Nós que balancam."
 
 #: src/settings_translation_file.cpp
 msgid "Waving leaves"
@@ -4832,19 +4774,16 @@ msgid "Y of upper limit of large pseudorandom caves."
 msgstr "Y de limite superior de grandes números pseudoaleatórios de cavernas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "cURL file download timeout"
 msgstr "Tempo limite de download de arquivo via cURL"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "cURL parallel limit"
 msgstr "limite paralelo de cURL"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "cURL timeout"
-msgstr "Tempo de cURL"
+msgstr "Tempo limite de cURL"
 
 #~ msgid "Detailed mod profile data. Useful for mod developers."
 #~ msgstr ""

From ceba12e5aa63dad7051123865196aa332dbfdf62 Mon Sep 17 00:00:00 2001
From: Bruno Borges <borgesdossantosbruno@gmail.com>
Date: Tue, 20 Dec 2016 04:19:29 +0000
Subject: [PATCH 414/418] Translated using Weblate (Portuguese (Brazil))

Currently translated at 94.8% (871 of 918 strings)
---
 po/pt_BR/minetest.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index 5827b6b51..a98458d44 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
 "PO-Revision-Date: 2016-12-20 04:19+0000\n"
-"Last-Translator: Cold Meson 06 <fernando.devmines@gmail.com>\n"
+"Last-Translator: Bruno Borges <borgesdossantosbruno@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) "
 "<https://hosted.weblate.org/projects/minetest/minetest/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -413,7 +413,7 @@ msgstr "Desinstalar o pacote de módulos selecionado"
 
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port"
-msgstr "Endereço / Porta"
+msgstr "Endereço / Porta :"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"

From 3fa7c5a476a6542485bd48ec320a1fc34dfeb646 Mon Sep 17 00:00:00 2001
From: Cold Meson 06 <fernando.devmines@gmail.com>
Date: Tue, 20 Dec 2016 06:07:18 +0000
Subject: [PATCH 415/418] Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.5% (914 of 918 strings)
---
 po/pt_BR/minetest.po | 350 +++++++++++++++++++------------------------
 1 file changed, 158 insertions(+), 192 deletions(-)

diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index a98458d44..d759c87b4 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-12-20 04:19+0000\n"
-"Last-Translator: Bruno Borges <borgesdossantosbruno@gmail.com>\n"
+"PO-Revision-Date: 2016-12-20 06:07+0000\n"
+"Last-Translator: Cold Meson 06 <fernando.devmines@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) "
 "<https://hosted.weblate.org/projects/minetest/minetest/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
-msgstr "Ocorreu um erro no script Lua em um mod :"
+msgstr "Ocorreu um erro em um script Lua, como um mod:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured:"
@@ -67,7 +67,7 @@ msgstr ""
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr "Nós apenas suportamos a versão do protocolo $1."
+msgstr "Nós apenas suportamos a versão de protocolo $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
@@ -274,7 +274,7 @@ msgstr "Por favor, insira um número válido."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Possible values are: "
-msgstr "Valores possíveis são:"
+msgstr "Valores possíveis são: "
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
@@ -302,11 +302,11 @@ msgid ""
 "Install Mod: unsupported filetype \"$1\" or broken archive"
 msgstr ""
 "\n"
-"Instalar Mod: tipo de arquivo \"$1\" não suportado ou arquivo corrompido"
+"Instalar Mod: tipo de arquivo \"$1\" não suportado ou corrompido"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Failed to install $1 to $2"
-msgstr "Não foi possível instalar $1 em $2"
+msgstr "Não foi possível instalar $1 para $2"
 
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: file: \"$1\""
@@ -357,7 +357,7 @@ msgstr "Instalado com sucesso:"
 
 #: builtin/mainmenu/store.lua
 msgid "Unsorted"
-msgstr "Desorganizado"
+msgstr "Sem categoria"
 
 #: builtin/mainmenu/store.lua
 msgid "re-Install"
@@ -393,7 +393,7 @@ msgstr "Informação do módulo:"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "No mod description available"
-msgstr "Nenhuma descrição disponível do módulo"
+msgstr "Nenhuma descrição do módulo disponível"
 
 #: builtin/mainmenu/tab_mods.lua
 msgid "Rename"
@@ -413,7 +413,7 @@ msgstr "Desinstalar o pacote de módulos selecionado"
 
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port"
-msgstr "Endereço / Porta :"
+msgstr "Endereço / Porta"
 
 #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
 msgid "Client"
@@ -429,11 +429,11 @@ msgstr "Modo criativo"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Damage enabled"
-msgstr "Habilitar dano"
+msgstr "Dano habilitado"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Del. Favorite"
-msgstr "Del. Favorito"
+msgstr "Deletar Favorito"
 
 #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Favorite"
@@ -527,7 +527,7 @@ msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Are you sure to reset your singleplayer world?"
-msgstr "Você tem certeza que deseja resetar seu mundo?"
+msgstr "Você tem certeza que deseja resetar seu mundo um-jogador?"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
@@ -711,7 +711,7 @@ msgstr "Carregando texturas..."
 
 #: src/client.cpp
 msgid "Rebuilding shaders..."
-msgstr "Recompilando shaders..."
+msgstr "Reconstruindo sombreadores..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
@@ -736,15 +736,15 @@ msgstr ""
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
-msgstr "Seu nome de jogador é muito longo."
+msgstr "Nome de jogador muito longo."
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr "O caminho fornecido não existe: "
+msgstr "O caminho do mundo providenciado  não existe. "
 
 #: src/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr "necessita_fonte_alternativa"
+msgstr "needs_fallback_font"
 
 #: src/game.cpp
 msgid ""
@@ -914,7 +914,7 @@ msgstr "Console"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr "\"Pular\" duas vezes ativa o voo"
+msgstr "\"Pular\" duas vezes para ativar o voo"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "Drop"
@@ -988,7 +988,7 @@ msgstr "Zoom"
 
 #: src/guiKeyChangeMenu.cpp
 msgid "press key"
-msgstr "press. uma tecla"
+msgstr "pressione uma tecla"
 
 #: src/guiPasswordChange.cpp
 msgid "Change"
@@ -1096,15 +1096,15 @@ msgstr "Insert"
 
 #: src/keycode.cpp
 msgid "Junja"
-msgstr "Tecla Junja"
+msgstr "Junja (tecla)"
 
 #: src/keycode.cpp
 msgid "Kana"
-msgstr "Tecla Kana"
+msgstr "Kana (tecla)"
 
 #: src/keycode.cpp
 msgid "Kanji"
-msgstr "Tecla Kanji"
+msgstr "Kanji (tecla)"
 
 #: src/keycode.cpp
 msgid "Left Button"
@@ -1374,7 +1374,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of emerge queues"
-msgstr "Limite absoluto de emergir filas"
+msgstr "Limite absoluto de filas emergentes"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -1637,7 +1637,7 @@ msgstr "Altura das nuvens"
 
 #: src/settings_translation_file.cpp
 msgid "Cloud radius"
-msgstr "Espessura das nuvens"
+msgstr "Raio das nuvens"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds"
@@ -1669,7 +1669,8 @@ msgid ""
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 "Lista separada por vírgulas dos mods confiáveis que podem utilizar funções "
-"inseguras mesmo quando o a opção de Mod Seguro está ativada (via "
+"inseguras \n"
+"mesmo quando o a opção de Mod Seguro está ativada (via "
 "request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
@@ -1741,7 +1742,7 @@ msgstr "Controla o esparsamento/altura das colinas."
 
 #: src/settings_translation_file.cpp
 msgid "Controls width of tunnels, a smaller value creates wider tunnels."
-msgstr "Controla a largura dos túneis, um valor menor cria túneis mais amplos."
+msgstr "Controla a largura dos túneis, um valor menor cria túneis mais largos."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -1781,7 +1782,7 @@ msgstr "Cor do cursor (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Crouch speed"
-msgstr "Velocidade para descer"
+msgstr "Velocidade de agachamento"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -1793,7 +1794,7 @@ msgstr "Dano"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
-msgstr "Tecla para alternar modo de Debug"
+msgstr "Tecla para alternar modo de Depuração"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log level"
@@ -1845,7 +1846,7 @@ msgid ""
 "A higher value results in smoother normal maps."
 msgstr ""
 "Define processo amostral de textura.\n"
-"Um valor mais alto resulta em mais suaves mapas normais."
+"Um valor mais alto resulta em mapas de normais mais suaves."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
@@ -1863,7 +1864,7 @@ msgstr "Dicas de ferramenta mostrando atraso. indicado em milissegundos."
 
 #: src/settings_translation_file.cpp
 msgid "Deprecated Lua API handling"
-msgstr "Tratamento da API Lua rejeitado"
+msgstr "Tratamento de API Lua rejeitada"
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find large caves."
@@ -1940,7 +1941,7 @@ msgstr "Tecla para largar item"
 
 #: src/settings_translation_file.cpp
 msgid "Dump the mapgen debug infos."
-msgstr "Mostrar informações de depuração do Mapgen."
+msgstr "Mostrar informações de depuração do Gerador de mapa."
 
 #: src/settings_translation_file.cpp
 msgid "Enable Joysticks"
@@ -2070,7 +2071,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "FPS in pause menu"
-msgstr "FPS em menu de pausa"
+msgstr "FPS no menu de pausa"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -2194,7 +2195,7 @@ msgstr "Tecla de comutação de névoa"
 
 #: src/settings_translation_file.cpp
 msgid "Font path"
-msgstr "Caminho fonte"
+msgstr "Caminho da fonte"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
@@ -2218,7 +2219,7 @@ msgstr "Tamanho da fonte"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
-msgstr "Formato de screenshots."
+msgstr "Formato das screenshots."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
@@ -2233,22 +2234,22 @@ msgid ""
 "From how far blocks are generated for clients, stated in mapblocks (16 "
 "nodes)."
 msgstr ""
-"De quão longe blocos são gerados para os clientes, indicado em mapa de "
-"blocos (16 nós)."
+"De quão longe blocos são gerados para os clientes, indicado em chunks (16 "
+"blocos)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
-"De quão longe blocos são enviados aos clientes, indicado em mapas de blocos "
-"(16 nós)."
+"De quão longe blocos são enviados aos clientes, indicado em chunks (16 "
+"blocos)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far clients know about objects, stated in mapblocks (16 nodes)."
 msgstr ""
-"De quão longe os clientes sabem sobre objetos, indicado em mapas blocos (16 "
-"nós)."
+"De quão longe os clientes sabem sobre objetos, indicado em chunks (16 "
+"blocos)."
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
@@ -2284,7 +2285,7 @@ msgstr "Geral"
 
 #: src/settings_translation_file.cpp
 msgid "Generate normalmaps"
-msgstr "Gerar normalmaps"
+msgstr "Gerar mapa de normais"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
@@ -2319,7 +2320,7 @@ msgstr "Gravidade"
 
 #: src/settings_translation_file.cpp
 msgid "HTTP Mods"
-msgstr "HTTP mods"
+msgstr "Modúlos HTTP"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
@@ -2341,7 +2342,6 @@ msgstr ""
 "desenvolvedores de mods)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Have the profiler instrument itself:\n"
 "* Instrument an empty function.\n"
@@ -2350,10 +2350,10 @@ msgid ""
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
 "Tem o instrumento de registro em si:\n"
-"* Instrui uma função vazia.\n"
+"* Monitorar uma função vazia.\n"
 "Isto estima a sobrecarga, que o istrumento está adicionando  (+1 Chamada de "
 "função).\n"
-"* Instrui o amostrador que está sendo usado para atualizar as estatísticas."
+"* Monitorar o amostrador que está sendo usado para atualizar as estatísticas."
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
@@ -2390,7 +2390,7 @@ msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
 "Higher value is smoother, but will use more RAM."
 msgstr ""
-"Quanto o servidor aguardará antes de descarregar mapblocks não utilizados. "
+"Quanto o servidor aguardará antes de descarregar chunks não utilizados. \n"
 "Um valor mais elevado é mais suave, mas vai usar mais memória RAM."
 
 #: src/settings_translation_file.cpp
@@ -2502,49 +2502,44 @@ msgid "In-game chat console background color (R,G,B)."
 msgstr "Cor de fundo do Bate-papo no jogo (R,G,B)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
-"Instrumento imbutido.\n"
+"Monitoração imbutida.\n"
 "Isto é usualmente apenas nessesário por contribuidores core/builtin"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Instrument chatcommands on registration."
-msgstr "Instrução de comandos de chat no registo."
+msgstr "Monitoração de comandos de chat quando registrados."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
-"Instrução de chamadas de retorno globais durante a registração.\n"
+"Monitorar de chamadas de retorno globais durante a registração.\n"
 "(qualquer coisa que você passar ao minetest.register_*() function)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
-msgstr "Instruir a ação de ação do Active Block Modifiers no registro."
+msgstr ""
+"Monitorar a ação de ação do Active Block Modifiers durante a registração."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
-msgstr "Instruir a ação de ação do Loading Block Modifiers no registro."
+msgstr ""
+"Monitorar a ação de ação do Loading Block Modifiers durante a registração."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Instrument the methods of entities on registration."
-msgstr "Instruir os métodos das entidades no registo."
+msgstr "Monitorar os métodos das entidades durante a registração."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Instrumentation"
-msgstr "Instrumentação"
+msgstr "Monitorização"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
@@ -2637,7 +2632,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Jump key"
-msgstr "Pular"
+msgstr "Tecla para Pular"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
@@ -2679,9 +2674,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla para pular.\n"
-"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tecla para pular. \n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319"
+"01735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2689,9 +2684,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla para mover-se rápido no modo rápido.\n"
-"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tecla para mover-se rápido no modo rápido. \n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319"
+"01735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2818,15 +2813,14 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling autorun.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla para ativar/desativar o modo rápido.\n"
-"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
+"Tecla para ativar/desativar o modo auto acionamento.\n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319"
+"01735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3074,25 +3068,22 @@ msgid "Liquid update tick"
 msgstr "Período de atualização dos Líquidos"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Load the game profiler"
 msgstr "Carregar o analizador do jogo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Load the game profiler to collect game profiling data.\n"
 "Provides a /profiler command to access the compiled profile.\n"
 "Useful for mod developers and server operators."
 msgstr ""
 "Carregar o analizador do jogo para coletar dados de analize do jogo\n"
-"Providencia o comando /profiler para acessar o a analize compliada.\n"
+"Providencia o comando /profiler para acessar a analize compiliada.\n"
 "Muito util para desenvolvedores de mods e operadores de servidores."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Loading Block Modifiers"
-msgstr "Distância para blocos ativos"
+msgstr "Carregado Block Modifiers"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu game manager"
@@ -3133,7 +3124,7 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Atributos para o gerador de mapas específico para o Gerador de mapa  Valleys."
+"Atributos para o gerador de mapas específico para o gerador de mundo Valleys."
 "\n"
 "'altitude_chill' faz elevações mais altas mais geladas, o que pode causar "
 "problemas em biomas.\n"
@@ -3153,7 +3144,7 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Atributos de geração de mapas específicos para o Gerador de mapa plano.\n"
+"Atributos de geração de mapas específicos para o gerador de mundo plano.\n"
 "Lagos ocasionais e colinas podem ser adicionados ao mundo plano.\n"
 "Flags que não estão especificadas na string da flag não são modificadas por "
 "padrão.\n"
@@ -3168,7 +3159,7 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Atributos para o gerador de mapas específico para o Mapgen v6.\n"
+"Atributos para o gerador de mapas específico para o gerador de mundo v6.\n"
 "Quando biomas de neve estão habilitadas, selvas são automaticamente  "
 "habilitadas, a flag 'jungles' é ignorada.\n"
 "Flags que não são especificadas na string da flag não são modificadas por "
@@ -3183,7 +3174,7 @@ msgid ""
 "default.\n"
 "Flags starting with 'no' are used to explicitly disable them."
 msgstr ""
-"Atributos de geração de mapas específicos para o Mapgen v7.\n"
+"Atributos de geração de mapas específicos para o gerador de mundo v7.\n"
 "A flag'ridges' controla os rios.\n"
 "Flags que não estão especificadas na string da flag não são modificadas por "
 "padrão.\n"
@@ -3203,7 +3194,7 @@ msgstr "Limite de mapblock"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
-msgstr "Timeout de descarregamento do mapblock"
+msgstr "Tempo limite de descarregamento do mapblock"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys"
@@ -3227,11 +3218,11 @@ msgstr "Debug do mapgen"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr "Flags do Mapgen"
+msgstr "Flags do gerador de mundo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat"
-msgstr "Mapgen plano"
+msgstr "Gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat cave width"
@@ -3248,32 +3239,32 @@ msgstr "Parâmetros de ruido \"cave2\" do gerador de mundo plano"
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat filler depth noise parameters"
 msgstr ""
-"Parâmetros da profundidade do ruido de preenchimento do gerador de mundo "
-"plano"
+"Parâmetros de ruído da profundidade de preenchimento plano do gerador de "
+"mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat flags"
-msgstr "Flags do Mapgen plano"
+msgstr "Flags do gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat ground level"
-msgstr "Nível do terreno para o Mapgen plano"
+msgstr "Nível do terreno para o gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill steepness"
-msgstr "Esparsamento das colinas no Mapgen plano"
+msgstr "Esparsamento das colinas no gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat hill threshold"
-msgstr "Threshold das colinas no Mapgen plano"
+msgstr "Threshold das colinas no gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat lake steepness"
-msgstr "Esparsamento de lagos no Mapgen plano"
+msgstr "Esparsamento de lagos no gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat lake threshold"
-msgstr "Threshold dos lagos no Mapgen plano"
+msgstr "Threshold dos lagos no gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen flat large cave depth"
@@ -3285,7 +3276,7 @@ msgstr "Parâmetros de ruido de terreno do gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal"
-msgstr "Fractal do Mapgen"
+msgstr "Gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal cave width"
@@ -3296,46 +3287,46 @@ msgid "Mapgen fractal cave1 noise parameters"
 msgstr "Parâmetros de ruido \"cave1\" do gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal cave2 noise parameters"
-msgstr "Parâmetro noise do fractal do cave2 do mapgen"
+msgstr "Parâmetro de ruido do fractal do cave2 do gerador de mundo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen fractal filler depth noise parameters"
-msgstr "Parâmetros noise do fractal da profundidade de preenchimento do mapgen"
+msgstr ""
+"Parâmetros de ruido da profundidade de preenchimento do gerador de mundo "
+"fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal fractal"
-msgstr "Fractal do Mapgen fractal"
+msgstr "Fractal do gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal iterations"
-msgstr "Iterações no fractal do Mapgen"
+msgstr "Iterações gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia w"
-msgstr "Componente W do fractal Julia no Mapgen"
+msgstr "Componente W do gerador de mundo fractal julia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia x"
-msgstr "Componente X do fractal julia no Mapgen"
+msgstr "Componente X  do gerador de mundo fractal julia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia y"
-msgstr "Componente Y do fractal julia no Mapgen"
+msgstr "Componente Y  do gerador de mundo fractal julia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal julia z"
-msgstr "Componente Z do fractal julia no Mapgen"
+msgstr "Componente Z do gerador de mundo fractal julia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal offset"
-msgstr "Offset do fractal do Mapgen"
+msgstr "Espacamento do gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal scale"
-msgstr "Escala no fractal do Mapgen"
+msgstr "Escala do gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal seabed noise parameters"
@@ -3343,7 +3334,7 @@ msgstr "Parâmetros de ruido do leito oceânico do gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen fractal slice w"
-msgstr "Componente W da fatia do fractal do Mapgen"
+msgstr "Componente W da fatia do gerador de mundo fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen heat blend noise parameters"
@@ -3351,11 +3342,11 @@ msgstr "Parâmetros de mistura de ruido do gerador de mundo \"heat\""
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
-msgstr "Nome do mapgen"
+msgstr "Nome do gerador de mundo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5"
-msgstr "Mapgen versão 5"
+msgstr "Gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave width"
@@ -3363,11 +3354,11 @@ msgstr "Largura das cavernas no gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave1 noise parameters"
-msgstr "Parâmetros de ruido \"cave1 \" do gerador de mundo v5"
+msgstr "Parâmetros de ruido cave1 do gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 cave2 noise parameters"
-msgstr "Parâmetros de ruido \"cave2\" do gerador de mundo v5"
+msgstr "Parâmetros de ruido cave2 do gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 factor noise parameters"
@@ -3375,7 +3366,8 @@ msgstr "Parâmetros do fator de ruido do gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 filler depth noise parameters"
-msgstr "Parâmetros de ruido da profundidade de preenchimento do mapgen v5"
+msgstr ""
+"Parâmetros de ruido da profundidade de preenchimento do gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v5 height noise parameters"
@@ -3383,7 +3375,7 @@ msgstr "Parâmetros de ruido de altura do gerador de mundo v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6"
-msgstr "Mapgen versão 6"
+msgstr "Gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v6 apple trees noise parameters"
@@ -3443,7 +3435,7 @@ msgstr "Parâmetros de ruido das árvores no gerador de mundo v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7"
-msgstr "Mapgen versão 7"
+msgstr "Gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave width"
@@ -3451,31 +3443,28 @@ msgstr "Largura das cavernas no gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave1 noise parameters"
-msgstr "Parâmetros de ruido \"cave1\" do gerador de mundo v7"
+msgstr "Parâmetros de ruido cave1 do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 cave2 noise parameters"
-msgstr "Parâmetros de ruido \"cave2\" do gerador de mundo v7"
+msgstr "Parâmetros de ruido cave2 do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 filler depth noise parameters"
-msgstr "Parâmetros noise da profundidade de enchimento do Mapgen v7"
+msgstr ""
+"Parâmetros de ruido da profundidade de preenchimento do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 flags"
-msgstr "Flags do Mapgen v7"
+msgstr "Flags do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 height select noise parameters"
-msgstr "Parâmetros noise da seleção de altura do Mapgen v7"
+msgstr "Parâmetros de ruido da seleção de altura do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen v7 mount height noise parameters"
-msgstr "Parâmetros noise da altura de montagem do Mapgen v7"
+msgstr "Parâmetros ruido da altura de montagem do gerador de mundo v7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen v7 mountain noise parameters"
@@ -3507,7 +3496,7 @@ msgstr "Profundidade de caverna enorme"
 
 #: src/settings_translation_file.cpp
 msgid "Massive cave noise"
-msgstr "Deformação de caverna enorme"
+msgstr "Ruido de caverna enorme"
 
 #: src/settings_translation_file.cpp
 msgid "Massive caves form here."
@@ -3518,7 +3507,6 @@ msgid "Max block generate distance"
 msgstr "Distância máxima de geração de bloco"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Max block send distance"
 msgstr "Distância máxima de envio de bloco"
 
@@ -3528,7 +3516,7 @@ msgstr "Máximo de líquidos processados por etapa."
 
 #: src/settings_translation_file.cpp
 msgid "Max. clearobjects extra blocks"
-msgstr "Max. clearobjects blocos extras."
+msgstr "Max. clearobjects blocos extras"
 
 #: src/settings_translation_file.cpp
 msgid "Max. packets per iteration"
@@ -3548,12 +3536,12 @@ msgstr "Máximo de blocos carregados forçadamente"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum hotbar width"
-msgstr "Largura máxima do hotbar"
+msgstr "Largura máxima da hotbar"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of blocks that are simultaneously sent in total."
-msgstr "Número máximo de jogadores que podem se conectar simultaneamente."
+msgstr ""
+"Número máximo de jogadores que podem se conectar simultaneamente no total."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that are simultaneously sent per client."
@@ -3586,7 +3574,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
-msgstr "Número máximo de mapblocks carregados forçadamente."
+msgstr "Número máximo de chunks carregados forçadamente."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3603,8 +3591,9 @@ msgid ""
 "client number."
 msgstr ""
 "Número máximo de pacotes enviados por etapa de envio, se você tem uma "
-"conexão lenta tente reduzir isso, mas não reduza a um número abaixo do dobro "
-"do número de cliente alvo."
+"conexão lenta \n"
+"tente reduzir isso, mas não reduza a um número abaixo do dobro do número de "
+"cliente alvo."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of players that can connect simultaneously."
@@ -3616,7 +3605,7 @@ msgstr "Número máximo de objetos estaticamente armazenados em um bloco."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum objects per block"
-msgstr "Limite maximo de objetos por bloco."
+msgstr "Limite maximo de objetos por bloco"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3628,11 +3617,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneous block sends per client"
-msgstr "Máximo de blocos enviados simultaneamente por cliente."
+msgstr "Máximo de blocos enviados simultaneamente por cliente"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneous block sends total"
-msgstr "Máximo de blocos totais enviados simultaneamente."
+msgstr "Máximo de blocos totais enviados simultaneamente"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
@@ -3698,11 +3687,11 @@ msgstr "URL da lista de modificadores da Modstore"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
-msgstr "Caminho de fonte monoespaçada."
+msgstr "Caminho de fonte monoespaçada"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font size"
-msgstr "Tamanho da fonte monoespaçada."
+msgstr "Tamanho da fonte monoespaçada"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
@@ -3743,9 +3732,9 @@ msgid ""
 "When starting from the main menu, this is overridden."
 msgstr ""
 "Nome do jogador.\n"
-"Quando executando um servidor, os clientes com este nome são "
-"administradores.\n"
-"Nome definido a partir do menu principal, substitui esse."
+"Quando executando um servidor, os clientes com este nome são administradores."
+"\n"
+"Quando iniciado pelo menu principal, este é substituido."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3771,18 +3760,16 @@ msgid "New users need to input this password."
 msgstr "Novos usuários precisam inserir esta senha."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Noclip"
-msgstr "Noclip"
+msgstr "Atravessar blocos"
 
 #: src/settings_translation_file.cpp
 msgid "Noclip key"
 msgstr "Tecla Noclip"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Node highlighting"
-msgstr "Realce no bloco"
+msgstr "Destacamento do bloco"
 
 #: src/settings_translation_file.cpp
 msgid "NodeTimer interval"
@@ -3824,7 +3811,6 @@ msgstr ""
 "à custa de uns poucos bugs nas cavernas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Number of extra blocks that can be loaded by /clearobjects at once.\n"
 "This is a trade-off between sqlite transaction overhead and\n"
@@ -3840,9 +3826,8 @@ msgid "Number of parallax occlusion iterations."
 msgstr "Número de iterações de oclusão de paralaxe."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Viés global do efeito de paralaxe oclusão, geralmente de escala/2."
+msgstr "Viés geral do efeito de oclusão de paralaxe, geralmente de escala/2."
 
 #: src/settings_translation_file.cpp
 msgid "Overall scale of parallax occlusion effect."
@@ -3929,10 +3914,9 @@ msgid ""
 "disable. Useful for developers."
 msgstr ""
 "Intervalo de impressão de dados do analizador (em segundos). 0 = "
-"desabilitado. Útil para os desenvolvedores."
+"desabilitado. Útil para desenvolvedores."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Privileges that players with basic_privs can grant"
 msgstr "Privilégios que jogadores com basic_privs podem conceder"
 
@@ -3942,7 +3926,7 @@ msgstr "Analizador"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
-msgstr "Tecla de alternância de Profiler"
+msgstr "Tecla de alternância do Analizador"
 
 #: src/settings_translation_file.cpp
 msgid "Profiling"
@@ -3983,18 +3967,16 @@ msgid "Replaces the default main menu with a custom one."
 msgstr "Substitui o menu principal padrão por um personalizado."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
-msgstr "Caminho fonte"
+msgstr "Diretorio de reporte"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Tecla direita"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Rightclick repetition interval"
-msgstr "Intervalo de repetição de clique direito"
+msgstr "Intervalo de repetição do clique direito"
 
 #: src/settings_translation_file.cpp
 msgid "River Depth"
@@ -4025,9 +4007,8 @@ msgid "Save the map received by the client on disk."
 msgstr "Salvar o mapa recebido pelo cliente no disco."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Saving map received from server"
-msgstr "Salvamento do mapa recebido do servidor"
+msgstr "Salvado mapa recebido do servidor"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4062,7 +4043,7 @@ msgstr "Pasta de screenshot"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot format"
-msgstr "Formato da Captura de tela."
+msgstr "Formato da Captura de tela"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot quality"
@@ -4128,7 +4109,7 @@ msgstr "URL da lista de servidores"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist file"
-msgstr "arquivo da lista de servidores"
+msgstr "Arquivo da lista de servidores"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4163,14 +4144,13 @@ msgstr ""
 "Requer sombreadores seres ativados."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video cards.\n"
 "Thy only work with the OpenGL video backend."
 msgstr ""
-"Shaders permitem efeitos visuais avançados e podem aumentar a performance em "
-"algumas placas de vídeo.\n"
+"Sombreadores permitem efeitos visuais avançados e podem aumentar a "
+"performance em algumas placas de vídeo.\n"
 "Só funcionam com o backend de vídeo OpenGL."
 
 #: src/settings_translation_file.cpp
@@ -4198,7 +4178,6 @@ msgstr ""
 "mapblocks (16 nodes)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Slope and fill work together to modify the heights"
 msgstr "Inclinação e preenchimento trabalham juntos para modificar as alturas"
 
@@ -4257,7 +4236,6 @@ msgid "Strength of parallax."
 msgstr "Intensidade de paralaxe."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Strict protocol checking"
 msgstr "Verificação rígida de protocolo"
 
@@ -4295,7 +4273,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
-msgstr "Pacotes de texturas"
+msgstr "Diretorio da textura"
 
 #: src/settings_translation_file.cpp
 msgid "The altitude at which temperature drops by 20C"
@@ -4307,7 +4285,7 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 "O formato padrão no qual as analises estão sendo salvas,\n"
-"Quando chamado `/profiler save [formato]` sem formato"
+"Quando chamado `/profiler save [formato]` sem formato."
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
@@ -4336,7 +4314,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The rendering back-end for Irrlicht."
-msgstr "O processamento back-end para Irrlicht."
+msgstr "A rederização back-end para Irrlicht."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4348,14 +4326,13 @@ msgstr ""
 "frustum de exibição no jogo."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The strength (darkness) of node ambient-occlusion shading.\n"
 "Lower is darker, Higher is lighter. The valid range of values for this\n"
 "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
 "set to the nearest valid value."
 msgstr ""
-"A intensidade (escuridão) de sombreamento da oclusão-ambiente no node.\n"
+"A intensidade (escuridão) de sombreamento da oclusão de ambiente no bloco.\n"
 "Inferior é mais escura, superior é mais clara. O intervalo válido de valores "
 "para esta\n"
 "configuração é 0.25 a 4.0. Se o valor está fora do intervalo ele será \n"
@@ -4374,13 +4351,12 @@ msgstr ""
 "de antigas filas de itens.  Um valor 0 desativa a funcionalidade."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 "O tempo em segundos que leva entre eventos repetidos \n"
-"quando pressionar uma combinação de botão no joystick."
+"quando pressionando uma combinação de botão no joystick."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4456,7 +4432,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
-msgstr "Modificadores confiáveis"
+msgstr "Modulos confiáveis"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -4502,10 +4478,9 @@ msgstr "Use a filtragem trilinear ao dimensionamento de texturas."
 
 #: src/settings_translation_file.cpp
 msgid "V-Sync"
-msgstr "Sincronização Vertical."
+msgstr "Sincronização Vertical"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "VBO"
 msgstr "VBO"
 
@@ -4566,7 +4541,6 @@ msgid "Volume"
 msgstr "Volume do som"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "W co-ordinate of the generated 3D slice of a 4D fractal.\n"
 "Determines which 3D slice of the 4D shape is generated.\n"
@@ -4596,7 +4570,7 @@ msgstr "Nível de superfície de água do mundo."
 
 #: src/settings_translation_file.cpp
 msgid "Waving Nodes"
-msgstr "Nós que balancam."
+msgstr "Nós que balancam"
 
 #: src/settings_translation_file.cpp
 msgid "Waving leaves"
@@ -4623,18 +4597,16 @@ msgid "Waving water speed"
 msgstr "Velocidade de balanço da água"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When gui_scaling_filter is true, all GUI images need to be\n"
 "filtered in software, but some images are generated directly\n"
 "to hardware (e.g. render-to-texture for nodes in inventory)."
 msgstr ""
 "Quando gui_scaling_filter é true, todas as imagens de GUI precisam ser\n"
-"filtrado no software, mas algumas imagens são geradas diretamente ao\n"
+"filtrado no software, porém algumas imagens são geradas diretamente ao\n"
 "hardware (por exemplo render-to-texture para nodes no inventário)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When gui_scaling_filter_txr2img is true, copy those images\n"
 "from hardware to software for scaling.  When false, fall back\n"
@@ -4647,7 +4619,6 @@ msgstr ""
 "vídeo que não suportem propriedades baixas de texturas voltam do hardware."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
 "can be blurred, so automatically upscale them with nearest-neighbor\n"
@@ -4659,14 +4630,14 @@ msgid ""
 msgstr ""
 "Ao usar filtros bilineares/trilinear/anisotrópica, texturas de baixa "
 "resolução\n"
-"podem ficar turva, então automaticamente melhora eles com a interpolação\n"
+"podem ficar borradas, então automaticamente aumenta a escala deles com a "
+"interpolação\n"
 "de nearest-neighbor para preservar os pixels nítidos. Isto define o tamanho\n"
 "mínimo da textura para as texturas melhoradas; valores mais altos parecem\n"
-"mais nítidas, mas requerem mais memória. Intensidades de 2 são "
-"recomendadas.\n"
-"Essa configuração superior a 1 não pode ter um efeito visível, a menos que "
-"a \n"
-"filtragem bilineares/trilinear/anisotrópica seja habilitada."
+"mais nítidas, mas requerem mais memória. Poências de 2 são recomendadas.\n"
+"Essa configuração superior a 1 não pode ter um efeito visível, a menos que a "
+"\n"
+"filtragem bilineares/trilinear/anisotrópica estejam habilitadas."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4686,7 +4657,6 @@ msgstr ""
 "-    Apenas grupos dentro do limite definido map_gerenation_limit são gerados"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Whether freetype fonts are used, requires freetype support to be compiled in."
 msgstr ""
@@ -4699,7 +4669,6 @@ msgstr ""
 "Se as animações de textura do nodes devem ser dessincronizadas por mapblock."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Whether players are shown to clients without any range limit.\n"
 "Deprecated, use the setting player_transfer_distance instead."
@@ -4734,15 +4703,14 @@ msgstr ""
 "como teclar F5)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Whether to support older servers before protocol version 25.\n"
 "Enable if you want to connect to 0.4.12 servers and before.\n"
 "Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n"
 "Disabling this option will protect your password better."
 msgstr ""
-"Se vai apoiar os servidores mais antigos antes de protocolo versão 25.\n"
-"Habilitar se você deseja se conectar a servidores anteriores a 0.4.12.\n"
+"Se vai suportar os servidores mais antigos antes da versão de protocolo 25.\n"
+"Habilite se você deseja se conectar a servidores anteriores a 0.4.12.\n"
 "Servidores começando com 0.4.13 vão funcionar, servidores 0.4.12-dev podem "
 "ou não funcionar.\n"
 "Desabilitar esta opção irá proteger sua senha melhor."
@@ -4764,12 +4732,10 @@ msgstr ""
 "Não é necessário se for iniciado a partir do menu principal."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Y of flat ground."
-msgstr "Y de terreno plano."
+msgstr "Componente Y de terreno plano."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Y of upper limit of large pseudorandom caves."
 msgstr "Y de limite superior de grandes números pseudoaleatórios de cavernas."
 

From a17bcb176730700216f1ab1897036ee4309f69bd Mon Sep 17 00:00:00 2001
From: Nikolay <nikolay0054@factmodule.ru>
Date: Mon, 19 Dec 2016 10:06:43 +0000
Subject: [PATCH 416/418] Translated using Weblate (Russian)

Currently translated at 59.2% (544 of 918 strings)
---
 po/ru/minetest.po | 89 ++++++++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 39 deletions(-)

diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index 1ef80854c..e5b806432 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-30 06:18+0200\n"
-"PO-Revision-Date: 2016-12-13 03:10+0000\n"
-"Last-Translator: Andrey <lordofmist@mail.ru>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/minetest/"
-"minetest/ru/>\n"
+"PO-Revision-Date: 2016-12-19 10:06+0000\n"
+"Last-Translator: Nikolay <nikolay0054@factmodule.ru>\n"
+"Language-Team: Russian "
+"<https://hosted.weblate.org/projects/minetest/minetest/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.10-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.10\n"
 
 #: builtin/fstk/ui.lua
 msgid "An error occured in a Lua script, such as a mod:"
@@ -54,7 +54,7 @@ msgstr "Несоответствие версии протокола. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "Сервер обеспечивает соблюдение версии протокола $ 1. "
+msgstr "Сервер обеспечивает соблюдение версии протокола $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
@@ -102,9 +102,9 @@ msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "chararacters [a-z0-9_] are allowed."
 msgstr ""
-"Ошибка при попытке подключения мода \"$1\", поскольку он содержит "
-"недопустимые символы. Допускается использование строчных букв латинского "
-"алфавита, цифр, и знака подчёркивания."
+"Ошибка при включении мода \"$1\", поскольку он содержит недопустимые "
+"символы. Допускается использование строчных букв латинского алфавита, цифр, "
+"и знака подчёркивания."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Hide Game"
@@ -460,7 +460,7 @@ msgstr "Режим творчества"
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua
 #: builtin/mainmenu/tab_singleplayer.lua
 msgid "Enable Damage"
-msgstr "Разрешить увечья"
+msgstr "Включить Урон"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Name/Password"
@@ -480,7 +480,7 @@ msgstr "Порт"
 
 #: builtin/mainmenu/tab_server.lua
 msgid "Public"
-msgstr "Публичные"
+msgstr "Публичный"
 
 #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
 msgid "Select World:"
@@ -531,7 +531,6 @@ msgid "Bilinear Filter"
 msgstr "Билинейная фильтрация"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Bump Mapping"
 msgstr "Бампмаппинг"
 
@@ -599,7 +598,7 @@ msgstr "Parallax Occlusion"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
-msgstr "частицы"
+msgstr "Частицы"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Reset singleplayer world"
@@ -1478,7 +1477,7 @@ msgstr "Автоматически добавлять в список серве
 
 #: src/settings_translation_file.cpp
 msgid "Autorun key"
-msgstr ""
+msgstr "Кнопка автобега"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -1516,7 +1515,7 @@ msgstr "Разрешить ставить блоки на месте игрок
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
+msgstr "Встроен"
 
 #: src/settings_translation_file.cpp
 msgid "Bumpmapping"
@@ -1685,7 +1684,7 @@ msgstr "Кнопка вызова консоли"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward"
-msgstr ""
+msgstr "Непрерывная ходьба"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward movement (only used for testing)."
@@ -3643,7 +3642,6 @@ msgstr ""
 "Создание мира из главного меню переопределит это."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Name of the player.\n"
 "When running a server, clients connecting with this name are admins.\n"
@@ -3667,6 +3665,8 @@ msgid ""
 "Network port to listen (UDP).\n"
 "This value will be overridden when starting from the main menu."
 msgstr ""
+"Сетевой порт для прослушивания (UDP).\n"
+"Этот параметр будет переопределён, если запускать сервер с главного меню."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3698,7 +3698,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Noises"
-msgstr ""
+msgstr "Шумы"
 
 #: src/settings_translation_file.cpp
 msgid "Normalmaps sampling"
@@ -3782,13 +3782,12 @@ msgid "Physics"
 msgstr "Физика"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
 msgstr ""
 "Игрок может летать без влияния гравитации.\n"
-"Это требует привилегии fly на сервере."
+"Это требует привилегии \"fly\" на сервере."
 
 #: src/settings_translation_file.cpp
 msgid "Player name"
@@ -3800,17 +3799,22 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Player versus Player"
-msgstr "PvP"
+msgstr "Игрок против Игрока"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Port to connect to (UDP).\n"
 "Note that the port field in the main menu overrides this setting."
 msgstr ""
+"Порт, к которому подключиться (UDP).\n"
+"Имейте ввиду, что поле ввода порта в главном меню переопределяет эту "
+"настройку."
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
+"Не допускать модам выполнение небезопасных вещей, например выполнение "
+"консольных команд."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3903,15 +3907,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Round minimap"
-msgstr ""
+msgstr "Круглая миникарта"
 
 #: src/settings_translation_file.cpp
 msgid "Save the map received by the client on disk."
-msgstr ""
+msgstr "Сохранение карты, полученной от клиента на диск."
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
-msgstr ""
+msgstr "Сохранение карты, полученной с сервера"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4009,7 +4013,7 @@ msgstr "Порт сервера"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist URL"
-msgstr "Список публичных серверов"
+msgstr "Адрес списка серверов"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist file"
@@ -4064,16 +4068,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr ""
+msgstr "Форма миникарты. Включено = круг, выключено = квадрат."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Show debug info"
-msgstr "Показывать отладочную информацию."
+msgstr "Показывать отладочную информацию"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
-msgstr ""
+msgstr "Показывать выделение энтити"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4135,6 +4138,11 @@ msgid ""
 "(obviously, remote_media should end with a slash).\n"
 "Files that are not present will be fetched the usual way."
 msgstr ""
+"Указывает URL с которого клиент будет качать медиа-файлы вместо "
+"использования UDP.\n"
+"$filename должен быть доступен по адресу $remote_demia$filename через cURL\n"
+"(remote_media должен заканчиваться слешем).\n"
+"Файлы, которых не будет, будут скачены обычным путём."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4156,7 +4164,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Support older servers"
-msgstr ""
+msgstr "Поддержка старых серверов"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -4164,7 +4172,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Terrain Height"
-msgstr ""
+msgstr "Высота местности"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4194,6 +4202,8 @@ msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"Стандартный формат, в котором профили будут сохранены,\n"
+"когда вызывают '/profiler save [формат]' без формата."
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other filler"
@@ -4207,10 +4217,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
-msgstr ""
+msgstr "Сетевой интерфейс, который слушает сервер."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The privileges that new users automatically get.\n"
 "See /privs in game for a full list on your server and mod configuration."
@@ -4259,7 +4268,7 @@ msgstr "Задержка в секундах между кликами при з
 
 #: src/settings_translation_file.cpp
 msgid "This font will be used for certain languages."
-msgstr ""
+msgstr "Этот шрифт будет использован для некоторых языков."
 
 #: src/settings_translation_file.cpp
 msgid "Time in between active block management cycles"
@@ -4332,7 +4341,7 @@ msgstr "Доверенные моды"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
-msgstr ""
+msgstr "URL списка серверов, отображающийся во вкладке Мультиплеер."
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
@@ -4428,6 +4437,8 @@ msgid ""
 "View distance in nodes.\n"
 "Min = 20"
 msgstr ""
+"Дальность отрисовки в нодах.\n"
+"Минимум = 20"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4468,11 +4479,11 @@ msgstr "Текстуры предметов..."
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
-msgstr ""
+msgstr "Уровень воды"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
-msgstr ""
+msgstr "Уровень поверхности воды мира."
 
 #: src/settings_translation_file.cpp
 #, fuzzy

From 5114329ada6ef3ccac7d964790868eb505484a96 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Fri, 23 Dec 2016 07:23:12 +1000
Subject: [PATCH 417/418] Final update to credits before release

---
 builtin/mainmenu/tab_credits.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua
index 224731b14..c2ad19183 100644
--- a/builtin/mainmenu/tab_credits.lua
+++ b/builtin/mainmenu/tab_credits.lua
@@ -45,6 +45,7 @@ local active_contributors = {
 	"Jean-Patrick G (kilbith) <jeanpatrick.guerrero@gmail.com>",
 	"Diego Martínez (kaeza) <kaeza@users.sf.net>",
 	"Dániel Juhász (juhdanad) <juhdanad@gmail.com>",
+	"Rogier <rogier777@gmail.com>",
 }
 
 local previous_core_developers = {

From 231ac33d34dfaaddf292c5f31b1eae43eeefba2d Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 22 Dec 2016 22:52:15 +0100
Subject: [PATCH 418/418] Bump version to 0.4.15

---
 CMakeLists.txt             | 4 ++--
 build/android/build.gradle | 2 +-
 doc/lua_api.txt            | 2 +-
 doc/menu_lua_api.txt       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15b3fc33c..11ebe94a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,11 @@ set(PROJECT_NAME_CAPITALIZED "Minetest")
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH 14)
+set(VERSION_PATCH 15)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
 # Change to false for releases
-set(DEVELOPMENT_BUILD TRUE)
+set(DEVELOPMENT_BUILD FALSE)
 
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 if(VERSION_EXTRA)
diff --git a/build/android/build.gradle b/build/android/build.gradle
index e0a0a186a..20c13e385 100644
--- a/build/android/build.gradle
+++ b/build/android/build.gradle
@@ -14,7 +14,7 @@ android {
 	buildToolsVersion "23.0.3"
 
 	defaultConfig {
-		versionCode 15
+		versionCode 16
 		versionName "${System.env.VERSION_STR}.${versionCode}"
 		minSdkVersion 9
 		targetSdkVersion 9
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 62cd6bb46..34c64b8df 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Modding API Reference 0.4.14
+Minetest Lua Modding API Reference 0.4.15
 =========================================
 * More information at <http://www.minetest.net/>
 * Developer Wiki: <http://dev.minetest.net/>
diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt
index 479880266..423b8bb9c 100644
--- a/doc/menu_lua_api.txt
+++ b/doc/menu_lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Mainmenu API Reference 0.4.14
+Minetest Lua Mainmenu API Reference 0.4.15
 ========================================
 
 Introduction