Skip to content

Commit 1f2ff86

Browse files
committedAug 30, 2016
Update minetest.conf.example and settings_translation_file.cpp
1 parent 78ff5c1 commit 1f2ff86

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed
 

Diff for: ‎minetest.conf.example

+7-7
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
# type: key
209209
# keymap_toggle_force_fog_off = KEY_F3
210210

211-
# Key for toggling the camrea update. Only used for development
211+
# Key for toggling the camera update. Only used for development
212212
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
213213
# type: key
214214
# keymap_toggle_update_camera =
@@ -369,7 +369,7 @@
369369

370370
#### Shaders
371371

372-
# Shaders allow advanced visul effects and may increase performance on some video cards.
372+
# Shaders allow advanced visual effects and may increase performance on some video cards.
373373
# Thy only work with the OpenGL video backend.
374374
# type: bool
375375
# enable_shaders = true
@@ -633,7 +633,7 @@
633633
# When gui_scaling_filter_txr2img is true, copy those images
634634
# from hardware to software for scaling. When false, fall back
635635
# to the old scaling method, for video drivers that don't
636-
# propery support downloading textures back from hardware.
636+
# properly support downloading textures back from hardware.
637637
# type: bool
638638
# gui_scaling_filter_txr2img = true
639639

@@ -789,11 +789,11 @@
789789

790790
### Advanced
791791

792-
# How many blocks are flying in the wire simultaneously per client.
792+
# Maximum number of blocks that are simultaneously sent per client.
793793
# type: int
794794
# max_simultaneous_block_sends_per_client = 10
795795

796-
# How many blocks are flying in the wire simultaneously for the whole server.
796+
# Maximum number of blocks that are simultaneously sent in total.
797797
# type: int
798798
# max_simultaneous_block_sends_server_total = 40
799799

@@ -1464,7 +1464,7 @@
14641464
# type: string
14651465
# secure.trusted_mods =
14661466

1467-
# Comma-seperated list of mods that are allowed to access HTTP APIs, which
1467+
# Comma-separated list of mods that are allowed to access HTTP APIs, which
14681468
# allow them to upload and download data to/from the internet.
14691469
# type: string
14701470
# secure.http_mods =
@@ -1485,7 +1485,7 @@
14851485
# profiler.default_report_format = txt
14861486

14871487
# The file path relative to your worldpath in which profiles will be saved to.
1488-
#
1488+
#
14891489
# type: string
14901490
# profiler.report_path = ""
14911491

Diff for: ‎src/settings_translation_file.cpp

