Skip to content

Commit d6f2a1c

Browse files
authored
Various grammar improvements (#7769)
In builtin//pkgmgr.lua, README.md and settingtypes.txt. Based on 2 pull requests by comradekingu.
1 parent b982e45 commit d6f2a1c

File tree

3 files changed

+55
-56
lines changed

3 files changed

+55
-56
lines changed

README.md

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Minetest
77

88
An InfiniMiner/Minecraft inspired game.
99

10-
Copyright (c) 2010-2018 Perttu Ahola <celeron55@gmail.com>
10+
Copyright (C) 2010-2018 Perttu Ahola <celeron55@gmail.com>
1111
and contributors (see source file comments and the version control log)
1212

1313
In case you downloaded the source code:
@@ -22,7 +22,7 @@ Further documentation
2222
- Wiki: http://wiki.minetest.net/
2323
- Developer wiki: http://dev.minetest.net/
2424
- Forum: http://forum.minetest.net/
25-
- Github: https://github.com/minetest/minetest/
25+
- GitHub: https://github.com/minetest/minetest/
2626
- [doc/](doc/) directory of source distribution
2727

2828
Default controls
@@ -55,15 +55,14 @@ Some can be changed in the key config dialog in the settings tab.
5555
| J | Enable/disable fast mode (needs fast privilege) |
5656
| H | Enable/disable noclip mode (needs noclip privilege) |
5757
| E | Move fast in fast mode |
58-
| F1 | Hide/show HUD |
59-
| F2 | Hide/show chat |
60-
| F3 | Disable/enable fog |
61-
| F4 | Disable/enable camera update (Mapblocks are not updated anymore when disabled, disabled in release builds) |
62-
| F5 | Cycle through debug info screens |
63-
| F6 | Cycle through profiler info screens |
64-
| F7 | Cycle through camera modes |
65-
| F8 | Toggle cinematic mode |
66-
| F9 | Cycle through minimap modes |
58+
| F1 | Hide/show HUD |
59+
| F2 | Hide/show chat |
60+
| F3 | Disable/enable fog |
61+
| F4 | Disable/enable camera update (Mapblocks are not updated anymore when disabled, disabled in release builds) |
62+
| F5 | Cycle through debug information screens |
63+
| F6 | Cycle through profiler info screens |
64+
| F7 | Cycle through camera modes |
65+
| F9 | Cycle through minimap modes |
6766
| Shift + F9 | Change minimap orientation |
6867
| F10 | Show/hide console |
6968
| F12 | Take screenshot |
@@ -133,32 +132,32 @@ For Fedora users:
133132

134133
#### Download
135134

136-
You can install git for easily keeping your copy up to date.
137-
If you don’t want git, read below on how to get the source without git.
138-
This is an example for installing git on Debian/Ubuntu:
135+
You can install Git for easily keeping your copy up to date.
136+
If you don’t want Git, read below on how to get the source without Git.
137+
This is an example for installing Git on Debian/Ubuntu:
139138

140139
sudo apt install git
141140

142141
For Fedora users:
143142

144143
sudo dnf install git
145144

146-
Download source (this is the URL to the latest of source repository, which might not work at all times) using git:
145+
Download source (this is the URL to the latest of source repository, which might not work at all times) using Git:
147146

148147
git clone --depth 1 https://github.com/minetest/minetest.git
149148
cd minetest
150149

151-
Download minetest_game (otherwise only the "Minimal development test" game is available) using git:
150+
Download minetest_game (otherwise only the "Minimal development test" game is available) using Git:
152151

153152
git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game
154153

155-
Download source, without using git:
154+
Download source, without using Git:
156155

157156
wget https://github.com/minetest/minetest/archive/master.tar.gz
158157
tar xf master.tar.gz
159158
cd minetest-master
160159

161-
Download minetest_game, without using git:
160+
Download minetest_game, without using Git:
162161

163162
cd games/
164163
wget https://github.com/minetest/minetest_game/archive/master.tar.gz
@@ -197,7 +196,7 @@ General options and their default values:
197196
Release - Release build
198197
Debug - Debug build
199198
SemiDebug - Partially optimized debug build
200-
RelWithDebInfo - Release build with Debug information
199+
RelWithDebInfo - Release build with debug information
201200
MinSizeRel - Release build with -Os passed to compiler to make executable as small as possible
202201
ENABLE_CURL=ON - Build with cURL; Enables use of online mod repo, public serverlist and remote media fetching via http
203202
ENABLE_CURSES=ON - Build with (n)curses; Enables a server side terminal (command line option: --terminal)
@@ -208,7 +207,7 @@ General options and their default values:
208207
ENABLE_POSTGRESQL=ON - Build with libpq; Enables use of PostgreSQL map backend (PostgreSQL 9.5 or greater recommended)
209208
ENABLE_REDIS=ON - Build with libhiredis; Enables use of Redis map backend
210209
ENABLE_SPATIAL=ON - Build with LibSpatial; Speeds up AreaStores
211-
ENABLE_SOUND=ON - Build with OpenAL, libogg & libvorbis; in-game Sounds
210+
ENABLE_SOUND=ON - Build with OpenAL, libogg & libvorbis; in-game sounds
212211
ENABLE_LUAJIT=ON - Build with LuaJIT (much faster than non-JIT Lua)
213212
ENABLE_SYSTEM_GMP=ON - Use GMP from system (much faster than bundled mini-gmp)
214213
ENABLE_SYSTEM_JSONCPP=OFF - Use JsonCPP from system
@@ -226,15 +225,15 @@ Library specific options:
226225
CURL_LIBRARY - Only if building with cURL; path to libcurl.a/libcurl.so/libcurl.lib
227226
EGL_INCLUDE_DIR - Only if building with GLES; directory that contains egl.h
228227
EGL_LIBRARY - Only if building with GLES; path to libEGL.a/libEGL.so
229-
FREETYPE_INCLUDE_DIR_freetype2 - Only if building with Freetype2; directory that contains an freetype directory with files such as ftimage.h in it
230-
FREETYPE_INCLUDE_DIR_ft2build - Only if building with Freetype2; directory that contains ft2build.h
231-
FREETYPE_LIBRARY - Only if building with Freetype2; path to libfreetype.a/libfreetype.so/freetype.lib
232-
FREETYPE_DLL - Only if building with Freetype2 on Windows; path to libfreetype.dll
233-
GETTEXT_DLL - Only when building with Gettext on Windows; path to libintl3.dll
234-
GETTEXT_ICONV_DLL - Only when building with Gettext on Windows; path to libiconv2.dll
235-
GETTEXT_INCLUDE_DIR - Only when building with Gettext; directory that contains iconv.h
236-
GETTEXT_LIBRARY - Only when building with Gettext on Windows; path to libintl.dll.a
237-
GETTEXT_MSGFMT - Only when building with Gettext; path to msgfmt/msgfmt.exe
228+
FREETYPE_INCLUDE_DIR_freetype2 - Only if building with FreeType 2; directory that contains an freetype directory with files such as ftimage.h in it
229+
FREETYPE_INCLUDE_DIR_ft2build - Only if building with FreeType 2; directory that contains ft2build.h
230+
FREETYPE_LIBRARY - Only if building with FreeType 2; path to libfreetype.a/libfreetype.so/freetype.lib
231+
FREETYPE_DLL - Only if building with FreeType 2 on Windows; path to libfreetype.dll
232+
GETTEXT_DLL - Only when building with gettext on Windows; path to libintl3.dll
233+
GETTEXT_ICONV_DLL - Only when building with gettext on Windows; path to libiconv2.dll
234+
GETTEXT_INCLUDE_DIR - Only when building with gettext; directory that contains iconv.h
235+
GETTEXT_LIBRARY - Only when building with gettext on Windows; path to libintl.dll.a
236+
GETTEXT_MSGFMT - Only when building with gettext; path to msgfmt/msgfmt.exe
238237
IRRLICHT_DLL - Only on Windows; path to Irrlicht.dll
239238
IRRLICHT_INCLUDE_DIR - Directory that contains IrrCompileConfig.h
240239
IRRLICHT_LIBRARY - Path to libIrrlicht.a/libIrrlicht.so/libIrrlicht.dll.a/Irrlicht.lib
@@ -302,10 +301,10 @@ Library specific options:
302301
* Download all the other stuff to DIR and extract them into there.
303302
("extract here", not "extract to packagename/")
304303
* NOTE: zlib125dll.zip needs to be extracted into zlib125dll
305-
* NOTE: You need to extract sqlite3.h & sqlite3ext.h from sqlite3 source
306-
and sqlite3.dll & sqlite3.def from sqlite3 precompiled binaries
307-
into "sqlite3" directory, and generate sqlite3.lib using command
308-
"LIB /DEF:sqlite3.def /OUT:sqlite3.lib"
304+
* NOTE: You need to extract sqlite3.h & sqlite3ext.h from the SQLite 3
305+
source and sqlite3.dll & sqlite3.def from the SQLite 3 precompiled
306+
binaries into "sqlite3" directory, and generate sqlite3.lib using
307+
command "LIB /DEF:sqlite3.def /OUT:sqlite3.lib"
309308
* All those packages contain a nice base directory in them, which
310309
should end up being the direct subdirectories of DIR.
311310
* You will end up with a directory structure like this (+=dir, -=file):
@@ -439,5 +438,5 @@ patch is set to 0.
439438
minor/trivial features considered necessary.
440439

441440
Since 5.0.0-dev and 0.4.17-dev, the dev notation refers to the next release,
442-
ie: 5.0.0-dev is the development version leading to 5.0.0.
441+
i.e.: 5.0.0-dev is the development version leading to 5.0.0.
443442
Prior to that we used `previous_version-dev`.

builtin/mainmenu/pkgmgr.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ function pkgmgr.install_dir(type, path, basename, targetpath)
431431
targetpath = core.get_modpath() .. DIR_DELIM .. clean_path
432432
else
433433
return nil,
434-
fgettext("Install Mod: unable to find suitable foldername for modpack $1",
434+
fgettext("Install Mod: Unable to find suitable folder name for modpack $1",
435435
modfilename)
436436
end
437437
end
@@ -457,7 +457,7 @@ function pkgmgr.install_dir(type, path, basename, targetpath)
457457
if targetfolder ~= nil and pkgmgr.isValidModname(targetfolder) then
458458
targetpath = core.get_modpath() .. DIR_DELIM .. targetfolder
459459
else
460-
return nil, fgettext("Install Mod: unable to find real modname for: $1", modfilename)
460+
return nil, fgettext("Install Mod: Unable to find real mod name for: $1", modfilename)
461461
end
462462
end
463463

@@ -493,7 +493,7 @@ function pkgmgr.install(type, modfilename, basename, dest)
493493
if path == nil then
494494
return nil,
495495
fgettext("Install: file: \"$1\"", archive_info.name) .. "\n" ..
496-
fgettext("Install: unsupported filetype \"$1\" or broken archive",
496+
fgettext("Install: Unsupported file type \"$1\" or broken archive",
497497
archive_info.type)
498498
end
499499

builtin/settingtypes.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -349,15 +349,15 @@ keymap_slot23 (Hotbar slot 23 key) key
349349
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
350350
keymap_toggle_hud (HUD toggle key) key KEY_F1
351351

352-
# Key for toggling the display of the chat.
352+
# Key for toggling the display of chat.
353353
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
354354
keymap_toggle_chat (Chat toggle key) key KEY_F2
355355

356356
# Key for toggling the display of the large chat console.
357357
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
358358
keymap_console (Large chat console key) key KEY_F10
359359

360-
# Key for toggling the display of the fog.
360+
# Key for toggling the display of fog.
361361
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
362362
keymap_toggle_force_fog_off (Fog toggle key) key KEY_F3
363363

@@ -440,15 +440,15 @@ trilinear_filter (Trilinear filtering) bool false
440440

441441
# Filtered textures can blend RGB values with fully-transparent neighbors,
442442
# which PNG optimizers usually discard, sometimes resulting in a dark or
443-
# light edge to transparent textures. Apply this filter to clean that up
443+
# light edge to transparent textures. Apply this filter to clean that up
444444
# at texture load time.
445445
texture_clean_transparent (Clean transparent textures) bool false
446446

447447
# When using bilinear/trilinear/anisotropic filters, low-resolution textures
448448
# can be blurred, so automatically upscale them with nearest-neighbor
449-
# interpolation to preserve crisp pixels. This sets the minimum texture size
449+
# interpolation to preserve crisp pixels. This sets the minimum texture size
450450
# for the upscaled textures; higher values look sharper, but require more
451-
# memory. Powers of 2 are recommended. Setting this higher than 1 may not
451+
# memory. Powers of 2 are recommended. Setting this higher than 1 may not
452452
# have a visible effect unless bilinear/trilinear/anisotropic filtering is
453453
# enabled.
454454
# This is also used as the base node texture size for world-aligned
@@ -579,7 +579,7 @@ fullscreen (Full screen) bool false
579579
fullscreen_bpp (Full screen BPP) int 24
580580

581581
# Vertical screen synchronization.
582-
vsync (V-Sync) bool false
582+
vsync (VSync) bool false
583583

584584
# Field of view in degrees.
585585
fov (Field of view) int 72 45 160
@@ -609,7 +609,7 @@ texture_path (Texture path) path
609609

610610
# The rendering back-end for Irrlicht.
611611
# A restart is required after changing this.
612-
# Note: on Android, stick with OGLES1 if unsure! App may fail to start otherwise.
612+
# Note: On Android, stick with OGLES1 if unsure! App may fail to start otherwise.
613613
# On other platforms, OpenGL is recommended, and it’s the only driver with
614614
# shader support currently.
615615
video_driver (Video driver) enum opengl null,software,burningsvideo,direct3d8,direct3d9,opengl,ogles1,ogles2
@@ -738,7 +738,7 @@ world_aligned_mode (World-aligned textures mode) enum enable disable,enable,forc
738738
# a specially-designed texture pack; with this option, the client tries
739739
# to determine the scale automatically basing on the texture size.
740740
# See also texture_min_size.
741-
# Warning: this option is EXPERIMENTAL!
741+
# Warning: This option is EXPERIMENTAL!
742742
autoscale_mode (Autoscaling mode) enum disable disable,enable,force
743743

744744
# Show entity selection boxes
@@ -773,8 +773,8 @@ tooltip_show_delay (Tooltip delay) int 400
773773
# Append item name to tooltip.
774774
tooltip_append_itemname (Append item name) bool false
775775

776-
# Whether freetype fonts are used, requires freetype support to be compiled in.
777-
freetype (Freetype fonts) bool true
776+
# Whether FreeType fonts are used, requires FreeType support to be compiled in.
777+
freetype (FreeType fonts) bool true
778778

779779
# Path to TrueTypeFont or bitmap.
780780
font_path (Font path) filepath fonts/liberationsans.ttf
@@ -883,7 +883,7 @@ server_description (Server description) string mine here
883883
server_address (Server address) string game.minetest.net
884884

885885
# Homepage of server, to be displayed in the serverlist.
886-
server_url (Server URL) string http://minetest.net
886+
server_url (Server URL) string https://minetest.net
887887

888888
# Automaticaly report to the serverlist.
889889
server_announce (Announce server) bool false
@@ -1088,17 +1088,17 @@ server_unload_unused_data_timeout (Unload unused server data) int 29
10881088
# Maximum number of statically stored objects in a block.
10891089
max_objects_per_block (Maximum objects per block) int 64
10901090

1091-
# See http://www.sqlite.org/pragma.html#pragma_synchronous
1091+
# See https://www.sqlite.org/pragma.html#pragma_synchronous
10921092
sqlite_synchronous (Synchronous SQLite) enum 2 0,1,2
10931093

10941094
# Length of a server tick and the interval at which objects are generally updated over network.
10951095
dedicated_server_step (Dedicated server step) float 0.09
10961096

1097-
# Time in between active block management cycles
1098-
active_block_mgmt_interval (Active Block Management interval) float 2.0
1097+
# Length of time between active block management cycles
1098+
active_block_mgmt_interval (Active block management interval) float 2.0
10991099

1100-
# Length of time between ABM execution cycles
1101-
abm_interval (Active Block Modifier interval) float 1.0
1100+
# Length of time between Active Block Modifier (ABM) execution cycles
1101+
abm_interval (ABM interval) float 1.0
11021102

11031103
# Length of time between NodeTimer execution cycles
11041104
nodetimer_interval (NodeTimer interval) float 0.2
@@ -1704,7 +1704,7 @@ mgfractal_iterations (Iterations) int 11
17041704
mgfractal_scale (Scale) v3f (4096.0, 1024.0, 4096.0)
17051705

17061706
# (X,Y,Z) offset of fractal from world centre in units of 'scale'.
1707-
# Can be used to move a desired point to (0, 0): to create a
1707+
# Can be used to move a desired point to (0, 0) to create a
17081708
# suitable spawn point, or to allow 'zooming in' on a desired
17091709
# point by increasing 'scale'.
17101710
# The default is tuned for a suitable spawn point for mandelbrot
@@ -1841,12 +1841,12 @@ mgvalleys_np_inter_valley_slope (Valley slope) noise_params_2d 0.5, 0.5, (128, 1
18411841
# Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes).
18421842
# Increasing this by 1 almost doubles the 3D noise calculation load.
18431843
# High values can cause noise calculation to overload.
1844-
# Values smaller than 5 cause a terrain bug in mgv6.
1844+
# Values smaller than 5 cause a terrain bug in Mapgen V6.
18451845
# Since there is a fixed number of large caves and dungeons per
18461846
# mapchunk, values other than 5 alter the density of these.
18471847
chunksize (Chunk size) int 5
18481848

1849-
# Dump the mapgen debug infos.
1849+
# Dump the mapgen debug information.
18501850
enable_mapgen_debug_info (Mapgen debug) bool false
18511851

18521852
# Maximum number of blocks that can be queued for loading.

0 commit comments

Comments
 (0)