diff --git a/CHANGELOG.md b/CHANGELOG.md index 94e0caa6da1..375002cedae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ See the [release announcement](https://godotengine.org/article/maintenance-relea - Print every file exported with `PCKPacker.flush()`'s verbose parameter ([GH-58520](https://github.com/godotengine/godot/pull/58520)). - Fix `UndoRedo::create_action()` invalid memory usage ([GH-58652](https://github.com/godotengine/godot/pull/58652)). -- Revert "Fix ProjectSettings `has_setting()` when used on a overriden setting with feature tags" ([GH-58859](https://github.com/godotengine/godot/pull/58859)). +- Revert "Fix ProjectSettings `has_setting()` when used on a overridden setting with feature tags" ([GH-58859](https://github.com/godotengine/godot/pull/58859)). - Fix crash on `Input.get_joy_button_index_from_string` and `Input.get_joy_axis_index_from_string` for non-existing key ([GH-59195](https://github.com/godotengine/godot/pull/59195)). #### GUI diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h index dae067a37b4..ab9e5135c0e 100644 --- a/core/command_queue_mt.h +++ b/core/command_queue_mt.h @@ -299,7 +299,7 @@ class CommandQueueMT { DECL_CMD(0) SPACE_SEP_LIST(DECL_CMD, 13) - /* comands that return */ + /* commands that return */ DECL_CMD_RET(0) SPACE_SEP_LIST(DECL_CMD_RET, 13) diff --git a/core/compressed_translation.h b/core/compressed_translation.h index 4c30a74fb8d..0de24e1a612 100644 --- a/core/compressed_translation.h +++ b/core/compressed_translation.h @@ -38,7 +38,7 @@ class PHashTranslation : public Translation { //this translation uses a sort of modified perfect hash algorithm //it requires hashing strings twice and then does a binary search, - //so it's slower, but at the same time it has an extreemly high chance + //so it's slower, but at the same time it has an extremely high chance //of catching untranslated strings //load/store friendly types diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 224101d9e5c..0a2be1fcb8d 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -765,7 +765,7 @@ static void _encode_string(const String &p_string, uint8_t *&buf, int &r_len) { } Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bool p_full_objects, int p_depth) { - ERR_FAIL_COND_V_MSG(p_depth > Variant::MAX_RECURSION_DEPTH, ERR_OUT_OF_MEMORY, "Potential inifite recursion detected. Bailing."); + ERR_FAIL_COND_V_MSG(p_depth > Variant::MAX_RECURSION_DEPTH, ERR_OUT_OF_MEMORY, "Potential infinite recursion detected. Bailing."); uint8_t *buf = r_buffer; r_len = 0; diff --git a/core/math/face3.h b/core/math/face3.h index f3429e2be5c..634ec1d9a6d 100644 --- a/core/math/face3.h +++ b/core/math/face3.h @@ -50,8 +50,8 @@ public: /** * * @param p_plane plane used to split the face - * @param p_res array of at least 3 faces, amount used in functio return - * @param p_is_point_over array of at least 3 booleans, determining which face is over the plane, amount used in functio return + * @param p_res array of at least 3 faces, amount used in function return + * @param p_is_point_over array of at least 3 booleans, determining which face is over the plane, amount used in function return * @param _epsilon constant used for numerical error rounding, to add "thickness" to the plane (so coplanar points can happen) * @return amount of faces generated by the split, either 0 (means no split possible), 2 or 3 */ diff --git a/core/pool_allocator.h b/core/pool_allocator.h index ae73c999e7a..865d7805a6d 100644 --- a/core/pool_allocator.h +++ b/core/pool_allocator.h @@ -37,7 +37,7 @@ @author Juan Linietsky * Generic Pool Allocator. * This is a generic memory pool allocator, with locking, compacting and alignment. (@TODO alignment) - * It used as a standard way to manage alloction in a specific region of memory, such as texture memory, + * It used as a standard way to manage allocation in a specific region of memory, such as texture memory, * audio sample memory, or just any kind of memory overall. * (@TODO) abstraction should be greater, because in many platforms, you need to manage a nonreachable memory. */ diff --git a/doc/classes/BakedLightmap.xml b/doc/classes/BakedLightmap.xml index 8b4257138f8..c2dcd7b1cfe 100644 --- a/doc/classes/BakedLightmap.xml +++ b/doc/classes/BakedLightmap.xml @@ -81,7 +81,7 @@ The calculated light data. - Determines the amount of samples per texel used in indrect light baking. The amount of samples for each quality level can be configured in the project settings. + Determines the amount of samples per texel used in indirect light baking. The amount of samples for each quality level can be configured in the project settings. Store full color values in the lightmap textures. When disabled, lightmap textures will store a single brightness channel. Can be disabled to reduce disk usage if the scene contains only white lights or you don't mind losing color information in indirect lighting. diff --git a/doc/classes/InputEventJoypadButton.xml b/doc/classes/InputEventJoypadButton.xml index c67d70e054a..dea276b8dba 100644 --- a/doc/classes/InputEventJoypadButton.xml +++ b/doc/classes/InputEventJoypadButton.xml @@ -19,7 +19,7 @@ If [code]true[/code], the button's state is pressed. If [code]false[/code], the button's state is released. - Represents the pressure the user puts on the button with his finger, if the controller supports it. Ranges from [code]0[/code] to [code]1[/code]. + Represents the pressure the user puts on the button with their finger, if the controller supports it. Ranges from [code]0[/code] to [code]1[/code]. diff --git a/doc/translations/ar.po b/doc/translations/ar.po index 0930e5197db..b7a7b2eb099 100644 --- a/doc/translations/ar.po +++ b/doc/translations/ar.po @@ -29095,7 +29095,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/ca.po b/doc/translations/ca.po index 691153fbceb..faabda14652 100644 --- a/doc/translations/ca.po +++ b/doc/translations/ca.po @@ -29042,7 +29042,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/classes.pot b/doc/translations/classes.pot index bb2e760ebbb..c80b0309106 100644 --- a/doc/translations/classes.pot +++ b/doc/translations/classes.pot @@ -28862,7 +28862,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/cs.po b/doc/translations/cs.po index de8385bbd01..accdca70f7d 100644 --- a/doc/translations/cs.po +++ b/doc/translations/cs.po @@ -29533,7 +29533,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/de.po b/doc/translations/de.po index 1088b9e6f70..0ef22df1459 100644 --- a/doc/translations/de.po +++ b/doc/translations/de.po @@ -31228,7 +31228,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/el.po b/doc/translations/el.po index 9ba019ca284..313c89a2f58 100644 --- a/doc/translations/el.po +++ b/doc/translations/el.po @@ -29017,7 +29017,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/es.po b/doc/translations/es.po index 673139340d6..a6a37f59ee6 100644 --- a/doc/translations/es.po +++ b/doc/translations/es.po @@ -38638,7 +38638,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" "Representa la presión que el usuario ejerce sobre el botón con su dedo, si " diff --git a/doc/translations/fa.po b/doc/translations/fa.po index bd209f9fed0..4085efc164e 100644 --- a/doc/translations/fa.po +++ b/doc/translations/fa.po @@ -29436,7 +29436,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/fi.po b/doc/translations/fi.po index daa94f4a29a..18d03e190e5 100644 --- a/doc/translations/fi.po +++ b/doc/translations/fi.po @@ -29020,7 +29020,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/fil.po b/doc/translations/fil.po index ac4a3fe5096..be4f16903ee 100644 --- a/doc/translations/fil.po +++ b/doc/translations/fil.po @@ -28997,7 +28997,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/fr.po b/doc/translations/fr.po index bcd27008e3a..c69fe101799 100644 --- a/doc/translations/fr.po +++ b/doc/translations/fr.po @@ -31229,7 +31229,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/gl.po b/doc/translations/gl.po index 76e7ff8723e..79472c5cb4f 100644 --- a/doc/translations/gl.po +++ b/doc/translations/gl.po @@ -28869,7 +28869,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/hi.po b/doc/translations/hi.po index 15e61071345..5e103814aa6 100644 --- a/doc/translations/hi.po +++ b/doc/translations/hi.po @@ -28867,7 +28867,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/hu.po b/doc/translations/hu.po index 3eb1e9c60d0..590911cfd4e 100644 --- a/doc/translations/hu.po +++ b/doc/translations/hu.po @@ -28884,7 +28884,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/id.po b/doc/translations/id.po index f7f15e54a9a..cf61715d6bd 100644 --- a/doc/translations/id.po +++ b/doc/translations/id.po @@ -29203,7 +29203,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/is.po b/doc/translations/is.po index 5d8ce0484b1..639beffaa7d 100644 --- a/doc/translations/is.po +++ b/doc/translations/is.po @@ -28868,7 +28868,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/it.po b/doc/translations/it.po index b74c2f72876..e6e51c3145f 100644 --- a/doc/translations/it.po +++ b/doc/translations/it.po @@ -29860,7 +29860,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/ja.po b/doc/translations/ja.po index 4d71ede7896..04e3fd5b284 100644 --- a/doc/translations/ja.po +++ b/doc/translations/ja.po @@ -31896,7 +31896,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/ko.po b/doc/translations/ko.po index 37a0251ee3f..2a7a9401aba 100644 --- a/doc/translations/ko.po +++ b/doc/translations/ko.po @@ -29235,7 +29235,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/lv.po b/doc/translations/lv.po index 07b3467ef1e..9dd066910e3 100644 --- a/doc/translations/lv.po +++ b/doc/translations/lv.po @@ -29011,7 +29011,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/mr.po b/doc/translations/mr.po index d904db109ae..6280382df53 100644 --- a/doc/translations/mr.po +++ b/doc/translations/mr.po @@ -28867,7 +28867,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/nb.po b/doc/translations/nb.po index 9f45438090e..c09c01a2063 100644 --- a/doc/translations/nb.po +++ b/doc/translations/nb.po @@ -28877,7 +28877,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/nl.po b/doc/translations/nl.po index ab8bc6906f3..04c0bf527c7 100644 --- a/doc/translations/nl.po +++ b/doc/translations/nl.po @@ -29045,7 +29045,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/pl.po b/doc/translations/pl.po index c1ff9756b2c..2a18edffb42 100644 --- a/doc/translations/pl.po +++ b/doc/translations/pl.po @@ -29485,7 +29485,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/pt.po b/doc/translations/pt.po index aba4e235a6a..d5698e8f03c 100644 --- a/doc/translations/pt.po +++ b/doc/translations/pt.po @@ -28907,7 +28907,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/pt_BR.po b/doc/translations/pt_BR.po index 85766749251..6961600e48f 100644 --- a/doc/translations/pt_BR.po +++ b/doc/translations/pt_BR.po @@ -30037,7 +30037,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/ro.po b/doc/translations/ro.po index 7fe003f0b8a..0d13ea54a7d 100644 --- a/doc/translations/ro.po +++ b/doc/translations/ro.po @@ -29010,7 +29010,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/ru.po b/doc/translations/ru.po index 469dd48e553..8be2888e4e2 100644 --- a/doc/translations/ru.po +++ b/doc/translations/ru.po @@ -30780,7 +30780,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/sk.po b/doc/translations/sk.po index 4c83e63dcbf..5629057958f 100644 --- a/doc/translations/sk.po +++ b/doc/translations/sk.po @@ -28998,7 +28998,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/sr_Cyrl.po b/doc/translations/sr_Cyrl.po index 23b99761729..aa8c28f0bab 100644 --- a/doc/translations/sr_Cyrl.po +++ b/doc/translations/sr_Cyrl.po @@ -29008,7 +29008,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/sv.po b/doc/translations/sv.po index 44b549f8972..4e35dac9c23 100644 --- a/doc/translations/sv.po +++ b/doc/translations/sv.po @@ -28869,7 +28869,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/th.po b/doc/translations/th.po index 1381ed59f30..8c111ff16f6 100644 --- a/doc/translations/th.po +++ b/doc/translations/th.po @@ -29111,7 +29111,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/tl.po b/doc/translations/tl.po index 1e1957cc79a..eb8633ba35a 100644 --- a/doc/translations/tl.po +++ b/doc/translations/tl.po @@ -28941,7 +28941,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/tr.po b/doc/translations/tr.po index 43e48f55ab5..c2345762d6d 100644 --- a/doc/translations/tr.po +++ b/doc/translations/tr.po @@ -29800,7 +29800,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/uk.po b/doc/translations/uk.po index e5dc0ff028d..bac4e9d4859 100644 --- a/doc/translations/uk.po +++ b/doc/translations/uk.po @@ -29149,7 +29149,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/vi.po b/doc/translations/vi.po index ece73d8c481..83c7441c8bd 100644 --- a/doc/translations/vi.po +++ b/doc/translations/vi.po @@ -29338,7 +29338,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/doc/translations/zh_CN.po b/doc/translations/zh_CN.po index 6c32572956e..f61d45173a2 100644 --- a/doc/translations/zh_CN.po +++ b/doc/translations/zh_CN.po @@ -36150,7 +36150,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" "如果控制器支持，则表示用户用手指在按钮上施加的压力。范围从 [code]0[/code] 到 " diff --git a/doc/translations/zh_TW.po b/doc/translations/zh_TW.po index fe3f6df2b00..5db985bed22 100644 --- a/doc/translations/zh_TW.po +++ b/doc/translations/zh_TW.po @@ -29127,7 +29127,7 @@ msgstr "" #: doc/classes/InputEventJoypadButton.xml msgid "" -"Represents the pressure the user puts on the button with his finger, if the " +"Represents the pressure the user puts on the button with their finger, if the " "controller supports it. Ranges from [code]0[/code] to [code]1[/code]." msgstr "" diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index f054ea42e49..b42eb450b04 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -1213,7 +1213,7 @@ bool RasterizerSceneGLES3::_setup_material(RasterizerStorageGLES3::Material *p_m glBindTexture(target, tex); if (t && storage->config.srgb_decode_supported) { - //if SRGB decode extension is present, simply switch the texture to whathever is needed + //if SRGB decode extension is present, simply switch the texture to whatever is needed bool must_srgb = false; if (t->srgb && (texture_hints[i] == ShaderLanguage::ShaderNode::Uniform::HINT_ALBEDO || texture_hints[i] == ShaderLanguage::ShaderNode::Uniform::HINT_BLACK_ALBEDO)) { diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl index 3ff45d2af91..e97d62b5acc 100644 --- a/drivers/gles3/shaders/scene.glsl +++ b/drivers/gles3/shaders/scene.glsl @@ -1768,7 +1768,7 @@ void main() { discard; #endif - //lay out everything, whathever is unused is optimized away anyway + //lay out everything, whatever is unused is optimized away anyway highp vec3 vertex = vertex_interp; vec3 view = -normalize(vertex_interp); vec3 albedo = vec3(1.0); diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 891b896a783..92a36591ffc 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -324,7 +324,7 @@ float EditorAudioBus::_normalized_volume_to_scaled_db(float normalized) { /* There are three different formulas for the conversion from normalized * values to relative decibal values. * One formula is an exponential graph which intends to counteract - * the logorithmic nature of human hearing. This is an approximation + * the logarithmic nature of human hearing. This is an approximation * of the behaviour of a 'logarithmic potentiometer' found on most * musical instruments and also emulated in popular software. * The other two equations are hand-tuned linear tapers that intend to diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index e6cc7efad70..27fa98df786 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -1544,7 +1544,7 @@ Error EditorFileSystem::_reimport_group(const String &p_group_file, const Vector for (List::Element *E = sk.front(); E; E = E->next()) { String param = E->get(); Variant value = config->get_value("params", param); - //override with whathever is in file + //override with whatever is in file source_file_options[p_files[i]][param] = value; } } diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index d4747622edc..bdde11d1a57 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -1697,7 +1697,7 @@ void EditorInspector::update_tree() { if (F->get().label != String()) { ep->set_label(F->get().label); } else { - //use existin one + //use existing one ep->set_label(name); } for (int i = 0; i < F->get().properties.size(); i++) { diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index cadc9c4fcc7..1a24a2a3246 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -535,7 +535,7 @@ String RenameDialog::_postprocess(const String &subject) { // To Lowercase result = result.to_lower(); } else if (case_id == 2) { - // To Upercase + // To Uppercase result = result.to_upper(); } diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp index 9aafa1e5763..36c11fcd3ef 100644 --- a/main/tests/test_math.cpp +++ b/main/tests/test_math.cpp @@ -319,7 +319,7 @@ public: curly_stack++; break; } else { - break; //whathever else + break; //whatever else } } diff --git a/modules/camera/camera_osx.h b/modules/camera/camera_osx.h index 5f125f59654..9d672358399 100644 --- a/modules/camera/camera_osx.h +++ b/modules/camera/camera_osx.h @@ -32,7 +32,7 @@ #define CAMERAOSX_H ///@TODO this is a near duplicate of CameraIOS, we should find a way to combine those to minimize code duplication!!!! -// If you fix something here, make sure you fix it there as wel! +// If you fix something here, make sure you fix it there as well! #include "servers/camera_server.h" diff --git a/modules/camera/camera_osx.mm b/modules/camera/camera_osx.mm index a119a4d028c..330ffe73d0b 100644 --- a/modules/camera/camera_osx.mm +++ b/modules/camera/camera_osx.mm @@ -29,7 +29,7 @@ /*************************************************************************/ ///@TODO this is a near duplicate of CameraIOS, we should find a way to combine those to minimize code duplication!!!! -// If you fix something here, make sure you fix it there as wel! +// If you fix something here, make sure you fix it there as well! #include "camera_osx.h" #include "servers/camera/camera_feed.h" diff --git a/modules/gdnative/include/nativescript/godot_nativescript.h b/modules/gdnative/include/nativescript/godot_nativescript.h index 1edb2c8d490..eb8575fdd3c 100644 --- a/modules/gdnative/include/nativescript/godot_nativescript.h +++ b/modules/gdnative/include/nativescript/godot_nativescript.h @@ -145,7 +145,7 @@ typedef struct { } godot_method_attributes; typedef struct { - // instance pointer, method data, user data, num args, args - return result as varaint + // instance pointer, method data, user data, num args, args - return result as variant GDCALLINGCONV godot_variant (*method)(godot_object *, void *, void *, int, godot_variant **); void *method_data; GDCALLINGCONV void (*free_func)(void *); diff --git a/modules/mono/mono_gd/gd_mono_class.cpp b/modules/mono/mono_gd/gd_mono_class.cpp index f70c27a3140..a7bbac2349f 100644 --- a/modules/mono/mono_gd/gd_mono_class.cpp +++ b/modules/mono/mono_gd/gd_mono_class.cpp @@ -187,7 +187,7 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base #ifdef DEBUG_ENABLED // For debug builds, we also fetched from native base classes as well before if this is not a native base class. - // This allows us to warn the user here if he is using snake_case by mistake. + // This allows us to warn the user here if they are using snake_case by mistake. if (p_native_base != this) { GDMonoClass *native_top = p_native_base; diff --git a/modules/visual_script/visual_script_flow_control.cpp b/modules/visual_script/visual_script_flow_control.cpp index b54f2273d4c..98e51d8b1f9 100644 --- a/modules/visual_script/visual_script_flow_control.cpp +++ b/modules/visual_script/visual_script_flow_control.cpp @@ -778,7 +778,7 @@ public: } if (!ResourceCache::has(script)) { - //if the script is not in use by anyone, we can safely assume whathever we got is not casting to it. + //if the script is not in use by anyone, we can safely assume whatever we got is not casting to it. return 1; } Ref