Make advanced settings noiseparams strings translatable (#8062)

Various minor language improvements in settingtypes.txt.

5 files changed, 35 insertions, 28 deletions

diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua
index 968b1fc74..c701f094e 100644
--- a/builtin/mainmenu/dlg_create_world.lua
+++ b/builtin/mainmenu/dlg_create_world.lua
@@ -90,7 +90,7 @@ local function create_world_formspec(dialogdata)
 	elseif #pkgmgr.games == 1 and pkgmgr.games[1].id == "minimal" then
 		retval = retval .. "box[1.75,4;8.7,1;#ff8800]label[2,4;" ..
 				fgettext("Warning: The minimal development test is meant for developers.") .. "]label[2,4.4;" ..
-				fgettext("Download a game, such as minetest_game, from minetest.net") .. "]"
+				fgettext("Download a game, such as Minetest Game, from minetest.net") .. "]"
 	end
 
 	return retval
diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua
index ea0134580..cbeb6fee2 100644
--- a/builtin/mainmenu/dlg_settings_advanced.lua
+++ b/builtin/mainmenu/dlg_settings_advanced.lua
@@ -599,25 +599,26 @@ local function create_change_setting_formspec(dialogdata)
 		end
 		-- First row
 		height = height + 0.3
-		add_field(0.3, "te_offset", "Offset", t[1])
-		add_field(3.6, "te_scale",  "Scale",  t[2])
-		add_field(6.9, "te_seed",   "Seed",   t[6])
+		add_field(0.3, "te_offset", fgettext("Offset"), t[1])
+		add_field(3.6, "te_scale",  fgettext("Scale"),  t[2])
+		add_field(6.9, "te_seed",   fgettext("Seed"),   t[6])
 		height = height + 1.1
 
 		-- Second row
-		add_field(0.3, "te_spreadx", "X spread", t[3])
+		add_field(0.3, "te_spreadx", fgettext("X spread"), t[3])
 		if dimension == 3 then
-			add_field(3.6, "te_spready", "Y spread", t[4])
+			add_field(3.6, "te_spready", fgettext("Y spread"), t[4])
 		else
-			fields[#fields + 1] = "label[4," .. height - 0.2 .. ";2D Noise]"
+			fields[#fields + 1] = "label[4," .. height - 0.2 .. ";" ..
+					fgettext("2D Noise") .. "]"
 		end
-		add_field(6.9, "te_spreadz", "Z spread", t[5])
+		add_field(6.9, "te_spreadz", fgettext("Z spread"), t[5])
 		height = height + 1.1
 
 		-- Third row
-		add_field(0.3, "te_octaves", "Octaves",     t[7])
-		add_field(3.6, "te_persist", "Persistance", t[8])
-		add_field(6.9, "te_lacun",   "Lacunarity",  t[9])
+		add_field(0.3, "te_octaves", fgettext("Octaves"),     t[7])
+		add_field(3.6, "te_persist", fgettext("Persistance"), t[8])
+		add_field(6.9, "te_lacun",   fgettext("Lacunarity"),  t[9])
 		height = height + 1.1
 
 
@@ -634,11 +635,14 @@ local function create_change_setting_formspec(dialogdata)
 		end
 		-- Flags
 		formspec = table.concat(fields)
-				.. "checkbox[0.5," .. height - 0.6 .. ";cb_defaults;defaults;" -- defaults
+				.. "checkbox[0.5," .. height - 0.6 .. ";cb_defaults;"
+				.. fgettext("defaults") .. ";" -- defaults
 				.. tostring(flags["defaults"] == true) .. "]" -- to get false if nil
-				.. "checkbox[5," .. height - 0.6 .. ";cb_eased;eased;" -- eased
+				.. "checkbox[5," .. height - 0.6 .. ";cb_eased;"
+				.. fgettext("eased") .. ";" -- eased
 				.. tostring(flags["eased"] == true) .. "]"
-				.. "checkbox[5," .. height - 0.15 .. ";cb_absvalue;absvalue;" -- absvalue
+				.. "checkbox[5," .. height - 0.15 .. ";cb_absvalue;"
+				.. fgettext("absvalue") .. ";" -- absvalue
 				.. tostring(flags["absvalue"] == true) .. "]"
 		height = height + 1
 
@@ -651,11 +655,14 @@ local function create_change_setting_formspec(dialogdata)
 
 		height = height + 0.3
 		formspec = formspec
-				.. "field[0.3," .. height .. ";3.3,1;te_x;X;" -- X
+				.. "field[0.3," .. height .. ";3.3,1;te_x;"
+				.. fgettext("X") .. ";" -- X
 				.. core.formspec_escape(v3f[1] or "") .. "]"
-				.. "field[3.6," .. height .. ";3.3,1;te_y;Y;" -- Y
+				.. "field[3.6," .. height .. ";3.3,1;te_y;"
+				.. fgettext("Y") .. ";" -- Y
 				.. core.formspec_escape(v3f[2] or "") .. "]"
-				.. "field[6.9," .. height .. ";3.3,1;te_z;Z;" -- Z
+				.. "field[6.9," .. height .. ";3.3,1;te_z;"
+				.. fgettext("Z") .. ";" -- Z
 				.. core.formspec_escape(v3f[3] or "") .. "]"
 		height = height + 1.1
 
diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua
index 171ba54ea..7863f1ca1 100644
--- a/builtin/mainmenu/pkgmgr.lua
+++ b/builtin/mainmenu/pkgmgr.lua
@@ -564,7 +564,7 @@ function pkgmgr.preparemodlist(data)
 		retval[#retval + 1] = {
 			type = "game",
 			is_game_content = true,
-			name = fgettext(gamespec.name .. " mods"),
+			name = fgettext("$1 mods", gamespec.name),
 			path = gamespec.path
 		}
 	end
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 7e8854cae..40c249e71 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -1307,7 +1307,7 @@ curl_file_download_timeout (cURL file download timeout) int 300000
 high_precision_fpu (High-precision FPU) bool true
 
 #    Changes the main menu UI:
-#    -   Full:  Multple singleplayer worlds, game choice, texture pack chooser, etc.
+#    -   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, etc.
 #    -   Simple: One singleplayer world, no game or texture pack choosers. May be
 #                necessary for smaller screens.
 main_menu_style (Main menu style) enum full full,simple
@@ -1626,13 +1626,13 @@ mgcarpathian_np_height3 (Hilliness3 noise) noise_params_2d 0, 5, (509, 509, 509)
 #    Fourth of 4 2D noises that together define hill/mountain range height.
 mgcarpathian_np_height4 (Hilliness4 noise) noise_params_2d 0, 5, (631, 631, 631), 1583, 5, 0.5, 2.0, eased
 
-#    2D noise that controls the size/occurance of rolling hills.
+#    2D noise that controls the size/occurrence of rolling hills.
 mgcarpathian_np_hills_terrain (Rolling hills spread noise) noise_params_2d 1, 1, (1301, 1301, 1301), 1692, 3, 0.5, 2.0, eased
 
-#    2D noise that controls the size/occurance of ridged mountain ranges.
+#    2D noise that controls the size/occurrence of ridged mountain ranges.
 mgcarpathian_np_ridge_terrain (Ridge mountain spread noise) noise_params_2d 1, 1, (1889, 1889, 1889), 3568, 3, 0.5, 2.0, eased
 
-#    2D noise that controls the size/occurance of step mountain ranges.
+#    2D noise that controls the size/occurrence of step mountain ranges.
 mgcarpathian_np_step_terrain (Step mountain spread noise) noise_params_2d 1, 1, (1889, 1889, 1889), 4157, 3, 0.5, 2.0, eased
 
 #    2D noise that controls the shape/size of rolling hills.
@@ -1825,7 +1825,7 @@ mgfractal_np_cave2 (Cave2 noise) noise_params_3d 0, 12, (67, 67, 67), 10325, 3,
 
 #    Map generation attributes specific to Mapgen Valleys.
 #    'altitude_chill': Reduces heat with altitude.
-#    'humid_rivers': Increases humidity around rivers and where water pools.
+#    'humid_rivers': Increases humidity around rivers.
 #    'vary_river_depth': If enabled, low humidity and high heat causes rivers
 #    to become shallower and occasionally dry.
 #    'altitude_dry': Reduces humidity with altitude.
diff --git a/minetest.conf.example b/minetest.conf.example
index 773100759..6c9177c10 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1602,7 +1602,7 @@
 # high_precision_fpu = true
 
 #    Changes the main menu UI:
-#    -   Full:  Multple singleplayer worlds, game choice, texture pack chooser, etc.
+#    -   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, etc.
 #    -   Simple: One singleplayer world, no game or texture pack choosers. May be
 #    necessary for smaller screens.
 #    -   Auto: Simple on Android, full on everything else.
@@ -2382,7 +2382,7 @@
 #    flags       = eased
 # }
 
-#    2D noise that controls the size/occurance of rolling hills.
+#    2D noise that controls the size/occurrence of rolling hills.
 #    type: noise_params_2d
 # mgcarpathian_np_hills_terrain = {
 #    offset      = 1,
@@ -2395,7 +2395,7 @@
 #    flags       = eased
 # }
 
-#    2D noise that controls the size/occurance of ridged mountain ranges.
+#    2D noise that controls the size/occurrence of ridged mountain ranges.
 #    type: noise_params_2d
 # mgcarpathian_np_ridge_terrain = {
 #    offset      = 1,
@@ -2408,7 +2408,7 @@
 #    flags       = eased
 # }
 
-#    2D noise that controls the size/occurance of step mountain ranges.
+#    2D noise that controls the size/occurrence of step mountain ranges.
 #    type: noise_params_2d
 # mgcarpathian_np_step_terrain = {
 #    offset      = 1,
@@ -2786,7 +2786,7 @@
 
 #    Map generation attributes specific to Mapgen Valleys.
 #    'altitude_chill': Reduces heat with altitude.
-#    'humid_rivers': Increases humidity around rivers and where water pools.
+#    'humid_rivers': Increases humidity around rivers.
 #    'vary_river_depth': If enabled, low humidity and high heat causes rivers
 #    to become shallower and occasionally dry.
 #    'altitude_dry': Reduces humidity with altitude.