diff options
| author | Haoyu Qiu <timothyqiu32@gmail.com> | 2023-03-02 14:13:33 +0800 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-03-06 10:10:02 +0100 |
| commit | 17a130cbd153be806c3e18c5d3098f256f050bda (patch) | |
| tree | 41983f317fa3de9643f4a5688493cbc8ba6ed1c7 | |
| parent | 47114a77f809b07f0b58fe3562b7b6c9fd3b3425 (diff) | |
Fix "Convert Full Project" button not translated
Also fixes a typo in the CHANGELOG.
(cherry picked from commit e03bfd6f7fef1845dff544a3b0acb62d2af2b0ad)
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | editor/project_manager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 728434526f..008aa0db3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -932,7 +932,7 @@ See the [release announcement](https://godotengine.org/article/godot-3-4-is-rele - Fix and clean disabled shapes handling in Godot physics servers ([GH-49845](https://github.com/godotengine/godot/pull/49845)). - Fix `KinematicBody` axis lock ([GH-45176](https://github.com/godotengine/godot/pull/45176)). - Don't override `KinematicCollision` reference when still in use in script ([GH-52955](https://github.com/godotengine/godot/pull/52955)). -- Fix ragdoll simulation when parent was readded to scene ([GH-48823](https://github.com/godotengine/godot/pull/48823)). +- Fix ragdoll simulation when parent was re-added to scene ([GH-48823](https://github.com/godotengine/godot/pull/48823)). - Ignore disabled shapes for mass property calculations ([GH-49699](https://github.com/godotengine/godot/pull/49699)). #### Porting diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 2f3f4dd2e1..341a2f519d 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -2974,7 +2974,7 @@ ProjectManager::ProjectManager() { ask_update_settings = memnew(ConfirmationDialog); ask_update_settings->set_autowrap(true); ask_update_settings->get_ok_button()->connect("pressed", callable_mp(this, &ProjectManager::_confirm_update_settings)); - full_convert_button = ask_update_settings->add_button("Convert Full Project", !GLOBAL_GET("gui/common/swap_cancel_ok")); + full_convert_button = ask_update_settings->add_button(TTR("Convert Full Project"), !GLOBAL_GET("gui/common/swap_cancel_ok")); full_convert_button->connect("pressed", callable_mp(this, &ProjectManager::_full_convert_button_pressed)); add_child(ask_update_settings); |