Update minetest.conf.example, settings_translation_file.cpp

2 files changed, 30 insertions, 29 deletions

diff --git a/minetest.conf.example b/minetest.conf.example
index 5bc41a9a4..1c1796a14 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1371,7 +1371,7 @@
 # ask_reconnect_on_crash = false
 
 #    From how far clients know about objects, stated in mapblocks (16 nodes).
-#
+#    
 #    Setting this larger than active_block_range will also cause the server
 #    to maintain active objects up to this distance in the direction the
 #    player is looking. (This can avoid mobs suddenly disappearing from view)
@@ -1920,7 +1920,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    Second of two 3D noises that together define tunnels.
@@ -1933,7 +1933,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    3D noise defining giant caverns.
@@ -1946,7 +1946,7 @@
 #    octaves     = 5,
 #    persistence = 0.63,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    3D noise defining terrain.
@@ -1972,7 +1972,7 @@
 #    octaves     = 2,
 #    persistence = 0.8,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 ## Mapgen V6
@@ -2312,7 +2312,7 @@
 #    octaves     = 5,
 #    persistence = 0.63,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    3D noise defining structure of river canyon walls.
@@ -2325,7 +2325,7 @@
 #    octaves     = 4,
 #    persistence = 0.75,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    3D noise defining giant caverns.
@@ -2338,7 +2338,7 @@
 #    octaves     = 5,
 #    persistence = 0.63,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    First of two 3D noises that together define tunnels.
@@ -2351,7 +2351,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    Second of two 3D noises that together define tunnels.
@@ -2364,7 +2364,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    3D noise that determines number of dungeons per mapchunk.
@@ -2377,7 +2377,7 @@
 #    octaves     = 2,
 #    persistence = 0.8,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 ## Mapgen Carpathian
@@ -2620,7 +2620,7 @@
 #    octaves     = 5,
 #    persistence = 0.55,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    First of two 3D noises that together define tunnels.
@@ -2633,7 +2633,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    Second of two 3D noises that together define tunnels.
@@ -2646,7 +2646,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    3D noise defining giant caverns.
@@ -2659,7 +2659,7 @@
 #    octaves     = 5,
 #    persistence = 0.63,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    3D noise that determines number of dungeons per mapchunk.
@@ -2672,7 +2672,7 @@
 #    octaves     = 2,
 #    persistence = 0.8,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 ## Mapgen Flat
@@ -2782,7 +2782,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    Second of two 3D noises that together define tunnels.
@@ -2795,7 +2795,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    3D noise that determines number of dungeons per mapchunk.
@@ -2808,7 +2808,7 @@
 #    octaves     = 2,
 #    persistence = 0.8,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 ## Mapgen Fractal
@@ -2982,7 +2982,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    Second of two 3D noises that together define tunnels.
@@ -2995,7 +2995,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    3D noise that determines number of dungeons per mapchunk.
@@ -3008,7 +3008,7 @@
 #    octaves     = 2,
 #    persistence = 0.8,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 ## Mapgen Valleys
@@ -3098,7 +3098,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    Second of two 3D noises that together define tunnels.
@@ -3111,7 +3111,7 @@
 #    octaves     = 3,
 #    persistence = 0.5,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    The depth of dirt or other biome filler node.
@@ -3137,7 +3137,7 @@
 #    octaves     = 6,
 #    persistence = 0.63,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    Defines large-scale river channel structure.
@@ -3189,7 +3189,7 @@
 #    octaves     = 6,
 #    persistence = 0.8,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 #    Amplifies the valleys.
@@ -3228,7 +3228,7 @@
 #    octaves     = 2,
 #    persistence = 0.8,
 #    lacunarity  = 2.0,
-#    flags       =
+#    flags       = 
 # }
 
 ## Advanced
@@ -3292,3 +3292,4 @@
 #    so see a full list at https://content.minetest.net/help/content_flags/
 #    type: string
 # contentdb_flag_blacklist = nonfree, desktop_default
+
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index 0e38e5c73..9156580c0 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -286,8 +286,8 @@ fake_function() {
 	gettext("Open the pause menu when the window's focus is lost. Does not pause if a formspec is\nopen.");
 	gettext("Viewing range");
 	gettext("View distance in nodes.");
-	gettext("Near clipping plane");
-	gettext("Camera 'near clipping 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("Near plane");
+	gettext("Camera 'near clipping plane' distance in nodes, between 0 and 0.25\nOnly works on GLES platforms. Most 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");