Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 01:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various grammar improvements (#7769)

Browse Source 
In builtin//pkgmgr.lua, README.md and settingtypes.txt.
Based on 2 pull requests by comradekingu.
This commit is contained in:
Paramat 2018-10-06 03:43:26 +01:00 committed by GitHub
parent b982e45456
commit d6f2a1c4b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
README.md
View File

@ -7,7 +7,7 @@ Minetest
An InfiniMiner/Minecraft inspired game. An InfiniMiner/Minecraft inspired game.
Copyright (c) 2010-2018 Perttu Ahola <celeron55@gmail.com> Copyright (C) 2010-2018 Perttu Ahola <celeron55@gmail.com>
and contributors (see source file comments and the version control log) and contributors (see source file comments and the version control log)
In case you downloaded the source code: In case you downloaded the source code:
@ -22,7 +22,7 @@ Further documentation
- Wiki: http://wiki.minetest.net/ - Wiki: http://wiki.minetest.net/
- Developer wiki: http://dev.minetest.net/ - Developer wiki: http://dev.minetest.net/
- Forum: http://forum.minetest.net/ - Forum: http://forum.minetest.net/
- Github: https://github.com/minetest/minetest/ - GitHub: https://github.com/minetest/minetest/
- [doc/](doc/) directory of source distribution - [doc/](doc/) directory of source distribution
Default controls Default controls
@ -59,10 +59,9 @@ Some can be changed in the key config dialog in the settings tab.
| F2 | Hide/show chat | | F2 | Hide/show chat |
| F3 | Disable/enable fog | | F3 | Disable/enable fog |
| F4 | Disable/enable camera update (Mapblocks are not updated anymore when disabled, disabled in release builds) | | F4 | Disable/enable camera update (Mapblocks are not updated anymore when disabled, disabled in release builds) |
| F5 | Cycle through debug info screens | | F5 | Cycle through debug information screens |
| F6 | Cycle through profiler info screens | | F6 | Cycle through profiler info screens |
| F7 | Cycle through camera modes | | F7 | Cycle through camera modes |
| F8 | Toggle cinematic mode |
| F9 | Cycle through minimap modes | | F9 | Cycle through minimap modes |
| Shift + F9 | Change minimap orientation | | Shift + F9 | Change minimap orientation |
| F10 | Show/hide console | | F10 | Show/hide console |
@ -133,9 +132,9 @@ For Fedora users:
#### Download #### Download
You can install git for easily keeping your copy up to date. You can install Git for easily keeping your copy up to date.
If you don’t want git, read below on how to get the source without git. If you don’t want Git, read below on how to get the source without Git.
This is an example for installing git on Debian/Ubuntu: This is an example for installing Git on Debian/Ubuntu:
sudo apt install git sudo apt install git
@ -143,22 +142,22 @@ For Fedora users:
sudo dnf install git sudo dnf install git
Download source (this is the URL to the latest of source repository, which might not work at all times) using git: Download source (this is the URL to the latest of source repository, which might not work at all times) using Git:
git clone --depth 1 https://github.com/minetest/minetest.git git clone --depth 1 https://github.com/minetest/minetest.git
cd minetest cd minetest
Download minetest_game (otherwise only the "Minimal development test" game is available) using git: Download minetest_game (otherwise only the "Minimal development test" game is available) using Git:
git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game
Download source, without using git: Download source, without using Git:
wget https://github.com/minetest/minetest/archive/master.tar.gz wget https://github.com/minetest/minetest/archive/master.tar.gz
tar xf master.tar.gz tar xf master.tar.gz
cd minetest-master cd minetest-master
Download minetest_game, without using git: Download minetest_game, without using Git:
cd games/ cd games/
wget https://github.com/minetest/minetest_game/archive/master.tar.gz wget https://github.com/minetest/minetest_game/archive/master.tar.gz
@ -197,7 +196,7 @@ General options and their default values:
Release - Release build Release - Release build
Debug - Debug build Debug - Debug build
SemiDebug - Partially optimized debug build SemiDebug - Partially optimized debug build
RelWithDebInfo - Release build with Debug information RelWithDebInfo - Release build with debug information
MinSizeRel - Release build with -Os passed to compiler to make executable as small as possible MinSizeRel - Release build with -Os passed to compiler to make executable as small as possible
ENABLE_CURL=ON - Build with cURL; Enables use of online mod repo, public serverlist and remote media fetching via http ENABLE_CURL=ON - Build with cURL; Enables use of online mod repo, public serverlist and remote media fetching via http
ENABLE_CURSES=ON - Build with (n)curses; Enables a server side terminal (command line option: --terminal) 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:
ENABLE_POSTGRESQL=ON - Build with libpq; Enables use of PostgreSQL map backend (PostgreSQL 9.5 or greater recommended) ENABLE_POSTGRESQL=ON - Build with libpq; Enables use of PostgreSQL map backend (PostgreSQL 9.5 or greater recommended)
ENABLE_REDIS=ON - Build with libhiredis; Enables use of Redis map backend ENABLE_REDIS=ON - Build with libhiredis; Enables use of Redis map backend
ENABLE_SPATIAL=ON - Build with LibSpatial; Speeds up AreaStores ENABLE_SPATIAL=ON - Build with LibSpatial; Speeds up AreaStores
ENABLE_SOUND=ON - Build with OpenAL, libogg & libvorbis; in-game Sounds ENABLE_SOUND=ON - Build with OpenAL, libogg & libvorbis; in-game sounds
ENABLE_LUAJIT=ON - Build with LuaJIT (much faster than non-JIT Lua) ENABLE_LUAJIT=ON - Build with LuaJIT (much faster than non-JIT Lua)
ENABLE_SYSTEM_GMP=ON - Use GMP from system (much faster than bundled mini-gmp) ENABLE_SYSTEM_GMP=ON - Use GMP from system (much faster than bundled mini-gmp)
ENABLE_SYSTEM_JSONCPP=OFF - Use JsonCPP from system ENABLE_SYSTEM_JSONCPP=OFF - Use JsonCPP from system
@ -226,15 +225,15 @@ Library specific options:
CURL_LIBRARY - Only if building with cURL; path to libcurl.a/libcurl.so/libcurl.lib CURL_LIBRARY - Only if building with cURL; path to libcurl.a/libcurl.so/libcurl.lib
EGL_INCLUDE_DIR - Only if building with GLES; directory that contains egl.h EGL_INCLUDE_DIR - Only if building with GLES; directory that contains egl.h
EGL_LIBRARY - Only if building with GLES; path to libEGL.a/libEGL.so EGL_LIBRARY - Only if building with GLES; path to libEGL.a/libEGL.so
FREETYPE_INCLUDE_DIR_freetype2 - Only if building with Freetype2; directory that contains an freetype directory with files such as ftimage.h in it FREETYPE_INCLUDE_DIR_freetype2 - Only if building with FreeType 2; directory that contains an freetype directory with files such as ftimage.h in it
FREETYPE_INCLUDE_DIR_ft2build - Only if building with Freetype2; directory that contains ft2build.h FREETYPE_INCLUDE_DIR_ft2build - Only if building with FreeType 2; directory that contains ft2build.h
FREETYPE_LIBRARY - Only if building with Freetype2; path to libfreetype.a/libfreetype.so/freetype.lib FREETYPE_LIBRARY - Only if building with FreeType 2; path to libfreetype.a/libfreetype.so/freetype.lib
FREETYPE_DLL - Only if building with Freetype2 on Windows; path to libfreetype.dll FREETYPE_DLL - Only if building with FreeType 2 on Windows; path to libfreetype.dll
GETTEXT_DLL - Only when building with Gettext on Windows; path to libintl3.dll GETTEXT_DLL - Only when building with gettext on Windows; path to libintl3.dll
GETTEXT_ICONV_DLL - Only when building with Gettext on Windows; path to libiconv2.dll GETTEXT_ICONV_DLL - Only when building with gettext on Windows; path to libiconv2.dll
GETTEXT_INCLUDE_DIR - Only when building with Gettext; directory that contains iconv.h GETTEXT_INCLUDE_DIR - Only when building with gettext; directory that contains iconv.h
GETTEXT_LIBRARY - Only when building with Gettext on Windows; path to libintl.dll.a GETTEXT_LIBRARY - Only when building with gettext on Windows; path to libintl.dll.a
GETTEXT_MSGFMT - Only when building with Gettext; path to msgfmt/msgfmt.exe GETTEXT_MSGFMT - Only when building with gettext; path to msgfmt/msgfmt.exe
IRRLICHT_DLL - Only on Windows; path to Irrlicht.dll IRRLICHT_DLL - Only on Windows; path to Irrlicht.dll
IRRLICHT_INCLUDE_DIR - Directory that contains IrrCompileConfig.h IRRLICHT_INCLUDE_DIR - Directory that contains IrrCompileConfig.h
IRRLICHT_LIBRARY - Path to libIrrlicht.a/libIrrlicht.so/libIrrlicht.dll.a/Irrlicht.lib IRRLICHT_LIBRARY - Path to libIrrlicht.a/libIrrlicht.so/libIrrlicht.dll.a/Irrlicht.lib
@ -302,10 +301,10 @@ Library specific options:
* Download all the other stuff to DIR and extract them into there. * Download all the other stuff to DIR and extract them into there.
("extract here", not "extract to packagename/") ("extract here", not "extract to packagename/")
* NOTE: zlib125dll.zip needs to be extracted into zlib125dll * NOTE: zlib125dll.zip needs to be extracted into zlib125dll
* NOTE: You need to extract sqlite3.h & sqlite3ext.h from sqlite3 source * NOTE: You need to extract sqlite3.h & sqlite3ext.h from the SQLite 3
and sqlite3.dll & sqlite3.def from sqlite3 precompiled binaries source and sqlite3.dll & sqlite3.def from the SQLite 3 precompiled
into "sqlite3" directory, and generate sqlite3.lib using command binaries into "sqlite3" directory, and generate sqlite3.lib using
"LIB /DEF:sqlite3.def /OUT:sqlite3.lib" command "LIB /DEF:sqlite3.def /OUT:sqlite3.lib"
* All those packages contain a nice base directory in them, which * All those packages contain a nice base directory in them, which
should end up being the direct subdirectories of DIR. should end up being the direct subdirectories of DIR.
* You will end up with a directory structure like this (+=dir, -=file): * You will end up with a directory structure like this (+=dir, -=file):
@ -439,5 +438,5 @@ patch is set to 0.
minor/trivial features considered necessary. minor/trivial features considered necessary.
Since 5.0.0-dev and 0.4.17-dev, the dev notation refers to the next release, Since 5.0.0-dev and 0.4.17-dev, the dev notation refers to the next release,
ie: 5.0.0-dev is the development version leading to 5.0.0. i.e.: 5.0.0-dev is the development version leading to 5.0.0.
Prior to that we used `previous_version-dev`. Prior to that we used `previous_version-dev`.

6
builtin/mainmenu/pkgmgr.lua
View File

@ -431,7 +431,7 @@ function pkgmgr.install_dir(type, path, basename, targetpath)
targetpath = core.get_modpath() .. DIR_DELIM .. clean_path targetpath = core.get_modpath() .. DIR_DELIM .. clean_path
else else
return nil, return nil,
fgettext("Install Mod: unable to find suitable foldername for modpack $1", fgettext("Install Mod: Unable to find suitable folder name for modpack $1",
modfilename) modfilename)
end end
end end
@ -457,7 +457,7 @@ function pkgmgr.install_dir(type, path, basename, targetpath)
if targetfolder ~= nil and pkgmgr.isValidModname(targetfolder) then if targetfolder ~= nil and pkgmgr.isValidModname(targetfolder) then
targetpath = core.get_modpath() .. DIR_DELIM .. targetfolder targetpath = core.get_modpath() .. DIR_DELIM .. targetfolder
else else
return nil, fgettext("Install Mod: unable to find real modname for: $1", modfilename) return nil, fgettext("Install Mod: Unable to find real mod name for: $1", modfilename)
end end
end end
@ -493,7 +493,7 @@ function pkgmgr.install(type, modfilename, basename, dest)
if path == nil then if path == nil then
return nil, return nil,
fgettext("Install: file: \"$1\"", archive_info.name) .. "\n" .. fgettext("Install: file: \"$1\"", archive_info.name) .. "\n" ..
fgettext("Install: unsupported filetype \"$1\" or broken archive", fgettext("Install: Unsupported file type \"$1\" or broken archive",
archive_info.type) archive_info.type)
end end

32
builtin/settingtypes.txt
View File

@ -349,7 +349,7 @@ keymap_slot23 (Hotbar slot 23 key) key
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
keymap_toggle_hud (HUD toggle key) key KEY_F1 keymap_toggle_hud (HUD toggle key) key KEY_F1
# Key for toggling the display of the chat. # Key for toggling the display of chat.
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
keymap_toggle_chat (Chat toggle key) key KEY_F2 keymap_toggle_chat (Chat toggle key) key KEY_F2
@ -357,7 +357,7 @@ keymap_toggle_chat (Chat toggle key) key KEY_F2
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
keymap_console (Large chat console key) key KEY_F10 keymap_console (Large chat console key) key KEY_F10
# Key for toggling the display of the fog. # Key for toggling the display of fog.
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
keymap_toggle_force_fog_off (Fog toggle key) key KEY_F3 keymap_toggle_force_fog_off (Fog toggle key) key KEY_F3
@ -579,7 +579,7 @@ fullscreen (Full screen) bool false
fullscreen_bpp (Full screen BPP) int 24 fullscreen_bpp (Full screen BPP) int 24
# Vertical screen synchronization. # Vertical screen synchronization.
vsync (V-Sync) bool false vsync (VSync) bool false
# Field of view in degrees. # Field of view in degrees.
fov (Field of view) int 72 45 160 fov (Field of view) int 72 45 160
@ -609,7 +609,7 @@ texture_path (Texture path) path
# The rendering back-end for Irrlicht. # The rendering back-end for Irrlicht.
# A restart is required after changing this. # A restart is required after changing this.
# Note: on Android, stick with OGLES1 if unsure! App may fail to start otherwise. # Note: On Android, stick with OGLES1 if unsure! App may fail to start otherwise.
# On other platforms, OpenGL is recommended, and it’s the only driver with # On other platforms, OpenGL is recommended, and it’s the only driver with
# shader support currently. # shader support currently.
video_driver (Video driver) enum opengl null,software,burningsvideo,direct3d8,direct3d9,opengl,ogles1,ogles2 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
# a specially-designed texture pack; with this option, the client tries # a specially-designed texture pack; with this option, the client tries
# to determine the scale automatically basing on the texture size. # to determine the scale automatically basing on the texture size.
# See also texture_min_size. # See also texture_min_size.
# Warning: this option is EXPERIMENTAL! # Warning: This option is EXPERIMENTAL!
autoscale_mode (Autoscaling mode) enum disable disable,enable,force autoscale_mode (Autoscaling mode) enum disable disable,enable,force
# Show entity selection boxes # Show entity selection boxes
@ -773,8 +773,8 @@ tooltip_show_delay (Tooltip delay) int 400
# Append item name to tooltip. # Append item name to tooltip.
tooltip_append_itemname (Append item name) bool false tooltip_append_itemname (Append item name) bool false
# Whether freetype fonts are used, requires freetype support to be compiled in. # Whether FreeType fonts are used, requires FreeType support to be compiled in.
freetype (Freetype fonts) bool true freetype (FreeType fonts) bool true
# Path to TrueTypeFont or bitmap. # Path to TrueTypeFont or bitmap.
font_path (Font path) filepath fonts/liberationsans.ttf font_path (Font path) filepath fonts/liberationsans.ttf
@ -883,7 +883,7 @@ server_description (Server description) string mine here
server_address (Server address) string game.minetest.net server_address (Server address) string game.minetest.net
# Homepage of server, to be displayed in the serverlist. # Homepage of server, to be displayed in the serverlist.
server_url (Server URL) string http://minetest.net server_url (Server URL) string https://minetest.net
# Automaticaly report to the serverlist. # Automaticaly report to the serverlist.
server_announce (Announce server) bool false server_announce (Announce server) bool false
@ -1088,17 +1088,17 @@ server_unload_unused_data_timeout (Unload unused server data) int 29
# Maximum number of statically stored objects in a block. # Maximum number of statically stored objects in a block.
max_objects_per_block (Maximum objects per block) int 64 max_objects_per_block (Maximum objects per block) int 64
# See http://www.sqlite.org/pragma.html#pragma_synchronous # See https://www.sqlite.org/pragma.html#pragma_synchronous
sqlite_synchronous (Synchronous SQLite) enum 2 0,1,2 sqlite_synchronous (Synchronous SQLite) enum 2 0,1,2
# Length of a server tick and the interval at which objects are generally updated over network. # Length of a server tick and the interval at which objects are generally updated over network.
dedicated_server_step (Dedicated server step) float 0.09 dedicated_server_step (Dedicated server step) float 0.09
# Time in between active block management cycles # Length of time between active block management cycles
active_block_mgmt_interval (Active Block Management interval) float 2.0 active_block_mgmt_interval (Active block management interval) float 2.0
# Length of time between ABM execution cycles # Length of time between Active Block Modifier (ABM) execution cycles
abm_interval (Active Block Modifier interval) float 1.0 abm_interval (ABM interval) float 1.0
# Length of time between NodeTimer execution cycles # Length of time between NodeTimer execution cycles
nodetimer_interval (NodeTimer interval) float 0.2 nodetimer_interval (NodeTimer interval) float 0.2
@ -1704,7 +1704,7 @@ mgfractal_iterations (Iterations) int 11
mgfractal_scale (Scale) v3f (4096.0, 1024.0, 4096.0) mgfractal_scale (Scale) v3f (4096.0, 1024.0, 4096.0)
# (X,Y,Z) offset of fractal from world centre in units of 'scale'. # (X,Y,Z) offset of fractal from world centre in units of 'scale'.
# Can be used to move a desired point to (0, 0): to create a # Can be used to move a desired point to (0, 0) to create a
# suitable spawn point, or to allow 'zooming in' on a desired # suitable spawn point, or to allow 'zooming in' on a desired
# point by increasing 'scale'. # point by increasing 'scale'.
# The default is tuned for a suitable spawn point for mandelbrot # 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
# Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes). # Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes).
# Increasing this by 1 almost doubles the 3D noise calculation load. # Increasing this by 1 almost doubles the 3D noise calculation load.
# High values can cause noise calculation to overload. # High values can cause noise calculation to overload.
# Values smaller than 5 cause a terrain bug in mgv6. # Values smaller than 5 cause a terrain bug in Mapgen V6.
# Since there is a fixed number of large caves and dungeons per # Since there is a fixed number of large caves and dungeons per
# mapchunk, values other than 5 alter the density of these. # mapchunk, values other than 5 alter the density of these.
chunksize (Chunk size) int 5 chunksize (Chunk size) int 5
# Dump the mapgen debug infos. # Dump the mapgen debug information.
enable_mapgen_debug_info (Mapgen debug) bool false enable_mapgen_debug_info (Mapgen debug) bool false
# Maximum number of blocks that can be queued for loading. # Maximum number of blocks that can be queued for loading.