Update minetest.conf.example, and settings_translation_file.cpp

diff --git a/minetest.conf.example b/minetest.conf.example
index bc0d4c5274935fd5a45a5886e2fb4bda3314df7f..704501f364092d10072d8608e3050452197b623c 100644 (file)
--- 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 f7e14dd65f3b0013de1b7fb5d6425e60dbf606b7..78d1c799f75213c15bc0ecd066f250118b8ade3c 100644 (file)
--- 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");