Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issues in Minetest's English texts #13913

Merged
merged 7 commits into from
Oct 29, 2023
Merged

Fix issues in Minetest's English texts #13913

merged 7 commits into from
Oct 29, 2023

Conversation

srifqi
Copy link
Member

@srifqi srifqi commented Oct 21, 2023 •
edited

This PR is a continuation of #13907.

Goal of the PR
This PR tries to fix issues in Minetest's English texts/messages.

How does the PR work?

The table from #13907
Original Text Fix Reason
for FSAA and SSAA antializasing methods. antialiasing Mistype
odd/even line based polarisation screen support. polarization US spelling
Defines size of the sampling grid the size Missing article
shadow map over given amount of frames. number of frames Countable noun
Amount of messages a player may send per 10 seconds. Number of messages Countable noun
The client will not longer receive most invisible no longer - not longer = not for a long time
- no longer = not any more
so see a full list at so, see Comma
When enabling water placement the floatlands must be placement, the floatlands Comma
enabled. Also the vertical distance over which Also, the Comma
Clouds are a client side effect. client-side Hyphen
using a high resolution texture pack. high-resolution Hyphen
Client side node lookup range restriction Client-side Hyphen
The depth of dirt or other biome filler node. other-biome Hyphen
Maximum size of the out chat queue out-chat Hyphen
Maximum forceloaded blocks force-loaded Hyphen
Default maximum number of forceloaded mapblocks. force-loaded Hyphen
Server side occlusion culling Server-side Hyphen
WARNING!: There is no benefit WARNING: There Multiple punctuation
Misc Misc. Missing punctuation
The file path relative to your worldpath in which profiles world path Not in a dictionary
Static spawnpoint spawn point Alternative form

rollerozxa's comment

Does it resolve any reported issue?
This PR tries to fix #13907 and also might fix #12936.

Does this relate to a goal in the roadmap?
Probably, this PR aims to have proper English texts/messages in Minetest.

To do

This PR is Ready for Review.

How to test

  1. Read the user-facing English texts/messages in Minetest.
  2. Find any errors/issues/mistakes in it.

@srifqi srifqi added Maintenance Tasks to keep the codebase and related parts in order, including architectural improvements Bugfix 🐛 PRs that fix a bug @ Builtin labels Oct 21, 2023
grorp
grorp reviewed Oct 21, 2023
View reviewed changes
Copy link
Member

@grorp grorp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(English is not my native language, so take my review with a grain of salt.)

builtin/settingtypes.txt Outdated Show resolved Hide resolved
builtin/settingtypes.txt Outdated Show resolved Hide resolved
builtin/settingtypes.txt Outdated Show resolved Hide resolved
@grorp grorp added the Action / change needed Code still needs changes (PR) / more information requested (Issues) label Oct 21, 2023
@srifqi @grorp @rubenwardy
Revision 1
9b1acf7 
Co-authored-by: Gregor Parzefall <82708541+grorp@users.noreply.github.com>
Co-authored-by: rubenwardy <rw@rubenwardy.com>
@srifqi srifqi removed the Action / change needed Code still needs changes (PR) / more information requested (Issues) label Oct 22, 2023
Desour
Desour reviewed Oct 22, 2023
View reviewed changes
Copy link
Member

@Desour Desour left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm also not a native english speaker.

builtin/settingtypes.txt
@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't "spawnpoint" something like a keyword in minetest / game terminology.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments in the source code use spawn point (with space) while variable/setting names use spawnpoint (without space).

builtin/settingtypes.txt Outdated Show resolved Hide resolved
builtin/settingtypes.txt Outdated Show resolved Hide resolved
builtin/settingtypes.txt
@@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The information that biome filler is usually dirt is likely useful.

Copy link
Member

@grorp grorp Oct 22, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"dirt" seems MC/MTG-specific.

Most other mapgens also have a mg<name>_np_filler_depth setting. If this description is changed again, please make sure that all mg<name>_np_filler_depth settings still have the same description.

grorp
grorp reviewed Oct 22, 2023
View reviewed changes
builtin/settingtypes.txt Outdated Show resolved Hide resolved
srifqi and others added 2 commits October 23, 2023 01:00
@srifqi @Desour @grorp
Revision 2
5dd3387 
Co-authored-by: Desour <ds.desour@proton.me>
Co-authored-by: Gregor Parzefall <82708541+grorp@users.noreply.github.com>
@srifqi
Revision 3
3600455
@srifqi
Copy link
Member Author

srifqi commented Oct 23, 2023

I tried to make the setting's section name in title-case, but can not decide for Dynamic shadows since it is used both as a section title and as a setting name.

@srifqi
Copy link
Member Author

srifqi commented Oct 23, 2023

I also added fix for #12936.

sfan5
sfan5 reviewed Oct 27, 2023
View reviewed changes
builtin/settingtypes.txt Outdated Show resolved Hide resolved
builtin/settingtypes.txt Outdated Show resolved Hide resolved
builtin/settingtypes.txt Outdated Show resolved Hide resolved
builtin/settingtypes.txt Outdated Show resolved Hide resolved
src/client/keycode.cpp Outdated Show resolved Hide resolved
src/client/keycode.cpp Outdated Show resolved Hide resolved
srifqi and others added 2 commits October 27, 2023 18:00
@srifqi @sfan5
Revision 5
0cc2fad 
Co-authored-by: sfan5 <sfan5@live.de>
@srifqi
Revision 6
7e798b9
grorp
grorp approved these changes Oct 28, 2023
View reviewed changes
Copy link
Member

@grorp grorp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sfan5 sfan5 merged commit 1363059 into minetest:master Oct 29, 2023
15 checks passed
@srifqi srifqi deleted the spell_check_1 branch December 1, 2023 17:00
cx384 pushed a commit to cx384/minetest that referenced this pull request Dec 9, 2023
@srifqi @grorp
@rubenwardy @Desour @sfan5 @cx384
Fix issues in Minetest's English texts (minetest#13913)
63d25c9 
Co-authored-by: Gregor Parzefall <82708541+grorp@users.noreply.github.com>
Co-authored-by: rubenwardy <rw@rubenwardy.com>
Co-authored-by: Desour <ds.desour@proton.me>
Co-authored-by: sfan5 <sfan5@live.de>
kawogi pushed a commit to kawogi/minetest that referenced this pull request Dec 19, 2023
@srifqi @grorp
@rubenwardy @Desour @sfan5 @kawogi
Fix issues in Minetest's English texts (minetest#13913)
c6ebf93 
Co-authored-by: Gregor Parzefall <82708541+grorp@users.noreply.github.com>
Co-authored-by: rubenwardy <rw@rubenwardy.com>
Co-authored-by: Desour <ds.desour@proton.me>
Co-authored-by: sfan5 <sfan5@live.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rubenwardy rubenwardy rubenwardy left review comments

@Desour Desour Desour left review comments

@sfan5 sfan5 sfan5 approved these changes

@grorp grorp grorp approved these changes

Assignees
No one assigned
Labels
Bugfix 🐛 PRs that fix a bug @ Builtin Maintenance Tasks to keep the codebase and related parts in order, including architectural improvements >= Two approvals ✅ ✅
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Text issues in the Minetest's English texts/strings String "Clear" is used twice with 2 different meanings
5 participants
@srifqi @sfan5 @rubenwardy @Desour @grorp