diff --git a/builtin/mainmenu/settings/dlg_settings.lua b/builtin/mainmenu/settings/dlg_settings.lua index 19055455e985..f54edabb5dda 100644 --- a/builtin/mainmenu/settings/dlg_settings.lua +++ b/builtin/mainmenu/settings/dlg_settings.lua @@ -48,13 +48,13 @@ end local change_keys = { - query_text = "Change keys", + query_text = "Change Keys", requires = { keyboard_mouse = true, }, get_formspec = function(self, avail_w) local btn_w = math.min(avail_w, 3) - return ("button[0,0;%f,0.8;btn_change_keys;%s]"):format(btn_w, fgettext("Change keys")), 0.8 + return ("button[0,0;%f,0.8;btn_change_keys;%s]"):format(btn_w, fgettext("Change Keys")), 0.8 end, on_submit = function(self, fields) if fields.btn_change_keys then diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 80f1565bf061..56a9a3111e61 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -263,13 +263,13 @@ performance_tradeoffs (Tradeoffs for performance) bool false # Adds particles when digging a node. enable_particles (Digging particles) bool true -[**3d] +[**3D] # 3D support. # Currently supported: # - none: no 3d output. # - anaglyph: cyan/magenta color 3d. -# - interlaced: odd/even line based polarisation screen support. +# - interlaced: odd/even line based polarization screen support. # - topbottom: split screen top/bottom. # - sidebyside: split screen side by side. # - crossview: Cross-eyed 3d @@ -371,7 +371,7 @@ fog_start (Fog start) float 0.4 0.0 0.99 [**Clouds] -# Clouds are a client side effect. +# Clouds are a client-side effect. enable_clouds (Clouds) bool true # Use 3D cloud look instead of flat. @@ -382,7 +382,7 @@ enable_3d_clouds (3D clouds) bool true [**Filtering and Antialiasing] # Use mipmaps when scaling textures down. May slightly increase performance, -# especially when using a high resolution texture pack. +# especially when using a high-resolution texture pack. # Gamma-correct downscaling is not supported. mip_map (Mipmapping) bool false @@ -415,7 +415,7 @@ anisotropic_filter (Anisotropic filtering) bool false # the aliasing effects. This is the slowest and the most accurate method. antialiasing (Antialiasing method) enum none none,fsaa,fxaa,ssaa -# Defines size of the sampling grid for FSAA and SSAA antializasing methods. +# Defines the size of the sampling grid for FSAA and SSAA antialiasing methods. # Value of 2 means taking 2x2 = 4 samples. fsaa (Anti-aliasing scale) enum 2 2,4,8,16 @@ -533,7 +533,7 @@ shadow_filters (Shadow filter quality) enum 1 0,1,2 # Requires: shaders, enable_dynamic_shadows, opengl shadow_map_color (Colored shadows) bool false -# Spread a complete update of shadow map over given amount of frames. +# Spread a complete update of shadow map over given number of frames. # Higher values might make shadows laggy, lower values # will consume more resources. # Minimum value: 1; maximum value: 16 @@ -635,7 +635,7 @@ mute_sound (Mute sound) bool false # A restart is required after changing this. language (Language) enum ,be,bg,ca,cs,da,de,el,en,eo,es,et,eu,fi,fr,gd,gl,hu,id,it,ja,jbo,kk,ko,lt,lv,ms,nb,nl,nn,pl,pt,pt_BR,ro,ru,sk,sl,sr_Cyrl,sr_Latn,sv,sw,tr,uk,vi,zh_CN,zh_TW -[**GUIs] +[**GUI] # Scale GUI by a user specified value. # Use a nearest-neighbor-anti-alias filter to scale the GUI. @@ -780,7 +780,7 @@ motd (Message of the day) string max_users (Maximum users) int 15 0 65535 # If this is set, players will always (re)spawn at the given position. -static_spawnpoint (Static spawnpoint) string +static_spawnpoint (Static spawn point) string [**Networking] @@ -845,7 +845,7 @@ csm_restriction_flags (Client side modding restrictions) int 62 0 63 # If the CSM restriction for node range is enabled, get_node calls are limited # to this distance from the player to the node. -csm_restriction_noderange (Client side node lookup range restriction) int 0 0 4294967295 +csm_restriction_noderange (Client-side node lookup range restriction) int 0 0 4294967295 [**Chat] @@ -856,7 +856,7 @@ strip_color_codes (Strip color codes) bool false # Set the maximum length of a chat message (in characters) sent by clients. chat_message_max_size (Chat message max length) int 500 10 65535 -# Amount of messages a player may send per 10 seconds. +# Number of messages a player may send per 10 seconds. chat_message_limit_per_10sec (Chat message count limit) float 8.0 1.0 # Kick players who sent more than X messages per 10 seconds. @@ -953,7 +953,7 @@ mapgen_limit (Map generation limit) int 31007 0 31007 # and jungle grass, in all other mapgens this flag controls all decorations. mg_flags (Mapgen flags) flags caves,dungeons,light,decorations,biomes,ores caves,dungeons,light,decorations,biomes,ores,nocaves,nodungeons,nolight,nodecorations,nobiomes,noores -[*Biome API noise parameters] +[*Biome API] # Temperature variation for biomes. mg_biome_np_heat (Heat noise) noise_params_2d 50, 50, (1000, 1000, 1000), 5349, 3, 0.5, 2.0, eased @@ -1136,7 +1136,7 @@ mgv7_floatland_density (Floatland density) float -0.6 # to above 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (the start of the # upper tapering). # ***WARNING, POTENTIAL DANGER TO WORLDS AND SERVER PERFORMANCE***: -# When enabling water placement the floatlands must be configured and tested +# When enabling water placement, floatlands must be configured and tested # to be a solid layer by setting 'mgv7_floatland_density' to 2.0 (or other # required value depending on 'mgv7_np_floatland'), to avoid # server-intensive extreme water flow and to avoid vast flooding of the @@ -1563,7 +1563,7 @@ mgfractal_np_dungeons (Dungeon noise) noise_params_3d 0.9, 0.5, (500, 500, 500), mgvalleys_spflags (Mapgen Valleys specific flags) flags altitude_chill,humid_rivers,vary_river_depth,altitude_dry altitude_chill,humid_rivers,vary_river_depth,altitude_dry,noaltitude_chill,nohumid_rivers,novary_river_depth,noaltitude_dry # The vertical distance over which heat drops by 20 if 'altitude_chill' is -# enabled. Also the vertical distance over which humidity drops by 10 if +# enabled. Also, the vertical distance over which humidity drops by 10 if # 'altitude_dry' is enabled. mgvalleys_altitude_chill (Altitude chill) int 90 0 65535 @@ -1619,7 +1619,7 @@ mgvalleys_np_cave1 (Cave noise #1) noise_params_3d 0, 12, (61, 61, 61), 52534, 3 # Second of two 3D noises that together define tunnels. mgvalleys_np_cave2 (Cave noise #2) noise_params_3d 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0 -# The depth of dirt or other biome filler node. +# Variation of biome filler depth. mgvalleys_np_filler_depth (Filler depth) noise_params_2d 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0, eased # 3D noise defining giant caverns. @@ -1716,7 +1716,7 @@ profiler.load (Load the game profiler) bool false # when calling `/profiler save [format]` without format. profiler.default_report_format (Default report format) enum txt txt,csv,lua,json,json_pretty -# The file path relative to your worldpath in which profiles will be saved to. +# The file path relative to your world path in which profiles will be saved to. profiler.report_path (Report path) string # Instrument the methods of entities on registration. @@ -1745,7 +1745,7 @@ instrument.builtin (Builtin) bool false # * Instrument the sampler being used to update the statistics. instrument.profiler (Profiler) bool false -[**Engine profiler] +[**Engine Profiler] # Print the engine's profiling data in regular intervals (in seconds). # 0 = disable. Useful for developers. @@ -1919,9 +1919,9 @@ lighting_boost_spread (Light curve boost spread) float 0.2 0.0 0.4 # Metrics can be fetched on http://127.0.0.1:30000/metrics prometheus_listener_address (Prometheus listener address) string 127.0.0.1:30000 -# Maximum size of the out chat queue. +# Maximum size of the outgoing chat queue. # 0 to disable queueing and -1 to make the queue size unlimited. -max_out_chat_queue_size (Maximum size of the out chat queue) int 20 -1 32767 +max_out_chat_queue_size (Maximum size of the outgoing chat queue) int 20 -1 32767 # Timeout for client to remove unused map data from memory, in seconds. client_unload_unused_data_timeout (Mapblock unload timeout) float 600.0 0.0 @@ -2054,16 +2054,16 @@ liquid_update (Liquid update tick) float 1.0 0.001 # Stated in mapblocks (16 nodes). block_send_optimize_distance (Block send optimize distance) int 4 2 32767 -# If enabled the server will perform map block occlusion culling based on +# If enabled, the server will perform map block occlusion culling based on # on the eye position of the player. This can reduce the number of blocks -# sent to the client 50-80%. The client will not longer receive most invisible -# so that the utility of noclip mode is reduced. -server_side_occlusion_culling (Server side occlusion culling) bool true +# sent to the client by 50-80%. Clients will no longer receive most +# invisible blocks, so that the utility of noclip mode is reduced. +server_side_occlusion_culling (Server-side occlusion culling) bool true [**Mapgen] # Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes). -# WARNING!: There is no benefit, and there are several dangers, in +# WARNING: There is no benefit, and there are several dangers, in # increasing this value above 5. # Reducing this value increases cave and dungeon density. # Altering this value is for special usage, leaving it unchanged is @@ -2111,7 +2111,7 @@ curl_parallel_limit (cURL parallel limit) int 8 1 2147483647 # Maximum time a file download (e.g. a mod download) may take, stated in milliseconds. curl_file_download_timeout (cURL file download timeout) int 300000 5000 2147483647 -[**Misc] +[**Miscellaneous] # Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k screens. screen_dpi (DPI) int 72 1 diff --git a/src/client/keycode.cpp b/src/client/keycode.cpp index 85851cc9c9db..1fcd15e01bfa 100644 --- a/src/client/keycode.cpp +++ b/src/client/keycode.cpp @@ -99,29 +99,31 @@ static const struct table_key table[] = { // Keys without a Char DEFINEKEY1(KEY_LBUTTON, N_("Left Button")) DEFINEKEY1(KEY_RBUTTON, N_("Right Button")) - DEFINEKEY1(KEY_CANCEL, N_("Cancel")) + //~ Usually paired with the Pause key + DEFINEKEY1(KEY_CANCEL, N_("Break Key")) DEFINEKEY1(KEY_MBUTTON, N_("Middle Button")) DEFINEKEY1(KEY_XBUTTON1, N_("X Button 1")) DEFINEKEY1(KEY_XBUTTON2, N_("X Button 2")) DEFINEKEY1(KEY_BACK, N_("Backspace")) DEFINEKEY1(KEY_TAB, N_("Tab")) - DEFINEKEY1(KEY_CLEAR, N_("Clear")) - DEFINEKEY1(KEY_RETURN, N_("Return")) - DEFINEKEY1(KEY_SHIFT, N_("Shift")) - DEFINEKEY1(KEY_CONTROL, N_("Control")) + DEFINEKEY1(KEY_CLEAR, N_("Clear Key")) + DEFINEKEY1(KEY_RETURN, N_("Return Key")) + DEFINEKEY1(KEY_SHIFT, N_("Shift Key")) + DEFINEKEY1(KEY_CONTROL, N_("Control Key")) //~ Key name, common on Windows keyboards - DEFINEKEY1(KEY_MENU, N_("Menu")) - DEFINEKEY1(KEY_PAUSE, N_("Pause")) + DEFINEKEY1(KEY_MENU, N_("Menu Key")) + //~ Usually paired with the Break key + DEFINEKEY1(KEY_PAUSE, N_("Pause Key")) DEFINEKEY1(KEY_CAPITAL, N_("Caps Lock")) DEFINEKEY1(KEY_SPACE, N_("Space")) - DEFINEKEY1(KEY_PRIOR, N_("Page up")) - DEFINEKEY1(KEY_NEXT, N_("Page down")) + DEFINEKEY1(KEY_PRIOR, N_("Page Up")) + DEFINEKEY1(KEY_NEXT, N_("Page Down")) DEFINEKEY1(KEY_END, N_("End")) DEFINEKEY1(KEY_HOME, N_("Home")) - DEFINEKEY1(KEY_LEFT, N_("Left")) - DEFINEKEY1(KEY_UP, N_("Up")) - DEFINEKEY1(KEY_RIGHT, N_("Right")) - DEFINEKEY1(KEY_DOWN, N_("Down")) + DEFINEKEY1(KEY_LEFT, N_("Left Arrow")) + DEFINEKEY1(KEY_UP, N_("Up Arrow")) + DEFINEKEY1(KEY_RIGHT, N_("Right Arrow")) + DEFINEKEY1(KEY_DOWN, N_("Down Arrow")) //~ Key name DEFINEKEY1(KEY_SELECT, N_("Select")) //~ "Print screen" key @@ -129,7 +131,7 @@ static const struct table_key table[] = { DEFINEKEY1(KEY_EXECUT, N_("Execute")) DEFINEKEY1(KEY_SNAPSHOT, N_("Snapshot")) DEFINEKEY1(KEY_INSERT, N_("Insert")) - DEFINEKEY1(KEY_DELETE, N_("Delete")) + DEFINEKEY1(KEY_DELETE, N_("Delete Key")) DEFINEKEY1(KEY_HELP, N_("Help")) DEFINEKEY1(KEY_LWIN, N_("Left Windows")) DEFINEKEY1(KEY_RWIN, N_("Right Windows")) @@ -212,7 +214,7 @@ static const struct table_key table[] = { DEFINEKEY1(KEY_EXSEL, "ExSel") DEFINEKEY1(KEY_EREOF, N_("Erase EOF")) DEFINEKEY1(KEY_PLAY, N_("Play")) - DEFINEKEY1(KEY_ZOOM, N_("Zoom")) + DEFINEKEY1(KEY_ZOOM, N_("Zoom Key")) DEFINEKEY1(KEY_PA1, "PA1") DEFINEKEY1(KEY_OEM_CLEAR, N_("OEM Clear"))