+13-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fake_function() {
3737
gettext("Continuous forward movement (only used for testing).");
3838
gettext("Enable Joysticks");
3939
gettext("Enable Joysticks");
40-
gettext("Joystick button repetition invterval");
40+
gettext("Joystick button repetition interval");
4141
gettext("The time in seconds it takes between repeated events\nwhen holding down a joystick button combination.");
4242
gettext("Joystick frustum sensitivity");
4343
gettext("The sensitivity of the joystick axes for moving the\ningame view frustum around.");
@@ -86,7 +86,7 @@ fake_function() {
8686
gettext("Fog toggle key");
8787
gettext("Key for toggling the display of the fog.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
8888
gettext("Camera update toggle key");
89-
gettext("Key for toggling the camrea update. Only used for development\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
89+
gettext("Key for toggling the camera update. Only used for development\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
9090
gettext("Debug info toggle key");
9191
gettext("Key for toggling the display of debug info.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
9292
gettext("Profiler toggle key");
@@ -152,7 +152,7 @@ fake_function() {
152152
gettext("Experimental option, might cause visible spaces between blocks\nwhen set to higher number than 0.");
153153
gettext("Shaders");
154154
gettext("Shaders");
155-
gettext("Shaders allow advanced visul effects and may increase performance on some video cards.\nThy only work with the OpenGL video backend.");
155+
gettext("Shaders allow advanced visual effects and may increase performance on some video cards.\nThy only work with the OpenGL video backend.");
156156
gettext("Tone Mapping");
157157
gettext("Filmic tone mapping");
158158
gettext("Enables filmic tone mapping");
@@ -207,6 +207,8 @@ fake_function() {
207207
gettext("Vertical screen synchronization.");
208208
gettext("Field of view");
209209
gettext("Field of view in degrees.");
210+
gettext("Field of view for zoom");
211+
gettext("Field of view while zooming in degrees.\nThis requires the \"zoom\" privilege on the server.");
210212
gettext("Gamma");
211213
gettext("Adjust the gamma encoding for the light tables. Lower numbers are brighter.\nThis setting is for the client only and is ignored by the server.");
212214
gettext("Texture path");
@@ -261,7 +263,7 @@ fake_function() {
261263
gettext("GUI scaling filter");
262264
gettext("When gui_scaling_filter is true, all GUI images need to be\nfiltered in software, but some images are generated directly\nto hardware (e.g. render-to-texture for nodes in inventory).");
263265
gettext("GUI scaling filter txr2img");
264-
gettext("When gui_scaling_filter_txr2img is true, copy those images\nfrom hardware to software for scaling. When false, fall back\nto the old scaling method, for video drivers that don't\npropery support downloading textures back from hardware.");
266+
gettext("When gui_scaling_filter_txr2img is true, copy those images\nfrom hardware to software for scaling. When false, fall back\nto the old scaling method, for video drivers that don't\nproperly support downloading textures back from hardware.");
265267
gettext("Tooltip delay");
266268
gettext("Delay showing tooltips, stated in milliseconds.");
267269
gettext("Freetype fonts");
@@ -326,10 +328,11 @@ fake_function() {
326328
gettext("IPv6 server");
327329
gettext("Enable/disable running an IPv6 server. An IPv6 server may be restricted\nto IPv6 clients, depending on system configuration.\nIgnored if bind_address is set.");
328330
gettext("Advanced");
329-
gettext("Maximum simultaneously blocks send per client");
330-
gettext("How many blocks are flying in the wire simultaneously per client.");
331-
gettext("Maximum simultaneously bocks send total");
332-
gettext("How many blocks are flying in the wire simultaneously for the whole server.");
331+
gettext("Maximum simultaneous block sends per client");
332+
gettext("Maximum number of blocks that are simultaneously sent per client.");
333+
gettext("Maximum simultaneous block sends total");
334+
gettext("Maximum number of blocks that are simultaneously sent in total.");
335+
gettext("Delay in sending blocks after building");
333336
gettext("To reduce lag, block transfers are slowed down when a player is building something.\nThis determines how long they are slowed down after placing or removing a node.");
334337
gettext("Max. packets per iteration");
335338
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.");
@@ -409,7 +412,7 @@ fake_function() {
409412
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).");
410413
gettext("Unload unused server data");
411414
gettext("How much the server will wait before unloading unused mapblocks.\nHigher value is smoother, but will use more RAM.");
412-
gettext("Maxmimum objects per block");
415+
gettext("Maximum objects per block");
413416
gettext("Maximum number of statically stored objects in a block.");
414417
gettext("Synchronous SQLite");
415418
gettext("See http://www.sqlite.org/pragma.html#pragma_synchronous");
@@ -593,7 +596,7 @@ fake_function() {
593596
gettext("Trusted mods");
594597
gettext("Comma-separated list of trusted mods that are allowed to access insecure\nfunctions even when mod security is on (via request_insecure_environment()).");
595598
gettext("HTTP Mods");
596-
gettext("Comma-seperated list of mods that are allowed to access HTTP APIs, which\nallow them to upload and download data to/from the internet.");
599+
gettext("Comma-separated list of mods that are allowed to access HTTP APIs, which\nallow them to upload and download data to/from the internet.");
597600
gettext("Advanced");
598601
gettext("Profiling");
599602
gettext("Load the game profiler");

0 commit comments

Comments
 (0)
Please sign in to comment.