From a157256706d5bf2c8f982ca971207765c2972405 Mon Sep 17 00:00:00 2001 From: "updatepo.sh" Date: Sat, 27 Nov 2021 19:41:45 +0100 Subject: [PATCH] Update minetest.conf.example and dummy cpp file --- minetest.conf.example | 93 ++++++++++++++++--------------- src/settings_translation_file.cpp | 54 ++++++++++-------- 2 files changed, 78 insertions(+), 69 deletions(-) diff --git a/minetest.conf.example b/minetest.conf.example index b252f4f70..3f4d01420 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -121,7 +121,7 @@ # joystick_id = 0 # The type of joystick -# type: enum values: auto, generic, xbox +# type: enum values: auto, generic, xbox, dragonrise_gamecube # joystick_type = auto # The time in seconds it takes between repeated events @@ -129,12 +129,12 @@ # type: float min: 0.001 # repeat_joystick_button_time = 0.17 -# The deadzone of the joystick +# The dead zone of the joystick # type: int # joystick_deadzone = 2048 # The sensitivity of the joystick axes for moving the -# ingame view frustum around. +# in-game view frustum around. # type: float # joystick_frustum_sensitivity = 170 @@ -503,7 +503,7 @@ ### Basic -# Whether nametag backgrounds should be shown by default. +# Whether name tag backgrounds should be shown by default. # Mods may still set a background. # type: bool # show_nametag_backgrounds = true @@ -551,7 +551,7 @@ ### Filtering -# Use mip mapping to scale textures. May slightly increase performance, +# Use mipmapping to scale textures. May slightly increase performance, # especially when using a high resolution texture pack. # Gamma correct downscaling is not supported. # type: bool @@ -580,7 +580,7 @@ # can be blurred, so automatically upscale them with nearest-neighbor # interpolation to preserve crisp pixels. This sets the minimum texture size # for the upscaled textures; higher values look sharper, but require more -# memory. Powers of 2 are recommended. This setting is ONLY applies if +# memory. Powers of 2 are recommended. This setting is ONLY applied if # bilinear/trilinear/anisotropic filtering is enabled. # This is also used as the base node texture size for world-aligned # texture autoscaling. @@ -679,7 +679,7 @@ # Texture size to render the shadow map on. # This must be a power of two. -# Bigger numbers create better shadowsbut it is also more expensive. +# Bigger numbers create better shadows but it is also more expensive. # type: int min: 128 max: 8192 # shadow_map_texture_size = 1024 @@ -689,37 +689,38 @@ # type: bool # shadow_map_texture_32bit = true -# Enable poisson disk filtering. -# On true uses poisson disk to make "soft shadows". Otherwise uses PCF filtering. +# Enable Poisson disk filtering. +# On true uses Poisson disk to make "soft shadows". Otherwise uses PCF filtering. # type: bool # shadow_poisson_filter = true -# Define shadow filtering quality -# This simulates the soft shadows effect by applying a PCF or poisson disk +# Define shadow filtering quality. +# This simulates the soft shadows effect by applying a PCF or Poisson disk # but also uses more resources. # type: enum values: 0, 1, 2 # shadow_filters = 1 -# Enable colored shadows. +# Enable colored shadows. # On true translucent nodes cast colored shadows. This is expensive. # type: bool # shadow_map_color = false -# Set the shadow update time. -# Lower value means shadows and map updates faster, but it consume more resources. -# Minimun value 0.001 seconds max value 0.2 seconds -# type: float min: 0.001 max: 0.2 -# shadow_update_time = 0.2 +# Spread a complete update of shadow map over given amount of frames. +# Higher values might make shadows laggy, lower values +# will consume more resources. +# Minimum value: 1; maximum value: 16 +# type: int min: 1 max: 16 +# shadow_update_frames = 8 # Set the soft shadow radius size. -# Lower values mean sharper shadows bigger values softer. -# Minimun value 1.0 and max value 10.0 +# Lower values mean sharper shadows, bigger values mean softer shadows. +# Minimum value: 1.0; maximum value: 10.0 # type: float min: 1 max: 10 # shadow_soft_radius = 1.0 -# Set the tilt of Sun/Moon orbit in degrees +# Set the tilt of Sun/Moon orbit in degrees. # Value of 0 means no tilt / vertical orbit. -# Minimun value 0.0 and max value 60.0 +# Minimum value: 0.0; maximum value: 60.0 # type: float min: 0 max: 60 # shadow_sky_body_orbit_tilt = 0.0 @@ -823,7 +824,7 @@ # Note: On Android, stick with OGLES1 if unsure! App may fail to start otherwise. # On other platforms, OpenGL is recommended. # Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental) -# type: enum values: null, software, burningsvideo, direct3d8, direct3d9, opengl, ogles1, ogles2 +# type: enum values: opengl, ogles1, ogles2 # video_driver = opengl # Radius of cloud area stated in number of 64 node cloud squares. @@ -900,7 +901,7 @@ # crosshair_color = (255,255,255) # Crosshair alpha (opaqueness, between 0 and 255). -# Also controls the object crosshair color +# This also applies to the object crosshair. # type: int min: 0 max: 255 # crosshair_alpha = 255 @@ -917,7 +918,7 @@ # type: float # hud_hotbar_max_width = 1.0 -# Modifies the size of the hudbar elements. +# Modifies the size of the HUD elements. # type: float # hud_scaling = 1.0 @@ -1108,7 +1109,7 @@ # screenshot_path = screenshots # Format of screenshots. -# type: enum values: png, jpg, bmp, pcx, ppm, tga +# type: enum values: png, jpg # screenshot_format = png # Screenshot quality. Only used for JPEG format. @@ -1123,6 +1124,10 @@ # type: int min: 1 # screen_dpi = 72 +# Adjust the detected display density, used for scaling UI elements. +# type: float +# display_density_factor = 1 + # Windows systems only: Start Minetest with the command line window in the background. # Contains the same information as the file debug.txt (default name). # type: bool @@ -1155,13 +1160,13 @@ # Client # -# If enabled, http links in chat can be middle-clicked or ctrl-left-clicked to open the link in the OS's default web browser. +# Clickable weblinks (middle-click or Ctrl+left-click) enabled in chat console output. # type: bool # clickable_chat_weblinks = false -# If clickable_chat_weblinks is enabled, specify the color (as 24-bit hexadecimal) of weblinks in chat. +# Optional override for chat weblink color. # type: string -# chat_weblink_color = #8888FF +# chat_weblink_color = ## Network @@ -1177,9 +1182,9 @@ # remote_port = 30000 # Prometheus listener address. -# If minetest is compiled with ENABLE_PROMETHEUS option enabled, +# If Minetest is compiled with ENABLE_PROMETHEUS option enabled, # enable metrics listener for Prometheus on that address. -# Metrics can be fetch on http://127.0.0.1:30000/metrics +# Metrics can be fetched on http://127.0.0.1:30000/metrics # type: string # prometheus_listener_address = 127.0.0.1:30000 @@ -1314,11 +1319,10 @@ # type: int # max_packets_per_iteration = 1024 -# ZLib compression level to use when sending mapblocks to the client. -# -1 - Zlib's default compression level -# 0 - no compresson, fastest +# Compression level to use when sending mapblocks to the client. +# -1 - use default compression level +# 0 - least compression, fastest # 9 - best compression, slowest -# (levels 1-3 use Zlib's "fast" method, 4-9 use the normal method) # type: int min: -1 max: 9 # map_compression_level_net = -1 @@ -1553,7 +1557,7 @@ # deprecated_lua_api_handling = log # Number of extra blocks that can be loaded by /clearobjects at once. -# This is a trade-off between sqlite transaction overhead and +# This is a trade-off between SQLite transaction overhead and # memory consumption (4096=100MB, as a rule of thumb). # type: int # max_clearobjects_extra_loaded_blocks = 4096 @@ -1571,13 +1575,12 @@ # type: enum values: 0, 1, 2 # sqlite_synchronous = 2 -# ZLib compression level to use when saving mapblocks to disk. -# -1 - Zlib's default compression level -# 0 - no compresson, fastest +# Compression level to use when saving mapblocks to disk. +# -1 - use default compression level +# 0 - least compression, fastest # 9 - best compression, slowest -# (levels 1-3 use Zlib's "fast" method, 4-9 use the normal method) # type: int min: -1 max: 9 -# map_compression_level_disk = 3 +# map_compression_level_disk = -1 # Length of a server tick and the interval at which objects are generally updated over # network. @@ -1705,7 +1708,7 @@ # type: bool # instrument.lbm = true -# Instrument chatcommands on registration. +# Instrument chat commands on registration. # type: bool # instrument.chatcommand = true @@ -1824,7 +1827,7 @@ # 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. +# and jungle grass, in all other mapgens this flag controls all decorations. # type: flags possible values: caves, dungeons, light, decorations, biomes, ores, nocaves, nodungeons, nolight, nodecorations, nobiomes, noores # mg_flags = caves,dungeons,light,decorations,biomes,ores @@ -3405,17 +3408,17 @@ # enable_mapgen_debug_info = false # Maximum number of blocks that can be queued for loading. -# type: int +# type: int min: 1 max: 1000000 # emergequeue_limit_total = 1024 # Maximum number of blocks to be queued that are to be loaded from file. # This limit is enforced per player. -# type: int +# type: int min: 1 max: 1000000 # emergequeue_limit_diskonly = 128 # Maximum number of blocks to be queued that are to be generated. # This limit is enforced per player. -# type: int +# type: int min: 1 max: 1000000 # emergequeue_limit_generate = 128 # Number of emerge threads to use. diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index 49591d1ee..ad2093382 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -54,10 +54,10 @@ fake_function() { gettext("The type of joystick"); gettext("Joystick button repetition interval"); gettext("The time in seconds it takes between repeated events\nwhen holding down a joystick button combination."); - gettext("Joystick deadzone"); - gettext("The deadzone of the joystick"); + gettext("Joystick dead zone"); + gettext("The dead zone of the joystick"); gettext("Joystick frustum sensitivity"); - gettext("The sensitivity of the joystick axes for moving the\ningame view frustum around."); + gettext("The sensitivity of the joystick axes for moving the\nin-game 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"); @@ -203,8 +203,8 @@ fake_function() { gettext("Graphics"); gettext("In-Game"); gettext("Basic"); - gettext("Show nametag backgrounds by default"); - gettext("Whether nametag backgrounds should be shown by default.\nMods may still set a background."); + gettext("Show name tag backgrounds by default"); + gettext("Whether name tag backgrounds should be shown by default.\nMods may still set a background."); gettext("VBO"); gettext("Enable vertex buffer objects.\nThis should greatly improve graphics performance."); gettext("Fog"); @@ -225,7 +225,7 @@ fake_function() { gettext("Adds particles when digging a node."); gettext("Filtering"); gettext("Mipmapping"); - gettext("Use mip mapping to scale textures. May slightly increase performance,\nespecially when using a high resolution texture pack.\nGamma correct downscaling is not supported."); + gettext("Use mipmapping to scale textures. May slightly increase performance,\nespecially when using a high resolution texture pack.\nGamma correct downscaling is not supported."); gettext("Anisotropic filtering"); gettext("Use anisotropic filtering when viewing at textures from an angle."); gettext("Bilinear filtering"); @@ -235,7 +235,7 @@ fake_function() { gettext("Clean transparent textures"); gettext("Filtered textures can blend RGB values with fully-transparent neighbors,\nwhich PNG optimizers usually discard, often resulting in dark or\nlight edges to transparent textures. Apply a filter to clean that up\nat texture load time. This is automatically enabled if mipmapping is enabled."); gettext("Minimum texture size"); - gettext("When using bilinear/trilinear/anisotropic filters, low-resolution textures\ncan be blurred, so automatically upscale them with nearest-neighbor\ninterpolation to preserve crisp pixels. This sets the minimum texture size\nfor the upscaled textures; higher values look sharper, but require more\nmemory. Powers of 2 are recommended. This setting is ONLY applies if\nbilinear/trilinear/anisotropic filtering is enabled.\nThis is also used as the base node texture size for world-aligned\ntexture autoscaling."); + gettext("When using bilinear/trilinear/anisotropic filters, low-resolution textures\ncan be blurred, so automatically upscale them with nearest-neighbor\ninterpolation to preserve crisp pixels. This sets the minimum texture size\nfor the upscaled textures; higher values look sharper, but require more\nmemory. Powers of 2 are recommended. This setting is ONLY applied if\nbilinear/trilinear/anisotropic filtering is enabled.\nThis is also used as the base node texture size for world-aligned\ntexture autoscaling."); gettext("FSAA"); gettext("Use multi-sample antialiasing (MSAA) to smooth out block edges.\nThis algorithm smooths out the 3D viewport while keeping the image sharp,\nbut it doesn't affect the insides of textures\n(which is especially noticeable with transparent textures).\nVisible spaces appear between nodes when shaders are disabled.\nIf set to 0, MSAA is disabled.\nA restart is required after changing this option."); gettext("Undersampling"); @@ -269,21 +269,21 @@ fake_function() { gettext("Shadow map max distance in nodes to render shadows"); gettext("Maximum distance to render shadows."); gettext("Shadow map texture size"); - gettext("Texture size to render the shadow map on.\nThis must be a power of two.\nBigger numbers create better shadowsbut it is also more expensive."); + gettext("Texture size to render the shadow map on.\nThis must be a power of two.\nBigger numbers create better shadows but it is also more expensive."); gettext("Shadow map texture in 32 bits"); gettext("Sets shadow texture quality to 32 bits.\nOn false, 16 bits texture will be used.\nThis can cause much more artifacts in the shadow."); gettext("Poisson filtering"); - gettext("Enable poisson disk filtering.\nOn true uses poisson disk to make \"soft shadows\". Otherwise uses PCF filtering."); + gettext("Enable Poisson disk filtering.\nOn true uses Poisson disk to make \"soft shadows\". Otherwise uses PCF filtering."); gettext("Shadow filter quality"); - gettext("Define shadow filtering quality\nThis simulates the soft shadows effect by applying a PCF or poisson disk\nbut also uses more resources."); + gettext("Define shadow filtering quality.\nThis simulates the soft shadows effect by applying a PCF or Poisson disk\nbut also uses more resources."); gettext("Colored shadows"); - gettext("Enable colored shadows. \nOn true translucent nodes cast colored shadows. This is expensive."); - gettext("Map update time"); - gettext("Set the shadow update time.\nLower value means shadows and map updates faster, but it consume more resources.\nMinimun value 0.001 seconds max value 0.2 seconds"); + gettext("Enable colored shadows.\nOn true translucent nodes cast colored shadows. This is expensive."); + gettext("Map shadows update frames"); + gettext("Spread a complete update of shadow map over given amount of frames.\nHigher values might make shadows laggy, lower values\nwill consume more resources.\nMinimum value: 1; maximum value: 16"); gettext("Soft shadow radius"); - gettext("Set the soft shadow radius size.\nLower values mean sharper shadows bigger values softer.\nMinimun value 1.0 and max value 10.0"); + gettext("Set the soft shadow radius size.\nLower values mean sharper shadows, bigger values mean softer shadows.\nMinimum value: 1.0; maximum value: 10.0"); gettext("Sky Body Orbit Tilt"); - gettext("Set the tilt of Sun/Moon orbit in degrees\nValue of 0 means no tilt / vertical orbit.\nMinimun value 0.0 and max value 60.0"); + gettext("Set the tilt of Sun/Moon orbit in degrees.\nValue of 0 means no tilt / vertical orbit.\nMinimum value: 0.0; maximum value: 60.0"); gettext("Advanced"); gettext("Arm inertia"); gettext("Arm inertia, gives a more realistic movement of\nthe arm when the camera moves."); @@ -356,7 +356,7 @@ fake_function() { gettext("Crosshair color"); gettext("Crosshair color (R,G,B).\nAlso controls the object crosshair color"); gettext("Crosshair alpha"); - gettext("Crosshair alpha (opaqueness, between 0 and 255).\nAlso controls the object crosshair color"); + gettext("Crosshair alpha (opaqueness, between 0 and 255).\nThis also applies to the object crosshair."); gettext("Recent Chat Messages"); gettext("Maximum number of recent chat messages to show"); gettext("Desynchronize block animation"); @@ -364,7 +364,7 @@ fake_function() { gettext("Maximum hotbar width"); gettext("Maximum proportion of current window to be used for hotbar.\nUseful if there's something to be displayed right or left of hotbar."); gettext("HUD scale factor"); - gettext("Modifies the size of the hudbar elements."); + gettext("Modifies the size of the HUD elements."); gettext("Mesh cache"); gettext("Enables caching of facedir rotated meshes."); gettext("Mapblock mesh generation delay"); @@ -441,6 +441,8 @@ fake_function() { gettext("Advanced"); gettext("DPI"); gettext("Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k screens."); + gettext("Display Density Scaling Factor"); + gettext("Adjust the detected display density, used for scaling UI elements."); gettext("Enable console window"); gettext("Windows systems only: Start Minetest with the command line window in the background.\nContains the same information as the file debug.txt (default name)."); gettext("Sound"); @@ -451,13 +453,17 @@ fake_function() { gettext("Mute sound"); gettext("Whether to mute sounds. You can unmute sounds at any time, unless the\nsound system is disabled (enable_sound=false).\nIn-game, you can toggle the mute state with the mute key or by using the\npause menu."); gettext("Client"); + gettext("Chat weblinks"); + gettext("Clickable weblinks (middle-click or Ctrl+left-click) enabled in chat console output."); + gettext("Weblink color"); + gettext("Optional override for chat weblink color."); 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("Prometheus listener address"); - gettext("Prometheus listener address.\nIf minetest is compiled with ENABLE_PROMETHEUS option enabled,\nenable metrics listener for Prometheus on that address.\nMetrics can be fetch on http://127.0.0.1:30000/metrics"); + gettext("Prometheus listener address.\nIf Minetest is compiled with ENABLE_PROMETHEUS option enabled,\nenable metrics listener for Prometheus on that address.\nMetrics can be fetched on http://127.0.0.1:30000/metrics"); gettext("Saving map received from server"); gettext("Save the map received by the client on disk."); gettext("Connect to external media server"); @@ -513,7 +519,7 @@ fake_function() { 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."); gettext("Map Compression Level for Network Transfer"); - gettext("ZLib compression level to use when sending mapblocks to the client.\n-1 - Zlib's default compression level\n0 - no compresson, fastest\n9 - best compression, slowest\n(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"); + gettext("Compression level to use when sending mapblocks to the client.\n-1 - use default compression level\n0 - least compression, fastest\n9 - best compression, slowest"); gettext("Game"); gettext("Default game"); gettext("Default game when creating a new world.\nThis will be overridden when creating a world from the main menu."); @@ -616,7 +622,7 @@ fake_function() { gettext("Deprecated Lua API handling"); gettext("Handling for deprecated Lua API calls:\n- none: Do not log deprecated calls\n- log: mimic and log backtrace of deprecated call (default).\n- error: abort on usage of deprecated call (suggested for mod 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("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("Maximum objects per block"); @@ -624,7 +630,7 @@ fake_function() { gettext("Synchronous SQLite"); gettext("See https://www.sqlite.org/pragma.html#pragma_synchronous"); gettext("Map Compression Level for Disk Storage"); - gettext("ZLib compression level to use when saving mapblocks to disk.\n-1 - Zlib's default compression level\n0 - no compresson, fastest\n9 - best compression, slowest\n(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"); + gettext("Compression level to use when saving mapblocks to disk.\n-1 - use default compression level\n0 - least compression, fastest\n9 - best compression, slowest"); gettext("Dedicated server step"); gettext("Length of a server tick and the interval at which objects are generally updated over\nnetwork."); gettext("Active block management interval"); @@ -673,8 +679,8 @@ fake_function() { 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("Chat commands"); + gettext("Instrument chat commands on registration."); gettext("Global callbacks"); gettext("Instrument global callback functions on registration.\n(anything you pass to a minetest.register_*() function)"); gettext("Advanced"); @@ -716,7 +722,7 @@ fake_function() { gettext("Map generation limit"); 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."); + gettext("Global map generation attributes.\nIn Mapgen v6 the 'decorations' flag controls all decorations except trees\nand jungle grass, in all other mapgens this flag controls all decorations."); gettext("Biome API temperature and humidity noise parameters"); gettext("Heat noise"); gettext("Temperature variation for biomes.");