Regenerate minetest.conf.example and translation file

2 files changed, 275 insertions, 122 deletions

diff --git a/minetest.conf.example b/minetest.conf.example
index 28281fc38..0677026aa 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -618,6 +618,13 @@
 #    type: int min: 20 max: 4000
 # viewing_range = 100
 
+#    Camera near plane distance in nodes, between 0 and 0.5
+#    Most users will not need to change this.
+#    Increasing can reduce artifacting on weaker GPUs.
+#    0.1 = Default, 0.25 = Good value for weaker tablets.
+#    type: float min: 0 max: 0.5
+# near_plane = 0.1
+
 #    Width component of the initial window size.
 #    type: int
 # screen_w = 1024
@@ -647,7 +654,7 @@
 # fov = 72
 
 #    Field of view while zooming in degrees.
-#    This requires the "zoom" privilege on the server.
+#    Requires to be allowed by server-sided mods.
 #    type: int min: 7 max: 160
 # zoom_fov = 15
 
@@ -740,6 +747,10 @@
 #    type: int min: 0 max: 255
 # crosshair_alpha = 255
 
+#    Maximum number of recent chat items to show
+#    type: int min: 3 max: 99
+# recent_chat_size = 6
+
 #    Whether node texture animations should be desynchronized per mapblock.
 #    type: bool
 # desynchronize_mapblock_texture_animation = true
@@ -811,7 +822,7 @@
 # opaque_water = false
 
 #    Textures on a node may be aligned either to the node or to the world.
-#    The former mode sutis better things like machines, furniture, etc., while
+#    The former mode suits better things like machines, furniture, etc., while
 #    the latter makes stairs and microblocks fit surroundings better.
 #    However, as this possibility is new, thus may not be used by older servers,
 #    this option allows enforcing it for certain node types. Note though that
@@ -863,6 +874,10 @@
 #    type: int
 # tooltip_show_delay = 400
 
+#    Append item name to tooltip.
+#    type: bool
+# tooltip_append_itemname = false
+
 #    Whether freetype fonts are used, requires freetype support to be compiled in.
 #    type: bool
 # freetype = true
@@ -936,6 +951,9 @@
 #    type: float min: 0 max: 1
 # sound_volume = 0.7
 
+#    type: bool
+# mute_sound = false
+
 #
 # Client
 #
@@ -1146,7 +1164,7 @@
 #    type: bool
 # enable_pvp = true
 
-#    Enable mod channels.
+#    Enable mod channels support.
 #    type: bool
 # enable_mod_channels = false
 
@@ -1666,11 +1684,10 @@
 
 #    Map generation attributes specific to Mapgen v7.
 #    'ridges' enables the rivers.
-#    'biomerepeat' causes surface biomes to repeat in the floatlands.
 #    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, caverns, biomerepeat, nomountains, noridges, nofloatlands, nocaverns, nobiomerepeat
-# mgv7_spflags = mountains,ridges,nofloatlands,caverns,biomerepeat
+#    type: flags possible values: mountains, ridges, floatlands, caverns, nomountains, noridges, nofloatlands, nocaverns
+# mgv7_spflags = mountains,ridges,nofloatlands,caverns
 
 #    Y of mountain density gradient zero level. Used to shift mountains vertically.
 #    type: int
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index cebe6bdf1..b7c80e79b 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -3,14 +3,13 @@
 // To update it, refer to the bottom of builtin/mainmenu/dlg_settings_advanced.lua
 
 fake_function() {
-	gettext("Client");
 	gettext("Controls");
 	gettext("Build inside player");
 	gettext("If enabled, you can place blocks at the position (feet + eye level) where you stand.\nThis is helpful when working with nodeboxes in small areas.");
 	gettext("Flying");
 	gettext("Player is able to fly without being affected by gravity.\nThis requires the \"fly\" privilege on the server.");
 	gettext("Fast movement");
-	gettext("Fast movement (via use key).\nThis requires the \"fast\" privilege on the server.");
+	gettext("Fast movement (via the \"special\" key).\nThis requires the \"fast\" privilege on the server.");
 	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");
@@ -23,14 +22,16 @@ fake_function() {
 	gettext("Invert vertical mouse movement.");
 	gettext("Mouse sensitivity");
 	gettext("Mouse sensitivity multiplier.");
-	gettext("Key use for climbing/descending");
-	gettext("If enabled, \"use\" key instead of \"sneak\" key is used for climbing down and descending.");
+	gettext("Special key for climbing/descending");
+	gettext("If enabled, \"special\" key instead of \"sneak\" key is used for climbing down and descending.");
 	gettext("Double tap jump for fly");
 	gettext("Double-tapping the jump key toggles fly mode.");
 	gettext("Always fly and fast");
-	gettext("If disabled \"use\" key is used to fly fast if both fly and fast mode are enabled.");
+	gettext("If disabled, \"special\" key is used to fly fast if both fly and fast mode are enabled.");
 	gettext("Rightclick repetition interval");
 	gettext("The time in seconds it takes between repeated right clicks when holding the right mouse button.");
+	gettext("Safe digging and placing");
+	gettext("Prevent digging and placing from repeating when holding the mouse buttons.\nEnable this when you dig or place too often by accident.");
 	gettext("Random input");
 	gettext("Enable random user input (only used for testing).");
 	gettext("Continuous forward");
@@ -59,7 +60,7 @@ fake_function() {
 	gettext("Key for sneaking.\nAlso used for climbing down and descending in water if aux1_descends is disabled.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Inventory key");
 	gettext("Key for opening the inventory.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
-	gettext("Use key");
+	gettext("Special key");
 	gettext("Key for moving fast in fast mode.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Chat key");
 	gettext("Key for opening the chat window.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
@@ -99,6 +100,52 @@ fake_function() {
 	gettext("Key for dropping the currently selected item.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("View zoom key");
 	gettext("Key to use view zoom when possible.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 1 key");
+	gettext("Key for selecting the first hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 2 key");
+	gettext("Key for selecting the second hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 3 key");
+	gettext("Key for selecting the third hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 4 key");
+	gettext("Key for selecting the fourth hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 5 key");
+	gettext("Key for selecting the fifth hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 6 key");
+	gettext("Key for selecting the sixth hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 7 key");
+	gettext("Key for selecting the seventh hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 8 key");
+	gettext("Key for selecting the eighth hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 9 key");
+	gettext("Key for selecting the ninth hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 10 key");
+	gettext("Key for selecting the tenth hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 11 key");
+	gettext("Key for selecting the 11th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 12 key");
+	gettext("Key for selecting the 12th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 13 key");
+	gettext("Key for selecting the 13th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 14 key");
+	gettext("Key for selecting the 14th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 15 key");
+	gettext("Key for selecting the 15th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 16 key");
+	gettext("Key for selecting the 16th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 17 key");
+	gettext("Key for selecting the 17th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 18 key");
+	gettext("Key for selecting the 18th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 19 key");
+	gettext("Key for selecting the 19th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 20 key");
+	gettext("Key for selecting the 20th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 21 key");
+	gettext("Key for selecting the 21th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 22 key");
+	gettext("Key for selecting the 22th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Hotbar slot 23 key");
+	gettext("Key for selecting the 23th hotbar slot.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("HUD toggle key");
 	gettext("Key for toggling the display of the HUD.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Chat toggle key");
@@ -119,27 +166,6 @@ fake_function() {
 	gettext("Key for increasing the viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("View range decrease key");
 	gettext("Key for decreasing the viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
-	gettext("Network");
-	gettext("Server address");
-	gettext("Address to connect to.\nLeave this blank to start a local server.\nNote that the address field in the main menu overrides this setting.");
-	gettext("Remote port");
-	gettext("Port to connect to (UDP).\nNote that the port field in the main menu overrides this setting.");
-	gettext("Support older servers");
-	gettext("Whether to support older servers before protocol version 25.\nEnable if you want to connect to 0.4.12 servers and before.\nServers starting with 0.4.13 will work, 0.4.12-dev servers may work.\nDisabling this option will protect your password better.");
-	gettext("Saving map received from server");
-	gettext("Save the map received by the client on disk.");
-	gettext("Show entity selection boxes");
-	gettext("Show entity selection boxes");
-	gettext("Connect to external media server");
-	gettext("Enable usage of remote media server (if provided by server).\nRemote servers offer a significantly faster way to download media (e.g. textures)\nwhen connecting to the server.");
-	gettext("Client modding");
-	gettext("Enable Lua modding support on client.\nThis support is experimental and API can change.");
-	gettext("Serverlist URL");
-	gettext("URL to the server list displayed in the Multiplayer Tab.");
-	gettext("Serverlist file");
-	gettext("File in client/serverlist/ that contains your favorite servers displayed in the Multiplayer Tab.");
-	gettext("Maximum size of the out chat queue");
-	gettext("Maximum size of the out chat queue. 0 to disable queueing and -1 to make the queue size unlimited");
 	gettext("Graphics");
 	gettext("In-Game");
 	gettext("Basic");
@@ -178,7 +204,6 @@ fake_function() {
 	gettext("Experimental option, might cause visible spaces between blocks\nwhen set to higher number than 0.");
 	gettext("Undersampling");
 	gettext("Undersampling is similar to using lower screen resolution, but it applies\nto the game world only, keeping the GUI intact.\nIt should give significant performance boost at the cost of less detailed image.");
-	gettext("Autoscaling mode");
 	gettext("Shaders");
 	gettext("Shaders");
 	gettext("Shaders allow advanced visual effects and may increase performance on some video cards.\nThis only works with the OpenGL video backend.");
@@ -220,12 +245,16 @@ fake_function() {
 	gettext("Waving plants");
 	gettext("Set to true enables waving plants.\nRequires shaders to be enabled.");
 	gettext("Advanced");
+	gettext("Arm inertia");
+	gettext("Arm inertia, gives a more realistic movement of\nthe arm when the camera moves.");
 	gettext("Maximum FPS");
 	gettext("If FPS would go higher than this, limit it by sleeping\nto not waste CPU power for no benefit.");
 	gettext("FPS in pause menu");
 	gettext("Maximum FPS when game is paused.");
 	gettext("Viewing range");
 	gettext("View distance in nodes.");
+	gettext("Near plane");
+	gettext("Camera near plane distance in nodes, between 0 and 0.5\nMost users will not need to change this.\nIncreasing can reduce artifacting on weaker GPUs.\n0.1 = Default, 0.25 = Good value for weaker tablets.");
 	gettext("Screen width");
 	gettext("Width component of the initial window size.");
 	gettext("Screen height");
@@ -241,7 +270,7 @@ fake_function() {
 	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("Field of view while zooming in degrees.\nRequires to be allowed by server-sided mods.");
 	gettext("Gamma");
 	gettext("Adjust the gamma encoding for the light tables. Higher numbers are brighter.\nThis setting is for the client only and is ignored by the server.");
 	gettext("Darkness sharpness");
@@ -250,8 +279,6 @@ fake_function() {
 	gettext("Path to texture directory. All textures are first searched from here.");
 	gettext("Video driver");
 	gettext("The rendering back-end for Irrlicht.");
-	gettext("Cloud height");
-	gettext("Height on which clouds are appearing.");
 	gettext("Cloud radius");
 	gettext("Radius of cloud area stated in number of 64 node cloud squares.\nValues larger than 26 will start to produce sharp cutoffs at cloud area corners.");
 	gettext("View bobbing factor");
@@ -266,6 +293,14 @@ fake_function() {
 	gettext("In-game chat console background color (R,G,B).");
 	gettext("Console alpha");
 	gettext("In-game chat console background alpha (opaqueness, between 0 and 255).");
+	gettext("Formspec Full-Screen Background Opacity");
+	gettext("Formspec full-screen background opacity (between 0 and 255).");
+	gettext("Formspec Full-Screen Background Color");
+	gettext("Formspec full-screen background color (R,G,B).");
+	gettext("Formspec Default Background Opacity");
+	gettext("Formspec default background opacity (between 0 and 255).");
+	gettext("Formspec Default Background Color");
+	gettext("Formspec default background color (R,G,B).");
 	gettext("Selection box color");
 	gettext("Selection box border color (R,G,B).");
 	gettext("Selection box width");
@@ -274,6 +309,8 @@ fake_function() {
 	gettext("Crosshair color (R,G,B).");
 	gettext("Crosshair alpha");
 	gettext("Crosshair alpha (opaqueness, between 0 and 255).");
+	gettext("Recent Chat Messages");
+	gettext("Maximum number of recent chat items to show");
 	gettext("Desynchronize block animation");
 	gettext("Whether node texture animations should be desynchronized per mapblock.");
 	gettext("Maximum hotbar width");
@@ -305,9 +342,11 @@ fake_function() {
 	gettext("Opaque liquids");
 	gettext("Makes all liquids opaque");
 	gettext("World-aligned textures mode");
-	gettext("Textures on a node may be aligned either to the node or to the world.\nThe former mode sutis better things like machines, furniture, etc., while\nthe latter makes stairs and microblocks fit surroundings better.\nHowever, as this possibility is new, thus may not be used by older servers,\nthis option allows enforcing it for certain node types. Note though that\nthat is considered EXPERIMENTAL and may not work properly.");
+	gettext("Textures on a node may be aligned either to the node or to the world.\nThe former mode suits better things like machines, furniture, etc., while\nthe latter makes stairs and microblocks fit surroundings better.\nHowever, as this possibility is new, thus may not be used by older servers,\nthis option allows enforcing it for certain node types. Note though that\nthat is considered EXPERIMENTAL and may not work properly.");
 	gettext("Autoscaling mode");
-	gettext("World-aligned textures may be scaled to span several nodes. However,\nthe server may not send the scale you want, especially if you use\na specially-designed texture pack; with this option, the client tries\nto determine the scale automatically basing on the texture size.\nSee also min_texture_size.\nWarning: this option is EXPERIMENTAL!");
+	gettext("World-aligned textures may be scaled to span several nodes. However,\nthe server may not send the scale you want, especially if you use\na specially-designed texture pack; with this option, the client tries\nto determine the scale automatically basing on the texture size.\nSee also texture_min_size.\nWarning: this option is EXPERIMENTAL!");
+	gettext("Show entity selection boxes");
+	gettext("Show entity selection boxes");
 	gettext("Menus");
 	gettext("Clouds in menu");
 	gettext("Use a cloud animation for the main menu background.");
@@ -319,6 +358,8 @@ fake_function() {
 	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("Append item name");
+	gettext("Append item name to tooltip.");
 	gettext("Freetype fonts");
 	gettext("Whether freetype fonts are used, requires freetype support to be compiled in.");
 	gettext("Font path");
@@ -349,6 +390,25 @@ fake_function() {
 	gettext("Sound");
 	gettext("Sound");
 	gettext("Volume");
+	gettext("Mute sound");
+	gettext("Client");
+	gettext("Network");
+	gettext("Server address");
+	gettext("Address to connect to.\nLeave this blank to start a local server.\nNote that the address field in the main menu overrides this setting.");
+	gettext("Remote port");
+	gettext("Port to connect to (UDP).\nNote that the port field in the main menu overrides this setting.");
+	gettext("Saving map received from server");
+	gettext("Save the map received by the client on disk.");
+	gettext("Connect to external media server");
+	gettext("Enable usage of remote media server (if provided by server).\nRemote servers offer a significantly faster way to download media (e.g. textures)\nwhen connecting to the server.");
+	gettext("Client modding");
+	gettext("Enable Lua modding support on client.\nThis support is experimental and API can change.");
+	gettext("Serverlist URL");
+	gettext("URL to the server list displayed in the Multiplayer Tab.");
+	gettext("Serverlist file");
+	gettext("File in client/serverlist/ that contains your favorite servers displayed in the Multiplayer Tab.");
+	gettext("Maximum size of the out chat queue");
+	gettext("Maximum size of the out chat queue. 0 to disable queueing and -1 to make the queue size unlimited");
 	gettext("Advanced");
 	gettext("Mapblock unload timeout");
 	gettext("Timeout for client to remove unused map data from memory.");
@@ -384,9 +444,7 @@ fake_function() {
 	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 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("Maximum number of blocks that are simultaneously sent per client.\nThe maximum total count is calculated dynamically:\nmax_total = ceil((#clients + max_users) * per_client / 4)");
 	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");
@@ -422,6 +480,8 @@ fake_function() {
 	gettext("Defines the maximal player transfer distance in blocks (0 = unlimited).");
 	gettext("Player versus Player");
 	gettext("Whether to allow players to damage and kill each other.");
+	gettext("Mod channels");
+	gettext("Enable mod channels support.");
 	gettext("Static spawnpoint");
 	gettext("If this is set, players will always (re)spawn at the given position.");
 	gettext("Disallow empty passwords");
@@ -448,6 +508,8 @@ fake_function() {
 	gettext("Interval of sending time of day to clients.");
 	gettext("Time speed");
 	gettext("Controls length of day/night cycle.\nExamples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged.");
+	gettext("World start time");
+	gettext("Time of day when a new world is started, in millihours (0-23999).");
 	gettext("Map save interval");
 	gettext("Interval of saving important changes in the world, stated in seconds.");
 	gettext("Physics");
@@ -494,6 +556,65 @@ fake_function() {
 	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("Server side occlusion culling");
 	gettext("If enabled the server will perform map block occlusion culling based on\non the eye position of the player. This can reduce the number of blocks\nsent to the client 50-80%. The client will not longer receive most invisible\nso that the utility of noclip mode is reduced.");
+	gettext("Client side modding flavour limits");
+	gettext("Restricts the access of certain client-side functions on servers\nCombine these byteflags below to restrict more client-side features:\nLOOKUP_NODES_LIMIT: 1 (limits get_node call client-side to csm_flavour_noderange_limit)\nCHAT_MESSAGES: 2 (disable send_chat_message call client-side)\nREAD_ITEMDEFS: 4 (disable get_item_def call client-side)\nREAD_NODEDEFS: 8 (disable get_node_def call client-side)\ntype: int");
+	gettext("Client side noderange flavour limit");
+	gettext("If the CSM flavour for node range is enabled, get_node is limited to\nthis many nodes from the player.");
+	gettext("Security");
+	gettext("Enable mod security");
+	gettext("Prevent mods from doing insecure things like running shell commands.");
+	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-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");
+	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.");
+	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.");
+	gettext("Language");
+	gettext("Set the language. Leave empty to use the system language.\nA restart is required after changing this.");
+	gettext("Debug log level");
+	gettext("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");
+	gettext("IPv6");
+	gettext("IPv6 support.");
+	gettext("Advanced");
+	gettext("cURL timeout");
+	gettext("Default timeout for cURL, stated in milliseconds.\nOnly has an effect if compiled with cURL.");
+	gettext("cURL parallel limit");
+	gettext("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).\nOnly has an effect if compiled with cURL.");
+	gettext("cURL file download timeout");
+	gettext("Maximum time in ms a file download (e.g. a mod download) may take.");
+	gettext("High-precision FPU");
+	gettext("Makes DirectX work with LuaJIT. Disable if it causes troubles.");
+	gettext("Main menu script");
+	gettext("Replaces the default main menu with a custom one.");
+	gettext("Main menu game manager");
+	gettext("Main menu mod manager");
+	gettext("Engine profiling data print interval");
+	gettext("Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers.");
 	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.");
@@ -505,19 +626,8 @@ fake_function() {
 	gettext("Limit of map generation, in nodes, in all 6 directions from (0, 0, 0).\nOnly mapchunks completely within the mapgen limit are generated.\nValue is stored per-world.");
 	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.\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).");
-	gettext("Mapgen debug");
-	gettext("Dump the mapgen debug infos.");
-	gettext("Absolute limit of emerge queues");
-	gettext("Maximum number of blocks that can be queued for loading.");
-	gettext("Limit of emerge queues on disk");
-	gettext("Maximum number of blocks to be queued that are to be loaded from file.\nSet to blank for an appropriate amount to be chosen automatically.");
-	gettext("Limit of emerge queues to generate");
-	gettext("Maximum number of blocks to be queued that are to be generated.\nSet to blank for an appropriate amount to be chosen automatically.");
-	gettext("Number of emerge threads");
-	gettext("Number of emerge threads to use. Make this field blank, or increase this number\nto use multiple threads. On multiprocessor systems, this will improve mapgen speed greatly\nat the cost of slightly buggy caves.");
+	gettext("Projecting dungeons");
+	gettext("Whether dungeons occasionally project from the terrain.");
 	gettext("Biome API temperature and humidity noise parameters");
 	gettext("Heat noise");
 	gettext("Temperature variation for biomes.");
@@ -527,17 +637,22 @@ fake_function() {
 	gettext("Humidity variation for biomes.");
 	gettext("Humidity blend noise");
 	gettext("Small-scale humidity variation for blending biomes on borders.");
-	gettext("Mapgen v5");
-	gettext("Mapgen v5 specific flags");
+	gettext("Mapgen V5");
+	gettext("Mapgen V5 specific flags");
 	gettext("Map generation attributes specific to Mapgen v5.\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("Cave width");
 	gettext("Controls width of tunnels, a smaller value creates wider tunnels.");
+	gettext("Large cave depth");
+	gettext("Y of upper limit of large caves.");
+	gettext("Lava depth");
+	gettext("Y of upper limit of lava in large caves.");
 	gettext("Cavern limit");
 	gettext("Y-level of cavern upper limit.");
 	gettext("Cavern taper");
 	gettext("Y-distance over which caverns expand to full size.");
 	gettext("Cavern threshold");
 	gettext("Defines full size of caverns, smaller values create larger caverns.");
+	gettext("Noises");
 	gettext("Filler depth noise");
 	gettext("Variation of biome filler depth.");
 	gettext("Factor noise");
@@ -550,13 +665,14 @@ fake_function() {
 	gettext("Second of 2 3D noises that together define tunnels.");
 	gettext("Cavern noise");
 	gettext("3D noise defining giant caverns.");
-	gettext("Mapgen v6");
-	gettext("Mapgen v6 specific flags");
+	gettext("Mapgen V6");
+	gettext("Mapgen V6 specific flags");
 	gettext("Map generation attributes specific to Mapgen v6.\nThe 'snowbiomes' flag enables the new 5 biome system.\nWhen the new biome system is enabled jungles are automatically enabled and\nthe '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("Desert noise threshold");
 	gettext("Deserts occur when np_biome exceeds this value.\nWhen the new biome system is enabled, this is ignored.");
 	gettext("Beach noise threshold");
 	gettext("Sandy beaches occur when np_beach exceeds this value.");
+	gettext("Noises");
 	gettext("Terrain base noise");
 	gettext("Y-level of lower terrain and lakebeds.");
 	gettext("Terrain higher noise");
@@ -579,11 +695,17 @@ fake_function() {
 	gettext("Defines tree areas and tree density.");
 	gettext("Apple trees noise");
 	gettext("Defines areas where trees have apples.");
-	gettext("Mapgen v7");
-	gettext("Mapgen v7 specific flags");
-	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");
+	gettext("Mapgen V7 specific flags");
+	gettext("Map generation attributes specific to Mapgen v7.\n'ridges' enables 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("Mountain zero level");
+	gettext("Y of mountain density gradient zero level. Used to shift mountains vertically.");
 	gettext("Cave width");
 	gettext("Controls width of tunnels, a smaller value creates wider tunnels.");
+	gettext("Large cave depth");
+	gettext("Y of upper limit of large caves.");
+	gettext("Lava depth");
+	gettext("Y of upper limit of lava in large caves.");
 	gettext("Floatland mountain density");
 	gettext("Controls the density of floatland mountain terrain.\nIs an offset added to the 'np_mountain' noise value.");
 	gettext("Floatland mountain height");
@@ -598,6 +720,7 @@ fake_function() {
 	gettext("Y-distance over which caverns expand to full size.");
 	gettext("Cavern threshold");
 	gettext("Defines full size of caverns, smaller values create larger caverns.");
+	gettext("Noises");
 	gettext("Terrain base noise");
 	gettext("Y-level of higher (cliff-top) terrain.");
 	gettext("Terrain alt noise");
@@ -626,13 +749,63 @@ fake_function() {
 	gettext("First of 2 3D noises that together define tunnels.");
 	gettext("Cave2 noise");
 	gettext("Second of 2 3D noises that together define tunnels.");
-	gettext("Mapgen flat");
-	gettext("Mapgen flat specific flags");
+	gettext("Mapgen Carpathian");
+	gettext("Mapgen Carpathian specific flags");
+	gettext("Map generation attributes specific to Mapgen Carpathian.\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("Cave width");
+	gettext("Controls width of tunnels, a smaller value creates wider tunnels.");
+	gettext("Large cave depth");
+	gettext("Y of upper limit of large caves.");
+	gettext("Lava depth");
+	gettext("Y of upper limit of lava in large caves.");
+	gettext("Cavern limit");
+	gettext("Y-level of cavern upper limit.");
+	gettext("Cavern taper");
+	gettext("Y-distance over which caverns expand to full size.");
+	gettext("Cavern threshold");
+	gettext("Defines full size of caverns, smaller values create larger caverns.");
+	gettext("Noises");
+	gettext("Base ground noise");
+	gettext("2D noise that defines the base ground level.");
+	gettext("Filler depth noise");
+	gettext("Variation of biome filler depth.");
+	gettext("Hilliness1 noise");
+	gettext("First of 4 3D noises that together define hill/mountain range height.");
+	gettext("Hilliness2 noise");
+	gettext("Second of 4 3D noises that together define hill/mountain range height.");
+	gettext("Hilliness3 noise");
+	gettext("Third of 4 3D noises that together define hill/mountain range height.");
+	gettext("Hilliness4 noise");
+	gettext("Fourth of 4 3D noises that together define hill/mountain range height.");
+	gettext("Rolling hills spread noise");
+	gettext("2D noise that controls the size/occurance of rolling hills.");
+	gettext("Ridge mountain spread noise");
+	gettext("2D noise that controls the size/occurance of ridged mountain ranges.");
+	gettext("Step mountain spread noise");
+	gettext("2D noise that controls the size/occurance of step mountain ranges.");
+	gettext("Rolling hill size noise");
+	gettext("2D noise that controls the shape/size of rolling hills.");
+	gettext("Ridged mountain size noise");
+	gettext("2D noise that controls the shape/size of ridged mountains.");
+	gettext("Step mountain size noise");
+	gettext("2D noise that controls the shape/size of step mountains.");
+	gettext("Mountain variation noise");
+	gettext("3D noise for mountain overhangs, cliffs, etc. Usually small variations.");
+	gettext("Cave1 noise");
+	gettext("First of 2 3D noises that together define tunnels.");
+	gettext("Cave2 noise");
+	gettext("Second of 2 3D noises that together define tunnels.");
+	gettext("Cavern noise");
+	gettext("3D noise defining giant caverns.");
+	gettext("Mapgen Flat");
+	gettext("Mapgen Flat specific flags");
 	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("Ground level");
 	gettext("Y of flat ground.");
 	gettext("Large cave depth");
-	gettext("Y of upper limit of large pseudorandom caves.");
+	gettext("Y of upper limit of large caves.");
+	gettext("Lava depth");
+	gettext("Y of upper limit of lava in large caves.");
 	gettext("Cave width");
 	gettext("Controls width of tunnels, a smaller value creates wider tunnels.");
 	gettext("Lake threshold");
@@ -643,6 +816,7 @@ fake_function() {
 	gettext("Terrain noise threshold for hills.\nControls proportion of world area covered by hills.\nAdjust towards 0.0 for a larger proportion.");
 	gettext("Hill steepness");
 	gettext("Controls steepness/height of hills.");
+	gettext("Noises");
 	gettext("Terrain noise");
 	gettext("Defines location and terrain of optional hills and lakes.");
 	gettext("Filler depth noise");
@@ -651,9 +825,13 @@ fake_function() {
 	gettext("First of 2 3D noises that together define tunnels.");
 	gettext("Cave2 noise");
 	gettext("Second of 2 3D noises that together define tunnels.");
-	gettext("Mapgen fractal");
+	gettext("Mapgen Fractal");
 	gettext("Cave width");
 	gettext("Controls width of tunnels, a smaller value creates wider tunnels.");
+	gettext("Large cave depth");
+	gettext("Y of upper limit of large caves.");
+	gettext("Lava depth");
+	gettext("Y of upper limit of lava in large caves.");
 	gettext("Fractal type");
 	gettext("Choice of 18 fractals from 9 formulas.\n1 = 4D \"Roundy\" mandelbrot set.\n2 = 4D \"Roundy\" julia set.\n3 = 4D \"Squarry\" mandelbrot set.\n4 = 4D \"Squarry\" julia set.\n5 = 4D \"Mandy Cousin\" mandelbrot set.\n6 = 4D \"Mandy Cousin\" julia set.\n7 = 4D \"Variation\" mandelbrot set.\n8 = 4D \"Variation\" julia set.\n9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n11 = 3D \"Christmas Tree\" mandelbrot set.\n12 = 3D \"Christmas Tree\" julia set.\n13 = 3D \"Mandelbulb\" mandelbrot set.\n14 = 3D \"Mandelbulb\" julia set.\n15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n16 = 3D \"Cosine Mandelbulb\" julia set.\n17 = 4D \"Mandelbulb\" mandelbrot set.\n18 = 4D \"Mandelbulb\" julia set.");
 	gettext("Iterations");
@@ -672,6 +850,7 @@ fake_function() {
 	gettext("Julia set only: Z component of hypercomplex constant determining julia shape.\nRange roughly -2 to 2.");
 	gettext("Julia w");
 	gettext("Julia set only: W component of hypercomplex constant determining julia shape.\nHas no effect on 3D fractals.\nRange roughly -2 to 2.");
+	gettext("Noises");
 	gettext("Seabed noise");
 	gettext("Y-level of seabed.");
 	gettext("Filler depth noise");
@@ -681,8 +860,7 @@ fake_function() {
 	gettext("Cave2 noise");
 	gettext("Second of 2 3D noises that together define tunnels.");
 	gettext("Mapgen Valleys");
-	gettext("General");
-	gettext("Valleys C Flags");
+	gettext("Mapgen Valleys specific 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.\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");
@@ -721,59 +899,17 @@ fake_function() {
 	gettext("Amplifies the valleys");
 	gettext("Valley Slope");
 	gettext("Slope and fill work together to modify the heights");
-	gettext("Security");
-	gettext("Enable mod security");
-	gettext("Prevent mods from doing insecure things like running shell commands.");
-	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-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");
-	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.");
-	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.");
-	gettext("Language");
-	gettext("Set the language. Leave empty to use the system language.\nA restart is required after changing this.");
-	gettext("Debug log level");
-	gettext("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");
-	gettext("IPv6");
-	gettext("IPv6 support.");
-	gettext("Advanced");
-	gettext("cURL timeout");
-	gettext("Default timeout for cURL, stated in milliseconds.\nOnly has an effect if compiled with cURL.");
-	gettext("cURL parallel limit");
-	gettext("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).\nOnly has an effect if compiled with cURL.");
-	gettext("cURL file download timeout");
-	gettext("Maximum time in ms a file download (e.g. a mod download) may take.");
-	gettext("High-precision FPU");
-	gettext("Makes DirectX work with LuaJIT. Disable if it causes troubles.");
-	gettext("Main menu script");
-	gettext("Replaces the default main menu with a custom one.");
-	gettext("Main menu game manager");
-	gettext("Main menu mod manager");
-	gettext("Engine profiling data print interval");
-	gettext("Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers.");
+	gettext("Chunk size");
+	gettext("Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes).");
+	gettext("Mapgen debug");
+	gettext("Dump the mapgen debug infos.");
+	gettext("Absolute limit of emerge queues");
+	gettext("Maximum number of blocks that can be queued for loading.");
+	gettext("Limit of emerge queues on disk");
+	gettext("Maximum number of blocks to be queued that are to be loaded from file.\nSet to blank for an appropriate amount to be chosen automatically.");
+	gettext("Limit of emerge queues to generate");
+	gettext("Maximum number of blocks to be queued that are to be generated.\nSet to blank for an appropriate amount to be chosen automatically.");
+	gettext("Number of emerge threads");
+	gettext("Number of emerge threads to use. Make this field blank, or increase this number\nto use multiple threads. On multiprocessor systems, this will improve mapgen speed greatly\nat the cost of slightly buggy caves.");
 }