diff options
Diffstat (limited to 'editor')
163 files changed, 4331 insertions, 6908 deletions
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index e66aa88eb9..83047caf98 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -37,6 +37,7 @@ #include "editor/editor_scale.h" #include "editor/plugins/animation_player_editor_plugin.h" #include "scene/animation/animation_player.h" +#include "scene/gui/separator.h" #include "scene/gui/view_panner.h" #include "scene/main/window.h" #include "scene/scene_string_names.h" diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index 18ce2ded63..cb7d3c7d96 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation_track_editor.h @@ -33,11 +33,14 @@ #include "editor/editor_data.h" #include "editor/editor_spin_slider.h" -#include "editor/property_editor.h" #include "editor/property_selector.h" +#include "scene/3d/node_3d.h" +#include "scene/gui/check_box.h" #include "scene/gui/control.h" #include "scene/gui/menu_button.h" +#include "scene/gui/option_button.h" +#include "scene/gui/panel_container.h" #include "scene/gui/scroll_bar.h" #include "scene/gui/slider.h" #include "scene/gui/spin_box.h" diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 99ca82b311..b0eb384efc 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -1045,6 +1045,8 @@ void CodeTextEditor::update_editor_settings() { guideline_cols.append(EditorSettings::get_singleton()->get("text_editor/appearance/guidelines/line_length_guideline_soft_column")); } text_editor->set_line_length_guidelines(guideline_cols); + } else { + text_editor->set_line_length_guidelines(TypedArray<int>()); } } diff --git a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp index 92ea0f15e9..4c445eb766 100644 --- a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp @@ -37,6 +37,7 @@ #include "editor/doc_tools.h" #include "editor/editor_log.h" #include "editor/editor_node.h" +#include "editor/editor_settings.h" DebugAdapterProtocol *DebugAdapterProtocol::singleton = nullptr; diff --git a/editor/debugger/debug_adapter/debug_adapter_server.cpp b/editor/debugger/debug_adapter/debug_adapter_server.cpp index e9fc7ec913..41e6b1f308 100644 --- a/editor/debugger/debug_adapter/debug_adapter_server.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_server.cpp @@ -33,6 +33,7 @@ #include "core/os/os.h" #include "editor/editor_log.h" #include "editor/editor_node.h" +#include "editor/editor_settings.h" DebugAdapterServer::DebugAdapterServer() { _EDITOR_DEF("network/debug_adapter/remote_port", remote_port); diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp index bdab1cfecb..dbd2c61d44 100644 --- a/editor/debugger/editor_debugger_tree.cpp +++ b/editor/debugger/editor_debugger_tree.cpp @@ -225,6 +225,39 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int updating_scene_tree = false; } +Variant EditorDebuggerTree::get_drag_data(const Point2 &p_point) { + if (get_button_id_at_position(p_point) != -1) { + return Variant(); + } + + TreeItem *selected = get_selected(); + if (!selected) { + return Variant(); + } + + String path = selected->get_text(0); + + HBoxContainer *hb = memnew(HBoxContainer); + TextureRect *tf = memnew(TextureRect); + tf->set_texture(selected->get_icon(0)); + tf->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED); + hb->add_child(tf); + Label *label = memnew(Label(path)); + hb->add_child(label); + set_drag_preview(hb); + + if (!selected->get_parent() || !selected->get_parent()->get_parent()) { + path = "."; + } else { + while (selected->get_parent()->get_parent() != get_root()) { + selected = selected->get_parent(); + path = selected->get_text(0) + "/" + path; + } + } + + return vformat("\"%s\"", path); +} + String EditorDebuggerTree::get_selected_path() { if (!get_selected()) { return ""; diff --git a/editor/debugger/editor_debugger_tree.h b/editor/debugger/editor_debugger_tree.h index 9d163fd548..5b2df8abd5 100644 --- a/editor/debugger/editor_debugger_tree.h +++ b/editor/debugger/editor_debugger_tree.h @@ -65,6 +65,8 @@ protected: void _notification(int p_what); public: + virtual Variant get_drag_data(const Point2 &p_point) override; + String get_selected_path(); ObjectID get_selected_object(); int get_current_debugger(); // Would love to have one tree for every debugger. diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 41095a7267..ac2e958c5b 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -50,7 +50,6 @@ #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/plugins/editor_debugger_plugin.h" #include "editor/plugins/node_3d_editor_plugin.h" -#include "editor/property_editor.h" #include "main/performance.h" #include "scene/3d/camera_3d.h" #include "scene/debugger/scene_debugger.h" diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 4f89e1b2d1..43961a7ceb 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -37,6 +37,7 @@ #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/gui/margin_container.h" void DependencyEditor::_searched(const String &p_path) { @@ -416,6 +417,45 @@ void DependencyRemoveDialog::_find_all_removed_dependencies(EditorFileSystemDire } } +void DependencyRemoveDialog::_find_localization_remaps_of_removed_files(Vector<RemovedDependency> &p_removed) { + for (KeyValue<String, String> &files : all_remove_files) { + const String &path = files.key; + + // Look for dependencies in the translation remaps. + if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/translation_remaps")) { + Dictionary remaps = ProjectSettings::get_singleton()->get("internationalization/locale/translation_remaps"); + + if (remaps.has(path)) { + RemovedDependency dep; + dep.file = TTR("Localization remap"); + dep.file_type = ""; + dep.dependency = path; + dep.dependency_folder = files.value; + p_removed.push_back(dep); + } + + Array remap_keys = remaps.keys(); + for (int j = 0; j < remap_keys.size(); j++) { + PackedStringArray remapped_files = remaps[remap_keys[j]]; + for (int k = 0; k < remapped_files.size(); k++) { + int splitter_pos = remapped_files[k].rfind(":"); + String res_path = remapped_files[k].substr(0, splitter_pos); + if (res_path == path) { + String locale_name = remapped_files[k].substr(splitter_pos + 1); + + RemovedDependency dep; + dep.file = vformat(TTR("Localization remap for path '%s' and locale '%s'."), remap_keys[j], locale_name); + dep.file_type = ""; + dep.dependency = path; + dep.dependency_folder = files.value; + p_removed.push_back(dep); + } + } + } + } + } +} + void DependencyRemoveDialog::_build_removed_dependency_tree(const Vector<RemovedDependency> &p_removed) { owners->clear(); owners->create_item(); // root @@ -472,6 +512,7 @@ void DependencyRemoveDialog::show(const Vector<String> &p_folders, const Vector< Vector<RemovedDependency> removed_deps; _find_all_removed_dependencies(EditorFileSystem::get_singleton()->get_filesystem(), removed_deps); + _find_localization_remaps_of_removed_files(removed_deps); removed_deps.sort(); if (removed_deps.is_empty()) { owners->hide(); diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h index 96d82d58eb..6e39015ec3 100644 --- a/editor/dependency_editor.h +++ b/editor/dependency_editor.h @@ -119,6 +119,7 @@ class DependencyRemoveDialog : public ConfirmationDialog { void _find_files_in_removed_folder(EditorFileSystemDirectory *efsd, const String &p_folder); void _find_all_removed_dependencies(EditorFileSystemDirectory *efsd, Vector<RemovedDependency> &p_removed); + void _find_localization_remaps_of_removed_files(Vector<RemovedDependency> &p_removed); void _build_removed_dependency_tree(const Vector<RemovedDependency> &p_removed); void ok_pressed() override; diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 556a0176cb..b6d7bbc45f 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -37,6 +37,7 @@ #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "filesystem_dock.h" #include "scene/resources/font.h" #include "servers/audio_server.h" diff --git a/editor/editor_build_profile.cpp b/editor/editor_build_profile.cpp index d093ab518e..0f0ab4a339 100644 --- a/editor/editor_build_profile.cpp +++ b/editor/editor_build_profile.cpp @@ -46,19 +46,68 @@ const char *EditorBuildProfile::build_option_identifiers[BUILD_OPTION_MAX] = { "disable_3d_physics", "disable_navigation", "openxr", + "rendering_device", // FIXME: there's no scons option to disable rendering device "opengl3", "vulkan", + "module_text_server_fb_enabled", + "module_text_server_adv_enabled", + "module_freetype_enabled", + "brotli", + "graphite", + "module_msdfgen_enabled" +}; + +const bool EditorBuildProfile::build_option_disabled_by_default[BUILD_OPTION_MAX] = { + // This maps to SCons build options. + false, // 3D + false, // PHYSICS_2D + false, // PHYSICS_3D + false, // NAVIGATION + false, // XR + false, // RENDERING_DEVICE + false, // OPENGL + false, // VULKAN + true, // TEXT_SERVER_FALLBACK + false, // TEXT_SERVER_COMPLEX + false, // DYNAMIC_FONTS + false, // WOFF2_FONTS + false, // GRPAHITE_FONTS + false, // MSDFGEN }; const bool EditorBuildProfile::build_option_disable_values[BUILD_OPTION_MAX] = { // This maps to SCons build options. - true, - true, - true, - true, - false, - false, - false + true, // 3D + true, // PHYSICS_2D + true, // PHYSICS_3D + true, // NAVIGATION + false, // XR + false, // RENDERING_DEVICE + false, // OPENGL + false, // VULKAN + false, // TEXT_SERVER_FALLBACK + false, // TEXT_SERVER_COMPLEX + false, // DYNAMIC_FONTS + false, // WOFF2_FONTS + false, // GRPAHITE_FONTS + false, // MSDFGEN +}; + +const EditorBuildProfile::BuildOptionCategory EditorBuildProfile::build_option_category[BUILD_OPTION_MAX] = { + BUILD_OPTION_CATEGORY_GENERAL, // 3D + BUILD_OPTION_CATEGORY_GENERAL, // PHYSICS_2D + BUILD_OPTION_CATEGORY_GENERAL, // PHYSICS_3D + BUILD_OPTION_CATEGORY_GENERAL, // NAVIGATION + BUILD_OPTION_CATEGORY_GENERAL, // XR + BUILD_OPTION_CATEGORY_GENERAL, // RENDERING_DEVICE + BUILD_OPTION_CATEGORY_GENERAL, // OPENGL + BUILD_OPTION_CATEGORY_GENERAL, // VULKAN + BUILD_OPTION_CATEGORY_TEXT_SERVER, // TEXT_SERVER_FALLBACK + BUILD_OPTION_CATEGORY_TEXT_SERVER, // TEXT_SERVER_COMPLEX + BUILD_OPTION_CATEGORY_TEXT_SERVER, // DYNAMIC_FONTS + BUILD_OPTION_CATEGORY_TEXT_SERVER, // WOFF2_FONTS + BUILD_OPTION_CATEGORY_TEXT_SERVER, // GRPAHITE_FONTS + BUILD_OPTION_CATEGORY_TEXT_SERVER, // MSDFGEN }; void EditorBuildProfile::set_disable_class(const StringName &p_class, bool p_disabled) { @@ -127,6 +176,12 @@ String EditorBuildProfile::get_build_option_name(BuildOption p_build_option) { TTRC("RenderingDevice"), TTRC("OpenGL"), TTRC("Vulkan"), + TTRC("Text Server: Fallback"), + TTRC("Text Server: Advanced"), + TTRC("TTF, OTF, Type 1, WOFF1 Fonts"), + TTRC("WOFF2 Fonts"), + TTRC("SIL Graphite Fonts"), + TTRC("Multi-channel Signed Distance Field Font Rendering"), }; return TTRGET(build_option_names[p_build_option]); } @@ -143,11 +198,33 @@ String EditorBuildProfile::get_build_option_description(BuildOption p_build_opti TTRC("RenderingDevice based rendering (if disabled, the OpenGL back-end is required)."), TTRC("OpenGL back-end (if disabled, the RenderingDevice back-end is required)."), TTRC("Vulkan back-end of RenderingDevice."), + TTRC("Fallback implementation of Text Server\nSupports basic text layouts."), + TTRC("Text Server implementation powered by ICU and HarfBuzz libraries.\nSupports complex text layouts, BiDi, and contextual OpenType font features."), + TTRC("TrueType, OpenType, Type 1, and WOFF1 font format support using FreeType library (if disabled, WOFF2 support is also disabled)."), + TTRC("WOFF2 font format support using FreeType and Brotli libraries."), + TTRC("SIL Graphite smart font technology support (supported by Advanced Text Server only)."), + TTRC("Multi-channel signed distance field font rendering support using msdfgen library (pre-rendered MSDF fonts can be used even if this option disabled)."), }; return TTRGET(build_option_descriptions[p_build_option]); } +EditorBuildProfile::BuildOptionCategory EditorBuildProfile::get_build_option_category(BuildOption p_build_option) { + ERR_FAIL_INDEX_V(p_build_option, BUILD_OPTION_MAX, BUILD_OPTION_CATEGORY_GENERAL); + return build_option_category[p_build_option]; +} + +String EditorBuildProfile::get_build_option_category_name(BuildOptionCategory p_build_option_category) { + ERR_FAIL_INDEX_V(p_build_option_category, BUILD_OPTION_CATEGORY_MAX, String()); + + const char *build_option_subcategories[BUILD_OPTION_CATEGORY_MAX]{ + TTRC("General Features:"), + TTRC("Text Rendering and Font Options:"), + }; + + return TTRGET(build_option_subcategories[p_build_option_category]); +} + Error EditorBuildProfile::save_to_file(const String &p_path) { Dictionary data; data["type"] = "build_profile"; @@ -160,8 +237,12 @@ Error EditorBuildProfile::save_to_file(const String &p_path) { Dictionary dis_build_options; for (int i = 0; i < BUILD_OPTION_MAX; i++) { - if (build_options_disabled[i]) { - dis_build_options[build_option_identifiers[i]] = build_option_disable_values[i]; + if (build_options_disabled[i] != build_option_disabled_by_default[i]) { + if (build_options_disabled[i]) { + dis_build_options[build_option_identifiers[i]] = build_option_disable_values[i]; + } else { + dis_build_options[build_option_identifiers[i]] = !build_option_disable_values[i]; + } } } @@ -211,7 +292,7 @@ Error EditorBuildProfile::load_from_file(const String &p_path) { } for (int i = 0; i < BUILD_OPTION_MAX; i++) { - build_options_disabled[i] = false; + build_options_disabled[i] = build_option_disabled_by_default[i]; } if (data.has("disabled_build_options")) { @@ -259,10 +340,24 @@ void EditorBuildProfile::_bind_methods() { BIND_ENUM_CONSTANT(BUILD_OPTION_RENDERING_DEVICE); BIND_ENUM_CONSTANT(BUILD_OPTION_OPENGL); BIND_ENUM_CONSTANT(BUILD_OPTION_VULKAN); + BIND_ENUM_CONSTANT(BUILD_OPTION_TEXT_SERVER_FALLBACK); + BIND_ENUM_CONSTANT(BUILD_OPTION_TEXT_SERVER_ADVANCED); + BIND_ENUM_CONSTANT(BUILD_OPTION_DYNAMIC_FONTS); + BIND_ENUM_CONSTANT(BUILD_OPTION_WOFF2_FONTS); + BIND_ENUM_CONSTANT(BUILD_OPTION_GRPAHITE_FONTS); + BIND_ENUM_CONSTANT(BUILD_OPTION_MSDFGEN); BIND_ENUM_CONSTANT(BUILD_OPTION_MAX); + + BIND_ENUM_CONSTANT(BUILD_OPTION_CATEGORY_GENERAL); + BIND_ENUM_CONSTANT(BUILD_OPTION_CATEGORY_TEXT_SERVER); + BIND_ENUM_CONSTANT(BUILD_OPTION_CATEGORY_MAX); } -EditorBuildProfile::EditorBuildProfile() {} +EditorBuildProfile::EditorBuildProfile() { + for (int i = 0; i < EditorBuildProfile::BUILD_OPTION_MAX; i++) { + build_options_disabled[i] = build_option_disabled_by_default[i]; + } +} ////////////////////////// @@ -633,11 +728,18 @@ void EditorBuildProfileManager::_update_edited_profile() { TreeItem *root = class_list->create_item(); - TreeItem *build_options = class_list->create_item(root); - build_options->set_text(0, TTR("General Features:")); + HashMap<EditorBuildProfile::BuildOptionCategory, TreeItem *> subcats; + for (int i = 0; i < EditorBuildProfile::BUILD_OPTION_CATEGORY_MAX; i++) { + TreeItem *build_cat; + build_cat = class_list->create_item(root); + + build_cat->set_text(0, EditorBuildProfile::get_build_option_category_name(EditorBuildProfile::BuildOptionCategory(i))); + subcats[EditorBuildProfile::BuildOptionCategory(i)] = build_cat; + } + for (int i = 0; i < EditorBuildProfile::BUILD_OPTION_MAX; i++) { TreeItem *build_option; - build_option = class_list->create_item(build_options); + build_option = class_list->create_item(subcats[EditorBuildProfile::get_build_option_category(EditorBuildProfile::BuildOption(i))]); build_option->set_cell_mode(0, TreeItem::CELL_MODE_CHECK); build_option->set_text(0, EditorBuildProfile::get_build_option_name(EditorBuildProfile::BuildOption(i))); diff --git a/editor/editor_build_profile.h b/editor/editor_build_profile.h index bb6494b8c9..606c415429 100644 --- a/editor/editor_build_profile.h +++ b/editor/editor_build_profile.h @@ -53,7 +53,19 @@ public: BUILD_OPTION_RENDERING_DEVICE, BUILD_OPTION_OPENGL, BUILD_OPTION_VULKAN, - BUILD_OPTION_MAX + BUILD_OPTION_TEXT_SERVER_FALLBACK, + BUILD_OPTION_TEXT_SERVER_ADVANCED, + BUILD_OPTION_DYNAMIC_FONTS, + BUILD_OPTION_WOFF2_FONTS, + BUILD_OPTION_GRPAHITE_FONTS, + BUILD_OPTION_MSDFGEN, + BUILD_OPTION_MAX, + }; + + enum BuildOptionCategory { + BUILD_OPTION_CATEGORY_GENERAL, + BUILD_OPTION_CATEGORY_TEXT_SERVER, + BUILD_OPTION_CATEGORY_MAX, }; private: @@ -65,7 +77,9 @@ private: bool build_options_disabled[BUILD_OPTION_MAX] = {}; static const char *build_option_identifiers[BUILD_OPTION_MAX]; + static const bool build_option_disabled_by_default[BUILD_OPTION_MAX]; static const bool build_option_disable_values[BUILD_OPTION_MAX]; + static const BuildOptionCategory build_option_category[BUILD_OPTION_MAX]; String _get_build_option_name(BuildOption p_build_option) { return get_build_option_name(p_build_option); } @@ -93,11 +107,15 @@ public: static String get_build_option_name(BuildOption p_build_option); static String get_build_option_description(BuildOption p_build_option); static bool get_build_option_disable_value(BuildOption p_build_option); + static BuildOptionCategory get_build_option_category(BuildOption p_build_option); + + static String get_build_option_category_name(BuildOptionCategory p_build_option_category); EditorBuildProfile(); }; VARIANT_ENUM_CAST(EditorBuildProfile::BuildOption) +VARIANT_ENUM_CAST(EditorBuildProfile::BuildOptionCategory) class EditorFileSystemDirectory; diff --git a/editor/editor_command_palette.cpp b/editor/editor_command_palette.cpp index 174a97d471..ba1f2fd6af 100644 --- a/editor/editor_command_palette.cpp +++ b/editor/editor_command_palette.cpp @@ -32,6 +32,7 @@ #include "core/os/keyboard.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/gui/control.h" #include "scene/gui/tree.h" diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index ab6dec7eeb..f0bf9fd5b3 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -324,6 +324,11 @@ void EditorFeatureProfileManager::_notification(int p_what) { } _update_profile_list(current_profile); } break; + + case NOTIFICATION_THEME_CHANGED: { + // Make sure that the icons are correctly adjusted if the theme's lightness was switched. + _update_selected_profile(); + } break; } } diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp index 424195e4dd..297d1226e3 100644 --- a/editor/editor_help_search.cpp +++ b/editor/editor_help_search.cpp @@ -34,6 +34,7 @@ #include "editor/editor_feature_profile.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" void EditorHelpSearch::_update_icons() { search_box->set_right_icon(results_tree->get_theme_icon(SNAME("Search"), SNAME("EditorIcons"))); diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 57acc0b2c5..d11c659b98 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -471,6 +471,9 @@ void EditorProperty::update_revert_and_pin_status() { bool new_can_revert = EditorPropertyRevert::can_property_revert(object, property, ¤t) && !is_read_only(); if (new_can_revert != can_revert || new_pinned != pinned) { + if (new_can_revert != can_revert) { + emit_signal(SNAME("property_can_revert_changed"), property, new_can_revert); + } can_revert = new_can_revert; pinned = new_pinned; update(); @@ -784,6 +787,9 @@ void EditorProperty::expand_all_folding() { void EditorProperty::collapse_all_folding() { } +void EditorProperty::expand_revertable() { +} + void EditorProperty::set_selectable(bool p_selectable) { selectable = p_selectable; } @@ -966,6 +972,7 @@ void EditorProperty::_bind_methods() { ADD_SIGNAL(MethodInfo("property_keyed_with_value", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::NIL, "value", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NIL_IS_VARIANT))); ADD_SIGNAL(MethodInfo("property_checked", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::BOOL, "checked"))); ADD_SIGNAL(MethodInfo("property_pinned", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::BOOL, "pinned"))); + ADD_SIGNAL(MethodInfo("property_can_revert_changed", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::BOOL, "can_revert"))); ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::STRING, "path"), PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"))); ADD_SIGNAL(MethodInfo("object_id_selected", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::INT, "id"))); ADD_SIGNAL(MethodInfo("selected", PropertyInfo(Variant::STRING, "path"), PropertyInfo(Variant::INT, "focusable_idx"))); @@ -1225,12 +1232,15 @@ void EditorInspectorSection::_notification(int p_what) { // Get the section header font. Ref<Font> font = get_theme_font(SNAME("bold"), SNAME("EditorFonts")); int font_size = get_theme_font_size(SNAME("bold_size"), SNAME("EditorFonts")); + Color font_color = get_theme_color(SNAME("font_color"), SNAME("Editor")); // Get the right direction arrow texture, if the section is foldable. Ref<Texture2D> arrow; + bool folded = foldable; if (foldable) { if (object->editor_is_section_unfolded(section)) { arrow = get_theme_icon(SNAME("arrow"), SNAME("Tree")); + folded = false; } else { if (is_layout_rtl()) { arrow = get_theme_icon(SNAME("arrow_collapsed_mirrored"), SNAME("Tree")); @@ -1274,28 +1284,71 @@ void EditorInspectorSection::_notification(int p_what) { } draw_rect(header_rect, c); - // Draw header title and folding arrow. - const int arrow_margin = 2; - const int arrow_width = arrow.is_valid() ? arrow->get_width() : 0; - Color color = get_theme_color(SNAME("font_color")); - float text_width = get_size().width - Math::round(arrow_width + arrow_margin * EDSCALE) - section_indent; - Point2 text_offset = Point2(0, font->get_ascent(font_size) + (header_height - font->get_height(font_size)) / 2); - HorizontalAlignment text_align = HORIZONTAL_ALIGNMENT_LEFT; - if (rtl) { - text_align = HORIZONTAL_ALIGNMENT_RIGHT; - } else { - text_offset.x = section_indent + Math::round(arrow_width + arrow_margin * EDSCALE); - } - draw_string(font, text_offset.floor(), label, text_align, text_width, font_size, color); + // Draw header title, folding arrow and coutn of revertable properties. + { + int separation = Math::round(2 * EDSCALE); - if (arrow.is_valid()) { - Point2 arrow_position = Point2(0, (header_height - arrow->get_height()) / 2); + int margin_start = section_indent + separation; + int margin_end = separation; + + // - Arrow. + if (arrow.is_valid()) { + Point2 arrow_position; + if (rtl) { + arrow_position.x = get_size().width - (margin_start + arrow->get_width()); + } else { + arrow_position.x = margin_start; + } + arrow_position.y = (header_height - arrow->get_height()) / 2; + draw_texture(arrow, arrow_position); + margin_start += arrow->get_width(); + } + + int available = get_size().width - (margin_start + margin_end); + + // - Count of revertable properties. + String num_revertable_str; + int num_revertable_width = 0; + if (folded && revertable_properties.size()) { + int label_width = font->get_string_size(label, HORIZONTAL_ALIGNMENT_LEFT, available, font_size, TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_CONSTRAIN_ELLIPSIS).x; + + Ref<Font> light_font = get_theme_font(SNAME("main"), SNAME("EditorFonts")); + int light_font_size = get_theme_font_size(SNAME("main_size"), SNAME("EditorFonts")); + Color light_font_color = get_theme_color(SNAME("disabled_font_color"), SNAME("Editor")); + + // Can we fit the long version of the revertable count text? + if (revertable_properties.size() == 1) { + num_revertable_str = "(1 change)"; + } else { + num_revertable_str = vformat("(%d changes)", revertable_properties.size()); + } + num_revertable_width = light_font->get_string_size(num_revertable_str, HORIZONTAL_ALIGNMENT_LEFT, -1.0f, light_font_size, TextServer::JUSTIFICATION_NONE).x; + if (label_width + separation + num_revertable_width > available) { + // We'll have to use the short version. + num_revertable_str = vformat("(%d)", revertable_properties.size()); + num_revertable_width = light_font->get_string_size(num_revertable_str, HORIZONTAL_ALIGNMENT_LEFT, -1.0f, light_font_size, TextServer::JUSTIFICATION_NONE).x; + } + + Point2 text_offset = Point2( + margin_end, + light_font->get_ascent(light_font_size) + (header_height - light_font->get_height(light_font_size)) / 2); + if (!rtl) { + text_offset.x = get_size().width - (text_offset.x + num_revertable_width); + } + draw_string(light_font, text_offset, num_revertable_str, HORIZONTAL_ALIGNMENT_LEFT, -1.0f, light_font_size, light_font_color, TextServer::JUSTIFICATION_NONE); + margin_end += num_revertable_width + separation; + available -= num_revertable_width + separation; + } + + // - Label. + Point2 text_offset = Point2( + margin_start, + font->get_ascent(font_size) + (header_height - font->get_height(font_size)) / 2); if (rtl) { - arrow_position.x = get_size().width - section_indent - arrow->get_width() - Math::round(arrow_margin * EDSCALE); - } else { - arrow_position.x = section_indent + Math::round(arrow_margin * EDSCALE); + text_offset.x = margin_end; } - draw_texture(arrow, arrow_position.floor()); + HorizontalAlignment text_align = rtl ? HORIZONTAL_ALIGNMENT_RIGHT : HORIZONTAL_ALIGNMENT_LEFT; + draw_string(font, text_offset, label, text_align, available, font_size, font_color, TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_CONSTRAIN_ELLIPSIS); } // Draw dropping highlight. @@ -1471,6 +1524,22 @@ void EditorInspectorSection::fold() { update(); } +bool EditorInspectorSection::has_revertable_properties() const { + return !revertable_properties.is_empty(); +} + +void EditorInspectorSection::property_can_revert_changed(const String &p_path, bool p_can_revert) { + bool had_revertable_properties = has_revertable_properties(); + if (p_can_revert) { + revertable_properties.insert(p_path); + } else { + revertable_properties.erase(p_path); + } + if (has_revertable_properties() != had_revertable_properties) { + update(); + } +} + void EditorInspectorSection::_bind_methods() { ClassDB::bind_method(D_METHOD("setup", "section", "label", "object", "bg_color", "foldable"), &EditorInspectorSection::setup); ClassDB::bind_method(D_METHOD("get_vbox"), &EditorInspectorSection::get_vbox); @@ -1608,7 +1677,7 @@ void EditorInspectorArray::_panel_gui_input(Ref<InputEvent> p_event, int p_index Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid()) { - if (mb->get_button_index() == MouseButton::RIGHT) { + if (movable && mb->get_button_index() == MouseButton::RIGHT) { popup_array_index_pressed = begin_array_index + p_index; rmb_popup->set_item_disabled(OPTION_MOVE_UP, popup_array_index_pressed == 0); rmb_popup->set_item_disabled(OPTION_MOVE_DOWN, popup_array_index_pressed == count - 1); @@ -1643,43 +1712,112 @@ void EditorInspectorArray::_move_element(int p_element_index, int p_to_pos) { } } else if (mode == MODE_USE_COUNT_PROPERTY) { ERR_FAIL_COND(p_to_pos < -1 || p_to_pos > count); - List<PropertyInfo> object_property_list; - object->get_property_list(&object_property_list); - Array properties_as_array = _extract_properties_as_array(object_property_list); - properties_as_array.resize(count); + if (!swap_method.is_empty()) { + ERR_FAIL_COND(!object->has_method(swap_method)); - // For undoing things - undo_redo->add_undo_property(object, count_property, properties_as_array.size()); - for (int i = 0; i < (int)properties_as_array.size(); i++) { - Dictionary d = Dictionary(properties_as_array[i]); - Array keys = d.keys(); - for (int j = 0; j < keys.size(); j++) { - String key = keys[j]; - undo_redo->add_undo_property(object, vformat(key, i), d[key]); - } - } + // Swap method was provided, use it. + if (p_element_index < 0) { + // Add an element at position + undo_redo->add_do_property(object, count_property, count + 1); + if (p_to_pos >= 0) { + for (int i = count; i > p_to_pos; i--) { + undo_redo->add_do_method(object, swap_method, i, i - 1); + } + for (int i = p_to_pos; i < count; i++) { + undo_redo->add_undo_method(object, swap_method, i, i + 1); + } + } + undo_redo->add_undo_property(object, count_property, count); + + } else if (p_to_pos < 0) { + if (count > 0) { + // Remove element at position + undo_redo->add_undo_property(object, count_property, count); - if (p_element_index < 0) { - // Add an element. - properties_as_array.insert(p_to_pos < 0 ? properties_as_array.size() : p_to_pos, Dictionary()); - } else if (p_to_pos < 0) { - // Delete the element. - properties_as_array.remove_at(p_element_index); + List<PropertyInfo> object_property_list; + object->get_property_list(&object_property_list); + + for (int i = p_element_index; i < count - 1; i++) { + undo_redo->add_do_method(object, swap_method, i, i + 1); + } + + for (int i = count; i > p_element_index; i--) { + undo_redo->add_undo_method(object, swap_method, i, i - 1); + } + + String erase_prefix = String(array_element_prefix) + itos(p_element_index); + + for (const PropertyInfo &E : object_property_list) { + if (E.name.begins_with(erase_prefix)) { + undo_redo->add_undo_property(object, E.name, object->get(E.name)); + } + } + + undo_redo->add_do_property(object, count_property, count - 1); + } + } else { + if (p_to_pos > p_element_index) { + p_to_pos--; + } + + if (p_to_pos < p_element_index) { + for (int i = p_element_index; i > p_to_pos; i--) { + undo_redo->add_do_method(object, swap_method, i, i - 1); + } + for (int i = p_to_pos; i < p_element_index; i++) { + undo_redo->add_undo_method(object, swap_method, i, i + 1); + } + } else if (p_to_pos > p_element_index) { + for (int i = p_element_index; i < p_to_pos; i++) { + undo_redo->add_do_method(object, swap_method, i, i + 1); + } + + for (int i = p_to_pos; i > p_element_index; i--) { + undo_redo->add_undo_method(object, swap_method, i, i - 1); + } + } + } } else { - // Move the element. - properties_as_array.insert(p_to_pos, properties_as_array[p_element_index].duplicate()); - properties_as_array.remove_at(p_to_pos < p_element_index ? p_element_index + 1 : p_element_index); - } + // Use standard properties. + List<PropertyInfo> object_property_list; + object->get_property_list(&object_property_list); - // Change the array size then set the properties. - undo_redo->add_do_property(object, count_property, properties_as_array.size()); - for (int i = 0; i < (int)properties_as_array.size(); i++) { - Dictionary d = properties_as_array[i]; - Array keys = d.keys(); - for (int j = 0; j < keys.size(); j++) { - String key = keys[j]; - undo_redo->add_do_property(object, vformat(key, i), d[key]); + Array properties_as_array = _extract_properties_as_array(object_property_list); + properties_as_array.resize(count); + + // For undoing things + undo_redo->add_undo_property(object, count_property, properties_as_array.size()); + for (int i = 0; i < (int)properties_as_array.size(); i++) { + Dictionary d = Dictionary(properties_as_array[i]); + Array keys = d.keys(); + for (int j = 0; j < keys.size(); j++) { + String key = keys[j]; + undo_redo->add_undo_property(object, vformat(key, i), d[key]); + } + } + + if (p_element_index < 0) { + // Add an element. + properties_as_array.insert(p_to_pos < 0 ? properties_as_array.size() : p_to_pos, Dictionary()); + } else if (p_to_pos < 0) { + // Delete the element. + properties_as_array.remove_at(p_element_index); + } else { + // Move the element. + properties_as_array.insert(p_to_pos, properties_as_array[p_element_index].duplicate()); + properties_as_array.remove_at(p_to_pos < p_element_index ? p_element_index + 1 : p_element_index); + } + + // Change the array size then set the properties. + undo_redo->add_do_property(object, count_property, properties_as_array.size()); + for (int i = 0; i < (int)properties_as_array.size(); i++) { + Dictionary d = properties_as_array[i]; + Array keys = d.keys(); + for (int j = 0; j < keys.size(); j++) { + String key = keys[j]; + undo_redo->add_do_property(object, vformat(key, i), d[key]); + } } } } @@ -1919,6 +2057,20 @@ void EditorInspectorArray::_setup() { page = CLAMP(page, 0, max_page); } + Ref<Font> numbers_font; + int numbers_min_w = 0; + + if (numbered) { + numbers_font = get_theme_font(SNAME("bold"), SNAME("EditorFonts")); + int digits_found = count; + String test; + while (digits_found) { + test += "8"; + digits_found /= 10; + } + numbers_min_w = numbers_font->get_string_size(test).width; + } + for (int i = 0; i < (int)array_elements.size(); i++) { ArrayElement &ae = array_elements[i]; @@ -1953,19 +2105,38 @@ void EditorInspectorArray::_setup() { ae.margin->add_child(ae.hbox); // Move button. - ae.move_texture_rect = memnew(TextureRect); - ae.move_texture_rect->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED); - ae.move_texture_rect->set_default_cursor_shape(Control::CURSOR_MOVE); - if (is_inside_tree()) { - ae.move_texture_rect->set_texture(get_theme_icon(SNAME("TripleBar"), SNAME("EditorIcons"))); + if (movable) { + ae.move_texture_rect = memnew(TextureRect); + ae.move_texture_rect->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED); + ae.move_texture_rect->set_default_cursor_shape(Control::CURSOR_MOVE); + + if (is_inside_tree()) { + ae.move_texture_rect->set_texture(get_theme_icon(SNAME("TripleBar"), SNAME("EditorIcons"))); + } + ae.hbox->add_child(ae.move_texture_rect); + } + + if (numbered) { + ae.number = memnew(Label); + ae.number->add_theme_font_override("font", numbers_font); + ae.number->set_custom_minimum_size(Size2(numbers_min_w, 0)); + ae.number->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT); + ae.number->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER); + ae.number->set_text(itos(begin_array_index + i)); + ae.hbox->add_child(ae.number); } - ae.hbox->add_child(ae.move_texture_rect); // Right vbox. ae.vbox = memnew(VBoxContainer); ae.vbox->set_h_size_flags(SIZE_EXPAND_FILL); ae.vbox->set_v_size_flags(SIZE_EXPAND_FILL); ae.hbox->add_child(ae.vbox); + + ae.erase = memnew(Button); + ae.erase->set_icon(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons"))); + ae.erase->set_v_size_flags(SIZE_SHRINK_CENTER); + ae.erase->connect("pressed", callable_mp(this, &EditorInspectorArray::_remove_item).bind(begin_array_index + i)); + ae.hbox->add_child(ae.erase); } // Hide/show the add button. @@ -1980,7 +2151,14 @@ void EditorInspectorArray::_setup() { } } +void EditorInspectorArray::_remove_item(int p_index) { + _move_element(p_index, -1); +} + Variant EditorInspectorArray::get_drag_data_fw(const Point2 &p_point, Control *p_from) { + if (!movable) { + return Variant(); + } int index = p_from->get_meta("index"); Dictionary dict; dict["type"] = "property_array_element"; @@ -2002,6 +2180,9 @@ void EditorInspectorArray::drop_data_fw(const Point2 &p_point, const Variant &p_ } bool EditorInspectorArray::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { + if (!movable) { + return false; + } // First, update drawing. control_dropping->update(); @@ -2031,13 +2212,19 @@ void EditorInspectorArray::_notification(int p_what) { for (int i = 0; i < (int)array_elements.size(); i++) { ArrayElement &ae = array_elements[i]; - ae.move_texture_rect->set_texture(get_theme_icon(SNAME("TripleBar"), SNAME("EditorIcons"))); + if (ae.move_texture_rect) { + ae.move_texture_rect->set_texture(get_theme_icon(SNAME("TripleBar"), SNAME("EditorIcons"))); + } Size2 min_size = get_theme_stylebox(SNAME("Focus"), SNAME("EditorStyles"))->get_minimum_size(); ae.margin->add_theme_constant_override("margin_left", min_size.x / 2); ae.margin->add_theme_constant_override("margin_top", min_size.y / 2); ae.margin->add_theme_constant_override("margin_right", min_size.x / 2); ae.margin->add_theme_constant_override("margin_bottom", min_size.y / 2); + + if (ae.erase) { + ae.erase->set_icon(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons"))); + } } add_button->set_icon(get_theme_icon(SNAME("Add"), SNAME("EditorIcons"))); @@ -2073,23 +2260,31 @@ void EditorInspectorArray::set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; } -void EditorInspectorArray::setup_with_move_element_function(Object *p_object, String p_label, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable) { +void EditorInspectorArray::setup_with_move_element_function(Object *p_object, String p_label, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable, bool p_numbered, int p_page_length, const String &p_add_item_text) { count_property = ""; mode = MODE_USE_MOVE_ARRAY_ELEMENT_FUNCTION; array_element_prefix = p_array_element_prefix; page = p_page; + movable = p_movable; + page_length = p_page_length; + numbered = p_numbered; EditorInspectorSection::setup(String(p_array_element_prefix) + "_array", p_label, p_object, p_bg_color, p_foldable, 0); _setup(); } -void EditorInspectorArray::setup_with_count_property(Object *p_object, String p_label, const StringName &p_count_property, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable) { +void EditorInspectorArray::setup_with_count_property(Object *p_object, String p_label, const StringName &p_count_property, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable, bool p_numbered, int p_page_length, const String &p_add_item_text, const String &p_swap_method) { count_property = p_count_property; mode = MODE_USE_COUNT_PROPERTY; array_element_prefix = p_array_element_prefix; page = p_page; + movable = p_movable; + page_length = p_page_length; + numbered = p_numbered; + swap_method = p_swap_method; + add_button->set_text(p_add_item_text); EditorInspectorSection::setup(String(count_property) + "_array", p_label, p_object, p_bg_color, p_foldable, 0); _setup(); @@ -2330,7 +2525,7 @@ String EditorInspector::get_selected_path() const { return property_selected; } -void EditorInspector::_parse_added_editors(VBoxContainer *current_vbox, Ref<EditorInspectorPlugin> ped) { +void EditorInspector::_parse_added_editors(VBoxContainer *current_vbox, EditorInspectorSection *p_section, Ref<EditorInspectorPlugin> ped) { for (const EditorInspectorPlugin::AddedEditor &F : ped->added_editors) { EditorProperty *ep = Object::cast_to<EditorProperty>(F.property_editor); current_vbox->add_child(F.property_editor); @@ -2370,6 +2565,10 @@ void EditorInspector::_parse_added_editors(VBoxContainer *current_vbox, Ref<Edit } } + if (p_section) { + ep->connect("property_can_revert_changed", callable_mp(p_section, &EditorInspectorSection::property_can_revert_changed)); + } + ep->set_read_only(read_only); ep->update_property(); ep->_update_pin_flags(); @@ -2476,9 +2675,11 @@ void EditorInspector::update_tree() { // Get the lists of editors to add the beginning. for (Ref<EditorInspectorPlugin> &ped : valid_plugins) { ped->parse_begin(object); - _parse_added_editors(main_vbox, ped); + _parse_added_editors(main_vbox, nullptr, ped); } + StringName type_name; + // Get the lists of editors for properties. for (List<PropertyInfo>::Element *E_property = plist.front(); E_property; E_property = E_property->next()) { PropertyInfo &p = E_property->get(); @@ -2549,6 +2750,7 @@ void EditorInspector::update_tree() { category_vbox = nullptr; //reset String type = p.name; + type_name = p.name; // Set the category icon. if (!ClassDB::class_exists(type) && !ScriptServer::is_global_class(type) && p.hint_string.length() && FileAccess::exists(p.hint_string)) { @@ -2582,24 +2784,23 @@ void EditorInspector::update_tree() { if (use_doc_hints) { // Sets the category tooltip to show documentation. - StringName type2 = p.name; - if (!class_descr_cache.has(type2)) { + if (!class_descr_cache.has(type_name)) { String descr; DocTools *dd = EditorHelp::get_doc_data(); - HashMap<String, DocData::ClassDoc>::Iterator E = dd->class_list.find(type2); + HashMap<String, DocData::ClassDoc>::Iterator E = dd->class_list.find(type_name); if (E) { descr = DTR(E->value.brief_description); } - class_descr_cache[type2] = descr; + class_descr_cache[type_name] = descr; } - category->set_tooltip(p.name + "::" + (class_descr_cache[type2].is_empty() ? "" : class_descr_cache[type2])); + category->set_tooltip(p.name + "::" + (class_descr_cache[type_name].is_empty() ? "" : class_descr_cache[type_name])); } // Add editors at the start of a category. for (Ref<EditorInspectorPlugin> &ped : valid_plugins) { ped->parse_category(object, p.name); - _parse_added_editors(main_vbox, ped); + _parse_added_editors(main_vbox, nullptr, ped); } continue; @@ -2791,7 +2992,7 @@ void EditorInspector::update_tree() { // Add editors at the start of a group. for (Ref<EditorInspectorPlugin> &ped : valid_plugins) { ped->parse_group(object, path); - _parse_added_editors(section->get_vbox(), ped); + _parse_added_editors(section->get_vbox(), section, ped); } vbox_per_path[root_vbox][acc_path] = section->get_vbox(); @@ -2812,9 +3013,34 @@ void EditorInspector::update_tree() { StringName array_element_prefix; Color c = sscolor; c.a /= level; + + Vector<String> class_name_components = String(p.class_name).split(","); + + int page_size = 5; + bool movable = true; + bool numbered = false; + bool foldable = use_folding; + String add_button_text; + String swap_method; + for (int i = (p.type == Variant::NIL ? 1 : 2); i < class_name_components.size(); i++) { + if (class_name_components[i].begins_with("page_size") && class_name_components[i].get_slice_count("=") == 2) { + page_size = class_name_components[i].get_slice("=", 1).to_int(); + } else if (class_name_components[i].begins_with("add_button_text") && class_name_components[i].get_slice_count("=") == 2) { + add_button_text = class_name_components[i].get_slice("=", 1).strip_edges(); + } else if (class_name_components[i] == "static") { + movable = false; + } else if (class_name_components[i] == "numbered") { + numbered = true; + } else if (class_name_components[i] == "unfoldable") { + foldable = false; + } else if (class_name_components[i].begins_with("swap_method") && class_name_components[i].get_slice_count("=") == 2) { + swap_method = class_name_components[i].get_slice("=", 1).strip_edges(); + } + } + if (p.type == Variant::NIL) { // Setup the array to use a method to create/move/delete elements. - array_element_prefix = p.class_name; + array_element_prefix = class_name_components[0]; editor_inspector_array = memnew(EditorInspectorArray); String array_label = path.contains("/") ? path.substr(path.rfind("/") + 1) : path; @@ -2825,13 +3051,14 @@ void EditorInspector::update_tree() { editor_inspector_array->set_undo_redo(undo_redo); } else if (p.type == Variant::INT) { // Setup the array to use the count property and built-in functions to create/move/delete elements. - Vector<String> class_name_components = String(p.class_name).split(","); - if (class_name_components.size() == 2) { + if (class_name_components.size() >= 2) { array_element_prefix = class_name_components[1]; editor_inspector_array = memnew(EditorInspectorArray); int page = per_array_page.has(array_element_prefix) ? per_array_page[array_element_prefix] : 0; - editor_inspector_array->setup_with_count_property(object, class_name_components[0], p.name, array_element_prefix, page, c, use_folding); + + editor_inspector_array->setup_with_count_property(object, class_name_components[0], p.name, array_element_prefix, page, c, foldable, movable, numbered, page_size, add_button_text, swap_method); editor_inspector_array->connect("page_change_request", callable_mp(this, &EditorInspector::_page_change_request).bind(array_element_prefix)); + editor_inspector_array->set_undo_redo(undo_redo); } } @@ -2840,6 +3067,7 @@ void EditorInspector::update_tree() { current_vbox->add_child(editor_inspector_array); editor_inspector_array_per_prefix[array_element_prefix] = editor_inspector_array; } + continue; } @@ -2864,7 +3092,7 @@ void EditorInspector::update_tree() { // Build the doc hint, to use as tooltip. // Get the class name. - StringName classname = object->get_class_name(); + StringName classname = type_name == "" ? object->get_class_name() : type_name; if (!object_class.is_empty()) { classname = object_class; } @@ -2973,6 +3201,12 @@ void EditorInspector::update_tree() { editor_property_map[prop].push_back(ep); } } + + EditorInspectorSection *section = Object::cast_to<EditorInspectorSection>(current_vbox->get_parent()); + if (section) { + ep->connect("property_can_revert_changed", callable_mp(section, &EditorInspectorSection::property_can_revert_changed)); + } + ep->set_draw_warning(draw_warning); ep->set_use_folding(use_folding); ep->set_checkable(checkable); @@ -3016,6 +3250,11 @@ void EditorInspector::update_tree() { } if (!hide_metadata) { + // Add 4px of spacing between the "Add Metadata" button and the content above it. + Control *spacer = memnew(Control); + spacer->set_custom_minimum_size(Size2(0, 4) * EDSCALE); + main_vbox->add_child(spacer); + Button *add_md = EditorInspector::create_inspector_action_button(TTR("Add Metadata")); add_md->set_icon(get_theme_icon(SNAME("Add"), SNAME("EditorIcons"))); add_md->connect(SNAME("pressed"), callable_mp(this, &EditorInspector::_show_add_meta_dialog)); @@ -3025,7 +3264,7 @@ void EditorInspector::update_tree() { // Get the lists of to add at the end. for (Ref<EditorInspectorPlugin> &ped : valid_plugins) { ped->parse_end(object); - _parse_added_editors(main_vbox, ped); + _parse_added_editors(main_vbox, nullptr, ped); } } @@ -3178,6 +3417,44 @@ void EditorInspector::expand_all_folding() { } } +void EditorInspector::expand_revertable() { + HashSet<EditorInspectorSection *> sections_to_unfold[2]; + for (EditorInspectorSection *E : sections) { + if (E->has_revertable_properties()) { + sections_to_unfold[0].insert(E); + } + } + + // Climb up the hierachy doing double buffering with the sets. + int a = 0; + int b = 1; + while (sections_to_unfold[a].size()) { + for (EditorInspectorSection *E : sections_to_unfold[a]) { + E->unfold(); + + Node *n = E->get_parent(); + while (n) { + if (Object::cast_to<EditorInspector>(n)) { + break; + } + if (Object::cast_to<EditorInspectorSection>(n) && !sections_to_unfold[a].has((EditorInspectorSection *)n)) { + sections_to_unfold[b].insert((EditorInspectorSection *)n); + } + n = n->get_parent(); + } + } + + sections_to_unfold[a].clear(); + SWAP(a, b); + } + + for (const KeyValue<StringName, List<EditorProperty *>> &F : editor_property_map) { + for (EditorProperty *E : F.value) { + E->expand_revertable(); + } + } +} + void EditorInspector::set_scroll_offset(int p_offset) { set_v_scroll(p_offset); } @@ -3277,14 +3554,23 @@ void EditorInspector::_edit_set(const String &p_name, const Variant &p_value, bo undo_redo->add_undo_property(object, p_name, value); } - PropertyInfo prop_info; - if (ClassDB::get_property_info(object->get_class_name(), p_name, &prop_info)) { - for (const String &linked_prop : prop_info.linked_properties) { - valid = false; - value = object->get(linked_prop, &valid); - if (valid) { - undo_redo->add_undo_property(object, linked_prop, value); - } + List<StringName> linked_properties; + ClassDB::get_linked_properties_info(object->get_class_name(), p_name, &linked_properties); + + for (const StringName &linked_prop : linked_properties) { + valid = false; + Variant undo_value = object->get(linked_prop, &valid); + if (valid) { + undo_redo->add_undo_property(object, linked_prop, undo_value); + } + } + + PackedStringArray linked_properties_dynamic = object->call("_get_linked_undo_properties", p_name, p_value); + for (int i = 0; i < linked_properties_dynamic.size(); i++) { + valid = false; + Variant undo_value = object->get(linked_properties_dynamic[i], &valid); + if (valid) { + undo_redo->add_undo_property(object, linked_properties_dynamic[i], undo_value); } } diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 4ec3513da5..9b5e295854 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -184,6 +184,7 @@ public: virtual void expand_all_folding(); virtual void collapse_all_folding(); + virtual void expand_revertable(); virtual Variant get_drag_data(const Point2 &p_point) override; virtual void update_cache(); @@ -281,6 +282,8 @@ class EditorInspectorSection : public Container { Timer *dropping_unfold_timer = nullptr; bool dropping = false; + HashSet<StringName> revertable_properties; + void _test_unfold(); protected: @@ -299,6 +302,9 @@ public: void unfold(); void fold(); + bool has_revertable_properties() const; + void property_can_revert_changed(const String &p_path, bool p_can_revert); + EditorInspectorSection(); ~EditorInspectorSection(); }; @@ -315,6 +321,7 @@ class EditorInspectorArray : public EditorInspectorSection { } mode; StringName count_property; StringName array_element_prefix; + String swap_method; int count = 0; @@ -336,6 +343,9 @@ class EditorInspectorArray : public EditorInspectorSection { int begin_array_index = 0; int end_array_index = 0; + bool movable = true; + bool numbered = false; + enum MenuOptions { OPTION_MOVE_UP = 0, OPTION_MOVE_DOWN, @@ -353,7 +363,9 @@ class EditorInspectorArray : public EditorInspectorSection { MarginContainer *margin = nullptr; HBoxContainer *hbox = nullptr; TextureRect *move_texture_rect = nullptr; + Label *number = nullptr; VBoxContainer *vbox = nullptr; + Button *erase = nullptr; }; LocalVector<ArrayElement> array_elements; @@ -389,6 +401,8 @@ class EditorInspectorArray : public EditorInspectorSection { void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; + void _remove_item(int p_index); + protected: void _notification(int p_what); static void _bind_methods(); @@ -396,8 +410,8 @@ protected: public: void set_undo_redo(UndoRedo *p_undo_redo); - void setup_with_move_element_function(Object *p_object, String p_label, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable); - void setup_with_count_property(Object *p_object, String p_label, const StringName &p_count_property, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable); + void setup_with_move_element_function(Object *p_object, String p_label, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable = true, bool p_numbered = false, int p_page_length = 5, const String &p_add_item_text = ""); + void setup_with_count_property(Object *p_object, String p_label, const StringName &p_count_property, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable = true, bool p_numbered = false, int p_page_length = 5, const String &p_add_item_text = "", const String &p_swap_method = ""); VBoxContainer *get_vbox(int p_index); EditorInspectorArray(); @@ -517,7 +531,7 @@ class EditorInspector : public ScrollContainer { void _edit_request_change(Object *p_object, const String &p_prop); void _filter_changed(const String &p_text); - void _parse_added_editors(VBoxContainer *current_vbox, Ref<EditorInspectorPlugin> ped); + void _parse_added_editors(VBoxContainer *current_vbox, EditorInspectorSection *p_section, Ref<EditorInspectorPlugin> ped); void _vscroll_changed(double); @@ -579,6 +593,7 @@ public: void collapse_all_folding(); void expand_all_folding(); + void expand_revertable(); void set_scroll_offset(int p_offset); int get_scroll_offset() const; diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 012666d625..38cc85bb4e 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -35,7 +35,9 @@ #include "editor/editor_node.h" #include "editor/editor_paths.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/gui/center_container.h" +#include "scene/gui/separator.h" #include "scene/resources/font.h" void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, bool p_editor_notify, ErrorHandlerType p_type) { diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index e10394a2a8..e7946f56da 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -49,6 +49,7 @@ #include "main/main.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/gui/center_container.h" +#include "scene/gui/color_picker.h" #include "scene/gui/control.h" #include "scene/gui/dialogs.h" #include "scene/gui/file_dialog.h" @@ -140,6 +141,7 @@ #include "editor/plugins/bone_map_editor_plugin.h" #include "editor/plugins/camera_3d_editor_plugin.h" #include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/plugins/cast_2d_editor_plugin.h" #include "editor/plugins/collision_polygon_2d_editor_plugin.h" #include "editor/plugins/collision_shape_2d_editor_plugin.h" #include "editor/plugins/control_editor_plugin.h" @@ -149,6 +151,7 @@ #include "editor/plugins/debugger_editor_plugin.h" #include "editor/plugins/editor_debugger_plugin.h" #include "editor/plugins/editor_preview_plugins.h" +#include "editor/plugins/editor_resource_conversion_plugin.h" #include "editor/plugins/font_config_plugin.h" #include "editor/plugins/gdextension_export_plugin.h" #include "editor/plugins/gpu_particles_2d_editor_plugin.h" @@ -174,7 +177,6 @@ #include "editor/plugins/physical_bone_3d_editor_plugin.h" #include "editor/plugins/polygon_2d_editor_plugin.h" #include "editor/plugins/polygon_3d_editor_plugin.h" -#include "editor/plugins/ray_cast_2d_editor_plugin.h" #include "editor/plugins/resource_preloader_editor_plugin.h" #include "editor/plugins/root_motion_editor_plugin.h" #include "editor/plugins/script_editor_plugin.h" @@ -2200,9 +2202,10 @@ void EditorNode::_edit_current(bool p_skip_foreign) { Object *prev_inspected_object = InspectorDock::get_inspector_singleton()->get_edited_object(); bool disable_folding = bool(EDITOR_GET("interface/inspector/disable_folding")); - bool stay_in_script_editor_on_node_selected = bool(EDITOR_GET("text_editor/behavior/navigation/stay_in_script_editor_on_node_selected")); bool is_resource = current_obj->is_class("Resource"); bool is_node = current_obj->is_class("Node"); + bool stay_in_script_editor_on_node_selected = bool(EDITOR_GET("text_editor/behavior/navigation/stay_in_script_editor_on_node_selected")); + bool skip_main_plugin = false; String editable_warning; // None by default. @@ -2239,8 +2242,8 @@ void EditorNode::_edit_current(bool p_skip_foreign) { NodeDock::get_singleton()->set_node(current_node); SceneTreeDock::get_singleton()->set_selected(current_node); InspectorDock::get_singleton()->update(current_node); - if (!inspector_only) { - inspector_only = stay_in_script_editor_on_node_selected && ScriptEditor::get_singleton()->is_visible_in_tree(); + if (!inspector_only && !skip_main_plugin) { + skip_main_plugin = stay_in_script_editor_on_node_selected && ScriptEditor::get_singleton()->is_visible_in_tree(); } } else { NodeDock::get_singleton()->set_node(nullptr); @@ -2316,7 +2319,7 @@ void EditorNode::_edit_current(bool p_skip_foreign) { } } - if (main_plugin) { + if (main_plugin && !skip_main_plugin) { // Special case if use of external editor is true. Resource *current_res = Object::cast_to<Resource>(current_obj); if (main_plugin->get_name() == "Script" && !current_obj->is_class("VisualScript") && current_res && !current_res->is_built_in() && (bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) { @@ -6154,8 +6157,6 @@ EditorNode::EditorNode() { register_exporters(); - ClassDB::set_class_enabled("RootMotionView", true); - EDITOR_DEF("interface/editor/save_on_focus_loss", false); EDITOR_DEF("interface/editor/show_update_spinner", false); EDITOR_DEF("interface/editor/update_continuously", false); @@ -6172,7 +6173,14 @@ EditorNode::EditorNode() { EDITOR_DEF("interface/inspector/horizontal_vector2_editing", false); EDITOR_DEF("interface/inspector/horizontal_vector_types_editing", true); EDITOR_DEF("interface/inspector/open_resources_in_current_inspector", true); - EDITOR_DEF("interface/inspector/resources_to_open_in_new_inspector", "Script,MeshLibrary"); + + PackedStringArray open_in_new_inspector_defaults; + // Required for the script editor to work. + open_in_new_inspector_defaults.push_back("Script"); + // Required for the GridMap editor to work. + open_in_new_inspector_defaults.push_back("MeshLibrary"); + EDITOR_DEF("interface/inspector/resources_to_open_in_new_inspector", open_in_new_inspector_defaults); + EDITOR_DEF("interface/inspector/default_color_picker_mode", 0); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "interface/inspector/default_color_picker_mode", PROPERTY_HINT_ENUM, "RGB,HSV,RAW,OKHSL", PROPERTY_USAGE_DEFAULT)); EDITOR_DEF("interface/inspector/default_color_picker_shape", (int32_t)ColorPicker::SHAPE_OKHSL_CIRCLE); @@ -6867,6 +6875,7 @@ EditorNode::EditorNode() { filesystem_dock->connect("inherit", callable_mp(this, &EditorNode::_inherit_request)); filesystem_dock->connect("instance", callable_mp(this, &EditorNode::_instantiate_request)); filesystem_dock->connect("display_mode_changed", callable_mp(this, &EditorNode::_save_docks)); + get_project_settings()->connect_filesystem_dock_signals(filesystem_dock); // Scene: Top left. dock_slot[DOCK_SLOT_LEFT_UR]->add_child(SceneTreeDock::get_singleton()); @@ -7183,7 +7192,7 @@ EditorNode::EditorNode() { add_editor_plugin(memnew(NavigationPolygonEditorPlugin)); add_editor_plugin(memnew(Path2DEditorPlugin)); add_editor_plugin(memnew(Polygon2DEditorPlugin)); - add_editor_plugin(memnew(RayCast2DEditorPlugin)); + add_editor_plugin(memnew(Cast2DEditorPlugin)); add_editor_plugin(memnew(Skeleton2DEditorPlugin)); add_editor_plugin(memnew(Sprite2DEditorPlugin)); add_editor_plugin(memnew(TilesEditorPlugin)); diff --git a/editor/editor_node.h b/editor/editor_node.h index c521c0fb04..0201e84eaf 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -37,7 +37,6 @@ #include "editor/editor_run.h" #include "editor/export/editor_export.h" #include "editor/inspector_dock.h" -#include "editor/property_editor.h" typedef void (*EditorNodeInitCallback)(); typedef void (*EditorPluginInitializeCallback)(); @@ -48,6 +47,7 @@ class AudioStreamPreviewGenerator; class BackgroundProgress; class Button; class CenterContainer; +class ColorPicker; class ConfirmationDialog; class Control; class DependencyEditor; @@ -67,6 +67,7 @@ class EditorPlugin; class EditorPluginList; class EditorQuickOpen; class EditorResourcePreview; +class EditorResourceConversionPlugin; class EditorRun; class EditorRunNative; class EditorSettingsDialog; diff --git a/editor/editor_plugin_settings.cpp b/editor/editor_plugin_settings.cpp index 3a0b875b8c..5a010a66c1 100644 --- a/editor/editor_plugin_settings.cpp +++ b/editor/editor_plugin_settings.cpp @@ -37,6 +37,7 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "scene/gui/margin_container.h" +#include "scene/gui/tree.h" void EditorPluginSettings::_notification(int p_what) { switch (p_what) { diff --git a/editor/editor_plugin_settings.h b/editor/editor_plugin_settings.h index 7c6d93e6f4..9c619066f2 100644 --- a/editor/editor_plugin_settings.h +++ b/editor/editor_plugin_settings.h @@ -34,8 +34,8 @@ #include "core/object/undo_redo.h" #include "editor/editor_data.h" #include "editor/plugin_config_dialog.h" -#include "property_editor.h" -#include "scene/gui/dialogs.h" + +class Tree; class EditorPluginSettings : public VBoxContainer { GDCLASS(EditorPluginSettings, VBoxContainer); diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 215a44482e..c713fe3df0 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -133,6 +133,11 @@ void EditorPropertyMultilineText::_text_changed() { void EditorPropertyMultilineText::_open_big_text() { if (!big_text_dialog) { big_text = memnew(TextEdit); + if (expression) { + big_text->set_syntax_highlighter(text->get_syntax_highlighter()); + big_text->add_theme_font_override("font", get_theme_font(SNAME("expression"), SNAME("EditorFonts"))); + big_text->add_theme_font_size_override("font_size", get_theme_font_size(SNAME("expression_size"), SNAME("EditorFonts"))); + } big_text->connect("text_changed", callable_mp(this, &EditorPropertyMultilineText::_big_text_changed)); big_text->set_line_wrapping_mode(TextEdit::LineWrappingMode::LINE_WRAPPING_BOUNDARY); big_text_dialog = memnew(AcceptDialog); @@ -162,12 +167,24 @@ void EditorPropertyMultilineText::_notification(int p_what) { case NOTIFICATION_ENTER_TREE: { Ref<Texture2D> df = get_theme_icon(SNAME("DistractionFree"), SNAME("EditorIcons")); open_big_text->set_icon(df); - Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Label")); - int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Label")); - text->set_custom_minimum_size(Vector2(0, font->get_height(font_size) * 6)); - text->add_theme_font_override("font", get_theme_font("expression", "EditorFonts")); - text->add_theme_font_size_override("font_size", get_theme_font_size("expression_size", "EditorFonts")); + Ref<Font> font; + int font_size; + if (expression) { + font = get_theme_font(SNAME("expression"), SNAME("EditorFonts")); + font_size = get_theme_font_size(SNAME("expression_size"), SNAME("EditorFonts")); + + text->add_theme_font_override("font", font); + text->add_theme_font_size_override("font_size", font_size); + if (big_text) { + big_text->add_theme_font_override("font", font); + big_text->add_theme_font_size_override("font_size", font_size); + } + } else { + font = get_theme_font(SNAME("font"), SNAME("TextEdit")); + font_size = get_theme_font_size(SNAME("font_size"), SNAME("TextEdit")); + } + text->set_custom_minimum_size(Vector2(0, font->get_height(font_size) * 6)); } break; } } @@ -1580,6 +1597,11 @@ void EditorPropertyEasing::_spin_value_changed(double p_value) { // which can cause crashes and other issues. p_value = CLAMP(p_value, -1'000'000, 1'000'000); + if (positive_only) { + // Force a positive or zero value if a negative value was manually entered by double-clicking. + p_value = MAX(0.0, p_value); + } + emit_changed(get_edited_property(), p_value); _spin_focus_exited(); } @@ -1591,9 +1613,9 @@ void EditorPropertyEasing::_spin_focus_exited() { easing_draw->update(); } -void EditorPropertyEasing::setup(bool p_full, bool p_flip) { +void EditorPropertyEasing::setup(bool p_positive_only, bool p_flip) { flip = p_flip; - full = p_full; + positive_only = p_positive_only; } void EditorPropertyEasing::_notification(int p_what) { @@ -1601,13 +1623,13 @@ void EditorPropertyEasing::_notification(int p_what) { case NOTIFICATION_THEME_CHANGED: case NOTIFICATION_ENTER_TREE: { preset->clear(); - preset->add_icon_item(get_theme_icon(SNAME("CurveConstant"), SNAME("EditorIcons")), "Zero", EASING_ZERO); preset->add_icon_item(get_theme_icon(SNAME("CurveLinear"), SNAME("EditorIcons")), "Linear", EASING_LINEAR); - preset->add_icon_item(get_theme_icon(SNAME("CurveIn"), SNAME("EditorIcons")), "In", EASING_IN); - preset->add_icon_item(get_theme_icon(SNAME("CurveOut"), SNAME("EditorIcons")), "Out", EASING_OUT); - if (full) { - preset->add_icon_item(get_theme_icon(SNAME("CurveInOut"), SNAME("EditorIcons")), "In-Out", EASING_IN_OUT); - preset->add_icon_item(get_theme_icon(SNAME("CurveOutIn"), SNAME("EditorIcons")), "Out-In", EASING_OUT_IN); + preset->add_icon_item(get_theme_icon(SNAME("CurveIn"), SNAME("EditorIcons")), "Ease In", EASING_IN); + preset->add_icon_item(get_theme_icon(SNAME("CurveOut"), SNAME("EditorIcons")), "Ease Out", EASING_OUT); + preset->add_icon_item(get_theme_icon(SNAME("CurveConstant"), SNAME("EditorIcons")), "Zero", EASING_ZERO); + if (!positive_only) { + preset->add_icon_item(get_theme_icon(SNAME("CurveInOut"), SNAME("EditorIcons")), "Ease In-Out", EASING_IN_OUT); + preset->add_icon_item(get_theme_icon(SNAME("CurveOutIn"), SNAME("EditorIcons")), "Ease Out-In", EASING_OUT_IN); } easing_draw->set_custom_minimum_size(Size2(0, get_theme_font(SNAME("font"), SNAME("Label"))->get_height(get_theme_font_size(SNAME("font_size"), SNAME("Label"))) * 2)); } break; @@ -3918,6 +3940,12 @@ void EditorPropertyResource::expand_all_folding() { } } +void EditorPropertyResource::expand_revertable() { + if (sub_inspector) { + sub_inspector->expand_revertable(); + } +} + void EditorPropertyResource::set_use_sub_inspector(bool p_enable) { use_sub_inspector = p_enable; } @@ -4099,20 +4127,20 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_ case Variant::FLOAT: { if (p_hint == PROPERTY_HINT_EXP_EASING) { EditorPropertyEasing *editor = memnew(EditorPropertyEasing); - bool full = true; + bool positive_only = false; bool flip = false; - Vector<String> hints = p_hint_text.split(","); + const Vector<String> hints = p_hint_text.split(","); for (int i = 0; i < hints.size(); i++) { - String h = hints[i].strip_edges(); - if (h == "attenuation") { + const String hint = hints[i].strip_edges(); + if (hint == "attenuation") { flip = true; } - if (h == "inout") { - full = true; + if (hint == "positive_only") { + positive_only = true; } } - editor->setup(full, flip); + editor->setup(positive_only, flip); return editor; } else { @@ -4356,11 +4384,11 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_ editor->setup(p_object, p_path, p_hint == PROPERTY_HINT_RESOURCE_TYPE ? p_hint_text : "Resource"); if (p_hint == PROPERTY_HINT_RESOURCE_TYPE) { - String open_in_new = EDITOR_GET("interface/inspector/resources_to_open_in_new_inspector"); - for (int i = 0; i < open_in_new.get_slice_count(","); i++) { - String type = open_in_new.get_slicec(',', i).strip_edges(); + const PackedStringArray open_in_new_inspector = EDITOR_GET("interface/inspector/resources_to_open_in_new_inspector"); + + for (const String &type : open_in_new_inspector) { for (int j = 0; j < p_hint_text.get_slice_count(","); j++) { - String inherits = p_hint_text.get_slicec(',', j); + const String inherits = p_hint_text.get_slicec(',', j); if (ClassDB::is_parent_class(inherits, type)) { editor->set_use_sub_inspector(false); } diff --git a/editor/editor_properties.h b/editor/editor_properties.h index b3aac6e8ca..6a1360d2ca 100644 --- a/editor/editor_properties.h +++ b/editor/editor_properties.h @@ -443,6 +443,7 @@ class EditorPropertyEasing : public EditorProperty { bool dragging = false; bool full = false; bool flip = false; + bool positive_only = false; enum { EASING_ZERO, @@ -471,7 +472,7 @@ protected: public: virtual void update_property() override; - void setup(bool p_full, bool p_flip); + void setup(bool p_positive_only, bool p_flip); EditorPropertyEasing(); }; @@ -856,6 +857,7 @@ public: void collapse_all_folding() override; void expand_all_folding() override; + void expand_revertable() override; void set_use_sub_inspector(bool p_enable); diff --git a/editor/editor_property_name_processor.cpp b/editor/editor_property_name_processor.cpp index 09d2992e07..6c713de94a 100644 --- a/editor/editor_property_name_processor.cpp +++ b/editor/editor_property_name_processor.cpp @@ -114,6 +114,7 @@ EditorPropertyNameProcessor::EditorPropertyNameProcessor() { capitalize_string_remaps["bidi"] = "BiDi"; capitalize_string_remaps["bp"] = "BP"; capitalize_string_remaps["bpc"] = "BPC"; + capitalize_string_remaps["bpm"] = "BPM"; capitalize_string_remaps["bptc"] = "BPTC"; capitalize_string_remaps["bvh"] = "BVH"; capitalize_string_remaps["ca"] = "CA"; diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index 60c091a4b0..d850773a6d 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -38,6 +38,7 @@ #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/filesystem_dock.h" +#include "editor/plugins/editor_resource_conversion_plugin.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/scene_tree_dock.h" diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp index ec5edab860..d8b738be17 100644 --- a/editor/editor_run_native.cpp +++ b/editor/editor_run_native.cpp @@ -32,6 +32,7 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "editor/export/editor_export_platform.h" void EditorRunNative::_notification(int p_what) { diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 37a531299f..80e77a1125 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -685,7 +685,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { // Visual editors EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/visual_editors/minimap_opacity", 0.85, "0.0,1.0,0.01") EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/visual_editors/lines_curvature", 0.5, "0.0,1.0,0.01") - EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "editors/visual_editors/visualshader/port_preview_size", 160, "100,400,0.01") + EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "editors/visual_editors/visual_shader/port_preview_size", 160, "100,400,0.01") /* Run */ @@ -1051,6 +1051,8 @@ void EditorSettings::set_initial_value(const StringName &p_setting, const Varian } Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default, bool p_restart_if_changed) { + ERR_FAIL_NULL_V_MSG(EditorSettings::get_singleton(), p_default, "EditorSettings not instantiated yet."); + Variant ret = p_default; if (EditorSettings::get_singleton()->has_setting(p_setting)) { ret = EditorSettings::get_singleton()->get(p_setting); @@ -1067,7 +1069,7 @@ Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default, bool p_re } Variant _EDITOR_GET(const String &p_setting) { - ERR_FAIL_COND_V(!EditorSettings::get_singleton()->has_setting(p_setting), Variant()); + ERR_FAIL_COND_V(!EditorSettings::get_singleton() || !EditorSettings::get_singleton()->has_setting(p_setting), Variant()); return EditorSettings::get_singleton()->get(p_setting); } @@ -1422,9 +1424,7 @@ void EditorSettings::get_shortcut_list(List<String> *r_shortcuts) { } Ref<Shortcut> ED_GET_SHORTCUT(const String &p_path) { - if (!EditorSettings::get_singleton()) { - return nullptr; - } + ERR_FAIL_NULL_V_MSG(EditorSettings::get_singleton(), nullptr, "EditorSettings not instantiated yet."); Ref<Shortcut> sc = EditorSettings::get_singleton()->get_shortcut(p_path); @@ -1434,6 +1434,8 @@ Ref<Shortcut> ED_GET_SHORTCUT(const String &p_path) { } void ED_SHORTCUT_OVERRIDE(const String &p_path, const String &p_feature, Key p_keycode) { + ERR_FAIL_NULL_MSG(EditorSettings::get_singleton(), "EditorSettings not instantiated yet."); + Ref<Shortcut> sc = EditorSettings::get_singleton()->get_shortcut(p_path); ERR_FAIL_COND_MSG(!sc.is_valid(), "Used ED_SHORTCUT_OVERRIDE with invalid shortcut: " + p_path + "."); @@ -1444,6 +1446,8 @@ void ED_SHORTCUT_OVERRIDE(const String &p_path, const String &p_feature, Key p_k } void ED_SHORTCUT_OVERRIDE_ARRAY(const String &p_path, const String &p_feature, const PackedInt32Array &p_keycodes) { + ERR_FAIL_NULL_MSG(EditorSettings::get_singleton(), "EditorSettings not instantiated yet."); + Ref<Shortcut> sc = EditorSettings::get_singleton()->get_shortcut(p_path); ERR_FAIL_COND_MSG(!sc.is_valid(), "Used ED_SHORTCUT_OVERRIDE_ARRAY with invalid shortcut: " + p_path + "."); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 5d60baf202..a3086a2ccf 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -641,6 +641,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { // Add a highlight line at the top of the selected tab. style_tab_selected->set_border_width_all(0); + style_tab_selected->set_default_margin(SIDE_LEFT, widget_default_margin.x - border_width); style_tab_selected->set_border_width(SIDE_TOP, Math::round(2 * EDSCALE)); // Make the highlight line prominent, but not too prominent as to not be distracting. Color tab_highlight = dark_color_2.lerp(accent_color, 0.75); @@ -653,6 +654,9 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { // We can't prevent them with both rounded corners and non-zero border width, though style_tab_selected->set_expand_margin_size(SIDE_BOTTOM, corner_width > 0 ? corner_width : border_width); + // When using a border width greater than 0, visually line up the left of the selected tab with the underlying panel. + style_tab_selected->set_expand_margin_size(SIDE_LEFT, -border_width); + style_tab_selected->set_default_margin(SIDE_LEFT, widget_default_margin.x + 2 * EDSCALE); style_tab_selected->set_default_margin(SIDE_RIGHT, widget_default_margin.x + 2 * EDSCALE); style_tab_selected->set_default_margin(SIDE_BOTTOM, widget_default_margin.y); @@ -830,6 +834,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_stylebox("pressed", "CheckButton", style_menu); theme->set_stylebox("disabled", "CheckButton", style_menu); theme->set_stylebox("hover", "CheckButton", style_menu); + theme->set_stylebox("hover_pressed", "CheckButton", style_menu); theme->set_icon("on", "CheckButton", theme->get_icon(SNAME("GuiToggleOn"), SNAME("EditorIcons"))); theme->set_icon("on_disabled", "CheckButton", theme->get_icon(SNAME("GuiToggleOnDisabled"), SNAME("EditorIcons"))); @@ -867,6 +872,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_stylebox("pressed", "CheckBox", sb_checkbox); theme->set_stylebox("disabled", "CheckBox", sb_checkbox); theme->set_stylebox("hover", "CheckBox", sb_checkbox); + theme->set_stylebox("hover_pressed", "CheckBox", sb_checkbox); theme->set_icon("checked", "CheckBox", theme->get_icon(SNAME("GuiChecked"), SNAME("EditorIcons"))); theme->set_icon("unchecked", "CheckBox", theme->get_icon(SNAME("GuiUnchecked"), SNAME("EditorIcons"))); theme->set_icon("radio_checked", "CheckBox", theme->get_icon(SNAME("GuiRadioChecked"), SNAME("EditorIcons"))); @@ -895,17 +901,16 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_stylebox("panel", "PopupDialog", style_popup); // PopupMenu - const int popup_menu_margin_size = default_margin_size * 1.5 * EDSCALE; Ref<StyleBoxFlat> style_popup_menu = style_popup->duplicate(); // Use 1 pixel for the sides, since if 0 is used, the highlight of hovered items is drawn // on top of the popup border. This causes a 'gap' in the panel border when an item is highlighted, // and it looks weird. 1px solves this. - style_popup_menu->set_default_margin(SIDE_LEFT, 1 * EDSCALE); - style_popup_menu->set_default_margin(SIDE_TOP, popup_menu_margin_size); - style_popup_menu->set_default_margin(SIDE_RIGHT, 1 * EDSCALE); - style_popup_menu->set_default_margin(SIDE_BOTTOM, popup_menu_margin_size); + style_popup_menu->set_default_margin(SIDE_LEFT, EDSCALE); + style_popup_menu->set_default_margin(SIDE_TOP, 2 * EDSCALE); + style_popup_menu->set_default_margin(SIDE_RIGHT, EDSCALE); + style_popup_menu->set_default_margin(SIDE_BOTTOM, 2 * EDSCALE); // Always display a border for PopupMenus so they can be distinguished from their background. - style_popup_menu->set_border_width_all(1 * EDSCALE); + style_popup_menu->set_border_width_all(EDSCALE); style_popup_menu->set_border_color(dark_color_2); theme->set_stylebox("panel", "PopupMenu", style_popup_menu); @@ -939,12 +944,12 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { // Force the v_separation to be even so that the spacing on top and bottom is even. // If the vsep is odd and cannot be split into 2 even groups (of pixels), then it will be lopsided. - // We add 2 to the vsep to give it some extra spacing which looks a bit more modern (see Windows, for example) - int vsep_base = extra_spacing + default_margin_size + 2; - int force_even_vsep = vsep_base + (vsep_base % 2); + // We add 2 to the vsep to give it some extra spacing which looks a bit more modern (see Windows, for example). + const int vsep_base = extra_spacing + default_margin_size + 6; + const int force_even_vsep = vsep_base + (vsep_base % 2); theme->set_constant("v_separation", "PopupMenu", force_even_vsep * EDSCALE); - theme->set_constant("item_start_padding", "PopupMenu", popup_menu_margin_size * EDSCALE); - theme->set_constant("item_end_padding", "PopupMenu", popup_menu_margin_size * EDSCALE); + theme->set_constant("item_start_padding", "PopupMenu", default_margin_size * 1.5 * EDSCALE); + theme->set_constant("item_end_padding", "PopupMenu", default_margin_size * 1.5 * EDSCALE); // Sub-inspectors for (int i = 0; i < 16; i++) { @@ -1660,6 +1665,9 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { style_dictionary_add_item->set_expand_margin_size(SIDE_RIGHT, 4 * EDSCALE); theme->set_stylebox("DictionaryAddItem", "EditorStyles", style_dictionary_add_item); + Ref<StyleBoxEmpty> vshader_label_style = make_empty_stylebox(2, 1, 2, 1); + theme->set_stylebox("label_style", "VShaderEditor", vshader_label_style); + // adaptive script theme constants // for comments and elements with lower relevance const Color dim_color = Color(font_color.r, font_color.g, font_color.b, 0.5); @@ -1669,17 +1677,14 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { const Color alpha2 = Color(mono_value, mono_value, mono_value, 0.14); const Color alpha3 = Color(mono_value, mono_value, mono_value, 0.27); - // editor main color - const Color main_color = dark_theme ? Color(0.34, 0.7, 1.0) : Color(0.02, 0.5, 1.0); - - const Color symbol_color = Color(0.34, 0.57, 1.0).lerp(mono_color, dark_theme ? 0.5 : 0.3); - const Color keyword_color = Color(1.0, 0.44, 0.52); - const Color control_flow_keyword_color = dark_theme ? Color(1.0, 0.55, 0.8) : Color(0.8, 0.4, 0.6); - const Color basetype_color = dark_theme ? Color(0.26, 1.0, 0.76) : Color(0.0, 0.76, 0.38); - const Color type_color = basetype_color.lerp(mono_color, dark_theme ? 0.4 : 0.3); - const Color usertype_color = basetype_color.lerp(mono_color, dark_theme ? 0.7 : 0.5); - const Color comment_color = dim_color; - const Color string_color = (dark_theme ? Color(1.0, 0.85, 0.26) : Color(1.0, 0.82, 0.09)).lerp(mono_color, dark_theme ? 0.5 : 0.3); + const Color symbol_color = dark_theme ? Color(0.67, 0.79, 1) : Color(0, 0, 0.61); + const Color keyword_color = dark_theme ? Color(1.0, 0.44, 0.52) : Color(0.9, 0.135, 0.51); + const Color control_flow_keyword_color = dark_theme ? Color(1.0, 0.55, 0.8) : Color(0.743, 0.12, 0.8); + const Color base_type_color = dark_theme ? Color(0.26, 1.0, 0.76) : Color(0, 0.6, 0.2); + const Color engine_type_color = dark_theme ? Color(0.56, 1, 0.86) : Color(0.11, 0.55, 0.4); + const Color user_type_color = dark_theme ? Color(0.78, 1, 0.93) : Color(0.18, 0.45, 0.4); + const Color comment_color = dark_theme ? dim_color : Color(0.08, 0.08, 0.08, 0.5); + const Color string_color = dark_theme ? Color(1, 0.93, 0.63) : Color(0.6, 0.42, 0); // Use the brightest background color on a light theme (which generally uses a negative contrast rate). const Color te_background_color = dark_theme ? background_color : dark_color_3; @@ -1692,24 +1697,24 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { const Color completion_font_color = font_color; const Color text_color = font_color; const Color line_number_color = dim_color; - const Color safe_line_number_color = dim_color * Color(1, 1.2, 1, 1.5); + const Color safe_line_number_color = dark_theme ? (dim_color * Color(1, 1.2, 1, 1.5)) : Color(0, 0.4, 0, 0.75); const Color caret_color = mono_color; const Color caret_background_color = mono_color.inverted(); const Color text_selected_color = dark_color_3; - const Color brace_mismatch_color = error_color; + const Color brace_mismatch_color = dark_theme ? error_color : Color(1, 0.08, 0, 1); const Color current_line_color = alpha1; const Color line_length_guideline_color = dark_theme ? base_color : background_color; const Color word_highlighted_color = alpha1; - const Color number_color = basetype_color.lerp(mono_color, dark_theme ? 0.5 : 0.3); - const Color function_color = main_color; - const Color member_variable_color = main_color.lerp(mono_color, 0.6); + const Color number_color = dark_theme ? Color(0.63, 1, 0.88) : Color(0, 0.55, 0.28, 1); + const Color function_color = dark_theme ? Color(0.34, 0.7, 1.0) : Color(0, 0.225, 0.9, 1); + const Color member_variable_color = dark_theme ? Color(0.34, 0.7, 1.0).lerp(mono_color, 0.6) : Color(0, 0.4, 0.68, 1); const Color mark_color = Color(error_color.r, error_color.g, error_color.b, 0.3); const Color bookmark_color = Color(0.08, 0.49, 0.98); - const Color breakpoint_color = error_color; + const Color breakpoint_color = dark_theme ? error_color : Color(1, 0.27, 0.2, 1); const Color executing_line_color = Color(0.98, 0.89, 0.27); const Color code_folding_color = alpha3; const Color search_result_color = alpha1; - const Color search_result_border_color = Color(0.41, 0.61, 0.91, 0.38); + const Color search_result_border_color = dark_theme ? Color(0.41, 0.61, 0.91, 0.38) : Color(0, 0.4, 1, 0.38); EditorSettings *setting = EditorSettings::get_singleton(); String text_editor_color_theme = setting->get("text_editor/theme/color_theme"); @@ -1717,9 +1722,9 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { setting->set_initial_value("text_editor/theme/highlighting/symbol_color", symbol_color, true); setting->set_initial_value("text_editor/theme/highlighting/keyword_color", keyword_color, true); setting->set_initial_value("text_editor/theme/highlighting/control_flow_keyword_color", control_flow_keyword_color, true); - setting->set_initial_value("text_editor/theme/highlighting/base_type_color", basetype_color, true); - setting->set_initial_value("text_editor/theme/highlighting/engine_type_color", type_color, true); - setting->set_initial_value("text_editor/theme/highlighting/user_type_color", usertype_color, true); + setting->set_initial_value("text_editor/theme/highlighting/base_type_color", base_type_color, true); + setting->set_initial_value("text_editor/theme/highlighting/engine_type_color", engine_type_color, true); + setting->set_initial_value("text_editor/theme/highlighting/user_type_color", user_type_color, true); setting->set_initial_value("text_editor/theme/highlighting/comment_color", comment_color, true); setting->set_initial_value("text_editor/theme/highlighting/string_color", string_color, true); setting->set_initial_value("text_editor/theme/highlighting/background_color", te_background_color, true); diff --git a/editor/export/editor_export_platform.cpp b/editor/export/editor_export_platform.cpp index 57ae83aeee..34b407779e 100644 --- a/editor/export/editor_export_platform.cpp +++ b/editor/export/editor_export_platform.cpp @@ -41,6 +41,7 @@ #include "editor/editor_node.h" #include "editor/editor_paths.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "editor/plugins/script_editor_plugin.h" #include "editor_export_plugin.h" diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp index 7d20081217..a7d9d7f068 100644 --- a/editor/export/export_template_manager.cpp +++ b/editor/export/export_template_manager.cpp @@ -37,8 +37,10 @@ #include "editor/editor_node.h" #include "editor/editor_paths.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "editor/progress_dialog.h" #include "scene/gui/file_dialog.h" +#include "scene/gui/separator.h" #include "scene/gui/tree.h" #include "scene/main/http_request.h" diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index a20f19efc8..cb82cefbbb 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -38,6 +38,7 @@ #include "editor/editor_properties.h" #include "editor/editor_scale.h" #include "editor/export/editor_export.h" +#include "scene/gui/check_button.h" #include "scene/gui/link_button.h" #include "scene/gui/tree.h" diff --git a/editor/icons/AudioStream.svg b/editor/icons/AudioStream.svg new file mode 100644 index 0000000000..5d92dc25a5 --- /dev/null +++ b/editor/icons/AudioStream.svg @@ -0,0 +1 @@ +<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="1" y2="15"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path d="m12 2a-1 1 0 0 1 1 1-1 1 0 0 1 -1 1c-4.4301 0-8 3.5699-8 8a-1 1 0 0 1 -1 1-1 1 0 0 1 -1-1c0-5.511 4.489-10 10-10zm0 4a-1 1 0 0 1 1 1-1 1 0 0 1 -1 1c-2.221 0-4 1.779-4 4a-1 1 0 0 1 -1 1-1 1 0 0 1 -1-1c0-3.3018 2.6981-6 6-6zm0 4a-2 2 0 0 1 2 2-2 2 0 0 1 -2 2-2 2 0 0 1 -2-2-2 2 0 0 1 2-2z" fill="url(#a)"/></svg> diff --git a/editor/icons/AudioStreamGenerator.svg b/editor/icons/AudioStreamGenerator.svg new file mode 100644 index 0000000000..55b0fb9d92 --- /dev/null +++ b/editor/icons/AudioStreamGenerator.svg @@ -0,0 +1 @@ +<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="1" y2="15"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path d="m14 9-3 5-3-12-3 7-3-2" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg> diff --git a/editor/icons/AudioStreamMicrophone.svg b/editor/icons/AudioStreamMicrophone.svg new file mode 100644 index 0000000000..51009e9d53 --- /dev/null +++ b/editor/icons/AudioStreamMicrophone.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="1" y2="15"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path d="m7 1c-1.108 0-2 .892-2 2h2v1h-2v2h2v1h-2c0 1.108.892 2 2 2v4l-2 2h6l-2-2v-4c1.108 0 2-.892 2-2h-2v-1h2v-2h-2v-1h2c0-1.108-.892-2-2-2z" fill="url(#a)"/></svg> diff --git a/editor/icons/AudioStreamRandomizer.svg b/editor/icons/AudioStreamRandomizer.svg new file mode 100644 index 0000000000..1696dff795 --- /dev/null +++ b/editor/icons/AudioStreamRandomizer.svg @@ -0,0 +1 @@ +<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="1" y2="15"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path d="m7.9999997 1c6.6837543 0 7.0000003.3165085 7.0000003 7.0057779 0 6.6877711-.286255 6.9755641-6.9367525 6.9938021-3.0191555.008313-4.4456225-.105997-5.1863245-.415726-1.570375-.65669-1.876923-1.727949-1.876923-6.5780761 0-6.6892694.316247-7.0057779 6.9999997-7.0057779zm3.5299143 1.7638478c-1.5662016 0-2.4379256 1.7724432-1.475213 2.9973439.738933.9401693 2.041543 1.025967 2.876923.1899002 1.183646-1.1846229.303279-3.1872441-1.40171-3.1872441zm-3.5760682 3.2710739c-1.5661974 0-2.4379268 1.7707341-1.4752138 2.9956331.7389365.9401892 2.0415435 1.0276772 2.8769233.191611 1.1836457-1.1846231.3032798-3.1872441-1.4017095-3.1872441zm-3.5538458 3.4729499c-.958537.031867-1.875214.7423284-1.875214 1.8493884 0 1.564955 2.248443 2.516522 3.249573 1.375494.7905175-.900982.8551191-1.664857.208547-2.487522-.416627-.5300879-1.007786-.7565128-1.582906-.7373604z" fill="url(#a)"/></svg> diff --git a/editor/icons/NodeWarnings2.svg b/editor/icons/NodeWarnings2.svg new file mode 100644 index 0000000000..e0385c28d1 --- /dev/null +++ b/editor/icons/NodeWarnings2.svg @@ -0,0 +1 @@ +<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8.0292969 2.0019531a1.0001 1.0001 0 0 0 -.8867188.484375l-6 9.9999999a1.0001 1.0001 0 0 0 .8574219 1.513672h12a1.0001 1.0001 0 0 0 .857422-1.513672l-2.326172-3.876953c-.89392-.5083134-1.507327-1.4610509-1.529297-2.5488281l-2.1445311-3.5742188a1.0001 1.0001 0 0 0 -.828125-.484375zm-1.0292969 2.9980469h2v5h-2zm0 6h2v2h-2z" fill="#ffdd65"/><g fill="#f95252"><path d="m14 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2z"/><path d="m15.447266 4.6210938c-.430501.2402237-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062z"/></g></svg> diff --git a/editor/icons/NodeWarnings3.svg b/editor/icons/NodeWarnings3.svg new file mode 100644 index 0000000000..53c0e70034 --- /dev/null +++ b/editor/icons/NodeWarnings3.svg @@ -0,0 +1 @@ +<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8.0292969 2.0019531a1.0001 1.0001 0 0 0 -.8867188.484375l-6 9.9999999a1.0001 1.0001 0 0 0 .8574219 1.513672h12a1.0001 1.0001 0 0 0 .982422-1.171875c-.308689.108606-.638692.171875-.982422.171875-1.645008 0-3-1.354992-3-3a1.0001 1.0001 0 0 0 0-.0019531c.002071-.7569921.302544-1.4803618.818359-2.0332031-.464296-.5178712-.798903-1.1662278-.816406-1.9042969l-2.1445311-3.5742188a1.0001 1.0001 0 0 0 -.828125-.484375zm-1.0292969 2.9980469h2v5h-2zm6.095703 4.7636719c-.02286.0837076-.095296.1479891-.095703.2363281v.001953c.001004.551209.418791.97816.964844.996094l-.712891-1.1875001c-.051505-.0169949-.103183-.0337067-.15625-.046875zm-6.095703 1.2363281h2v2h-2z" fill="#ffdd65"/><path d="m14 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm1.447266 4.6210938c-.430501.2402237-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062zm0 4c-.430501.2402236-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062z" fill="#f95252" stroke-dashoffset="16.5" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg> diff --git a/editor/icons/NodeWarnings4Plus.svg b/editor/icons/NodeWarnings4Plus.svg new file mode 100644 index 0000000000..64c0a0671d --- /dev/null +++ b/editor/icons/NodeWarnings4Plus.svg @@ -0,0 +1 @@ +<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8.0292969 2.0019531a1.0001 1.0001 0 0 0 -.8867188.484375l-6 9.9999999a1.0001 1.0001 0 0 0 .8574219 1.513672h9a1.0001 1.0001 0 0 0 0-.001953c.002025-.740254.278882-1.453739.773438-2.001953-.478045-.532242-.773438-1.231924-.773438-1.996094a1.0001 1.0001 0 0 0 0-.0019531c.002071-.7569921.302544-1.4803618.818359-2.0332031-.464296-.5178713-.798903-1.1662278-.816406-1.9042969l-2.1445311-3.5742188a1.0001 1.0001 0 0 0 -.828125-.484375zm-1.0292969 2.9980469h2v5h-2zm6.095703 4.7636719c-.02286.0837076-.095296.1479891-.095703.2363281v.001953c.001004.551209.418791.97816.964844.996094l-.712891-1.1875001c-.051505-.0169949-.103183-.0337067-.15625-.046875zm-6.095703 1.2363281h2v2h-2zm6.095703 2.763672c-.02286.083707-.095296.147988-.095703.236328h1c-.326848 0-.598793-.160518-.904297-.236328z" fill="#ffdd65"/><g fill="#f95252" stroke-dashoffset="16.5" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m14 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2z"/><path d="m15.447266 8.6210938c-.430501.2402236-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062z"/><path d="m15.447266 4.6210938c-.430501.2402237-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062z"/><path d="m15.447266 12.621094c-.430501.240224-.923653.378906-1.447266.378906-.522676 0-1.015355-.137527-1.445312-.376953a2 2 0 0 0 -.554688 1.376953 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.378906z"/></g></svg> diff --git a/editor/import/scene_import_settings.cpp b/editor/import/scene_import_settings.cpp index 410f01a9c6..6c12464b5a 100644 --- a/editor/import/scene_import_settings.cpp +++ b/editor/import/scene_import_settings.cpp @@ -35,6 +35,7 @@ #include "editor/editor_inspector.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/animation/animation_player.h" #include "scene/resources/importer_mesh.h" diff --git a/editor/import_defaults_editor.cpp b/editor/import_defaults_editor.cpp index 9d96822aef..a70f5225e9 100644 --- a/editor/import_defaults_editor.cpp +++ b/editor/import_defaults_editor.cpp @@ -36,6 +36,7 @@ #include "editor/editor_autoload_settings.h" #include "editor/editor_plugin_settings.h" #include "editor/editor_sectioned_inspector.h" +#include "editor/editor_settings.h" #include "editor/localization_editor.h" #include "editor/shader_globals_editor.h" #include "scene/gui/center_container.h" diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index f9e5885f9d..087ef48b56 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -34,6 +34,7 @@ #include "editor/editor_node.h" #include "editor/editor_resource_preview.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" class ImportDockParameters : public Object { GDCLASS(ImportDockParameters, Object); diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index e0dd5610ee..79d94246ad 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -33,6 +33,7 @@ #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "editor/plugins/script_editor_plugin.h" InspectorDock *InspectorDock::singleton = nullptr; @@ -64,6 +65,9 @@ void InspectorDock::_menu_option_confirm(int p_option, bool p_confirmed) { case COLLAPSE_ALL: { _menu_collapseall(); } break; + case EXPAND_REVERTABLE: { + _menu_expand_revertable(); + } break; case RESOURCE_SAVE: { _save_resource(false); @@ -400,6 +404,10 @@ void InspectorDock::_menu_expandall() { inspector->expand_all_folding(); } +void InspectorDock::_menu_expand_revertable() { + inspector->expand_revertable(); +} + void InspectorDock::_warning_pressed() { warning_dialog->popup_centered(); } @@ -518,6 +526,8 @@ void InspectorDock::update(Object *p_object) { p->clear(); p->add_icon_shortcut(get_theme_icon(SNAME("GuiTreeArrowDown"), SNAME("EditorIcons")), ED_SHORTCUT("property_editor/expand_all", TTR("Expand All")), EXPAND_ALL); p->add_icon_shortcut(get_theme_icon(SNAME("GuiTreeArrowRight"), SNAME("EditorIcons")), ED_SHORTCUT("property_editor/collapse_all", TTR("Collapse All")), COLLAPSE_ALL); + // Calling it 'revertable' internally, because that's what the implementation is based on, but labeling it as 'non-default' because that's more user friendly, even if not 100% accurate. + p->add_shortcut(ED_SHORTCUT("property_editor/expand_revertable", TTR("Expand Non-Default")), EXPAND_REVERTABLE); p->add_separator(TTR("Property Name Style")); p->add_radio_check_item(TTR("Raw"), PROPERTY_NAME_STYLE_RAW); diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index e3d35c2157..e32410151f 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -61,6 +61,7 @@ class InspectorDock : public VBoxContainer { COLLAPSE_ALL, EXPAND_ALL, + EXPAND_REVERTABLE, // Matches `EditorPropertyNameProcessor::Style`. PROPERTY_NAME_STYLE_RAW, @@ -124,6 +125,7 @@ class InspectorDock : public VBoxContainer { void _edit_back(); void _menu_collapseall(); void _menu_expandall(); + void _menu_expand_revertable(); void _select_history(int p_idx); void _prepare_history(); diff --git a/editor/localization_editor.cpp b/editor/localization_editor.cpp index 0325f4bd5c..e8fb80eb57 100644 --- a/editor/localization_editor.cpp +++ b/editor/localization_editor.cpp @@ -36,6 +36,7 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_translation_parser.h" +#include "editor/filesystem_dock.h" #include "editor/pot_generator.h" #include "scene/gui/control.h" @@ -379,6 +380,95 @@ void LocalizationEditor::_update_pot_file_extensions() { } } +void LocalizationEditor::connect_filesystem_dock_signals(FileSystemDock *p_fs_dock) { + p_fs_dock->connect("files_moved", callable_mp(this, &LocalizationEditor::_filesystem_files_moved)); + p_fs_dock->connect("file_removed", callable_mp(this, &LocalizationEditor::_filesystem_file_removed)); +} + +void LocalizationEditor::_filesystem_files_moved(const String &p_old_file, const String &p_new_file) { + // Update remaps if the moved file is a part of them. + Dictionary remaps; + bool remaps_changed = false; + + if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/translation_remaps")) { + remaps = ProjectSettings::get_singleton()->get("internationalization/locale/translation_remaps"); + } + + // Check for the keys. + if (remaps.has(p_old_file)) { + PackedStringArray remapped_files = remaps[p_old_file]; + remaps.erase(p_old_file); + remaps[p_new_file] = remapped_files; + remaps_changed = true; + print_verbose(vformat("Changed remap key \"%s\" to \"%s\" due to a moved file.", p_old_file, p_new_file)); + } + + // Check for the Array elements of the values. + Array remap_keys = remaps.keys(); + for (int i = 0; i < remap_keys.size(); i++) { + PackedStringArray remapped_files = remaps[remap_keys[i]]; + bool remapped_files_updated = false; + + for (int j = 0; j < remapped_files.size(); j++) { + int splitter_pos = remapped_files[j].rfind(":"); + String res_path = remapped_files[j].substr(0, splitter_pos); + + if (res_path == p_old_file) { + String locale_name = remapped_files[j].substr(splitter_pos + 1); + // Replace the element at that index. + remapped_files.insert(j, p_new_file + ":" + locale_name); + remapped_files.remove_at(j + 1); + remaps_changed = true; + remapped_files_updated = true; + print_verbose(vformat("Changed remap value \"%s\" to \"%s\" of key \"%s\" due to a moved file.", res_path + ":" + locale_name, remapped_files[j], remap_keys[i])); + } + } + + if (remapped_files_updated) { + remaps[remap_keys[i]] = remapped_files; + } + } + + if (remaps_changed) { + ProjectSettings::get_singleton()->set_setting("internationalization/locale/translation_remaps", remaps); + update_translations(); + emit_signal("localization_changed"); + } +} + +void LocalizationEditor::_filesystem_file_removed(const String &p_file) { + // Check if the remaps are affected. + Dictionary remaps; + + if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/translation_remaps")) { + remaps = ProjectSettings::get_singleton()->get("internationalization/locale/translation_remaps"); + } + + bool remaps_changed = remaps.has(p_file); + + if (!remaps_changed) { + Array remap_keys = remaps.keys(); + for (int i = 0; i < remap_keys.size() && !remaps_changed; i++) { + PackedStringArray remapped_files = remaps[remap_keys[i]]; + for (int j = 0; j < remapped_files.size() && !remaps_changed; j++) { + int splitter_pos = remapped_files[j].rfind(":"); + String res_path = remapped_files[j].substr(0, splitter_pos); + remaps_changed = p_file == res_path; + if (remaps_changed) { + print_verbose(vformat("Remap value \"%s\" of key \"%s\" has been removed from the file system.", remapped_files[j], remap_keys[i])); + } + } + } + } else { + print_verbose(vformat("Remap key \"%s\" has been removed from the file system.", p_file)); + } + + if (remaps_changed) { + update_translations(); + emit_signal("localization_changed"); + } +} + void LocalizationEditor::update_translations() { if (updating_translations) { return; @@ -432,6 +522,13 @@ void LocalizationEditor::update_translations() { t->set_tooltip(0, keys[i]); t->set_metadata(0, keys[i]); t->add_button(0, get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), 0, false, TTR("Remove")); + + // Display that it has been removed if this is the case. + if (!FileAccess::exists(keys[i])) { + t->set_text(0, t->get_text(0) + vformat(" (%s)", TTR("Removed"))); + t->set_tooltip(0, vformat(TTR("%s cannot be found."), t->get_tooltip(0))); + } + if (keys[i] == remap_selected) { t->select(0); translation_res_option_add_button->set_disabled(false); @@ -454,6 +551,12 @@ void LocalizationEditor::update_translations() { t2->set_editable(1, true); t2->set_metadata(1, path); t2->set_tooltip(1, locale); + + // Display that it has been removed if this is the case. + if (!FileAccess::exists(path)) { + t2->set_text(0, t2->get_text(0) + vformat(" (%s)", TTR("Removed"))); + t2->set_tooltip(0, vformat(TTR("%s cannot be found."), t2->get_tooltip(0))); + } } } } diff --git a/editor/localization_editor.h b/editor/localization_editor.h index 4b41a90cc2..10ccdfdc13 100644 --- a/editor/localization_editor.h +++ b/editor/localization_editor.h @@ -36,6 +36,7 @@ #include "scene/gui/tree.h" class EditorFileDialog; +class FileSystemDock; class LocalizationEditor : public VBoxContainer { GDCLASS(LocalizationEditor, VBoxContainer); @@ -81,6 +82,9 @@ class LocalizationEditor : public VBoxContainer { void _pot_generate(const String &p_file); void _update_pot_file_extensions(); + void _filesystem_files_moved(const String &p_old_file, const String &p_new_file); + void _filesystem_file_removed(const String &p_file); + protected: void _notification(int p_what); static void _bind_methods(); @@ -88,6 +92,7 @@ protected: public: void add_translation(const String &p_translation); void update_translations(); + void connect_filesystem_dock_signals(FileSystemDock *p_fs_dock); LocalizationEditor(); }; diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index 9d80e7a193..cb77cd78bf 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -35,6 +35,8 @@ #include "core/os/keyboard.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" +#include "scene/gui/separator.h" bool AbstractPolygon2DEditor::Vertex::operator==(const AbstractPolygon2DEditor::Vertex &p_vertex) const { return polygon == p_vertex.polygon && vertex == p_vertex.vertex; diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp index 7481882cbe..32d97c65a9 100644 --- a/editor/plugins/animation_blend_space_1d_editor.cpp +++ b/editor/plugins/animation_blend_space_1d_editor.cpp @@ -34,6 +34,7 @@ #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/animation/animation_blend_tree.h" StringName AnimationNodeBlendSpace1DEditor::get_blend_position_path() const { diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h index 3488b4bf30..9b06f3248f 100644 --- a/editor/plugins/animation_blend_space_1d_editor.h +++ b/editor/plugins/animation_blend_space_1d_editor.h @@ -33,11 +33,11 @@ #include "editor/editor_plugin.h" #include "editor/plugins/animation_tree_editor_plugin.h" -#include "editor/property_editor.h" #include "scene/animation/animation_blend_space_1d.h" #include "scene/gui/button.h" #include "scene/gui/graph_edit.h" #include "scene/gui/popup.h" +#include "scene/gui/separator.h" #include "scene/gui/tree.h" class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin { diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index 14d009f03b..dc764725dd 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -38,6 +38,7 @@ #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/animation_blend_space_2d_editor.h b/editor/plugins/animation_blend_space_2d_editor.h index 88b9072599..26471df051 100644 --- a/editor/plugins/animation_blend_space_2d_editor.h +++ b/editor/plugins/animation_blend_space_2d_editor.h @@ -33,11 +33,11 @@ #include "editor/editor_plugin.h" #include "editor/plugins/animation_tree_editor_plugin.h" -#include "editor/property_editor.h" #include "scene/animation/animation_blend_space_2d.h" #include "scene/gui/button.h" #include "scene/gui/graph_edit.h" #include "scene/gui/popup.h" +#include "scene/gui/separator.h" #include "scene/gui/tree.h" class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin { diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index 561651e5f5..79be2d04b3 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -38,6 +38,7 @@ #include "editor/editor_inspector.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/animation/animation_player.h" #include "scene/gui/menu_button.h" #include "scene/gui/panel.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h index b5bf91a1da..18199676b8 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.h +++ b/editor/plugins/animation_blend_tree_editor_plugin.h @@ -33,7 +33,6 @@ #include "editor/editor_plugin.h" #include "editor/plugins/animation_tree_editor_plugin.h" -#include "editor/property_editor.h" #include "scene/animation/animation_blend_tree.h" #include "scene/gui/button.h" #include "scene/gui/graph_edit.h" diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 57203ec147..ebd7525bb8 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -1426,19 +1426,19 @@ void AnimationPlayerEditor::_prepare_onion_layers_2() { // Render every past/future step with the capture shader. RS::get_singleton()->canvas_item_set_material(onion.capture.canvas_item, onion.capture.material->get_rid()); - onion.capture.material->set_shader_param("bkg_color", GLOBAL_GET("rendering/environment/defaults/default_clear_color")); - onion.capture.material->set_shader_param("differences_only", onion.differences_only); - onion.capture.material->set_shader_param("present", onion.differences_only ? RS::get_singleton()->viewport_get_texture(present_rid) : RID()); + onion.capture.material->set_shader_uniform("bkg_color", GLOBAL_GET("rendering/environment/defaults/default_clear_color")); + onion.capture.material->set_shader_uniform("differences_only", onion.differences_only); + onion.capture.material->set_shader_uniform("present", onion.differences_only ? RS::get_singleton()->viewport_get_texture(present_rid) : RID()); int step_off_a = onion.past ? -onion.steps : 0; int step_off_b = onion.future ? onion.steps : 0; int cidx = 0; - onion.capture.material->set_shader_param("dir_color", onion.force_white_modulate ? Color(1, 1, 1) : Color(EDITOR_GET("editors/animation/onion_layers_past_color"))); + onion.capture.material->set_shader_uniform("dir_color", onion.force_white_modulate ? Color(1, 1, 1) : Color(EDITOR_GET("editors/animation/onion_layers_past_color"))); for (int step_off = step_off_a; step_off <= step_off_b; step_off++) { if (step_off == 0) { // Skip present step and switch to the color of future. if (!onion.force_white_modulate) { - onion.capture.material->set_shader_param("dir_color", EDITOR_GET("editors/animation/onion_layers_future_color")); + onion.capture.material->set_shader_uniform("dir_color", EDITOR_GET("editors/animation/onion_layers_future_color")); } continue; } diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp index fe5a772b0d..473450b292 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/plugins/animation_state_machine_editor.cpp @@ -38,6 +38,7 @@ #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/plugins/animation_state_machine_editor.h index ea16abd64c..165940e639 100644 --- a/editor/plugins/animation_state_machine_editor.h +++ b/editor/plugins/animation_state_machine_editor.h @@ -33,7 +33,6 @@ #include "editor/editor_plugin.h" #include "editor/plugins/animation_tree_editor_plugin.h" -#include "editor/property_editor.h" #include "scene/animation/animation_node_state_machine.h" #include "scene/gui/button.h" #include "scene/gui/graph_edit.h" diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h index ab4ef5a001..a33d97f62f 100644 --- a/editor/plugins/animation_tree_editor_plugin.h +++ b/editor/plugins/animation_tree_editor_plugin.h @@ -32,7 +32,6 @@ #define ANIMATION_TREE_EDITOR_PLUGIN_H #include "editor/editor_plugin.h" -#include "editor/property_editor.h" #include "scene/animation/animation_tree.h" #include "scene/gui/button.h" #include "scene/gui/graph_edit.h" diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 964570e1bd..ac85eb5e1b 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -53,6 +53,7 @@ #include "scene/gui/flow_container.h" #include "scene/gui/grid_container.h" #include "scene/gui/nine_patch_rect.h" +#include "scene/gui/separator.h" #include "scene/gui/subviewport_container.h" #include "scene/gui/view_panner.h" #include "scene/main/canvas_layer.h" @@ -4236,13 +4237,13 @@ void CanvasItemEditor::_insert_animation_keys(bool p_location, bool p_rotation, Control *ctrl = Object::cast_to<Control>(canvas_item); if (key_pos) { - te->insert_node_value_key(ctrl, "rect_position", ctrl->get_position(), p_on_existing); + te->insert_node_value_key(ctrl, "position", ctrl->get_position(), p_on_existing); } if (key_rot) { - te->insert_node_value_key(ctrl, "rect_rotation", ctrl->get_rotation(), p_on_existing); + te->insert_node_value_key(ctrl, "rotation", ctrl->get_rotation(), p_on_existing); } if (key_scale) { - te->insert_node_value_key(ctrl, "rect_size", ctrl->get_size(), p_on_existing); + te->insert_node_value_key(ctrl, "size", ctrl->get_size(), p_on_existing); } } } @@ -5215,7 +5216,7 @@ CanvasItemEditor::CanvasItemEditor() { group_button->set_flat(true); main_menu_hbox->add_child(group_button); group_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(GROUP_SELECTED)); - group_button->set_tooltip(TTR("Makes sure the object's children are not selectable.")); + group_button->set_tooltip(TTR("Make selected node's children not selectable.")); // Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused. group_button->set_shortcut(ED_SHORTCUT("editor/group_selected_nodes", TTR("Group Selected Node(s)"), KeyModifierMask::CMD | Key::G)); @@ -5223,7 +5224,7 @@ CanvasItemEditor::CanvasItemEditor() { ungroup_button->set_flat(true); main_menu_hbox->add_child(ungroup_button); ungroup_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(UNGROUP_SELECTED)); - ungroup_button->set_tooltip(TTR("Restores the object's children's ability to be selected.")); + ungroup_button->set_tooltip(TTR("Make selected node's children selectable.")); // Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused. ungroup_button->set_shortcut(ED_SHORTCUT("editor/ungroup_selected_nodes", TTR("Ungroup Selected Node(s)"), KeyModifierMask::CMD | KeyModifierMask::SHIFT | Key::G)); diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 5b368de3cc..04fd819dec 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -214,8 +214,8 @@ private: int primary_grid_steps = 8; int grid_step_multiplier = 0; - real_t snap_rotation_step = 0.0; - real_t snap_rotation_offset = Math::deg2rad(15.0); + real_t snap_rotation_step = Math::deg2rad(15.0); + real_t snap_rotation_offset = 0.0; real_t snap_scale_step = 0.1f; bool smart_snap_active = false; bool grid_snap_active = false; diff --git a/editor/plugins/ray_cast_2d_editor_plugin.cpp b/editor/plugins/cast_2d_editor_plugin.cpp index 6f247a37ef..18c38e7ab8 100644 --- a/editor/plugins/ray_cast_2d_editor_plugin.cpp +++ b/editor/plugins/cast_2d_editor_plugin.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* ray_cast_2d_editor_plugin.cpp */ +/* cast_2d_editor_plugin.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,30 +28,32 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "ray_cast_2d_editor_plugin.h" +#include "cast_2d_editor_plugin.h" #include "canvas_item_editor_plugin.h" #include "editor/editor_node.h" +#include "scene/2d/ray_cast_2d.h" +#include "scene/2d/shape_cast_2d.h" -void RayCast2DEditor::_notification(int p_what) { +void Cast2DEditor::_notification(int p_what) { switch (p_what) { case NOTIFICATION_ENTER_TREE: { - get_tree()->connect("node_removed", callable_mp(this, &RayCast2DEditor::_node_removed)); + get_tree()->connect("node_removed", callable_mp(this, &Cast2DEditor::_node_removed)); } break; case NOTIFICATION_EXIT_TREE: { - get_tree()->disconnect("node_removed", callable_mp(this, &RayCast2DEditor::_node_removed)); + get_tree()->disconnect("node_removed", callable_mp(this, &Cast2DEditor::_node_removed)); } break; } } -void RayCast2DEditor::_node_removed(Node *p_node) { +void Cast2DEditor::_node_removed(Node *p_node) { if (p_node == node) { node = nullptr; } } -bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) { +bool Cast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) { if (!node || !node->is_visible_in_tree()) { return false; } @@ -60,10 +62,12 @@ bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid() && mb->get_button_index() == MouseButton::LEFT) { + Vector2 target_position = node->get("target_position"); + if (mb->is_pressed()) { - if (xform.xform(node->get_target_position()).distance_to(mb->get_position()) < 8) { + if (xform.xform(target_position).distance_to(mb->get_position()) < 8) { pressed = true; - original_target_position = node->get_target_position(); + original_target_position = target_position; return true; } else { @@ -73,9 +77,9 @@ bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) { } } else if (pressed) { undo_redo->create_action(TTR("Set target_position")); - undo_redo->add_do_method(node, "set_target_position", node->get_target_position()); + undo_redo->add_do_property(node, "target_position", target_position); undo_redo->add_do_method(canvas_item_editor, "update_viewport"); - undo_redo->add_undo_method(node, "set_target_position", original_target_position); + undo_redo->add_undo_property(node, "target_position", original_target_position); undo_redo->add_undo_method(canvas_item_editor, "update_viewport"); undo_redo->commit_action(); @@ -90,7 +94,7 @@ bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) { Vector2 point = canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(mm->get_position())); point = node->get_global_transform().affine_inverse().xform(point); - node->set_target_position(point); + node->set("target_position", point); canvas_item_editor->update_viewport(); node->notify_property_list_changed(); @@ -100,7 +104,7 @@ bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) { return false; } -void RayCast2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) { +void Cast2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) { if (!node || !node->is_visible_in_tree()) { return; } @@ -108,16 +112,16 @@ void RayCast2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) { Transform2D gt = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); const Ref<Texture2D> handle = get_theme_icon(SNAME("EditorHandle"), SNAME("EditorIcons")); - p_overlay->draw_texture(handle, gt.xform(node->get_target_position()) - handle->get_size() / 2); + p_overlay->draw_texture(handle, gt.xform((Vector2)node->get("target_position")) - handle->get_size() / 2); } -void RayCast2DEditor::edit(Node *p_node) { +void Cast2DEditor::edit(Node2D *p_node) { if (!canvas_item_editor) { canvas_item_editor = CanvasItemEditor::get_singleton(); } - if (p_node) { - node = Object::cast_to<RayCast2D>(p_node); + if (Object::cast_to<RayCast2D>(p_node) || Object::cast_to<ShapeCast2D>(p_node)) { + node = p_node; } else { node = nullptr; } @@ -125,27 +129,27 @@ void RayCast2DEditor::edit(Node *p_node) { canvas_item_editor->update_viewport(); } -RayCast2DEditor::RayCast2DEditor() { +Cast2DEditor::Cast2DEditor() { undo_redo = EditorNode::get_singleton()->get_undo_redo(); } /////////////////////// -void RayCast2DEditorPlugin::edit(Object *p_object) { - ray_cast_2d_editor->edit(Object::cast_to<RayCast2D>(p_object)); +void Cast2DEditorPlugin::edit(Object *p_object) { + cast_2d_editor->edit(Object::cast_to<Node2D>(p_object)); } -bool RayCast2DEditorPlugin::handles(Object *p_object) const { - return Object::cast_to<RayCast2D>(p_object) != nullptr; +bool Cast2DEditorPlugin::handles(Object *p_object) const { + return Object::cast_to<RayCast2D>(p_object) != nullptr || Object::cast_to<ShapeCast2D>(p_object) != nullptr; } -void RayCast2DEditorPlugin::make_visible(bool p_visible) { +void Cast2DEditorPlugin::make_visible(bool p_visible) { if (!p_visible) { edit(nullptr); } } -RayCast2DEditorPlugin::RayCast2DEditorPlugin() { - ray_cast_2d_editor = memnew(RayCast2DEditor); - EditorNode::get_singleton()->get_gui_base()->add_child(ray_cast_2d_editor); +Cast2DEditorPlugin::Cast2DEditorPlugin() { + cast_2d_editor = memnew(Cast2DEditor); + EditorNode::get_singleton()->get_gui_base()->add_child(cast_2d_editor); } diff --git a/editor/plugins/ray_cast_2d_editor_plugin.h b/editor/plugins/cast_2d_editor_plugin.h index 74628da0e4..d9c0cc4a06 100644 --- a/editor/plugins/ray_cast_2d_editor_plugin.h +++ b/editor/plugins/cast_2d_editor_plugin.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* ray_cast_2d_editor_plugin.h */ +/* cast_2d_editor_plugin.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,20 +28,20 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RAY_CAST_2D_EDITOR_PLUGIN_H -#define RAY_CAST_2D_EDITOR_PLUGIN_H +#ifndef CAST_2D_EDITOR_PLUGIN_H +#define CAST_2D_EDITOR_PLUGIN_H #include "editor/editor_plugin.h" -#include "scene/2d/ray_cast_2d.h" +#include "scene/2d/node_2d.h" class CanvasItemEditor; -class RayCast2DEditor : public Control { - GDCLASS(RayCast2DEditor, Control); +class Cast2DEditor : public Control { + GDCLASS(Cast2DEditor, Control); UndoRedo *undo_redo = nullptr; CanvasItemEditor *canvas_item_editor = nullptr; - RayCast2D *node; + Node2D *node; bool pressed = false; Point2 original_target_position; @@ -53,27 +53,27 @@ protected: public: bool forward_canvas_gui_input(const Ref<InputEvent> &p_event); void forward_canvas_draw_over_viewport(Control *p_overlay); - void edit(Node *p_node); + void edit(Node2D *p_node); - RayCast2DEditor(); + Cast2DEditor(); }; -class RayCast2DEditorPlugin : public EditorPlugin { - GDCLASS(RayCast2DEditorPlugin, EditorPlugin); +class Cast2DEditorPlugin : public EditorPlugin { + GDCLASS(Cast2DEditorPlugin, EditorPlugin); - RayCast2DEditor *ray_cast_2d_editor = nullptr; + Cast2DEditor *cast_2d_editor = nullptr; public: - virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return ray_cast_2d_editor->forward_canvas_gui_input(p_event); } - virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { ray_cast_2d_editor->forward_canvas_draw_over_viewport(p_overlay); } + virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return cast_2d_editor->forward_canvas_gui_input(p_event); } + virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { cast_2d_editor->forward_canvas_draw_over_viewport(p_overlay); } - virtual String get_name() const override { return "RayCast2D"; } + virtual String get_name() const override { return "Cast2D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; virtual void make_visible(bool visible) override; - RayCast2DEditorPlugin(); + Cast2DEditorPlugin(); }; -#endif // RAY_CAST_2D_EDITOR_PLUGIN_H +#endif // CAST_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/control_editor_plugin.cpp b/editor/plugins/control_editor_plugin.cpp index ec038174fc..2756e45cf4 100644 --- a/editor/plugins/control_editor_plugin.cpp +++ b/editor/plugins/control_editor_plugin.cpp @@ -31,7 +31,9 @@ #include "control_editor_plugin.h" #include "editor/editor_node.h" +#include "editor/editor_settings.h" #include "editor/plugins/canvas_item_editor_plugin.h" +#include "scene/gui/separator.h" void ControlPositioningWarning::_update_warning() { if (!control_node) { diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 2954071054..8aeab684e3 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -36,6 +36,7 @@ #include "core/os/keyboard.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" CurveEditor::CurveEditor() { _selected_point = -1; diff --git a/editor/plugins/debugger_editor_plugin.cpp b/editor/plugins/debugger_editor_plugin.cpp index 5c90d70982..c572b5b7fe 100644 --- a/editor/plugins/debugger_editor_plugin.cpp +++ b/editor/plugins/debugger_editor_plugin.cpp @@ -35,6 +35,7 @@ #include "editor/debugger/editor_debugger_server.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "editor/fileserver/editor_file_server.h" #include "editor/plugins/script_editor_plugin.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/editor_resource_conversion_plugin.cpp b/editor/plugins/editor_resource_conversion_plugin.cpp new file mode 100644 index 0000000000..91394dbac7 --- /dev/null +++ b/editor/plugins/editor_resource_conversion_plugin.cpp @@ -0,0 +1,64 @@ +/*************************************************************************/ +/* editor_resource_conversion_plugin.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ + +#include "editor_resource_conversion_plugin.h" + +void EditorResourceConversionPlugin::_bind_methods() { + GDVIRTUAL_BIND(_converts_to); + GDVIRTUAL_BIND(_handles, "resource"); + GDVIRTUAL_BIND(_convert, "resource"); +} + +String EditorResourceConversionPlugin::converts_to() const { + String ret; + if (GDVIRTUAL_CALL(_converts_to, ret)) { + return ret; + } + + return ""; +} + +bool EditorResourceConversionPlugin::handles(const Ref<Resource> &p_resource) const { + bool ret; + if (GDVIRTUAL_CALL(_handles, p_resource, ret)) { + return ret; + } + + return false; +} + +Ref<Resource> EditorResourceConversionPlugin::convert(const Ref<Resource> &p_resource) const { + Ref<Resource> ret; + if (GDVIRTUAL_CALL(_convert, p_resource, ret)) { + return ret; + } + + return Ref<Resource>(); +} diff --git a/editor/plugins/editor_resource_conversion_plugin.h b/editor/plugins/editor_resource_conversion_plugin.h new file mode 100644 index 0000000000..34b0837383 --- /dev/null +++ b/editor/plugins/editor_resource_conversion_plugin.h @@ -0,0 +1,54 @@ +/*************************************************************************/ +/* editor_resource_conversion_plugin.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ + +#ifndef EDITOR_RESOURCE_CONVERSION_PLUGIN_H +#define EDITOR_RESOURCE_CONVERSION_PLUGIN_H + +#include "core/io/resource.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/script_language.h" + +class EditorResourceConversionPlugin : public RefCounted { + GDCLASS(EditorResourceConversionPlugin, RefCounted); + +protected: + static void _bind_methods(); + + GDVIRTUAL0RC(String, _converts_to) + GDVIRTUAL1RC(bool, _handles, Ref<Resource>) + GDVIRTUAL1RC(Ref<Resource>, _convert, Ref<Resource>) + +public: + virtual String converts_to() const; + virtual bool handles(const Ref<Resource> &p_resource) const; + virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const; +}; + +#endif // EDITOR_RESOURCE_CONVERSION_PLUGIN_H diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp index 4cdca95fca..542aee879b 100644 --- a/editor/plugins/gradient_editor_plugin.cpp +++ b/editor/plugins/gradient_editor_plugin.cpp @@ -33,6 +33,7 @@ #include "canvas_item_editor_plugin.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "node_3d_editor_plugin.h" Size2 GradientEditor::get_minimum_size() const { diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index 4f8f6568d1..1b4d98fc3f 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/gui/subviewport_container.h" #include "scene/resources/fog_material.h" #include "scene/resources/particles_material.h" @@ -339,17 +340,17 @@ Ref<Resource> StandardMaterial3DConversionPlugin::convert(const Ref<Resource> &p smat->set_shader(shader); List<PropertyInfo> params; - RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), ¶ms); + RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), ¶ms); for (const PropertyInfo &E : params) { // Texture parameter has to be treated specially since StandardMaterial3D saved it // as RID but ShaderMaterial needs Texture itself Ref<Texture2D> texture = mat->get_texture_by_name(E.name); if (texture.is_valid()) { - smat->set_shader_param(E.name, texture); + smat->set_shader_uniform(E.name, texture); } else { Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name); - smat->set_shader_param(E.name, value); + smat->set_shader_uniform(E.name, value); } } @@ -385,17 +386,17 @@ Ref<Resource> ORMMaterial3DConversionPlugin::convert(const Ref<Resource> &p_reso smat->set_shader(shader); List<PropertyInfo> params; - RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), ¶ms); + RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), ¶ms); for (const PropertyInfo &E : params) { // Texture parameter has to be treated specially since ORMMaterial3D saved it // as RID but ShaderMaterial needs Texture itself Ref<Texture2D> texture = mat->get_texture_by_name(E.name); if (texture.is_valid()) { - smat->set_shader_param(E.name, texture); + smat->set_shader_uniform(E.name, texture); } else { Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name); - smat->set_shader_param(E.name, value); + smat->set_shader_uniform(E.name, value); } } @@ -431,11 +432,11 @@ Ref<Resource> ParticlesMaterialConversionPlugin::convert(const Ref<Resource> &p_ smat->set_shader(shader); List<PropertyInfo> params; - RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), ¶ms); + RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), ¶ms); for (const PropertyInfo &E : params) { Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name); - smat->set_shader_param(E.name, value); + smat->set_shader_uniform(E.name, value); } smat->set_render_priority(mat->get_render_priority()); @@ -470,11 +471,11 @@ Ref<Resource> CanvasItemMaterialConversionPlugin::convert(const Ref<Resource> &p smat->set_shader(shader); List<PropertyInfo> params; - RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), ¶ms); + RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), ¶ms); for (const PropertyInfo &E : params) { Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name); - smat->set_shader_param(E.name, value); + smat->set_shader_uniform(E.name, value); } smat->set_render_priority(mat->get_render_priority()); @@ -509,11 +510,11 @@ Ref<Resource> ProceduralSkyMaterialConversionPlugin::convert(const Ref<Resource> smat->set_shader(shader); List<PropertyInfo> params; - RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), ¶ms); + RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), ¶ms); for (const PropertyInfo &E : params) { Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name); - smat->set_shader_param(E.name, value); + smat->set_shader_uniform(E.name, value); } smat->set_render_priority(mat->get_render_priority()); @@ -548,11 +549,11 @@ Ref<Resource> PanoramaSkyMaterialConversionPlugin::convert(const Ref<Resource> & smat->set_shader(shader); List<PropertyInfo> params; - RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), ¶ms); + RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), ¶ms); for (const PropertyInfo &E : params) { Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name); - smat->set_shader_param(E.name, value); + smat->set_shader_uniform(E.name, value); } smat->set_render_priority(mat->get_render_priority()); @@ -587,11 +588,11 @@ Ref<Resource> PhysicalSkyMaterialConversionPlugin::convert(const Ref<Resource> & smat->set_shader(shader); List<PropertyInfo> params; - RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), ¶ms); + RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), ¶ms); for (const PropertyInfo &E : params) { Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name); - smat->set_shader_param(E.name, value); + smat->set_shader_uniform(E.name, value); } smat->set_render_priority(mat->get_render_priority()); @@ -626,11 +627,11 @@ Ref<Resource> FogMaterialConversionPlugin::convert(const Ref<Resource> &p_resour smat->set_shader(shader); List<PropertyInfo> params; - RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), ¶ms); + RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), ¶ms); for (const PropertyInfo &E : params) { Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name); - smat->set_shader_param(E.name, value); + smat->set_shader_uniform(E.name, value); } smat->set_render_priority(mat->get_render_priority()); diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index 9c6247d59b..fc3da5fd9f 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -32,7 +32,7 @@ #define MATERIAL_EDITOR_PLUGIN_H #include "editor/editor_plugin.h" -#include "editor/property_editor.h" +#include "editor/plugins/editor_resource_conversion_plugin.h" #include "scene/3d/camera_3d.h" #include "scene/3d/light_3d.h" #include "scene/3d/mesh_instance_3d.h" diff --git a/editor/plugins/node_3d_editor_gizmos.cpp b/editor/plugins/node_3d_editor_gizmos.cpp index 5c66026c1b..0070226d40 100644 --- a/editor/plugins/node_3d_editor_gizmos.cpp +++ b/editor/plugins/node_3d_editor_gizmos.cpp @@ -2569,9 +2569,12 @@ void ShapeCast3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) { const Ref<StandardMaterial3D> material = shapecast->is_enabled() ? shapecast->get_debug_material() : get_material("shape_material_disabled"); - p_gizmo->add_lines(shapecast->get_debug_shape_vertices(), material); p_gizmo->add_lines(shapecast->get_debug_line_vertices(), material); + if (shapecast->get_shape().is_valid()) { + p_gizmo->add_lines(shapecast->get_debug_shape_vertices(), material); + } + p_gizmo->add_collision_segments(shapecast->get_debug_line_vertices()); } diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 7628a95310..005d5fc951 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -6408,7 +6408,7 @@ void fragment() { Ref<ShaderMaterial> rotate_mat = memnew(ShaderMaterial); rotate_mat->set_render_priority(Material::RENDER_PRIORITY_MAX); rotate_mat->set_shader(rotate_shader); - rotate_mat->set_shader_param("albedo", col); + rotate_mat->set_shader_uniform("albedo", col); rotate_gizmo_color[i] = rotate_mat; Array arrays = surftool->commit_to_arrays(); @@ -6416,7 +6416,7 @@ void fragment() { rotate_gizmo[i]->surface_set_material(0, rotate_mat); Ref<ShaderMaterial> rotate_mat_hl = rotate_mat->duplicate(); - rotate_mat_hl->set_shader_param("albedo", albedo); + rotate_mat_hl->set_shader_uniform("albedo", albedo); rotate_gizmo_color_hl[i] = rotate_mat_hl; if (i == 2) { // Rotation white outline @@ -6457,7 +6457,7 @@ void fragment() { )"); border_mat->set_shader(border_shader); - border_mat->set_shader_param("albedo", Color(0.75, 0.75, 0.75, col.a / 3.0)); + border_mat->set_shader_uniform("albedo", Color(0.75, 0.75, 0.75, col.a / 3.0)); rotate_gizmo[3] = Ref<ArrayMesh>(memnew(ArrayMesh)); rotate_gizmo[3]->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, arrays); @@ -6710,8 +6710,8 @@ void Node3DEditor::_init_grid() { fade_size = CLAMP(fade_size, min_fade_size, max_fade_size); real_t grid_fade_size = (grid_size - primary_grid_steps) * fade_size; - grid_mat[c]->set_shader_param("grid_size", grid_fade_size); - grid_mat[c]->set_shader_param("orthogonal", orthogonal); + grid_mat[c]->set_shader_uniform("grid_size", grid_fade_size); + grid_mat[c]->set_shader_uniform("orthogonal", orthogonal); // Cache these so we don't have to re-access memory. Vector<Vector3> &ref_grid = grid_points[c]; @@ -7559,9 +7559,9 @@ void Node3DEditor::_sun_direction_draw() { sun_direction->draw_rect(Rect2(Vector2(), sun_direction->get_size()), Color(1, 1, 1, 1)); Vector3 z_axis = preview_sun->get_transform().basis.get_column(Vector3::AXIS_Z); z_axis = get_editor_viewport(0)->camera->get_camera_transform().basis.xform_inv(z_axis); - sun_direction_material->set_shader_param("sun_direction", Vector3(z_axis.x, -z_axis.y, z_axis.z)); + sun_direction_material->set_shader_uniform("sun_direction", Vector3(z_axis.x, -z_axis.y, z_axis.z)); Color color = sun_color->get_pick_color() * sun_energy->get_value(); - sun_direction_material->set_shader_param("sun_color", Vector3(color.r, color.g, color.b)); + sun_direction_material->set_shader_uniform("sun_color", Vector3(color.r, color.g, color.b)); } void Node3DEditor::_preview_settings_changed() { @@ -7796,7 +7796,7 @@ Node3DEditor::Node3DEditor() { main_menu_hbox->add_child(tool_button[TOOL_GROUP_SELECTED]); tool_button[TOOL_GROUP_SELECTED]->set_flat(true); tool_button[TOOL_GROUP_SELECTED]->connect("pressed", callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_GROUP_SELECTED)); - tool_button[TOOL_GROUP_SELECTED]->set_tooltip(TTR("Makes sure the object's children are not selectable.")); + tool_button[TOOL_GROUP_SELECTED]->set_tooltip(TTR("Make selected node's children not selectable.")); // Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused. tool_button[TOOL_GROUP_SELECTED]->set_shortcut(ED_SHORTCUT("editor/group_selected_nodes", TTR("Group Selected Node(s)"), KeyModifierMask::CMD | Key::G)); @@ -7804,7 +7804,7 @@ Node3DEditor::Node3DEditor() { main_menu_hbox->add_child(tool_button[TOOL_UNGROUP_SELECTED]); tool_button[TOOL_UNGROUP_SELECTED]->set_flat(true); tool_button[TOOL_UNGROUP_SELECTED]->connect("pressed", callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_UNGROUP_SELECTED)); - tool_button[TOOL_UNGROUP_SELECTED]->set_tooltip(TTR("Restores the object's children's ability to be selected.")); + tool_button[TOOL_UNGROUP_SELECTED]->set_tooltip(TTR("Make selected node's children selectable.")); // Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused. tool_button[TOOL_UNGROUP_SELECTED]->set_shortcut(ED_SHORTCUT("editor/ungroup_selected_nodes", TTR("Ungroup Selected Node(s)"), KeyModifierMask::CMD | KeyModifierMask::SHIFT | Key::G)); @@ -8162,8 +8162,8 @@ void fragment() { )"); sun_direction_material.instantiate(); sun_direction_material->set_shader(sun_direction_shader); - sun_direction_material->set_shader_param("sun_direction", Vector3(0, 0, 1)); - sun_direction_material->set_shader_param("sun_color", Vector3(1, 1, 1)); + sun_direction_material->set_shader_uniform("sun_direction", Vector3(0, 0, 1)); + sun_direction_material->set_shader_uniform("sun_color", Vector3(1, 1, 1)); sun_direction->set_material(sun_direction_material); HBoxContainer *sun_angle_hbox = memnew(HBoxContainer); diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp index 2605a60d48..65b15a6001 100644 --- a/editor/plugins/path_3d_editor_plugin.cpp +++ b/editor/plugins/path_3d_editor_plugin.cpp @@ -34,6 +34,7 @@ #include "core/math/geometry_3d.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" +#include "editor/editor_settings.h" #include "node_3d_editor_plugin.h" #include "scene/resources/curve.h" diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index adf9ab1db8..c53ac59c11 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -591,7 +591,7 @@ void ScriptEditor::_go_to_tab(int p_idx) { } } - Control *c = Object::cast_to<Control>(tab_container->get_tab_control(p_idx)); + Control *c = tab_container->get_tab_control(p_idx); if (!c) { return; } @@ -813,7 +813,7 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) { if (history_pos >= 0) { idx = tab_container->get_tab_idx_from_control(history[history_pos].control); } - tab_container->set_current_tab(idx); + _go_to_tab(idx); } else { _update_selected_editor_menu(); } @@ -1448,20 +1448,20 @@ void ScriptEditor::_menu_option(int p_option) { case WINDOW_MOVE_UP: { if (tab_container->get_current_tab() > 0) { tab_container->move_child(current, tab_container->get_current_tab() - 1); - tab_container->set_current_tab(tab_container->get_current_tab() - 1); + tab_container->set_current_tab(tab_container->get_current_tab()); _update_script_names(); } } break; case WINDOW_MOVE_DOWN: { if (tab_container->get_current_tab() < tab_container->get_tab_count() - 1) { tab_container->move_child(current, tab_container->get_current_tab() + 1); - tab_container->set_current_tab(tab_container->get_current_tab() + 1); + tab_container->set_current_tab(tab_container->get_current_tab()); _update_script_names(); } } break; default: { if (p_option >= WINDOW_SELECT_BASE) { - tab_container->set_current_tab(p_option - WINDOW_SELECT_BASE); + _go_to_tab(p_option - WINDOW_SELECT_BASE); _update_script_names(); } } @@ -1494,14 +1494,14 @@ void ScriptEditor::_menu_option(int p_option) { case WINDOW_MOVE_UP: { if (tab_container->get_current_tab() > 0) { tab_container->move_child(help, tab_container->get_current_tab() - 1); - tab_container->set_current_tab(tab_container->get_current_tab() - 1); + tab_container->set_current_tab(tab_container->get_current_tab()); _update_script_names(); } } break; case WINDOW_MOVE_DOWN: { if (tab_container->get_current_tab() < tab_container->get_tab_count() - 1) { tab_container->move_child(help, tab_container->get_current_tab() + 1); - tab_container->set_current_tab(tab_container->get_current_tab() + 1); + tab_container->set_current_tab(tab_container->get_current_tab()); _update_script_names(); } } break; @@ -2128,8 +2128,8 @@ void ScriptEditor::_update_script_names() { sd.index = i; sedata.set(i, sd); } - tab_container->set_current_tab(new_prev_tab); - tab_container->set_current_tab(new_cur_tab); + _go_to_tab(new_prev_tab); + _go_to_tab(new_cur_tab); _sort_list_on_update = false; } @@ -2157,8 +2157,10 @@ void ScriptEditor::_update_script_names() { } if (tab_container->get_current_tab() == sedata_filtered[i].index) { script_list->select(index); + script_name_label->set_text(sedata_filtered[i].name); script_icon->set_texture(sedata_filtered[i].icon); + ScriptEditorBase *se = _get_current_editor(); if (se) { se->enable_editor(); diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index f77e23e63e..e700412188 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -41,7 +41,6 @@ #include "editor/filesystem_dock.h" #include "editor/plugins/visual_shader_editor_plugin.h" #include "editor/project_settings_editor.h" -#include "editor/property_editor.h" #include "editor/shader_create_dialog.h" #include "scene/gui/split_container.h" #include "servers/display_server.h" diff --git a/editor/plugins/shader_file_editor_plugin.cpp b/editor/plugins/shader_file_editor_plugin.cpp index 4564f60fa5..4874944d33 100644 --- a/editor/plugins/shader_file_editor_plugin.cpp +++ b/editor/plugins/shader_file_editor_plugin.cpp @@ -37,7 +37,6 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "editor/property_editor.h" #include "servers/display_server.h" #include "servers/rendering/shader_types.h" diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp index ed0d14efb7..c453ed26aa 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.cpp +++ b/editor/plugins/skeleton_3d_editor_plugin.cpp @@ -921,8 +921,8 @@ void fragment() { )"); handle_material->set_shader(handle_shader); Ref<Texture2D> handle = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("EditorBoneHandle"), SNAME("EditorIcons")); - handle_material->set_shader_param("point_size", handle->get_width()); - handle_material->set_shader_param("texture_albedo", handle); + handle_material->set_shader_uniform("point_size", handle->get_width()); + handle_material->set_shader_uniform("texture_albedo", handle); handles_mesh_instance = memnew(MeshInstance3D); handles_mesh_instance->set_cast_shadows_setting(GeometryInstance3D::SHADOW_CASTING_SETTING_OFF); diff --git a/editor/plugins/text_editor.cpp b/editor/plugins/text_editor.cpp index 2e9b89f1f3..196d87da36 100644 --- a/editor/plugins/text_editor.cpp +++ b/editor/plugins/text_editor.cpp @@ -32,6 +32,7 @@ #include "core/os/keyboard.h" #include "editor/editor_node.h" +#include "editor/editor_settings.h" void TextEditor::add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) { ERR_FAIL_COND(p_highlighter.is_null()); diff --git a/editor/plugins/texture_3d_editor_plugin.cpp b/editor/plugins/texture_3d_editor_plugin.cpp index 0fc7079a24..64cafa17f3 100644 --- a/editor/plugins/texture_3d_editor_plugin.cpp +++ b/editor/plugins/texture_3d_editor_plugin.cpp @@ -57,8 +57,8 @@ void Texture3DEditor::_texture_changed() { } void Texture3DEditor::_update_material() { - material->set_shader_param("layer", (layer->get_value() + 0.5) / texture->get_depth()); - material->set_shader_param("tex", texture->get_rid()); + material->set_shader_uniform("layer", (layer->get_value() + 0.5) / texture->get_depth()); + material->set_shader_uniform("tex", texture->get_rid()); String format = Image::get_format_name(texture->get_format()); diff --git a/editor/plugins/texture_layered_editor_plugin.cpp b/editor/plugins/texture_layered_editor_plugin.cpp index cb146fd342..2c6f70463d 100644 --- a/editor/plugins/texture_layered_editor_plugin.cpp +++ b/editor/plugins/texture_layered_editor_plugin.cpp @@ -68,9 +68,9 @@ void TextureLayeredEditor::_texture_changed() { } void TextureLayeredEditor::_update_material() { - materials[0]->set_shader_param("layer", layer->get_value()); - materials[2]->set_shader_param("layer", layer->get_value()); - materials[texture->get_layered_type()]->set_shader_param("tex", texture->get_rid()); + materials[0]->set_shader_uniform("layer", layer->get_value()); + materials[2]->set_shader_uniform("layer", layer->get_value()); + materials[texture->get_layered_type()]->set_shader_uniform("tex", texture->get_rid()); Vector3 v(1, 1, 1); v.normalize(); @@ -79,10 +79,10 @@ void TextureLayeredEditor::_update_material() { b.rotate(Vector3(1, 0, 0), x_rot); b.rotate(Vector3(0, 1, 0), y_rot); - materials[1]->set_shader_param("normal", v); - materials[1]->set_shader_param("rot", b); - materials[2]->set_shader_param("normal", v); - materials[2]->set_shader_param("rot", b); + materials[1]->set_shader_uniform("normal", v); + materials[1]->set_shader_uniform("rot", b); + materials[2]->set_shader_uniform("normal", v); + materials[2]->set_shader_uniform("rot", b); String format = Image::get_format_name(texture->get_format()); diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index a2b09b95eb..0bd8a8a484 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -35,7 +35,9 @@ #include "core/os/keyboard.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/gui/check_box.h" +#include "scene/gui/separator.h" #include "scene/gui/view_panner.h" #include "scene/resources/texture.h" diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index b4eab5f811..bbc22c8622 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -36,6 +36,7 @@ #include "editor/editor_resource_picker.h" #include "editor/editor_scale.h" #include "editor/progress_dialog.h" +#include "scene/gui/color_picker.h" void ThemeItemImportTree::_update_items_tree() { import_items_tree->clear(); @@ -3380,6 +3381,7 @@ ThemeTypeEditor::ThemeTypeEditor() { theme_type_list = memnew(OptionButton); theme_type_list->set_h_size_flags(SIZE_EXPAND_FILL); + theme_type_list->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS); type_list_hb->add_child(theme_type_list); theme_type_list->connect("item_selected", callable_mp(this, &ThemeTypeEditor::_list_type_selected)); diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/plugins/theme_editor_preview.cpp index 0c7303dda4..b5c6c6d651 100644 --- a/editor/plugins/theme_editor_preview.cpp +++ b/editor/plugins/theme_editor_preview.cpp @@ -36,6 +36,7 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "scene/gui/button.h" +#include "scene/gui/check_button.h" #include "scene/gui/color_picker.h" #include "scene/gui/progress_bar.h" #include "scene/resources/packed_scene.h" diff --git a/editor/plugins/version_control_editor_plugin.cpp b/editor/plugins/version_control_editor_plugin.cpp index 443d5975cd..cf55465417 100644 --- a/editor/plugins/version_control_editor_plugin.cpp +++ b/editor/plugins/version_control_editor_plugin.cpp @@ -35,6 +35,8 @@ #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" +#include "scene/gui/separator.h" VersionControlEditorPlugin *VersionControlEditorPlugin::singleton = nullptr; diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index 626071aa72..1c0e879a0a 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -40,10 +40,17 @@ #include "editor/editor_node.h" #include "editor/editor_properties.h" #include "editor/editor_scale.h" +#include "editor/plugins/curve_editor_plugin.h" #include "editor/plugins/shader_editor_plugin.h" #include "scene/animation/animation_player.h" +#include "scene/gui/button.h" +#include "scene/gui/code_edit.h" +#include "scene/gui/graph_edit.h" #include "scene/gui/menu_button.h" #include "scene/gui/panel.h" +#include "scene/gui/popup.h" +#include "scene/gui/rich_text_label.h" +#include "scene/gui/tree.h" #include "scene/gui/view_panner.h" #include "scene/main/window.h" #include "scene/resources/visual_shader_nodes.h" @@ -91,17 +98,6 @@ void VisualShaderNodePlugin::_bind_methods() { /////////////////// -static Ref<StyleBoxEmpty> make_empty_stylebox(float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_bottom = -1) { - Ref<StyleBoxEmpty> style(memnew(StyleBoxEmpty)); - style->set_default_margin(SIDE_LEFT, p_margin_left * EDSCALE); - style->set_default_margin(SIDE_RIGHT, p_margin_right * EDSCALE); - style->set_default_margin(SIDE_BOTTOM, p_margin_bottom * EDSCALE); - style->set_default_margin(SIDE_TOP, p_margin_top * EDSCALE); - return style; -} - -/////////////////// - VisualShaderGraphPlugin::VisualShaderGraphPlugin() { } @@ -364,8 +360,6 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) { Control *offset; - static Ref<StyleBoxEmpty> label_style = make_empty_stylebox(2, 1, 2, 1); - static const Color type_color[] = { Color(0.38, 0.85, 0.96), // scalar (float) Color(0.49, 0.78, 0.94), // scalar (int) @@ -765,14 +759,14 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) { } else { Label *label = memnew(Label); label->set_text(name_left); - label->add_theme_style_override("normal", label_style); //more compact + label->add_theme_style_override("normal", editor->get_theme_stylebox(SNAME("label_style"), SNAME("VShaderEditor"))); //more compact hb->add_child(label); if (vsnode->is_input_port_default(i, mode) && !port_left_used) { Label *hint_label = memnew(Label); hint_label->set_text(TTR("[default]")); hint_label->add_theme_color_override("font_color", editor->get_theme_color(SNAME("font_readonly_color"), SNAME("TextEdit"))); - hint_label->add_theme_style_override("normal", label_style); + hint_label->add_theme_style_override("normal", editor->get_theme_stylebox(SNAME("label_style"), SNAME("VShaderEditor"))); hb->add_child(hint_label); } } @@ -813,7 +807,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) { } else { Label *label = memnew(Label); label->set_text(name_right); - label->add_theme_style_override("normal", label_style); //more compact + label->add_theme_style_override("normal", editor->get_theme_stylebox(SNAME("label_style"), SNAME("VShaderEditor"))); //more compact hb->add_child(label); } } @@ -1080,6 +1074,23 @@ VisualShaderGraphPlugin::~VisualShaderGraphPlugin() { ///////////////// +void VisualShaderEditedProperty::_bind_methods() { + ClassDB::bind_method(D_METHOD("set_edited_property", "value"), &VisualShaderEditedProperty::set_edited_property); + ClassDB::bind_method(D_METHOD("get_edited_property"), &VisualShaderEditedProperty::get_edited_property); + + ADD_PROPERTY(PropertyInfo(Variant::NIL, "edited_property", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NIL_IS_VARIANT), "set_edited_property", "get_edited_property"); +} + +void VisualShaderEditedProperty::set_edited_property(Variant p_variant) { + edited_property = p_variant; +} + +Variant VisualShaderEditedProperty::get_edited_property() const { + return edited_property; +} + +///////////////// + Vector2 VisualShaderEditor::selection_center; List<VisualShaderEditor::CopyItem> VisualShaderEditor::copy_items_buffer; List<VisualShader::Connection> VisualShaderEditor::copy_connections_buffer; @@ -2287,10 +2298,8 @@ void VisualShaderEditor::_port_name_focus_out(Object *line_edit, int p_node_id, } } -void VisualShaderEditor::_port_edited() { +void VisualShaderEditor::_port_edited(const StringName &p_property, const Variant &p_value, const String &p_field, bool p_changing) { VisualShader::Type type = get_current_shader_type(); - - Variant value = property_editor->get_variant(); Ref<VisualShaderNode> vsn = visual_shader->get_node(type, editing_node); ERR_FAIL_COND(!vsn.is_valid()); @@ -2298,30 +2307,51 @@ void VisualShaderEditor::_port_edited() { Ref<VisualShaderNodeCustom> custom = Object::cast_to<VisualShaderNodeCustom>(vsn.ptr()); if (custom.is_valid()) { - undo_redo->add_do_method(custom.ptr(), "_set_input_port_default_value", editing_port, value); + undo_redo->add_do_method(custom.ptr(), "_set_input_port_default_value", editing_port, p_value); undo_redo->add_undo_method(custom.ptr(), "_set_input_port_default_value", editing_port, vsn->get_input_port_default_value(editing_port)); } else { - undo_redo->add_do_method(vsn.ptr(), "set_input_port_default_value", editing_port, value); + undo_redo->add_do_method(vsn.ptr(), "set_input_port_default_value", editing_port, p_value); undo_redo->add_undo_method(vsn.ptr(), "set_input_port_default_value", editing_port, vsn->get_input_port_default_value(editing_port)); } - undo_redo->add_do_method(graph_plugin.ptr(), "set_input_port_default_value", type, editing_node, editing_port, value); + undo_redo->add_do_method(graph_plugin.ptr(), "set_input_port_default_value", type, editing_node, editing_port, p_value); undo_redo->add_undo_method(graph_plugin.ptr(), "set_input_port_default_value", type, editing_node, editing_port, vsn->get_input_port_default_value(editing_port)); undo_redo->commit_action(); - - property_editor->hide(); } void VisualShaderEditor::_edit_port_default_input(Object *p_button, int p_node, int p_port) { VisualShader::Type type = get_current_shader_type(); + Ref<VisualShaderNode> vs_node = visual_shader->get_node(type, p_node); + Variant value = vs_node->get_input_port_default_value(p_port); + + edited_property_holder->set_edited_property(value); + + if (property_editor) { + property_editor->disconnect("property_changed", callable_mp(this, &VisualShaderEditor::_port_edited)); + property_editor_popup->remove_child(property_editor); + } - Ref<VisualShaderNode> vsn = visual_shader->get_node(type, p_node); + // TODO: Define these properties with actual PropertyInfo and feed it to the property editor widget. + property_editor = EditorInspector::instantiate_property_editor(edited_property_holder.ptr(), value.get_type(), "edited_property", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE); + if (property_editor) { + property_editor->set_object_and_property(edited_property_holder.ptr(), "edited_property"); + property_editor->update_property(); + property_editor->set_name_split_ratio(0); + property_editor_popup->add_child(property_editor); + + property_editor->connect("property_changed", callable_mp(this, &VisualShaderEditor::_port_edited)); + + Button *button = Object::cast_to<Button>(p_button); + if (button) { + property_editor_popup->set_position(button->get_screen_position() + Vector2(0, button->get_size().height) * graph->get_zoom()); + } + property_editor_popup->reset_size(); + if (button) { + property_editor_popup->popup(); + } else { + property_editor_popup->popup_centered_ratio(); + } + } - Button *button = Object::cast_to<Button>(p_button); - ERR_FAIL_COND(!button); - Variant value = vsn->get_input_port_default_value(p_port); - property_editor->set_position(button->get_screen_position() + Vector2(0, button->get_size().height)); - property_editor->edit(nullptr, "", value.get_type(), value, 0, ""); - property_editor->popup(); editing_node = p_node; editing_port = p_port; } @@ -5147,6 +5177,10 @@ VisualShaderEditor::VisualShaderEditor() { add_options.push_back(AddOption("ViewIndex", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "view_index", "VIEW_INDEX"), { "view_index" }, VisualShaderNode::PORT_TYPE_SCALAR_INT, TYPE_FLAGS_VERTEX, Shader::MODE_SPATIAL)); add_options.push_back(AddOption("ViewMonoLeft", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "view_mono_left", "VIEW_MONO_LEFT"), { "view_mono_left" }, VisualShaderNode::PORT_TYPE_SCALAR_INT, TYPE_FLAGS_VERTEX, Shader::MODE_SPATIAL)); add_options.push_back(AddOption("ViewRight", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "view_right", "VIEW_RIGHT"), { "view_right" }, VisualShaderNode::PORT_TYPE_SCALAR_INT, TYPE_FLAGS_VERTEX, Shader::MODE_SPATIAL)); + add_options.push_back(AddOption("NodePositionWorld", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "node_position_world", "NODE_POSITION_WORLD"), { "node_position_world" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_VERTEX, Shader::MODE_SPATIAL)); + add_options.push_back(AddOption("CameraPositionWorld", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "camera_position_world", "CAMERA_POSITION_WORLD"), { "camera_position_world" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_VERTEX, Shader::MODE_SPATIAL)); + add_options.push_back(AddOption("CameraDirectionWorld", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "camera_direction_world", "CAMERA_DIRECTION_WORLD"), { "camera_direction_world" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_VERTEX, Shader::MODE_SPATIAL)); + add_options.push_back(AddOption("NodePositionView", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "node_position_view", "NODE_POSITION_VIEW"), { "node_position_view" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_VERTEX, Shader::MODE_SPATIAL)); add_options.push_back(AddOption("Binormal", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "binormal", "BINORMAL"), { "binormal" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_FRAGMENT, Shader::MODE_SPATIAL)); add_options.push_back(AddOption("Color", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "color", "COLOR"), { "color" }, VisualShaderNode::PORT_TYPE_VECTOR_4D, TYPE_FLAGS_FRAGMENT, Shader::MODE_SPATIAL)); @@ -5162,6 +5196,10 @@ VisualShaderEditor::VisualShaderEditor() { add_options.push_back(AddOption("ViewIndex", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "view_index", "VIEW_INDEX"), { "view_index" }, VisualShaderNode::PORT_TYPE_SCALAR_INT, TYPE_FLAGS_FRAGMENT, Shader::MODE_SPATIAL)); add_options.push_back(AddOption("ViewMonoLeft", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "view_mono_left", "VIEW_MONO_LEFT"), { "view_mono_left" }, VisualShaderNode::PORT_TYPE_SCALAR_INT, TYPE_FLAGS_FRAGMENT, Shader::MODE_SPATIAL)); add_options.push_back(AddOption("ViewRight", "Input", "Vertex", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "view_right", "VIEW_RIGHT"), { "view_right" }, VisualShaderNode::PORT_TYPE_SCALAR_INT, TYPE_FLAGS_FRAGMENT, Shader::MODE_SPATIAL)); + add_options.push_back(AddOption("NodePositionWorld", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "node_position_world", "NODE_POSITION_WORLD"), { "node_position_world" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_FRAGMENT, Shader::MODE_SPATIAL)); + add_options.push_back(AddOption("CameraPositionWorld", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "camera_position_world", "CAMERA_POSITION_WORLD"), { "camera_position_world" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_FRAGMENT, Shader::MODE_SPATIAL)); + add_options.push_back(AddOption("CameraDirectionWorld", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "camera_direction_world", "CAMERA_DIRECTION_WORLD"), { "camera_direction_world" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_FRAGMENT, Shader::MODE_SPATIAL)); + add_options.push_back(AddOption("NodePositionView", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_vertex_and_fragment_shader_modes, "node_position_view", "NODE_POSITION_VIEW"), { "node_position_view" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_FRAGMENT, Shader::MODE_SPATIAL)); add_options.push_back(AddOption("Albedo", "Input", "Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "albedo", "ALBEDO"), { "albedo" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL)); add_options.push_back(AddOption("Attenuation", "Input", "Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "attenuation", "ATTENUATION"), { "attenuation" }, VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL)); @@ -5636,10 +5674,11 @@ VisualShaderEditor::VisualShaderEditor() { graph_plugin.instantiate(); graph_plugin->set_editor(this); - property_editor = memnew(CustomPropertyEditor); - add_child(property_editor); + property_editor_popup = memnew(PopupPanel); + property_editor_popup->set_min_size(Size2i(180, 0) * EDSCALE); + add_child(property_editor_popup); - property_editor->connect("variant_changed", callable_mp(this, &VisualShaderEditor::_port_edited)); + edited_property_holder.instantiate(); } class VisualShaderNodePluginInputEditor : public OptionButton { @@ -6189,7 +6228,7 @@ void VisualShaderNodePortPreview::_shader_changed() { } if (src_mat && src_mat->get_shader().is_valid()) { List<PropertyInfo> params; - src_mat->get_shader()->get_param_list(¶ms); + src_mat->get_shader()->get_shader_uniform_list(¶ms); for (const PropertyInfo &E : params) { material->set(E.name, src_mat->get(E.name)); } @@ -6210,7 +6249,7 @@ void VisualShaderNodePortPreview::setup(const Ref<VisualShader> &p_shader, Visua } Size2 VisualShaderNodePortPreview::get_minimum_size() const { - int port_preview_size = EditorSettings::get_singleton()->get("editors/visual_editors/visualshader/port_preview_size"); + int port_preview_size = EditorSettings::get_singleton()->get("editors/visual_editors/visual_shader/port_preview_size"); return Size2(port_preview_size, port_preview_size) * EDSCALE; } diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h index 2feed6108a..b846c34f9e 100644 --- a/editor/plugins/visual_shader_editor_plugin.h +++ b/editor/plugins/visual_shader_editor_plugin.h @@ -32,16 +32,21 @@ #define VISUAL_SHADER_EDITOR_PLUGIN_H #include "editor/editor_plugin.h" -#include "editor/plugins/curve_editor_plugin.h" -#include "editor/property_editor.h" -#include "scene/gui/button.h" -#include "scene/gui/code_edit.h" -#include "scene/gui/graph_edit.h" -#include "scene/gui/popup.h" -#include "scene/gui/rich_text_label.h" -#include "scene/gui/tree.h" +#include "editor/plugins/editor_resource_conversion_plugin.h" #include "scene/resources/visual_shader.h" +class Button; +class CodeEdit; +class CodeHighlighter; +class CurveEditor; +class GraphEdit; +class GraphNode; +class PopupMenu; +class PopupPanel; +class RichTextLabel; +class TextEdit; +class Tree; + class VisualShaderEditor; class VisualShaderNodePlugin : public RefCounted { @@ -137,13 +142,31 @@ public: ~VisualShaderGraphPlugin(); }; +class VisualShaderEditedProperty : public RefCounted { + GDCLASS(VisualShaderEditedProperty, RefCounted); + +private: + Variant edited_property; + +protected: + static void _bind_methods(); + +public: + void set_edited_property(Variant p_variant); + Variant get_edited_property() const; + + VisualShaderEditedProperty() {} +}; + class VisualShaderEditor : public VBoxContainer { GDCLASS(VisualShaderEditor, VBoxContainer); friend class VisualShaderGraphPlugin; - CustomPropertyEditor *property_editor = nullptr; + PopupPanel *property_editor_popup = nullptr; + EditorProperty *property_editor = nullptr; int editing_node = -1; int editing_port = -1; + Ref<VisualShaderEditedProperty> edited_property_holder; Ref<VisualShader> visual_shader; GraphEdit *graph = nullptr; @@ -358,7 +381,7 @@ class VisualShaderEditor : public VBoxContainer { void _node_changed(int p_id); void _edit_port_default_input(Object *p_button, int p_node, int p_port); - void _port_edited(); + void _port_edited(const StringName &p_property, const Variant &p_value, const String &p_field, bool p_changing); int to_node = -1; int to_slot = -1; diff --git a/editor/project_converter_3_to_4.cpp b/editor/project_converter_3_to_4.cpp index 658258d98b..8de8f94f87 100644 --- a/editor/project_converter_3_to_4.cpp +++ b/editor/project_converter_3_to_4.cpp @@ -42,7 +42,8 @@ const int ERROR_CODE = 77; #include "core/templates/hash_map.h" #include "core/templates/list.h" -const int CONVERSION_MAX_FILE_SIZE = 1024 * 1024 * 4; // 4 MB +const uint64_t CONVERSION_MAX_FILE_SIZE_MB = 4; +const uint64_t CONVERSION_MAX_FILE_SIZE = 1024 * 1024 * CONVERSION_MAX_FILE_SIZE_MB; static const char *enum_renames[][2] = { //// constants @@ -255,6 +256,7 @@ static const char *gdscript_function_renames[][2] = { { "damped_spring_joint_create", "joint_make_damped_spring" }, // PhysicsServer2D { "damped_string_joint_get_param", "damped_spring_joint_get_param" }, // PhysicsServer2D { "damped_string_joint_set_param", "damped_spring_joint_set_param" }, // PhysicsServer2D + { "dectime", "move_toward" }, // GDScript, Math functions { "delete_char_at_cursor", "delete_char_at_caret" }, // LineEdit { "deselect_items", "deselect_all" }, // FileDialog { "disable_plugin", "_disable_plugin" }, // EditorPlugin @@ -427,6 +429,7 @@ static const char *gdscript_function_renames[][2] = { { "joint_create_slider", "joint_make_slider" }, // PhysicsServer3D { "line_intersects_line_2d", "line_intersects_line" }, // Geometry2D { "load_from_globals", "load_from_project_settings" }, // InputMap + { "load_interactive", "load_threaded_request" }, // ResourceLoader - load_threaded_request is alternative, but is used differently { "make_convex_from_brothers", "make_convex_from_siblings" }, // CollisionShape3D { "make_visible", "_make_visible" }, // EditorPlugin { "merge_polygons_2d", "merge_polygons" }, // Geometry2D @@ -484,6 +487,7 @@ static const char *gdscript_function_renames[][2] = { { "set_enabled_focus_mode", "set_focus_mode" }, // BaseButton { "set_endian_swap", "set_big_endian" }, // File { "set_expand_to_text_length", "set_expand_to_text_length_enabled" }, // LineEdit + { "set_filename", "set_scene_file_path" }, // Node, WARNING, this may be used in a lot of other places { "set_focus_neighbour", "set_focus_neighbor" }, // Control { "set_frame_color", "set_color" }, // ColorRect { "set_global_rate_scale", "set_playback_speed_scale" }, // AudioServer @@ -975,6 +979,7 @@ static const char *gdscript_properties_renames[][2] = { // { "wrap_enabled", "wrap_mode" }, // TextEdit // { "zfar", "far" }, // Camera3D // { "znear", "near" }, // Camera3D + // { "filename", "scene_file_path" }, // Node { "as_normalmap", "as_normal_map" }, // NoiseTexture { "bbcode_text", "text" }, // RichTextLabel { "caret_moving_by_right_click", "caret_move_on_right_click" }, // TextEdit @@ -1595,12 +1600,33 @@ static const char *colors_renames[][2] = { { nullptr, nullptr }, }; +class ProjectConverter3To4::RegExContainer { +public: + RegEx reg_is_empty = RegEx("\\bempty\\("); + RegEx reg_super = RegEx("([\t ])\\.([a-zA-Z_])"); + RegEx reg_json_to = RegEx("\\bto_json\\b"); + RegEx reg_json_parse = RegEx("([\t]{0,})([^\n]+)parse_json\\(([^\n]+)"); + RegEx reg_json_non_new = RegEx("([\t]{0,})([^\n]+)JSON\\.parse\\(([^\n]+)"); + RegEx reg_export = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)"); + RegEx reg_export_advanced = RegEx("export\\(([^)^\n]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)([^\n]+)"); + RegEx reg_setget_setget = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*,[ \t]*([a-zA-Z0-9_]+)"); + RegEx reg_setget_set = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*[,]*[^a-z^A-Z^0-9^_]*$"); + RegEx reg_setget_get = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+,[ \t]*([a-zA-Z0-9_]+)[ \t]*$"); + RegEx reg_join = RegEx("([\\(\\)a-zA-Z0-9_]+)\\.join\\(([^\n^\\)]+)\\)"); + RegEx reg_mixed_tab_space = RegEx("([\t]+)([ ]+)"); + RegEx reg_image_lock = RegEx("([a-zA-Z0-9_\\.]+)\\.lock\\(\\)"); + RegEx reg_image_unlock = RegEx("([a-zA-Z0-9_\\.]+)\\.unlock\\(\\)"); + RegEx reg_os_fullscreen = RegEx("OS.window_fullscreen[= ]+([^#^\n]+)"); +}; + // Function responsible for converting project int ProjectConverter3To4::convert() { print_line("Starting conversion."); + RegExContainer reg_container = RegExContainer(); + ERR_FAIL_COND_V_MSG(!test_array_names(), ERROR_CODE, "Cannot start converting due to problems with data in arrays."); - ERR_FAIL_COND_V_MSG(!test_conversion(), ERROR_CODE, "Cannot start converting due to problems with converting arrays."); + ERR_FAIL_COND_V_MSG(!test_conversion(reg_container), ERROR_CODE, "Cannot start converting due to problems with converting arrays."); // Checking if folder contains valid Godot 3 project. // Project cannot be converted 2 times @@ -1640,7 +1666,7 @@ int ProjectConverter3To4::convert() { uint64_t start_time = Time::get_singleton()->get_ticks_msec(); if (file_name.ends_with(".shader")) { - DirAccess::remove_file_or_error(file_name); + DirAccess::remove_file_or_error(file_name.trim_prefix("res://")); file_name = file_name.replace(".shader", ".gdshader"); } @@ -1653,7 +1679,7 @@ int ProjectConverter3To4::convert() { rename_enums(file_content); // Require to additional rename rename_common(gdscript_function_renames, file_content); - rename_gdscript_functions(file_content); // Require to additional rename + rename_gdscript_functions(file_content, reg_container, false); // Require to additional rename rename_common(project_settings_renames, file_content); rename_gdscript_keywords(file_content); @@ -1671,7 +1697,7 @@ int ProjectConverter3To4::convert() { rename_enums(file_content); // Require to additional rename rename_common(gdscript_function_renames, file_content); - rename_gdscript_functions(file_content); // Require to additional rename + rename_gdscript_functions(file_content, reg_container, true); // Require to additional rename rename_common(project_settings_renames, file_content); rename_gdscript_keywords(file_content); @@ -1708,7 +1734,7 @@ int ProjectConverter3To4::convert() { continue; } } else { - reason.append(" ERROR: File has exceeded the maximum size allowed - 500 KB"); + reason.append(" ERROR: File has exceeded the maximum size allowed - " + itos(CONVERSION_MAX_FILE_SIZE_MB) + " MB"); is_ignored = true; } @@ -1718,7 +1744,7 @@ int ProjectConverter3To4::convert() { uint64_t hash_after = file_content.hash64(); // Don't need to save file without any changes // Save if this is a shader, because it was renamed - if (hash_before != hash_after || file_name.find(".gdshader") != -1) { + if (hash_before != hash_after || file_name.ends_with(".gdshader")) { converted_files++; Ref<FileAccess> file = FileAccess::open(file_name, FileAccess::WRITE); @@ -1742,8 +1768,10 @@ int ProjectConverter3To4::convert() { int ProjectConverter3To4::validate_conversion() { print_line("Starting checking if project conversion can be done."); + RegExContainer reg_container = RegExContainer(); + ERR_FAIL_COND_V_MSG(!test_array_names(), ERROR_CODE, "Cannot start converting due to problems with data in arrays."); - ERR_FAIL_COND_V_MSG(!test_conversion(), ERROR_CODE, "Cannot start converting due to problems with converting arrays."); + ERR_FAIL_COND_V_MSG(!test_conversion(reg_container), ERROR_CODE, "Cannot start converting due to problems with converting arrays."); // Checking if folder contains valid Godot 3 project. // Project cannot be converted 2 times @@ -1784,7 +1812,7 @@ int ProjectConverter3To4::validate_conversion() { bool is_ignored = false; uint64_t start_time = Time::get_singleton()->get_ticks_msec(); - if (file_name.ends_with(".sader")) { + if (file_name.ends_with(".shader")) { reason.append("\tFile extension will be renamed from `shader` to `gdshader`."); } @@ -1796,7 +1824,7 @@ int ProjectConverter3To4::validate_conversion() { changed_elements.append_array(check_for_rename_enums(file_content)); changed_elements.append_array(check_for_rename_common(gdscript_function_renames, file_content)); - changed_elements.append_array(check_for_rename_gdscript_functions(file_content)); + changed_elements.append_array(check_for_rename_gdscript_functions(file_content, reg_container, false)); changed_elements.append_array(check_for_rename_common(project_settings_renames, file_content)); changed_elements.append_array(check_for_rename_gdscript_keywords(file_content)); @@ -1814,7 +1842,7 @@ int ProjectConverter3To4::validate_conversion() { changed_elements.append_array(check_for_rename_enums(file_content)); changed_elements.append_array(check_for_rename_common(gdscript_function_renames, file_content)); - changed_elements.append_array(check_for_rename_gdscript_functions(file_content)); + changed_elements.append_array(check_for_rename_gdscript_functions(file_content, reg_container, true)); changed_elements.append_array(check_for_rename_common(project_settings_renames, file_content)); changed_elements.append_array(check_for_rename_gdscript_keywords(file_content)); @@ -1851,7 +1879,7 @@ int ProjectConverter3To4::validate_conversion() { continue; } } else { - reason.append("\tERROR: File has exceeded the maximum size allowed - 500 KB"); + reason.append("\tERROR: File has exceeded the maximum size allowed - " + itos(CONVERSION_MAX_FILE_SIZE_MB) + " MB"); is_ignored = true; } @@ -1928,6 +1956,17 @@ bool ProjectConverter3To4::test_conversion_single_additional(String name, String return true; } +bool ProjectConverter3To4::test_conversion_single_additional_builtin(String name, String expected, void (ProjectConverter3To4::*func)(String &, const RegExContainer &, bool), String what, const RegExContainer ®_container, bool builtin_script) { + String got = name; + (this->*func)(got, reg_container, builtin_script); + if (expected != got) { + ERR_PRINT("Failed to convert " + what + " `" + name + "` to `" + expected + "`, got instead `" + got + "`"); + return false; + } + + return true; +} + bool ProjectConverter3To4::test_conversion_single_normal(String name, String expected, const char *array[][2], String what) { String got = name; rename_common(array, got); @@ -1939,7 +1978,7 @@ bool ProjectConverter3To4::test_conversion_single_normal(String name, String exp } // Validate if conversions are proper -bool ProjectConverter3To4::test_conversion() { +bool ProjectConverter3To4::test_conversion(const RegExContainer ®_container) { bool valid = true; valid = valid & test_conversion_single_normal("Spatial", "Node3D", class_renames, "class"); @@ -1970,26 +2009,28 @@ bool ProjectConverter3To4::test_conversion() { valid = valid & test_conversion_single_additional("(Disconnect(A,B,C) != OK):", "(Disconnect(A,new Callable(B,C)) != OK):", &ProjectConverter3To4::rename_csharp_functions, "custom rename csharp"); valid = valid & test_conversion_single_additional("(IsConnected(A,B,C) != OK):", "(IsConnected(A,new Callable(B,C)) != OK):", &ProjectConverter3To4::rename_csharp_functions, "custom rename"); - valid = valid & test_conversion_single_additional("OS.window_fullscreen = Settings.fullscreen", "ProjectSettings.set(\"display/window/size/fullscreen\", Settings.fullscreen)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); + valid = valid & test_conversion_single_additional_builtin("OS.window_fullscreen = Settings.fullscreen", "ProjectSettings.set(\"display/window/size/fullscreen\", Settings.fullscreen)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("OS.window_fullscreen = Settings.fullscreen", "ProjectSettings.set(\\\"display/window/size/fullscreen\\\", Settings.fullscreen)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, true); + valid = valid & test_conversion_single_additional_builtin("OS.get_window_safe_area()", "DisplayServer.get_display_safe_area()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); - valid = valid & test_conversion_single_additional("\tvar aa = roman(r.move_and_slide( a, b, c, d, e, f )) # Roman", "\tr.set_motion_velocity(a)\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `f`\n\tvar aa = roman(r.move_and_slide()) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("\tvar aa = roman(r.move_and_slide_with_snap( a, g, b, c, d, e, f )) # Roman", "\tr.set_motion_velocity(a)\n\t# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `g`\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `f`\n\tvar aa = roman(r.move_and_slide()) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); + valid = valid & test_conversion_single_additional_builtin("\tvar aa = roman(r.move_and_slide( a, b, c, d, e, f )) # Roman", "\tr.set_motion_velocity(a)\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `f`\n\tvar aa = roman(r.move_and_slide()) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("\tvar aa = roman(r.move_and_slide_with_snap( a, g, b, c, d, e, f )) # Roman", "\tr.set_motion_velocity(a)\n\t# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `g`\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `f`\n\tvar aa = roman(r.move_and_slide()) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); - valid = valid & test_conversion_single_additional("list_dir_begin( a , b )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("list_dir_begin( a )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("list_dir_begin( )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); + valid = valid & test_conversion_single_additional_builtin("list_dir_begin( a , b )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("list_dir_begin( a )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("list_dir_begin( )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); - valid = valid & test_conversion_single_additional("sort_custom( a , b )", "sort_custom(Callable(a,b))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); + valid = valid & test_conversion_single_additional_builtin("sort_custom( a , b )", "sort_custom(Callable(a,b))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); - valid = valid & test_conversion_single_additional("func c(var a, var b)", "func c(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); + valid = valid & test_conversion_single_additional_builtin("func c(var a, var b)", "func c(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); - valid = valid & test_conversion_single_additional("draw_line(1, 2, 3, 4, 5)", "draw_line(1,2,3,4)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); + valid = valid & test_conversion_single_additional_builtin("draw_line(1, 2, 3, 4, 5)", "draw_line(1,2,3,4)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); - valid = valid & test_conversion_single_additional("\timage.lock()", "\tfalse # image.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("\timage.unlock()", "\tfalse # image.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("\troman.image.unlock()", "\tfalse # roman.image.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("\tmtx.lock()", "\tmtx.lock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("\tmutex.unlock()", "\tmutex.unlock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); + valid = valid & test_conversion_single_additional_builtin("\timage.lock()", "\tfalse # image.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("\timage.unlock()", "\tfalse # image.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("\troman.image.unlock()", "\tfalse # roman.image.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("\tmtx.lock()", "\tmtx.lock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("\tmutex.unlock()", "\tmutex.unlock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); valid = valid & test_conversion_single_additional("\nonready", "\n@onready", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); valid = valid & test_conversion_single_additional("onready", "@onready", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); @@ -2002,82 +2043,86 @@ bool ProjectConverter3To4::test_conversion() { valid = valid & test_conversion_single_additional("tool", "@tool", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); valid = valid & test_conversion_single_additional("\n tool", "\n tool", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); valid = valid & test_conversion_single_additional("\n\ntool", "\n\n@tool", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); - valid = valid & test_conversion_single_additional("\n\nmaster func", "\n\n@rpc(any) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); - valid = valid & test_conversion_single_additional("\n\npuppet func", "\n\n@rpc(auth) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); - valid = valid & test_conversion_single_additional("\n\nremote func", "\n\n@rpc(any) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); - valid = valid & test_conversion_single_additional("\n\nremotesync func", "\n\n@rpc(any,sync) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); - valid = valid & test_conversion_single_additional("\n\nsync func", "\n\n@rpc(any,sync) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); - valid = valid & test_conversion_single_additional("\n\npuppetsync func", "\n\n@rpc(auth,sync) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); - valid = valid & test_conversion_single_additional("\n\nmastersync func", "\n\n@rpc(any,sync) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); - - valid = valid & test_conversion_single_additional("var size : Vector2 = Vector2() setget set_function , get_function", "var size : Vector2 = Vector2() :\n get:\n return size # TODOConverter40 Copy here content of get_function\n set(mod_value):\n mod_value # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("var size : Vector2 = Vector2() setget set_function , ", "var size : Vector2 = Vector2() :\n get:\n return size # TODOConverter40 Non existent get function \n set(mod_value):\n mod_value # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("var size : Vector2 = Vector2() setget set_function", "var size : Vector2 = Vector2() :\n get:\n return size # TODOConverter40 Non existent get function \n set(mod_value):\n mod_value # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("var size : Vector2 = Vector2() setget , get_function", "var size : Vector2 = Vector2() :\n get:\n return size # TODOConverter40 Copy here content of get_function \n set(mod_value):\n mod_value # TODOConverter40 Non existent set function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("get_node(@", "get_node(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("yield(this, \"timeout\")", "await this.timeout", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional(" Transform.xform(Vector3(a,b,c)) ", " Transform * Vector3(a,b,c) ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional(" Transform.xform_inv(Vector3(a,b,c)) ", " Vector3(a,b,c) * Transform ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("export(float) var lifetime = 3.0", "export var lifetime: float = 3.0", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro'", "export var _font_name = 'AnonymousPro' # (String, 'AnonymousPro', 'CourierPrime')", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); // TODO, this is only a workaround - valid = valid & test_conversion_single_additional("export(PackedScene) var mob_scene", "export var mob_scene: PackedScene", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("var d = parse_json(roman(sfs))", "var test_json_conv = JSON.new()\ntest_json_conv.parse(roman(sfs))\nvar d = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("to_json( AA ) szon", "JSON.new().stringify( AA ) szon", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("s to_json", "s JSON.new().stringify", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("AF to_json2", "AF to_json2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("var rr = JSON.parse(a)", "var test_json_conv = JSON.new()\ntest_json_conv.parse(a)\nvar rr = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("empty()", "is_empty()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional(".empty", ".empty", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional(").roman(", ").roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("\t.roman(", "\tsuper.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional(" .roman(", " super.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional(".1", ".1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional(" .1", " .1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("'.'", "'.'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("'.a'", "'.a'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("\t._input(_event)", "\tsuper._input(_event)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("(start(A,B,C,D,E,F,G) != OK):", "(start(A,Callable(B,C),D,E,F,G) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("(connect(A,B,C,D,E,F,G) != OK):", "(connect(A,Callable(B,C),D,E,F,G) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("(connect(A,B,C) != OK):", "(connect(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("disconnect(A,B,C) != OK):", "disconnect(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("is_connected(A,B,C) != OK):", "is_connected(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("is_connected(A,B,C))", "is_connected(A,Callable(B,C)))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("func _init(p_x:int)->void:", "func _init(p_x:int):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("q_PackedDataContainer._iter_init(variable1)", "q_PackedDataContainer._iter_init(variable1)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("assert(speed < 20, str(randi()%10))", "assert(speed < 20) #,str(randi()%10))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("assert(speed < 2)", "assert(speed < 2)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("assert(false, \"Missing type --\" + str(argument.type) + \"--, needs to be added to project\")", "assert(false) #,\"Missing type --\" + str(argument.type) + \"--, needs to be added to project\")", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("create_from_image(aa, bb)", "create_from_image(aa) #,bb", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("q_ImageTexture.create_from_image(variable1, variable2)", "q_ImageTexture.create_from_image(variable1) #,variable2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("set_cell_item(a, b, c, d ,e) # AA", "set_cell_item( Vector3(a,b,c) ,d,e) # AA", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("set_cell_item(a, b)", "set_cell_item(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("get_cell_item_orientation(a, b,c)", "get_cell_item_orientation(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("get_cell_item(a, b,c)", "get_cell_item(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("map_to_world(a, b,c)", "map_to_world(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("PackedStringArray(req_godot).join('.')", "'.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("=PackedStringArray(req_godot).join('.')", "='.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional(" aa", " aa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("\taa", "\taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("\t aa", "\taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional(" \taa", " \taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - - valid = valid & test_conversion_single_additional("apply_force(position, impulse)", "apply_force(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); - valid = valid & test_conversion_single_additional("apply_impulse(position, impulse)", "apply_impulse(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); + valid = valid & test_conversion_single_additional("\n\nremote func", "\n\n@rpc(any_peer) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); + valid = valid & test_conversion_single_additional("\n\nremotesync func", "\n\n@rpc(any_peer, call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); + valid = valid & test_conversion_single_additional("\n\npuppet func", "\n\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); + valid = valid & test_conversion_single_additional("\n\npuppetsync func", "\n\n@rpc(call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); + valid = valid & test_conversion_single_additional("\n\nmaster func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); + valid = valid & test_conversion_single_additional("\n\nmastersync func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc(call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword"); + + valid = valid & test_conversion_single_additional_builtin("var size : Vector2 = Vector2() setget set_function , get_function", "var size : Vector2 = Vector2() :\n get:\n return size # TODOConverter40 Copy here content of get_function\n set(mod_value):\n mod_value # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("var size : Vector2 = Vector2() setget set_function , ", "var size : Vector2 = Vector2() :\n get:\n return size # TODOConverter40 Non existent get function \n set(mod_value):\n mod_value # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("var size : Vector2 = Vector2() setget set_function", "var size : Vector2 = Vector2() :\n get:\n return size # TODOConverter40 Non existent get function \n set(mod_value):\n mod_value # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("var size : Vector2 = Vector2() setget , get_function", "var size : Vector2 = Vector2() :\n get:\n return size # TODOConverter40 Copy here content of get_function \n set(mod_value):\n mod_value # TODOConverter40 Non existent set function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("get_node(@", "get_node(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("yield(this, \"timeout\")", "await this.timeout", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("yield(this, \"timeout\")", "await this.\"timeout\"", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, true); + + valid = valid & test_conversion_single_additional_builtin(" Transform.xform(Vector3(a,b,c)) ", " Transform * Vector3(a,b,c) ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin(" Transform.xform_inv(Vector3(a,b,c)) ", " Vector3(a,b,c) * Transform ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("export(float) var lifetime = 3.0", "export var lifetime: float = 3.0", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro'", "export var _font_name = 'AnonymousPro' # (String, 'AnonymousPro', 'CourierPrime')", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); // TODO, this is only a workaround + valid = valid & test_conversion_single_additional_builtin("export(PackedScene) var mob_scene", "export var mob_scene: PackedScene", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("var d = parse_json(roman(sfs))", "var test_json_conv = JSON.new()\ntest_json_conv.parse(roman(sfs))\nvar d = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("to_json( AA ) szon", "JSON.new().stringify( AA ) szon", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("s to_json", "s JSON.new().stringify", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("AF to_json2", "AF to_json2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("var rr = JSON.parse(a)", "var test_json_conv = JSON.new()\ntest_json_conv.parse(a)\nvar rr = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("empty()", "is_empty()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin(".empty", ".empty", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin(").roman(", ").roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("\t.roman(", "\tsuper.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin(" .roman(", " super.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin(".1", ".1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin(" .1", " .1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("'.'", "'.'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("'.a'", "'.a'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("\t._input(_event)", "\tsuper._input(_event)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("(connect(A,B,C) != OK):", "(connect(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("(connect(A,B,C,D) != OK):", "(connect(A,Callable(B,C).bind(D)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("(connect(A,B,C,[D]) != OK):", "(connect(A,Callable(B,C).bind(D)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("(connect(A,B,C,D,E) != OK):", "(connect(A,Callable(B,C).bind(D),E) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("(start(A,B) != OK):", "(start(Callable(A,B)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("(start(A,B,C,D,E,F,G) != OK):", "(start(Callable(A,B).bind(C),D,E,F,G) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("disconnect(A,B,C) != OK):", "disconnect(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("is_connected(A,B,C) != OK):", "is_connected(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("is_connected(A,B,C))", "is_connected(A,Callable(B,C)))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("func _init(p_x:int)->void:", "func _init(p_x:int):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("q_PackedDataContainer._iter_init(variable1)", "q_PackedDataContainer._iter_init(variable1)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("assert(speed < 20, str(randi()%10))", "assert(speed < 20) #,str(randi()%10))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("assert(speed < 2)", "assert(speed < 2)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("assert(false, \"Missing type --\" + str(argument.type) + \"--, needs to be added to project\")", "assert(false) #,\"Missing type --\" + str(argument.type) + \"--, needs to be added to project\")", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("create_from_image(aa, bb)", "create_from_image(aa) #,bb", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("q_ImageTexture.create_from_image(variable1, variable2)", "q_ImageTexture.create_from_image(variable1) #,variable2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("set_cell_item(a, b, c, d ,e) # AA", "set_cell_item( Vector3(a,b,c) ,d,e) # AA", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("set_cell_item(a, b)", "set_cell_item(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("get_cell_item_orientation(a, b,c)", "get_cell_item_orientation(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("get_cell_item(a, b,c)", "get_cell_item(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("map_to_world(a, b,c)", "map_to_world(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("PackedStringArray(req_godot).join('.')", "'.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("=PackedStringArray(req_godot).join('.')", "='.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin(" aa", " aa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("\taa", "\taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("\t aa", "\taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin(" \taa", " \taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + + valid = valid & test_conversion_single_additional_builtin("apply_force(position, impulse)", "apply_force(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); + valid = valid & test_conversion_single_additional_builtin("apply_impulse(position, impulse)", "apply_impulse(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); valid = valid & test_conversion_single_additional("AAA Color.white AF", "AAA Color.WHITE AF", &ProjectConverter3To4::rename_enums, "custom rename"); @@ -2519,7 +2564,7 @@ Vector<String> ProjectConverter3To4::check_for_rename_enums(Vector<String> &file int current_line = 1; for (String &line : file_content) { - Array reg_match = reg.search_all(line); + TypedArray<RegExMatch> reg_match = reg.search_all(line); if (reg_match.size() > 0) { found_things.append(line_formatter(current_line, colors_renames[current_index][0], colors_renames[current_index][1], line)); } @@ -2535,7 +2580,7 @@ Vector<String> ProjectConverter3To4::check_for_rename_enums(Vector<String> &file void ProjectConverter3To4::rename_classes(String &file_content) { int current_index = 0; - // TODO Maybe it is better way to not rename gd, tscn and other files which are named are classes + // TODO Maybe it is better way to not rename gd, tscn and other files which are named as classes while (class_renames[current_index][0]) { // Begin renaming workaround `Resource.gd` -> `RefCounter.gd` RegEx reg_before = RegEx(String("\\b") + class_renames[current_index][0] + ".tscn\\b"); @@ -2596,7 +2641,7 @@ Vector<String> ProjectConverter3To4::check_for_rename_classes(Vector<String> &fi line = reg_before.sub(line, "TEMP_RENAMED_CLASS.tscn", true); line = reg_before2.sub(line, "TEMP_RENAMED_CLASS.gd", true); - Array reg_match = reg.search_all(line); + TypedArray<RegExMatch> reg_match = reg.search_all(line); if (reg_match.size() > 0) { found_things.append(line_formatter(current_line, class_renames[current_index][0], class_renames[current_index][1], line)); } @@ -2625,432 +2670,11 @@ Vector<String> ProjectConverter3To4::check_for_rename_classes(Vector<String> &fi return found_things; } -void ProjectConverter3To4::rename_gdscript_functions(String &file_content) { - // Custom renaming, each rule needs to be set manually - // Don't forget to put validate each rule in validate_conversion function +void ProjectConverter3To4::rename_gdscript_functions(String &file_content, const RegExContainer ®_container, bool builtin) { Vector<String> lines = file_content.split("\n"); - RegEx reg_is_empty = RegEx("\\bempty\\("); - RegEx reg_super = RegEx("([\t ])\\.([a-zA-Z_])"); - RegEx reg_json_to = RegEx("\\bto_json\\b"); - RegEx reg_json_parse = RegEx("([\t]{0,})([^\n]+)parse_json\\(([^\n]+)"); - RegEx reg_json_non_new = RegEx("([\t]{0,})([^\n]+)JSON\\.parse\\(([^\n]+)"); - RegEx reg_export = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)"); - RegEx reg_export_advanced = RegEx("export\\(([^)^\n]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)([^\n]+)"); - RegEx reg_setget_setget = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*,[ \t]*([a-zA-Z0-9_]+)"); - RegEx reg_setget_set = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*[,]*[^a-z^A-Z^0-9^_]*$"); - RegEx reg_setget_get = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+,[ \t]*([a-zA-Z0-9_]+)[ \t]*$"); - RegEx reg_join = RegEx("([\\(\\)a-zA-Z0-9_]+)\\.join\\(([^\n^\\)]+)\\)"); - RegEx reg_mixed_tab_space = RegEx("([\t]+)([ ]+)"); - RegEx reg_image_lock = RegEx("([a-zA-Z0-9_\\.]+)\\.lock\\(\\)"); - RegEx reg_image_unlock = RegEx("([a-zA-Z0-9_\\.]+)\\.unlock\\(\\)"); - RegEx reg_os_fullscreen = RegEx("OS.window_fullscreen[= ]+([^#^\n]+)"); - - CRASH_COND(!reg_is_empty.is_valid()); - CRASH_COND(!reg_super.is_valid()); - CRASH_COND(!reg_json_to.is_valid()); - CRASH_COND(!reg_json_parse.is_valid()); - CRASH_COND(!reg_json_non_new.is_valid()); - CRASH_COND(!reg_export.is_valid()); - CRASH_COND(!reg_export_advanced.is_valid()); - CRASH_COND(!reg_setget_setget.is_valid()); - CRASH_COND(!reg_setget_set.is_valid()); - CRASH_COND(!reg_setget_get.is_valid()); - CRASH_COND(!reg_join.is_valid()); - CRASH_COND(!reg_mixed_tab_space.is_valid()); - CRASH_COND(!reg_image_lock.is_valid()); - CRASH_COND(!reg_image_unlock.is_valid()); - CRASH_COND(!reg_os_fullscreen.is_valid()); - for (String &line : lines) { - if (line.find("mtx") == -1 && line.find("mutex") == -1 && line.find("Mutex") == -1) { - line = reg_image_lock.sub(line, "false # $1.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true); - line = reg_image_unlock.sub(line, "false # $1.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true); - } - - // Mixed use of spaces and tabs - tabs as first - TODO, this probably is problem problem, but not sure - line = reg_mixed_tab_space.sub(line, "$1", true); - - // PackedStringArray(req_godot).join('.') -> '.'.join(PackedStringArray(req_godot)) PoolStringArray - line = reg_join.sub(line, "$2.join($1)", true); - - // -- empty() -> is_empty() Pool*Array - line = reg_is_empty.sub(line, "is_empty(", true); - - // -- \t.func() -> \tsuper.func() Object - line = reg_super.sub(line, "$1super.$2", true); // TODO, not sure if possible, but for now this brake String text e.g. "Choosen .gitignore" -> "Choosen super.gitignore" - - // -- JSON.parse(a) -> JSON.new().parse(a) etc. JSON - line = reg_json_non_new.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true); - - // -- to_json(a) -> JSON.new().stringify(a) Object - line = reg_json_to.sub(line, "JSON.new().stringify", true); - - // -- parse_json(a) -> JSON.get_data() etc. Object - line = reg_json_parse.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true); - - // -- get_node(@ -> get_node( Node - line = line.replace("get_node(@", "get_node("); - - // export(float) var lifetime = 3.0 -> export var lifetime: float = 3.0 GDScript - line = reg_export.sub(line, "export var $2: $1"); - - // export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro' -> export var _font_name = 'AnonymousPro' #(String, 'AnonymousPro', 'CourierPrime') GDScript - line = reg_export_advanced.sub(line, "export var $2$3 # ($1)"); - - // Setget Setget - line = reg_setget_setget.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $4\n\tset(mod_value):\n\t\tmod_value # TODOConverter40 Copy here content of $3", true); - - // Setget set - line = reg_setget_set.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Non existent get function \n\tset(mod_value):\n\t\tmod_value # TODOConverter40 Copy here content of $3", true); - - // Setget get - line = reg_setget_get.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $3 \n\tset(mod_value):\n\t\tmod_value # TODOConverter40 Non existent set function", true); - - // OS.window_fullscreen = true -> ProjectSettings.set("display/window/size/fullscreen",true) - line = reg_os_fullscreen.sub(line, "ProjectSettings.set(\"display/window/size/fullscreen\", $1)", true); - - // -- r.move_and_slide( a, b, c, d, e ) -> r.set_motion_velocity(a) ... r.move_and_slide() KinematicBody - if (line.find("move_and_slide(") != -1) { - int start = line.find("move_and_slide("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - String base_obj = get_object_of_execution(line.substr(0, start)); - String starting_space = get_starting_space(line); - - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 1) { - String line_new; - - // motion_velocity - line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n"; - - // up_direction - if (parts.size() >= 2) { - line_new += starting_space + base_obj + "set_up_direction(" + parts[1] + ")\n"; - } - - // stop_on_slope - if (parts.size() >= 3) { - line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[2] + ")\n"; - } - - // max_slides - if (parts.size() >= 4) { - line_new += starting_space + base_obj + "set_max_slides(" + parts[3] + ")\n"; - } - - // floor_max_angle - if (parts.size() >= 5) { - line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[4] + ")\n"; - } - - // infiinite_interia - if (parts.size() >= 6) { - line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[5] + "`\n"; - } - - line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start); - } - } - } - - // -- r.move_and_slide_with_snap( a, b, c, d, e ) -> r.set_motion_velocity(a) ... r.move_and_slide() KinematicBody - if (line.find("move_and_slide_with_snap(") != -1) { - int start = line.find("move_and_slide_with_snap("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - String base_obj = get_object_of_execution(line.substr(0, start)); - String starting_space = get_starting_space(line); - - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 1) { - String line_new; - - // motion_velocity - line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n"; - - // snap - if (parts.size() >= 2) { - line_new += starting_space + "# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `" + parts[1] + "`\n"; - } - - // up_direction - if (parts.size() >= 3) { - line_new += starting_space + base_obj + "set_up_direction(" + parts[2] + ")\n"; - } - - // stop_on_slope - if (parts.size() >= 4) { - line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[3] + ")\n"; - } - - // max_slides - if (parts.size() >= 5) { - line_new += starting_space + base_obj + "set_max_slides(" + parts[4] + ")\n"; - } - - // floor_max_angle - if (parts.size() >= 6) { - line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[5] + ")\n"; - } - - // infiinite_interia - if (parts.size() >= 7) { - line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[6] + "`\n"; - } - - line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start); - } - } - } - - // -- sort_custom( a , b ) -> sort_custom(Callable( a , b )) Object - if (line.find("sort_custom(") != -1) { - int start = line.find("sort_custom("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "sort_custom(Callable(" + parts[0] + "," + parts[1] + "))" + line.substr(end + start); - } - } - } - - // -- list_dir_begin( ) -> list_dir_begin() Object - if (line.find("list_dir_begin(") != -1) { - int start = line.find("list_dir_begin("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - line = line.substr(0, start) + "list_dir_begin() " + line.substr(end + start) + "# TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547"; - } - } - - // -- draw_line(1,2,3,4,5) -> draw_line(1,2,3,4) CanvasItem - if (line.find("draw_line(") != -1) { - int start = line.find("draw_line("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 5) { - line = line.substr(0, start) + "draw_line(" + parts[0] + "," + parts[1] + "," + parts[2] + "," + parts[3] + ")" + line.substr(end + start); - } - } - } - - // -- func c(var a, var b) -> func c(a, b) - if (line.find("func ") != -1 && line.find("var ") != -1) { - int start = line.find("func "); - start = line.substr(start).find("(") + start; - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - - String start_string = line.substr(0, start) + "("; - for (int i = 0; i < parts.size(); i++) { - start_string += parts[i].strip_edges().trim_prefix("var "); - if (i != parts.size() - 1) { - start_string += ", "; - } - } - line = start_string + ")" + line.substr(end + start); - } - } - - // -- yield(this, \"timeout\") -> await this.timeout GDScript - if (line.find("yield(") != -1) { - int start = line.find("yield("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\"", "").replace("\'", "").replace(" ", "") + line.substr(end + start); - } - } - } - - // -- parse_json( AA ) -> TODO Object - if (line.find("parse_json(") != -1) { - int start = line.find("parse_json("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - line = line.substr(0, start) + "JSON.new().stringify(" + connect_arguments(parts, 0) + ")" + line.substr(end + start); - } - } - - // -- .xform(Vector3(a,b,c)) -> * Vector3(a,b,c) Transform - if (line.find(".xform(") != -1) { - int start = line.find(".xform("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 1) { - line = line.substr(0, start) + " * " + parts[0] + line.substr(end + start); - } - } - } - - // -- .xform_inv(Vector3(a,b,c)) -> * Vector3(a,b,c) Transform - if (line.find(".xform_inv(") != -1) { - int start = line.find(".xform_inv("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - String object_exec = get_object_of_execution(line.substr(0, start)); - if (line.find(object_exec + ".xform") != -1) { - int start2 = line.find(object_exec + ".xform"); - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 1) { - line = line.substr(0, start2) + parts[0] + " * " + object_exec + line.substr(end + start); - } - } - } - } - - // -- connect(,,,things) -> connect(,Callable(,),things) Object - if (line.find("connect(") != -1) { - int start = line.find("connect("); - // Protection from disconnect - if (start == 0 || line.get(start - 1) != 's') { - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 3) { - line = line.substr(0, start) + "connect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start); - } - } - } - } - // -- disconnect(a,b,c) -> disconnect(a,Callable(b,c)) Object - if (line.find("disconnect(") != -1) { - int start = line.find("disconnect("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "disconnect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } - } - } - // -- is_connected(a,b,c) -> is_connected(a,Callable(b,c)) Object - if (line.find("is_connected(") != -1) { - int start = line.find("is_connected("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "is_connected(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } - } - } - // -- start(a,b,c) -> start(a,Callable(b,c)) Thread - if (line.find("start(") != -1) { - int start = line.find("start("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 3) { - line = line.substr(0, start) + "start(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start); - } - } - } - // -- func _init(p_x:int)->void: -> func _init(p_x:int): Object # https://github.com/godotengine/godot/issues/50589 - if (line.find(" _init(") != -1) { - int start = line.find(" _init("); - int end = line.rfind(":") + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - line = line.substr(0, start) + " _init(" + connect_arguments(parts, 0) + "):" + line.substr(end + start); - } - } - // assert(speed < 20, str(randi()%10)) -> assert(speed < 20) #,str(randi()%10)) GDScript - GDScript bug constant message - if (line.find("assert(") != -1) { - int start = line.find("assert("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "assert(" + parts[0] + ") " + line.substr(end + start) + "#," + parts[1] + ")"; - } - } - } - // create_from_image(aa, bb) -> create_from_image(aa) #, bb ImageTexture - if (line.find("create_from_image(") != -1) { - int start = line.find("create_from_image("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "create_from_image(" + parts[0] + ") " + "#," + parts[1] + line.substr(end + start); - } - } - } - // set_cell_item(a, b, c, d ,e) -> set_cell_item(Vector3(a, b, c), d ,e) - if (line.find("set_cell_item(") != -1) { - int start = line.find("set_cell_item("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() > 2) { - line = line.substr(0, start) + "set_cell_item( Vector3(" + parts[0] + "," + parts[1] + "," + parts[2] + ") " + connect_arguments(parts, 3) + ")" + line.substr(end + start); - } - } - } - // get_cell_item(a, b, c) -> get_cell_item(Vector3i(a, b, c)) - if (line.find("get_cell_item(") != -1) { - int start = line.find("get_cell_item("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "get_cell_item(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } - } - } - // get_cell_item_orientation(a, b, c) -> get_cell_item_orientation(Vector3i(a, b, c)) - if (line.find("get_cell_item_orientation(") != -1) { - int start = line.find("get_cell_item_orientation("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "get_cell_item_orientation(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } - } - } - // apply_impulse(A, B) -> apply_impulse(B, A) - if (line.find("apply_impulse(") != -1) { - int start = line.find("apply_impulse("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "apply_impulse(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start); - } - } - } - // apply_force(A, B) -> apply_force(B, A) - if (line.find("apply_force(") != -1) { - int start = line.find("apply_force("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "apply_force(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start); - } - } - } - // map_to_world(a, b, c) -> map_to_world(Vector3i(a, b, c)) - if (line.find("map_to_world(") != -1) { - int start = line.find("map_to_world("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "map_to_world(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } - } - } + process_gdscript_line(line, reg_container, builtin); } // Collect vector to string @@ -3064,478 +2688,484 @@ void ProjectConverter3To4::rename_gdscript_functions(String &file_content) { } }; -// This is almost 1:1 copy of function which rename gdscript functions -Vector<String> ProjectConverter3To4::check_for_rename_gdscript_functions(Vector<String> &file_content) { +Vector<String> ProjectConverter3To4::check_for_rename_gdscript_functions(Vector<String> &file_content, const RegExContainer ®_container, bool builtin) { int current_line = 1; Vector<String> found_things; - RegEx reg_is_empty = RegEx("\\bempty\\("); - RegEx reg_super = RegEx("([\t ])\\.([a-zA-Z_])"); - RegEx reg_json_to = RegEx("\\bto_json\\b"); - RegEx reg_json_parse = RegEx("([\t]{0,})([^\n]+)parse_json\\(([^\n]+)"); - RegEx reg_json_non_new = RegEx("([\t]{0,})([^\n]+)JSON\\.parse\\(([^\n]+)"); - RegEx reg_export = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)"); - RegEx reg_export_advanced = RegEx("export\\(([^)^\n]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)([^\n]+)"); - RegEx reg_setget_setget = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*,[ \t]*([a-zA-Z0-9_]+)"); - RegEx reg_setget_set = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*[,]*[^a-z^A-Z^0-9^_]*$"); - RegEx reg_setget_get = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+,[ \t]*([a-zA-Z0-9_]+)[ \t]*$"); - RegEx reg_join = RegEx("([\\(\\)a-zA-Z0-9_]+)\\.join\\(([^\n^\\)]+)\\)"); - RegEx reg_mixed_tab_space = RegEx("([\t]+)([ ]+)"); - RegEx reg_image_lock = RegEx("([a-zA-Z0-9_\\.]+)\\.lock\\(\\)"); - RegEx reg_image_unlock = RegEx("([a-zA-Z0-9_\\.]+)\\.unlock\\(\\)"); - RegEx reg_os_fullscreen = RegEx("OS.window_fullscreen[= ]+([^#^\n]+)"); - - CRASH_COND(!reg_is_empty.is_valid()); - CRASH_COND(!reg_super.is_valid()); - CRASH_COND(!reg_json_to.is_valid()); - CRASH_COND(!reg_json_parse.is_valid()); - CRASH_COND(!reg_json_non_new.is_valid()); - CRASH_COND(!reg_export.is_valid()); - CRASH_COND(!reg_export_advanced.is_valid()); - CRASH_COND(!reg_setget_setget.is_valid()); - CRASH_COND(!reg_setget_set.is_valid()); - CRASH_COND(!reg_setget_get.is_valid()); - CRASH_COND(!reg_join.is_valid()); - CRASH_COND(!reg_mixed_tab_space.is_valid()); - CRASH_COND(!reg_image_lock.is_valid()); - CRASH_COND(!reg_image_unlock.is_valid()); - CRASH_COND(!reg_os_fullscreen.is_valid()); - for (String &line : file_content) { String old_line = line; - - if (line.find("mtx") == -1 && line.find("mutex") == -1 && line.find("Mutex") == -1) { - line = reg_image_lock.sub(line, "false # $1.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true); - line = reg_image_unlock.sub(line, "false # $1.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true); + process_gdscript_line(line, reg_container, builtin); + if (old_line != line) { + found_things.append(simple_line_formatter(current_line, old_line, line)); } + } - // Mixed use of spaces and tabs - tabs as first - TODO, this probably is problem problem, but not sure - line = reg_mixed_tab_space.sub(line, "$1", true); + return found_things; +} +void ProjectConverter3To4::process_gdscript_line(String &line, const RegExContainer ®_container, bool builtin) { + if (line.find("mtx") == -1 && line.find("mutex") == -1 && line.find("Mutex") == -1) { + line = reg_container.reg_image_lock.sub(line, "false # $1.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true); + line = reg_container.reg_image_unlock.sub(line, "false # $1.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true); + } - // PackedStringArray(req_godot).join('.') -> '.'.join(PackedStringArray(req_godot)) PoolStringArray - line = reg_join.sub(line, "$2.join($1)", true); + // Mixed use of spaces and tabs - tabs as first - TODO, this probably is problem problem, but not sure + line = reg_container.reg_mixed_tab_space.sub(line, "$1", true); - // -- empty() -> is_empty() Pool*Array - line = reg_is_empty.sub(line, "is_empty(", true); + // PackedStringArray(req_godot).join('.') -> '.'.join(PackedStringArray(req_godot)) PoolStringArray + line = reg_container.reg_join.sub(line, "$2.join($1)", true); - // -- \t.func() -> \tsuper.func() Object - line = reg_super.sub(line, "$1super.$2", true); // TODO, not sure if possible, but for now this brake String text e.g. "Choosen .gitignore" -> "Choosen super.gitignore" + // -- empty() -> is_empty() Pool*Array + line = reg_container.reg_is_empty.sub(line, "is_empty(", true); - // -- JSON.parse(a) -> JSON.new().parse(a) etc. JSON - line = reg_json_non_new.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true); + // -- \t.func() -> \tsuper.func() Object + line = reg_container.reg_super.sub(line, "$1super.$2", true); // TODO, not sure if possible, but for now this brake String text e.g. "Choosen .gitignore" -> "Choosen super.gitignore" - // -- to_json(a) -> JSON.new().stringify(a) Object - line = reg_json_to.sub(line, "JSON.new().stringify", true); + // -- JSON.parse(a) -> JSON.new().parse(a) etc. JSON + line = reg_container.reg_json_non_new.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true); - // -- parse_json(a) -> JSON.get_data() etc. Object - line = reg_json_parse.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true); + // -- to_json(a) -> JSON.new().stringify(a) Object + line = reg_container.reg_json_to.sub(line, "JSON.new().stringify", true); - // -- get_node(@ -> get_node( Node - line = line.replace("get_node(@", "get_node("); + // -- parse_json(a) -> JSON.get_data() etc. Object + line = reg_container.reg_json_parse.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true); - // export(float) var lifetime = 3.0 -> export var lifetime: float = 3.0 GDScript - line = reg_export.sub(line, "export var $2: $1"); + // -- get_node(@ -> get_node( Node + line = line.replace("get_node(@", "get_node("); - // export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro' -> export var _font_name = 'AnonymousPro' #(String, 'AnonymousPro', 'CourierPrime') GDScript - line = reg_export_advanced.sub(line, "export var $2$3 # ($1)"); + // export(float) var lifetime = 3.0 -> export var lifetime: float = 3.0 GDScript + line = reg_container.reg_export.sub(line, "export var $2: $1"); - // Setget Setget - line = reg_setget_setget.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $4\n\tset(mod_value):\n\t\tmod_value # TODOConverter40 Copy here content of $3", true); + // export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro' -> export var _font_name = 'AnonymousPro' #(String, 'AnonymousPro', 'CourierPrime') GDScript + line = reg_container.reg_export_advanced.sub(line, "export var $2$3 # ($1)"); - // Setget set - line = reg_setget_set.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Non existent get function \n\tset(mod_value):\n\t\tmod_value # TODOConverter40 Copy here content of $3", true); + // Setget Setget + line = reg_container.reg_setget_setget.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $4\n\tset(mod_value):\n\t\tmod_value # TODOConverter40 Copy here content of $3", true); - // Setget get - line = reg_setget_get.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $3 \n\tset(mod_value):\n\t\tmod_value # TODOConverter40 Non existent set function", true); + // Setget set + line = reg_container.reg_setget_set.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Non existent get function \n\tset(mod_value):\n\t\tmod_value # TODOConverter40 Copy here content of $3", true); - // OS.window_fullscreen = true -> ProjectSettings.set("display/window/size/fullscreen",true) - line = reg_os_fullscreen.sub(line, "ProjectSettings.set(\"display/window/size/fullscreen\", $1)", true); + // Setget get + line = reg_container.reg_setget_get.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $3 \n\tset(mod_value):\n\t\tmod_value # TODOConverter40 Non existent set function", true); - // -- r.move_and_slide( a, b, c, d, e ) -> r.set_motion_velocity(a) ... r.move_and_slide() KinematicBody - if (line.find("move_and_slide(") != -1) { - int start = line.find("move_and_slide("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - String base_obj = get_object_of_execution(line.substr(0, start)); - String starting_space = get_starting_space(line); + // OS.window_fullscreen = true -> ProjectSettings.set("display/window/size/fullscreen",true) + if (builtin) { + line = reg_container.reg_os_fullscreen.sub(line, "ProjectSettings.set(\\\"display/window/size/fullscreen\\\", $1)", true); + } else { + line = reg_container.reg_os_fullscreen.sub(line, "ProjectSettings.set(\"display/window/size/fullscreen\", $1)", true); + } - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 1) { - String line_new; + // -- r.move_and_slide( a, b, c, d, e ) -> r.set_motion_velocity(a) ... r.move_and_slide() KinematicBody + if (line.find("move_and_slide(") != -1) { + int start = line.find("move_and_slide("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + String base_obj = get_object_of_execution(line.substr(0, start)); + String starting_space = get_starting_space(line); - // motion_velocity - line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n"; + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() >= 1) { + String line_new; - // up_direction - if (parts.size() >= 2) { - line_new += starting_space + base_obj + "set_up_direction(" + parts[1] + ")\n"; - } + // motion_velocity + line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n"; - // stop_on_slope - if (parts.size() >= 3) { - line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[2] + ")\n"; - } + // up_direction + if (parts.size() >= 2) { + line_new += starting_space + base_obj + "set_up_direction(" + parts[1] + ")\n"; + } - // max_slides - if (parts.size() >= 4) { - line_new += starting_space + base_obj + "set_max_slides(" + parts[3] + ")\n"; - } + // stop_on_slope + if (parts.size() >= 3) { + line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[2] + ")\n"; + } - // floor_max_angle - if (parts.size() >= 5) { - line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[4] + ")\n"; - } + // max_slides + if (parts.size() >= 4) { + line_new += starting_space + base_obj + "set_max_slides(" + parts[3] + ")\n"; + } - // infiinite_interia - if (parts.size() >= 6) { - line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[5] + "`\n"; - } + // floor_max_angle + if (parts.size() >= 5) { + line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[4] + ")\n"; + } - line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start); + // infiinite_interia + if (parts.size() >= 6) { + line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[5] + "`\n"; } + + line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start); } } + } - // -- r.move_and_slide_with_snap( a, b, c, d, e ) -> r.set_motion_velocity(a) ... r.move_and_slide() KinematicBody - if (line.find("move_and_slide_with_snap(") != -1) { - int start = line.find("move_and_slide_with_snap("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - String base_obj = get_object_of_execution(line.substr(0, start)); - String starting_space = get_starting_space(line); - - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 1) { - String line_new; + // -- r.move_and_slide_with_snap( a, b, c, d, e ) -> r.set_motion_velocity(a) ... r.move_and_slide() KinematicBody + if (line.find("move_and_slide_with_snap(") != -1) { + int start = line.find("move_and_slide_with_snap("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + String base_obj = get_object_of_execution(line.substr(0, start)); + String starting_space = get_starting_space(line); - // motion_velocity - line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n"; + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() >= 1) { + String line_new; - // snap - if (parts.size() >= 2) { - line_new += starting_space + "# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `" + parts[1] + "`\n"; - } + // motion_velocity + line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n"; - // up_direction - if (parts.size() >= 3) { - line_new += starting_space + base_obj + "set_up_direction(" + parts[2] + ")\n"; - } + // snap + if (parts.size() >= 2) { + line_new += starting_space + "# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `" + parts[1] + "`\n"; + } - // stop_on_slope - if (parts.size() >= 4) { - line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[3] + ")\n"; - } + // up_direction + if (parts.size() >= 3) { + line_new += starting_space + base_obj + "set_up_direction(" + parts[2] + ")\n"; + } - // max_slides - if (parts.size() >= 5) { - line_new += starting_space + base_obj + "set_max_slides(" + parts[4] + ")\n"; - } + // stop_on_slope + if (parts.size() >= 4) { + line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[3] + ")\n"; + } - // floor_max_angle - if (parts.size() >= 6) { - line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[5] + ")\n"; - } + // max_slides + if (parts.size() >= 5) { + line_new += starting_space + base_obj + "set_max_slides(" + parts[4] + ")\n"; + } - // infiinite_interia - if (parts.size() >= 7) { - line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[6] + "`\n"; - } + // floor_max_angle + if (parts.size() >= 6) { + line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[5] + ")\n"; + } - line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start); + // infiinite_interia + if (parts.size() >= 7) { + line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[6] + "`\n"; } + + line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start); } } + } - // -- sort_custom( a , b ) -> sort_custom(Callable( a , b )) Object - if (line.find("sort_custom(") != -1) { - int start = line.find("sort_custom("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "sort_custom(Callable(" + parts[0] + "," + parts[1] + "))" + line.substr(end + start); - } + // -- sort_custom( a , b ) -> sort_custom(Callable( a , b )) Object + if (line.find("sort_custom(") != -1) { + int start = line.find("sort_custom("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 2) { + line = line.substr(0, start) + "sort_custom(Callable(" + parts[0] + "," + parts[1] + "))" + line.substr(end + start); } } + } - // -- draw_line(1,2,3,4,5) -> draw_line(1,2,3,4) CanvasItem - if (line.find("draw_line(") != -1) { - int start = line.find("draw_line("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 5) { - line = line.substr(0, start) + "draw_line(" + parts[0] + "," + parts[1] + "," + parts[2] + "," + parts[3] + ")" + line.substr(end + start); - } - } + // -- list_dir_begin( ) -> list_dir_begin() Object + if (line.find("list_dir_begin(") != -1) { + int start = line.find("list_dir_begin("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + line = line.substr(0, start) + "list_dir_begin() " + line.substr(end + start) + "# TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547"; } + } - // -- func c(var a, var b) -> func c(a, b) - if (line.find("func ") != -1 && line.find("var ") != -1) { - int start = line.find("func "); - start = line.substr(start).find("(") + start; - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); + // -- draw_line(1,2,3,4,5) -> draw_line(1,2,3,4) CanvasItem + if (line.find("draw_line(") != -1) { + int start = line.find("draw_line("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 5) { + line = line.substr(0, start) + "draw_line(" + parts[0] + "," + parts[1] + "," + parts[2] + "," + parts[3] + ")" + line.substr(end + start); + } + } + } - String start_string = line.substr(0, start) + "("; - for (int i = 0; i < parts.size(); i++) { - start_string += parts[i].strip_edges().trim_prefix("var "); - if (i != parts.size() - 1) { - start_string += ", "; - } + // -- func c(var a, var b) -> func c(a, b) + if (line.find("func ") != -1 && line.find("var ") != -1) { + int start = line.find("func "); + start = line.substr(start).find("(") + start; + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + + String start_string = line.substr(0, start) + "("; + for (int i = 0; i < parts.size(); i++) { + start_string += parts[i].strip_edges().trim_prefix("var "); + if (i != parts.size() - 1) { + start_string += ", "; } - line = start_string + ")" + line.substr(end + start); } + line = start_string + ")" + line.substr(end + start); } + } - // -- yield(this, \"timeout\") -> await this.timeout GDScript - if (line.find("yield(") != -1) { - int start = line.find("yield("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { + // -- yield(this, \"timeout\") -> await this.timeout GDScript + if (line.find("yield(") != -1) { + int start = line.find("yield("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 2) { + if (builtin) { + line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace(" ", "") + line.substr(end + start); + } else { line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\"", "").replace("\'", "").replace(" ", "") + line.substr(end + start); } } } + } - // -- parse_json( AA ) -> TODO Object - if (line.find("parse_json(") != -1) { - int start = line.find("parse_json("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - line = line.substr(0, start) + "JSON.new().stringify(" + connect_arguments(parts, 0) + ")" + line.substr(end + start); - } + // -- parse_json( AA ) -> TODO Object + if (line.find("parse_json(") != -1) { + int start = line.find("parse_json("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + line = line.substr(0, start) + "JSON.new().stringify(" + connect_arguments(parts, 0) + ")" + line.substr(end + start); } + } - // -- .xform(Vector3(a,b,c)) -> * Vector3(a,b,c) Transform - if (line.find(".xform(") != -1) { - int start = line.find(".xform("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 1) { - line = line.substr(0, start) + " * " + parts[0] + line.substr(end + start); - } + // -- .xform(Vector3(a,b,c)) -> * Vector3(a,b,c) Transform + if (line.find(".xform(") != -1) { + int start = line.find(".xform("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 1) { + line = line.substr(0, start) + " * " + parts[0] + line.substr(end + start); } } + } - // -- .xform_inv(Vector3(a,b,c)) -> / Vector3(a,b,c) Transform - if (line.find(".xform_inv(") != -1) { - int start = line.find(".xform_inv("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { + // -- .xform_inv(Vector3(a,b,c)) -> * Vector3(a,b,c) Transform + if (line.find(".xform_inv(") != -1) { + int start = line.find(".xform_inv("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + String object_exec = get_object_of_execution(line.substr(0, start)); + if (line.find(object_exec + ".xform") != -1) { + int start2 = line.find(object_exec + ".xform"); Vector<String> parts = parse_arguments(line.substr(start, end)); if (parts.size() == 1) { - line = line.substr(0, start) + " / " + parts[0] + line.substr(end + start); + line = line.substr(0, start2) + parts[0] + " * " + object_exec + line.substr(end + start); } } } + } - // -- connect(,,,things) -> connect(,Callable(,),things) Object - if (line.find("connect(") != -1) { - int start = line.find("connect("); - // Protection from disconnect - if (start == 0 || line.get(start - 1) != 's') { - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 3) { - line = line.substr(0, start) + "connect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start); - } - } - } - } - // -- disconnect(a,b,c) -> disconnect(a,Callable(b,c)) Object - if (line.find("disconnect(") != -1) { - int start = line.find("disconnect("); + // -- "(connect(A,B,C,D,E) != OK):", "(connect(A,Callable(B,C).bind(D),E) Object + if (line.find("connect(") != -1) { + int start = line.find("connect("); + // Protection from disconnect + if (start == 0 || line.get(start - 1) != 's') { int end = get_end_parenthess(line.substr(start)) + 1; if (end > -1) { Vector<String> parts = parse_arguments(line.substr(start, end)); if (parts.size() == 3) { - line = line.substr(0, start) + "disconnect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); + line = line.substr(0, start) + "connect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); + } else if (parts.size() >= 4) { + line = line.substr(0, start) + "connect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ").bind(" + parts[3].lstrip("[").rstrip("]") + ")" + connect_arguments(parts, 4) + ")" + line.substr(end + start); } } } - // -- is_connected(a,b,c) -> is_connected(a,Callable(b,c)) Object - if (line.find("is_connected(") != -1) { - int start = line.find("is_connected("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "is_connected(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } + } + // -- disconnect(a,b,c) -> disconnect(a,Callable(b,c)) Object + if (line.find("disconnect(") != -1) { + int start = line.find("disconnect("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 3) { + line = line.substr(0, start) + "disconnect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); } } - // -- start(a,b,c) -> start(a,Callable(b,c)) Thread - if (line.find("start(") != -1) { - int start = line.find("start("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 3) { - line = line.substr(0, start) + "start(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start); - } + } + // -- is_connected(a,b,c) -> is_connected(a,Callable(b,c)) Object + if (line.find("is_connected(") != -1) { + int start = line.find("is_connected("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 3) { + line = line.substr(0, start) + "is_connected(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); } } - // -- func _init(p_x:int)->void: -> func _init(p_x:int): Object # https://github.com/godotengine/godot/issues/50589 - if (line.find(" _init(") != -1) { - int start = line.find(" _init("); - int end = line.rfind(":") + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - line = line.substr(0, start) + " _init(" + connect_arguments(parts, 0) + "):" + line.substr(end + start); + } + // -- start(a,b) -> start(Callable(a,b)) Thread + // -- start(a,b,c,d) -> start(Callable(a,b).bind(c),d) Thread + if (line.find("start(") != -1) { + int start = line.find("start("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 2) { + line = line.substr(0, start) + "start(Callable(" + parts[0] + "," + parts[1] + "))" + line.substr(end + start); + } else if (parts.size() >= 3) { + line = line.substr(0, start) + "start(Callable(" + parts[0] + "," + parts[1] + ").bind(" + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start); } } - // assert(speed < 20, str(randi()%10)) -> assert(speed < 20) #,str(randi()%10)) GDScript - GDScript bug constant message - if (line.find("assert(") != -1) { - int start = line.find("assert("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "assert(" + parts[0] + ") " + line.substr(end + start) + "#," + parts[1] + ")"; - } + } + // -- func _init(p_x:int)->void: -> func _init(p_x:int): Object # https://github.com/godotengine/godot/issues/50589 + if (line.find(" _init(") != -1) { + int start = line.find(" _init("); + int end = line.rfind(":") + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + line = line.substr(0, start) + " _init(" + connect_arguments(parts, 0) + "):" + line.substr(end + start); + } + } + // assert(speed < 20, str(randi()%10)) -> assert(speed < 20) #,str(randi()%10)) GDScript - GDScript bug constant message + if (line.find("assert(") != -1) { + int start = line.find("assert("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 2) { + line = line.substr(0, start) + "assert(" + parts[0] + ") " + line.substr(end + start) + "#," + parts[1] + ")"; } } - // create_from_image(aa, bb) -> create_from_image(aa) #, bb ImageTexture - if (line.find("create_from_image(") != -1) { - int start = line.find("create_from_image("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "create_from_image(" + parts[0] + ") " + "#," + parts[1] + line.substr(end + start); - } + } + // create_from_image(aa, bb) -> create_from_image(aa) #, bb ImageTexture + if (line.find("create_from_image(") != -1) { + int start = line.find("create_from_image("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 2) { + line = line.substr(0, start) + "create_from_image(" + parts[0] + ") " + "#," + parts[1] + line.substr(end + start); } } - // set_cell_item(a, b, c, d ,e) -> set_cell_item(Vector3(a, b, c), d ,e) - if (line.find("set_cell_item(") != -1) { - int start = line.find("set_cell_item("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() > 2) { - line = line.substr(0, start) + "set_cell_item( Vector3(" + parts[0] + "," + parts[1] + "," + parts[2] + ") " + connect_arguments(parts, 3) + ")" + line.substr(end + start); - } + } + // set_cell_item(a, b, c, d ,e) -> set_cell_item(Vector3(a, b, c), d ,e) + if (line.find("set_cell_item(") != -1) { + int start = line.find("set_cell_item("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() > 2) { + line = line.substr(0, start) + "set_cell_item( Vector3(" + parts[0] + "," + parts[1] + "," + parts[2] + ") " + connect_arguments(parts, 3) + ")" + line.substr(end + start); } } - // get_cell_item(a, b, c) -> get_cell_item(Vector3i(a, b, c)) - if (line.find("get_cell_item(") != -1) { - int start = line.find("get_cell_item("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "get_cell_item(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } + } + // get_cell_item(a, b, c) -> get_cell_item(Vector3i(a, b, c)) + if (line.find("get_cell_item(") != -1) { + int start = line.find("get_cell_item("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 3) { + line = line.substr(0, start) + "get_cell_item(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start); } } - // get_cell_item_orientation(a, b, c) -> get_cell_item_orientation(Vector3i(a, b, c)) - if (line.find("get_cell_item_orientation(") != -1) { - int start = line.find("get_cell_item_orientation("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "get_cell_item_orientation(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } + } + // get_cell_item_orientation(a, b, c) -> get_cell_item_orientation(Vector3i(a, b, c)) + if (line.find("get_cell_item_orientation(") != -1) { + int start = line.find("get_cell_item_orientation("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 3) { + line = line.substr(0, start) + "get_cell_item_orientation(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start); } } - - // apply_impulse(A, B) -> apply_impulse(B, A) - if (line.find("apply_impulse(") != -1) { - int start = line.find("apply_impulse("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "apply_impulse(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start); - } + } + // apply_impulse(A, B) -> apply_impulse(B, A) + if (line.find("apply_impulse(") != -1) { + int start = line.find("apply_impulse("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 2) { + line = line.substr(0, start) + "apply_impulse(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start); } } - // apply_force(A, B) -> apply_force(B, A) - if (line.find("apply_force(") != -1) { - int start = line.find("apply_force("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 2) { - line = line.substr(0, start) + "apply_force(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start); - } + } + // apply_force(A, B) -> apply_force(B, A) + if (line.find("apply_force(") != -1) { + int start = line.find("apply_force("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 2) { + line = line.substr(0, start) + "apply_force(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start); } } - // map_to_world(a, b, c) -> map_to_world(Vector3i(a, b, c)) - if (line.find("map_to_world(") != -1) { - int start = line.find("get_cell_item_orientation("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "map_to_world(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } + } + // map_to_world(a, b, c) -> map_to_world(Vector3i(a, b, c)) + if (line.find("map_to_world(") != -1) { + int start = line.find("map_to_world("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 3) { + line = line.substr(0, start) + "map_to_world(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start); } } - - if (old_line != line) { - found_things.append(simple_line_formatter(current_line, old_line, line)); + } + // OS.get_window_safe_area() -> DisplayServer.get_display_safe_area() + if (line.find("OS.get_window_safe_area(") != -1) { + int start = line.find("OS.get_window_safe_area("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 0) { + line = line.substr(0, start) + "DisplayServer.get_display_safe_area()" + line.substr(end + start); + } } } - - return found_things; } -void ProjectConverter3To4::rename_csharp_functions(String &file_content) { - // Custom renaming, each rule needs to be set manually - // Don't forget to put validate each rule in validate_conversion function - Vector<String> lines = file_content.split("\n"); +void ProjectConverter3To4::process_csharp_line(String &line) { + // TODO maybe this can be changed to normal rule + line = line.replace("OS.GetWindowSafeArea()", "DisplayServer.ScreenGetUsableRect()"); - for (String &line : lines) { - // TODO maybe this can be changed to normal rule - line = line.replace("OS.GetWindowSafeArea()", "DisplayServer.ScreenGetUsableRect()"); - - // -- Connect(,,,things) -> Connect(,Callable(,),things) Object - if (line.find("Connect(") != -1) { - int start = line.find("Connect("); - // Protection from disconnect - if (start == 0 || line.get(start - 1) != 's') { - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 3) { - line = line.substr(0, start) + "Connect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start); - } - } - } - } - // -- Disconnect(a,b,c) -> Disconnect(a,Callable(b,c)) Object - if (line.find("Disconnect(") != -1) { - int start = line.find("Disconnect("); + // -- Connect(,,,things) -> Connect(,Callable(,),things) Object + if (line.find("Connect(") != -1) { + int start = line.find("Connect("); + // Protection from disconnect + if (start == 0 || line.get(start - 1) != 's') { int end = get_end_parenthess(line.substr(start)) + 1; if (end > -1) { Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "Disconnect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); + if (parts.size() >= 3) { + line = line.substr(0, start) + "Connect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start); } } } - // -- IsConnected(a,b,c) -> IsConnected(a,Callable(b,c)) Object - if (line.find("IsConnected(") != -1) { - int start = line.find("IsConnected("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "IsConnected(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } + } + // -- Disconnect(a,b,c) -> Disconnect(a,Callable(b,c)) Object + if (line.find("Disconnect(") != -1) { + int start = line.find("Disconnect("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 3) { + line = line.substr(0, start) + "Disconnect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); + } + } + } + // -- IsConnected(a,b,c) -> IsConnected(a,Callable(b,c)) Object + if (line.find("IsConnected(") != -1) { + int start = line.find("IsConnected("); + int end = get_end_parenthess(line.substr(start)) + 1; + if (end > -1) { + Vector<String> parts = parse_arguments(line.substr(start, end)); + if (parts.size() == 3) { + line = line.substr(0, start) + "IsConnected(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); } } } +} + +void ProjectConverter3To4::rename_csharp_functions(String &file_content) { + Vector<String> lines = file_content.split("\n"); + + for (String &line : lines) { + process_csharp_line(line); + } // Collect vector to string file_content = ""; @@ -3556,47 +3186,7 @@ Vector<String> ProjectConverter3To4::check_for_rename_csharp_functions(Vector<St for (String &line : file_content) { String old_line = line; - - // TODO maybe this can be changed to normal rule - line = line.replace("OS.GetWindowSafeArea()", "DisplayServer.ScreenGetUsableRect()"); - - // -- Connect(,,,things) -> connect(,Callable(,),things) Object - if (line.find("Connect(") != -1) { - int start = line.find("Connect("); - // Protection from disconnect - if (start == 0 || line.get(start - 1) != 's') { - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() >= 3) { - line = line.substr(0, start) + "Connect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start); - } - } - } - } - // -- Disconnect(a,b,c) -> Disconnect(a,Callable(b,c)) Object - if (line.find("Disconnect(") != -1) { - int start = line.find("Disconnect("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "Disconnect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } - } - } - // -- IsConnected(a,b,c) -> IsConnected(a,Callable(b,c)) Object - if (line.find("IsConnected(") != -1) { - int start = line.find("IsConnected("); - int end = get_end_parenthess(line.substr(start)) + 1; - if (end > -1) { - Vector<String> parts = parse_arguments(line.substr(start, end)); - if (parts.size() == 3) { - line = line.substr(0, start) + "IsConnected(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start); - } - } - } - + process_csharp_line(line); if (old_line != line) { found_things.append(simple_line_formatter(current_line, old_line, line)); } @@ -3605,88 +3195,81 @@ Vector<String> ProjectConverter3To4::check_for_rename_csharp_functions(Vector<St return found_things; } -void ProjectConverter3To4::rename_gdscript_keywords(String &file_content){ - { RegEx reg_tool = RegEx("([\n]+)tool"); -CRASH_COND(!reg_tool.is_valid()); -file_content = reg_tool.sub(file_content, "$1@tool", true); -RegEx reg_tool2 = RegEx("^tool"); -CRASH_COND(!reg_tool2.is_valid()); -file_content = reg_tool2.sub(file_content, "@tool", true); -} -{ - RegEx reg_export = RegEx("([\n\t]+)export\\b"); - CRASH_COND(!reg_export.is_valid()); - file_content = reg_export.sub(file_content, "$1@export", true); - RegEx reg_export2 = RegEx("^export"); - CRASH_COND(!reg_export2.is_valid()); - file_content = reg_export2.sub(file_content, "@export", true); -} -{ - RegEx reg_onready = RegEx("([\n]+)onready"); - CRASH_COND(!reg_onready.is_valid()); - file_content = reg_onready.sub(file_content, "$1@onready", true); - RegEx reg_onready2 = RegEx("^onready"); - CRASH_COND(!reg_onready2.is_valid()); - file_content = reg_onready2.sub(file_content, "@onready", true); -} -{ - RegEx reg_master = RegEx("([\n]+)master func"); - CRASH_COND(!reg_master.is_valid()); - file_content = reg_master.sub(file_content, "$1@rpc(any) func", true); - RegEx reg_master2 = RegEx("^master func"); - CRASH_COND(!reg_master2.is_valid()); - file_content = reg_master2.sub(file_content, "@rpc(any) func", true); -} -{ - RegEx reg_puppet = RegEx("([\n]+)puppet func"); - CRASH_COND(!reg_puppet.is_valid()); - file_content = reg_puppet.sub(file_content, "$1@rpc(auth) func", true); - RegEx reg_puppet2 = RegEx("^puppet func"); - CRASH_COND(!reg_puppet2.is_valid()); - file_content = reg_puppet2.sub(file_content, "@rpc(auth) func", true); -} -{ - RegEx reg_remote = RegEx("([\n]+)remote func"); - CRASH_COND(!reg_remote.is_valid()); - file_content = reg_remote.sub(file_content, "$1@rpc(any) func", true); - RegEx reg_remote2 = RegEx("^remote func"); - CRASH_COND(!reg_remote2.is_valid()); - file_content = reg_remote2.sub(file_content, "@rpc(any) func", true); -} -{ - RegEx reg_remotesync = RegEx("([\n]+)remotesync func"); - CRASH_COND(!reg_remotesync.is_valid()); - file_content = reg_remotesync.sub(file_content, "$1@rpc(any,sync) func", true); - RegEx reg_remotesync2 = RegEx("^remotesync func"); - CRASH_COND(!reg_remotesync2.is_valid()); - file_content = reg_remotesync2.sub(file_content, "@rpc(any,sync) func", true); -} -{ - RegEx reg_sync = RegEx("([\n]+)sync func"); - CRASH_COND(!reg_sync.is_valid()); - file_content = reg_sync.sub(file_content, "$1@rpc(any,sync) func", true); - RegEx reg_sync2 = RegEx("^sync func"); - CRASH_COND(!reg_sync2.is_valid()); - file_content = reg_sync2.sub(file_content, "@rpc(any,sync) func", true); -} -{ - RegEx reg_puppetsync = RegEx("([\n]+)puppetsync func"); - CRASH_COND(!reg_puppetsync.is_valid()); - file_content = reg_puppetsync.sub(file_content, "$1@rpc(auth,sync) func", true); - RegEx reg_puppetsync2 = RegEx("^puppetsync func"); - CRASH_COND(!reg_puppetsync2.is_valid()); - file_content = reg_puppetsync2.sub(file_content, "@rpc(auth,sync) func", true); -} -{ - RegEx reg_mastersync = RegEx("([\n]+)mastersync func"); - CRASH_COND(!reg_mastersync.is_valid()); - file_content = reg_mastersync.sub(file_content, "$1@rpc(any,sync) func", true); - RegEx reg_mastersync2 = RegEx("^mastersync func"); - CRASH_COND(!reg_mastersync2.is_valid()); - file_content = reg_mastersync2.sub(file_content, "@rpc(any,sync) func", true); -} +void ProjectConverter3To4::rename_gdscript_keywords(String &file_content) { + { + RegEx reg_first = RegEx("([\n]+)tool"); + CRASH_COND(!reg_first.is_valid()); + file_content = reg_first.sub(file_content, "$1@tool", true); + RegEx reg_second = RegEx("^tool"); + CRASH_COND(!reg_second.is_valid()); + file_content = reg_second.sub(file_content, "@tool", true); + } + { + RegEx reg_first = RegEx("([\n\t]+)export\\b"); + CRASH_COND(!reg_first.is_valid()); + file_content = reg_first.sub(file_content, "$1@export", true); + RegEx reg_second = RegEx("^export"); + CRASH_COND(!reg_second.is_valid()); + file_content = reg_second.sub(file_content, "@export", true); + } + { + RegEx reg_first = RegEx("([\n]+)onready"); + CRASH_COND(!reg_first.is_valid()); + file_content = reg_first.sub(file_content, "$1@onready", true); + RegEx reg_second = RegEx("^onready"); + CRASH_COND(!reg_second.is_valid()); + file_content = reg_second.sub(file_content, "@onready", true); + } + { + RegEx reg_first = RegEx("([\n]+)remote func"); + CRASH_COND(!reg_first.is_valid()); + file_content = reg_first.sub(file_content, "$1@rpc(any_peer) func", true); + RegEx reg_second = RegEx("^remote func"); + CRASH_COND(!reg_second.is_valid()); + file_content = reg_second.sub(file_content, "@rpc(any_peer) func", true); + } + { + RegEx reg_first = RegEx("([\n]+)remotesync func"); + CRASH_COND(!reg_first.is_valid()); + file_content = reg_first.sub(file_content, "$1@rpc(any_peer, call_local) func", true); + RegEx reg_second = RegEx("^remotesync func"); + CRASH_COND(!reg_second.is_valid()); + file_content = reg_second.sub(file_content, "@rpc(any_peer, call_local) func", true); + } + { + RegEx reg_first = RegEx("([\n]+)puppet func"); + CRASH_COND(!reg_first.is_valid()); + file_content = reg_first.sub(file_content, "$1@rpc func", true); + RegEx reg_second = RegEx("^puppet func"); + CRASH_COND(!reg_second.is_valid()); + file_content = reg_second.sub(file_content, "@rpc func", true); + } + { + RegEx reg_first = RegEx("([\n]+)puppetsync func"); + CRASH_COND(!reg_first.is_valid()); + file_content = reg_first.sub(file_content, "$1@rpc(call_local) func", true); + RegEx reg_second = RegEx("^puppetsync func"); + CRASH_COND(!reg_second.is_valid()); + file_content = reg_second.sub(file_content, "@rpc(call_local) func", true); + } + String error_message = "The master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n"; + { + RegEx reg_first = RegEx("([\n]+)master func"); + CRASH_COND(!reg_first.is_valid()); + file_content = reg_first.sub(file_content, "$1" + error_message + "@rpc func", true); + RegEx reg_second = RegEx("^master func"); + CRASH_COND(!reg_second.is_valid()); + file_content = reg_second.sub(file_content, error_message + "@rpc func", true); + } + { + RegEx reg_first = RegEx("([\n]+)mastersync func"); + CRASH_COND(!reg_first.is_valid()); + file_content = reg_first.sub(file_content, "$1" + error_message + "@rpc(call_local) func", true); + RegEx reg_second = RegEx("^mastersync func"); + CRASH_COND(!reg_second.is_valid()); + file_content = reg_second.sub(file_content, error_message + "@rpc(call_local) func", true); + } } -; Vector<String> ProjectConverter3To4::check_for_rename_gdscript_keywords(Vector<String> &file_content) { Vector<String> found_things; @@ -3697,96 +3280,87 @@ Vector<String> ProjectConverter3To4::check_for_rename_gdscript_keywords(Vector<S String old; old = line; { - RegEx reg_tool2 = RegEx("^tool"); - CRASH_COND(!reg_tool2.is_valid()); - line = reg_tool2.sub(line, "@tool", true); + RegEx reg_first = RegEx("^tool"); + CRASH_COND(!reg_first.is_valid()); + line = reg_first.sub(line, "@tool", true); } if (old != line) { found_things.append(line_formatter(current_line, "tool", "@tool", line)); } old = line; { - RegEx reg_export = RegEx("([\t]+)export\\b"); - CRASH_COND(!reg_export.is_valid()); - line = reg_export.sub(line, "$1@export", true); - RegEx reg_export2 = RegEx("^export"); - CRASH_COND(!reg_export2.is_valid()); - line = reg_export2.sub(line, "@export", true); + RegEx reg_first = RegEx("([\t]+)export\\b"); + CRASH_COND(!reg_first.is_valid()); + line = reg_first.sub(line, "$1@export", true); + RegEx reg_second = RegEx("^export"); + CRASH_COND(!reg_second.is_valid()); + line = reg_second.sub(line, "@export", true); } if (old != line) { found_things.append(line_formatter(current_line, "export", "@export", line)); } old = line; { - RegEx reg_onready2 = RegEx("^onready"); - CRASH_COND(!reg_onready2.is_valid()); - line = reg_onready2.sub(line, "@onready", true); + RegEx reg_first = RegEx("^onready"); + CRASH_COND(!reg_first.is_valid()); + line = reg_first.sub(line, "@onready", true); } if (old != line) { found_things.append(line_formatter(current_line, "onready", "@onready", line)); } old = line; { - RegEx reg_master2 = RegEx("^master func"); - CRASH_COND(!reg_master2.is_valid()); - line = reg_master2.sub(line, "@rpc(any) func", true); - } - if (old != line) { - found_things.append(line_formatter(current_line, "master func", "@rpc(any) func", line)); - } - old = line; - { - RegEx reg_puppet2 = RegEx("^puppet func"); - CRASH_COND(!reg_puppet2.is_valid()); - line = reg_puppet2.sub(line, "@rpc(auth) func", true); + RegEx regex = RegEx("^remote func"); + CRASH_COND(!regex.is_valid()); + line = regex.sub(line, "@rpc(any_peer) func", true); } if (old != line) { - found_things.append(line_formatter(current_line, "puppet func", "@rpc(auth) func", line)); + found_things.append(line_formatter(current_line, "remote func", "@rpc(any_peer) func", line)); } old = line; { - RegEx reg_remote2 = RegEx("^remote func"); - CRASH_COND(!reg_remote2.is_valid()); - line = reg_remote2.sub(line, "@rpc(any) func", true); + RegEx regex = RegEx("^remotesync func"); + CRASH_COND(!regex.is_valid()); + line = regex.sub(line, "@rpc(any_peer, call_local)) func", true); } if (old != line) { - found_things.append(line_formatter(current_line, "remote func", "@rpc(any) func", line)); + found_things.append(line_formatter(current_line, "remotesync func", "@rpc(any_peer, call_local)) func", line)); } old = line; { - RegEx reg_remotesync2 = RegEx("^remotesync func"); - CRASH_COND(!reg_remotesync2.is_valid()); - line = reg_remotesync2.sub(line, "@rpc(any,sync) func", true); + RegEx regex = RegEx("^puppet func"); + CRASH_COND(!regex.is_valid()); + line = regex.sub(line, "@rpc func", true); } if (old != line) { - found_things.append(line_formatter(current_line, "remotesync func", "@rpc(any,sync) func", line)); + found_things.append(line_formatter(current_line, "puppet func", "@rpc func", line)); } old = line; { - RegEx reg_sync2 = RegEx("^sync func"); - CRASH_COND(!reg_sync2.is_valid()); - line = reg_sync2.sub(line, "@rpc(any,sync) func", true); + RegEx regex = RegEx("^puppetsync func"); + CRASH_COND(!regex.is_valid()); + line = regex.sub(line, "@rpc(call_local) func", true); } if (old != line) { - found_things.append(line_formatter(current_line, "sync func", "@rpc(any,sync) func", line)); + found_things.append(line_formatter(current_line, "puppetsync func", "@rpc(call_local) func", line)); } old = line; { - RegEx reg_puppetsync2 = RegEx("^puppetsync func"); - CRASH_COND(!reg_puppetsync2.is_valid()); - line = reg_puppetsync2.sub(line, "@rpc(auth,sync) func", true); + RegEx regex = RegEx("^master func"); + CRASH_COND(!regex.is_valid()); + line = regex.sub(line, "@rpc func", true); } if (old != line) { - found_things.append(line_formatter(current_line, "puppetsync func", "@rpc(any,sync) func", line)); + found_things.append(line_formatter(current_line, "master func", "@rpc func", line)); } old = line; { - RegEx reg_mastersync2 = RegEx("^mastersync func"); - CRASH_COND(!reg_mastersync2.is_valid()); - line = reg_mastersync2.sub(line, "@rpc(any,sync) func", true); + RegEx regex = RegEx("^mastersync func"); + CRASH_COND(!regex.is_valid()); + line = regex.sub(line, "@rpc(call_local) func", true); } if (old != line) { - found_things.append(line_formatter(current_line, "mastersync", "@rpc(any,sync) func", line)); + found_things.append(line_formatter(current_line, "mastersync func", "@rpc(call_local) func", line)); } old = line; @@ -3810,7 +3384,7 @@ Vector<String> ProjectConverter3To4::check_for_custom_rename(Vector<String> &fil int current_line = 1; for (String &line : file_content) { - Array reg_match = reg.search_all(line); + TypedArray<RegExMatch> reg_match = reg.search_all(line); if (reg_match.size() > 0) { found_things.append(line_formatter(current_line, from.replace("\\.", "."), to, line)); // Without replacing it will print "\.shader" instead ".shader" } @@ -3841,7 +3415,7 @@ Vector<String> ProjectConverter3To4::check_for_rename_common(const char *array[] int current_line = 1; for (String &line : file_content) { - Array reg_match = reg.search_all(line); + TypedArray<RegExMatch> reg_match = reg.search_all(line); if (reg_match.size() > 0) { found_things.append(line_formatter(current_line, array[current_index][0], array[current_index][1], line)); } diff --git a/editor/project_converter_3_to_4.h b/editor/project_converter_3_to_4.h index 95239666e0..a58bb2767a 100644 --- a/editor/project_converter_3_to_4.h +++ b/editor/project_converter_3_to_4.h @@ -37,17 +37,23 @@ #include "core/string/ustring.h" class ProjectConverter3To4 { +public: + class RegExContainer; + +private: void rename_enums(String &file_content); Vector<String> check_for_rename_enums(Vector<String> &file_content); void rename_classes(String &file_content); Vector<String> check_for_rename_classes(Vector<String> &file_content); - void rename_gdscript_functions(String &file_content); - Vector<String> check_for_rename_gdscript_functions(Vector<String> &file_content); + void rename_gdscript_functions(String &file_content, const RegExContainer ®_container, bool builtin); + Vector<String> check_for_rename_gdscript_functions(Vector<String> &file_content, const RegExContainer ®_container, bool builtin); + void process_gdscript_line(String &line, const RegExContainer ®_container, bool builtin); void rename_csharp_functions(String &file_content); Vector<String> check_for_rename_csharp_functions(Vector<String> &file_content); + void process_csharp_line(String &line); void rename_gdscript_keywords(String &file_content); Vector<String> check_for_rename_gdscript_keywords(Vector<String> &file_content); @@ -71,9 +77,10 @@ class ProjectConverter3To4 { bool test_single_array(const char *array[][2], bool ignore_second_check = false); bool test_conversion_single_additional(String name, String expected, void (ProjectConverter3To4::*func)(String &), String what); + bool test_conversion_single_additional_builtin(String name, String expected, void (ProjectConverter3To4::*func)(String &, const RegExContainer &, bool), String what, const RegExContainer ®_container, bool builtin); bool test_conversion_single_normal(String name, String expected, const char *array[][2], String what); bool test_array_names(); - bool test_conversion(); + bool test_conversion(const RegExContainer ®_container); public: int validate_conversion(); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 7d35d5a3d5..8395fa996a 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -646,14 +646,6 @@ private: protected: static void _bind_methods() { - ClassDB::bind_method("_browse_path", &ProjectDialog::_browse_path); - ClassDB::bind_method("_create_folder", &ProjectDialog::_create_folder); - ClassDB::bind_method("_text_changed", &ProjectDialog::_text_changed); - ClassDB::bind_method("_path_text_changed", &ProjectDialog::_path_text_changed); - ClassDB::bind_method("_path_selected", &ProjectDialog::_path_selected); - ClassDB::bind_method("_file_selected", &ProjectDialog::_file_selected); - ClassDB::bind_method("_install_path_selected", &ProjectDialog::_install_path_selected); - ClassDB::bind_method("_browse_install_path", &ProjectDialog::_browse_install_path); ADD_SIGNAL(MethodInfo("project_created")); ADD_SIGNAL(MethodInfo("projects_updated")); } diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index be1ad1ca9c..ca5eeaa787 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -34,10 +34,15 @@ #include "editor/editor_log.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "servers/movie_writer/movie_writer.h" ProjectSettingsEditor *ProjectSettingsEditor::singleton = nullptr; +void ProjectSettingsEditor::connect_filesystem_dock_signals(FileSystemDock *p_fs_dock) { + localization_editor->connect_filesystem_dock_signals(p_fs_dock); +} + void ProjectSettingsEditor::popup_project_settings() { // Restore valid window bounds or pop up at default size. Rect2 saved_size = EditorSettings::get_singleton()->get_project_metadata("dialog_bounds", "project_settings", Rect2()); @@ -74,8 +79,13 @@ void ProjectSettingsEditor::_setting_edited(const String &p_name) { queue_save(); } +void ProjectSettingsEditor::_update_advanced(bool p_is_advanced) { + custom_properties->set_visible(p_is_advanced); +} + void ProjectSettingsEditor::_advanced_toggled(bool p_button_pressed) { EditorSettings::get_singleton()->set_project_metadata("project_settings", "advanced_mode", p_button_pressed); + _update_advanced(p_button_pressed); general_settings_inspector->set_restrict_to_basic_settings(!p_button_pressed); } @@ -584,35 +594,35 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { advanced->connect("toggled", callable_mp(this, &ProjectSettingsEditor::_advanced_toggled)); search_bar->add_child(advanced); - HBoxContainer *header = memnew(HBoxContainer); - general_editor->add_child(header); + custom_properties = memnew(HBoxContainer); + general_editor->add_child(custom_properties); property_box = memnew(LineEdit); property_box->set_placeholder(TTR("Select a Setting or Type its Name")); property_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); property_box->connect("text_changed", callable_mp(this, &ProjectSettingsEditor::_property_box_changed)); - header->add_child(property_box); + custom_properties->add_child(property_box); feature_box = memnew(OptionButton); feature_box->set_custom_minimum_size(Size2(120, 0) * EDSCALE); feature_box->connect("item_selected", callable_mp(this, &ProjectSettingsEditor::_feature_selected)); - header->add_child(feature_box); + custom_properties->add_child(feature_box); type_box = memnew(OptionButton); type_box->set_custom_minimum_size(Size2(120, 0) * EDSCALE); - header->add_child(type_box); + custom_properties->add_child(type_box); add_button = memnew(Button); add_button->set_text(TTR("Add")); add_button->set_disabled(true); add_button->connect("pressed", callable_mp(this, &ProjectSettingsEditor::_add_setting)); - header->add_child(add_button); + custom_properties->add_child(add_button); del_button = memnew(Button); del_button->set_text(TTR("Delete")); del_button->set_disabled(true); del_button->connect("pressed", callable_mp(this, &ProjectSettingsEditor::_delete_setting)); - header->add_child(del_button); + custom_properties->add_child(del_button); general_settings_inspector = memnew(SectionedInspector); general_settings_inspector->get_inspector()->set_undo_redo(EditorNode::get_singleton()->get_undo_redo()); @@ -693,6 +703,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { advanced->set_pressed(true); } + _update_advanced(use_advanced); general_settings_inspector->set_restrict_to_basic_settings(!use_advanced); import_defaults_editor = memnew(ImportDefaultsEditor); diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h index 455aaae11c..c2d2c2d8f4 100644 --- a/editor/project_settings_editor.h +++ b/editor/project_settings_editor.h @@ -43,6 +43,8 @@ #include "editor/shader_globals_editor.h" #include "scene/gui/tab_container.h" +class FileSystemDock; + class ProjectSettingsEditor : public AcceptDialog { GDCLASS(ProjectSettingsEditor, AcceptDialog); @@ -61,6 +63,7 @@ class ProjectSettingsEditor : public AcceptDialog { LineEdit *search_box = nullptr; CheckButton *advanced = nullptr; + HBoxContainer *custom_properties = nullptr; LineEdit *property_box = nullptr; OptionButton *feature_box = nullptr; OptionButton *type_box = nullptr; @@ -77,6 +80,7 @@ class ProjectSettingsEditor : public AcceptDialog { UndoRedo *undo_redo = nullptr; void _advanced_toggled(bool p_button_pressed); + void _update_advanced(bool p_is_advanced); void _property_box_changed(const String &p_text); void _update_property_box(); void _feature_selected(int p_index); @@ -118,6 +122,7 @@ public: TabContainer *get_tabs() { return tab_container; } void queue_save(); + void connect_filesystem_dock_signals(FileSystemDock *p_fs_dock); ProjectSettingsEditor(EditorData *p_data); }; diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp deleted file mode 100644 index 5f4375b424..0000000000 --- a/editor/property_editor.cpp +++ /dev/null @@ -1,1898 +0,0 @@ -/*************************************************************************/ -/* property_editor.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ - -#include "property_editor.h" - -#include "core/config/project_settings.h" -#include "core/input/input.h" -#include "core/io/image_loader.h" -#include "core/io/marshalls.h" -#include "core/io/resource_loader.h" -#include "core/math/expression.h" -#include "core/object/class_db.h" -#include "core/os/keyboard.h" -#include "core/string/print_string.h" -#include "core/templates/pair.h" -#include "editor/array_property_edit.h" -#include "editor/create_dialog.h" -#include "editor/dictionary_property_edit.h" -#include "editor/editor_file_dialog.h" -#include "editor/editor_file_system.h" -#include "editor/editor_help.h" -#include "editor/editor_node.h" -#include "editor/editor_scale.h" -#include "editor/editor_settings.h" -#include "editor/filesystem_dock.h" -#include "editor/multi_node_edit.h" -#include "editor/property_selector.h" -#include "editor/scene_tree_dock.h" -#include "scene/gui/label.h" -#include "scene/main/window.h" -#include "scene/resources/font.h" -#include "scene/resources/packed_scene.h" -#include "scene/scene_string_names.h" - -void EditorResourceConversionPlugin::_bind_methods() { - GDVIRTUAL_BIND(_converts_to); - GDVIRTUAL_BIND(_handles, "resource"); - GDVIRTUAL_BIND(_convert, "resource"); -} - -String EditorResourceConversionPlugin::converts_to() const { - String ret; - if (GDVIRTUAL_CALL(_converts_to, ret)) { - return ret; - } - - return ""; -} - -bool EditorResourceConversionPlugin::handles(const Ref<Resource> &p_resource) const { - bool ret; - if (GDVIRTUAL_CALL(_handles, p_resource, ret)) { - return ret; - } - - return false; -} - -Ref<Resource> EditorResourceConversionPlugin::convert(const Ref<Resource> &p_resource) const { - Ref<Resource> ret; - if (GDVIRTUAL_CALL(_convert, p_resource, ret)) { - return ret; - } - - return Ref<Resource>(); -} - -void CustomPropertyEditor::_notification(int p_what) { - switch (p_what) { - case NOTIFICATION_WM_CLOSE_REQUEST: { - hide(); - } break; - } -} - -void CustomPropertyEditor::_menu_option(int p_which) { - switch (type) { - case Variant::INT: { - if (hint == PROPERTY_HINT_FLAGS) { - int idx = menu->get_item_index(p_which); - uint32_t item_value = menu->get_item_metadata(idx); - uint32_t value = v; - // If the item wasn't previously checked it means it was pressed, - // otherwise it was unpressed. - if (!menu->is_item_checked(idx)) { - v = value | item_value; - } else { - v = value & ~item_value; - } - emit_signal(SNAME("variant_changed")); - } else if (hint == PROPERTY_HINT_ENUM) { - v = menu->get_item_metadata(p_which); - emit_signal(SNAME("variant_changed")); - } - } break; - case Variant::STRING: { - if (hint == PROPERTY_HINT_ENUM) { - v = hint_text.get_slice(",", p_which); - emit_signal(SNAME("variant_changed")); - } - } break; - case Variant::OBJECT: { - switch (p_which) { - case OBJ_MENU_LOAD: { - file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE); - String type = (hint == PROPERTY_HINT_RESOURCE_TYPE) ? hint_text : String(); - - List<String> extensions; - for (int i = 0; i < type.get_slice_count(","); i++) { - ResourceLoader::get_recognized_extensions_for_type(type.get_slice(",", i), &extensions); - } - - HashSet<String> valid_extensions; - for (const String &E : extensions) { - valid_extensions.insert(E); - } - - file->clear_filters(); - for (const String &E : valid_extensions) { - file->add_filter("*." + E, E.to_upper()); - } - - file->popup_file_dialog(); - } break; - - case OBJ_MENU_EDIT: { - Ref<RefCounted> r = v; - - if (!r.is_null()) { - emit_signal(SNAME("resource_edit_request")); - hide(); - } - } break; - case OBJ_MENU_CLEAR: { - v = Variant(); - emit_signal(SNAME("variant_changed")); - hide(); - } break; - - case OBJ_MENU_MAKE_UNIQUE: { - Ref<Resource> res_orig = v; - if (res_orig.is_null()) { - return; - } - - List<PropertyInfo> property_list; - res_orig->get_property_list(&property_list); - List<Pair<String, Variant>> propvalues; - - for (const PropertyInfo &pi : property_list) { - Pair<String, Variant> p; - if (pi.usage & PROPERTY_USAGE_STORAGE) { - p.first = pi.name; - p.second = res_orig->get(pi.name); - } - - propvalues.push_back(p); - } - - String orig_type = res_orig->get_class(); - - Object *inst = ClassDB::instantiate(orig_type); - - Ref<Resource> res = Ref<Resource>(Object::cast_to<Resource>(inst)); - - ERR_FAIL_COND(res.is_null()); - - for (const Pair<String, Variant> &p : propvalues) { - res->set(p.first, p.second); - } - - v = res; - emit_signal(SNAME("variant_changed")); - hide(); - } break; - - case OBJ_MENU_COPY: { - EditorSettings::get_singleton()->set_resource_clipboard(v); - - } break; - case OBJ_MENU_PASTE: { - v = EditorSettings::get_singleton()->get_resource_clipboard(); - emit_signal(SNAME("variant_changed")); - - } break; - case OBJ_MENU_NEW_SCRIPT: { - if (Object::cast_to<Node>(owner)) { - SceneTreeDock::get_singleton()->open_script_dialog(Object::cast_to<Node>(owner), false); - } - - } break; - case OBJ_MENU_EXTEND_SCRIPT: { - if (Object::cast_to<Node>(owner)) { - SceneTreeDock::get_singleton()->open_script_dialog(Object::cast_to<Node>(owner), true); - } - - } break; - case OBJ_MENU_SHOW_IN_FILE_SYSTEM: { - Ref<Resource> r = v; - FileSystemDock *file_system_dock = FileSystemDock::get_singleton(); - file_system_dock->navigate_to_path(r->get_path()); - // Ensure that the FileSystem dock is visible. - TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control(); - tab_container->set_current_tab(tab_container->get_tab_idx_from_control(file_system_dock)); - } break; - default: { - if (p_which >= CONVERT_BASE_ID) { - int to_type = p_which - CONVERT_BASE_ID; - - Vector<Ref<EditorResourceConversionPlugin>> conversions = EditorNode::get_singleton()->find_resource_conversion_plugin(Ref<Resource>(v)); - - ERR_FAIL_INDEX(to_type, conversions.size()); - - Ref<Resource> new_res = conversions[to_type]->convert(v); - - v = new_res; - emit_signal(SNAME("variant_changed")); - break; - } - ERR_FAIL_COND(inheritors_array.is_empty()); - - String intype = inheritors_array[p_which - TYPE_BASE_ID]; - - if (intype == "ViewportTexture") { - scene_tree->set_title(TTR("Pick a Viewport")); - scene_tree->popup_scenetree_dialog(); - picking_viewport = true; - return; - } - - Variant obj = ClassDB::instantiate(intype); - - if (!obj) { - if (ScriptServer::is_global_class(intype)) { - obj = EditorNode::get_editor_data().script_class_instance(intype); - } else { - obj = EditorNode::get_editor_data().instance_custom_type(intype, "Resource"); - } - } - - ERR_BREAK(!obj); - Resource *res = Object::cast_to<Resource>(obj); - ERR_BREAK(!res); - if (owner && hint == PROPERTY_HINT_RESOURCE_TYPE && hint_text == "Script") { - //make visual script the right type - res->call("set_instance_base_type", owner->get_class()); - } - - EditorNode::get_editor_data().instantiate_object_properties(obj); - v = obj; - - emit_signal(SNAME("variant_changed")); - - } break; - } - - } break; - default: { - } - } -} - -void CustomPropertyEditor::hide_menu() { - menu->hide(); -} - -Variant CustomPropertyEditor::get_variant() const { - return v; -} - -String CustomPropertyEditor::get_name() const { - return name; -} - -bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::Type p_type, const Variant &p_variant, int p_hint, String p_hint_text) { - owner = p_owner; - updating = true; - name = p_name; - v = p_variant; - field_names.clear(); - hint = p_hint; - hint_text = p_hint_text; - type_button->hide(); - if (color_picker) { - color_picker->hide(); - } - texture_preview->hide(); - inheritors_array.clear(); - text_edit->hide(); - easing_draw->hide(); - spinbox->hide(); - slider->hide(); - menu->clear(); - menu->reset_size(); - - for (int i = 0; i < MAX_VALUE_EDITORS; i++) { - if (i < MAX_VALUE_EDITORS / 4) { - value_hboxes[i]->hide(); - } - value_editor[i]->hide(); - value_label[i]->hide(); - if (i < 4) { - scroll[i]->hide(); - } - } - - for (int i = 0; i < MAX_ACTION_BUTTONS; i++) { - action_buttons[i]->hide(); - } - - checks20gc->hide(); - for (int i = 0; i < 20; i++) { - checks20[i]->hide(); - } - - type = (p_variant.get_type() != Variant::NIL && p_variant.get_type() != Variant::RID && p_type != Variant::OBJECT) ? p_variant.get_type() : p_type; - - switch (type) { - case Variant::BOOL: { - checks20gc->show(); - - CheckBox *c = checks20[0]; - c->set_text("True"); - checks20gc->set_position(Vector2(4, 4) * EDSCALE); - c->set_pressed(v); - c->show(); - - checks20gc->set_size(checks20gc->get_minimum_size()); - set_size(checks20gc->get_position() + checks20gc->get_size() + c->get_size() + Vector2(4, 4) * EDSCALE); - - } break; - case Variant::INT: - case Variant::FLOAT: { - if (hint == PROPERTY_HINT_RANGE) { - int c = hint_text.get_slice_count(","); - float min = 0, max = 100, step = type == Variant::FLOAT ? .01 : 1; - if (c >= 1) { - if (!hint_text.get_slice(",", 0).is_empty()) { - min = hint_text.get_slice(",", 0).to_float(); - } - } - if (c >= 2) { - if (!hint_text.get_slice(",", 1).is_empty()) { - max = hint_text.get_slice(",", 1).to_float(); - } - } - - if (c >= 3) { - if (!hint_text.get_slice(",", 2).is_empty()) { - step = hint_text.get_slice(",", 2).to_float(); - } - } - - if (c >= 4 && hint_text.get_slice(",", 3) == "slider") { - slider->set_min(min); - slider->set_max(max); - slider->set_step(step); - slider->set_value(v); - slider->show(); - set_size(Size2(110, 30) * EDSCALE); - } else { - spinbox->set_min(min); - spinbox->set_max(max); - spinbox->set_step(step); - spinbox->set_value(v); - spinbox->show(); - set_size(Size2(70, 35) * EDSCALE); - } - - } else if (hint == PROPERTY_HINT_ENUM) { - Vector<String> options = hint_text.split(","); - int current_val = 0; - for (int i = 0; i < options.size(); i++) { - Vector<String> text_split = options[i].split(":"); - if (text_split.size() != 1) { - current_val = text_split[1].to_int(); - } - menu->add_item(text_split[0]); - menu->set_item_metadata(i, current_val); - current_val += 1; - } - menu->set_position(get_position()); - menu->popup(); - hide(); - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || - hint == PROPERTY_HINT_LAYERS_2D_RENDER || - hint == PROPERTY_HINT_LAYERS_2D_NAVIGATION || - hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || - hint == PROPERTY_HINT_LAYERS_3D_RENDER || - hint == PROPERTY_HINT_LAYERS_3D_NAVIGATION) { - String basename; - switch (hint) { - case PROPERTY_HINT_LAYERS_2D_RENDER: - basename = "layer_names/2d_render"; - break; - case PROPERTY_HINT_LAYERS_2D_PHYSICS: - basename = "layer_names/2d_physics"; - break; - case PROPERTY_HINT_LAYERS_2D_NAVIGATION: - basename = "layer_names/2d_navigation"; - break; - case PROPERTY_HINT_LAYERS_3D_RENDER: - basename = "layer_names/3d_render"; - break; - case PROPERTY_HINT_LAYERS_3D_PHYSICS: - basename = "layer_names/3d_physics"; - break; - case PROPERTY_HINT_LAYERS_3D_NAVIGATION: - basename = "layer_names/3d_navigation"; - break; - } - - checks20gc->show(); - uint32_t flgs = v; - for (int i = 0; i < 2; i++) { - Point2 ofs(4, 4); - ofs.y += 22 * i; - for (int j = 0; j < 10; j++) { - int idx = i * 10 + j; - CheckBox *c = checks20[idx]; - c->set_text(ProjectSettings::get_singleton()->get(basename + "/layer_" + itos(idx + 1))); - c->set_pressed(flgs & (1 << (i * 10 + j))); - c->show(); - } - } - - show(); - - checks20gc->set_position(Vector2(4, 4) * EDSCALE); - checks20gc->set_size(checks20gc->get_minimum_size()); - - set_size(Vector2(4, 4) * EDSCALE + checks20gc->get_position() + checks20gc->get_size()); - - } else if (hint == PROPERTY_HINT_EXP_EASING) { - easing_draw->set_anchor_and_offset(SIDE_LEFT, Control::ANCHOR_BEGIN, 5 * EDSCALE); - easing_draw->set_anchor_and_offset(SIDE_RIGHT, Control::ANCHOR_END, -5 * EDSCALE); - easing_draw->set_anchor_and_offset(SIDE_TOP, Control::ANCHOR_BEGIN, 5 * EDSCALE); - easing_draw->set_anchor_and_offset(SIDE_BOTTOM, Control::ANCHOR_END, -30 * EDSCALE); - type_button->set_anchor_and_offset(SIDE_LEFT, Control::ANCHOR_BEGIN, 3 * EDSCALE); - type_button->set_anchor_and_offset(SIDE_RIGHT, Control::ANCHOR_END, -3 * EDSCALE); - type_button->set_anchor_and_offset(SIDE_TOP, Control::ANCHOR_END, -25 * EDSCALE); - type_button->set_anchor_and_offset(SIDE_BOTTOM, Control::ANCHOR_END, -7 * EDSCALE); - type_button->set_text(TTR("Preset...")); - type_button->get_popup()->clear(); - type_button->get_popup()->add_item(TTR("Linear"), EASING_LINEAR); - type_button->get_popup()->add_item(TTR("Ease In"), EASING_EASE_IN); - type_button->get_popup()->add_item(TTR("Ease Out"), EASING_EASE_OUT); - if (hint_text != "attenuation") { - type_button->get_popup()->add_item(TTR("Zero"), EASING_ZERO); - type_button->get_popup()->add_item(TTR("Easing In-Out"), EASING_IN_OUT); - type_button->get_popup()->add_item(TTR("Easing Out-In"), EASING_OUT_IN); - } - - type_button->show(); - easing_draw->show(); - set_size(Size2(200, 150) * EDSCALE); - } else if (hint == PROPERTY_HINT_FLAGS) { - Vector<String> flags = hint_text.split(","); - uint32_t value = v; - for (int i = 0; i < flags.size(); i++) { - uint32_t current_val; - Vector<String> text_split = flags[i].split(":"); - if (text_split.size() != 1) { - current_val = text_split[1].to_int(); - } else { - current_val = 1 << i; - } - menu->add_check_item(text_split[0], current_val); - menu->set_item_metadata(i, current_val); - if ((value & current_val) == current_val) { - menu->set_item_checked(menu->get_item_index(current_val), true); - } - } - menu->set_position(get_position()); - menu->popup(); - hide(); - updating = false; - return false; - - } else { - List<String> names; - names.push_back("value:"); - config_value_editors(1, 1, 50, names); - value_editor[0]->set_text(TS->format_number(String::num(v))); - } - - } break; - case Variant::STRING: { - if (hint == PROPERTY_HINT_LOCALE_ID) { - List<String> names; - names.push_back(TTR("Locale...")); - names.push_back(TTR("Clear")); - config_action_buttons(names); - } else if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_GLOBAL_FILE) { - List<String> names; - names.push_back(TTR("File...")); - names.push_back(TTR("Clear")); - config_action_buttons(names); - } else if (hint == PROPERTY_HINT_DIR || hint == PROPERTY_HINT_GLOBAL_DIR) { - List<String> names; - names.push_back(TTR("Dir...")); - names.push_back(TTR("Clear")); - config_action_buttons(names); - } else if (hint == PROPERTY_HINT_ENUM) { - Vector<String> options = hint_text.split(","); - for (int i = 0; i < options.size(); i++) { - menu->add_item(options[i], i); - } - menu->set_position(get_position()); - menu->popup(); - hide(); - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_MULTILINE_TEXT) { - text_edit->show(); - text_edit->set_text(v); - text_edit->deselect(); - - int button_margin = text_edit->get_theme_constant(SNAME("button_margin"), SNAME("Dialogs")); - int margin = text_edit->get_theme_constant(SNAME("margin"), SNAME("Dialogs")); - - action_buttons[0]->set_anchor(SIDE_LEFT, Control::ANCHOR_END); - action_buttons[0]->set_anchor(SIDE_TOP, Control::ANCHOR_END); - action_buttons[0]->set_anchor(SIDE_RIGHT, Control::ANCHOR_END); - action_buttons[0]->set_anchor(SIDE_BOTTOM, Control::ANCHOR_END); - action_buttons[0]->set_begin(Point2(-70 * EDSCALE, -button_margin + 5 * EDSCALE)); - action_buttons[0]->set_end(Point2(-margin, -margin)); - action_buttons[0]->set_text(TTR("Close")); - action_buttons[0]->show(); - - } else if (hint == PROPERTY_HINT_TYPE_STRING) { - if (!create_dialog) { - create_dialog = memnew(CreateDialog); - create_dialog->connect("create", callable_mp(this, &CustomPropertyEditor::_create_dialog_callback)); - add_child(create_dialog); - } - - if (!hint_text.is_empty()) { - create_dialog->set_base_type(hint_text); - } else { - create_dialog->set_base_type("Object"); - } - - create_dialog->popup_create(false); - hide(); - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_METHOD_OF_VARIANT_TYPE) { -#define MAKE_PROPSELECT \ - if (!property_select) { \ - property_select = memnew(PropertySelector); \ - property_select->connect("selected", callable_mp(this, &CustomPropertyEditor::_create_selected_property)); \ - add_child(property_select); \ - } \ - hide(); - - MAKE_PROPSELECT; - - Variant::Type type = Variant::NIL; - for (int i = 0; i < Variant::VARIANT_MAX; i++) { - if (hint_text == Variant::get_type_name(Variant::Type(i))) { - type = Variant::Type(i); - } - } - if (type != Variant::NIL) { - property_select->select_method_from_basic_type(type, v); - } - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_METHOD_OF_BASE_TYPE) { - MAKE_PROPSELECT - - property_select->select_method_from_base_type(hint_text, v); - - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_METHOD_OF_INSTANCE) { - MAKE_PROPSELECT - - Object *instance = ObjectDB::get_instance(ObjectID(hint_text.to_int())); - if (instance) { - property_select->select_method_from_instance(instance, v); - } - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_METHOD_OF_SCRIPT) { - MAKE_PROPSELECT - - Object *obj = ObjectDB::get_instance(ObjectID(hint_text.to_int())); - if (Object::cast_to<Script>(obj)) { - property_select->select_method_from_script(Object::cast_to<Script>(obj), v); - } - - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE) { - MAKE_PROPSELECT - Variant::Type type = Variant::NIL; - String tname = hint_text; - if (tname.contains(".")) { - tname = tname.get_slice(".", 0); - } - for (int i = 0; i < Variant::VARIANT_MAX; i++) { - if (tname == Variant::get_type_name(Variant::Type(i))) { - type = Variant::Type(Variant::Type(i)); - } - } - - if (type != Variant::NIL) { - property_select->select_property_from_basic_type(type, v); - } - - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_PROPERTY_OF_BASE_TYPE) { - MAKE_PROPSELECT - - property_select->select_property_from_base_type(hint_text, v); - - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_PROPERTY_OF_INSTANCE) { - MAKE_PROPSELECT - - Object *instance = ObjectDB::get_instance(ObjectID(hint_text.to_int())); - if (instance) { - property_select->select_property_from_instance(instance, v); - } - - updating = false; - return false; - - } else if (hint == PROPERTY_HINT_PROPERTY_OF_SCRIPT) { - MAKE_PROPSELECT - - Object *obj = ObjectDB::get_instance(ObjectID(hint_text.to_int())); - if (Object::cast_to<Script>(obj)) { - property_select->select_property_from_script(Object::cast_to<Script>(obj), v); - } - - updating = false; - return false; - - } else { - List<String> names; - names.push_back("string:"); - config_value_editors(1, 1, 50, names); - value_editor[0]->set_text(v); - } - - } break; - case Variant::VECTOR2: { - field_names.push_back("x"); - field_names.push_back("y"); - config_value_editors(2, 2, 10, field_names); - Vector2 vec = v; - value_editor[0]->set_text(String::num(vec.x)); - value_editor[1]->set_text(String::num(vec.y)); - } break; - case Variant::RECT2: { - field_names.push_back("x"); - field_names.push_back("y"); - field_names.push_back("w"); - field_names.push_back("h"); - config_value_editors(4, 4, 10, field_names); - Rect2 r = v; - value_editor[0]->set_text(String::num(r.position.x)); - value_editor[1]->set_text(String::num(r.position.y)); - value_editor[2]->set_text(String::num(r.size.x)); - value_editor[3]->set_text(String::num(r.size.y)); - } break; - case Variant::VECTOR3: { - field_names.push_back("x"); - field_names.push_back("y"); - field_names.push_back("z"); - config_value_editors(3, 3, 10, field_names); - Vector3 vec = v; - value_editor[0]->set_text(String::num(vec.x)); - value_editor[1]->set_text(String::num(vec.y)); - value_editor[2]->set_text(String::num(vec.z)); - } break; - case Variant::PLANE: { - field_names.push_back("x"); - field_names.push_back("y"); - field_names.push_back("z"); - field_names.push_back("d"); - config_value_editors(4, 4, 10, field_names); - Plane plane = v; - value_editor[0]->set_text(String::num(plane.normal.x)); - value_editor[1]->set_text(String::num(plane.normal.y)); - value_editor[2]->set_text(String::num(plane.normal.z)); - value_editor[3]->set_text(String::num(plane.d)); - - } break; - case Variant::QUATERNION: { - field_names.push_back("x"); - field_names.push_back("y"); - field_names.push_back("z"); - field_names.push_back("w"); - config_value_editors(4, 4, 10, field_names); - Quaternion q = v; - value_editor[0]->set_text(String::num(q.x)); - value_editor[1]->set_text(String::num(q.y)); - value_editor[2]->set_text(String::num(q.z)); - value_editor[3]->set_text(String::num(q.w)); - - } break; - case Variant::AABB: { - field_names.push_back("px"); - field_names.push_back("py"); - field_names.push_back("pz"); - field_names.push_back("sx"); - field_names.push_back("sy"); - field_names.push_back("sz"); - config_value_editors(6, 3, 16, field_names); - - AABB aabb = v; - value_editor[0]->set_text(String::num(aabb.position.x)); - value_editor[1]->set_text(String::num(aabb.position.y)); - value_editor[2]->set_text(String::num(aabb.position.z)); - value_editor[3]->set_text(String::num(aabb.size.x)); - value_editor[4]->set_text(String::num(aabb.size.y)); - value_editor[5]->set_text(String::num(aabb.size.z)); - - } break; - case Variant::TRANSFORM2D: { - field_names.push_back("xx"); - field_names.push_back("xy"); - field_names.push_back("yx"); - field_names.push_back("yy"); - field_names.push_back("ox"); - field_names.push_back("oy"); - config_value_editors(6, 2, 16, field_names); - - Transform2D basis = v; - for (int i = 0; i < 6; i++) { - value_editor[i]->set_text(String::num(basis.columns[i / 2][i % 2])); - } - - } break; - case Variant::BASIS: { - field_names.push_back("xx"); - field_names.push_back("xy"); - field_names.push_back("xz"); - field_names.push_back("yx"); - field_names.push_back("yy"); - field_names.push_back("yz"); - field_names.push_back("zx"); - field_names.push_back("zy"); - field_names.push_back("zz"); - config_value_editors(9, 3, 16, field_names); - - Basis basis = v; - for (int i = 0; i < 9; i++) { - value_editor[i]->set_text(String::num(basis.rows[i / 3][i % 3])); - } - - } break; - case Variant::TRANSFORM3D: { - field_names.push_back("xx"); - field_names.push_back("xy"); - field_names.push_back("xz"); - field_names.push_back("xo"); - field_names.push_back("yx"); - field_names.push_back("yy"); - field_names.push_back("yz"); - field_names.push_back("yo"); - field_names.push_back("zx"); - field_names.push_back("zy"); - field_names.push_back("zz"); - field_names.push_back("zo"); - config_value_editors(12, 4, 16, field_names); - - Transform3D tr = v; - for (int i = 0; i < 9; i++) { - value_editor[(i / 3) * 4 + i % 3]->set_text(String::num(tr.basis.rows[i / 3][i % 3])); - } - - value_editor[3]->set_text(String::num(tr.origin.x)); - value_editor[7]->set_text(String::num(tr.origin.y)); - value_editor[11]->set_text(String::num(tr.origin.z)); - - } break; - case Variant::COLOR: { - if (!color_picker) { - //late init for performance - color_picker = memnew(ColorPicker); - color_picker->set_deferred_mode(true); - value_vbox->add_child(color_picker); - color_picker->hide(); - color_picker->connect("color_changed", callable_mp(this, &CustomPropertyEditor::_color_changed)); - color_picker->connect("show", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(color_picker)); - } - - color_picker->show(); - color_picker->set_edit_alpha(hint != PROPERTY_HINT_COLOR_NO_ALPHA); - color_picker->set_pick_color(v); - color_picker->set_focus_on_line_edit(); - - } break; - - case Variant::NODE_PATH: { - List<String> names; - names.push_back(TTR("Assign")); - names.push_back(TTR("Clear")); - - if (owner && owner->is_class("Node") && (v.get_type() == Variant::NODE_PATH) && Object::cast_to<Node>(owner)->has_node(v)) { - names.push_back(TTR("Select Node")); - } - - config_action_buttons(names); - - } break; - case Variant::OBJECT: { - if (hint != PROPERTY_HINT_RESOURCE_TYPE) { - break; - } - - if (p_name == "script" && hint_text == "Script" && Object::cast_to<Node>(owner)) { - menu->add_item(TTR("New Script"), OBJ_MENU_NEW_SCRIPT); - menu->add_separator(); - } else if (!hint_text.is_empty()) { - int idx = 0; - - Vector<EditorData::CustomType> custom_resources; - - if (EditorNode::get_editor_data().get_custom_types().has("Resource")) { - custom_resources = EditorNode::get_editor_data().get_custom_types()["Resource"]; - } - - for (int i = 0; i < hint_text.get_slice_count(","); i++) { - String base = hint_text.get_slice(",", i); - - HashSet<String> valid_inheritors; - valid_inheritors.insert(base); - List<StringName> inheritors; - ClassDB::get_inheriters_from_class(base.strip_edges(), &inheritors); - - for (int j = 0; j < custom_resources.size(); j++) { - inheritors.push_back(custom_resources[j].name); - } - - List<StringName>::Element *E = inheritors.front(); - while (E) { - valid_inheritors.insert(E->get()); - E = E->next(); - } - - for (const String &j : valid_inheritors) { - const String &t = j; - - bool is_custom_resource = false; - Ref<Texture2D> icon; - if (!custom_resources.is_empty()) { - for (int k = 0; k < custom_resources.size(); k++) { - if (custom_resources[k].name == t) { - is_custom_resource = true; - if (custom_resources[k].icon.is_valid()) { - icon = custom_resources[k].icon; - } - break; - } - } - } - - if (!is_custom_resource && (!ClassDB::can_instantiate(t) || ClassDB::is_virtual(t))) { - continue; - } - - inheritors_array.push_back(t); - - int id = TYPE_BASE_ID + idx; - - menu->add_item(vformat(TTR("New %s"), t), id); - - idx++; - } - } - - if (menu->get_item_count()) { - menu->add_separator(); - } - } - - menu->add_item(TTR("Load"), OBJ_MENU_LOAD); - - if (!Ref<Resource>(v).is_null()) { - menu->add_item(TTR("Edit"), OBJ_MENU_EDIT); - menu->add_item(TTR("Clear"), OBJ_MENU_CLEAR); - menu->add_item(TTR("Make Unique"), OBJ_MENU_MAKE_UNIQUE); - - Ref<Resource> r = v; - if (r.is_valid() && r->get_path().is_resource_file()) { - menu->add_separator(); - menu->add_item(TTR("Show in FileSystem"), OBJ_MENU_SHOW_IN_FILE_SYSTEM); - } - } - - Ref<Resource> cb = EditorSettings::get_singleton()->get_resource_clipboard(); - bool paste_valid = false; - if (cb.is_valid()) { - if (hint_text.is_empty()) { - paste_valid = true; - } else { - for (int i = 0; i < hint_text.get_slice_count(","); i++) { - if (ClassDB::is_parent_class(cb->get_class(), hint_text.get_slice(",", i))) { - paste_valid = true; - break; - } - } - } - } - - if (!Ref<Resource>(v).is_null() || paste_valid) { - menu->add_separator(); - - if (!Ref<Resource>(v).is_null()) { - menu->add_item(TTR("Copy"), OBJ_MENU_COPY); - } - - if (paste_valid) { - menu->add_item(TTR("Paste"), OBJ_MENU_PASTE); - } - } - - if (!Ref<Resource>(v).is_null()) { - Vector<Ref<EditorResourceConversionPlugin>> conversions = EditorNode::get_singleton()->find_resource_conversion_plugin(Ref<Resource>(v)); - if (conversions.size()) { - menu->add_separator(); - } - for (int i = 0; i < conversions.size(); i++) { - String what = conversions[i]->converts_to(); - menu->add_item(vformat(TTR("Convert to %s"), what), CONVERT_BASE_ID + i); - } - } - - menu->set_position(get_position()); - menu->popup(); - hide(); - updating = false; - return false; - } break; - case Variant::DICTIONARY: { - } break; - case Variant::PACKED_BYTE_ARRAY: { - } break; - case Variant::PACKED_INT32_ARRAY: { - } break; - case Variant::PACKED_FLOAT32_ARRAY: { - } break; - case Variant::PACKED_INT64_ARRAY: { - } break; - case Variant::PACKED_FLOAT64_ARRAY: { - } break; - case Variant::PACKED_STRING_ARRAY: { - } break; - case Variant::PACKED_VECTOR3_ARRAY: { - } break; - case Variant::PACKED_COLOR_ARRAY: { - } break; - default: { - } - } - - updating = false; - return true; -} - -void CustomPropertyEditor::_file_selected(String p_file) { - switch (type) { - case Variant::STRING: { - if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_DIR) { - v = ProjectSettings::get_singleton()->localize_path(p_file); - emit_signal(SNAME("variant_changed")); - hide(); - } - - if (hint == PROPERTY_HINT_GLOBAL_FILE || hint == PROPERTY_HINT_GLOBAL_DIR) { - v = p_file; - emit_signal(SNAME("variant_changed")); - hide(); - } - - } break; - case Variant::OBJECT: { - String type = (hint == PROPERTY_HINT_RESOURCE_TYPE) ? hint_text : String(); - - Ref<Resource> res = ResourceLoader::load(p_file, type); - if (res.is_null()) { - error->set_text(TTR("Error loading file: Not a resource!")); - error->popup_centered(); - break; - } - v = res; - emit_signal(SNAME("variant_changed")); - hide(); - } break; - default: { - } - } -} - -void CustomPropertyEditor::_locale_selected(String p_locale) { - if (type == Variant::STRING && hint == PROPERTY_HINT_LOCALE_ID) { - v = p_locale; - emit_signal(SNAME("variant_changed")); - hide(); - } -} - -void CustomPropertyEditor::_type_create_selected(int p_idx) { - if (type == Variant::INT || type == Variant::FLOAT) { - float newval = 0; - switch (p_idx) { - case EASING_LINEAR: { - newval = 1; - } break; - case EASING_EASE_IN: { - newval = 2.0; - } break; - case EASING_EASE_OUT: { - newval = 0.5; - } break; - case EASING_ZERO: { - newval = 0; - } break; - case EASING_IN_OUT: { - newval = -0.5; - } break; - case EASING_OUT_IN: { - newval = -2.0; - } break; - } - - v = newval; - emit_signal(SNAME("variant_changed")); - easing_draw->update(); - - } else if (type == Variant::OBJECT) { - ERR_FAIL_INDEX(p_idx, inheritors_array.size()); - - String intype = inheritors_array[p_idx]; - - Variant obj = ClassDB::instantiate(intype); - - if (!obj) { - if (ScriptServer::is_global_class(intype)) { - obj = EditorNode::get_editor_data().script_class_instance(intype); - } else { - obj = EditorNode::get_editor_data().instance_custom_type(intype, "Resource"); - } - } - - ERR_FAIL_COND(!obj); - ERR_FAIL_COND(!Object::cast_to<Resource>(obj)); - - EditorNode::get_editor_data().instantiate_object_properties(obj); - v = obj; - - emit_signal(SNAME("variant_changed")); - hide(); - } -} - -void CustomPropertyEditor::_color_changed(const Color &p_color) { - v = p_color; - emit_signal(SNAME("variant_changed")); -} - -void CustomPropertyEditor::_node_path_selected(NodePath p_path) { - if (picking_viewport) { - Node *to_node = get_node(p_path); - if (!Object::cast_to<Viewport>(to_node)) { - EditorNode::get_singleton()->show_warning(TTR("Selected node is not a Viewport!")); - return; - } - - Ref<ViewportTexture> vt; - vt.instantiate(); - vt->set_viewport_path_in_scene(get_tree()->get_edited_scene_root()->get_path_to(to_node)); - vt->setup_local_to_scene(); - v = vt; - emit_signal(SNAME("variant_changed")); - return; - } - - if (hint == PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE && !hint_text.is_empty()) { - Node *node = get_node(hint_text); - if (node) { - Node *tonode = node->get_node(p_path); - if (tonode) { - p_path = node->get_path_to(tonode); - } - } - - } else if (owner) { - Node *node = nullptr; - - if (owner->is_class("Node")) { - node = Object::cast_to<Node>(owner); - } else if (owner->is_class("ArrayPropertyEdit")) { - node = Object::cast_to<ArrayPropertyEdit>(owner)->get_node(); - } else if (owner->is_class("DictionaryPropertyEdit")) { - node = Object::cast_to<DictionaryPropertyEdit>(owner)->get_node(); - } - if (!node) { - v = p_path; - emit_signal(SNAME("variant_changed")); - call_deferred(SNAME("hide")); //to not mess with dialogs - return; - } - - Node *tonode = node->get_node(p_path); - if (tonode) { - p_path = node->get_path_to(tonode); - } - } - - v = p_path; - emit_signal(SNAME("variant_changed")); - call_deferred(SNAME("hide")); //to not mess with dialogs -} - -void CustomPropertyEditor::_action_pressed(int p_which) { - if (updating) { - return; - } - - switch (type) { - case Variant::BOOL: { - v = checks20[0]->is_pressed(); - emit_signal(SNAME("variant_changed")); - } break; - case Variant::INT: { - if (hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || - hint == PROPERTY_HINT_LAYERS_2D_RENDER || - hint == PROPERTY_HINT_LAYERS_2D_NAVIGATION || - hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || - hint == PROPERTY_HINT_LAYERS_3D_RENDER || - hint == PROPERTY_HINT_LAYERS_3D_NAVIGATION) { - uint32_t f = v; - if (checks20[p_which]->is_pressed()) { - f |= (1 << p_which); - } else { - f &= ~(1 << p_which); - } - - v = f; - emit_signal(SNAME("variant_changed")); - } - - } break; - case Variant::STRING: { - if (hint == PROPERTY_HINT_MULTILINE_TEXT) { - hide(); - } else if (hint == PROPERTY_HINT_LOCALE_ID) { - locale->popup_locale_dialog(); - } else if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_GLOBAL_FILE) { - if (p_which == 0) { - if (hint == PROPERTY_HINT_FILE) { - file->set_access(EditorFileDialog::ACCESS_RESOURCES); - } else { - file->set_access(EditorFileDialog::ACCESS_FILESYSTEM); - } - - file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE); - file->clear_filters(); - - file->clear_filters(); - - if (!hint_text.is_empty()) { - Vector<String> extensions = hint_text.split(","); - for (int i = 0; i < extensions.size(); i++) { - String filter = extensions[i]; - if (filter.begins_with(".")) { - filter = "*" + extensions[i]; - } else if (!filter.begins_with("*")) { - filter = "*." + extensions[i]; - } - - file->add_filter(filter, extensions[i].to_upper()); - } - } - file->popup_file_dialog(); - } else { - v = ""; - emit_signal(SNAME("variant_changed")); - hide(); - } - - } else if (hint == PROPERTY_HINT_DIR || hint == PROPERTY_HINT_GLOBAL_DIR) { - if (p_which == 0) { - if (hint == PROPERTY_HINT_DIR) { - file->set_access(EditorFileDialog::ACCESS_RESOURCES); - } else { - file->set_access(EditorFileDialog::ACCESS_FILESYSTEM); - } - file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_DIR); - file->clear_filters(); - file->popup_file_dialog(); - } else { - v = ""; - emit_signal(SNAME("variant_changed")); - hide(); - } - } - - } break; - case Variant::NODE_PATH: { - if (p_which == 0) { - picking_viewport = false; - scene_tree->set_title(TTR("Pick a Node")); - scene_tree->popup_scenetree_dialog(); - - } else if (p_which == 1) { - v = NodePath(); - emit_signal(SNAME("variant_changed")); - hide(); - } else if (p_which == 2) { - if (owner->is_class("Node") && (v.get_type() == Variant::NODE_PATH) && Object::cast_to<Node>(owner)->has_node(v)) { - Node *target_node = Object::cast_to<Node>(owner)->get_node(v); - EditorNode::get_singleton()->get_editor_selection()->clear(); - SceneTreeDock::get_singleton()->set_selected(target_node); - } - - hide(); - } - - } break; - case Variant::OBJECT: { - if (p_which == 0) { - ERR_FAIL_COND(inheritors_array.is_empty()); - - String intype = inheritors_array[0]; - - if (hint == PROPERTY_HINT_RESOURCE_TYPE) { - Variant obj = ClassDB::instantiate(intype); - - if (!obj) { - if (ScriptServer::is_global_class(intype)) { - obj = EditorNode::get_editor_data().script_class_instance(intype); - } else { - obj = EditorNode::get_editor_data().instance_custom_type(intype, "Resource"); - } - } - - ERR_BREAK(!obj); - ERR_BREAK(!Object::cast_to<Resource>(obj)); - - EditorNode::get_editor_data().instantiate_object_properties(obj); - v = obj; - - emit_signal(SNAME("variant_changed")); - hide(); - } - } else if (p_which == 1) { - file->set_access(EditorFileDialog::ACCESS_RESOURCES); - file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE); - List<String> extensions; - String type = (hint == PROPERTY_HINT_RESOURCE_TYPE) ? hint_text : String(); - - ResourceLoader::get_recognized_extensions_for_type(type, &extensions); - file->clear_filters(); - for (const String &E : extensions) { - file->add_filter("*." + E, E.to_upper()); - } - - file->popup_file_dialog(); - - } else if (p_which == 2) { - Ref<Resource> r = v; - - if (!r.is_null()) { - emit_signal(SNAME("resource_edit_request")); - hide(); - } - - } else if (p_which == 3) { - v = Variant(); - emit_signal(SNAME("variant_changed")); - hide(); - } else if (p_which == 4) { - Ref<Resource> res_orig = v; - if (res_orig.is_null()) { - return; - } - - List<PropertyInfo> property_list; - res_orig->get_property_list(&property_list); - List<Pair<String, Variant>> propvalues; - - for (const PropertyInfo &pi : property_list) { - Pair<String, Variant> p; - if (pi.usage & PROPERTY_USAGE_STORAGE) { - p.first = pi.name; - p.second = res_orig->get(pi.name); - } - - propvalues.push_back(p); - } - - Ref<Resource> res = Ref<Resource>(ClassDB::instantiate(res_orig->get_class())); - - ERR_FAIL_COND(res.is_null()); - - for (const Pair<String, Variant> &p : propvalues) { - res->set(p.first, p.second); - } - - v = res; - emit_signal(SNAME("variant_changed")); - hide(); - } - - } break; - - default: { - }; - } -} - -void CustomPropertyEditor::_drag_easing(const Ref<InputEvent> &p_ev) { - Ref<InputEventMouseMotion> mm = p_ev; - - if (mm.is_valid() && (mm->get_button_mask() & MouseButton::MASK_LEFT) != MouseButton::NONE) { - float rel = mm->get_relative().x; - if (rel == 0) { - return; - } - - bool flip = hint_text == "attenuation"; - - if (flip) { - rel = -rel; - } - - float val = v; - if (val == 0) { - return; - } - bool sg = val < 0; - val = Math::absf(val); - - val = Math::log(val) / Math::log((float)2.0); - //logspace - val += rel * 0.05; - - val = Math::pow(2.0f, val); - if (sg) { - val = -val; - } - - v = val; - easing_draw->update(); - emit_signal(SNAME("variant_changed")); - } -} - -void CustomPropertyEditor::_draw_easing() { - RID ci = easing_draw->get_canvas_item(); - - Size2 s = easing_draw->get_size(); - Rect2 r(Point2(), s); - r = r.grow(3); - easing_draw->get_theme_stylebox(SNAME("normal"), SNAME("LineEdit"))->draw(ci, r); - - int points = 48; - - float prev = 1.0; - float exp = v; - bool flip = hint_text == "attenuation"; - - Ref<Font> f = easing_draw->get_theme_font(SNAME("font"), SNAME("Label")); - int font_size = easing_draw->get_theme_font_size(SNAME("font_size"), SNAME("Label")); - Color color = easing_draw->get_theme_color(SNAME("font_color"), SNAME("Label")); - - for (int i = 1; i <= points; i++) { - float ifl = i / float(points); - float iflp = (i - 1) / float(points); - - float h = 1.0 - Math::ease(ifl, exp); - - if (flip) { - ifl = 1.0 - ifl; - iflp = 1.0 - iflp; - } - - RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(iflp * s.width, prev * s.height), Point2(ifl * s.width, h * s.height), color); - prev = h; - } - - f->draw_string(ci, Point2(10, 10 + f->get_ascent(font_size)), String::num(exp, 2), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, color); -} - -void CustomPropertyEditor::_text_edit_changed() { - v = text_edit->get_text(); - emit_signal(SNAME("variant_changed")); -} - -void CustomPropertyEditor::_create_dialog_callback() { - v = create_dialog->get_selected_type(); - emit_signal(SNAME("variant_changed")); -} - -void CustomPropertyEditor::_create_selected_property(const String &p_prop) { - v = p_prop; - emit_signal(SNAME("variant_changed")); -} - -void CustomPropertyEditor::_modified(String p_string) { - if (updating) { - return; - } - - Variant prev_v = v; - - updating = true; - switch (type) { - case Variant::INT: { - String text = TS->parse_number(value_editor[0]->get_text()); - Ref<Expression> expr; - expr.instantiate(); - Error err = expr->parse(text); - if (err != OK) { - v = value_editor[0]->get_text().to_int(); - return; - } else { - v = expr->execute(Array(), nullptr, false, false); - } - - if (v != prev_v) { - emit_signal(SNAME("variant_changed")); - } - } break; - case Variant::FLOAT: { - if (hint != PROPERTY_HINT_EXP_EASING) { - String text = TS->parse_number(value_editor[0]->get_text()); - v = _parse_real_expression(text); - if (v != prev_v) { - emit_signal(SNAME("variant_changed")); - } - } - - } break; - case Variant::STRING: { - v = value_editor[0]->get_text(); - emit_signal(SNAME("variant_changed")); - } break; - case Variant::VECTOR2: { - Vector2 vec; - vec.x = _parse_real_expression(value_editor[0]->get_text()); - vec.y = _parse_real_expression(value_editor[1]->get_text()); - v = vec; - if (v != prev_v) { - _emit_changed_whole_or_field(); - } - - } break; - case Variant::RECT2: { - Rect2 r2; - - r2.position.x = _parse_real_expression(value_editor[0]->get_text()); - r2.position.y = _parse_real_expression(value_editor[1]->get_text()); - r2.size.x = _parse_real_expression(value_editor[2]->get_text()); - r2.size.y = _parse_real_expression(value_editor[3]->get_text()); - v = r2; - if (v != prev_v) { - _emit_changed_whole_or_field(); - } - - } break; - - case Variant::VECTOR3: { - Vector3 vec; - vec.x = _parse_real_expression(value_editor[0]->get_text()); - vec.y = _parse_real_expression(value_editor[1]->get_text()); - vec.z = _parse_real_expression(value_editor[2]->get_text()); - v = vec; - if (v != prev_v) { - _emit_changed_whole_or_field(); - } - - } break; - case Variant::PLANE: { - Plane pl; - pl.normal.x = _parse_real_expression(value_editor[0]->get_text()); - pl.normal.y = _parse_real_expression(value_editor[1]->get_text()); - pl.normal.z = _parse_real_expression(value_editor[2]->get_text()); - pl.d = _parse_real_expression(value_editor[3]->get_text()); - v = pl; - if (v != prev_v) { - _emit_changed_whole_or_field(); - } - - } break; - case Variant::QUATERNION: { - Quaternion q; - q.x = _parse_real_expression(value_editor[0]->get_text()); - q.y = _parse_real_expression(value_editor[1]->get_text()); - q.z = _parse_real_expression(value_editor[2]->get_text()); - q.w = _parse_real_expression(value_editor[3]->get_text()); - v = q; - if (v != prev_v) { - _emit_changed_whole_or_field(); - } - - } break; - case Variant::AABB: { - Vector3 pos; - Vector3 size; - - pos.x = _parse_real_expression(value_editor[0]->get_text()); - pos.y = _parse_real_expression(value_editor[1]->get_text()); - pos.z = _parse_real_expression(value_editor[2]->get_text()); - size.x = _parse_real_expression(value_editor[3]->get_text()); - size.y = _parse_real_expression(value_editor[4]->get_text()); - size.z = _parse_real_expression(value_editor[5]->get_text()); - v = AABB(pos, size); - if (v != prev_v) { - _emit_changed_whole_or_field(); - } - - } break; - case Variant::TRANSFORM2D: { - Transform2D m; - for (int i = 0; i < 6; i++) { - m.columns[i / 2][i % 2] = _parse_real_expression(value_editor[i]->get_text()); - } - - v = m; - if (v != prev_v) { - _emit_changed_whole_or_field(); - } - - } break; - case Variant::BASIS: { - Basis m; - for (int i = 0; i < 9; i++) { - m.rows[i / 3][i % 3] = _parse_real_expression(value_editor[i]->get_text()); - } - - v = m; - if (v != prev_v) { - _emit_changed_whole_or_field(); - } - - } break; - case Variant::TRANSFORM3D: { - Basis basis; - for (int i = 0; i < 9; i++) { - basis.rows[i / 3][i % 3] = _parse_real_expression(value_editor[(i / 3) * 4 + i % 3]->get_text()); - } - - Vector3 origin; - - origin.x = _parse_real_expression(value_editor[3]->get_text()); - origin.y = _parse_real_expression(value_editor[7]->get_text()); - origin.z = _parse_real_expression(value_editor[11]->get_text()); - - v = Transform3D(basis, origin); - if (v != prev_v) { - _emit_changed_whole_or_field(); - } - - } break; - case Variant::COLOR: { - } break; - - case Variant::NODE_PATH: { - v = NodePath(value_editor[0]->get_text()); - if (v != prev_v) { - emit_signal(SNAME("variant_changed")); - } - } break; - case Variant::DICTIONARY: { - } break; - case Variant::PACKED_BYTE_ARRAY: { - } break; - case Variant::PACKED_INT32_ARRAY: { - } break; - case Variant::PACKED_FLOAT32_ARRAY: { - } break; - case Variant::PACKED_STRING_ARRAY: { - } break; - case Variant::PACKED_VECTOR3_ARRAY: { - } break; - case Variant::PACKED_COLOR_ARRAY: { - } break; - default: { - } - } - - updating = false; -} - -real_t CustomPropertyEditor::_parse_real_expression(String text) { - Ref<Expression> expr; - expr.instantiate(); - Error err = expr->parse(text); - real_t out; - if (err != OK) { - out = value_editor[0]->get_text().to_float(); - } else { - out = expr->execute(Array(), nullptr, false, true); - } - return out; -} - -void CustomPropertyEditor::_emit_changed_whole_or_field() { - if (!Input::get_singleton()->is_key_pressed(Key::SHIFT)) { - emit_signal(SNAME("variant_changed")); - } else { - emit_signal(SNAME("variant_field_changed"), field_names[focused_value_editor]); - } -} - -void CustomPropertyEditor::_range_modified(double p_value) { - v = p_value; - emit_signal(SNAME("variant_changed")); -} - -void CustomPropertyEditor::_focus_enter() { - switch (type) { - case Variant::FLOAT: - case Variant::STRING: - case Variant::VECTOR2: - case Variant::RECT2: - case Variant::VECTOR3: - case Variant::PLANE: - case Variant::QUATERNION: - case Variant::AABB: - case Variant::TRANSFORM2D: - case Variant::BASIS: - case Variant::TRANSFORM3D: { - for (int i = 0; i < MAX_VALUE_EDITORS; ++i) { - if (value_editor[i]->has_focus()) { - focused_value_editor = i; - value_editor[i]->select_all(); - break; - } - } - } break; - default: { - } - } -} - -void CustomPropertyEditor::_focus_exit() { - _modified(String()); -} - -void CustomPropertyEditor::config_action_buttons(const List<String> &p_strings) { - Ref<StyleBox> sb = action_buttons[0]->get_theme_stylebox(SNAME("button")); - int margin_top = sb->get_margin(SIDE_TOP); - int margin_left = sb->get_margin(SIDE_LEFT); - int margin_bottom = sb->get_margin(SIDE_BOTTOM); - int margin_right = sb->get_margin(SIDE_RIGHT); - - int max_width = 0; - int height = 0; - - for (int i = 0; i < MAX_ACTION_BUTTONS; i++) { - if (i < p_strings.size()) { - action_buttons[i]->show(); - action_buttons[i]->set_text(p_strings[i]); - - Size2 btn_m_size = action_buttons[i]->get_minimum_size(); - if (btn_m_size.width > max_width) { - max_width = btn_m_size.width; - } - - } else { - action_buttons[i]->hide(); - } - } - - for (int i = 0; i < p_strings.size(); i++) { - Size2 btn_m_size = action_buttons[i]->get_size(); - action_buttons[i]->set_position(Point2(0, height) + Point2(margin_left, margin_top)); - action_buttons[i]->set_size(Size2(max_width, btn_m_size.height)); - - height += btn_m_size.height; - } - set_size(Size2(max_width, height) + Size2(margin_left + margin_right, margin_top + margin_bottom)); -} - -void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns, int p_label_w, const List<String> &p_strings) { - int cell_width = 95; - int cell_height = 25; - int cell_margin = 5; - int rows = ((p_amount - 1) / p_columns) + 1; - - set_size(Size2(cell_margin + p_label_w + (cell_width + cell_margin + p_label_w) * p_columns, cell_margin + (cell_height + cell_margin) * rows) * EDSCALE); - - for (int i = 0; i < MAX_VALUE_EDITORS; i++) { - value_label[i]->get_parent()->remove_child(value_label[i]); - value_editor[i]->get_parent()->remove_child(value_editor[i]); - - int box_id = i / p_columns; - value_hboxes[box_id]->add_child(value_label[i]); - value_hboxes[box_id]->add_child(value_editor[i]); - - if (i < MAX_VALUE_EDITORS / 4) { - if (i <= p_amount / 4) { - value_hboxes[i]->show(); - } else { - value_hboxes[i]->hide(); - } - } - - if (i < p_amount) { - value_editor[i]->show(); - value_label[i]->show(); - value_label[i]->set_text(i < p_strings.size() ? p_strings[i] : String("")); - value_editor[i]->set_editable(!read_only); - } else { - value_editor[i]->hide(); - value_label[i]->hide(); - } - } -} - -void CustomPropertyEditor::_bind_methods() { - ADD_SIGNAL(MethodInfo("variant_changed")); - ADD_SIGNAL(MethodInfo("variant_field_changed", PropertyInfo(Variant::STRING, "field"))); - ADD_SIGNAL(MethodInfo("resource_edit_request")); -} - -CustomPropertyEditor::CustomPropertyEditor() { - value_vbox = memnew(VBoxContainer); - add_child(value_vbox); - - for (int i = 0; i < MAX_VALUE_EDITORS; i++) { - if (i < MAX_VALUE_EDITORS / 4) { - value_hboxes[i] = memnew(HBoxContainer); - value_vbox->add_child(value_hboxes[i]); - value_hboxes[i]->hide(); - } - int hbox_idx = i / 4; - value_label[i] = memnew(Label); - value_hboxes[hbox_idx]->add_child(value_label[i]); - value_label[i]->hide(); - value_editor[i] = memnew(LineEdit); - value_hboxes[hbox_idx]->add_child(value_editor[i]); - value_editor[i]->set_h_size_flags(Control::SIZE_EXPAND_FILL); - value_editor[i]->hide(); - value_editor[i]->connect("text_submitted", callable_mp(this, &CustomPropertyEditor::_modified)); - value_editor[i]->connect("focus_entered", callable_mp(this, &CustomPropertyEditor::_focus_enter)); - value_editor[i]->connect("focus_exited", callable_mp(this, &CustomPropertyEditor::_focus_exit)); - } - focused_value_editor = -1; - - for (int i = 0; i < 4; i++) { - scroll[i] = memnew(HScrollBar); - scroll[i]->hide(); - scroll[i]->set_min(0); - scroll[i]->set_max(1.0); - scroll[i]->set_step(0.01); - add_child(scroll[i]); - } - - checks20gc = memnew(GridContainer); - add_child(checks20gc); - checks20gc->set_columns(11); - - for (int i = 0; i < 20; i++) { - if (i == 5 || i == 15) { - Control *space = memnew(Control); - space->set_custom_minimum_size(Size2(20, 0) * EDSCALE); - checks20gc->add_child(space); - } - - checks20[i] = memnew(CheckBox); - checks20[i]->set_toggle_mode(true); - checks20[i]->set_focus_mode(Control::FOCUS_NONE); - checks20gc->add_child(checks20[i]); - checks20[i]->hide(); - checks20[i]->connect("pressed", callable_mp(this, &CustomPropertyEditor::_action_pressed).bind(i)); - checks20[i]->set_tooltip(vformat(TTR("Bit %d, val %d."), i, 1 << i)); - } - - text_edit = memnew(TextEdit); - value_vbox->add_child(text_edit); - text_edit->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT, Control::PRESET_MODE_MINSIZE, 5); - text_edit->set_v_size_flags(Control::SIZE_EXPAND_FILL); - text_edit->set_offset(SIDE_BOTTOM, -30); - - text_edit->hide(); - text_edit->connect("text_changed", callable_mp(this, &CustomPropertyEditor::_text_edit_changed)); - - color_picker = nullptr; - - file = memnew(EditorFileDialog); - value_vbox->add_child(file); - file->hide(); - - file->connect("file_selected", callable_mp(this, &CustomPropertyEditor::_file_selected)); - file->connect("dir_selected", callable_mp(this, &CustomPropertyEditor::_file_selected)); - - locale = memnew(EditorLocaleDialog); - value_vbox->add_child(locale); - locale->hide(); - - locale->connect("locale_selected", callable_mp(this, &CustomPropertyEditor::_locale_selected)); - - error = memnew(ConfirmationDialog); - error->set_title(TTR("Error!")); - value_vbox->add_child(error); - - scene_tree = memnew(SceneTreeDialog); - value_vbox->add_child(scene_tree); - scene_tree->connect("selected", callable_mp(this, &CustomPropertyEditor::_node_path_selected)); - scene_tree->get_scene_tree()->set_show_enabled_subscene(true); - - texture_preview = memnew(TextureRect); - value_vbox->add_child(texture_preview); - texture_preview->hide(); - - easing_draw = memnew(Control); - value_vbox->add_child(easing_draw); - easing_draw->hide(); - easing_draw->connect("draw", callable_mp(this, &CustomPropertyEditor::_draw_easing)); - easing_draw->connect("gui_input", callable_mp(this, &CustomPropertyEditor::_drag_easing)); - easing_draw->set_default_cursor_shape(Control::CURSOR_MOVE); - - type_button = memnew(MenuButton); - value_vbox->add_child(type_button); - type_button->hide(); - type_button->get_popup()->connect("id_pressed", callable_mp(this, &CustomPropertyEditor::_type_create_selected)); - - menu = memnew(PopupMenu); - // menu->set_pass_on_modal_close_click(false); - value_vbox->add_child(menu); - menu->connect("id_pressed", callable_mp(this, &CustomPropertyEditor::_menu_option)); - - evaluator = nullptr; - - spinbox = memnew(SpinBox); - value_vbox->add_child(spinbox); - spinbox->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT, Control::PRESET_MODE_MINSIZE, 5); - spinbox->connect("value_changed", callable_mp(this, &CustomPropertyEditor::_range_modified)); - - slider = memnew(HSlider); - value_vbox->add_child(slider); - slider->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT, Control::PRESET_MODE_MINSIZE, 5); - slider->connect("value_changed", callable_mp(this, &CustomPropertyEditor::_range_modified)); - - action_hboxes = memnew(HBoxContainer); - action_hboxes->set_alignment(BoxContainer::ALIGNMENT_CENTER); - value_vbox->add_child(action_hboxes); - for (int i = 0; i < MAX_ACTION_BUTTONS; i++) { - action_buttons[i] = memnew(Button); - action_buttons[i]->hide(); - action_hboxes->add_child(action_buttons[i]); - action_buttons[i]->connect("pressed", callable_mp(this, &CustomPropertyEditor::_action_pressed).bind(i)); - } - - create_dialog = nullptr; - property_select = nullptr; -} diff --git a/editor/property_editor.h b/editor/property_editor.h deleted file mode 100644 index 27d1cabc3d..0000000000 --- a/editor/property_editor.h +++ /dev/null @@ -1,184 +0,0 @@ -/*************************************************************************/ -/* property_editor.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ - -#ifndef PROPERTY_EDITOR_H -#define PROPERTY_EDITOR_H - -#include "editor/editor_locale_dialog.h" -#include "editor/scene_tree_editor.h" -#include "scene/gui/button.h" -#include "scene/gui/check_box.h" -#include "scene/gui/check_button.h" -#include "scene/gui/color_picker.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/grid_container.h" -#include "scene/gui/label.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/split_container.h" -#include "scene/gui/text_edit.h" -#include "scene/gui/texture_rect.h" -#include "scene/gui/tree.h" - -class CreateDialog; -class EditorFileDialog; -class PropertyValueEvaluator; -class PropertySelector; - -class EditorResourceConversionPlugin : public RefCounted { - GDCLASS(EditorResourceConversionPlugin, RefCounted); - -protected: - static void _bind_methods(); - - GDVIRTUAL0RC(String, _converts_to) - GDVIRTUAL1RC(bool, _handles, Ref<Resource>) - GDVIRTUAL1RC(Ref<Resource>, _convert, Ref<Resource>) - -public: - virtual String converts_to() const; - virtual bool handles(const Ref<Resource> &p_resource) const; - virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const; -}; - -class CustomPropertyEditor : public PopupPanel { - GDCLASS(CustomPropertyEditor, PopupPanel); - - enum { - MAX_VALUE_EDITORS = 12, - MAX_ACTION_BUTTONS = 5, - OBJ_MENU_LOAD = 0, - OBJ_MENU_EDIT = 1, - OBJ_MENU_CLEAR = 2, - OBJ_MENU_MAKE_UNIQUE = 3, - OBJ_MENU_COPY = 4, - OBJ_MENU_PASTE = 5, - OBJ_MENU_NEW_SCRIPT = 6, - OBJ_MENU_EXTEND_SCRIPT = 7, - OBJ_MENU_SHOW_IN_FILE_SYSTEM = 8, - TYPE_BASE_ID = 100, - CONVERT_BASE_ID = 1000 - }; - - enum { - EASING_LINEAR, - EASING_EASE_IN, - EASING_EASE_OUT, - EASING_ZERO, - EASING_IN_OUT, - EASING_OUT_IN - }; - - PopupMenu *menu = nullptr; - SceneTreeDialog *scene_tree = nullptr; - EditorFileDialog *file = nullptr; - EditorLocaleDialog *locale = nullptr; - ConfirmationDialog *error = nullptr; - String name; - Variant::Type type; - Variant v; - List<String> field_names; - int hint = 0; - String hint_text; - HBoxContainer *value_hboxes[MAX_VALUE_EDITORS / 4]; - VBoxContainer *value_vbox = nullptr; - LineEdit *value_editor[MAX_VALUE_EDITORS]; - int focused_value_editor; - Label *value_label[MAX_VALUE_EDITORS]; - HScrollBar *scroll[4]; - HBoxContainer *action_hboxes = nullptr; - Button *action_buttons[MAX_ACTION_BUTTONS]; - MenuButton *type_button = nullptr; - Vector<String> inheritors_array; - TextureRect *texture_preview = nullptr; - ColorPicker *color_picker = nullptr; - TextEdit *text_edit = nullptr; - bool read_only = false; - bool picking_viewport = false; - GridContainer *checks20gc = nullptr; - CheckBox *checks20[20]; - SpinBox *spinbox = nullptr; - HSlider *slider = nullptr; - - Control *easing_draw = nullptr; - CreateDialog *create_dialog = nullptr; - PropertySelector *property_select = nullptr; - - Object *owner = nullptr; - - bool updating = false; - - PropertyValueEvaluator *evaluator = nullptr; - - void _text_edit_changed(); - void _file_selected(String p_file); - void _locale_selected(String p_locale); - void _modified(String p_string); - - real_t _parse_real_expression(String text); - - void _range_modified(double p_value); - void _focus_enter(); - void _focus_exit(); - void _action_pressed(int p_which); - void _type_create_selected(int p_idx); - void _create_dialog_callback(); - void _create_selected_property(const String &p_prop); - - void _color_changed(const Color &p_color); - void _draw_easing(); - void _menu_option(int p_which); - - void _drag_easing(const Ref<InputEvent> &p_ev); - - void _node_path_selected(NodePath p_path); - void show_value_editors(int p_amount); - void config_value_editors(int p_amount, int p_columns, int p_label_w, const List<String> &p_strings); - void config_action_buttons(const List<String> &p_strings); - - void _emit_changed_whole_or_field(); - -protected: - void _notification(int p_what); - static void _bind_methods(); - -public: - void hide_menu(); - - Variant get_variant() const; - String get_name() const; - - void set_read_only(bool p_read_only) { read_only = p_read_only; } - - bool edit(Object *p_owner, const String &p_name, Variant::Type p_type, const Variant &p_variant, int p_hint, String p_hint_text); - - CustomPropertyEditor(); -}; - -#endif // PROPERTY_EDITOR_H diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index 841c3ff3b1..1b17a740dd 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -32,8 +32,12 @@ #include "core/os/keyboard.h" #include "editor/doc_tools.h" +#include "editor/editor_help.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/rich_text_label.h" +#include "scene/gui/tree.h" void PropertySelector::_text_changed(const String &p_newtext) { _update_search(); diff --git a/editor/property_selector.h b/editor/property_selector.h index e2bf5c02b7..9f1af576dd 100644 --- a/editor/property_selector.h +++ b/editor/property_selector.h @@ -31,9 +31,11 @@ #ifndef PROPERTY_SELECTOR_H #define PROPERTY_SELECTOR_H -#include "editor/editor_help.h" -#include "editor/property_editor.h" -#include "scene/gui/rich_text_label.h" +#include "scene/gui/dialogs.h" + +class EditorHelpBit; +class LineEdit; +class Tree; class PropertySelector : public ConfirmationDialog { GDCLASS(PropertySelector, ConfirmationDialog); diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index 3222fb6eec..665aca6a37 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -42,6 +42,7 @@ #include "plugins/script_editor_plugin.h" #include "scene/gui/control.h" #include "scene/gui/label.h" +#include "scene/gui/separator.h" #include "scene/gui/tab_container.h" RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor, UndoRedo *p_undo_redo) { diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index c74a4c884d..282cfa80e8 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -268,7 +268,17 @@ void SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) { String warning = p_node->get_configuration_warnings_as_string(); if (!warning.is_empty()) { - item->add_button(0, get_theme_icon(SNAME("NodeWarning"), SNAME("EditorIcons")), BUTTON_WARNING, false, TTR("Node configuration warning:") + "\n" + warning); + const int num_warnings = p_node->get_configuration_warnings().size(); + String warning_icon; + if (num_warnings == 1) { + warning_icon = SNAME("NodeWarning"); + } else if (num_warnings <= 3) { + warning_icon = vformat("NodeWarnings%d", num_warnings); + } else { + warning_icon = SNAME("NodeWarnings4Plus"); + } + + item->add_button(0, get_theme_icon(warning_icon, SNAME("EditorIcons")), BUTTON_WARNING, false, TTR("Node configuration warning:") + "\n" + warning); } if (p_node->is_unique_name_in_owner()) { @@ -375,7 +385,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) { } if (p_node->has_meta("_edit_group_")) { - item->add_button(0, get_theme_icon(SNAME("Group"), SNAME("EditorIcons")), BUTTON_GROUP, false, TTR("Children are not selectable.\nClick to make selectable.")); + item->add_button(0, get_theme_icon(SNAME("Group"), SNAME("EditorIcons")), BUTTON_GROUP, false, TTR("Children are not selectable.\nClick to make them selectable.")); } bool v = p_node->call("is_visible"); @@ -407,7 +417,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) { } if (p_node->has_meta("_edit_group_")) { - item->add_button(0, get_theme_icon(SNAME("Group"), SNAME("EditorIcons")), BUTTON_GROUP, false, TTR("Children are not selectable.\nClick to make selectable.")); + item->add_button(0, get_theme_icon(SNAME("Group"), SNAME("EditorIcons")), BUTTON_GROUP, false, TTR("Children are not selectable.\nClick to make them selectable.")); } bool v = p_node->call("is_visible"); diff --git a/editor/translations/af.po b/editor/translations/af.po index 55fe58e1b0..f2e389b6f5 100644 --- a/editor/translations/af.po +++ b/editor/translations/af.po @@ -2856,8 +2856,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Verwyder Seleksie" #: editor/editor_export.cpp #, fuzzy @@ -20423,15 +20424,15 @@ msgstr "Kon nie vouer skep nie." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Moet 'n geldige uitbreiding gebruik." #: platform/windows/export/export.cpp #, fuzzy @@ -20455,15 +20456,15 @@ msgstr "Ongeldige naam." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Moet 'n geldige uitbreiding gebruik." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/ar.po b/editor/translations/ar.po index 36e71f130e..cda76c44c8 100644 --- a/editor/translations/ar.po +++ b/editor/translations/ar.po @@ -2820,7 +2820,7 @@ msgstr "تصدير المشروع لمنصة:" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "نسخ مسار العُقدة" #: editor/editor_export.cpp @@ -20570,15 +20570,15 @@ msgstr "لا يمكن العثور على مفتاح المتجر، لا يمك #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "صيغة غير صالحة." #: platform/windows/export/export.cpp #, fuzzy @@ -20602,15 +20602,15 @@ msgstr "اسم غير صالح." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "صيغة غير صالحة." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/az.po b/editor/translations/az.po index 3a59e8aa41..af28a85240 100644 --- a/editor/translations/az.po +++ b/editor/translations/az.po @@ -5,49 +5,49 @@ # # Jafar Tarverdiyev <cefertarverdiyevv@gmail.com>, 2021. # Lucifer25x <umudyt2006@gmail.com>, 2021. +# Ümid Quliyev <lucifer25x@protonmail.com>, 2022. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" -"PO-Revision-Date: 2021-09-16 14:36+0000\n" -"Last-Translator: Lucifer25x <umudyt2006@gmail.com>\n" +"PO-Revision-Date: 2022-08-05 01:04+0000\n" +"Last-Translator: Ümid Quliyev <lucifer25x@protonmail.com>\n" "Language-Team: Azerbaijani <https://hosted.weblate.org/projects/godot-engine/" "godot/az/>\n" "Language: az\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.9-dev\n" +"X-Generator: Weblate 4.14-dev\n" #: core/bind/core_bind.cpp main/main.cpp +#, fuzzy msgid "Tablet Driver" -msgstr "" +msgstr "Planşet sürücü" #: core/bind/core_bind.cpp -#, fuzzy msgid "Clipboard" -msgstr "Pano boşdur!" +msgstr "Pano" #: core/bind/core_bind.cpp -#, fuzzy msgid "Current Screen" -msgstr "Animasiya xüsusiyyətləri." +msgstr "Aktiv Ekran" #: core/bind/core_bind.cpp msgid "Exit Code" -msgstr "" +msgstr "Çıxış Kodu" #: core/bind/core_bind.cpp msgid "V-Sync Enabled" -msgstr "" +msgstr "V-Sync Aktivdir" #: core/bind/core_bind.cpp main/main.cpp msgid "V-Sync Via Compositor" -msgstr "" +msgstr "V-Sync Kompozitor Vasitəsilə" #: core/bind/core_bind.cpp main/main.cpp msgid "Delta Smoothing" -msgstr "" +msgstr "Delta hamarlanması" #: core/bind/core_bind.cpp msgid "Low Processor Usage Mode" @@ -59,28 +59,28 @@ msgstr "" #: core/bind/core_bind.cpp main/main.cpp platform/uwp/os_uwp.cpp msgid "Keep Screen On" -msgstr "" +msgstr "Ekranı Açıq Tut" #: core/bind/core_bind.cpp msgid "Min Window Size" -msgstr "" +msgstr "Minimum Pəncərə Ölçüsü" #: core/bind/core_bind.cpp msgid "Max Window Size" -msgstr "" +msgstr "Maksimum Pəncərə Ölçüsü" #: core/bind/core_bind.cpp msgid "Screen Orientation" -msgstr "" +msgstr "Pəncərə Nisbəti" #: core/bind/core_bind.cpp core/project_settings.cpp main/main.cpp #: platform/uwp/os_uwp.cpp msgid "Window" -msgstr "" +msgstr "Pəncərə" #: core/bind/core_bind.cpp core/project_settings.cpp msgid "Borderless" -msgstr "" +msgstr "Kənarsız" #: core/bind/core_bind.cpp msgid "Per Pixel Transparency Enabled" @@ -88,29 +88,28 @@ msgstr "" #: core/bind/core_bind.cpp core/project_settings.cpp msgid "Fullscreen" -msgstr "" +msgstr "Bütün Ekran" #: core/bind/core_bind.cpp msgid "Maximized" -msgstr "" +msgstr "Böyüdülmüş" #: core/bind/core_bind.cpp msgid "Minimized" -msgstr "" +msgstr "Kiçildilmiş" #: core/bind/core_bind.cpp core/project_settings.cpp scene/gui/dialogs.cpp #: scene/gui/graph_node.cpp msgid "Resizable" -msgstr "" +msgstr "Ölçüsü Dəyişdirilə Bilər" #: core/bind/core_bind.cpp core/os/input_event.cpp scene/2d/node_2d.cpp #: scene/2d/physics_body_2d.cpp scene/2d/remote_transform_2d.cpp #: scene/3d/physics_body.cpp scene/3d/remote_transform.cpp #: scene/gui/control.cpp scene/gui/line_edit.cpp #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Position" -msgstr "Animasiyanı Təmizləmə" +msgstr "Pozisiya" #: core/bind/core_bind.cpp core/project_settings.cpp editor/editor_settings.cpp #: main/main.cpp modules/gridmap/grid_map.cpp @@ -122,7 +121,7 @@ msgstr "Animasiyanı Təmizləmə" #: scene/resources/style_box.cpp scene/resources/texture.cpp #: scene/resources/visual_shader.cpp servers/visual_server.cpp msgid "Size" -msgstr "" +msgstr "Ölçü" #: core/bind/core_bind.cpp msgid "Endian Swap" @@ -131,25 +130,23 @@ msgstr "" #: core/bind/core_bind.cpp #, fuzzy msgid "Editor Hint" -msgstr "Redaktə et" +msgstr "Editor İpucu" #: core/bind/core_bind.cpp msgid "Print Error Messages" -msgstr "" +msgstr "Xəta Mesajlarını Yazdır" #: core/bind/core_bind.cpp -#, fuzzy msgid "Iterations Per Second" -msgstr "İnterpolasiya rejimi" +msgstr "Hər Saniyədə İterasiya Sayı" #: core/bind/core_bind.cpp msgid "Target FPS" -msgstr "" +msgstr "Hədəf FPS" #: core/bind/core_bind.cpp -#, fuzzy msgid "Time Scale" -msgstr "Animasya Açarlarını Ölçülə" +msgstr "Zaman Ölçəyi" #: core/bind/core_bind.cpp main/main.cpp msgid "Physics Jitter Fix" @@ -157,25 +154,23 @@ msgstr "" #: core/bind/core_bind.cpp editor/plugins/version_control_editor_plugin.cpp msgid "Error" -msgstr "" +msgstr "Xəta" #: core/bind/core_bind.cpp -#, fuzzy msgid "Error String" -msgstr "Yükləmə xətası:" +msgstr "Xəta Yazısı" #: core/bind/core_bind.cpp -#, fuzzy msgid "Error Line" -msgstr "Yükləmə xətası:" +msgstr "Xəta Sətiri" #: core/bind/core_bind.cpp msgid "Result" -msgstr "" +msgstr "Nəticə" #: core/command_queue_mt.cpp core/message_queue.cpp main/main.cpp msgid "Memory" -msgstr "" +msgstr "Yaddaş" #: core/command_queue_mt.cpp core/message_queue.cpp #: core/register_core_types.cpp drivers/gles2/rasterizer_canvas_base_gles2.cpp @@ -186,11 +181,11 @@ msgstr "" #: modules/webrtc/webrtc_data_channel.h modules/websocket/websocket_macros.h #: servers/visual_server.cpp msgid "Limits" -msgstr "" +msgstr "Limitlər" #: core/command_queue_mt.cpp msgid "Command Queue" -msgstr "" +msgstr "Əmr Növbəsi" #: core/command_queue_mt.cpp msgid "Multithreading Queue Size (KB)" @@ -200,14 +195,13 @@ msgstr "" #: modules/visual_script/visual_script_func_nodes.cpp #: modules/visual_script/visual_script_nodes.cpp #: scene/resources/visual_shader_nodes.cpp -#, fuzzy msgid "Function" -msgstr "Funksiyalar:" +msgstr "Funksiya" #: core/image.cpp core/packed_data_container.cpp scene/2d/polygon_2d.cpp #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp msgid "Data" -msgstr "" +msgstr "Məlumat" #: core/io/file_access_network.cpp core/register_core_types.cpp #: editor/editor_file_dialog.cpp editor/editor_settings.cpp main/main.cpp @@ -215,16 +209,15 @@ msgstr "" #: modules/webrtc/webrtc_data_channel.h modules/websocket/websocket_macros.h #: scene/gui/file_dialog.cpp msgid "Network" -msgstr "" +msgstr "Şəbəkə" #: core/io/file_access_network.cpp -#, fuzzy msgid "Remote FS" -msgstr "Sil" +msgstr "Uzaqdan FS" #: core/io/file_access_network.cpp msgid "Page Size" -msgstr "" +msgstr "Səhifə Ölçüsü" #: core/io/file_access_network.cpp msgid "Page Read Ahead" @@ -232,12 +225,11 @@ msgstr "" #: core/io/http_client.cpp msgid "Blocking Mode Enabled" -msgstr "" +msgstr "Bloklama Modu Aktivdir" #: core/io/http_client.cpp -#, fuzzy msgid "Connection" -msgstr "Qoş" +msgstr "Əlaqə" #: core/io/http_client.cpp msgid "Read Chunk Size" @@ -245,15 +237,15 @@ msgstr "" #: core/io/marshalls.cpp msgid "Object ID" -msgstr "" +msgstr "Obyekt ID" #: core/io/multiplayer_api.cpp core/io/packet_peer.cpp msgid "Allow Object Decoding" -msgstr "" +msgstr "Obyekt Deşifrəsinə İzn Verin" #: core/io/multiplayer_api.cpp scene/main/scene_tree.cpp msgid "Refuse New Network Connections" -msgstr "" +msgstr "Yeni Şəbəkə Əlaqələrindən İmtina Et" #: core/io/multiplayer_api.cpp scene/main/scene_tree.cpp msgid "Network Peer" @@ -261,16 +253,15 @@ msgstr "" #: core/io/multiplayer_api.cpp scene/animation/animation_player.cpp msgid "Root Node" -msgstr "" +msgstr "Kök Düyün" #: core/io/networked_multiplayer_peer.cpp -#, fuzzy msgid "Refuse New Connections" -msgstr "Qoş" +msgstr "Yeni Əlaqələrdən İmtina Et" #: core/io/networked_multiplayer_peer.cpp msgid "Transfer Mode" -msgstr "" +msgstr "Transfer Modu" #: core/io/packet_peer.cpp msgid "Encode Buffer Max Size" @@ -294,16 +285,15 @@ msgstr "" #: core/io/stream_peer.cpp msgid "Data Array" -msgstr "" +msgstr "Məlumat Siyahısı" #: core/io/stream_peer_ssl.cpp msgid "Blocking Handshake" -msgstr "" +msgstr "Əl Sıxmağın Qarşısının Alınması" #: core/io/udp_server.cpp -#, fuzzy msgid "Max Pending Connections" -msgstr "Əlaqəni redaktə edin:" +msgstr "Gözlənilən Maksimum Əlaqələr" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -325,7 +315,6 @@ msgstr "" "format." #: core/math/expression.cpp -#, fuzzy msgid "Invalid input %d (not passed) in expression" msgstr "İfadədə uyğunsuz giriş %d (ötürülmədi)" @@ -2810,8 +2799,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Animasiyanı Təmizləmə" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19641,14 +19631,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19670,14 +19659,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/bg.po b/editor/translations/bg.po index 877823c869..d2d7a56dc3 100644 --- a/editor/translations/bg.po +++ b/editor/translations/bg.po @@ -2814,8 +2814,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Копиране на избраното" #: editor/editor_export.cpp msgid "Completed successfully." @@ -20110,15 +20111,15 @@ msgstr "Не е намерено хранилище за ключове. Изн #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Неправилно разширение." #: platform/windows/export/export.cpp #, fuzzy @@ -20142,15 +20143,15 @@ msgstr "Неправилно име." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Неправилно разширение." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/bn.po b/editor/translations/bn.po index 8379e2de5b..6f1e8f945d 100644 --- a/editor/translations/bn.po +++ b/editor/translations/bn.po @@ -2904,7 +2904,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "পথ প্রতিলিপি/কপি করুন" #: editor/editor_export.cpp @@ -21539,15 +21539,15 @@ msgstr "ফোল্ডার তৈরী করা সম্ভব হয়ন #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "অগ্রহণযোগ্য এক্সটেনশন" #: platform/windows/export/export.cpp #, fuzzy @@ -21571,15 +21571,15 @@ msgstr "অগ্রহনযোগ্য নাম।" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "অগ্রহণযোগ্য এক্সটেনশন" #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/br.po b/editor/translations/br.po index f86b01cc44..823490a280 100644 --- a/editor/translations/br.po +++ b/editor/translations/br.po @@ -2732,8 +2732,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Tro Fiñvskeudenn" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19433,14 +19434,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19462,14 +19462,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/ca.po b/editor/translations/ca.po index b1ee6245f6..04c9b7761c 100644 --- a/editor/translations/ca.po +++ b/editor/translations/ca.po @@ -2790,7 +2790,8 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." +#, fuzzy +msgid "Completed with warnings." msgstr "Completat amb errors." #: editor/editor_export.cpp @@ -20973,15 +20974,15 @@ msgstr "No es pot obrir la plantilla per exportar." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "L'extensió no és vàlida." #: platform/windows/export/export.cpp #, fuzzy @@ -21005,15 +21006,15 @@ msgstr "Nom no vàlid." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "L'extensió no és vàlida." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/cs.po b/editor/translations/cs.po index c27334b374..1e92a92ae7 100644 --- a/editor/translations/cs.po +++ b/editor/translations/cs.po @@ -2882,7 +2882,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Kopírovat cestu k uzlu" #: editor/editor_export.cpp @@ -20734,15 +20734,15 @@ msgstr "Nepodařilo se najít úložiště klíčů, nelze exportovat." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Neplatná přípona." #: platform/windows/export/export.cpp #, fuzzy @@ -20766,15 +20766,15 @@ msgstr "Neplatný název." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Neplatná přípona." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/da.po b/editor/translations/da.po index 3dc6f52da1..1bb05be6f9 100644 --- a/editor/translations/da.po +++ b/editor/translations/da.po @@ -2895,8 +2895,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Fjern Markering" #: editor/editor_export.cpp #, fuzzy @@ -20911,15 +20912,15 @@ msgstr "Kan ikke åbne skabelon til eksport:\n" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Du skal bruge en gyldig udvidelse." #: platform/windows/export/export.cpp #, fuzzy @@ -20943,15 +20944,15 @@ msgstr "Ugyldigt navn." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Du skal bruge en gyldig udvidelse." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/de.po b/editor/translations/de.po index 5035a7aa5d..aa92914ada 100644 --- a/editor/translations/de.po +++ b/editor/translations/de.po @@ -82,13 +82,14 @@ # Christian Packenius <christian@packenius.com>, 2022. # Sajeg <jfx@posteo.de>, 2022. # Tobias Jacobs <tobi@jacobs.rocks>, 2022. +# JeremyStarTM <jeremystartm@tuta.io>, 2022. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2022-07-23 03:57+0000\n" -"Last-Translator: So Wieso <sowieso@dukun.de>\n" +"PO-Revision-Date: 2022-07-31 18:34+0000\n" +"Last-Translator: JeremyStarTM <jeremystartm@tuta.io>\n" "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/" "godot/de/>\n" "Language: de\n" @@ -1632,7 +1633,7 @@ msgstr "Methodenaufrufsspurschlüssel hinzufügen" #: editor/animation_track_editor.cpp msgid "Method not found in object:" -msgstr "Methode nicht in Objekt gefunden:" +msgstr "Methode im Objekt nicht gefunden:" #: editor/animation_track_editor.cpp msgid "Anim Move Keys" @@ -2814,7 +2815,8 @@ msgid "Project export for platform:" msgstr "Projektexport für Plattform:" #: editor/editor_export.cpp -msgid "Completed with errors." +#, fuzzy +msgid "Completed with warnings." msgstr "Fertiggestellt mit Fehlern." #: editor/editor_export.cpp @@ -5569,7 +5571,7 @@ msgstr "Auswahl ziehen und fallen lassen" #: editor/editor_settings.cpp msgid "Stay In Script Editor On Node Selected" -msgstr "" +msgstr "Im Skript Editor bei ausgewähltem Node bleiben" #: editor/editor_settings.cpp msgid "Appearance" @@ -11697,9 +11699,8 @@ msgid "New Animation" msgstr "Neue Animation" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Filter animations" -msgstr "Methoden filtern" +msgstr "Animationen filtern" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Speed:" @@ -18151,7 +18152,7 @@ msgstr "Ungültiges Argument vom Typ:" #: modules/visual_script/visual_script_nodes.cpp msgid "Invalid arguments:" -msgstr "Ungültige Argumente:" +msgstr "Ungültige Parameter:" #: modules/visual_script/visual_script_nodes.cpp msgid "a if cond, else b" @@ -19652,8 +19653,8 @@ msgid "" "Could not start codesign executable, make sure Xcode command line tools are " "installed." msgstr "" -"Codesign-Anwendung konnte nicht gestartet werden. Wurden die Xcode-" -"Kommandozeilen-Hilfsprogramme installiert?" +"Codesign-Anwendung konnte nicht gestartet werden, stelle sicher dass die " +"Xcode-Kommandozeilen-Tools installiert sind." #: platform/osx/export/export.cpp platform/windows/export/export.cpp msgid "No identity found." @@ -20145,17 +20146,18 @@ msgid "Could not find wine executable at \"%s\"." msgstr "Anwendung wine konnte nicht gefunden werden in „%s“." #: platform/windows/export/export.cpp +#, fuzzy msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" "Anwendung rcedit konnte nicht gestartet werden. Bitte rcedit-Pfad in " "Editoreinstellungen festlegen (Export > Windows > Rcedit)." #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +#, fuzzy +msgid "rcedit failed to modify executable: %s." msgstr "" "Modifikation der Anwendung durch rcedit fehlgeschlagen:\n" "%s" @@ -20177,17 +20179,18 @@ msgid "Invalid timestamp server." msgstr "Ungültiger Zeitstempelserver." #: platform/windows/export/export.cpp +#, fuzzy msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" "Anwendung signtool konnte nicht gestartet werden. Bitte signtool-Pfad in " "Editoreinstellungen festlegen (Export > Windows > Signtool)." #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +#, fuzzy +msgid "Signtool failed to sign executable: %s." msgstr "" "Signieren der Anwendung durch Signtool ist fehlgeschlagen:\n" "%s" diff --git a/editor/translations/editor.pot b/editor/translations/editor.pot index c207124fcb..23c58c5ffb 100644 --- a/editor/translations/editor.pot +++ b/editor/translations/editor.pot @@ -2684,7 +2684,7 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "" #: editor/editor_export.cpp @@ -19258,14 +19258,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19286,14 +19285,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/el.po b/editor/translations/el.po index 85005d903a..4b71ed8528 100644 --- a/editor/translations/el.po +++ b/editor/translations/el.po @@ -2841,7 +2841,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Αντιγραφή διαδρομής κόμβου" #: editor/editor_export.cpp @@ -20907,15 +20907,15 @@ msgstr "Σφάλμα κατά το άνοιγμα προτύπου για εξα #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Άκυρη επέκταση." #: platform/windows/export/export.cpp #, fuzzy @@ -20939,15 +20939,15 @@ msgstr "Μη έγκυρο όνομα." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Άκυρη επέκταση." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/en_Shaw.po b/editor/translations/en_Shaw.po index 45d0549a81..361c10ce1a 100644 --- a/editor/translations/en_Shaw.po +++ b/editor/translations/en_Shaw.po @@ -2707,8 +2707,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "𐑓𐑳𐑙𐑒𐑖𐑩𐑯𐑟:" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19353,14 +19354,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19382,14 +19382,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/eo.po b/editor/translations/eo.po index 5a251ba489..0139382972 100644 --- a/editor/translations/eo.po +++ b/editor/translations/eo.po @@ -2852,8 +2852,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Kopii elektaron" #: editor/editor_export.cpp #, fuzzy @@ -20555,15 +20556,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Nevalida kromprogramo." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20585,15 +20586,15 @@ msgstr "Malvalida nomo." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Nevalida kromprogramo." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/es.po b/editor/translations/es.po index 872fedfdac..173b195cc4 100644 --- a/editor/translations/es.po +++ b/editor/translations/es.po @@ -81,12 +81,16 @@ # David Martínez <goddrinksjava@gmail.com>, 2022. # Nagamine-j <jimmy.kochi@unmsm.edu.pe>, 2022. # Esdras Caleb Oliveira Silva <acheicaleb@gmail.com>, 2022. +# Luis Ortiz <luisortiz66@hotmail.com>, 2022. +# Angel Andrade <aandradeb99@gmail.com>, 2022. +# Juan Felipe Gómez López <juanfgomez0912@gmail.com>, 2022. +# Pineappletooth <yochank003@gmail.com>, 2022. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2022-07-27 13:26+0000\n" +"PO-Revision-Date: 2022-08-05 01:04+0000\n" "Last-Translator: Javier Ocampos <xavier.ocampos@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/" "godot/es/>\n" @@ -225,7 +229,7 @@ msgstr "Escala de Tiempo" #: core/bind/core_bind.cpp main/main.cpp msgid "Physics Jitter Fix" -msgstr "Arreglo de las Fluctuaciones Físicas" +msgstr "Corrección de Fluctuaciones de Física" #: core/bind/core_bind.cpp editor/plugins/version_control_editor_plugin.cpp msgid "Error" @@ -2813,7 +2817,8 @@ msgid "Project export for platform:" msgstr "Exportar proyecto para la plataforma:" #: editor/editor_export.cpp -msgid "Completed with errors." +#, fuzzy +msgid "Completed with warnings." msgstr "Completado con errores." #: editor/editor_export.cpp @@ -5563,7 +5568,7 @@ msgstr "Arrastrar y Soltar la Selección" #: editor/editor_settings.cpp msgid "Stay In Script Editor On Node Selected" -msgstr "" +msgstr "Permanecer En Editor de Scripts En Nodo Seleccionado" #: editor/editor_settings.cpp msgid "Appearance" @@ -5693,11 +5698,11 @@ msgstr "Espera de Completado de Código" #: editor/editor_settings.cpp msgid "Put Callhint Tooltip Below Current Line" -msgstr "Colocar la Información Sobre la Llamada Debajo de la Línea Actual" +msgstr "Colocar Tooltip de Llamada Debajo de la Línea Actual" #: editor/editor_settings.cpp msgid "Callhint Tooltip Offset" -msgstr "Desplazamiento de la Información Sobre la Llamada" +msgstr "Desplazamiento del Tooltip de Llamada" #: editor/editor_settings.cpp msgid "Complete File Paths" @@ -6155,7 +6160,7 @@ msgstr "Color de Número de Línea Seguro" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Caret Color" -msgstr "" +msgstr "Color del Caret" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Caret Background Color" @@ -6187,7 +6192,7 @@ msgstr "Color de la Palabra Resaltada" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Number Color" -msgstr "" +msgstr "Número del Color" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Function Color" @@ -6211,7 +6216,7 @@ msgstr "Puntos de Interrupción" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Executing Line Color" -msgstr "" +msgstr "Color de la línea de ejecución" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Code Folding Color" @@ -10144,7 +10149,7 @@ msgid "" "viewport." msgstr "" "El polígono 2D tiene vértices internos, por lo que ya no se puede editar en " -"la ventanilla." +"el viewport." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" @@ -11410,27 +11415,27 @@ msgstr "Dialogo de Transformación..." #: editor/plugins/spatial_editor_plugin.cpp msgid "1 Viewport" -msgstr "1 Ventana" +msgstr "1 Viewport" #: editor/plugins/spatial_editor_plugin.cpp msgid "2 Viewports" -msgstr "2 Ventanas" +msgstr "2 Viewports" #: editor/plugins/spatial_editor_plugin.cpp msgid "2 Viewports (Alt)" -msgstr "2 Ventanas (Alt)" +msgstr "2 Viewports (Alt)" #: editor/plugins/spatial_editor_plugin.cpp msgid "3 Viewports" -msgstr "3 Ventanas" +msgstr "3 Viewports" #: editor/plugins/spatial_editor_plugin.cpp msgid "3 Viewports (Alt)" -msgstr "3 Ventanas (Alt)" +msgstr "3 Viewports (Alt)" #: editor/plugins/spatial_editor_plugin.cpp msgid "4 Viewports" -msgstr "4 Ventanas" +msgstr "4 Viewports" #: editor/plugins/spatial_editor_plugin.cpp msgid "Gizmos" @@ -11475,7 +11480,7 @@ msgstr "Ajuste de Escala (%):" #: editor/plugins/spatial_editor_plugin.cpp msgid "Viewport Settings" -msgstr "Configuración de ventanilla" +msgstr "Configuración del Viewport" #: editor/plugins/spatial_editor_plugin.cpp msgid "Perspective FOV (deg.):" @@ -11683,9 +11688,8 @@ msgid "New Animation" msgstr "Nueva Animación" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Filter animations" -msgstr "Filtrar métodos" +msgstr "Filtrar animaciones" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Speed:" @@ -16430,7 +16434,7 @@ msgstr "" #: main/main.cpp msgid "Tooltip Position Offset" -msgstr "Offset de la Posición del Tooltip" +msgstr "Desplazamiento de Posición del Tooltip" #: main/main.cpp modules/mono/mono_gd/gd_mono.cpp msgid "Debugger Agent" @@ -20127,18 +20131,19 @@ msgid "Could not find wine executable at \"%s\"." msgstr "No se pudo encontrar el ejecutable de wine en \"%s\"." #: platform/windows/export/export.cpp +#, fuzzy msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" "No se ha podido iniciar el ejecutable rcedit, configura la ruta de rcedit en " "la configuración del editor (Exportar > Windows > Rcedit)." #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Fallo al abrir el archivo ejecutable \"%s\"." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20157,18 +20162,19 @@ msgid "Invalid timestamp server." msgstr "Servidor de marcas de tiempo inválido." #: platform/windows/export/export.cpp +#, fuzzy msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" "No se ha podido iniciar el ejecutable de signtool, configura la ruta de " "signtool en la configuración del editor (Exportar > Windows > Signtool)." #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Fallo al abrir el archivo ejecutable \"%s\"." #: platform/windows/export/export.cpp msgid "Failed to remove temporary file \"%s\"." @@ -20382,7 +20388,7 @@ msgstr "Zoom" #: scene/2d/camera_2d.cpp scene/main/canvas_layer.cpp msgid "Custom Viewport" -msgstr "Vista Personalizada" +msgstr "Viewport Personalizado" #: scene/2d/camera_2d.cpp scene/3d/camera.cpp scene/3d/interpolated_camera.cpp #: scene/animation/animation_player.cpp scene/animation/animation_tree.cpp @@ -22922,9 +22928,8 @@ msgid "Show Margins" msgstr "Mostrar Márgenes" #: scene/3d/room_manager.cpp -#, fuzzy msgid "Debug Sprawl" -msgstr "Depurar Desorden" +msgstr "Depurar Extensión" #: scene/3d/room_manager.cpp msgid "Overlap Warning Threshold" @@ -22939,14 +22944,12 @@ msgid "Portal Depth Limit" msgstr "" #: scene/3d/room_manager.cpp -#, fuzzy msgid "Default Portal Margin" -msgstr "Asignar Margen" +msgstr "Margen del Portal por Defecto" #: scene/3d/room_manager.cpp -#, fuzzy msgid "Roaming Expansion Margin" -msgstr "Expandir Todo" +msgstr "Margen de Expansión del Roaming" #: scene/3d/room_manager.cpp msgid "" @@ -22999,43 +23002,36 @@ msgstr "" "Asegúrate de que todas las rooms contienen geometría o límites manuales." #: scene/3d/skeleton.cpp scene/resources/skin.cpp -#, fuzzy msgid "Pose" -msgstr "Copiar Pose" +msgstr "Pose" #: scene/3d/skeleton.cpp -#, fuzzy msgid "Bound Children" -msgstr "Hijos Editables" +msgstr "Hijos Vinculados" #: scene/3d/soft_body.cpp -#, fuzzy msgid "Pinned Points" -msgstr "Fijado %s" +msgstr "Puntos de Anclaje" #: scene/3d/soft_body.cpp -#, fuzzy msgid "Attachments" -msgstr "Gizmos" +msgstr "Adjuntos" #: scene/3d/soft_body.cpp -#, fuzzy msgid "Point Index" -msgstr "Obtener Índice" +msgstr "Índice de Puntos" #: scene/3d/soft_body.cpp msgid "Spatial Attachment Path" msgstr "" #: scene/3d/soft_body.cpp -#, fuzzy msgid "Physics Enabled" -msgstr "Fotogramas de Física %" +msgstr "Física Activada" #: scene/3d/soft_body.cpp -#, fuzzy msgid "Parent Collision Ignore" -msgstr "Crear Polígono de Colisión" +msgstr "Ignorar Colisión de los Padres" #: scene/3d/soft_body.cpp msgid "Simulation Precision" @@ -23100,9 +23096,8 @@ msgid "Gizmo" msgstr "Gizmo" #: scene/3d/spatial_velocity_tracker.cpp -#, fuzzy msgid "Track Physics Step" -msgstr "Fotogramas de Física %" +msgstr "Paso de Física de Pistas" #: scene/3d/spring_arm.cpp msgid "Spring Length" @@ -23113,9 +23108,8 @@ msgid "Opacity" msgstr "" #: scene/3d/sprite_3d.cpp scene/resources/material.cpp -#, fuzzy msgid "Transparent" -msgstr "Transponer" +msgstr "Transparente" #: scene/3d/sprite_3d.cpp msgid "" @@ -23134,14 +23128,12 @@ msgstr "" "Por favor, úselo como hijo de un VehicleBody." #: scene/3d/vehicle_body.cpp -#, fuzzy msgid "Per-Wheel Motion" -msgstr "Botón Bajar la Rueda" +msgstr "Movimiento por Rueda" #: scene/3d/vehicle_body.cpp -#, fuzzy msgid "Engine Force" -msgstr "Documentación Online" +msgstr "Fuerza del Motor" #: scene/3d/vehicle_body.cpp msgid "Brake" @@ -23172,19 +23164,16 @@ msgid "Roll Influence" msgstr "" #: scene/3d/vehicle_body.cpp -#, fuzzy msgid "Friction Slip" -msgstr "Función" +msgstr "Deslizamiento por Fricción" #: scene/3d/vehicle_body.cpp -#, fuzzy msgid "Suspension" -msgstr "Expresión" +msgstr "Suspensión" #: scene/3d/vehicle_body.cpp -#, fuzzy msgid "Max Force" -msgstr "Error" +msgstr "Fuerza Máxima" #: scene/3d/visibility_notifier.cpp msgid "AABB" @@ -23211,14 +23200,12 @@ msgid "Extra Cull Margin" msgstr "Margen de Sacrificio Extra" #: scene/3d/visual_instance.cpp -#, fuzzy msgid "Baked Light" -msgstr "Calcular Lightmaps" +msgstr "Bakear Luces" #: scene/3d/visual_instance.cpp -#, fuzzy msgid "Generate Lightmap" -msgstr "Generando Lightmaps" +msgstr "Generar Lightmap" #: scene/3d/visual_instance.cpp msgid "Lightmap Scale" @@ -23274,9 +23261,8 @@ msgid "Animation not found: '%s'" msgstr "No se encontró la animación: '%s'" #: scene/animation/animation_blend_tree.cpp -#, fuzzy msgid "Mix Mode" -msgstr "Nodo Mix" +msgstr "Modo Mix" #: scene/animation/animation_blend_tree.cpp msgid "Fadein Time" @@ -23303,24 +23289,20 @@ msgid "Random Delay" msgstr "Retraso Aleatorio" #: scene/animation/animation_blend_tree.cpp -#, fuzzy msgid "Add Amount" -msgstr "Cantidad" +msgstr "Añadir Cantidad" #: scene/animation/animation_blend_tree.cpp -#, fuzzy msgid "Blend Amount" -msgstr "Cantidad de Escala" +msgstr "Cantidad de Mezcla" #: scene/animation/animation_blend_tree.cpp -#, fuzzy msgid "Seek Position" -msgstr "Establecer Posición de Entrada de Curva" +msgstr "Buscar Posición" #: scene/animation/animation_blend_tree.cpp -#, fuzzy msgid "Input Count" -msgstr "Añadir Puerto de Entrada" +msgstr "Conteo de Entradas" #: scene/animation/animation_blend_tree.cpp #: scene/animation/animation_node_state_machine.cpp @@ -23328,56 +23310,48 @@ msgid "Xfade Time" msgstr "Tiempo de Fundido Cruzado" #: scene/animation/animation_node_state_machine.cpp -#, fuzzy msgid "Switch Mode" -msgstr "Cambiar" +msgstr "Modo de Conmutación" #: scene/animation/animation_node_state_machine.cpp -#, fuzzy msgid "Auto Advance" -msgstr "Establecer avance automático" +msgstr "Auto Avance" #: scene/animation/animation_node_state_machine.cpp -#, fuzzy msgid "Advance Condition" -msgstr "Opciones Avanzadas" +msgstr "Condición de Avance" #: scene/animation/animation_player.cpp msgid "Anim Apply Reset" msgstr "Aplicar Reset de la Animación" #: scene/animation/animation_player.cpp -#, fuzzy msgid "Current Animation" -msgstr "Establecer Animación" +msgstr "Animación Actual" #: scene/animation/animation_player.cpp -#, fuzzy msgid "Assigned Animation" -msgstr "Añadir Animación" +msgstr "Animación Asignada" #: scene/animation/animation_player.cpp msgid "Reset On Save" msgstr "" #: scene/animation/animation_player.cpp -#, fuzzy msgid "Current Animation Length" -msgstr "Cambiar Duración de la Animación" +msgstr "Duración Actual de la Animación" #: scene/animation/animation_player.cpp -#, fuzzy msgid "Current Animation Position" -msgstr "Añadir Punto de Animación" +msgstr "Posición Actual de la Animación" #: scene/animation/animation_player.cpp msgid "Playback Options" msgstr "Opciones de Reproducción" #: scene/animation/animation_player.cpp -#, fuzzy msgid "Default Blend Time" -msgstr "Theme Predeterminado" +msgstr "Tiempo de Mezcla por Defecto" #: scene/animation/animation_player.cpp msgid "Method Call Mode" @@ -23418,67 +23392,56 @@ msgid "Tree Root" msgstr "Raíz del Árbol" #: scene/animation/animation_tree.cpp -#, fuzzy msgid "Anim Player" -msgstr "Fijar AnimationPlayer" +msgstr "Reproductor de Animación" #: scene/animation/animation_tree.cpp msgid "Root Motion" msgstr "" #: scene/animation/animation_tree.cpp -#, fuzzy msgid "Track" -msgstr "Agregar Pista" +msgstr "Pista" #: scene/animation/animation_tree_player.cpp msgid "This node has been deprecated. Use AnimationTree instead." msgstr "Este nodo ha quedado obsoleto. Usa AnimationTree en su lugar." #: scene/animation/animation_tree_player.cpp -#, fuzzy msgid "Playback" msgstr "Reproducir" #: scene/animation/animation_tree_player.cpp -#, fuzzy msgid "Master Player" -msgstr "Pegar Parámetros" +msgstr "Reproductor Principal" #: scene/animation/animation_tree_player.cpp -#, fuzzy msgid "Base Path" -msgstr "Ruta de Exportación" +msgstr "Ruta Base" #: scene/animation/root_motion_view.cpp -#, fuzzy msgid "Animation Path" -msgstr "Animación" +msgstr "Ruta de la Animación" #: scene/animation/root_motion_view.cpp -#, fuzzy msgid "Zero Y" -msgstr "Cero" +msgstr "Cero Y" #: scene/animation/skeleton_ik.cpp -#, fuzzy msgid "Root Bone" -msgstr "Nombre del nodo raíz" +msgstr "Hueso Raíz" #: scene/animation/skeleton_ik.cpp -#, fuzzy msgid "Tip Bone" -msgstr "Huesos" +msgstr "Punta del Hueso" #: scene/animation/skeleton_ik.cpp -#, fuzzy msgid "Interpolation" -msgstr "Modo de Interpolación" +msgstr "Interpolación" #: scene/animation/skeleton_ik.cpp -#, fuzzy msgid "Override Tip Basis" -msgstr "Anulaciones" +msgstr "Anular Base de la Punta" #: scene/animation/skeleton_ik.cpp msgid "Use Magnet" @@ -23489,54 +23452,46 @@ msgid "Magnet" msgstr "" #: scene/animation/skeleton_ik.cpp -#, fuzzy msgid "Target Node" -msgstr "Reemparentar nodo" +msgstr "Nodo Objetivo" #: scene/animation/skeleton_ik.cpp -#, fuzzy msgid "Max Iterations" -msgstr "Crear Función" +msgstr "Iteraciones Máximas" #: scene/animation/tween.cpp msgid "Playback Process Mode" msgstr "" #: scene/animation/tween.cpp -#, fuzzy msgid "Playback Speed" -msgstr "Reproducir Escena" +msgstr "Velocidad de Reproducción" #: scene/audio/audio_stream_player.cpp -#, fuzzy msgid "Mix Target" -msgstr "Objetivo" +msgstr "Objetivo de la Mezcla" #: scene/gui/aspect_ratio_container.cpp scene/gui/range.cpp #: servers/audio/effects/audio_effect_compressor.cpp -#, fuzzy msgid "Ratio" -msgstr "Mantener Proporciones" +msgstr "Proporción" #: scene/gui/aspect_ratio_container.cpp scene/gui/texture_button.cpp #: scene/gui/texture_rect.cpp -#, fuzzy msgid "Stretch Mode" -msgstr "Modo de Selección" +msgstr "Modo de Estiramiento" #: scene/gui/aspect_ratio_container.cpp scene/gui/box_container.cpp msgid "Alignment" msgstr "" #: scene/gui/base_button.cpp -#, fuzzy msgid "Shortcut In Tooltip" -msgstr "Mostrar Origen" +msgstr "Atajo en el Tooltip" #: scene/gui/base_button.cpp -#, fuzzy msgid "Action Mode" -msgstr "Modo de Icono" +msgstr "Modo de Acción" #: scene/gui/base_button.cpp msgid "Enabled Focus Mode" @@ -23547,38 +23502,33 @@ msgid "Keep Pressed Outside" msgstr "" #: scene/gui/base_button.cpp scene/gui/shortcut.cpp -#, fuzzy msgid "Shortcut" -msgstr "Atajos" +msgstr "Atajo" #: scene/gui/base_button.cpp -#, fuzzy msgid "Group" -msgstr "Grupos" +msgstr "Grupo" #: scene/gui/button.cpp scene/gui/label.cpp -#, fuzzy msgid "Clip Text" -msgstr "Copiar Texto" +msgstr "Texto del Clip" #: scene/gui/button.cpp scene/gui/label.cpp scene/gui/line_edit.cpp #: scene/gui/spin_box.cpp msgid "Align" -msgstr "" +msgstr "Alinear" #: scene/gui/button.cpp msgid "Icon Align" -msgstr "" +msgstr "Alinear Icono" #: scene/gui/button.cpp -#, fuzzy msgid "Expand Icon" -msgstr "Expandir Todo" +msgstr "Expandir Icono" #: scene/gui/center_container.cpp -#, fuzzy msgid "Use Top Left" -msgstr "Superior Izquierda" +msgstr "Usar Superior Izquierda" #: scene/gui/color_picker.cpp msgid "" @@ -23591,34 +23541,28 @@ msgstr "" "Clic der: Borrar configuración predeterminada" #: scene/gui/color_picker.cpp -#, fuzzy msgid "Edit Alpha" -msgstr "Editar Polígono" +msgstr "Editar Alfa" #: scene/gui/color_picker.cpp -#, fuzzy msgid "HSV Mode" -msgstr "Modo de Selección" +msgstr "Modo HSV" #: scene/gui/color_picker.cpp -#, fuzzy msgid "Raw Mode" -msgstr "Modo desplazamiento lateral" +msgstr "Modo Raw" #: scene/gui/color_picker.cpp -#, fuzzy msgid "Deferred Mode" -msgstr "Diferido" +msgstr "Modo Diferido" #: scene/gui/color_picker.cpp -#, fuzzy msgid "Presets Enabled" -msgstr "Ajustes preestablecidos" +msgstr "Preajustes Activados" #: scene/gui/color_picker.cpp -#, fuzzy msgid "Presets Visible" -msgstr "Act./Desact. Visible" +msgstr "Preajustes Visibles" #: scene/gui/color_picker.cpp msgid "Pick a color from the editor window." @@ -23648,9 +23592,8 @@ msgstr "" "sencillo." #: scene/gui/control.cpp -#, fuzzy msgid "Theme Overrides" -msgstr "Anulaciones" +msgstr "Anulación de Temas" #: scene/gui/control.cpp msgid "" @@ -23662,14 +23605,12 @@ msgstr "" "Filtro del Ratón en \"Stop\" o \"Pass\"." #: scene/gui/control.cpp -#, fuzzy msgid "Anchor" -msgstr "Sólo anclado" +msgstr "Anclaje" #: scene/gui/control.cpp -#, fuzzy msgid "Grow Direction" -msgstr "Direcciones" +msgstr "Dirección de Crecimiento" #: scene/gui/control.cpp scene/resources/navigation_mesh.cpp msgid "Min Size" @@ -23680,40 +23621,36 @@ msgid "Pivot Offset" msgstr "Pivote de Desplazamiento" #: scene/gui/control.cpp -#, fuzzy msgid "Clip Content" -msgstr "Constante de Clase" +msgstr "Contenido del Clip" #: scene/gui/control.cpp scene/resources/visual_shader_nodes.cpp msgid "Hint" msgstr "" #: scene/gui/control.cpp -#, fuzzy msgid "Tooltip" -msgstr "Herramientas" +msgstr "Tooltip" #: scene/gui/control.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Focus" -msgstr "Foco en Ruta" +msgstr "Foco" #: scene/gui/control.cpp msgid "Neighbour Left" -msgstr "" +msgstr "Vecino Izquierda" #: scene/gui/control.cpp msgid "Neighbour Top" -msgstr "" +msgstr "Vecino Superior" #: scene/gui/control.cpp msgid "Neighbour Right" -msgstr "" +msgstr "Vecino Derecha" #: scene/gui/control.cpp -#, fuzzy msgid "Neighbour Bottom" -msgstr "Centro Inferior" +msgstr "Vecino Inferior" #: scene/gui/control.cpp msgid "Next" @@ -23740,23 +23677,20 @@ msgid "Size Flags" msgstr "Tamaño de los Indicadores" #: scene/gui/control.cpp -#, fuzzy msgid "Stretch Ratio" -msgstr "Modo de Selección" +msgstr "Relación de Estiramiento" #: scene/gui/control.cpp -#, fuzzy msgid "Theme Type Variation" -msgstr "Propiedades del Theme" +msgstr "Propiedades del Tema" #: scene/gui/dialogs.cpp msgid "Window Title" msgstr "" #: scene/gui/dialogs.cpp -#, fuzzy msgid "Dialog" -msgstr "Diálogo XForm" +msgstr "Diálogo" #: scene/gui/dialogs.cpp msgid "Hide On OK" @@ -23771,18 +23705,16 @@ msgid "Please Confirm..." msgstr "Por favor, Confirma..." #: scene/gui/file_dialog.cpp -#, fuzzy msgid "Mode Overrides Title" -msgstr "Elemento de Anulación" +msgstr "Sobreescritura" #: scene/gui/file_dialog.cpp msgid "Must use a valid extension." msgstr "Debe tener una extensión válida." #: scene/gui/graph_edit.cpp -#, fuzzy msgid "Right Disconnects" -msgstr "Desconectar" +msgstr "Desconexión Correcta" #: scene/gui/graph_edit.cpp msgid "Scroll Offset" @@ -23793,24 +23725,20 @@ msgid "Snap Distance" msgstr "Ajustar Distancia" #: scene/gui/graph_edit.cpp -#, fuzzy msgid "Zoom Min" -msgstr "Acercar Zoom" +msgstr "Zoom Mínimo" #: scene/gui/graph_edit.cpp -#, fuzzy msgid "Zoom Max" -msgstr "Acercar Zoom" +msgstr "Zoom Máximo" #: scene/gui/graph_edit.cpp -#, fuzzy msgid "Zoom Step" -msgstr "Alejar Zoom" +msgstr "Paso Zoom" #: scene/gui/graph_edit.cpp -#, fuzzy msgid "Show Zoom Label" -msgstr "Mostrar Huesos" +msgstr "Mostrar Etiqueta Zoom" #: scene/gui/graph_edit.cpp scene/gui/text_edit.cpp #: scene/resources/default_theme/default_theme.cpp @@ -23822,58 +23750,50 @@ msgid "Enable grid minimap." msgstr "Activar minimapa de cuadrícula." #: scene/gui/graph_node.cpp -#, fuzzy msgid "Show Close" -msgstr "Mostrar Huesos" +msgstr "Mostrar Cerrar" #: scene/gui/graph_node.cpp scene/gui/option_button.cpp #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Selected" -msgstr "Seleccionar" +msgstr "Seleccionado" #: scene/gui/graph_node.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Comment" -msgstr "Confirmar" +msgstr "Comentario" #: scene/gui/graph_node.cpp msgid "Overlay" msgstr "" #: scene/gui/grid_container.cpp scene/gui/item_list.cpp scene/gui/tree.cpp -#, fuzzy msgid "Columns" -msgstr "Volumen" +msgstr "Columnas" #: scene/gui/item_list.cpp scene/gui/popup_menu.cpp scene/gui/text_edit.cpp #: scene/gui/tree.cpp scene/main/viewport.cpp -#, fuzzy msgid "Timers" -msgstr "Tiempo" +msgstr "Temporizadores" #: scene/gui/item_list.cpp scene/gui/popup_menu.cpp scene/gui/tree.cpp msgid "Incremental Search Max Interval Msec" msgstr "" #: scene/gui/item_list.cpp scene/gui/tree.cpp -#, fuzzy msgid "Allow Reselect" -msgstr "Aplicar Restablecer" +msgstr "Permitir Volver A Seleccionar" #: scene/gui/item_list.cpp scene/gui/tree.cpp -#, fuzzy msgid "Allow RMB Select" -msgstr "Rellenar Selección" +msgstr "Permitir Selección Con Botón Derecho Del Ratón" #: scene/gui/item_list.cpp msgid "Max Text Lines" msgstr "" #: scene/gui/item_list.cpp -#, fuzzy msgid "Auto Height" -msgstr "Prueba" +msgstr "Altura Automática" #: scene/gui/item_list.cpp msgid "Max Columns" @@ -23892,23 +23812,20 @@ msgid "Icon Scale" msgstr "Escala de Icono" #: scene/gui/item_list.cpp -#, fuzzy msgid "Fixed Icon Size" -msgstr "Vista Frontal" +msgstr "Tamaño Fijo de Icono" #: scene/gui/label.cpp -#, fuzzy msgid "V Align" -msgstr "Asignar" +msgstr "Alineamiento V" #: scene/gui/label.cpp scene/gui/rich_text_label.cpp msgid "Visible Characters" msgstr "Caracteres Visibles" #: scene/gui/label.cpp scene/gui/rich_text_label.cpp -#, fuzzy msgid "Percent Visible" -msgstr "Act./Desact. Visible" +msgstr "Porcentaje Visible" #: scene/gui/label.cpp msgid "Lines Skipped" @@ -23935,34 +23852,28 @@ msgid "Expand To Text Length" msgstr "" #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp -#, fuzzy msgid "Context Menu Enabled" -msgstr "Ayuda Contextual" +msgstr "Menú Contextual Activado" #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp -#, fuzzy msgid "Virtual Keyboard Enabled" -msgstr "Filtrar señales" +msgstr "Teclado Virtual Activado" #: scene/gui/line_edit.cpp -#, fuzzy msgid "Clear Button Enabled" -msgstr "Filtrar señales" +msgstr "Botón de Borrado Activado" #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp -#, fuzzy msgid "Shortcut Keys Enabled" -msgstr "Atajos" +msgstr "Atajos Activados" #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp -#, fuzzy msgid "Middle Mouse Paste Enabled" -msgstr "Filtrar señales" +msgstr "Pegar Con Botón Intermedio Ratón Activado" #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp -#, fuzzy msgid "Selecting Enabled" -msgstr "Sólo selección" +msgstr "Selección Activada" #: scene/gui/line_edit.cpp scene/gui/rich_text_label.cpp #: scene/gui/text_edit.cpp @@ -23970,14 +23881,12 @@ msgid "Deselect On Focus Loss Enabled" msgstr "" #: scene/gui/line_edit.cpp -#, fuzzy msgid "Right Icon" -msgstr "Botón Derecho" +msgstr "Icono Derecho" #: scene/gui/line_edit.cpp -#, fuzzy msgid "Placeholder" -msgstr "Cargar Como Placeholder" +msgstr "Marcador" #: scene/gui/line_edit.cpp msgid "Alpha" @@ -24000,24 +23909,20 @@ msgid "Underline" msgstr "" #: scene/gui/menu_button.cpp -#, fuzzy msgid "Switch On Hover" -msgstr "Cambiar" +msgstr "Cambiar Al Pasar Por Encima" #: scene/gui/nine_patch_rect.cpp scene/resources/style_box.cpp -#, fuzzy msgid "Draw Center" -msgstr "Centro" +msgstr "Dibujar al Centro" #: scene/gui/nine_patch_rect.cpp scene/resources/style_box.cpp -#, fuzzy msgid "Region Rect" -msgstr "Establecer Region Rect" +msgstr "Región Rectángulo" #: scene/gui/nine_patch_rect.cpp -#, fuzzy msgid "Patch Margin" -msgstr "Asignar Margen" +msgstr "Parche de Margen" #: scene/gui/nine_patch_rect.cpp scene/resources/style_box.cpp msgid "Axis Stretch" @@ -24036,14 +23941,12 @@ msgstr "" "como Stretch en su lugar." #: scene/gui/popup.cpp -#, fuzzy msgid "Popup" -msgstr "Rellenar" +msgstr "Popup" #: scene/gui/popup.cpp -#, fuzzy msgid "Exclusive" -msgstr "Inclusivo" +msgstr "Exclusivo" #: scene/gui/popup.cpp msgid "" @@ -24056,28 +23959,24 @@ msgstr "" "edición, pero se esconderán al iniciar." #: scene/gui/popup_menu.cpp -#, fuzzy msgid "Hide On Item Selection" -msgstr "Centrar Selección" +msgstr "Ocultar Al Seleccionar Elemento" #: scene/gui/popup_menu.cpp -#, fuzzy msgid "Hide On Checkable Item Selection" -msgstr "Eliminar Selección de GridMap" +msgstr "Ocultar Al Seleccionar Elemento Activable" #: scene/gui/popup_menu.cpp -#, fuzzy msgid "Hide On State Item Selection" -msgstr "Eliminar Selección" +msgstr "Ocultar Al Seleccionar Elemento de Estado" #: scene/gui/popup_menu.cpp msgid "Submenu Popup Delay" msgstr "" #: scene/gui/popup_menu.cpp -#, fuzzy msgid "Allow Search" -msgstr "Buscar" +msgstr "Permitir Búsqueda" #: scene/gui/progress_bar.cpp msgid "Percent" @@ -24088,28 +23987,24 @@ msgid "If \"Exp Edit\" is enabled, \"Min Value\" must be greater than 0." msgstr "Si \"Exp Edit\" está activado, \"Min Value\" debe ser mayor que 0." #: scene/gui/range.cpp scene/resources/curve.cpp -#, fuzzy msgid "Min Value" -msgstr "Fijar Valor" +msgstr "Valor Mínimo" #: scene/gui/range.cpp scene/resources/curve.cpp -#, fuzzy msgid "Max Value" -msgstr "Valor" +msgstr "Valor Máximo" #: scene/gui/range.cpp msgid "Page" msgstr "Página" #: scene/gui/range.cpp -#, fuzzy msgid "Exp Edit" -msgstr "Editar" +msgstr "Editar Exp" #: scene/gui/range.cpp -#, fuzzy msgid "Rounded" -msgstr "Agrupado" +msgstr "Redondeado" #: scene/gui/range.cpp msgid "Allow Greater" @@ -24120,24 +24015,20 @@ msgid "Allow Lesser" msgstr "" #: scene/gui/reference_rect.cpp -#, fuzzy msgid "Border Color" -msgstr "Cambiar Nombre del Elemento Color" +msgstr "Color Del Borde" #: scene/gui/reference_rect.cpp scene/resources/style_box.cpp -#, fuzzy msgid "Border Width" -msgstr "Píxeles del Borde" +msgstr "Anchura Del Borde" #: scene/gui/rich_text_effect.cpp -#, fuzzy msgid "Relative Index" -msgstr "Obtener Índice" +msgstr "Índice Relativo" #: scene/gui/rich_text_effect.cpp -#, fuzzy msgid "Absolute Index" -msgstr "Auto Sangría" +msgstr "Índice Absoluto" #: scene/gui/rich_text_effect.cpp msgid "Elapsed Time" @@ -24146,7 +24037,7 @@ msgstr "Tiempo Transcurrido" #: scene/gui/rich_text_effect.cpp #, fuzzy msgid "Env" -msgstr "Fin" +msgstr "Env" #: scene/gui/rich_text_effect.cpp msgid "Character" @@ -24165,9 +24056,8 @@ msgid "Tab Size" msgstr "Tamaño de Tabulación" #: scene/gui/rich_text_label.cpp -#, fuzzy msgid "Fit Content Height" -msgstr "Pintar Peso de Huesos" +msgstr "Ajustar Altura Del Contenido" #: scene/gui/rich_text_label.cpp msgid "Scroll Active" @@ -24178,23 +24068,20 @@ msgid "Scroll Following" msgstr "" #: scene/gui/rich_text_label.cpp -#, fuzzy msgid "Selection Enabled" -msgstr "Sólo selección" +msgstr "Selección Activada" #: scene/gui/rich_text_label.cpp scene/gui/text_edit.cpp msgid "Override Selected Font Color" msgstr "Sobrescribir Color de Fuente Seleccionada" #: scene/gui/rich_text_label.cpp -#, fuzzy msgid "Custom Effects" -msgstr "Mover Efecto de Bus" +msgstr "Efectos Personalizados" #: scene/gui/scroll_bar.cpp -#, fuzzy msgid "Custom Step" -msgstr "CustomNode" +msgstr "Paso Personalizado" #: scene/gui/scroll_container.cpp msgid "" @@ -24207,18 +24094,16 @@ msgstr "" "manualmente el tamaño mínimo personalizado." #: scene/gui/scroll_container.cpp -#, fuzzy msgid "Follow Focus" -msgstr "Llenar superficie" +msgstr "Seguir Focus" #: scene/gui/scroll_container.cpp msgid "Horizontal Enabled" msgstr "Horizontal Activado" #: scene/gui/scroll_container.cpp -#, fuzzy msgid "Vertical Enabled" -msgstr "Filtrar señales" +msgstr "Vertical Activada" #: scene/gui/scroll_container.cpp msgid "Default Scroll Deadzone" @@ -24229,9 +24114,8 @@ msgid "Scrollable" msgstr "" #: scene/gui/slider.cpp -#, fuzzy msgid "Tick Count" -msgstr "Seleccionar Color" +msgstr "Cantidad De Marcas" #: scene/gui/slider.cpp msgid "Ticks On Borders" @@ -24250,14 +24134,12 @@ msgid "Split Offset" msgstr "Desplazamiento de División" #: scene/gui/split_container.cpp scene/gui/tree.cpp -#, fuzzy msgid "Collapsed" -msgstr "Colapsar Todo" +msgstr "Colapsado" #: scene/gui/split_container.cpp -#, fuzzy msgid "Dragger Visibility" -msgstr "Cambiar Visibilidad" +msgstr "Visibilidad de los Arrastradores" #: scene/gui/tab_container.cpp scene/gui/tabs.cpp msgid "Tab Align" @@ -24268,9 +24150,8 @@ msgid "Current Tab" msgstr "Pestaña Actual" #: scene/gui/tab_container.cpp -#, fuzzy msgid "Tabs Visible" -msgstr "Act./Desact. Visible" +msgstr "Pestañas Visibles" #: scene/gui/tab_container.cpp msgid "All Tabs In Front" @@ -24297,18 +24178,16 @@ msgid "Readonly" msgstr "" #: scene/gui/text_edit.cpp -#, fuzzy msgid "Bookmark Gutter" -msgstr "Marcadores" +msgstr "Canalón de Marcadores" #: scene/gui/text_edit.cpp -#, fuzzy msgid "Breakpoint Gutter" -msgstr "Saltar Breakpoints" +msgstr "Canalón de Puntos de Ruptura" #: scene/gui/text_edit.cpp msgid "Fold Gutter" -msgstr "Plegar Gutter" +msgstr "Canalón Plegable" #: scene/gui/text_edit.cpp msgid "Drag And Drop Selection Enabled" @@ -24335,9 +24214,8 @@ msgid "Draw" msgstr "Dibujar" #: scene/gui/text_edit.cpp -#, fuzzy msgid "Block Mode" -msgstr "Desbloquear Nodo" +msgstr "Modo Bloque" #: scene/gui/text_edit.cpp msgid "Moving By Right Click" @@ -24356,34 +24234,29 @@ msgid "Hover" msgstr "" #: scene/gui/texture_button.cpp -#, fuzzy msgid "Focused" -msgstr "Foco en Ruta" +msgstr "Enfocado" #: scene/gui/texture_button.cpp -#, fuzzy msgid "Click Mask" -msgstr "Modo de Colisión" +msgstr "Máscara de Clic" #: scene/gui/texture_button.cpp scene/gui/texture_rect.cpp #: scene/gui/video_player.cpp -#, fuzzy msgid "Expand" -msgstr "Expandir Todo" +msgstr "Expandir" #: scene/gui/texture_progress.cpp msgid "Under" msgstr "" #: scene/gui/texture_progress.cpp -#, fuzzy msgid "Over" -msgstr "Sobreescribir" +msgstr "Sobre" #: scene/gui/texture_progress.cpp -#, fuzzy msgid "Progress" -msgstr "Propiedades del Theme" +msgstr "Progreso" #: scene/gui/texture_progress.cpp msgid "Progress Offset" @@ -24402,43 +24275,36 @@ msgid "Radial Fill" msgstr "" #: scene/gui/texture_progress.cpp -#, fuzzy msgid "Initial Angle" -msgstr "Inicializar" +msgstr "Ángulo Inicial" #: scene/gui/texture_progress.cpp msgid "Fill Degrees" msgstr "Completar Grados" #: scene/gui/texture_progress.cpp scene/resources/primitive_meshes.cpp -#, fuzzy msgid "Center Offset" -msgstr "Centro Izquierda" +msgstr "Desplazamiento Central" #: scene/gui/texture_progress.cpp -#, fuzzy msgid "Nine Patch Stretch" -msgstr "Modo de Interpolación" +msgstr "Estiramiento de Nine Patch" #: scene/gui/texture_progress.cpp -#, fuzzy msgid "Stretch Margin Left" -msgstr "Asignar Margen" +msgstr "Estiramiento de Margen Izquierdo" #: scene/gui/texture_progress.cpp -#, fuzzy msgid "Stretch Margin Top" -msgstr "Asignar Margen" +msgstr "Estiramiento de Margen Superior" #: scene/gui/texture_progress.cpp -#, fuzzy msgid "Stretch Margin Right" -msgstr "Asignar Margen" +msgstr "Estiramiento de Margen Derecho" #: scene/gui/texture_progress.cpp -#, fuzzy msgid "Stretch Margin Bottom" -msgstr "Modo de Selección" +msgstr "Estiramiento de Margen Inferior" #: scene/gui/tree.cpp msgid "Custom Minimum Height" @@ -24449,14 +24315,12 @@ msgid "(Other)" msgstr "(Otros)" #: scene/gui/tree.cpp -#, fuzzy msgid "Column Titles Visible" -msgstr "Act./Desact. Visible" +msgstr "Títulos de Columnas Visibles" #: scene/gui/tree.cpp -#, fuzzy msgid "Hide Folding" -msgstr "Botón Desactivado" +msgstr "Plegado de Pieles" #: scene/gui/tree.cpp msgid "Hide Root" @@ -24467,43 +24331,36 @@ msgid "Drop Mode Flags" msgstr "" #: scene/gui/video_player.cpp -#, fuzzy msgid "Audio Track" -msgstr "Agregar Pista" +msgstr "Pista de Audio" #: scene/gui/video_player.cpp scene/main/scene_tree.cpp scene/main/timer.cpp msgid "Paused" -msgstr "" +msgstr "Pausado" #: scene/gui/video_player.cpp -#, fuzzy msgid "Buffering Msec" -msgstr "Vista Trasera" +msgstr "Buffering Msec" #: scene/gui/video_player.cpp -#, fuzzy msgid "Stream Position" -msgstr "Establecer Posición de Entrada de Curva" +msgstr "Posición del Stream" #: scene/gui/viewport_container.cpp -#, fuzzy msgid "Stretch Shrink" -msgstr "Buscar" +msgstr "Encogimiento por Estiramiento" #: scene/main/canvas_layer.cpp -#, fuzzy msgid "Follow Viewport" -msgstr "Mostrar Viewport" +msgstr "Seguir el Viewport" #: scene/main/http_request.cpp -#, fuzzy msgid "Download File" -msgstr "Descargar" +msgstr "Descargar Archivo" #: scene/main/http_request.cpp -#, fuzzy msgid "Download Chunk Size" -msgstr "Descargando" +msgstr "Descargar Tamaño del Fragmento" #: scene/main/http_request.cpp msgid "Body Size Limit" @@ -24524,89 +24381,76 @@ msgid "" msgstr "" #: scene/main/node.cpp -#, fuzzy msgid "Name Num Separator" -msgstr "Separador con nombre" +msgstr "Separador Numérico del Nombre" #: scene/main/node.cpp msgid "Name Casing" msgstr "" #: scene/main/node.cpp -#, fuzzy msgid "Editor Description" -msgstr "Descripción" +msgstr "Descripción del Editor" #: scene/main/node.cpp -#, fuzzy msgid "Pause Mode" -msgstr "Modo desplazamiento lateral" +msgstr "Modo Pausa" #: scene/main/node.cpp -#, fuzzy msgid "Physics Interpolation Mode" -msgstr "Modo de Interpolación" +msgstr "Modo de Interpolación Física" #: scene/main/node.cpp -#, fuzzy msgid "Display Folded" -msgstr "Mostrar Sin Sombreado" +msgstr "Vista Plegada" #: scene/main/node.cpp -#, fuzzy msgid "Filename" -msgstr "Renombrar" +msgstr "Nombre del Archivo" #: scene/main/node.cpp msgid "Owner" msgstr "Propietario" #: scene/main/node.cpp scene/main/scene_tree.cpp -#, fuzzy msgid "Multiplayer" -msgstr "Multiplicar %s" +msgstr "Multijugador" #: scene/main/node.cpp msgid "Custom Multiplayer" msgstr "Multijugador Personalizado" #: scene/main/node.cpp -#, fuzzy msgid "Process Priority" -msgstr "Activar Prioridad" +msgstr "Prioridad del Proceso" #: scene/main/scene_tree.cpp scene/main/timer.cpp -#, fuzzy msgid "Time Left" -msgstr "Superior Izquierda" +msgstr "Tiempo Restante" #: scene/main/scene_tree.cpp -#, fuzzy msgid "Debug Collisions Hint" -msgstr "Modo de Colisión" +msgstr "Sugerencia de Depuración de Colisiones" #: scene/main/scene_tree.cpp -#, fuzzy msgid "Debug Navigation Hint" -msgstr "Modo de Navegación" +msgstr "Sugerencia de Depuración de Navegación" #: scene/main/scene_tree.cpp msgid "Use Font Oversampling" msgstr "" #: scene/main/scene_tree.cpp -#, fuzzy msgid "Edited Scene Root" -msgstr "Nueva Raíz de Escena" +msgstr "Escena Raíz Editada" #: scene/main/scene_tree.cpp msgid "Root" msgstr "" #: scene/main/scene_tree.cpp -#, fuzzy msgid "Multiplayer Poll" -msgstr "Multiplicar %s" +msgstr "Encuesta Multijugador" #: scene/main/scene_tree.cpp scene/resources/mesh_library.cpp #: scene/resources/shape_2d.cpp @@ -24618,32 +24462,28 @@ msgid "Shape Color" msgstr "" #: scene/main/scene_tree.cpp -#, fuzzy msgid "Contact Color" -msgstr "Seleccionar Color" +msgstr "Color de Contacto" #: scene/main/scene_tree.cpp msgid "Geometry Color" msgstr "" #: scene/main/scene_tree.cpp -#, fuzzy msgid "Disabled Geometry Color" -msgstr "Desactivar Elemento" +msgstr "Color de la Geometría Desactivada" #: scene/main/scene_tree.cpp msgid "Max Contacts Displayed" msgstr "" #: scene/main/scene_tree.cpp scene/resources/shape_2d.cpp -#, fuzzy msgid "Draw 2D Outlines" -msgstr "Crear Outline" +msgstr "Dibujar Contornos 2D" #: scene/main/scene_tree.cpp servers/visual_server.cpp -#, fuzzy msgid "Reflections" -msgstr "Direcciones" +msgstr "Reflexiones" #: scene/main/scene_tree.cpp msgid "Atlas Size" @@ -24674,9 +24514,8 @@ msgid "Use 32 BPC Depth" msgstr "" #: scene/main/scene_tree.cpp -#, fuzzy msgid "Default Environment" -msgstr "Ver Entorno" +msgstr "Entorno por Defecto" #: scene/main/scene_tree.cpp msgid "" @@ -24687,9 +24526,8 @@ msgstr "" "(Rendering -> Environment -> Default Environment) no se ha podido cargar." #: scene/main/scene_tree.cpp -#, fuzzy msgid "Enable Object Picking" -msgstr "Activar Papel Cebolla" +msgstr "Activar Selección de Objetos" #: scene/main/timer.cpp msgid "" @@ -24709,9 +24547,8 @@ msgid "Autostart" msgstr "Inicio Automático" #: scene/main/viewport.cpp -#, fuzzy msgid "Viewport Path" -msgstr "Ruta de Exportación" +msgstr "Ruta del Viewport" #: scene/main/viewport.cpp msgid "" @@ -24785,9 +24622,8 @@ msgid "Render Direct To Screen" msgstr "Renderización Directa en Pantalla" #: scene/main/viewport.cpp -#, fuzzy msgid "Debug Draw" -msgstr "Depurar" +msgstr "Depurar Dibujo" #: scene/main/viewport.cpp msgid "Render Target" @@ -24798,34 +24634,28 @@ msgid "V Flip" msgstr "" #: scene/main/viewport.cpp -#, fuzzy msgid "Clear Mode" -msgstr "Modo de Regla" +msgstr "Modo de Limpieza" #: scene/main/viewport.cpp -#, fuzzy msgid "Enable 2D" -msgstr "Activar" +msgstr "Activar 2D" #: scene/main/viewport.cpp -#, fuzzy msgid "Enable 3D" -msgstr "Activar" +msgstr "Activar 3D" #: scene/main/viewport.cpp -#, fuzzy msgid "Object Picking" -msgstr "Activar Papel Cebolla" +msgstr "Selección de Objetos" #: scene/main/viewport.cpp -#, fuzzy msgid "Disable Input" -msgstr "Desactivar Elemento" +msgstr "Desactivar Entrada" #: scene/main/viewport.cpp servers/visual_server.cpp -#, fuzzy msgid "Shadow Atlas" -msgstr "Nuevo Atlas" +msgstr "Sombra del Atlas" #: scene/main/viewport.cpp msgid "Quad 0" @@ -24844,78 +24674,66 @@ msgid "Quad 3" msgstr "" #: scene/main/viewport.cpp -#, fuzzy msgid "Canvas Transform" -msgstr "Reestablecer Transformación" +msgstr "Transformación del Canvas" #: scene/main/viewport.cpp -#, fuzzy msgid "Global Canvas Transform" -msgstr "Mantener transformación global" +msgstr "Transformación Global del Canvas" #: scene/main/viewport.cpp msgid "Tooltip Delay (sec)" -msgstr "" +msgstr "Retraso del Tooltip (sec)" #: scene/register_scene_types.cpp #, fuzzy msgid "Swap OK Cancel" -msgstr "Cancelar UI" +msgstr "Intercambio OK Cancelar" #: scene/register_scene_types.cpp -#, fuzzy msgid "Layer Names" -msgstr "Nombre" +msgstr "Nombres de las Capas" #: scene/register_scene_types.cpp -#, fuzzy msgid "2D Render" -msgstr "Renderización" +msgstr "Renderización 2D" #: scene/register_scene_types.cpp -#, fuzzy msgid "3D Render" -msgstr "Renderización" +msgstr "Renderización 3D" #: scene/register_scene_types.cpp -#, fuzzy msgid "2D Physics" -msgstr "Física" +msgstr "Física 2D" #: scene/register_scene_types.cpp -#, fuzzy msgid "3D Physics" -msgstr "Física" +msgstr "Física 3D" #: scene/register_scene_types.cpp -#, fuzzy msgid "2D Navigation" -msgstr "Navegación" +msgstr "Navegación 2D" #: scene/register_scene_types.cpp -#, fuzzy msgid "3D Navigation" -msgstr "Navegación" +msgstr "Navegación 3D" #: scene/register_scene_types.cpp msgid "Use hiDPI" msgstr "" #: scene/register_scene_types.cpp -#, fuzzy msgid "Custom" -msgstr "CustomNode" +msgstr "Personalizado" #: scene/register_scene_types.cpp -#, fuzzy msgid "Custom Font" -msgstr "CustomNode" +msgstr "Fuente Personalizada" #: scene/resources/audio_stream_sample.cpp #: servers/audio/effects/audio_stream_generator.cpp servers/audio_server.cpp -#, fuzzy msgid "Mix Rate" -msgstr "Nodo Mix" +msgstr "Tasa de Mezcla" #: scene/resources/audio_stream_sample.cpp msgid "Stereo" @@ -24926,9 +24744,8 @@ msgid "Segments" msgstr "Segmentos" #: scene/resources/curve.cpp -#, fuzzy msgid "Bake Resolution" -msgstr "Media Resolución" +msgstr "Bakear Resolución" #: scene/resources/curve.cpp msgid "Bake Interval" @@ -24939,77 +24756,64 @@ msgid "Panel" msgstr "" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Color" -msgstr "Seleccionar Color" +msgstr "Color de la Fuente" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Color Pressed" -msgstr "Color Hueso 1" +msgstr "Color de la Fuente Presionada" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Color Hover" -msgstr "Color Hueso 1" +msgstr "Color de la Fuente por Encima" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Color Focus" -msgstr "Llenar superficie" +msgstr "Color de la Fuente Enfocada" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Color Disabled" -msgstr "Clip Deshabilitado" +msgstr "Color de la Fuente Desactivada" #: scene/resources/default_theme/default_theme.cpp msgid "H Separation" msgstr "Separación en H" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Underline Spacing" -msgstr "Espaciado de Línea" +msgstr "Espaciado del Subrayado" #: scene/resources/default_theme/default_theme.cpp msgid "Arrow" msgstr "" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Arrow Margin" -msgstr "Asignar Margen" +msgstr "Margen de la Flecha" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Hover Pressed" -msgstr "Preset" +msgstr "Presionado por Encima" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Checked Disabled" -msgstr "Chequeable" +msgstr "Marcado Desactivado" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Unchecked" -msgstr "Chequeado" +msgstr "Sin marcar" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Unchecked Disabled" -msgstr "Desactivar Elemento" +msgstr "Sin marcar Desactivado" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Radio Checked" -msgstr "Chequeado" +msgstr "Radio Marcado" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Radio Checked Disabled" -msgstr "(Editor Desactivado)" +msgstr "Radio Marcado Desactivado" #: scene/resources/default_theme/default_theme.cpp msgid "Radio Unchecked" @@ -25030,27 +24834,23 @@ msgstr "" #: scene/resources/default_theme/default_theme.cpp #, fuzzy msgid "On Disabled" -msgstr "Desactivar Elemento" +msgstr "Desactivado" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Off" -msgstr "Desplazamiento" +msgstr "Apagado" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Off Disabled" -msgstr "Desactivar Elemento" +msgstr "Apagado Desactivado" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Color Shadow" -msgstr "Color Hueso 1" +msgstr "Color de la Sombra de la Fuente" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Outline Modulate" -msgstr "Forzar Modulación en Blanco" +msgstr "Modulación del Contorno de la Fuente" #: scene/resources/default_theme/default_theme.cpp msgid "Shadow Offset X" @@ -25061,59 +24861,50 @@ msgid "Shadow Offset Y" msgstr "Desplazamiento de la Sombra en Y" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Shadow As Outline" -msgstr "Mostrar Contorno Anterior" +msgstr "Sombra como Contorno" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Color Selected" -msgstr "Desbloquear Seleccionado" +msgstr "Color de Fuente Seleccionada" #: scene/resources/default_theme/default_theme.cpp msgid "Font Color Uneditable" msgstr "" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Cursor Color" -msgstr "CustomNode" +msgstr "Color del Cursor" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Clear Button Color" -msgstr "Filtrar señales" +msgstr "Limpiar Color del Botón" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Clear Button Color Pressed" -msgstr "Filtrar señales" +msgstr "Limpiar Color del Botón Presionado" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Minimum Spaces" -msgstr "Escena Principal" +msgstr "Espacios Mínimos" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "BG" -msgstr "B" +msgstr "BG" #: scene/resources/default_theme/default_theme.cpp msgid "FG" msgstr "" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Tab" -msgstr "Tab 1" +msgstr "Tab" #: scene/resources/default_theme/default_theme.cpp #: scene/resources/dynamic_font.cpp scene/resources/world.cpp #: scene/resources/world_2d.cpp -#, fuzzy msgid "Space" -msgstr "Escena Principal" +msgstr "Espacio" #: scene/resources/default_theme/default_theme.cpp msgid "Folded" @@ -25128,9 +24919,8 @@ msgid "Font Color Readonly" msgstr "" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Completion Lines" -msgstr "Completar" +msgstr "Finalización de Líneas" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -26907,7 +26697,7 @@ msgstr "Margen de Conexión de Bordes" #: scene/resources/world_2d.cpp msgid "Canvas" -msgstr "" +msgstr "Lienzo" #: servers/arvr/arvr_interface.cpp msgid "Is Primary" diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po index b37d9dcfd8..10a562d0b8 100644 --- a/editor/translations/es_AR.po +++ b/editor/translations/es_AR.po @@ -2800,7 +2800,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Copiar Ruta del Nodo" #: editor/editor_export.cpp @@ -20742,15 +20742,15 @@ msgstr "No se pudo encontrar la keystore, no se puedo exportar." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Archivo ejecutable no válido." #: platform/windows/export/export.cpp #, fuzzy @@ -20774,15 +20774,15 @@ msgstr "Nombre inválido." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Archivo ejecutable no válido." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/et.po b/editor/translations/et.po index 1f3fe075df..3976c9f0bd 100644 --- a/editor/translations/et.po +++ b/editor/translations/et.po @@ -2789,7 +2789,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Kopeeri sõlme tee" #: editor/editor_export.cpp @@ -20013,15 +20013,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Vigane nimi." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20043,15 +20043,15 @@ msgstr "Vigane nimi." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Vigane nimi." #: platform/windows/export/export.cpp msgid "Failed to remove temporary file \"%s\"." diff --git a/editor/translations/eu.po b/editor/translations/eu.po index 2555dfa8d3..3e69f3c4b9 100644 --- a/editor/translations/eu.po +++ b/editor/translations/eu.po @@ -2756,8 +2756,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Kargatu animazioa" #: editor/editor_export.cpp #, fuzzy @@ -19815,15 +19816,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Animazio izen baliogabea!" #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -19845,15 +19846,15 @@ msgstr "Animazio izen baliogabea!" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Animazio izen baliogabea!" #: platform/windows/export/export.cpp msgid "Failed to remove temporary file \"%s\"." diff --git a/editor/translations/fa.po b/editor/translations/fa.po index a0202d3254..86b847e530 100644 --- a/editor/translations/fa.po +++ b/editor/translations/fa.po @@ -2840,7 +2840,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "کپی کردن مسیر node" #: editor/editor_export.cpp @@ -20752,15 +20752,15 @@ msgstr "نمیتواند یک پوشه ایجاد شود." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "باید از یک پسوند معتبر استفاده شود." #: platform/windows/export/export.cpp #, fuzzy @@ -20784,15 +20784,15 @@ msgstr "نام نامعتبر." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "باید از یک پسوند معتبر استفاده شود." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/fi.po b/editor/translations/fi.po index 28b4581d60..db841ef48a 100644 --- a/editor/translations/fi.po +++ b/editor/translations/fi.po @@ -2864,7 +2864,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Kopioi solmun polku" #: editor/editor_export.cpp @@ -20756,17 +20756,17 @@ msgstr "Keystorea ei löytynyt, ei voida viedä." #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" "rcedit-työkalu täytyy olla konfiguroituna editorin asetuksissa (Export > " "Windows > Rcedit) ikonin tai sovelluksen tietojen muuttamiseksi." #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Virheellinen käynnistystiedosto." #: platform/windows/export/export.cpp #, fuzzy @@ -20791,17 +20791,17 @@ msgstr "Virheellinen nimi." #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" "rcedit-työkalu täytyy olla konfiguroituna editorin asetuksissa (Export > " "Windows > Rcedit) ikonin tai sovelluksen tietojen muuttamiseksi." #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Virheellinen käynnistystiedosto." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/fil.po b/editor/translations/fil.po index 4671a2aeaf..0a154fd6ae 100644 --- a/editor/translations/fil.po +++ b/editor/translations/fil.po @@ -2712,8 +2712,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Pagulit ng Animation" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19501,14 +19502,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19530,14 +19530,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/fr.po b/editor/translations/fr.po index 85a3e54c1d..88c4966b54 100644 --- a/editor/translations/fr.po +++ b/editor/translations/fr.po @@ -101,13 +101,14 @@ # Arnaud Lier <arnaud@ric-rac.org>, 2022. # Jérémie Guegain <mirejai@orange.fr>, 2022. # cwulveryck <cwulveryck@online.fr>, 2022. +# Helix Sir <vincentbarkmann@gmail.com>, 2022. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2022-07-16 06:20+0000\n" -"Last-Translator: cwulveryck <cwulveryck@online.fr>\n" +"PO-Revision-Date: 2022-08-05 01:04+0000\n" +"Last-Translator: Helix Sir <vincentbarkmann@gmail.com>\n" "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/" "godot/fr/>\n" "Language: fr\n" @@ -147,11 +148,11 @@ msgstr "Lissage de Delta" #: core/bind/core_bind.cpp msgid "Low Processor Usage Mode" -msgstr "Mode d'Utilisation Faible du Processeur" +msgstr "Mode d'utilisation faible du processeur" #: core/bind/core_bind.cpp msgid "Low Processor Usage Mode Sleep (µsec)" -msgstr "Mode d'Utilisation Faible du Processeur (µs)" +msgstr "Mode d'utilisation faible du processeur Veille (µsec)" #: core/bind/core_bind.cpp main/main.cpp platform/uwp/os_uwp.cpp msgid "Keep Screen On" @@ -244,9 +245,8 @@ msgid "Time Scale" msgstr "Echelle de temps" #: core/bind/core_bind.cpp main/main.cpp -#, fuzzy msgid "Physics Jitter Fix" -msgstr "Correction de la physique gigue" +msgstr "Correction des sursauts de physique" #: core/bind/core_bind.cpp editor/plugins/version_control_editor_plugin.cpp msgid "Error" @@ -316,9 +316,8 @@ msgid "Page Size" msgstr "Taille de page" #: core/io/file_access_network.cpp -#, fuzzy msgid "Page Read Ahead" -msgstr "Page lue devant" +msgstr "Pré-lecture de page" #: core/io/http_client.cpp msgid "Blocking Mode Enabled" @@ -329,9 +328,8 @@ msgid "Connection" msgstr "Connexion" #: core/io/http_client.cpp -#, fuzzy msgid "Read Chunk Size" -msgstr "Lire la taille du tronçon" +msgstr "Taile des tronçons de lecture" #: core/io/marshalls.cpp msgid "Object ID" @@ -375,7 +373,7 @@ msgstr "Taille maximale du tampon de sortie" #: core/io/packet_peer.cpp msgid "Stream Peer" -msgstr "" +msgstr "Pair de flux" #: core/io/stream_peer.cpp msgid "Big Endian" @@ -488,9 +486,8 @@ msgid "Command" msgstr "Commande" #: core/os/input_event.cpp -#, fuzzy msgid "Physical" -msgstr " (physique)" +msgstr "Physique" #: core/os/input_event.cpp scene/2d/touch_screen_button.cpp #: scene/gui/base_button.cpp scene/gui/texture_button.cpp @@ -500,7 +497,7 @@ msgstr "Pressé" #: core/os/input_event.cpp msgid "Scancode" -msgstr "Scancode" +msgstr "Code de scan" #: core/os/input_event.cpp msgid "Physical Scancode" @@ -543,9 +540,8 @@ msgid "Pressure" msgstr "Pression" #: core/os/input_event.cpp -#, fuzzy msgid "Pen Inverted" -msgstr "Inverser" +msgstr "Stylo Inversé" #: core/os/input_event.cpp msgid "Relative" @@ -624,7 +620,7 @@ msgstr "Application" #: core/project_settings.cpp main/main.cpp msgid "Config" -msgstr "Config" +msgstr "Configuration" #: core/project_settings.cpp msgid "Project Settings Override" @@ -731,9 +727,8 @@ msgid "Editor" msgstr "Éditeur" #: core/project_settings.cpp -#, fuzzy msgid "Main Run Args" -msgstr "Arguments de la scène principale :" +msgstr "Paramètres d'exécution du programme principal" #: core/project_settings.cpp msgid "Scene Naming" @@ -797,9 +792,8 @@ msgid "UI Down" msgstr "Bas" #: core/project_settings.cpp -#, fuzzy msgid "UI Page Up" -msgstr "Page Haut" +msgstr "Page Haut (Interface)" #: core/project_settings.cpp msgid "UI Page Down" @@ -835,9 +829,8 @@ msgid "3D" msgstr "3D" #: core/project_settings.cpp -#, fuzzy msgid "Smooth Trimesh Collision" -msgstr "Collision Lisse Trimesh" +msgstr "Lissage de Collision Trimesh" #: core/project_settings.cpp drivers/gles2/rasterizer_canvas_base_gles2.cpp #: drivers/gles2/rasterizer_scene_gles2.cpp @@ -918,9 +911,8 @@ msgid "Compression Level" msgstr "Niveau de Compression" #: core/project_settings.cpp -#, fuzzy msgid "Window Log Size" -msgstr "Taille de la fenêtre du journal" +msgstr "Taille du journal de la fenêtre" #: core/project_settings.cpp msgid "Zlib" @@ -948,10 +940,9 @@ msgstr "Délai d'expiration de la connexion en secondes" #: core/register_core_types.cpp msgid "Packet Peer Stream" -msgstr "" +msgstr "Flux de pair de paquet" #: core/register_core_types.cpp -#, fuzzy msgid "Max Buffer (Power of 2)" msgstr "Tampon Max (puissance de 2)" @@ -993,7 +984,6 @@ msgid "Test" msgstr "Test" #: core/translation.cpp scene/resources/font.cpp -#, fuzzy msgid "Fallback" msgstr "Repli" @@ -1036,12 +1026,12 @@ msgstr "Tampons" #: drivers/gles2/rasterizer_canvas_base_gles2.cpp #: drivers/gles3/rasterizer_canvas_base_gles3.cpp msgid "Canvas Polygon Buffer Size (KB)" -msgstr "" +msgstr "Taille du tampon des polygones du canevas (Ko)" #: drivers/gles2/rasterizer_canvas_base_gles2.cpp #: drivers/gles3/rasterizer_canvas_base_gles3.cpp msgid "Canvas Polygon Index Buffer Size (KB)" -msgstr "" +msgstr "Taille de l'index des polygones du canevas (Ko)" #: drivers/gles2/rasterizer_canvas_base_gles2.cpp #: drivers/gles3/rasterizer_canvas_base_gles3.cpp editor/editor_settings.cpp @@ -1057,15 +1047,13 @@ msgstr "2D" #: drivers/gles2/rasterizer_canvas_base_gles2.cpp #: drivers/gles3/rasterizer_canvas_base_gles3.cpp -#, fuzzy msgid "Snapping" -msgstr "Magnétisme intelligent" +msgstr "Magnétisme" #: drivers/gles2/rasterizer_canvas_base_gles2.cpp #: drivers/gles3/rasterizer_canvas_base_gles3.cpp -#, fuzzy msgid "Use GPU Pixel Snap" -msgstr "Aligner au pixel près" +msgstr "Arrondissement GPU au pixel le plus proche" #: drivers/gles2/rasterizer_scene_gles2.cpp #: drivers/gles3/rasterizer_scene_gles3.cpp @@ -1074,9 +1062,8 @@ msgstr "Taille du tampon immédiat (Ko)" #: drivers/gles2/rasterizer_storage_gles2.cpp #: drivers/gles3/rasterizer_storage_gles3.cpp -#, fuzzy msgid "Lightmapping" -msgstr "Précalculer les lightmaps" +msgstr "Cartographie des lumières" #: drivers/gles2/rasterizer_storage_gles2.cpp #: drivers/gles3/rasterizer_storage_gles3.cpp @@ -1100,7 +1087,6 @@ msgid "Max Lights Per Object" msgstr "Maximum de lumières par objet" #: drivers/gles3/rasterizer_scene_gles3.cpp -#, fuzzy msgid "Subsurface Scattering" msgstr "Transluminescence" @@ -1122,13 +1108,12 @@ msgid "Follow Surface" msgstr "Suivre la surface" #: drivers/gles3/rasterizer_scene_gles3.cpp -#, fuzzy msgid "Weight Samples" msgstr "Échantillons de poids" #: drivers/gles3/rasterizer_scene_gles3.cpp msgid "Voxel Cone Tracing" -msgstr "" +msgstr "Traçage de cone voxel" #: drivers/gles3/rasterizer_scene_gles3.cpp scene/resources/environment.cpp msgid "High Quality" @@ -1136,7 +1121,7 @@ msgstr "Haute Qualité" #: drivers/gles3/rasterizer_storage_gles3.cpp msgid "Blend Shape Max Buffer Size (KB)" -msgstr "" +msgstr "Taille max du tampon de mélange de formes" #. TRANSLATORS: Adjective, refers to the mode for Bezier handles (Free, Balanced, Mirror). #: editor/animation_bezier_editor.cpp @@ -1193,7 +1178,7 @@ msgstr "Modifier le temps de l’image-clé" #: editor/animation_track_editor.cpp msgid "Anim Change Transition" -msgstr "Changer la transition de l’animation" +msgstr "Transition de changement de l’animation" #: editor/animation_track_editor.cpp msgid "Anim Change Transform" @@ -1253,14 +1238,12 @@ msgid "Type" msgstr "Type" #: editor/animation_track_editor.cpp -#, fuzzy msgid "In Handle" -msgstr "Définir la poignée" +msgstr "Poignée d'entrée" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Out Handle" -msgstr "Définir la poignée" +msgstr "Poignée de sortie" #: editor/animation_track_editor.cpp #: editor/import/resource_importer_texture.cpp @@ -1274,7 +1257,6 @@ msgid "Start Offset" msgstr "Décalage du Départ" #: editor/animation_track_editor.cpp -#, fuzzy msgid "End Offset" msgstr "Décalage à la fin" @@ -1289,9 +1271,8 @@ msgid "Animation" msgstr "Animation" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Easing" -msgstr "Ease in-out" +msgstr "Transition entrée-sortie" #: editor/animation_track_editor.cpp msgid "Anim Multi Change Keyframe Time" @@ -1430,38 +1411,32 @@ msgid "(Invalid, expected type: %s)" msgstr "(Invalide, type attendu : %s)" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Easing:" -msgstr "Ease in-out" +msgstr "Transition entrée-sortie :" #: editor/animation_track_editor.cpp -#, fuzzy msgid "In-Handle:" -msgstr "Définir la poignée" +msgstr "Poignée d'entrée :" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Out-Handle:" -msgstr "Définir la poignée" +msgstr "Poignée de sortie :" #: editor/animation_track_editor.cpp msgid "Stream:" msgstr "Flux :" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Start (s):" -msgstr "Redémarrer (s) :" +msgstr "Début (s) :" #: editor/animation_track_editor.cpp -#, fuzzy msgid "End (s):" -msgstr "Fondu entrant (s) :" +msgstr "Fin (s) :" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Animation Clip:" -msgstr "Animations :" +msgstr "Clip d'animation :" #: editor/animation_track_editor.cpp msgid "Toggle Track Enabled" @@ -1549,9 +1524,8 @@ msgid "Editors" msgstr "Éditeurs" #: editor/animation_track_editor.cpp editor/editor_settings.cpp -#, fuzzy msgid "Confirm Insert Track" -msgstr "Insérer une piste et clé d’animation" +msgstr "Confirmer l'ajout de piste" #. TRANSLATORS: %s will be replaced by a phrase describing the target of track. #: editor/animation_track_editor.cpp @@ -2867,8 +2841,8 @@ msgid "Project export for platform:" msgstr "Exportation du projet pour la plateforme :" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "Terminé avec des erreurs." +msgid "Completed with warnings." +msgstr "Terminé avec des avertissements." #: editor/editor_export.cpp msgid "Completed successfully." @@ -2988,9 +2962,8 @@ msgid "64 Bits" msgstr "64 Bits" #: editor/editor_export.cpp -#, fuzzy msgid "Embed PCK" -msgstr "PCK Intégré" +msgstr "Intégrer PCK" #: editor/editor_export.cpp platform/osx/export/export.cpp msgid "Texture Format" @@ -3029,9 +3002,8 @@ msgid "Custom release template not found." msgstr "Modèle de version personnalisée introuvable." #: editor/editor_export.cpp -#, fuzzy msgid "Prepare Template" -msgstr "Gérer les modèles" +msgstr "Préparer le modèle type" #: editor/editor_export.cpp platform/osx/export/export.cpp msgid "The given export path doesn't exist." @@ -3047,9 +3019,8 @@ msgstr "La copie du modèle d'exportation a échoué." #: editor/editor_export.cpp platform/windows/export/export.cpp #: platform/x11/export/export.cpp -#, fuzzy msgid "PCK Embedding" -msgstr "Intégration du PCK" +msgstr "Intégration PCK" #: editor/editor_export.cpp msgid "On 32-bit exports the embedded PCK cannot be bigger than 4 GiB." @@ -3270,9 +3241,8 @@ msgid "Manage Editor Feature Profiles" msgstr "Gérer les profils de fonctionnalités de l'éditeur" #: editor/editor_feature_profile.cpp -#, fuzzy msgid "Default Feature Profile" -msgstr "Profil des fonctionnalités de Godot" +msgstr "Profil de fonctionalités par défaut" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Select Current Folder" @@ -3383,7 +3353,6 @@ msgid "Show Hidden Files" msgstr "Afficher les fichiers cachés" #: editor/editor_file_dialog.cpp -#, fuzzy msgid "Disable Overwrite Warning" msgstr "Désactiver l'avertissement de réécriture" @@ -3688,25 +3657,21 @@ msgid "Read Only" msgstr "Lecture Seule" #: editor/editor_inspector.cpp editor/plugins/item_list_editor_plugin.cpp -#, fuzzy msgid "Checkable" -msgstr "Item à cocher" +msgstr "Cochable" #: editor/editor_inspector.cpp editor/plugins/item_list_editor_plugin.cpp #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Checked" -msgstr "Item coché" +msgstr "Coché" #: editor/editor_inspector.cpp -#, fuzzy msgid "Draw Red" -msgstr "Appels de dessin :" +msgstr "Dessiner en rouge" #: editor/editor_inspector.cpp -#, fuzzy msgid "Keying" -msgstr "Jouer" +msgstr "En train de taper" #: editor/editor_inspector.cpp msgid "Pin value" @@ -4080,10 +4045,8 @@ msgid "Save & Reload" msgstr "Sauvegarder & Recharger" #: editor/editor_node.cpp -#, fuzzy msgid "Save changes to '%s' before reloading?" -msgstr "" -"Sauvegarder les modifications effectuées dans « %s » avant de recharger ?" +msgstr "Sauvegarder les modifications dans '%s' avant de recharger ?" #: editor/editor_node.cpp msgid "Save & Close" @@ -4202,11 +4165,9 @@ msgid "Open Project Manager?" msgstr "Ouvrir le gestionnaire de projets ?" #: editor/editor_node.cpp -#, fuzzy msgid "Save changes to the following scene(s) before reloading?" msgstr "" -"Sauvegarder les modifications sur la (les) scène(s) suivante(s) avant de " -"quitter ?" +"Sauvegarder les modifications de scène(s) suivante(s) avant de recharger ?" #: editor/editor_node.cpp msgid "Save & Quit" @@ -4411,9 +4372,8 @@ msgid "Interface" msgstr "Interface" #: editor/editor_node.cpp editor/editor_settings.cpp -#, fuzzy msgid "Scene Tabs" -msgstr "Basculer entre onglets de scène" +msgstr "Onglets de scène" #: editor/editor_node.cpp msgid "Always Show Close Button" @@ -4448,7 +4408,6 @@ msgid "Save On Focus Loss" msgstr "Enregistrer lorsque le focus est perdu" #: editor/editor_node.cpp editor/editor_settings.cpp -#, fuzzy msgid "Save Each Scene On Quit" msgstr "Enregistrer toutes les scènes à la fermeture" @@ -4470,12 +4429,10 @@ msgid "Update Vital Only" msgstr "Changements de matériau" #: editor/editor_node.cpp -#, fuzzy msgid "Localize Settings" -msgstr "Localisation" +msgstr "Traduction des réglages" #: editor/editor_node.cpp -#, fuzzy msgid "Restore Scenes On Load" msgstr "Restaurer les scènes au chargement" @@ -4488,7 +4445,6 @@ msgid "Inspector" msgstr "Inspecteur" #: editor/editor_node.cpp -#, fuzzy msgid "Default Property Name Style" msgstr "Style par défaut des noms de propriétés" @@ -4497,12 +4453,10 @@ msgid "Default Float Step" msgstr "Pas par défaut des flottant" #: editor/editor_node.cpp scene/gui/tree.cpp -#, fuzzy msgid "Disable Folding" -msgstr "Bouton désactivé" +msgstr "Désactiver le repliage" #: editor/editor_node.cpp -#, fuzzy msgid "Auto Unfold Foreign Scenes" msgstr "Déplier automatiquement les scènes étrangères" @@ -4511,7 +4465,6 @@ msgid "Horizontal Vector2 Editing" msgstr "Édition horizontale de Vector2" #: editor/editor_node.cpp -#, fuzzy msgid "Horizontal Vector Types Editing" msgstr "Édition de Types de Vecteur Horizontal" @@ -4520,12 +4473,10 @@ msgid "Open Resources In Current Inspector" msgstr "Ouvrir les ressources dans l'inspecteur actuel" #: editor/editor_node.cpp -#, fuzzy msgid "Resources To Open In New Inspector" msgstr "Ressources à ouvrir dans un nouvel inspecteur" #: editor/editor_node.cpp -#, fuzzy msgid "Default Color Picker Mode" msgstr "Mode par défaut du sélectionneur de couleur" @@ -5187,14 +5138,12 @@ msgid "Debugger" msgstr "Débogueur" #: editor/editor_profiler.cpp -#, fuzzy msgid "Profiler Frame History Size" msgstr "Taille de l'historique de la trame du profileur" #: editor/editor_profiler.cpp -#, fuzzy msgid "Profiler Frame Max Functions" -msgstr "Renommer la fonction" +msgstr "Nombre maximum de fonctions par trame de profileur" #: editor/editor_properties.cpp msgid "Edit Text:" @@ -5409,12 +5358,10 @@ msgid "Code Font Size" msgstr "Taille de la police du code" #: editor/editor_settings.cpp -#, fuzzy msgid "Font Antialiased" -msgstr "Anticrénelage appliqué sur la police" +msgstr "Police anticrénelée" #: editor/editor_settings.cpp -#, fuzzy msgid "Font Hinting" msgstr "Indication de police" @@ -5435,18 +5382,16 @@ msgid "Dim Editor On Dialog Popup" msgstr "Assombrir l'éditeur à l'ouverture d'un dialogue" #: editor/editor_settings.cpp main/main.cpp -#, fuzzy msgid "Low Processor Mode Sleep (µsec)" -msgstr "Mode de faible latence Processeur" +msgstr "Veille du Mode faible latence Processeur (µsec)" #: editor/editor_settings.cpp msgid "Unfocused Low Processor Mode Sleep (µsec)" -msgstr "" +msgstr "Veille du mode d'utilisation faible du processeur quand inactif (µsec)" #: editor/editor_settings.cpp -#, fuzzy msgid "Separate Distraction Mode" -msgstr "Mode Sans Distraction" +msgstr "Mode distraction séparée" #: editor/editor_settings.cpp msgid "Automatically Open Screenshots" @@ -5454,7 +5399,7 @@ msgstr "Ouvrir automatiquement les captures d'écran" #: editor/editor_settings.cpp msgid "Max Array Dictionary Items Per Page" -msgstr "" +msgstr "Nombre maximum d'articles tableau de dictionnaire par page" #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp #: editor/plugins/theme_editor_plugin.cpp scene/gui/control.cpp @@ -5475,9 +5420,8 @@ msgid "Base Color" msgstr "Couleur de Base" #: editor/editor_settings.cpp -#, fuzzy msgid "Accent Color" -msgstr "Prélever une couleur" +msgstr "Couleur d'accentuation" #: editor/editor_settings.cpp scene/resources/environment.cpp msgid "Contrast" @@ -5485,69 +5429,59 @@ msgstr "Contraste" #: editor/editor_settings.cpp msgid "Relationship Line Opacity" -msgstr "" +msgstr "Opacité des lignes de relation" #: editor/editor_settings.cpp -#, fuzzy msgid "Highlight Tabs" -msgstr "Enregistrement des lightmaps" +msgstr "Surligner les onglets" #: editor/editor_settings.cpp -#, fuzzy msgid "Border Size" -msgstr "Pixels de bordure" +msgstr "Taille de bordure" #: editor/editor_settings.cpp -#, fuzzy msgid "Use Graph Node Headers" -msgstr "Utiliser les en-tête de noeud Graph" +msgstr "Utiliser les en-têtes de graphes des nœuds" #: editor/editor_settings.cpp -#, fuzzy msgid "Additional Spacing" -msgstr "Bouclage de l’animation" +msgstr "Espacement supplémentaire" #: editor/editor_settings.cpp msgid "Custom Theme" msgstr "Thème Personnalisé" #: editor/editor_settings.cpp -#, fuzzy msgid "Show Script Button" -msgstr "Molette bouton droit" +msgstr "Afficher le bouton script" #: editor/editor_settings.cpp -#, fuzzy msgid "Directories" -msgstr "Directions" +msgstr "Dossiers" #: editor/editor_settings.cpp -#, fuzzy msgid "Autoscan Project Path" -msgstr "Chemin du projet :" +msgstr "Scan auto du chemin du projet" #: editor/editor_settings.cpp msgid "Default Project Path" msgstr "Chemin du Projet par Défaut" #: editor/editor_settings.cpp -#, fuzzy msgid "On Save" -msgstr "Enregistrer" +msgstr "À l'enregistrement" #: editor/editor_settings.cpp msgid "Compress Binary Resources" msgstr "Compresser les ressources binaires" #: editor/editor_settings.cpp -#, fuzzy msgid "Safe Save On Backup Then Rename" -msgstr "Sauvegarde sécurisée lors de l'archivage puis renommer" +msgstr "Sauvegarde sécurisée lors de l'archivage avant de renommer" #: editor/editor_settings.cpp -#, fuzzy msgid "File Dialog" -msgstr "Dialogue XForm" +msgstr "Fenêtre de sélection de fichiers" #: editor/editor_settings.cpp msgid "Thumbnail Size" @@ -5555,21 +5489,19 @@ msgstr "Taille de la vignette" #: editor/editor_settings.cpp msgid "Docks" -msgstr "" +msgstr "S'attache" #: editor/editor_settings.cpp msgid "Scene Tree" msgstr "une arborescence, arbre des scènes" #: editor/editor_settings.cpp -#, fuzzy msgid "Start Create Dialog Fully Expanded" -msgstr "Lancer le dialogue de Création totalement expandu" +msgstr "Lancer le dialogue de création complètement déplié" #: editor/editor_settings.cpp -#, fuzzy msgid "Always Show Folders" -msgstr "Toujours afficher la grille" +msgstr "Toujours afficher les dossiers" #: editor/editor_settings.cpp msgid "Property Editor" @@ -5580,29 +5512,24 @@ msgid "Auto Refresh Interval" msgstr "Intervalle d’autorafraîchissement" #: editor/editor_settings.cpp -#, fuzzy msgid "Subresource Hue Tint" -msgstr "Ressources secondaires" +msgstr "Teinte des sous-ressources" #: editor/editor_settings.cpp -#, fuzzy msgid "Color Theme" -msgstr "Thème de l'éditeur" +msgstr "Thème de couleurs" #: editor/editor_settings.cpp scene/3d/label_3d.cpp #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Line Spacing" msgstr "Espace entre les lignes" #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp #: modules/gdscript/editor/gdscript_highlighter.cpp -#, fuzzy msgid "Highlighting" -msgstr "Éclairage direct" +msgstr "Surlignage" #: editor/editor_settings.cpp scene/gui/text_edit.cpp -#, fuzzy msgid "Syntax Highlighting" msgstr "Coloration syntaxique" @@ -5615,32 +5542,28 @@ msgid "Highlight Current Line" msgstr "Mettre en évidence la ligne actuelle" #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Highlight Type Safe Lines" -msgstr "Surligner les lignes Typées" +msgstr "Surligner les lignes à types sûrs" #: editor/editor_settings.cpp -#, fuzzy msgid "Indent" -msgstr "Indenter vers la gauche" +msgstr "Indenter" #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "Indentation automatique" #: editor/editor_settings.cpp -#, fuzzy msgid "Convert Indent On Save" -msgstr "Convertir indentations en espaces" +msgstr "Convertir les indentations à l'enregistrement" #: editor/editor_settings.cpp scene/gui/text_edit.cpp msgid "Draw Tabs" msgstr "Montrer les tabulations" #: editor/editor_settings.cpp scene/gui/text_edit.cpp -#, fuzzy msgid "Draw Spaces" -msgstr "Appels de dessin :" +msgstr "Afficher les espaces" #: editor/editor_settings.cpp editor/plugins/spatial_editor_plugin.cpp #: editor/plugins/tile_set_editor_plugin.cpp scene/2d/tile_map.cpp @@ -5658,9 +5581,8 @@ msgid "V Scroll Speed" msgstr "Vitesse du défilement vertical" #: editor/editor_settings.cpp -#, fuzzy msgid "Show Minimap" -msgstr "Afficher l'origine" +msgstr "Afficher la minimap" #: editor/editor_settings.cpp msgid "Minimap Width" @@ -5668,16 +5590,15 @@ msgstr "Largeur de la mini-carte" #: editor/editor_settings.cpp msgid "Mouse Extra Buttons Navigate History" -msgstr "" +msgstr "Boutons additionnels de la souris déplacent dans l'historique" #: editor/editor_settings.cpp -#, fuzzy msgid "Drag And Drop Selection" -msgstr "Sélection de la GridMap" +msgstr "Sélection glisser/déposer" #: editor/editor_settings.cpp msgid "Stay In Script Editor On Node Selected" -msgstr "" +msgstr "Rester sur l’éditeur de script en sélectionnant un nœud" #: editor/editor_settings.cpp msgid "Appearance" @@ -5688,21 +5609,18 @@ msgid "Show Line Numbers" msgstr "Afficher les Numéros de Ligne" #: editor/editor_settings.cpp -#, fuzzy msgid "Line Numbers Zero Padded" -msgstr "Numéro de ligne :" +msgstr "Numéros de lignes avec remplissage en zéros" #: editor/editor_settings.cpp msgid "Show Bookmark Gutter" msgstr "Montrer le bandeau de marque-page" #: editor/editor_settings.cpp -#, fuzzy msgid "Show Breakpoint Gutter" -msgstr "Passer les points d'arrêt" +msgstr "Afficher le bandeau de points d’arrêt" #: editor/editor_settings.cpp -#, fuzzy msgid "Show Info Gutter" msgstr "Montrer le bandeau d'information" @@ -5712,26 +5630,25 @@ msgstr "Rétrécir le code" #: editor/editor_settings.cpp msgid "Word Wrap" -msgstr "" +msgstr "Retour à la ligne des mots" #: editor/editor_settings.cpp msgid "Show Line Length Guidelines" -msgstr "" +msgstr "Montrer les guides de longueur de ligne" #: editor/editor_settings.cpp msgid "Line Length Guideline Soft Column" -msgstr "" +msgstr "Colonne douce des guides de longueur de ligne" #: editor/editor_settings.cpp msgid "Line Length Guideline Hard Column" -msgstr "" +msgstr "Colonne dure des guides de longueur de ligne" #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp msgid "Script List" msgstr "Liste des Scripts" #: editor/editor_settings.cpp -#, fuzzy msgid "Show Members Overview" msgstr "Montrer l'ensemble des Membres" @@ -5740,19 +5657,16 @@ msgid "Files" msgstr "Fichiers" #: editor/editor_settings.cpp -#, fuzzy msgid "Trim Trailing Whitespace On Save" -msgstr "Supprimer les espaces de fin de ligne" +msgstr "Retirer les espaces de fin de ligne à l'enregistrement" #: editor/editor_settings.cpp -#, fuzzy msgid "Autosave Interval Secs" -msgstr "Intervalle entre les auto-sauvegarde (en secondes)" +msgstr "Intervalle entre les sauvegardes automatiques (en secondes)" #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Restore Scripts On Load" -msgstr "Restaurer les scripts lors du chargement" +msgstr "Restaurer les scripts au chargement" #: editor/editor_settings.cpp msgid "Auto Reload And Parse Scripts On Save" @@ -5761,16 +5675,15 @@ msgstr "" #: editor/editor_settings.cpp msgid "Auto Reload Scripts On External Change" -msgstr "" +msgstr "Recharger automatiquement les scripts sur changement externe" #: editor/editor_settings.cpp -#, fuzzy msgid "Create Signal Callbacks" -msgstr "Forcer les replis du shader" +msgstr "Créer des rappels de signaux" #: editor/editor_settings.cpp msgid "Sort Members Outline Alphabetically" -msgstr "" +msgstr "Trier le contour des membres alphabétiquement" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Cursor" @@ -5793,9 +5706,8 @@ msgid "Caret Blink Speed" msgstr "Vitesse du clignotement du caret" #: editor/editor_settings.cpp -#, fuzzy msgid "Right Click Moves Caret" -msgstr "Clic droit pour ajouter un point" +msgstr "Clic droit déplace le caret" #: editor/editor_settings.cpp modules/gdscript/gdscript.cpp #: modules/gdscript/gdscript_editor.cpp @@ -5817,31 +5729,27 @@ msgstr "Délai d'auto-complétion du code" #: editor/editor_settings.cpp msgid "Put Callhint Tooltip Below Current Line" -msgstr "" +msgstr "Placer l'info-bulle d'appel sous la ligne actuelle" #: editor/editor_settings.cpp msgid "Callhint Tooltip Offset" -msgstr "" +msgstr "Décalage des info-bulles d'appel" #: editor/editor_settings.cpp -#, fuzzy msgid "Complete File Paths" -msgstr "Copier le chemin du nœud" +msgstr "Compléter les chemins de fichiers" #: editor/editor_settings.cpp modules/gdscript/gdscript_editor.cpp -#, fuzzy msgid "Add Type Hints" -msgstr "Ajouter un type" +msgstr "Ajouter des indices de type" #: editor/editor_settings.cpp -#, fuzzy msgid "Use Single Quotes" -msgstr "Nouvelle Simple Tuile" +msgstr "Utiliser des simples guillemets" #: editor/editor_settings.cpp -#, fuzzy msgid "Show Help Index" -msgstr "Afficher les aides" +msgstr "Afficher l'index d'aide" #: editor/editor_settings.cpp msgid "Help Font Size" @@ -5852,7 +5760,6 @@ msgid "Help Source Font Size" msgstr "Taille de la police de l'aide de la source" #: editor/editor_settings.cpp -#, fuzzy msgid "Help Title Font Size" msgstr "Taille de la police du titre Aide" @@ -5861,9 +5768,8 @@ msgid "Grid Map" msgstr "Grille" #: editor/editor_settings.cpp modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy msgid "Pick Distance" -msgstr "Choisissez distance :" +msgstr "Choisissez la distance" #: editor/editor_settings.cpp editor/plugins/tile_map_editor_plugin.cpp msgid "Preview Size" @@ -5878,32 +5784,27 @@ msgid "Secondary Grid Color" msgstr "Couleur de la grille secondaire" #: editor/editor_settings.cpp -#, fuzzy msgid "Selection Box Color" -msgstr "Sélection uniquement" +msgstr "Couleur de la boîte de sélection" #: editor/editor_settings.cpp editor/plugins/path_editor_plugin.cpp #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp -#, fuzzy msgid "3D Gizmos" -msgstr "Gadgets" +msgstr "Manipulateurs 3D" #: editor/editor_settings.cpp editor/plugins/path_editor_plugin.cpp #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp -#, fuzzy msgid "Gizmo Colors" -msgstr "Couleurs d'émission" +msgstr "Couleurs des manipulateurs" #: editor/editor_settings.cpp -#, fuzzy msgid "Instanced" -msgstr "Instance" +msgstr "Instancié" #: editor/editor_settings.cpp modules/gltf/gltf_node.cpp #: scene/3d/physics_body.cpp -#, fuzzy msgid "Joint" -msgstr "Point" +msgstr "Jointure" #: editor/editor_settings.cpp scene/2d/collision_shape_2d.cpp #: scene/2d/cpu_particles_2d.cpp scene/2d/touch_screen_button.cpp @@ -5915,9 +5816,8 @@ msgid "Shape" msgstr "Forme" #: editor/editor_settings.cpp -#, fuzzy msgid "Primary Grid Steps" -msgstr "Pas de la grille :" +msgstr "Pas de la grille principale" #: editor/editor_settings.cpp msgid "Grid Size" @@ -5933,55 +5833,47 @@ msgstr "Niveau minimal de division de la grille" #: editor/editor_settings.cpp msgid "Grid Division Level Bias" -msgstr "" +msgstr "Niveau de biais de la division de grille" #: editor/editor_settings.cpp -#, fuzzy msgid "Grid XZ Plane" -msgstr "Peinture GridMap" +msgstr "Plan XZ de la grille" #: editor/editor_settings.cpp -#, fuzzy msgid "Grid XY Plane" -msgstr "Peinture GridMap" +msgstr "Plan XY de la grille" #: editor/editor_settings.cpp -#, fuzzy msgid "Grid YZ Plane" -msgstr "Peinture GridMap" +msgstr "Plan YZ de la grille" #: editor/editor_settings.cpp msgid "Default FOV" msgstr "FOV par défaut" #: editor/editor_settings.cpp -#, fuzzy msgid "Default Z Near" -msgstr "Thème par défaut" +msgstr "Z proche par défaut" #: editor/editor_settings.cpp -#, fuzzy msgid "Default Z Far" -msgstr "Défaut" +msgstr "Z distant par défaut" #: editor/editor_settings.cpp msgid "Lightmap Baking Number Of CPU Threads" msgstr "Nombre de fils CPU pour calculer les cartes de lumières" #: editor/editor_settings.cpp -#, fuzzy msgid "Navigation Scheme" -msgstr "Mode Navigation" +msgstr "Schéma de navigation" #: editor/editor_settings.cpp -#, fuzzy msgid "Invert Y Axis" -msgstr "Modifier l'axe Y" +msgstr "Inverser l'axe Y" #: editor/editor_settings.cpp -#, fuzzy msgid "Invert X Axis" -msgstr "Modifier l'axe X" +msgstr "Inverser l'axe X" #: editor/editor_settings.cpp msgid "Zoom Style" @@ -5996,14 +5888,12 @@ msgid "Emulate 3 Button Mouse" msgstr "Émuler souris à 3 boutons" #: editor/editor_settings.cpp -#, fuzzy msgid "Orbit Modifier" -msgstr "Trier par date de modification (moins récent au plus récent)" +msgstr "Modificateur d'orbite" #: editor/editor_settings.cpp -#, fuzzy msgid "Pan Modifier" -msgstr "Mode navigation" +msgstr "Modificateur panoramique" #: editor/editor_settings.cpp msgid "Zoom Modifier" @@ -6020,11 +5910,11 @@ msgstr "Mode Navigation" #: editor/editor_settings.cpp msgid "Orbit Sensitivity" -msgstr "" +msgstr "Sensibilité de l'orbite" #: editor/editor_settings.cpp msgid "Orbit Inertia" -msgstr "" +msgstr "Inertie de l'orbite" #: editor/editor_settings.cpp msgid "Translation Inertia" @@ -6035,152 +5925,128 @@ msgid "Zoom Inertia" msgstr "Inertie du Zoom" #: editor/editor_settings.cpp -#, fuzzy msgid "Freelook" -msgstr "Vue libre haut" +msgstr "Vue libre" #: editor/editor_settings.cpp -#, fuzzy msgid "Freelook Navigation Scheme" -msgstr "Créer un maillage de navigation" +msgstr "Schéma de navigation en vue libre" #: editor/editor_settings.cpp -#, fuzzy msgid "Freelook Sensitivity" -msgstr "Vue libre gauche" +msgstr "Sensibilité de la vue libre" #: editor/editor_settings.cpp -#, fuzzy msgid "Freelook Inertia" -msgstr "Vue libre gauche" +msgstr "Inertie de la vue libre" #: editor/editor_settings.cpp -#, fuzzy msgid "Freelook Base Speed" -msgstr "Modificateur de vitesse de la vue libre" +msgstr "Vitesse de base de la vue libre" #: editor/editor_settings.cpp -#, fuzzy msgid "Freelook Activation Modifier" -msgstr "Ralentissement de la vue libre" +msgstr "Modificateur d'activation de la vue libre" #: editor/editor_settings.cpp -#, fuzzy msgid "Freelook Speed Zoom Link" -msgstr "Modificateur de vitesse de la vue libre" +msgstr "Lien de zoom rapide de la vue libre" #: editor/editor_settings.cpp editor/plugins/tile_map_editor_plugin.cpp msgid "Grid Color" msgstr "Couleur de la Grille" #: editor/editor_settings.cpp -#, fuzzy msgid "Guides Color" -msgstr "Prélever une couleur" +msgstr "Couleur des guides" #: editor/editor_settings.cpp -#, fuzzy msgid "Smart Snapping Line Color" -msgstr "Magnétisme intelligent" +msgstr "Couleur de ligne du magnétisme intelligent" #: editor/editor_settings.cpp msgid "Bone Width" msgstr "Largeur des os" #: editor/editor_settings.cpp -#, fuzzy msgid "Bone Color 1" -msgstr "Renommer l'item de couleur" +msgstr "Couleur d'os 1" #: editor/editor_settings.cpp -#, fuzzy msgid "Bone Color 2" -msgstr "Renommer l'item de couleur" +msgstr "Couleur d'os 2" #: editor/editor_settings.cpp -#, fuzzy msgid "Bone Selected Color" -msgstr "Configurer le profil sélectionné :" +msgstr "Couleur de l'os sélectionnée" #: editor/editor_settings.cpp msgid "Bone IK Color" -msgstr "" +msgstr "Couleur de cinématique inverse d'os" #: editor/editor_settings.cpp -#, fuzzy msgid "Bone Outline Color" -msgstr "Couleur de bordure de l'Os" +msgstr "Couleur de contour d'os" #: editor/editor_settings.cpp -#, fuzzy msgid "Bone Outline Size" -msgstr "Taille du contour :" +msgstr "Taille du contour de l'os" #: editor/editor_settings.cpp -#, fuzzy msgid "Viewport Border Color" msgstr "Couleur de bordure de la fenêtre d'affichage" #: editor/editor_settings.cpp -#, fuzzy msgid "Constrain Editor View" msgstr "Restreindre la fenêtre d'Éditeur" #: editor/editor_settings.cpp msgid "Simple Panning" -msgstr "" +msgstr "Panoramique simple" #: editor/editor_settings.cpp msgid "Scroll To Pan" -msgstr "" +msgstr "Panoramique au défilement" #: editor/editor_settings.cpp -#, fuzzy msgid "Pan Speed" msgstr "Vitesse Panoramique" #: editor/editor_settings.cpp editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Poly Editor" -msgstr "Éditeur UV de polygones 2D" +msgstr "Éditeur de polygones" #: editor/editor_settings.cpp msgid "Point Grab Radius" -msgstr "" +msgstr "Rayon de saisie par point" #: editor/editor_settings.cpp editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Show Previous Outline" -msgstr "Plan précédent" +msgstr "Montrer le contour précédent" #: editor/editor_settings.cpp editor/scene_tree_dock.cpp -#, fuzzy msgid "Autorename Animation Tracks" -msgstr "Renommer l'animation" +msgstr "Renommer les pistes d'animation automatiquement" #: editor/editor_settings.cpp msgid "Default Create Bezier Tracks" -msgstr "" +msgstr "Créer pistes de Bézier par défaut" #: editor/editor_settings.cpp -#, fuzzy msgid "Default Create Reset Tracks" -msgstr "Créer des pistes RESET" +msgstr "Créer pistes de réinitialisation par défaut" #: editor/editor_settings.cpp -#, fuzzy msgid "Onion Layers Past Color" -msgstr "Couleur de couche Oignon précedente" +msgstr "Couleur des couches d'oignon précedentes" #: editor/editor_settings.cpp -#, fuzzy msgid "Onion Layers Future Color" -msgstr "Couleur de la couche d'Oignon suivante" +msgstr "Couleur des couches d'oignon suivantes" #: editor/editor_settings.cpp -#, fuzzy msgid "Visual Editors" -msgstr "Editeur de groupe" +msgstr "Éditeurs visuels" #: editor/editor_settings.cpp msgid "Minimap Opacity" @@ -6197,18 +6063,16 @@ msgid "Rect" msgstr "Rect" #: editor/editor_settings.cpp -#, fuzzy msgid "Rect Custom Position" -msgstr "Définir la position de sortie de la courbe" +msgstr "Position du Rect personnalisée" #: editor/editor_settings.cpp platform/android/export/export_plugin.cpp msgid "Screen" msgstr "Écran" #: editor/editor_settings.cpp -#, fuzzy msgid "Auto Save" -msgstr "Coupe automatique" +msgstr "Sauvegarde auto" #: editor/editor_settings.cpp msgid "Save Before Running" @@ -6225,14 +6089,12 @@ msgstr "Hôte distant" #: editor/editor_settings.cpp #: modules/gdscript/language_server/gdscript_language_server.cpp -#, fuzzy msgid "Remote Port" -msgstr "Supprimer un point" +msgstr "Port distant" #: editor/editor_settings.cpp -#, fuzzy msgid "Editor SSL Certificates" -msgstr "Paramètres de l'éditeur" +msgstr "Certificats SSL de l’éditeur" #: editor/editor_settings.cpp msgid "HTTP Proxy" @@ -6260,7 +6122,7 @@ msgstr "Ordre de Tri" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Symbol Color" -msgstr "" +msgstr "Couleur de symbole" #: editor/editor_settings.cpp msgid "Keyword Color" @@ -6268,29 +6130,27 @@ msgstr "Couleur des mots-clés" #: editor/editor_settings.cpp msgid "Control Flow Keyword Color" -msgstr "" +msgstr "Couleur de mot clé de contrôle de flux" #: editor/editor_settings.cpp -#, fuzzy msgid "Base Type Color" -msgstr "Changer le type de base" +msgstr "Couleur de base des types" #: editor/editor_settings.cpp msgid "Engine Type Color" -msgstr "" +msgstr "Couleur de type du moteur" #: editor/editor_settings.cpp msgid "User Type Color" -msgstr "" +msgstr "Couleur de type utilisateur" #: editor/editor_settings.cpp msgid "Comment Color" msgstr "Couleur des commentaires" #: editor/editor_settings.cpp -#, fuzzy msgid "String Color" -msgstr "Stockage du fichier :" +msgstr "Couleur des chaînes de caractères" #: editor/editor_settings.cpp platform/javascript/export/export.cpp #: platform/uwp/export/export.cpp @@ -6299,9 +6159,8 @@ msgid "Background Color" msgstr "Couleur d’Arrière-Plan" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Completion Background Color" -msgstr "Couleur de fond invalide." +msgstr "Couleur d'arrière-plan de complétion" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -6329,23 +6188,20 @@ msgid "Line Number Color" msgstr "Couleur du Numéro de Ligne" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Safe Line Number Color" -msgstr "Numéro de ligne :" +msgstr "Couleur des nombres des lignes sûres" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Caret Color" msgstr "Couleur du caret" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Caret Background Color" -msgstr "Couleur de fond invalide." +msgstr "Couleur d'arrière-plan de caret" #: editor/editor_settings.cpp -#, fuzzy msgid "Text Selected Color" -msgstr "Supprimer la selection" +msgstr "Couleur de texte sélectionné" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Selection Color" @@ -6353,7 +6209,7 @@ msgstr "Couleur de la Sélection" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Brace Mismatch Color" -msgstr "" +msgstr "Couleur des erreur de fermeture d'accolades" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Current Line Color" @@ -6361,26 +6217,23 @@ msgstr "Couleur de la Ligne Actuelle" #: editor/editor_settings.cpp msgid "Line Length Guideline Color" -msgstr "" +msgstr "Couleur du guide de longueur de ligne" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Word Highlighted Color" -msgstr "Coloration syntaxique" +msgstr "Couleur de surlignage des mots" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Number Color" msgstr "Couleur des nombres" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Function Color" -msgstr "Fonction" +msgstr "Couleur des fonctions" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Member Variable Color" -msgstr "Renommer la variable" +msgstr "Couleur des variables de membres" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -6388,33 +6241,28 @@ msgid "Mark Color" msgstr "Prélever une couleur" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Bookmark Color" -msgstr "Signets" +msgstr "Couleur des signets" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Breakpoint Color" -msgstr "Point d'arrêts" +msgstr "Couleur des point d'arrêts" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Executing Line Color" msgstr "Couleur de la ligne d’exécution" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Code Folding Color" -msgstr "" +msgstr "Couleur du repliage de code" #: editor/editor_settings.cpp -#, fuzzy msgid "Search Result Color" -msgstr "Résultats de recherche" +msgstr "Couleur des résultats de recherche" #: editor/editor_settings.cpp -#, fuzzy msgid "Search Result Border Color" -msgstr "Résultats de recherche" +msgstr "Couleur de bordure des résultats de recherche" #: editor/editor_spin_slider.cpp msgid "Hold %s to round to integers. Hold Shift for more precise changes." @@ -6427,9 +6275,8 @@ msgid "Flat" msgstr "Plat" #: editor/editor_spin_slider.cpp -#, fuzzy msgid "Hide Slider" -msgstr "Mode collision" +msgstr "Cacher la barre de défilement" #: editor/editor_sub_scene.cpp msgid "Select Node(s) to Import" @@ -6727,7 +6574,6 @@ msgstr "" "téléchargement est terminé." #: editor/fileserver/editor_file_server.cpp -#, fuzzy msgid "File Server" msgstr "Serveur de fichiers" @@ -7106,7 +6952,7 @@ msgstr "Collada" #: editor/import/editor_import_collada.cpp msgid "Use Ambient" -msgstr "" +msgstr "Utiliser ambiant" #: editor/import/resource_importer_bitmask.cpp msgid "Create From" @@ -7115,7 +6961,7 @@ msgstr "Créer à Partir de" #: editor/import/resource_importer_bitmask.cpp #: servers/audio/effects/audio_effect_compressor.cpp msgid "Threshold" -msgstr "" +msgstr "Seuil" #: editor/import/resource_importer_csv_translation.cpp #: editor/import/resource_importer_layered_texture.cpp @@ -7127,7 +6973,7 @@ msgstr "Compresser" #: editor/import/resource_importer_csv_translation.cpp msgid "Delimiter" -msgstr "" +msgstr "Délimiteur" #: editor/import/resource_importer_layered_texture.cpp #, fuzzy @@ -7165,9 +7011,8 @@ msgstr "Mipmaps" #: editor/import/resource_importer_layered_texture.cpp #: editor/import/resource_importer_texture.cpp -#, fuzzy msgid "Anisotropic" -msgstr "Anisotropie" +msgstr "Anisotrope" #: editor/import/resource_importer_layered_texture.cpp #: editor/import/resource_importer_texture.cpp @@ -7175,9 +7020,8 @@ msgid "sRGB" msgstr "sRGB" #: editor/import/resource_importer_layered_texture.cpp -#, fuzzy msgid "Slices" -msgstr "Coupures" +msgstr "Tranches" #: editor/import/resource_importer_layered_texture.cpp #: scene/gui/aspect_ratio_container.cpp scene/gui/control.cpp @@ -7207,7 +7051,6 @@ msgstr "Décalage du maillage" #: editor/import/resource_importer_obj.cpp #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Octahedral Compression" msgstr "Compression Octaédrique" @@ -7281,9 +7124,8 @@ msgid "Storage" msgstr "Stockage" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Use Legacy Names" -msgstr "Utiliser des noms classiques" +msgstr "Utiliser les noms hérités" #: editor/import/resource_importer_scene.cpp modules/gltf/gltf_state.cpp msgid "Materials" @@ -7303,9 +7145,8 @@ msgid "Ensure Tangents" msgstr "Modifier la tangente de courbes" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Light Baking" -msgstr "Pré-calculer les cartes de lumières" +msgstr "Pré-calculer les lumières" #: editor/import/resource_importer_scene.cpp msgid "Lightmap Texel Size" @@ -7313,24 +7154,21 @@ msgstr "Taille des Texels dans la carte de lumières" #: editor/import/resource_importer_scene.cpp modules/gltf/gltf_state.cpp msgid "Skins" -msgstr "" +msgstr "Enveloppes" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Use Named Skins" -msgstr "Utiliser le magnétisme d'échelle" +msgstr "Utiliser les enveloppes nommées" #: editor/import/resource_importer_scene.cpp msgid "External Files" msgstr "Fichiers externes" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Store In Subdir" msgstr "Stocker dans un sous-dossier" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Filter Script" msgstr "Filtrer les scripts" @@ -7366,17 +7204,14 @@ msgid "Max Angular Error" msgstr "Erreur Angulaire Max" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Max Angle" -msgstr "Valeur" +msgstr "Angle maximal" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Remove Unused Tracks" -msgstr "Supprimer la piste d’animation" +msgstr "Retirer les pistes inutilisées" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Clips" msgstr "Clips d'animation" @@ -7464,7 +7299,7 @@ msgstr "Mode HDR" #: editor/import/resource_importer_texture.cpp msgid "BPTC LDR" -msgstr "" +msgstr "BPTC LDR" #: editor/import/resource_importer_texture.cpp #: editor/plugins/tile_set_editor_plugin.cpp scene/2d/cpu_particles_2d.cpp @@ -7482,9 +7317,8 @@ msgid "Fix Alpha Border" msgstr "Corriger la bordure alpha" #: editor/import/resource_importer_texture.cpp -#, fuzzy msgid "Premult Alpha" -msgstr "Modifier le polygone" +msgstr "Alpha pré-multiplié" #: editor/import/resource_importer_texture.cpp msgid "Hdr As Srgb" @@ -7528,13 +7362,12 @@ msgid "Import Mode" msgstr "Mode d'Importation" #: editor/import/resource_importer_texture_atlas.cpp -#, fuzzy msgid "Crop To Region" -msgstr "Définir la région de la tuile" +msgstr "Rogner vers la région" #: editor/import/resource_importer_texture_atlas.cpp msgid "Trim Alpha Border From Region" -msgstr "" +msgstr "Rogner les bordures alpha de la région" #: editor/import/resource_importer_wav.cpp scene/2d/physics_body_2d.cpp msgid "Force" @@ -7559,7 +7392,7 @@ msgstr "Taux maximal en Hz" #: editor/import/resource_importer_wav.cpp msgid "Trim" -msgstr "" +msgstr "Rogner" #: editor/import/resource_importer_wav.cpp msgid "Normalize" @@ -7667,7 +7500,6 @@ msgid "Raw" msgstr "Brut" #: editor/inspector_dock.cpp -#, fuzzy msgid "Capitalized" msgstr "Majuscule à chaque mot" @@ -8481,7 +8313,7 @@ msgstr "Mélange 1 :" #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "X-Fade Time (s):" -msgstr "Durée du fondu (s) :" +msgstr "Durée du fondu croisé (s) :" #: editor/plugins/animation_tree_player_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp @@ -9722,7 +9554,6 @@ msgid "Swap GradientTexture2D Fill Points" msgstr "Échanger les points de remplissage du GradientTexture2D" #: editor/plugins/gradient_texture_2d_editor_plugin.cpp -#, fuzzy msgid "Swap Gradient Fill Points" msgstr "Échanger les points de remplissage du dégradé" @@ -10020,14 +9851,12 @@ msgid "Update from Scene" msgstr "Mettre à jour depuis la scène" #: editor/plugins/mesh_library_editor_plugin.cpp -#, fuzzy msgid "Apply without Transforms" -msgstr "Appliquer la transformation du MeshInstance" +msgstr "Appliquer sans transformations" #: editor/plugins/mesh_library_editor_plugin.cpp -#, fuzzy msgid "Apply with Transforms" -msgstr "Appliquer la transformation du MeshInstance" +msgstr "Appliquer avec transformations" #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and no MultiMesh set in node)." @@ -10904,9 +10733,8 @@ msgid "Exec Path" msgstr "Chemin d'exécution" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Script Temperature Enabled" -msgstr "Sélectionner le fichier de modèles" +msgstr "Température de script activée" #: editor/plugins/script_editor_plugin.cpp msgid "Highlight Current Script" @@ -10914,16 +10742,15 @@ msgstr "Mettre en évidence le script actuel" #: editor/plugins/script_editor_plugin.cpp msgid "Script Temperature History Size" -msgstr "" +msgstr "Taille de l'historique des températures de script" #: editor/plugins/script_editor_plugin.cpp msgid "Current Script Background Color" msgstr "Couleur d'Arrière-Plan du Script Actuel" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Group Help Pages" -msgstr "Groupe sélectionné" +msgstr "Pages d'aide de groupe" #: editor/plugins/script_editor_plugin.cpp msgid "Sort Scripts By" @@ -11756,11 +11583,11 @@ msgstr "Post" #: editor/plugins/spatial_editor_plugin.cpp msgid "Manipulator Gizmo Size" -msgstr "" +msgstr "Taille des manipulateurs" #: editor/plugins/spatial_editor_plugin.cpp msgid "Manipulator Gizmo Opacity" -msgstr "" +msgstr "Opacité des manipulateurs" #: editor/plugins/spatial_editor_plugin.cpp msgid "Show Viewport Rotation Gizmo" @@ -11921,9 +11748,8 @@ msgid "New Animation" msgstr "Nouvelle animation" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Filter animations" -msgstr "Filtrer les méthodes" +msgstr "Filtrer les animations" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Speed:" @@ -12395,9 +12221,8 @@ msgid "Select Another Theme Resource:" msgstr "Sélectionnez une autre ressource Theme :" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Theme Resource" -msgstr "Ressource de Thème" +msgstr "Ressource de thème" #: editor/plugins/theme_editor_plugin.cpp msgid "Another Theme" @@ -12453,9 +12278,8 @@ msgid "Add Item Type" msgstr "Ajouter un item de type" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Set Variation Base Type" -msgstr "Définir type de variable" +msgstr "Définir le type parent de la variation" #: editor/plugins/theme_editor_plugin.cpp msgid "Set Base Type" @@ -12481,15 +12305,16 @@ msgstr "Surcharge tous les items de type par défaut." #: editor/plugins/theme_editor_plugin.cpp msgid "Select the variation base type from a list of available types." msgstr "" +"Choisissez le type parent de la variation depuis la liste des types " +"disponibles." #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "" "A type associated with a built-in class cannot be marked as a variation of " "another type." msgstr "" -"Un type affilié à une classe intégré ne peut pas être marqué comme une " -"variante d'un autre type." +"Un type affilié à une classe intégrée ne peut pas être marqué comme variante " +"d'un autre type." #: editor/plugins/theme_editor_plugin.cpp msgid "Theme:" @@ -12756,9 +12581,8 @@ msgid "Sort Tiles By Name" msgstr "Trier les tuiles par nom" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Bucket Fill Preview" -msgstr "Remplissage du seau" +msgstr "Aperçu du remplissage" #: editor/plugins/tile_map_editor_plugin.cpp #: modules/gridmap/grid_map_editor_plugin.cpp @@ -13152,9 +12976,8 @@ msgid "Texture" msgstr "Texture" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tex Offset" -msgstr "Décalage d’Octet" +msgstr "Décalage de texture" #: editor/plugins/tile_set_editor_plugin.cpp modules/csg/csg_shape.cpp #: scene/2d/canvas_item.cpp scene/2d/particles_2d.cpp @@ -13168,14 +12991,12 @@ msgid "Modulate" msgstr "Moduler" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Mode" -msgstr "Basculer le mode" +msgstr "Mode de tuile" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Autotile Bitmask Mode" -msgstr "Mode Bitmask" +msgstr "Mode de masque d'octet de tuile auto" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Subtile Size" @@ -13206,28 +13027,24 @@ msgid "Selected Collision" msgstr "Collision sélectionné" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Selected Collision One Way" -msgstr "Sélection uniquement" +msgstr "Collision à sens unique de la sélection" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Selected Collision One Way Margin" -msgstr "Mode collision" +msgstr "Marge de collision à sens unique de la sélection" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Selected Navigation" msgstr "Navigation sélectionnée" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Selected Occlusion" -msgstr "Sélectionner" +msgstr "Occultation de la sélection" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tileset Script" -msgstr "Filtrer les scripts" +msgstr "Script de palette de tuiles" #: editor/plugins/tile_set_editor_plugin.cpp msgid "TileSet" @@ -14450,7 +14267,7 @@ msgstr "Plus d'informations..." #: editor/project_export.cpp msgid "Export PCK/Zip..." -msgstr "Exporter le PCK/ZIP" +msgstr "Exporter le PCK/ZIP..." #: editor/project_export.cpp msgid "Export Project..." @@ -15516,7 +15333,7 @@ msgstr "Supprimer le nœud \"%s\" et ses enfants ?" #: editor/scene_tree_dock.cpp msgid "Delete node \"%s\"?" -msgstr "Supprimer le noeud \"%s\" ?" +msgstr "Supprimer le nœud \"%s\" ?" #: editor/scene_tree_dock.cpp msgid "" @@ -15693,7 +15510,7 @@ msgstr "Ressources secondaires" #: editor/scene_tree_dock.cpp msgid "Access as Scene Unique Name" -msgstr "" +msgstr "Accéder en tant que nom unique de scène" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -15793,18 +15610,16 @@ msgid "Clear Inheritance? (No Undo!)" msgstr "Effacer l'héritage ? (Pas de retour en arrière !)" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Show Scene Tree Root Selection" -msgstr "Afficher la sélection de la racine de l'arborescence" +msgstr "Afficher la sélection de la racine de la hiérarchie de la scène" #: editor/scene_tree_dock.cpp msgid "Derive Script Globals By Name" -msgstr "" +msgstr "Dériver les Globals de scripts par nom" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Use Favorites Root Selection" -msgstr "Encadrer la sélection" +msgstr "Utiliser la sélection racine des favoris" #: editor/scene_tree_editor.cpp msgid "Toggle Visible" @@ -16126,7 +15941,7 @@ msgstr "Filtrer les variables de la pile" #: editor/script_editor_debugger.cpp msgid "Auto Switch To Remote Scene Tree" -msgstr "" +msgstr "Basculer automatiquement vers l'arborescence de scène distante" #: editor/script_editor_debugger.cpp msgid "Remote Scene Tree Refresh Interval" @@ -16134,7 +15949,7 @@ msgstr "Intervalle de rafraîchissement de l'arborescence distante" #: editor/script_editor_debugger.cpp msgid "Remote Inspect Refresh Interval" -msgstr "" +msgstr "Intervalle de rafraîchissement d'inspection distante" #: editor/script_editor_debugger.cpp msgid "Network Profiler" @@ -16232,9 +16047,8 @@ msgid "Change Light Radius" msgstr "Changer le rayon d'une lumière" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Stream Player 3D" -msgstr "Émetteur de flux sonore 3D" +msgstr "Émetteur de flux 3D" #: editor/spatial_editor_gizmos.cpp msgid "Change AudioStreamPlayer3D Emission Angle" @@ -16279,9 +16093,8 @@ msgid "GI Probe" msgstr "Sonde GI" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Baked Indirect Light" -msgstr "Éclairage indirect" +msgstr "Éclairage indirect pré-calculé" #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp msgid "Change Sphere Shape Radius" @@ -16320,22 +16133,20 @@ msgid "Navigation Edge Disabled" msgstr "Bord de la Navigation Désactivé" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Navigation Solid" -msgstr "Mode Navigation" +msgstr "Solide de navigation" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Navigation Solid Disabled" -msgstr "Mode Navigation" +msgstr "Solide de navigation désactivé" #: editor/spatial_editor_gizmos.cpp msgid "Joint Body A" -msgstr "" +msgstr "Jointure Corps A" #: editor/spatial_editor_gizmos.cpp msgid "Joint Body B" -msgstr "" +msgstr "Jointure Corps B" #: editor/spatial_editor_gizmos.cpp msgid "Room Edge" @@ -16343,7 +16154,7 @@ msgstr "Bord de la pièce" #: editor/spatial_editor_gizmos.cpp msgid "Room Overlap" -msgstr "" +msgstr "Chevauchement de salle" #: editor/spatial_editor_gizmos.cpp msgid "Set Room Point Position" @@ -16359,7 +16170,7 @@ msgstr "Bords du portail" #: editor/spatial_editor_gizmos.cpp msgid "Portal Arrow" -msgstr "" +msgstr "Flèche de portail" #: editor/spatial_editor_gizmos.cpp msgid "Set Portal Point Position" @@ -16387,44 +16198,38 @@ msgid "Set Occluder Sphere Position" msgstr "Définir la position de la sphère de l'occulteur" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Set Occluder Polygon Point Position" -msgstr "Définir la position du point du Portal" +msgstr "Définir la position ponctuelle du polygone occulteur" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Set Occluder Hole Point Position" -msgstr "Définir la position du point de la courbe" +msgstr "Définir la position ponctuelle du trou occulteur" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Occluder Polygon Front" -msgstr "Créer un polygone occulteur" +msgstr "Avant du polygone occulteur" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Occluder Polygon Back" -msgstr "Créer un polygone occulteur" +msgstr "Arrière du polygone occulteur" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Occluder Hole" -msgstr "Créer un polygone occulteur" +msgstr "Trou occulteur" #: main/main.cpp msgid "Godot Physics" -msgstr "" +msgstr "Calculs de physique de Godot" #: main/main.cpp servers/physics_2d/physics_2d_server_sw.cpp #: servers/visual/visual_server_scene.cpp msgid "Use BVH" -msgstr "" +msgstr "Utiliser BVH" #: main/main.cpp servers/physics_2d/physics_2d_server_sw.cpp #: servers/visual/visual_server_scene.cpp -#, fuzzy msgid "BVH Collision Margin" -msgstr "Mode collision" +msgstr "Marge de collision BVH" #: main/main.cpp msgid "Crash Handler" @@ -16460,7 +16265,7 @@ msgstr "Maximum d'avertissements par secondes" #: main/main.cpp msgid "Flush stdout On Print" -msgstr "" +msgstr "Vider stdout à l'impression" #: main/main.cpp servers/visual_server.cpp msgid "Logging" @@ -16500,11 +16305,11 @@ msgstr "" #: main/main.cpp msgid "DPI" -msgstr "" +msgstr "PPP" #: main/main.cpp msgid "Allow hiDPI" -msgstr "" +msgstr "Autoriser PPP élevé" #: main/main.cpp msgid "V-Sync" @@ -16548,7 +16353,7 @@ msgstr "" #: main/main.cpp msgid "Handheld" -msgstr "" +msgstr "Portable" #: main/main.cpp platform/javascript/export/export.cpp #: platform/uwp/export/export.cpp @@ -16588,7 +16393,7 @@ msgstr "Sortie Standard" #: main/main.cpp msgid "Print FPS" -msgstr "" +msgstr "Afficher les FPS" #: main/main.cpp msgid "Verbose stdout" @@ -16632,7 +16437,7 @@ msgstr "Pointage" #: main/main.cpp msgid "Touch Delay" -msgstr "" +msgstr "Retard d'appui" #: main/main.cpp servers/visual_server.cpp msgid "GLES3" @@ -16643,9 +16448,8 @@ msgid "Shaders" msgstr "Shaders" #: main/main.cpp -#, fuzzy msgid "Debug Shader Fallbacks" -msgstr "Forcer les replis du shader" +msgstr "Valeurs de repli du shader de débogage" #: main/main.cpp scene/3d/baked_lightmap.cpp scene/3d/camera.cpp #: scene/3d/world_environment.cpp scene/main/scene_tree.cpp @@ -16691,7 +16495,7 @@ msgstr "Icône native de Windows" #: main/main.cpp msgid "Buffering" -msgstr "" +msgstr "Mise en mémoire tampon" #: main/main.cpp msgid "Agile Event Flushing" @@ -16722,9 +16526,8 @@ msgid "Tooltip Position Offset" msgstr "Décalage de la position des info-bulles" #: main/main.cpp modules/mono/mono_gd/gd_mono.cpp -#, fuzzy msgid "Debugger Agent" -msgstr "Débogueur" +msgstr "Agent du débogueur" #: main/main.cpp modules/mono/mono_gd/gd_mono.cpp msgid "Wait For Debugger" @@ -16736,11 +16539,11 @@ msgstr "Délai d'Attente" #: main/main.cpp msgid "Runtime" -msgstr "" +msgstr "Exécution" #: main/main.cpp msgid "Unhandled Exception Policy" -msgstr "" +msgstr "Politique d'exceptions non gérées" #: main/main.cpp msgid "Main Loop Type" @@ -16764,14 +16567,12 @@ msgid "Auto Accept Quit" msgstr "Accepter automatiquement la fermeture" #: main/main.cpp scene/main/scene_tree.cpp -#, fuzzy msgid "Quit On Go Back" -msgstr "Retourner" +msgstr "Quitter au retour" #: main/main.cpp scene/main/viewport.cpp -#, fuzzy msgid "Snap Controls To Pixels" -msgstr "Aimanter aux flancs du nœud" +msgstr "Aimanter les contrôles aux pixels" #: main/main.cpp msgid "Dynamic Fonts" @@ -16779,7 +16580,7 @@ msgstr "Polices Dynamiques" #: main/main.cpp msgid "Use Oversampling" -msgstr "" +msgstr "Utiliser le suréchantillonnage" #: modules/bullet/register_types.cpp modules/bullet/space_bullet.cpp msgid "Active Soft World" @@ -16806,35 +16607,30 @@ msgid "Change Torus Outer Radius" msgstr "Changer le rayon extérieur de la tour" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Operation" -msgstr "Options" +msgstr "Opération" #: modules/csg/csg_shape.cpp msgid "Calculate Tangents" msgstr "Calculer les Tangentes" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Use Collision" -msgstr "Collision" +msgstr "Utiliser les collisions" #: modules/csg/csg_shape.cpp servers/physics_2d_server.cpp -#, fuzzy msgid "Collision Layer" -msgstr "Mode collision" +msgstr "Couche des collisions" #: modules/csg/csg_shape.cpp scene/2d/ray_cast_2d.cpp scene/3d/camera.cpp #: scene/3d/ray_cast.cpp scene/3d/spring_arm.cpp #: scene/resources/navigation_mesh.cpp servers/physics_server.cpp -#, fuzzy msgid "Collision Mask" -msgstr "Mode collision" +msgstr "Masque de collisions" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Invert Faces" -msgstr "Modifier la casse" +msgstr "Inverses les faces" #: modules/csg/csg_shape.cpp scene/2d/navigation_agent_2d.cpp #: scene/2d/navigation_obstacle_2d.cpp scene/3d/navigation_agent.cpp @@ -16852,57 +16648,50 @@ msgid "Radial Segments" msgstr "Segments radiaux" #: modules/csg/csg_shape.cpp scene/resources/primitive_meshes.cpp -#, fuzzy msgid "Rings" -msgstr "Avertissements" +msgstr "Anneaux" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Smooth Faces" -msgstr "Progression douce" +msgstr "Adoucir les faces" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Sides" -msgstr "Afficher les guides" +msgstr "Côtés" #: modules/csg/csg_shape.cpp msgid "Cone" -msgstr "" +msgstr "Cone" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Inner Radius" -msgstr "Changer le rayon intérieur de la tour" +msgstr "Rayon intérieur" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Outer Radius" -msgstr "Changer le rayon extérieur de la tour" +msgstr "Rayon extérieur" #: modules/csg/csg_shape.cpp msgid "Ring Sides" -msgstr "" +msgstr "Côtés de l'anneau" #: modules/csg/csg_shape.cpp scene/2d/collision_polygon_2d.cpp #: scene/2d/light_occluder_2d.cpp scene/2d/polygon_2d.cpp #: scene/3d/collision_polygon.cpp -#, fuzzy msgid "Polygon" -msgstr "Polygones" +msgstr "Polygone" #: modules/csg/csg_shape.cpp msgid "Spin Degrees" -msgstr "" +msgstr "Degrés de tour" #: modules/csg/csg_shape.cpp msgid "Spin Sides" -msgstr "" +msgstr "Côtés du tour" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Path Node" -msgstr "Coller les nœuds" +msgstr "Noeud de chemin" #: modules/csg/csg_shape.cpp #, fuzzy @@ -16911,35 +16700,31 @@ msgstr "Créer un vertex interne" #: modules/csg/csg_shape.cpp msgid "Path Interval" -msgstr "" +msgstr "Intervalle de chemin" #: modules/csg/csg_shape.cpp msgid "Path Simplify Angle" -msgstr "" +msgstr "Simplification d'angle de chemin" #: modules/csg/csg_shape.cpp msgid "Path Rotation" msgstr "Rotation du chemin" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Path Local" -msgstr "Rendre local" +msgstr "Chemin local" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Path Continuous U" -msgstr "Continu" +msgstr "Chemin Continu U" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Path U Distance" -msgstr "Choisissez distance :" +msgstr "Distance du chemin U" #: modules/csg/csg_shape.cpp -#, fuzzy msgid "Path Joined" -msgstr "Rotation aléatoire :" +msgstr "Chemin joint" #: modules/enet/networked_multiplayer_enet.cpp msgid "Compression Mode" @@ -16959,7 +16744,7 @@ msgstr "Toujours ordonnée" #: modules/enet/networked_multiplayer_enet.cpp msgid "Server Relay" -msgstr "" +msgstr "Relais serveur" #: modules/enet/networked_multiplayer_enet.cpp msgid "DTLS Verify" @@ -16986,9 +16771,8 @@ msgid "Config File" msgstr "Fichier de Configuration" #: modules/gdnative/gdnative.cpp -#, fuzzy msgid "Load Once" -msgstr "Charger une ressource" +msgstr "Charger une fois" #: modules/gdnative/gdnative.cpp #: modules/visual_script/visual_script_func_nodes.cpp @@ -17208,9 +16992,8 @@ msgid "Sparse Indices Byte Offset" msgstr "" #: modules/gltf/gltf_accessor.cpp -#, fuzzy msgid "Sparse Indices Component Type" -msgstr "Analyse de la géométrie..." +msgstr "Type de composant d'indices épars" #: modules/gltf/gltf_accessor.cpp msgid "Sparse Values Buffer View" @@ -17284,9 +17067,8 @@ msgid "Blend Weights" msgstr "Précalculer les lightmaps" #: modules/gltf/gltf_mesh.cpp -#, fuzzy msgid "Instance Materials" -msgstr "Changements de matériau :" +msgstr "Matériaux d'instances" #: modules/gltf/gltf_node.cpp scene/3d/skeleton.cpp msgid "Parent" @@ -17299,25 +17081,21 @@ msgstr "Plateforme" #: modules/gltf/gltf_node.cpp scene/3d/mesh_instance.cpp msgid "Skin" -msgstr "" +msgstr "Enveloppe" #: modules/gltf/gltf_node.cpp scene/3d/spatial.cpp -#, fuzzy msgid "Translation" -msgstr "Traductions" +msgstr "Translation" #: modules/gltf/gltf_node.cpp -#, fuzzy msgid "Children" -msgstr "Enfants modifiables" +msgstr "Enfants" #: modules/gltf/gltf_skeleton.cpp modules/gltf/gltf_skin.cpp -#, fuzzy msgid "Joints" -msgstr "Point" +msgstr "Jointures" #: modules/gltf/gltf_skeleton.cpp modules/gltf/gltf_skin.cpp -#, fuzzy msgid "Roots" msgstr "Racines" @@ -17326,48 +17104,42 @@ msgid "Unique Names" msgstr "Noms Uniques" #: modules/gltf/gltf_skeleton.cpp -#, fuzzy msgid "Godot Bone Node" -msgstr "Le nœud de la scène" +msgstr "Nœud d'os de Godot" #: modules/gltf/gltf_skin.cpp -#, fuzzy msgid "Skin Root" -msgstr "Nouvelle racine de scène" +msgstr "Racine de l'enveloppe" #: modules/gltf/gltf_skin.cpp -#, fuzzy msgid "Joints Original" -msgstr "Focaliser l'origine" +msgstr "Jointure à l'original" #: modules/gltf/gltf_skin.cpp msgid "Inverse Binds" -msgstr "" +msgstr "Inverser les liens" #: modules/gltf/gltf_skin.cpp -#, fuzzy msgid "Non Joints" -msgstr "Déplacer la jointure" +msgstr "Non jointures" #: modules/gltf/gltf_skin.cpp msgid "Joint I To Bone I" -msgstr "" +msgstr "Jointure I à os I" #: modules/gltf/gltf_skin.cpp msgid "Joint I To Name" -msgstr "" +msgstr "Jointure I à nom" #: modules/gltf/gltf_skin.cpp msgid "Godot Skin" -msgstr "" +msgstr "Enveloppe Godot" #: modules/gltf/gltf_spec_gloss.cpp -#, fuzzy msgid "Diffuse Img" msgstr "Image Diffuse" #: modules/gltf/gltf_spec_gloss.cpp -#, fuzzy msgid "Diffuse Factor" msgstr "Facteur de diffusion" @@ -17385,50 +17157,44 @@ msgstr "" #: modules/gltf/gltf_state.cpp msgid "Json" -msgstr "" +msgstr "Json" #: modules/gltf/gltf_state.cpp -#, fuzzy msgid "Major Version" -msgstr "Version" +msgstr "Version majeure" #: modules/gltf/gltf_state.cpp -#, fuzzy msgid "Minor Version" -msgstr "Version" +msgstr "Version mineure" #: modules/gltf/gltf_state.cpp -#, fuzzy msgid "GLB Data" -msgstr "Avec données" +msgstr "Données GLB" #: modules/gltf/gltf_state.cpp msgid "Use Named Skin Binds" -msgstr "" +msgstr "Utiliser les liens d'enveloppe par nom" #: modules/gltf/gltf_state.cpp -#, fuzzy msgid "Buffer Views" -msgstr "Vue de derrière" +msgstr "Vues tampon" #: modules/gltf/gltf_state.cpp msgid "Accessors" -msgstr "" +msgstr "Accesseurs" #: modules/gltf/gltf_state.cpp msgid "Scene Name" msgstr "Nom de la Scène" #: modules/gltf/gltf_state.cpp -#, fuzzy msgid "Root Nodes" -msgstr "Nom de nœud racine" +msgstr "Nœuds racines" #: modules/gltf/gltf_state.cpp scene/2d/particles_2d.cpp #: scene/gui/texture_button.cpp scene/gui/texture_progress.cpp -#, fuzzy msgid "Textures" -msgstr "Fonctionnalités" +msgstr "Textures" #: modules/gltf/gltf_state.cpp platform/uwp/export/export.cpp msgid "Images" @@ -17439,42 +17205,36 @@ msgid "Cameras" msgstr "Caméras" #: modules/gltf/gltf_state.cpp servers/visual_server.cpp -#, fuzzy msgid "Lights" -msgstr "Lumière" +msgstr "Lumières" #: modules/gltf/gltf_state.cpp -#, fuzzy msgid "Unique Animation Names" -msgstr "Nom de la nouvelle animation :" +msgstr "Noms d'animations uniques" #: modules/gltf/gltf_state.cpp -#, fuzzy msgid "Skeletons" -msgstr "Squelette" +msgstr "Squelettes" #: modules/gltf/gltf_state.cpp -#, fuzzy msgid "Skeleton To Node" -msgstr "Sélectionner un nœud" +msgstr "Squelette vers nœud" #: modules/gltf/gltf_state.cpp msgid "Animations" msgstr "Animations" #: modules/gltf/gltf_texture.cpp -#, fuzzy msgid "Src Image" -msgstr "Afficher les os" +msgstr "Image source" #: modules/gridmap/grid_map.cpp msgid "Mesh Library" msgstr "Librairie de maillages" #: modules/gridmap/grid_map.cpp -#, fuzzy msgid "Physics Material" -msgstr "Image physique %" +msgstr "Matériau physique" #: modules/gridmap/grid_map.cpp scene/3d/visual_instance.cpp #, fuzzy @@ -17486,24 +17246,20 @@ msgid "Cell" msgstr "Cellule" #: modules/gridmap/grid_map.cpp -#, fuzzy msgid "Octant Size" -msgstr "Vue de devant" +msgstr "Taille d'octant" #: modules/gridmap/grid_map.cpp -#, fuzzy msgid "Center X" -msgstr "Centre" +msgstr "X du centre" #: modules/gridmap/grid_map.cpp -#, fuzzy msgid "Center Y" -msgstr "Centre" +msgstr "Y du centre" #: modules/gridmap/grid_map.cpp -#, fuzzy msgid "Center Z" -msgstr "Centre" +msgstr "Z du centre" #: modules/gridmap/grid_map.cpp scene/2d/collision_object_2d.cpp #: scene/2d/tile_map.cpp scene/3d/collision_object.cpp scene/3d/soft_body.cpp @@ -17512,17 +17268,15 @@ msgid "Mask" msgstr "Masque" #: modules/gridmap/grid_map.cpp scene/2d/tile_map.cpp -#, fuzzy msgid "Bake Navigation" -msgstr "Navigation" +msgstr "Pré-calculer la navigation" #: modules/gridmap/grid_map.cpp scene/2d/navigation_2d.cpp #: scene/2d/navigation_agent_2d.cpp scene/2d/navigation_polygon.cpp #: scene/2d/tile_map.cpp scene/3d/navigation.cpp scene/3d/navigation_agent.cpp #: scene/3d/navigation_mesh_instance.cpp -#, fuzzy msgid "Navigation Layers" -msgstr "Mode Navigation" +msgstr "Calques de navigation" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Next Plane" @@ -17710,7 +17464,6 @@ msgid "Loop Offset" msgstr "Décalage de Boucle" #: modules/mobile_vr/mobile_vr_interface.cpp -#, fuzzy msgid "Eye Height" msgstr "Hauteur de l’œil" @@ -17729,15 +17482,15 @@ msgstr "Afficher sans ombrage" #: modules/mobile_vr/mobile_vr_interface.cpp msgid "Oversample" -msgstr "" +msgstr "Suréchantillonner" #: modules/mobile_vr/mobile_vr_interface.cpp msgid "K1" -msgstr "" +msgstr "K1" #: modules/mobile_vr/mobile_vr_interface.cpp msgid "K2" -msgstr "" +msgstr "K2" #: modules/mono/csharp_script.cpp msgid "Class name can't be a reserved keyword" @@ -17824,14 +17577,13 @@ msgstr "C'est fait !" #: modules/opensimplex/noise_texture.cpp msgid "Seamless" -msgstr "" +msgstr "Sans bord" #: modules/opensimplex/noise_texture.cpp msgid "As Normal Map" msgstr "En tant que carte de normales" #: modules/opensimplex/noise_texture.cpp -#, fuzzy msgid "Bump Strength" msgstr "Force du bossage" @@ -17840,12 +17592,10 @@ msgid "Noise" msgstr "Bruit" #: modules/opensimplex/noise_texture.cpp -#, fuzzy msgid "Noise Offset" -msgstr "Décalage de la grille :" +msgstr "Décalage du bruit" #: modules/opensimplex/open_simplex_noise.cpp -#, fuzzy msgid "Octaves" msgstr "Octaves" @@ -17854,28 +17604,24 @@ msgid "Period" msgstr "Période" #: modules/opensimplex/open_simplex_noise.cpp -#, fuzzy msgid "Persistence" -msgstr "Perspective" +msgstr "Persistance" #: modules/opensimplex/open_simplex_noise.cpp msgid "Lacunarity" -msgstr "" +msgstr "Lacunarité" #: modules/regex/regex.cpp -#, fuzzy msgid "Subject" msgstr "Sujet" #: modules/regex/regex.cpp -#, fuzzy msgid "Names" -msgstr "Nom" +msgstr "Noms" #: modules/regex/regex.cpp -#, fuzzy msgid "Strings" -msgstr "Paramètres :" +msgstr "Paramètres" #: modules/upnp/upnp.cpp msgid "Discover Multicast If" @@ -17883,39 +17629,35 @@ msgstr "" #: modules/upnp/upnp.cpp msgid "Discover Local Port" -msgstr "" +msgstr "Révéler le port local" #: modules/upnp/upnp.cpp msgid "Discover IPv6" msgstr "Découvrir IPv6" #: modules/upnp/upnp_device.cpp -#, fuzzy msgid "Description URL" -msgstr "Description" +msgstr "URL de description" #: modules/upnp/upnp_device.cpp -#, fuzzy msgid "Service Type" -msgstr "Définir type de variable" +msgstr "Type du service" #: modules/upnp/upnp_device.cpp msgid "IGD Control URL" -msgstr "" +msgstr "URL de contrôle IGD" #: modules/upnp/upnp_device.cpp -#, fuzzy msgid "IGD Service Type" -msgstr "Définir type de variable" +msgstr "Type de service IGD" #: modules/upnp/upnp_device.cpp msgid "IGD Our Addr" msgstr "" #: modules/upnp/upnp_device.cpp -#, fuzzy msgid "IGD Status" -msgstr "État" +msgstr "État IGD" #: modules/visual_script/visual_script.cpp msgid "" @@ -17956,9 +17698,8 @@ msgid "Stack overflow with stack depth:" msgstr "Débordement de pile avec profondeur de pile :" #: modules/visual_script/visual_script.cpp -#, fuzzy msgid "Visual Script" -msgstr "Rechercher VisualScript" +msgstr "Script graphique" #: modules/visual_script/visual_script_editor.cpp msgid "Change Signal Arguments" @@ -18294,9 +18035,8 @@ msgid "Return Enabled" msgstr "Exécutable" #: modules/visual_script/visual_script_flow_control.cpp -#, fuzzy msgid "Return Type" -msgstr "Retour" +msgstr "Type de retour" #: modules/visual_script/visual_script_flow_control.cpp #: scene/resources/visual_shader_nodes.cpp @@ -18344,7 +18084,6 @@ msgid "in order:" msgstr "dans l'ordre :" #: modules/visual_script/visual_script_flow_control.cpp -#, fuzzy msgid "Steps" msgstr "Pas" @@ -18366,9 +18105,8 @@ msgstr "Est-ce %s ?" #: modules/visual_script/visual_script_flow_control.cpp #: modules/visual_script/visual_script_func_nodes.cpp -#, fuzzy msgid "Base Script" -msgstr "Nouveau script" +msgstr "Script de base" #: modules/visual_script/visual_script_func_nodes.cpp msgid "On %s" @@ -18380,36 +18118,31 @@ msgstr "On Self" #: modules/visual_script/visual_script_func_nodes.cpp #: modules/visual_script/visual_script_yield_nodes.cpp -#, fuzzy msgid "Call Mode" -msgstr "Mode mise à l'échelle" +msgstr "Mode d'appel" #: modules/visual_script/visual_script_func_nodes.cpp #: modules/visual_script/visual_script_nodes.cpp -#, fuzzy msgid "Basic Type" -msgstr "Changer le type de base" +msgstr "Type simple" #: modules/visual_script/visual_script_func_nodes.cpp #: modules/visual_script/visual_script_nodes.cpp #: modules/visual_script/visual_script_yield_nodes.cpp -#, fuzzy msgid "Node Path" -msgstr "Copier le chemin du nœud" +msgstr "Chemin de nœud" #: modules/visual_script/visual_script_func_nodes.cpp -#, fuzzy msgid "Use Default Args" -msgstr "Réinitialiser" +msgstr "Utiliser les valeurs d'arguments par défaut" #: modules/visual_script/visual_script_func_nodes.cpp msgid "Validate" msgstr "Valider" #: modules/visual_script/visual_script_func_nodes.cpp -#, fuzzy msgid "RPC Call Mode" -msgstr "Mode mise à l'échelle" +msgstr "Mode d'appel RPC" #: modules/visual_script/visual_script_func_nodes.cpp msgid "Subtract %s" @@ -18448,14 +18181,12 @@ msgid "BitXor %s" msgstr "Ou-exclusif par bit %s" #: modules/visual_script/visual_script_func_nodes.cpp -#, fuzzy msgid "Set Mode" -msgstr "Mode sélection" +msgstr "Définir le mode" #: modules/visual_script/visual_script_func_nodes.cpp -#, fuzzy msgid "Assign Op" -msgstr "Assigner" +msgstr "Opérateur d'assignation" #: modules/visual_script/visual_script_func_nodes.cpp #: modules/visual_script/visual_script_nodes.cpp @@ -18472,9 +18203,8 @@ msgid "Base object is not a Node!" msgstr "L'objet de base n'est pas un nœud !" #: modules/visual_script/visual_script_func_nodes.cpp -#, fuzzy msgid "Path does not lead to Node!" -msgstr "Le chemin ne mène pas au nœud !" +msgstr "Le chemin ne mène pas vers un nœud !" #: modules/visual_script/visual_script_func_nodes.cpp msgid "Invalid index property name '%s' in node %s." @@ -18490,9 +18220,8 @@ msgstr "Composer le tableau" #: modules/visual_script/visual_script_nodes.cpp scene/resources/material.cpp #: scene/resources/visual_shader_nodes.cpp -#, fuzzy msgid "Operator" -msgstr "Itérateur" +msgstr "Opérateur" #: modules/visual_script/visual_script_nodes.cpp msgid "Invalid argument of type:" @@ -18507,9 +18236,8 @@ msgid "a if cond, else b" msgstr "a if cond, else b" #: modules/visual_script/visual_script_nodes.cpp -#, fuzzy msgid "Var Name" -msgstr "Nom" +msgstr "Nom de variable" #: modules/visual_script/visual_script_nodes.cpp msgid "VariableGet not found in script:" @@ -18634,9 +18362,8 @@ msgid "%s sec(s)" msgstr "%s seconde(s)" #: modules/visual_script/visual_script_yield_nodes.cpp scene/main/timer.cpp -#, fuzzy msgid "Wait Time" -msgstr "Peindre la tuile" +msgstr "Temps d'attente" #: modules/visual_script/visual_script_yield_nodes.cpp msgid "WaitSignal" @@ -18651,16 +18378,14 @@ msgid "WaitInstanceSignal" msgstr "WaitInstanceSignal" #: modules/webrtc/webrtc_data_channel.cpp -#, fuzzy msgid "Write Mode" -msgstr "Mode prioritaire" +msgstr "Mode écriture" #: modules/webrtc/webrtc_data_channel.h msgid "WebRTC" msgstr "WebRTC" #: modules/webrtc/webrtc_data_channel.h -#, fuzzy msgid "Max Channel In Buffer (KB)" msgstr "Maximum de canal dans le tampon (Ko)" @@ -18673,61 +18398,52 @@ msgid "Trusted SSL Certificate" msgstr "Certificat SSL Fiable" #: modules/websocket/websocket_macros.h -#, fuzzy msgid "WebSocket Client" -msgstr "Profileur réseau" +msgstr "Client WebSocket" #: modules/websocket/websocket_macros.h -#, fuzzy msgid "Max In Buffer (KB)" -msgstr "Taille Maximale (KB)" +msgstr "Maximum tampon entrant (KB)" #: modules/websocket/websocket_macros.h -#, fuzzy msgid "Max In Packets" -msgstr "Maximum par paquet" +msgstr "Maximum de paquets entrant" #: modules/websocket/websocket_macros.h -#, fuzzy msgid "Max Out Buffer (KB)" -msgstr "Taille Maximale (KB)" +msgstr "Maximum tampon sortant (KB)" #: modules/websocket/websocket_macros.h msgid "Max Out Packets" -msgstr "" +msgstr "Maximum de paquets sortant" #: modules/websocket/websocket_macros.h -#, fuzzy msgid "WebSocket Server" -msgstr "Profileur réseau" +msgstr "Server WebSocket" #: modules/websocket/websocket_server.cpp msgid "Bind IP" -msgstr "" +msgstr "Lier IP" #: modules/websocket/websocket_server.cpp -#, fuzzy msgid "Private Key" -msgstr "Chemin de la clé privée SSH" +msgstr "Clé privée" #: modules/websocket/websocket_server.cpp platform/javascript/export/export.cpp msgid "SSL Certificate" msgstr "Certificat SSL" #: modules/websocket/websocket_server.cpp -#, fuzzy msgid "CA Chain" -msgstr "Effacer la chaîne IK" +msgstr "Chaîne d’autorité de certificat (CA)" #: modules/websocket/websocket_server.cpp -#, fuzzy msgid "Handshake Timeout" -msgstr "Délai dépassé." +msgstr "Délai de poignée de main expiré" #: modules/webxr/webxr_interface.cpp -#, fuzzy msgid "Session Mode" -msgstr "Mode Région" +msgstr "Mode de session" #: modules/webxr/webxr_interface.cpp msgid "Required Features" @@ -18742,18 +18458,17 @@ msgid "Requested Reference Space Types" msgstr "" #: modules/webxr/webxr_interface.cpp +#, fuzzy msgid "Reference Space Type" -msgstr "" +msgstr "Type de référentiel spatial" #: modules/webxr/webxr_interface.cpp -#, fuzzy msgid "Visibility State" -msgstr "Basculer la visibilité" +msgstr "État de la visibilité" #: modules/webxr/webxr_interface.cpp -#, fuzzy msgid "Bounds Geometry" -msgstr "Réessayer" +msgstr "Géométrie des limites" #: modules/webxr/webxr_interface.cpp #, fuzzy @@ -18779,14 +18494,13 @@ msgstr "" #: platform/android/export/export.cpp msgid "Force System User" -msgstr "" +msgstr "Forcer l'utilisateur système" #: platform/android/export/export.cpp msgid "Shutdown ADB On Exit" -msgstr "" +msgstr "Fermer ADB à la sortie" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Launcher Icons" msgstr "Icônes du lanceur" @@ -18861,27 +18575,22 @@ msgid "Keystore" msgstr "Débogueur" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Debug User" -msgstr "Débogueur" +msgstr "Utilisateur de débogage" #: platform/android/export/export_plugin.cpp platform/uwp/export/export.cpp -#, fuzzy msgid "Debug Password" -msgstr "Mot de passe" +msgstr "Mot de passe de débogage" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Release User" -msgstr "Publication (release)" +msgstr "Utilisateur de publication (release)" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Release Password" -msgstr "Mot de passe" +msgstr "Mot de passe de publication" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "One Click Deploy" msgstr "Déploiement en un clic" @@ -18894,18 +18603,16 @@ msgid "Code" msgstr "Code" #: platform/android/export/export_plugin.cpp platform/uwp/export/export.cpp -#, fuzzy msgid "Package" -msgstr "Empaquetage" +msgstr "Paquetage" #: platform/android/export/export_plugin.cpp platform/uwp/export/export.cpp msgid "Unique Name" msgstr "Nom unique" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Signed" -msgstr "Signaux" +msgstr "Signé" #: platform/android/export/export_plugin.cpp msgid "Classify As Game" @@ -18916,9 +18623,8 @@ msgid "Retain Data On Uninstall" msgstr "Conserver les données lors de la désinstallation" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Exclude From Recents" -msgstr "Supprimer des nœuds" +msgstr "Exclure des récents" #: platform/android/export/export_plugin.cpp msgid "Graphics" @@ -18937,17 +18643,16 @@ msgid "XR Mode" msgstr "Mode XR" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Hand Tracking" -msgstr "Empaquetage" +msgstr "Suivi des mains" #: platform/android/export/export_plugin.cpp msgid "Hand Tracking Frequency" -msgstr "" +msgstr "Fréquence de suivi des mains" #: platform/android/export/export_plugin.cpp msgid "Passthrough" -msgstr "" +msgstr "Relais" #: platform/android/export/export_plugin.cpp msgid "Immersive Mode" @@ -18974,9 +18679,8 @@ msgid "Support Xlarge" msgstr "Support" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "User Data Backup" -msgstr "Interface utilisateur" +msgstr "Sauvegarde(backup) des données utilisateur" #: platform/android/export/export_plugin.cpp msgid "Allow" @@ -19209,20 +18913,17 @@ msgstr "" #: platform/android/export/export_plugin.cpp platform/osx/export/export.cpp #: platform/windows/export/export.cpp -#, fuzzy msgid "Code Signing" -msgstr "Signaux" +msgstr "Signature du code" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "" "'apksigner' could not be found. Please check that the command is available " "in the Android SDK build-tools directory. The resulting %s is unsigned." msgstr "" -"Impossible de trouver 'apksigner'.\n" -"Veuillez vérifier que la commande est disponible dans le dossier build-tools " -"du SDK Android.\n" -"Le paquet sortant %s est non signé." +"Impossible de trouver 'apksigner'. Veuillez vérifier que la commande est " +"disponible dans le dossier build-tools du SDK Android. Le %s resultant n'est " +"pas signé." #: platform/android/export/export_plugin.cpp msgid "Signing debug %s..." @@ -19237,9 +18938,8 @@ msgid "Could not find keystore, unable to export." msgstr "Impossible de trouver le keystore, impossible d'exporter." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Could not start apksigner executable." -msgstr "Impossible de démarrer le sous-processus !" +msgstr "Impossible de le programme apksigner." #: platform/android/export/export_plugin.cpp msgid "'apksigner' returned with error #%d" @@ -19276,9 +18976,8 @@ msgstr "" "*.apk." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Unsupported export format!" -msgstr "Format d'export non supporté !\n" +msgstr "Format d'export non supporté !" #: platform/android/export/export_plugin.cpp msgid "" @@ -19290,28 +18989,24 @@ msgstr "" "menu 'Projet'." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "" "Android build version mismatch: Template installed: %s, Godot version: %s. " "Please reinstall Android build template from 'Project' menu." msgstr "" -"La version d'Android ne correspond pas :\n" -" Modèle installé : %s\n" -" Version Godot : %s\n" -"Veuillez réinstaller la version d'Android depuis le menu 'Projet'." +"La version compilée d'Android ne correspond pas : Modèle type installé : %s, " +"Version de Godot : %s. Veuillez réinstaller le modèle type de compilation " +"d'Android depuis le menu 'Projet'." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "" "Unable to overwrite res://android/build/res/*.xml files with project name." msgstr "" "Impossible d'écraser les fichiers res://android/build/res/*.xml avec le nom " -"du projet" +"du projet." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Could not export project files to gradle project." -msgstr "Impossible d'exporter les fichiers du projet vers le projet gradle\n" +msgstr "Impossible d'exporter les fichiers du projet vers le projet gradle." #: platform/android/export/export_plugin.cpp msgid "Could not write expansion package file!" @@ -19322,15 +19017,13 @@ msgid "Building Android Project (gradle)" msgstr "Construire le Project Android (gradle)" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "" "Building of Android project failed, check output for the error. " "Alternatively visit docs.godotengine.org for Android build documentation." msgstr "" "La construction du projet Android a échoué, vérifiez la sortie pour " -"l'erreur.\n" -"Sinon, visitez docs.godotengine.org pour la documentation de construction " -"Android." +"l'erreur. Sinon, visitez docs.godotengine.org pour la documentation de " +"construction Android." #: platform/android/export/export_plugin.cpp msgid "Moving output" @@ -19345,41 +19038,38 @@ msgstr "" "du projet gradle pour les journaux." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Package not found: \"%s\"." -msgstr "Paquet non trouvé : %s" +msgstr "Paquet non trouvé : \"%s\"." #: platform/android/export/export_plugin.cpp msgid "Creating APK..." msgstr "Création de l'APK..." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Could not find template APK to export: \"%s\"." msgstr "" -"Impossible de trouver le modèle de l'APK à exporter :\n" -"%s" +"La construction du projet Android a échoué, vérifiez la sortie pour " +"l'erreur. Sinon, visitez docs.godotengine.org pour la documentation de " +"construction Android." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "" "Missing libraries in the export template for the selected architectures: %s. " "Please build a template with all required libraries, or uncheck the missing " "architectures in the export preset." msgstr "" "Bibliothèques manquantes dans le modèle d'exportation pour les architectures " -"sélectionnées : %s.\n" -"Veuillez construire un modèle avec toutes les bibliothèques requises, ou " -"désélectionner les architectures manquantes dans le préréglage d'exportation." +"sélectionnées : %s. Veuillez construire un modèle avec toutes les " +"bibliothèques requises, ou désélectionner les architectures manquantes dans " +"le préréglage d'exportation." #: platform/android/export/export_plugin.cpp msgid "Adding files..." msgstr "Ajout de fichiers..." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Could not export project files." -msgstr "Impossible d'exporter les fichiers du projet" +msgstr "Impossible d'exporter les fichiers du projet." #: platform/android/export/export_plugin.cpp msgid "Aligning APK..." @@ -19419,7 +19109,7 @@ msgstr "iPad 2048 X 1536" #: platform/iphone/export/export.cpp msgid "Portrait Launch Screens" -msgstr "" +msgstr "Écrans de lancement en mode portrait" #: platform/iphone/export/export.cpp msgid "iPhone 640 X 960" @@ -19451,38 +19141,35 @@ msgstr "iPhone 1242 X 2208" #: platform/iphone/export/export.cpp msgid "App Store Team ID" -msgstr "" +msgstr "ID de groupe de l'App Store" #: platform/iphone/export/export.cpp msgid "Provisioning Profile UUID Debug" -msgstr "" +msgstr "UUID de provisionnement de profils en débogage" #: platform/iphone/export/export.cpp msgid "Code Sign Identity Debug" -msgstr "" +msgstr "Identité de signature de code en débogage" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Export Method Debug" -msgstr "Exporter avec debug" +msgstr "Méthode d'exportation en débogage" #: platform/iphone/export/export.cpp msgid "Provisioning Profile UUID Release" -msgstr "" +msgstr "UUID de provisionnement de profils en publication" #: platform/iphone/export/export.cpp msgid "Code Sign Identity Release" -msgstr "" +msgstr "Identité de signature de code en publication" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Export Method Release" -msgstr "Mode d'exportation :" +msgstr "Méthode d'exportation en publication" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Targeted Device Family" -msgstr "Famille de système cible" +msgstr "Famille de système ciblée" #: platform/iphone/export/export.cpp platform/osx/export/export.cpp msgid "Info" @@ -19514,9 +19201,8 @@ msgid "Access Wi-Fi" msgstr "Accès Wi-Fi" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Push Notifications" -msgstr "Rotation aléatoire :" +msgstr "Notifications Push" #: platform/iphone/export/export.cpp msgid "User Data" @@ -19524,33 +19210,29 @@ msgstr "Données Utilisateur" #: platform/iphone/export/export.cpp msgid "Accessible From Files App" -msgstr "" +msgstr "Accessible depuis l'application Files" #: platform/iphone/export/export.cpp msgid "Accessible From iTunes Sharing" -msgstr "" +msgstr "Accessible depuis le partage iTunes" #: platform/iphone/export/export.cpp platform/osx/export/export.cpp msgid "Privacy" msgstr "Confidentialité" #: platform/iphone/export/export.cpp platform/osx/export/export.cpp -#, fuzzy msgid "Camera Usage Description" -msgstr "Description" +msgstr "Description d'utilisation de la caméra" #: platform/iphone/export/export.cpp platform/osx/export/export.cpp -#, fuzzy msgid "Microphone Usage Description" -msgstr "Description des propriétés" +msgstr "Description d'utilisation du microphone" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Photolibrary Usage Description" -msgstr "Description des propriétés" +msgstr "Description d'utilisation de la bibliothèque d'image" #: platform/iphone/export/export.cpp -#, fuzzy msgid "iPhone 120 X 120" msgstr "iPhone 120 X 120" @@ -19568,19 +19250,19 @@ msgstr "iPad 152 X 152" #: platform/iphone/export/export.cpp msgid "iPad 167 X 167" -msgstr "" +msgstr "iPad 167 X 167" #: platform/iphone/export/export.cpp msgid "App Store 1024 X 1024" -msgstr "" +msgstr "App Store 1024 X 1024" #: platform/iphone/export/export.cpp msgid "Spotlight 40 X 40" -msgstr "" +msgstr "Projecteur 40 X 40" #: platform/iphone/export/export.cpp msgid "Spotlight 80 X 80" -msgstr "" +msgstr "Projecteur 80 X 80" #: platform/iphone/export/export.cpp msgid "Storyboard" @@ -19591,19 +19273,16 @@ msgid "Use Launch Screen Storyboard" msgstr "" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Image Scale Mode" -msgstr "Mode mise à l'échelle" +msgstr "Mode de mise à l'échelle d'image" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Custom Image @2x" -msgstr "Nœud Personnalisé" +msgstr "Image personnalisée @2x" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Custom Image @3x" -msgstr "Nœud Personnalisé" +msgstr "Image personnalisée @3x" #: platform/iphone/export/export.cpp msgid "Use Custom BG Color" @@ -19704,7 +19383,7 @@ msgstr "" #: platform/javascript/export/export.cpp msgid "Canvas Resize Policy" -msgstr "" +msgstr "Politique de redimensionnement du canevas" #: platform/javascript/export/export.cpp msgid "Focus Canvas On Start" @@ -19803,18 +19482,16 @@ msgid "Already signed!" msgstr "Déjà signé !" #: platform/osx/export/codesign.cpp -#, fuzzy msgid "Failed to process nested resources." -msgstr "Impossible de charger la ressource." +msgstr "Le traitement des ressources imbriquées a échoué." #: platform/osx/export/codesign.cpp msgid "Failed to create _CodeSignature subfolder." msgstr "Échec lors de la création du sous-dossier _CodeSignature." #: platform/osx/export/codesign.cpp -#, fuzzy msgid "Failed to get CodeResources hash." -msgstr "Impossible de charger la ressource." +msgstr "La récupération du hachage de CodeResources a échouée." #: platform/osx/export/codesign.cpp platform/osx/export/export.cpp #, fuzzy @@ -19826,7 +19503,6 @@ msgid "Invalid executable file." msgstr "Fichier exécutable invalide." #: platform/osx/export/codesign.cpp -#, fuzzy msgid "Can't resize signature load command." msgstr "Impossible de redimensionner la commande de chargement des signatures." @@ -19847,75 +19523,65 @@ msgid "App Category" msgstr "Catégorie de l'application" #: platform/osx/export/export.cpp -#, fuzzy msgid "High Res" msgstr "Haute Résolution" #: platform/osx/export/export.cpp -#, fuzzy msgid "Location Usage Description" -msgstr "Description" +msgstr "Description d'utilisation de la géolocalisation" #: platform/osx/export/export.cpp msgid "Address Book Usage Description" -msgstr "" +msgstr "Description d'utilisation du carnet d'adresse" #: platform/osx/export/export.cpp -#, fuzzy msgid "Calendar Usage Description" -msgstr "Description" +msgstr "Description d'utilisation du calendrier" #: platform/osx/export/export.cpp -#, fuzzy msgid "Photos Library Usage Description" -msgstr "Description des propriétés" +msgstr "Description d'utilisation de la bibliothèque photo" #: platform/osx/export/export.cpp -#, fuzzy msgid "Desktop Folder Usage Description" -msgstr "Descriptions des méthodes" +msgstr "Description d'utilisation du dossier Bureau" #: platform/osx/export/export.cpp -#, fuzzy msgid "Documents Folder Usage Description" -msgstr "Descriptions des méthodes" +msgstr "Description d'utilisation du dossier Documents" #: platform/osx/export/export.cpp msgid "Downloads Folder Usage Description" -msgstr "" +msgstr "Description d'utilisation du dossier Téléchargements" #: platform/osx/export/export.cpp msgid "Network Volumes Usage Description" -msgstr "" +msgstr "Description d'utilisation des disques réseau" #: platform/osx/export/export.cpp msgid "Removable Volumes Usage Description" -msgstr "" +msgstr "Description d'utilisation des disques amovibles" #: platform/osx/export/export.cpp platform/windows/export/export.cpp -#, fuzzy msgid "Codesign" -msgstr "Nœud" +msgstr "Signature du code" #: platform/osx/export/export.cpp platform/uwp/export/export.cpp #: platform/windows/export/export.cpp -#, fuzzy msgid "Identity" -msgstr "Indenter vers la gauche" +msgstr "Identité" #: platform/osx/export/export.cpp platform/windows/export/export.cpp -#, fuzzy msgid "Timestamp" -msgstr "Temps" +msgstr "Horodatage" #: platform/osx/export/export.cpp msgid "Hardened Runtime" msgstr "" #: platform/osx/export/export.cpp -#, fuzzy msgid "Replace Existing Signature" -msgstr "Remplacer dans les fichiers" +msgstr "Remplacer la signature existante" #: platform/osx/export/export.cpp #, fuzzy @@ -19923,9 +19589,8 @@ msgid "Entitlements" msgstr "Gadgets" #: platform/osx/export/export.cpp -#, fuzzy msgid "Custom File" -msgstr "Nœud Personnalisé" +msgstr "Fichier personnalisé" #: platform/osx/export/export.cpp msgid "Allow JIT Code Execution" @@ -19960,43 +19625,37 @@ msgid "Photos Library" msgstr "Bibliothèque de photos" #: platform/osx/export/export.cpp -#, fuzzy msgid "Apple Events" -msgstr "Ajouter évènement" +msgstr "Événements Apple" #: platform/osx/export/export.cpp -#, fuzzy msgid "Debugging" msgstr "Débogage" #: platform/osx/export/export.cpp -#, fuzzy msgid "App Sandbox" msgstr "Bac à sable de l'application" #: platform/osx/export/export.cpp -#, fuzzy msgid "Network Server" -msgstr "Profileur réseau" +msgstr "Serveur réseau" #: platform/osx/export/export.cpp -#, fuzzy msgid "Network Client" -msgstr "Profileur réseau" +msgstr "Client réseau" #: platform/osx/export/export.cpp -#, fuzzy msgid "Device USB" -msgstr "Périphérique" +msgstr "Périphérique USB" #: platform/osx/export/export.cpp msgid "Device Bluetooth" -msgstr "" +msgstr "Périphérique Bluetooth" #: platform/osx/export/export.cpp #, fuzzy msgid "Files Downloads" -msgstr "Télécharger" +msgstr "Téléchargement de fichiers" #: platform/osx/export/export.cpp #, fuzzy @@ -20014,9 +19673,8 @@ msgid "Files Movies" msgstr "Filtrer les tuiles" #: platform/osx/export/export.cpp platform/windows/export/export.cpp -#, fuzzy msgid "Custom Options" -msgstr "Options de bus" +msgstr "Options personnalisées" #: platform/osx/export/export.cpp #, fuzzy @@ -20025,31 +19683,27 @@ msgstr "Localisation" #: platform/osx/export/export.cpp msgid "Apple ID Name" -msgstr "" +msgstr "Nom Apple ID" #: platform/osx/export/export.cpp -#, fuzzy msgid "Apple ID Password" -msgstr "Mot de passe" +msgstr "Mot de passe Apple ID" #: platform/osx/export/export.cpp msgid "Apple Team ID" msgstr "Apple Team ID" #: platform/osx/export/export.cpp -#, fuzzy msgid "Could not open icon file \"%s\"." -msgstr "Impossible d'exporter les fichiers du projet" +msgstr "Impossible d'ouvrir le fichier d'icône \"%s\"." #: platform/osx/export/export.cpp -#, fuzzy msgid "Could not start xcrun executable." -msgstr "Impossible de démarrer le sous-processus !" +msgstr "Impossible de démarrer le sous-processus." #: platform/osx/export/export.cpp -#, fuzzy msgid "Notarization failed." -msgstr "Localisation" +msgstr "Notarisation échouée." #: platform/osx/export/export.cpp msgid "Notarization request UUID: \"%s\"" @@ -20082,6 +19736,8 @@ msgstr "" #: platform/osx/export/export.cpp msgid "Timestamping is not compatible with ad-hoc signature, and was disabled!" msgstr "" +"L'horodatage n'est pas compatible avec la signature ad-hoc et a été " +"désactivé !" #: platform/osx/export/export.cpp msgid "" @@ -20094,7 +19750,7 @@ msgstr "" #: platform/osx/export/export.cpp msgid "Built-in CodeSign require regex module." -msgstr "" +msgstr "CodeSign intégré nécessite le module regex." #: platform/osx/export/export.cpp msgid "" @@ -20109,9 +19765,8 @@ msgid "No identity found." msgstr "Aucune identité trouvée." #: platform/osx/export/export.cpp -#, fuzzy msgid "Cannot sign file %s." -msgstr "Erreur lors de l'enregistrement du fichier : %s" +msgstr "Impossible de signer le fichier %s." #: platform/osx/export/export.cpp msgid "Relative symlinks are not supported, exported \"%s\" might be broken!" @@ -20120,17 +19775,14 @@ msgstr "" "cassé !" #: platform/osx/export/export.cpp -#, fuzzy msgid "DMG Creation" -msgstr "Directions" +msgstr "Création du DMG" #: platform/osx/export/export.cpp -#, fuzzy msgid "Could not start hdiutil executable." -msgstr "Impossible de démarrer le sous-processus !" +msgstr "Impossible de démarrer le programme hdiutil." #: platform/osx/export/export.cpp -#, fuzzy msgid "`hdiutil create` failed - file exists." msgstr "`hdiutil create` a échoué - le fichier existe." @@ -20139,19 +19791,16 @@ msgid "`hdiutil create` failed." msgstr "`hdiutil create` a échoué." #: platform/osx/export/export.cpp -#, fuzzy msgid "Creating app bundle" -msgstr "Création de l'aperçu" +msgstr "Création du paquet d'application" #: platform/osx/export/export.cpp -#, fuzzy msgid "Could not find template app to export: \"%s\"." -msgstr "Impossible de trouver le modèle de l'application à exporter :" +msgstr "Impossible de trouver le modèle de l'application à exporter : \"%s\"." #: platform/osx/export/export.cpp -#, fuzzy msgid "Invalid export format." -msgstr "Modèle d'exportation non valide :" +msgstr "Format d'export invalide." #: platform/osx/export/export.cpp msgid "" @@ -20178,10 +19827,13 @@ msgid "" "Ad-hoc signed applications require the 'Disable Library Validation' " "entitlement to load dynamic libraries." msgstr "" +"La signature d'applications ad-hoc nécessite la permission \"Désactiver la " +"validation de bibliothèque\" pour pouvoir charger dynamiquement les " +"bibliothèques." #: platform/osx/export/export.cpp msgid "Code signing bundle" -msgstr "" +msgstr "Paquet de signature du code" #: platform/osx/export/export.cpp msgid "Making DMG" @@ -20189,7 +19841,7 @@ msgstr "Création du DMG" #: platform/osx/export/export.cpp msgid "Code signing DMG" -msgstr "" +msgstr "DMG de signature du code" #: platform/osx/export/export.cpp msgid "Making ZIP" @@ -20208,14 +19860,12 @@ msgid "Sending archive for notarization" msgstr "Envoi de l'archive pour la certification" #: platform/osx/export/export.cpp -#, fuzzy msgid "ZIP Creation" -msgstr "Projet" +msgstr "Création ZIP" #: platform/osx/export/export.cpp -#, fuzzy msgid "Could not open file to read from path \"%s\"." -msgstr "Impossible d'exporter les fichiers du projet vers le projet gradle\n" +msgstr "Impossible d'ouvrir le fichier à lire au chemin \"%s\"." #: platform/osx/export/export.cpp msgid "Invalid bundle identifier:" @@ -20245,14 +19895,13 @@ msgstr "" "supporté." #: platform/osx/export/export.cpp -#, fuzzy msgid "Notarization: Code signing is required for notarization." -msgstr "Certification : signature du code requise." +msgstr "" +"Notarisation : La signature du code est nécessaire pour la notarisation." #: platform/osx/export/export.cpp -#, fuzzy msgid "Notarization: Hardened runtime is required for notarization." -msgstr "Certification : exécution renforcée requise." +msgstr "Notarisation : exécution renforcée nécessaire pour la notarisation." #: platform/osx/export/export.cpp #, fuzzy @@ -20294,6 +19943,8 @@ msgstr "" msgid "" "Timestamping is not compatible with ad-hoc signature, and will be disabled!" msgstr "" +"L'horodatage n'est pas compatible avec la signature ad-hoc et a été " +"désactivé !" #: platform/osx/export/export.cpp msgid "" @@ -20356,17 +20007,15 @@ msgstr "macOS" #: platform/osx/export/export.cpp msgid "Force Builtin Codesign" -msgstr "" +msgstr "Forcer CodeSign intégré" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Architecture" -msgstr "Ajouter une entrée architecture" +msgstr "Architecture" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Display Name" -msgstr "Tout afficher" +msgstr "Afficher le nom" #: platform/uwp/export/export.cpp msgid "Short Name" @@ -20374,36 +20023,31 @@ msgstr "Nom Abrégé" #: platform/uwp/export/export.cpp msgid "Publisher" -msgstr "" +msgstr "Publicateur" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Publisher Display Name" -msgstr "Nom d'affichage d'éditeur du paquet invalide." +msgstr "Nom d'affichage de l'éditeur du paquet" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Product GUID" -msgstr "GUID produit invalide." +msgstr "GUID du produit" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Publisher GUID" -msgstr "Effacé Guides" +msgstr "GUID du publicateur" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Signing" -msgstr "Signaux" +msgstr "Signature" #: platform/uwp/export/export.cpp msgid "Certificate" msgstr "Certificat" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Algorithm" -msgstr "Débogueur" +msgstr "Algorithme" #: platform/uwp/export/export.cpp msgid "Major" @@ -20414,23 +20058,20 @@ msgid "Minor" msgstr "Mineur" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Build" -msgstr "Mode Règle" +msgstr "Build" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Revision" -msgstr "Expression" +msgstr "Révision" #: platform/uwp/export/export.cpp msgid "Landscape" msgstr "Paysage" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Portrait" -msgstr "Retourner les Portals" +msgstr "Portrait" #: platform/uwp/export/export.cpp msgid "Landscape Flipped" @@ -20441,9 +20082,8 @@ msgid "Portrait Flipped" msgstr "Portrait Inversé" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Store Logo" -msgstr "Mode mise à l'échelle" +msgstr "Logo du magasin" #: platform/uwp/export/export.cpp msgid "Square 44 X 44 Logo" @@ -20466,14 +20106,12 @@ msgid "Wide 310 X 150 Logo" msgstr "Logo 310 X 150 Large" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Splash Screen" -msgstr "Appels de dessin :" +msgstr "Écran de chargement" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Tiles" -msgstr "Fichier" +msgstr "Tuiles" #: platform/uwp/export/export.cpp msgid "Show Name On Square 150 X 150" @@ -20557,32 +20195,28 @@ msgid "UWP" msgstr "UWP" #: platform/uwp/export/export.cpp platform/windows/export/export.cpp -#, fuzzy msgid "Signtool" -msgstr "Signaux" +msgstr "Signtool" #: platform/uwp/export/export.cpp msgid "Debug Certificate" msgstr "Certificat de Débogage" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Debug Algorithm" -msgstr "Débogueur" +msgstr "Algorithme de débogage" #: platform/windows/export/export.cpp -#, fuzzy msgid "Failed to rename temporary file \"%s\"." -msgstr "Impossible de supprimer le fichier temporaire :" +msgstr "Impossible de renommer le fichier temporaire \"%s\"." #: platform/windows/export/export.cpp -#, fuzzy msgid "Identity Type" msgstr "Type d'identité" #: platform/windows/export/export.cpp msgid "Timestamp Server URL" -msgstr "" +msgstr "URL du serveur d'horodatage" #: platform/windows/export/export.cpp #, fuzzy @@ -20590,14 +20224,12 @@ msgid "Digest Algorithm" msgstr "Débogueur" #: platform/windows/export/export.cpp -#, fuzzy msgid "Modify Resources" -msgstr "Copier la ressource" +msgstr "Modifier les ressources" #: platform/windows/export/export.cpp -#, fuzzy msgid "File Version" -msgstr "Version" +msgstr "Version de fichier" #: platform/windows/export/export.cpp msgid "Product Version" @@ -20612,18 +20244,16 @@ msgid "Product Name" msgstr "Nom du produit" #: platform/windows/export/export.cpp -#, fuzzy msgid "File Description" -msgstr "Description" +msgstr "Description de fichier" #: platform/windows/export/export.cpp msgid "Trademarks" msgstr "Marques Déposées" #: platform/windows/export/export.cpp -#, fuzzy msgid "Resources Modification" -msgstr "Rotation aléatoire :" +msgstr "Modification de ressources" #: platform/windows/export/export.cpp #, fuzzy @@ -20638,61 +20268,52 @@ msgstr "Impossible de trouver le keystore, impossible d'exporter." #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" "L'outil « rcedit » doit être configuré dans les préférences de l'éditeur " "(Exporter > Windows > Rcedit) for modifier l'icône ou les informations de " "l'application." #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" -"rcedit n'a pas réussi à modifier l'exécutable :\n" -"%s" +msgid "rcedit failed to modify executable: %s." +msgstr "rcedit n'a pas réussi à modifier l'exécutable : %s." #: platform/windows/export/export.cpp -#, fuzzy msgid "Could not find signtool executable at \"%s\"." -msgstr "Impossible de trouver le keystore, impossible d'exporter." +msgstr "Impossible de trouver l’exécutable signtool à \"%s\"." #: platform/windows/export/export.cpp -#, fuzzy msgid "Could not find osslsigncode executable at \"%s\"." -msgstr "Impossible de trouver le keystore, impossible d'exporter." +msgstr "Impossible de trouver l’exécutable osslsigncode à \"%s\"." #: platform/windows/export/export.cpp -#, fuzzy msgid "Invalid identity type." -msgstr "Identifiant invalide :" +msgstr "Type d'identité invalide." #: platform/windows/export/export.cpp -#, fuzzy msgid "Invalid timestamp server." -msgstr "Nom invalide." +msgstr "Server d'horodatage invalide." #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" "L'outil « rcedit » doit être configuré dans les préférences de l'éditeur " "(Exporter > Windows > Rcedit) for modifier l'icône ou les informations de " "l'application." #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +msgid "Signtool failed to sign executable: %s." +msgstr "La signature de l’exécutable avec Signtool a échoué : %s." #: platform/windows/export/export.cpp -#, fuzzy msgid "Failed to remove temporary file \"%s\"." -msgstr "Impossible de supprimer le fichier temporaire :" +msgstr "Impossible de supprimer le fichier temporaire \"%s\"." #: platform/windows/export/export.cpp msgid "" @@ -20717,7 +20338,7 @@ msgstr "Version du produit invalide :" #: platform/windows/export/export.cpp msgid "Windows executables cannot be >= 4 GiB." -msgstr "" +msgstr "Les exécutables Windows ne peuvent pas peser >= 4Gio." #: platform/windows/export/export.cpp platform/x11/export/export.cpp #, fuzzy @@ -20726,38 +20347,37 @@ msgstr "Fichier exécutable invalide." #: platform/windows/export/export.cpp platform/x11/export/export.cpp msgid "Executable file header corrupted." -msgstr "" +msgstr "Entête du fichier exécutable corrompue." #: platform/windows/export/export.cpp platform/x11/export/export.cpp msgid "Executable \"pck\" section not found." -msgstr "" +msgstr "Section \"pck\" de l’exécutable non trouvée." #: platform/windows/export/export.cpp -#, fuzzy msgid "Windows" -msgstr "Nouvelle Fenêtre" +msgstr "Windows" #: platform/windows/export/export.cpp msgid "Rcedit" -msgstr "" +msgstr "Rcedit" #: platform/windows/export/export.cpp msgid "Osslsigncode" -msgstr "" +msgstr "Osslsigncode" #: platform/windows/export/export.cpp msgid "Wine" -msgstr "" +msgstr "Wine" #: platform/x11/export/export.cpp msgid "32-bit executables cannot have embedded data >= 4 GiB." msgstr "" +"les exécutables 32 bits ne peuvent pas contenir de données pesant >= 4Gio." #: scene/2d/animated_sprite.cpp scene/3d/sprite_3d.cpp #: scene/resources/texture.cpp -#, fuzzy msgid "Frames" -msgstr "Image %" +msgstr "Trames" #: scene/2d/animated_sprite.cpp msgid "" @@ -20769,71 +20389,61 @@ msgstr "" #: scene/2d/animated_sprite.cpp scene/2d/cpu_particles_2d.cpp #: scene/2d/particles_2d.cpp scene/3d/cpu_particles.cpp scene/3d/particles.cpp -#, fuzzy msgid "Speed Scale" -msgstr "Mode mise à l'échelle" +msgstr "Échelle de vitesse" #: scene/2d/animated_sprite.cpp scene/2d/audio_stream_player_2d.cpp #: scene/3d/audio_stream_player_3d.cpp scene/3d/sprite_3d.cpp #: scene/audio/audio_stream_player.cpp -#, fuzzy msgid "Playing" -msgstr "Jouer" +msgstr "En train de jouer" #: scene/2d/animated_sprite.cpp scene/2d/sprite.cpp scene/3d/sprite_3d.cpp -#, fuzzy msgid "Centered" -msgstr "Centre" +msgstr "Centré" #: scene/2d/animated_sprite.cpp scene/2d/sprite.cpp scene/3d/sprite_3d.cpp #: scene/gui/texture_button.cpp scene/gui/texture_rect.cpp msgid "Flip H" -msgstr "" +msgstr "Miroir H" #: scene/2d/animated_sprite.cpp scene/2d/sprite.cpp scene/3d/sprite_3d.cpp #: scene/gui/texture_button.cpp scene/gui/texture_rect.cpp msgid "Flip V" -msgstr "" +msgstr "Miroir V" #: scene/2d/area_2d.cpp scene/3d/area.cpp -#, fuzzy msgid "Monitoring" -msgstr "Moniteur" +msgstr "Observation" #: scene/2d/area_2d.cpp scene/3d/area.cpp -#, fuzzy msgid "Monitorable" -msgstr "Moniteur" +msgstr "Observable" #: scene/2d/area_2d.cpp scene/3d/area.cpp -#, fuzzy msgid "Physics Overrides" -msgstr "Redéfinition" +msgstr "Redéfinitions de physique" #: scene/2d/area_2d.cpp scene/3d/area.cpp -#, fuzzy msgid "Space Override" -msgstr "Redéfinition" +msgstr "Redéfinition d'espace" #: scene/2d/area_2d.cpp scene/3d/area.cpp -#, fuzzy msgid "Gravity Point" -msgstr "Générer des points" +msgstr "Gravité ponctuelle" #: scene/2d/area_2d.cpp scene/3d/area.cpp -#, fuzzy msgid "Gravity Distance Scale" -msgstr "WaitInstanceSignal" +msgstr "Échelle de distance de gravité" #: scene/2d/area_2d.cpp scene/3d/area.cpp -#, fuzzy msgid "Gravity Vec" -msgstr "Aperçu par défaut" +msgstr "Vecteur de gravité" #: scene/2d/area_2d.cpp scene/2d/cpu_particles_2d.cpp scene/3d/area.cpp #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp msgid "Gravity" -msgstr "" +msgstr "Gravité" #: scene/2d/area_2d.cpp scene/3d/area.cpp #, fuzzy @@ -20845,38 +20455,33 @@ msgid "Angular Damp" msgstr "" #: scene/2d/area_2d.cpp scene/3d/area.cpp -#, fuzzy msgid "Audio Bus" -msgstr "Ajouter un bus audio" +msgstr "Bus audio" #: scene/2d/area_2d.cpp scene/3d/area.cpp -#, fuzzy msgid "Override" msgstr "Redéfinition" #: scene/2d/audio_stream_player_2d.cpp scene/audio/audio_stream_player.cpp #: scene/gui/video_player.cpp servers/audio/effects/audio_effect_amplify.cpp -#, fuzzy msgid "Volume dB" -msgstr "Volume" +msgstr "Volume (dB)" #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp #: scene/audio/audio_stream_player.cpp #: servers/audio/effects/audio_effect_pitch_shift.cpp -#, fuzzy msgid "Pitch Scale" -msgstr "Mode mise à l'échelle" +msgstr "Échelle de pitch" #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp #: scene/audio/audio_stream_player.cpp scene/gui/video_player.cpp -#, fuzzy msgid "Autoplay" -msgstr "Activer/désactiver la lecture automatique" +msgstr "Lecture automatique" #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp #: scene/audio/audio_stream_player.cpp msgid "Stream Paused" -msgstr "" +msgstr "Diffusion en pause" #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp #: scene/3d/light.cpp scene/3d/reflection_probe.cpp @@ -20886,34 +20491,29 @@ msgid "Max Distance" msgstr "Distance Maximale" #: scene/2d/audio_stream_player_2d.cpp scene/3d/light.cpp -#, fuzzy msgid "Attenuation" -msgstr "Animation" +msgstr "Atténuation" #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp #: scene/audio/audio_stream_player.cpp scene/gui/video_player.cpp -#, fuzzy msgid "Bus" -msgstr "Ajouter un bus" +msgstr "Bus" #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp msgid "Area Mask" -msgstr "" +msgstr "Masque de zone" #: scene/2d/back_buffer_copy.cpp -#, fuzzy msgid "Copy Mode" -msgstr "Copier les nœuds" +msgstr "Mode copie" #: scene/2d/camera_2d.cpp -#, fuzzy msgid "Anchor Mode" -msgstr "Mode Icône" +msgstr "Mode ancre" #: scene/2d/camera_2d.cpp -#, fuzzy msgid "Rotating" -msgstr "Pas de la rotation :" +msgstr "En rotation" #: scene/2d/camera_2d.cpp scene/2d/listener_2d.cpp scene/3d/camera.cpp #: scene/3d/listener.cpp scene/animation/animation_blend_tree.cpp @@ -20921,14 +20521,12 @@ msgid "Current" msgstr "Actuel" #: scene/2d/camera_2d.cpp scene/gui/graph_edit.cpp -#, fuzzy msgid "Zoom" msgstr "Zoomer" #: scene/2d/camera_2d.cpp scene/main/canvas_layer.cpp -#, fuzzy msgid "Custom Viewport" -msgstr "1 vue" +msgstr "Vue personnalisée" #: scene/2d/camera_2d.cpp scene/3d/camera.cpp scene/3d/interpolated_camera.cpp #: scene/animation/animation_player.cpp scene/animation/animation_tree.cpp @@ -20939,26 +20537,23 @@ msgstr "Mode déplacement" #: scene/2d/camera_2d.cpp msgid "Limit" -msgstr "" +msgstr "Limite" #: scene/2d/camera_2d.cpp scene/gui/control.cpp scene/gui/nine_patch_rect.cpp #: scene/resources/style_box.cpp scene/resources/texture.cpp -#, fuzzy msgid "Left" -msgstr "En haut à gauche" +msgstr "Gauche" #: scene/2d/camera_2d.cpp scene/gui/control.cpp scene/gui/nine_patch_rect.cpp #: scene/resources/style_box.cpp scene/resources/texture.cpp -#, fuzzy msgid "Right" -msgstr "Lumière" +msgstr "Droite" #: scene/2d/camera_2d.cpp scene/gui/control.cpp scene/gui/nine_patch_rect.cpp #: scene/resources/dynamic_font.cpp scene/resources/style_box.cpp #: scene/resources/texture.cpp -#, fuzzy msgid "Bottom" -msgstr "En bas à gauche" +msgstr "Bas" #: scene/2d/camera_2d.cpp #, fuzzy @@ -20966,9 +20561,8 @@ msgid "Smoothed" msgstr "Progression douce" #: scene/2d/camera_2d.cpp -#, fuzzy msgid "Draw Margin" -msgstr "Définir la marge" +msgstr "Afficher les marges" #: scene/2d/camera_2d.cpp #, fuzzy @@ -20987,27 +20581,24 @@ msgstr "Progression douce" #: scene/2d/camera_2d.cpp msgid "H" -msgstr "" +msgstr "H" #: scene/2d/camera_2d.cpp -#, fuzzy msgid "V" -msgstr "UV" +msgstr "V" #: scene/2d/camera_2d.cpp #, fuzzy msgid "Drag Margin" -msgstr "Définir la marge" +msgstr "Tirer la marge" #: scene/2d/camera_2d.cpp -#, fuzzy msgid "Draw Screen" -msgstr "Appels de dessin :" +msgstr "Afficher l'écran" #: scene/2d/camera_2d.cpp -#, fuzzy msgid "Draw Limits" -msgstr "Appels de dessin :" +msgstr "Afficher les limites" #: scene/2d/camera_2d.cpp #, fuzzy @@ -21016,43 +20607,37 @@ msgstr "Définir la marge" #: scene/2d/canvas_item.cpp scene/resources/environment.cpp #: scene/resources/material.cpp -#, fuzzy msgid "Blend Mode" -msgstr "Nœud Blend2" +msgstr "Mode mélange" #: scene/2d/canvas_item.cpp -#, fuzzy msgid "Light Mode" -msgstr "Étendu à Droite" +msgstr "Mode de lumière" #: scene/2d/canvas_item.cpp -#, fuzzy msgid "Particles Animation" -msgstr "Particules" +msgstr "Animation de particules" #: scene/2d/canvas_item.cpp msgid "Particles Anim H Frames" -msgstr "" +msgstr "Trames d'animation H de particules" #: scene/2d/canvas_item.cpp msgid "Particles Anim V Frames" -msgstr "" +msgstr "Trames d'animation V de particules" #: scene/2d/canvas_item.cpp -#, fuzzy msgid "Particles Anim Loop" -msgstr "Particules" +msgstr "Boucle d'animation de particules" #: scene/2d/canvas_item.cpp scene/3d/spatial.cpp -#, fuzzy msgid "Visibility" -msgstr "Basculer la visibilité" +msgstr "Visibilité" #: scene/2d/canvas_item.cpp scene/3d/spatial.cpp scene/gui/progress_bar.cpp #: scene/gui/rich_text_effect.cpp scene/main/canvas_layer.cpp -#, fuzzy msgid "Visible" -msgstr "Basculer la visibilité" +msgstr "Visible" #: scene/2d/canvas_item.cpp #, fuzzy @@ -21061,22 +20646,20 @@ msgstr "Peupler" #: scene/2d/canvas_item.cpp msgid "Show Behind Parent" -msgstr "" +msgstr "Montrer derrière le parent" #: scene/2d/canvas_item.cpp -#, fuzzy msgid "Show On Top" -msgstr "Afficher l'origine" +msgstr "Montrer au dessus" #: scene/2d/canvas_item.cpp scene/2d/light_occluder_2d.cpp #: scene/2d/tile_map.cpp -#, fuzzy msgid "Light Mask" -msgstr "LightMap Bake" +msgstr "Masque de lumières" #: scene/2d/canvas_item.cpp msgid "Use Parent Material" -msgstr "" +msgstr "Utiliser le matériau du parent" #: scene/2d/canvas_modulate.cpp msgid "" @@ -21098,9 +20681,8 @@ msgstr "" "qu'enfant pour définir sa forme." #: scene/2d/collision_object_2d.cpp -#, fuzzy msgid "Pickable" -msgstr "Sélectionner une tuile" +msgstr "Déplaçable" #: scene/2d/collision_polygon_2d.cpp msgid "" @@ -21132,29 +20714,27 @@ msgstr "" msgid "" "The One Way Collision property will be ignored when the parent is an Area2D." msgstr "" +"La propriété Collision à sens unique est ignorée lorsque le parent est un " +"Area2D." #: scene/2d/collision_polygon_2d.cpp -#, fuzzy msgid "Build Mode" -msgstr "Mode Règle" +msgstr "Mode construction" #: scene/2d/collision_polygon_2d.cpp scene/2d/collision_shape_2d.cpp #: scene/3d/collision_polygon.cpp scene/3d/collision_shape.cpp #: scene/animation/animation_node_state_machine.cpp scene/gui/base_button.cpp #: scene/gui/texture_button.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Disabled" -msgstr "Item désactivé" +msgstr "Désactivé" #: scene/2d/collision_polygon_2d.cpp scene/2d/collision_shape_2d.cpp -#, fuzzy msgid "One Way Collision" -msgstr "Créer le polygone de collision" +msgstr "Collision à sens unique" #: scene/2d/collision_polygon_2d.cpp scene/2d/collision_shape_2d.cpp -#, fuzzy msgid "One Way Collision Margin" -msgstr "Créer le polygone de collision" +msgstr "marge de collision à sens unique" #: scene/2d/collision_shape_2d.cpp msgid "" @@ -21193,31 +20773,28 @@ msgstr "" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp -#, fuzzy msgid "Emitting" -msgstr "Paramètres :" +msgstr "Émet" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp msgid "Lifetime" -msgstr "" +msgstr "Durée de vie" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp scene/main/timer.cpp -#, fuzzy msgid "One Shot" -msgstr "Nœud one-shot" +msgstr "Jouer une fois" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp -#, fuzzy msgid "Preprocess" -msgstr "Post-traitement" +msgstr "Pré-traitement" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp msgid "Explosiveness" -msgstr "" +msgstr "Explovisité" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp @@ -21227,13 +20804,12 @@ msgstr "Aléatoire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp msgid "Lifetime Randomness" -msgstr "" +msgstr "Aléatoire de durée de vie" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp -#, fuzzy msgid "Fixed FPS" -msgstr "Voir Images par secondes" +msgstr "FPS fixes" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp @@ -21247,20 +20823,18 @@ msgstr "" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp -#, fuzzy msgid "Local Coords" -msgstr "Projets locaux" +msgstr "Coordonnées locales" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp msgid "Draw Order" -msgstr "" +msgstr "Ordre de rendu" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Emission Shape" -msgstr "Masque d'émission" +msgstr "Forme d'émission" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp @@ -21273,63 +20847,55 @@ msgid "Rect Extents" msgstr "Gadgets" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp -#, fuzzy msgid "Normals" -msgstr "Format" +msgstr "Normales" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Align Y" -msgstr "Assigner" +msgstr "Aligner axe Y" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Direction" -msgstr "Directions" +msgstr "Direction" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp #: servers/audio/effects/audio_effect_reverb.cpp msgid "Spread" -msgstr "" +msgstr "Propagation" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Initial Velocity" -msgstr "Initialiser" +msgstr "Vélocité initiale" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Velocity Random" -msgstr "Vue de l'orbite vers la droite" +msgstr "Vélocité aléatoire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp servers/physics_2d_server.cpp #: servers/physics_server.cpp msgid "Angular Velocity" -msgstr "" +msgstr "Vélocité angulaire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Velocity Curve" -msgstr "Vue de l'orbite vers la droite" +msgstr "Courbe de vélocité" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Orbit Velocity" -msgstr "Vue de l'orbite vers la droite" +msgstr "Vélocité d'orbite" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Linear Accel" -msgstr "Linéaire" +msgstr "Accélération linéaire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp @@ -21339,23 +20905,22 @@ msgstr "Accel" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp msgid "Accel Random" -msgstr "" +msgstr "Accélération aléatoire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Accel Curve" -msgstr "Scinder la courbe" +msgstr "Courbe d’accélération" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp msgid "Radial Accel" -msgstr "" +msgstr "Accélération radiale" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp msgid "Tangential Accel" -msgstr "" +msgstr "Accélération tangentielle" #: scene/2d/cpu_particles_2d.cpp scene/2d/joints_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/physics_body.cpp @@ -21363,39 +20928,37 @@ msgstr "" #: scene/resources/particles_material.cpp #: servers/audio/effects/audio_effect_reverb.cpp msgid "Damping" -msgstr "" +msgstr "Amortissement" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp msgid "Damping Random" -msgstr "" +msgstr "Amortissement aléatoire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Damping Curve" -msgstr "Scinder la courbe" +msgstr "Courbe d'amortissement" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp scene/3d/light.cpp #: scene/resources/particles_material.cpp msgid "Angle" -msgstr "" +msgstr "Angle" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp msgid "Angle Random" -msgstr "" +msgstr "Angle aléatoire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Angle Curve" -msgstr "Fermer la courbe" +msgstr "Courbe d'angle" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #, fuzzy msgid "Scale Amount" -msgstr "Quantité :" +msgstr "Valeur d'échelle" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp msgid "Scale Amount Random" @@ -21408,14 +20971,13 @@ msgstr "Agrandir/Rétrécir à partir du curseur" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Color Ramp" -msgstr "Couleurs" +msgstr "Dégradé de couleurs" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp msgid "Color Initial Ramp" -msgstr "" +msgstr "Dégradé de couleurs initial" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp @@ -21434,33 +20996,28 @@ msgstr "Variation aléatoire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Variation Curve" -msgstr "Séparation :" +msgstr "Courbe de variation" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Speed Random" -msgstr "Mode mise à l'échelle" +msgstr "Vitesse aléatoire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Speed Curve" -msgstr "Scinder la courbe" +msgstr "Courbe de vitesse" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Offset Random" -msgstr "Décalage :" +msgstr "Décalage de l'aléatoire" #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp #: scene/resources/particles_material.cpp -#, fuzzy msgid "Offset Curve" -msgstr "Fermer la courbe" +msgstr "Courbe de décalage" #: scene/2d/joints_2d.cpp msgid "Node A and Node B must be PhysicsBody2Ds" @@ -21483,25 +21040,22 @@ msgid "Node A and Node B must be different PhysicsBody2Ds" msgstr "Node A et Node B doivent être des PhysicsBody2D différents" #: scene/2d/joints_2d.cpp scene/3d/physics_joint.cpp -#, fuzzy msgid "Node A" -msgstr "Nœud" +msgstr "Nœud A" #: scene/2d/joints_2d.cpp scene/3d/physics_joint.cpp -#, fuzzy msgid "Node B" -msgstr "Nœud" +msgstr "Nœud B" #: scene/2d/joints_2d.cpp scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp #: scene/3d/light.cpp scene/3d/physics_body.cpp scene/3d/physics_joint.cpp #: scene/resources/environment.cpp msgid "Bias" -msgstr "" +msgstr "Biais" #: scene/2d/joints_2d.cpp -#, fuzzy msgid "Disable Collision" -msgstr "Bouton désactivé" +msgstr "Désactiver les collisions" #: scene/2d/joints_2d.cpp scene/3d/physics_body.cpp scene/3d/physics_joint.cpp msgid "Softness" @@ -21513,9 +21067,8 @@ msgid "Length" msgstr "Longueur" #: scene/2d/joints_2d.cpp -#, fuzzy msgid "Initial Offset" -msgstr "Initialiser" +msgstr "Décalage initial" #: scene/2d/joints_2d.cpp scene/3d/vehicle_body.cpp msgid "Rest Length" @@ -21534,14 +21087,12 @@ msgstr "" "« Texture »." #: scene/2d/light_2d.cpp scene/3d/light.cpp scene/gui/reference_rect.cpp -#, fuzzy msgid "Editor Only" -msgstr "Éditeur" +msgstr "Éditeur seulement" #: scene/2d/light_2d.cpp -#, fuzzy msgid "Texture Scale" -msgstr "RegionDeTexture" +msgstr "Échelle de texture" #: scene/2d/light_2d.cpp scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp #: scene/3d/light.cpp scene/resources/environment.cpp @@ -21558,33 +21109,28 @@ msgid "Z Max" msgstr "Maximum Z" #: scene/2d/light_2d.cpp -#, fuzzy msgid "Layer Min" -msgstr "Changer la taille d'une caméra" +msgstr "Calque min" #: scene/2d/light_2d.cpp -#, fuzzy msgid "Layer Max" -msgstr "Calque" +msgstr "Calque max" #: scene/2d/light_2d.cpp msgid "Item Cull Mask" msgstr "" #: scene/2d/light_2d.cpp scene/3d/light.cpp scene/resources/style_box.cpp -#, fuzzy msgid "Shadow" -msgstr "Ombrage" +msgstr "Ombre" #: scene/2d/light_2d.cpp -#, fuzzy msgid "Buffer Size" -msgstr "Vue de derrière" +msgstr "Taille de tampon" #: scene/2d/light_2d.cpp -#, fuzzy msgid "Gradient Length" -msgstr "Dégradé édité" +msgstr "Longueur du dégradé" #: scene/2d/light_2d.cpp #, fuzzy @@ -21592,9 +21138,8 @@ msgid "Filter Smooth" msgstr "Filtrer les méthodes" #: scene/2d/light_occluder_2d.cpp -#, fuzzy msgid "Closed" -msgstr "Fermer" +msgstr "Fermé" #: scene/2d/light_occluder_2d.cpp scene/resources/material.cpp #, fuzzy @@ -21615,38 +21160,32 @@ msgstr "" "polygone." #: scene/2d/line_2d.cpp -#, fuzzy msgid "Width Curve" -msgstr "Scinder la courbe" +msgstr "Courbe de largeur" #: scene/2d/line_2d.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Default Color" -msgstr "Défaut" +msgstr "Couleur par défaut" #: scene/2d/line_2d.cpp scene/resources/texture.cpp msgid "Fill" msgstr "Remplissage" #: scene/2d/line_2d.cpp scene/resources/texture.cpp -#, fuzzy msgid "Gradient" -msgstr "Dégradé édité" +msgstr "Dégradé" #: scene/2d/line_2d.cpp -#, fuzzy msgid "Texture Mode" -msgstr "RegionDeTexture" +msgstr "Mode de texture" #: scene/2d/line_2d.cpp -#, fuzzy msgid "Capping" -msgstr "Recouvrement" +msgstr "Capuchonnement" #: scene/2d/line_2d.cpp -#, fuzzy msgid "Joint Mode" -msgstr "Mode Icône" +msgstr "Mode de jointure" #: scene/2d/line_2d.cpp #, fuzzy @@ -21654,14 +21193,12 @@ msgid "Begin Cap Mode" msgstr "Mode Région" #: scene/2d/line_2d.cpp -#, fuzzy msgid "End Cap Mode" -msgstr "Mode d'aimantation :" +msgstr "Mode du capuchon de fin" #: scene/2d/line_2d.cpp scene/2d/polygon_2d.cpp scene/resources/style_box.cpp -#, fuzzy msgid "Border" -msgstr "dans l'ordre :" +msgstr "Bordure" #: scene/2d/line_2d.cpp msgid "Sharp Limit" @@ -21673,9 +21210,8 @@ msgstr "Précision de l’arrondissement" #: scene/2d/line_2d.cpp scene/2d/polygon_2d.cpp #: scene/resources/dynamic_font.cpp -#, fuzzy msgid "Antialiased" -msgstr "Initialiser" +msgstr "Anticrénelé" #: scene/2d/multimesh_instance_2d.cpp scene/3d/multimesh_instance.cpp #, fuzzy @@ -21689,9 +21225,8 @@ msgid "Cell Size" msgstr "Taille des Cellules" #: scene/2d/navigation_2d.cpp scene/3d/navigation.cpp -#, fuzzy msgid "Edge Connection Margin" -msgstr "Modifier la connexion :" +msgstr "Marge de connexion des bords" #: scene/2d/navigation_2d.cpp msgid "" @@ -21706,31 +21241,27 @@ msgstr "" #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp #, fuzzy msgid "Pathfinding" -msgstr "Liaison" +msgstr "Pathfinding" #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp -#, fuzzy msgid "Path Desired Distance" -msgstr "Choisissez distance :" +msgstr "Distance souhaitée du chemin" #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp msgid "Target Desired Distance" msgstr "Distance Désirée de la Cible" #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp -#, fuzzy msgid "Path Max Distance" -msgstr "Choisissez distance :" +msgstr "Distance maximale du chemin" #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp -#, fuzzy msgid "Avoidance" -msgstr "Options avancées" +msgstr "Évitement" #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp -#, fuzzy msgid "Avoidance Enabled" -msgstr "Activer" +msgstr "Évitement activé" #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp msgid "Neighbor Dist" @@ -21750,10 +21281,11 @@ msgid "Max Speed" msgstr "Vitesse Max" #: scene/2d/navigation_agent_2d.cpp -#, fuzzy msgid "" "The NavigationAgent2D can be used only under a Node2D inheriting parent node." -msgstr "Le NavigationAgent2D ne peut être utilisé que sous un nœud Node2D." +msgstr "" +"Le NavigationAgent2D ne peut être utilisé que sous un nœud dont le parent " +"hérite de Node2D." #: scene/2d/navigation_obstacle_2d.cpp scene/3d/navigation_obstacle.cpp msgid "Estimate Radius" @@ -21778,17 +21310,15 @@ msgstr "" #: scene/2d/navigation_polygon.cpp msgid "Navpoly" -msgstr "" +msgstr "Polygone de navigation" #: scene/2d/navigation_polygon.cpp scene/3d/navigation_mesh_instance.cpp -#, fuzzy msgid "Enter Cost" -msgstr "Centrée en bas" +msgstr "Coût d’entrée" #: scene/2d/navigation_polygon.cpp scene/3d/navigation_mesh_instance.cpp -#, fuzzy msgid "Travel Cost" -msgstr "Se déplacer" +msgstr "Coût de déplacement" #: scene/2d/node_2d.cpp scene/2d/polygon_2d.cpp scene/3d/spatial.cpp #: scene/main/canvas_layer.cpp @@ -21854,9 +21384,8 @@ msgid "Motion" msgstr "Déplacement" #: scene/2d/parallax_layer.cpp -#, fuzzy msgid "Mirroring" -msgstr "Miroir" +msgstr "Effet de miroir" #: scene/2d/particles_2d.cpp msgid "" @@ -21919,9 +21448,8 @@ msgstr "" "d'un nœud de type Path2D." #: scene/2d/path_2d.cpp scene/3d/path.cpp -#, fuzzy msgid "Unit Offset" -msgstr "Décalage de la grille :" +msgstr "Décalage d'unité" #: scene/2d/path_2d.cpp scene/3d/camera.cpp scene/3d/path.cpp msgid "H Offset" @@ -21937,7 +21465,7 @@ msgstr "Interpolation Cubique" #: scene/2d/path_2d.cpp msgid "Lookahead" -msgstr "" +msgstr "Anticipation" #: scene/2d/physics_body_2d.cpp scene/3d/visual_instance.cpp msgid "Layers" @@ -21997,14 +21525,12 @@ msgid "Gravity Scale" msgstr "Échelle de la Gravité" #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp -#, fuzzy msgid "Custom Integrator" -msgstr "Nœud Personnalisé" +msgstr "Intégrateur personnalisé" #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp -#, fuzzy msgid "Continuous CD" -msgstr "Continu" +msgstr "Détection de collision continue" #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp msgid "Contacts Reported" @@ -22037,7 +21563,7 @@ msgstr "Forces Appliquées" #: scene/2d/physics_body_2d.cpp msgid "Torque" -msgstr "" +msgstr "Torque" #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp msgid "Safe Margin" @@ -22048,9 +21574,8 @@ msgid "Sync To Physics" msgstr "Synchroniser Avec La Physique" #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp -#, fuzzy msgid "Moving Platform" -msgstr "Déplacement du résultat" +msgstr "Plateforme mobile" #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp msgid "Apply Velocity On Leave" @@ -22064,9 +21589,8 @@ msgid "Normal" msgstr "Normale" #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp -#, fuzzy msgid "Remainder" -msgstr "Moteur de rendu :" +msgstr "Reste" #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp msgid "Local Shape" @@ -22127,9 +21651,8 @@ msgid "Exclude Parent" msgstr "Exclure Le Parent" #: scene/2d/ray_cast_2d.cpp scene/3d/ray_cast.cpp -#, fuzzy msgid "Cast To" -msgstr "Créer un nœud Shader" +msgstr "Lancer vers" #: scene/2d/ray_cast_2d.cpp scene/3d/ray_cast.cpp msgid "Collide With" @@ -22137,7 +21660,7 @@ msgstr "Collisionne Avec" #: scene/2d/ray_cast_2d.cpp scene/3d/camera.cpp scene/3d/ray_cast.cpp msgid "Areas" -msgstr "" +msgstr "Zones" #: scene/2d/ray_cast_2d.cpp scene/3d/camera.cpp scene/3d/ray_cast.cpp msgid "Bodies" @@ -22150,24 +21673,20 @@ msgstr "" "fonctionner." #: scene/2d/remote_transform_2d.cpp scene/3d/remote_transform.cpp -#, fuzzy msgid "Remote Path" -msgstr "Supprimer un point" +msgstr "Chemin distant" #: scene/2d/remote_transform_2d.cpp scene/3d/remote_transform.cpp -#, fuzzy msgid "Use Global Coordinates" -msgstr "Coordonnée suivante" +msgstr "Utiliser les coordonnées globales" #: scene/2d/skeleton_2d.cpp scene/3d/skeleton.cpp -#, fuzzy msgid "Rest" -msgstr "Redémarrer" +msgstr "Repos" #: scene/2d/skeleton_2d.cpp -#, fuzzy msgid "Default Length" -msgstr "Thème par défaut" +msgstr "Longueur par défaut" #: scene/2d/skeleton_2d.cpp msgid "This Bone2D chain should end at a Skeleton2D node." @@ -22188,16 +21707,15 @@ msgstr "" #: scene/2d/sprite.cpp scene/3d/sprite_3d.cpp msgid "Hframes" -msgstr "" +msgstr "Trames H" #: scene/2d/sprite.cpp scene/3d/sprite_3d.cpp msgid "Vframes" -msgstr "" +msgstr "Trames V" #: scene/2d/sprite.cpp scene/3d/sprite_3d.cpp -#, fuzzy msgid "Frame Coords" -msgstr "Image %" +msgstr "Coordonnées de trame" #: scene/2d/sprite.cpp scene/resources/texture.cpp #, fuzzy @@ -22215,14 +21733,12 @@ msgstr "" "etc." #: scene/2d/tile_map.cpp -#, fuzzy msgid "Tile Set" -msgstr "TileSet" +msgstr "Palette de tuiles" #: scene/2d/tile_map.cpp -#, fuzzy msgid "Quadrant Size" -msgstr "Changer la taille d'une caméra" +msgstr "Taille de quadrant" #: scene/2d/tile_map.cpp #, fuzzy @@ -22230,19 +21746,16 @@ msgid "Custom Transform" msgstr "Transformation" #: scene/2d/tile_map.cpp -#, fuzzy msgid "Half Offset" -msgstr "Initialiser" +msgstr "Décalage de moitié" #: scene/2d/tile_map.cpp -#, fuzzy msgid "Tile Origin" -msgstr "Afficher l'origine" +msgstr "Origine de la tuile" #: scene/2d/tile_map.cpp -#, fuzzy msgid "Y Sort" -msgstr "Trier" +msgstr "Trier par Y" #: scene/2d/tile_map.cpp msgid "Show Collision" @@ -22293,23 +21806,20 @@ msgstr "" "nœud racine de la scène éditée." #: scene/2d/visibility_notifier_2d.cpp scene/3d/visibility_notifier.cpp -#, fuzzy msgid "Pause Animations" -msgstr "Coller l'animation" +msgstr "Mettre les animations en pause" #: scene/2d/visibility_notifier_2d.cpp scene/3d/visibility_notifier.cpp msgid "Freeze Bodies" msgstr "Geler les corps" #: scene/2d/visibility_notifier_2d.cpp -#, fuzzy msgid "Pause Particles" -msgstr "Particules" +msgstr "Mettre les particules en pause" #: scene/2d/visibility_notifier_2d.cpp -#, fuzzy msgid "Pause Animated Sprites" -msgstr "Coller l'animation" +msgstr "Mettre les Sprites animés en pause" #: scene/2d/visibility_notifier_2d.cpp msgid "Process Parent" @@ -22337,7 +21847,7 @@ msgstr "ID Du Contrôleur" #: scene/3d/arvr_nodes.cpp servers/arvr/arvr_positional_tracker.cpp msgid "Rumble" -msgstr "" +msgstr "Vibration" #: scene/3d/arvr_nodes.cpp msgid "ARVRController must have an ARVROrigin node as its parent." @@ -22377,43 +21887,40 @@ msgid "World Scale" msgstr "Échelle du Monde" #: scene/3d/audio_stream_player_3d.cpp -#, fuzzy msgid "Attenuation Model" -msgstr "Nœud d'animation" +msgstr "Modèle d’atténuation" #: scene/3d/audio_stream_player_3d.cpp msgid "Unit dB" -msgstr "" +msgstr "Unité (dB)" #: scene/3d/audio_stream_player_3d.cpp msgid "Unit Size" -msgstr "" +msgstr "Taille d’unité" #: scene/3d/audio_stream_player_3d.cpp msgid "Max dB" -msgstr "" +msgstr "Max (dB)" #: scene/3d/audio_stream_player_3d.cpp msgid "Out Of Range Mode" msgstr "" #: scene/3d/audio_stream_player_3d.cpp -#, fuzzy msgid "Emission Angle" -msgstr "Couleurs d'émission" +msgstr "Angle d’émission" #: scene/3d/audio_stream_player_3d.cpp msgid "Degrees" msgstr "Degrés" #: scene/3d/audio_stream_player_3d.cpp -#, fuzzy msgid "Filter Attenuation dB" -msgstr "Animation" +msgstr "Filtre d’atténuation (dB)" #: scene/3d/audio_stream_player_3d.cpp msgid "Attenuation Filter" -msgstr "" +msgstr "Filtre d’atténuation" #: scene/3d/audio_stream_player_3d.cpp #: servers/audio/effects/audio_effect_chorus.cpp @@ -22423,14 +21930,12 @@ msgstr "" #: scene/3d/audio_stream_player_3d.cpp #: servers/audio/effects/audio_effect_filter.cpp -#, fuzzy msgid "dB" -msgstr "o" +msgstr "dB" #: scene/3d/audio_stream_player_3d.cpp -#, fuzzy msgid "Doppler" -msgstr "Activer l'effet Doppler" +msgstr "Doppler" #: scene/3d/audio_stream_player_3d.cpp #, fuzzy @@ -22440,7 +21945,7 @@ msgstr "Empaquetage" #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp #: scene/3d/reflection_probe.cpp msgid "Interior" -msgstr "" +msgstr "Intérieur" #: scene/3d/baked_lightmap.cpp msgid "Finding meshes and lights" @@ -22475,69 +21980,59 @@ msgstr "Gadgets" #: scene/3d/baked_lightmap.cpp msgid "Tweaks" -msgstr "" +msgstr "Ajustements" #: scene/3d/baked_lightmap.cpp msgid "Bounces" -msgstr "" +msgstr "Rebonds" #: scene/3d/baked_lightmap.cpp msgid "Bounce Indirect Energy" -msgstr "" +msgstr "Énergie indirecte de rebond" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Use Denoiser" -msgstr "Filtre :" +msgstr "Utiliser un filtre anti-bruit" #: scene/3d/baked_lightmap.cpp scene/resources/texture.cpp msgid "Use HDR" -msgstr "" +msgstr "Utiliser HDR" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Use Color" -msgstr "Couleurs" +msgstr "Utiliser la couleur" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Default Texels Per Unit" -msgstr "Thème par défaut" +msgstr "Texels par unité par défaut" #: scene/3d/baked_lightmap.cpp scene/resources/texture.cpp -#, fuzzy msgid "Atlas" -msgstr "Nouvel Atlas" +msgstr "Atlas" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Generate" -msgstr "Général" +msgstr "Générer" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Max Size" -msgstr "Taille :" +msgstr "Taille maximale" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Custom Sky" -msgstr "Nœud Personnalisé" +msgstr "Ciel personnalisé" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Custom Sky Rotation Degrees" -msgstr "Rotation de %s degrés." +msgstr "Degrés de rotation du ciel personnalisé" #: scene/3d/baked_lightmap.cpp scene/3d/ray_cast.cpp -#, fuzzy msgid "Custom Color" -msgstr "Nœud Personnalisé" +msgstr "Couleur personnalisée" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Custom Energy" -msgstr "Déplacer effet de transport" +msgstr "Énergie personnalisée" #: scene/3d/baked_lightmap.cpp #, fuzzy @@ -22545,27 +22040,24 @@ msgid "Min Light" msgstr "Indenter vers la droite" #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp -#, fuzzy msgid "Propagation" -msgstr "Navigation" +msgstr "Propagation" #: scene/3d/baked_lightmap.cpp msgid "Image Path" -msgstr "" +msgstr "Chemin de l'image" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Light Data" -msgstr "Avec données" +msgstr "Données de lumière" #: scene/3d/bone_attachment.cpp scene/3d/physics_body.cpp -#, fuzzy msgid "Bone Name" -msgstr "Nom de nœud :" +msgstr "Nom de l'os" #: scene/3d/camera.cpp msgid "Keep Aspect" -msgstr "" +msgstr "Garder l'aspect" #: scene/3d/camera.cpp scene/3d/light.cpp scene/3d/reflection_probe.cpp msgid "Cull Mask" @@ -22577,36 +22069,32 @@ msgid "Doppler Tracking" msgstr "Piste de propriété" #: scene/3d/camera.cpp -#, fuzzy msgid "Projection" -msgstr "Projet" +msgstr "Projection" #: scene/3d/camera.cpp msgid "FOV" -msgstr "" +msgstr "Champ de vision" #: scene/3d/camera.cpp -#, fuzzy msgid "Frustum Offset" -msgstr "Décalage de la grille :" +msgstr "Décalage du Tronc" #: scene/3d/camera.cpp -#, fuzzy msgid "Near" -msgstr "Au plus proche" +msgstr "Plan proche" #: scene/3d/camera.cpp msgid "Far" -msgstr "" +msgstr "Plan éloigné" #: scene/3d/camera.cpp scene/3d/collision_polygon.cpp scene/3d/spring_arm.cpp #: scene/gui/control.cpp scene/resources/default_theme/default_theme.cpp #: scene/resources/shape.cpp scene/resources/style_box.cpp #: scene/resources/texture.cpp servers/physics_2d_server.cpp #: servers/physics_server.cpp -#, fuzzy msgid "Margin" -msgstr "Définir la marge" +msgstr "Marge" #: scene/3d/camera.cpp #, fuzzy @@ -22696,48 +22184,40 @@ msgid "Box Extents" msgstr "Gadgets" #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp -#, fuzzy msgid "Ring Radius" -msgstr "Masque d'émission" +msgstr "Rayon de l'anneau" #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp -#, fuzzy msgid "Ring Inner Radius" -msgstr "Changer le rayon intérieur de la tour" +msgstr "Rayon intérieur de l'anneau" #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp -#, fuzzy msgid "Ring Height" -msgstr "Rotation vers la droite" +msgstr "Hauteur de l'anneau" #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp -#, fuzzy msgid "Ring Axis" -msgstr "Avertissements" +msgstr "Axe de l'anneau" #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp -#, fuzzy msgid "Rotate Y" -msgstr "Rotation" +msgstr "Rotation Y" #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp -#, fuzzy msgid "Disable Z" -msgstr "Item désactivé" +msgstr "Désactiver axe Z" #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp msgid "Flatness" -msgstr "" +msgstr "Platitude" #: scene/3d/cull_instance.cpp servers/visual_server.cpp -#, fuzzy msgid "Portals" -msgstr "Retourner les Portals" +msgstr "Portails" #: scene/3d/cull_instance.cpp -#, fuzzy msgid "Portal Mode" -msgstr "Mode prioritaire" +msgstr "Mode portail" #: scene/3d/cull_instance.cpp msgid "Include In Bound" @@ -22748,9 +22228,8 @@ msgid "Allow Merging" msgstr "" #: scene/3d/cull_instance.cpp -#, fuzzy msgid "Autoplace Priority" -msgstr "Activer la priorité" +msgstr "Priorité d’auto-placement" #: scene/3d/gi_probe.cpp msgid "Plotting Meshes" @@ -22781,114 +22260,98 @@ msgstr "" #: scene/3d/gi_probe.cpp msgid "Subdiv" -msgstr "" +msgstr "Subdivision" #: scene/3d/gi_probe.cpp -#, fuzzy msgid "Dynamic Range" -msgstr "Bibliothèque dynamique" +msgstr "Plage dynamique" #: scene/3d/gi_probe.cpp scene/3d/light.cpp msgid "Normal Bias" -msgstr "" +msgstr "Biais normal" #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp #: scene/resources/primitive_meshes.cpp -#, fuzzy msgid "Pixel Size" -msgstr "Aimanter au pixel" +msgstr "Taille de pixel" #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp msgid "Billboard" -msgstr "Billboard" +msgstr "Panneau(Billboard)" #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp -#, fuzzy msgid "Shaded" -msgstr "Ombrage" +msgstr "Ombré" #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp msgid "Double Sided" -msgstr "" +msgstr "Double face" #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp scene/resources/material.cpp msgid "No Depth Test" -msgstr "" +msgstr "Pas de test de profondeur" #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp scene/resources/material.cpp -#, fuzzy msgid "Fixed Size" -msgstr "Vue de devant" +msgstr "Taille fixe" #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp msgid "Alpha Cut" -msgstr "" +msgstr "Coupe alpha" #: scene/3d/label_3d.cpp scene/resources/material.cpp msgid "Alpha Scissor Threshold" -msgstr "" +msgstr "Seuil des ciseaux d'alpha" #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp scene/resources/material.cpp -#, fuzzy msgid "Render Priority" -msgstr "Activer la priorité" +msgstr "Priorité de rendu" #: scene/3d/label_3d.cpp -#, fuzzy msgid "Outline Render Priority" -msgstr "Activer la priorité" +msgstr "Priorité de rendu du contour" #: scene/3d/label_3d.cpp -#, fuzzy msgid "Outline Modulate" -msgstr "Forcer la modulation blanche" +msgstr "Moduler le contour" #: scene/3d/label_3d.cpp scene/resources/default_theme/default_theme.cpp #: scene/resources/dynamic_font.cpp scene/resources/primitive_meshes.cpp -#, fuzzy msgid "Font" -msgstr "Polices" +msgstr "Police" #: scene/3d/label_3d.cpp scene/resources/primitive_meshes.cpp -#, fuzzy msgid "Horizontal Alignment" -msgstr "Horizontal Activé" +msgstr "Alignement horizontal" #: scene/3d/label_3d.cpp -#, fuzzy msgid "Vertical Alignment" -msgstr "Filtrer les signaux" +msgstr "Alignement vertical" #: scene/3d/label_3d.cpp scene/gui/dialogs.cpp scene/gui/label.cpp -#, fuzzy msgid "Autowrap" -msgstr "AutoLoad" +msgstr "Retour à la ligne automatique" #: scene/3d/light.cpp -#, fuzzy msgid "Indirect Energy" -msgstr "Couleurs d'émission" +msgstr "Énergie indirecte" #: scene/3d/light.cpp -#, fuzzy msgid "Negative" -msgstr "GDNative" +msgstr "Négative" #: scene/3d/light.cpp scene/resources/material.cpp #: scene/resources/visual_shader.cpp -#, fuzzy msgid "Specular" -msgstr "Mode Règle" +msgstr "Spéculaire" #: scene/3d/light.cpp -#, fuzzy msgid "Bake Mode" -msgstr "Mode Bitmask" +msgstr "Mode de pré-calcul" #: scene/3d/light.cpp -#, fuzzy msgid "Contact" -msgstr "Prélever une couleur" +msgstr "Contact" #: scene/3d/light.cpp #, fuzzy @@ -22896,9 +22359,8 @@ msgid "Reverse Cull Face" msgstr "Réinitialiser le volume de bus" #: scene/3d/light.cpp servers/visual_server.cpp -#, fuzzy msgid "Directional Shadow" -msgstr "Directions" +msgstr "Ombre directionnelle" #: scene/3d/light.cpp #, fuzzy @@ -22916,9 +22378,8 @@ msgid "Split 3" msgstr "Divisé" #: scene/3d/light.cpp -#, fuzzy msgid "Blend Splits" -msgstr "Temps de mélange :" +msgstr "Mélanger les écarts" #: scene/3d/light.cpp #, fuzzy @@ -22926,23 +22387,20 @@ msgid "Bias Split Scale" msgstr "Utiliser le magnétisme d'échelle" #: scene/3d/light.cpp -#, fuzzy msgid "Depth Range" -msgstr "Profondeur" +msgstr "Plage de profondeur" #: scene/3d/light.cpp msgid "Omni" -msgstr "" +msgstr "Omnidirectionnelle" #: scene/3d/light.cpp -#, fuzzy msgid "Shadow Mode" -msgstr "Ombrage" +msgstr "Mode ombre" #: scene/3d/light.cpp -#, fuzzy msgid "Shadow Detail" -msgstr "Afficher par défaut" +msgstr "Détails d'ombre" #: scene/3d/light.cpp msgid "A SpotLight with an angle wider than 90 degrees cannot cast shadows." @@ -22952,21 +22410,19 @@ msgstr "" #: scene/3d/light.cpp msgid "Spot" -msgstr "" +msgstr "Spot" #: scene/3d/light.cpp -#, fuzzy msgid "Angle Attenuation" -msgstr "Animation" +msgstr "Atténuation d'angle" #: scene/3d/mesh_instance.cpp msgid "Software Skinning" msgstr "" #: scene/3d/mesh_instance.cpp -#, fuzzy msgid "Transform Normals" -msgstr "Transformation annulée." +msgstr "Transformer les normales" #: scene/3d/navigation.cpp msgid "" @@ -22974,45 +22430,44 @@ msgid "" "be removed in a future version. Use 'NavigationServer.map_get_path()' " "instead." msgstr "" +"Le nœud \"Navigation\" et \"Navigation.get_simple_path()\" sont obsolètes et " +"seront retires dans une version ultérieure. Utilisez plutôt " +"\"NavigationServer.map_get_path()\"." #: scene/3d/navigation.cpp scene/resources/curve.cpp -#, fuzzy msgid "Up Vector" -msgstr "Vecteur" +msgstr "Vecteur Haut" #: scene/3d/navigation.cpp -#, fuzzy msgid "Cell Height" -msgstr "En période de test" +msgstr "Hauteur de cellule" #: scene/3d/navigation_agent.cpp msgid "Agent Height Offset" -msgstr "" +msgstr "Décalage de hauteur de l'agent" #: scene/3d/navigation_agent.cpp -#, fuzzy msgid "Ignore Y" -msgstr "[Ignorer]" +msgstr "Ignorer Y" #: scene/3d/navigation_agent.cpp -#, fuzzy msgid "" "The NavigationAgent can be used only under a Spatial inheriting parent node." -msgstr "Le NavigationAgent ne peut être utilisé que sous un nœud spatial." +msgstr "" +"Le NavigationAgent ne peut être utilisé que sous un nœud parent héritant de " +"Spatial." #: scene/3d/navigation_mesh_instance.cpp scene/resources/mesh_library.cpp -#, fuzzy msgid "NavMesh" -msgstr "Calculer le NavMesh" +msgstr "NavMesh" #: scene/3d/navigation_obstacle.cpp -#, fuzzy msgid "" "The NavigationObstacle only serves to provide collision avoidance to a " "Spatial inheriting parent object." msgstr "" -"Un NavigationObstacle ne peut éviter les collisions qu'avec les nœuds " -"Spatial." +"Le NavigationObstacle ne sert qu'à fournir l’évitement de collision qu'aux " +"objets dont les parents héritent de Spatial." #: scene/3d/occluder.cpp msgid "No shape is set." @@ -23063,19 +22518,16 @@ msgstr "" "Particles » activé." #: scene/3d/particles.cpp -#, fuzzy msgid "Visibility AABB" -msgstr "Basculer la visibilité" +msgstr "Visibilité AABB" #: scene/3d/particles.cpp -#, fuzzy msgid "Draw Passes" -msgstr "Appels de dessin :" +msgstr "Afficher les passes" #: scene/3d/particles.cpp -#, fuzzy msgid "Passes" -msgstr "Appels de dessin :" +msgstr "Passes" #: scene/3d/path.cpp msgid "PathFollow only works when set as a child of a Path node." @@ -23092,7 +22544,6 @@ msgstr "" "Vector » dans la ressource Curve de son parent Path." #: scene/3d/path.cpp -#, fuzzy msgid "Rotation Mode" msgstr "Mode rotation" @@ -23107,223 +22558,189 @@ msgstr "" "Modifiez la taille dans les formes de collision enfant à la place." #: scene/3d/physics_body.cpp -#, fuzzy msgid "Axis Lock" -msgstr "Axe" +msgstr "Verrouiller l'axe" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear X" -msgstr "Linéaire" +msgstr "X linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Y" -msgstr "Linéaire" +msgstr "Y linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Z" -msgstr "Linéaire" +msgstr "Z linéaire" #: scene/3d/physics_body.cpp msgid "Angular X" -msgstr "" +msgstr "X angulaire" #: scene/3d/physics_body.cpp msgid "Angular Y" -msgstr "" +msgstr "Y angulaire" #: scene/3d/physics_body.cpp msgid "Angular Z" -msgstr "" +msgstr "Z angulaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Motion X" -msgstr "Action" +msgstr "X mouvement" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Motion Y" -msgstr "Action" +msgstr "Y mouvement" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Motion Z" -msgstr "Action" +msgstr "Z mouvement" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Joint Constraints" -msgstr "Constantes" +msgstr "Restrictions de jointure" #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp msgid "Impulse Clamp" -msgstr "" +msgstr "Borner l'impulsion" #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp -#, fuzzy msgid "Swing Span" -msgstr "Enregistrement de la scène" +msgstr "Ampleur de balancement" #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp msgid "Twist Span" -msgstr "" +msgstr "Ampleur de torsion" #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp #: scene/3d/vehicle_body.cpp -#, fuzzy msgid "Relaxation" -msgstr "Séparation :" +msgstr "Relaxation" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Limit Enabled" -msgstr "Filtrer les signaux" +msgstr "Limite angulaire activée" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Limit Upper" -msgstr "Linéaire" +msgstr "Limite angulaire haute" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Limit Lower" -msgstr "Erreur angulaire max. :" +msgstr "Limite angulaire basse" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Limit Bias" -msgstr "Linéaire" +msgstr "Biais de limite angulaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Limit Softness" -msgstr "Animation" +msgstr "Douceur de limite angulaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Limit Relaxation" -msgstr "Animation" +msgstr "Relaxation de limite angulaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Limit Upper" -msgstr "Linéaire" +msgstr "Limite linéaire haute" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Limit Lower" -msgstr "Linéaire" +msgstr "Limite linéaire basse" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Limit Softness" -msgstr "Linéaire" +msgstr "Douceur de limite linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Limit Restitution" -msgstr "Linéaire" +msgstr "Restitution de limite linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Limit Damping" -msgstr "Linéaire" +msgstr "Amortissement de limite linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Limit Restitution" -msgstr "Animation" +msgstr "Restitution de limite angulaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Limit Damping" -msgstr "Animation" +msgstr "Amortissement de limite angulaire" #: scene/3d/physics_body.cpp msgid "X" -msgstr "" +msgstr "X" #: scene/3d/physics_body.cpp msgid "Y" -msgstr "" +msgstr "Y" #: scene/3d/physics_body.cpp msgid "Z" -msgstr "" +msgstr "Z" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Limit Enabled" -msgstr "Linéaire" +msgstr "Limite linéaire active" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Spring Enabled" -msgstr "Linéaire" +msgstr "Ressort linéaire actif" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Spring Stiffness" -msgstr "Linéaire" +msgstr "Raideur du ressort linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Spring Damping" -msgstr "Linéaire" +msgstr "Amortissement de ressort linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Equilibrium Point" -msgstr "Linéaire" +msgstr "Point d’équilibre linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Restitution" -msgstr "Description" +msgstr "Restitution linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Linear Damping" -msgstr "Linéaire" +msgstr "Amortissement linéaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Restitution" -msgstr "Description" +msgstr "Restitution angulaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Damping" -msgstr "Animation" +msgstr "Amortissement angulaire" #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp msgid "ERP" msgstr "" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Angular Spring Enabled" -msgstr "Filtrer les signaux" +msgstr "Ressort angulaire actif" #: scene/3d/physics_body.cpp msgid "Angular Spring Stiffness" -msgstr "" +msgstr "Raideur de ressort angulaire" #: scene/3d/physics_body.cpp msgid "Angular Spring Damping" -msgstr "" +msgstr "Amortissement de ressort angulaire" #: scene/3d/physics_body.cpp msgid "Angular Equilibrium Point" -msgstr "" +msgstr "Point d’équilibre angulaire" #: scene/3d/physics_body.cpp -#, fuzzy msgid "Body Offset" -msgstr "Décalage :" +msgstr "Décalage du corps" #: scene/3d/physics_joint.cpp msgid "Node A and Node B must be PhysicsBodies" @@ -23347,183 +22764,159 @@ msgstr "Node A et Node B doivent être des PhysicsBody différents" #: scene/3d/physics_joint.cpp msgid "Solver" -msgstr "" +msgstr "Résolveur" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Exclude Nodes" -msgstr "Supprimer des nœuds" +msgstr "Exclure les nœuds" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Params" -msgstr "Paramètre modifié :" +msgstr "Paramètres" #: scene/3d/physics_joint.cpp msgid "Angular Limit" -msgstr "" +msgstr "Limite angulaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Upper" -msgstr "Tout en majuscule" +msgstr "Haute" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Lower" -msgstr "Tout en minuscule" +msgstr "Basse" #: scene/3d/physics_joint.cpp msgid "Motor" -msgstr "" +msgstr "Moteur" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Target Velocity" -msgstr "Vue de l'orbite vers la droite" +msgstr "Vélocité cible" #: scene/3d/physics_joint.cpp msgid "Max Impulse" msgstr "Impulsion Maximale" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Limit" -msgstr "Linéaire" +msgstr "Limite linéaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Upper Distance" -msgstr "Choisissez distance :" +msgstr "Distance haute" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Lower Distance" -msgstr "Choisissez distance :" +msgstr "Distance basse" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Restitution" -msgstr "Description" +msgstr "Restitution" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Motion" -msgstr "Initialiser" +msgstr "Mouvement linéaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Ortho" -msgstr "Orthogonale arrière" +msgstr "Ortho linéaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Upper Angle" -msgstr "Tout en majuscule" +msgstr "Angle supérieur" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Lower Angle" -msgstr "Tout en minuscule" +msgstr "Angle inférieur" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Angular Motion" -msgstr "Animation" +msgstr "Mouvement angulaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Angular Ortho" -msgstr "Erreur angulaire max. :" +msgstr "Ortho angulaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Limit X" -msgstr "Linéaire" +msgstr "X de la limite linéaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Motor X" -msgstr "Initialiser" +msgstr "X du moteur linéaire" #: scene/3d/physics_joint.cpp msgid "Force Limit" msgstr "Limite de Force" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Spring X" -msgstr "Linéaire" +msgstr "X du ressort linéaire" #: scene/3d/physics_joint.cpp msgid "Equilibrium Point" -msgstr "" +msgstr "Point d’équilibre" #: scene/3d/physics_joint.cpp msgid "Angular Limit X" -msgstr "" +msgstr "X de la limite angulaire" #: scene/3d/physics_joint.cpp msgid "Angular Motor X" -msgstr "" +msgstr "X du moteur angulaire" #: scene/3d/physics_joint.cpp msgid "Angular Spring X" -msgstr "" +msgstr "X du ressort angulaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Limit Y" -msgstr "Linéaire" +msgstr "Y de la limite linéaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Motor Y" -msgstr "Initialiser" +msgstr "Y du moteur linéaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Spring Y" -msgstr "Linéaire" +msgstr "Y du ressort linéaire" #: scene/3d/physics_joint.cpp msgid "Angular Limit Y" -msgstr "" +msgstr "Y de la limite angulaire" #: scene/3d/physics_joint.cpp msgid "Angular Motor Y" -msgstr "" +msgstr "Y du moteur angulaire" #: scene/3d/physics_joint.cpp msgid "Angular Spring Y" -msgstr "" +msgstr "Y du ressort angulaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Limit Z" -msgstr "Linéaire" +msgstr "Z de la limite linéaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Motor Z" -msgstr "Initialiser" +msgstr "Z du moteur linéaire" #: scene/3d/physics_joint.cpp -#, fuzzy msgid "Linear Spring Z" -msgstr "Linéaire" +msgstr "Z du ressort linéaire" #: scene/3d/physics_joint.cpp msgid "Angular Limit Z" -msgstr "" +msgstr "Z de la limite angulaire" #: scene/3d/physics_joint.cpp msgid "Angular Motor Z" -msgstr "" +msgstr "Z du moteur angulaire" #: scene/3d/physics_joint.cpp msgid "Angular Spring Z" -msgstr "" +msgstr "Z du ressort angulaire" #: scene/3d/portal.cpp msgid "The RoomManager should not be a child or grandchild of a Portal." @@ -23543,21 +22936,19 @@ msgstr "Portail actif" #: scene/3d/portal.cpp scene/resources/occluder_shape_polygon.cpp msgid "Two Way" -msgstr "" +msgstr "Double sens" #: scene/3d/portal.cpp msgid "Linked Room" msgstr "Salle liée" #: scene/3d/portal.cpp -#, fuzzy msgid "Use Default Margin" -msgstr "Défaut" +msgstr "Utiliser les marges par défaut" #: scene/3d/proximity_group.cpp -#, fuzzy msgid "Group Name" -msgstr "Groupé" +msgstr "Nom de groupe" #: scene/3d/proximity_group.cpp msgid "Dispatch Mode" @@ -23568,42 +22959,36 @@ msgid "Grid Radius" msgstr "Rayon de la Grille" #: scene/3d/ray_cast.cpp -#, fuzzy msgid "Debug Shape" -msgstr "Débogueur" +msgstr "Forme de débogage" #: scene/3d/ray_cast.cpp scene/resources/style_box.cpp msgid "Thickness" -msgstr "" +msgstr "Épaisseur" #: scene/3d/reflection_probe.cpp scene/main/viewport.cpp -#, fuzzy msgid "Update Mode" -msgstr "Mode rotation" +msgstr "Mode de mise à jour" #: scene/3d/reflection_probe.cpp msgid "Origin Offset" msgstr "Décalage de la Grille" #: scene/3d/reflection_probe.cpp -#, fuzzy msgid "Box Projection" -msgstr "Projet" +msgstr "Projection boîte" #: scene/3d/reflection_probe.cpp -#, fuzzy msgid "Enable Shadows" -msgstr "Activer l'alignement" +msgstr "Activer les ombres" #: scene/3d/reflection_probe.cpp -#, fuzzy msgid "Ambient Color" -msgstr "Prélever une couleur" +msgstr "Couleur ambiante" #: scene/3d/reflection_probe.cpp -#, fuzzy msgid "Ambient Energy" -msgstr "Couleurs d'émission" +msgstr "Énergie ambiante" #: scene/3d/reflection_probe.cpp #, fuzzy @@ -23984,9 +23369,8 @@ msgid "Use As Steering" msgstr "" #: scene/3d/vehicle_body.cpp -#, fuzzy msgid "Wheel" -msgstr "Molette vers le haut." +msgstr "Molette" #: scene/3d/vehicle_body.cpp msgid "Roll Influence" @@ -24022,9 +23406,8 @@ msgid "Material Override" msgstr "Redéfinition" #: scene/3d/visual_instance.cpp -#, fuzzy msgid "Material Overlay" -msgstr "Changements de matériau :" +msgstr "Superposition de Matériau" #: scene/3d/visual_instance.cpp #, fuzzy @@ -24032,9 +23415,8 @@ msgid "Cast Shadow" msgstr "Créer un nœud Shader" #: scene/3d/visual_instance.cpp -#, fuzzy msgid "Extra Cull Margin" -msgstr "Arguments supplémentaires :" +msgstr "Marge supplémentaire de détermination des faces cachées" #: scene/3d/visual_instance.cpp #, fuzzy @@ -24106,14 +23488,12 @@ msgid "Mix Mode" msgstr "Mélanger le nœud" #: scene/animation/animation_blend_tree.cpp -#, fuzzy msgid "Fadein Time" -msgstr "Durée du fondu (s) :" +msgstr "Durée du fondu entrant" #: scene/animation/animation_blend_tree.cpp -#, fuzzy msgid "Fadeout Time" -msgstr "Durée du fondu (s) :" +msgstr "Durée du fondu sortant" #: scene/animation/animation_blend_tree.cpp msgid "Auto Restart" @@ -24128,9 +23508,8 @@ msgid "Delay" msgstr "" #: scene/animation/animation_blend_tree.cpp -#, fuzzy msgid "Random Delay" -msgstr "Inclinaison aléatoire :" +msgstr "Retard aléatoire" #: scene/animation/animation_blend_tree.cpp #, fuzzy @@ -24138,9 +23517,8 @@ msgid "Add Amount" msgstr "Quantité" #: scene/animation/animation_blend_tree.cpp -#, fuzzy msgid "Blend Amount" -msgstr "Quantité :" +msgstr "Quantité de mélange" #: scene/animation/animation_blend_tree.cpp #, fuzzy @@ -24154,9 +23532,8 @@ msgstr "Ajouter un port d'entrée" #: scene/animation/animation_blend_tree.cpp #: scene/animation/animation_node_state_machine.cpp -#, fuzzy msgid "Xfade Time" -msgstr "Durée du fondu (s) :" +msgstr "Durée du fondu croisé" #: scene/animation/animation_node_state_machine.cpp #, fuzzy @@ -24568,9 +23945,8 @@ msgid "Pass On Modal Close Click" msgstr "" #: scene/gui/control.cpp -#, fuzzy msgid "Size Flags" -msgstr "Taille :" +msgstr "Drapeaux de Taille" #: scene/gui/control.cpp #, fuzzy @@ -24622,9 +23998,8 @@ msgid "Scroll Offset" msgstr "Décalage du Défilement" #: scene/gui/graph_edit.cpp -#, fuzzy msgid "Snap Distance" -msgstr "Choisissez distance :" +msgstr "Distance d'arrondissage" #: scene/gui/graph_edit.cpp #, fuzzy @@ -24761,9 +24136,8 @@ msgid "Secret" msgstr "" #: scene/gui/line_edit.cpp -#, fuzzy msgid "Secret Character" -msgstr "Caractères valides :" +msgstr "Caractère secret" #: scene/gui/line_edit.cpp msgid "Expand To Text Length" @@ -24820,7 +24194,7 @@ msgstr "" #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Caret" -msgstr "" +msgstr "Caret" #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Blink" @@ -24997,9 +24371,8 @@ msgid "Meta Underlined" msgstr "" #: scene/gui/rich_text_label.cpp -#, fuzzy msgid "Tab Size" -msgstr "Taille :" +msgstr "Taille de tabulation" #: scene/gui/rich_text_label.cpp #, fuzzy @@ -25020,9 +24393,8 @@ msgid "Selection Enabled" msgstr "Sélection uniquement" #: scene/gui/rich_text_label.cpp scene/gui/text_edit.cpp -#, fuzzy msgid "Override Selected Font Color" -msgstr "Configurer le profil sélectionné :" +msgstr "Remplacer la couleur de police sélectionnée" #: scene/gui/rich_text_label.cpp #, fuzzy @@ -25073,9 +24445,8 @@ msgid "Tick Count" msgstr "Prélever une couleur" #: scene/gui/slider.cpp -#, fuzzy msgid "Ticks On Borders" -msgstr "dans l'ordre :" +msgstr "Encoches aux bordures" #: scene/gui/spin_box.cpp msgid "Prefix" @@ -25086,9 +24457,8 @@ msgid "Suffix" msgstr "Suffixe" #: scene/gui/split_container.cpp -#, fuzzy msgid "Split Offset" -msgstr "Décalage de la grille :" +msgstr "Décalage des écarts" #: scene/gui/split_container.cpp scene/gui/tree.cpp #, fuzzy @@ -25105,9 +24475,8 @@ msgid "Tab Align" msgstr "" #: scene/gui/tab_container.cpp scene/gui/tabs.cpp -#, fuzzy msgid "Current Tab" -msgstr "Actuel :" +msgstr "Onglet actuel" #: scene/gui/tab_container.cpp #, fuzzy @@ -25149,9 +24518,8 @@ msgid "Breakpoint Gutter" msgstr "Passer les points d'arrêt" #: scene/gui/text_edit.cpp -#, fuzzy msgid "Fold Gutter" -msgstr "Dossier :" +msgstr "Replier le bandeau" #: scene/gui/text_edit.cpp #, fuzzy @@ -25253,9 +24621,8 @@ msgid "Initial Angle" msgstr "Initialiser" #: scene/gui/texture_progress.cpp -#, fuzzy msgid "Fill Degrees" -msgstr "Rotation de %s degrés." +msgstr "Degrés remplis" #: scene/gui/texture_progress.cpp scene/resources/primitive_meshes.cpp #, fuzzy @@ -25361,9 +24728,8 @@ msgid "Max Redirects" msgstr "" #: scene/main/http_request.cpp -#, fuzzy msgid "Timeout" -msgstr "Délai dépassé." +msgstr "Délai dépassé" #: scene/main/node.cpp msgid "" @@ -25636,9 +25002,8 @@ msgid "Debug Draw" msgstr "Débogage" #: scene/main/viewport.cpp -#, fuzzy msgid "Render Target" -msgstr "Moteur de rendu :" +msgstr "Rendre la cible" #: scene/main/viewport.cpp msgid "V Flip" @@ -25811,9 +25176,8 @@ msgid "Font Color Disabled" msgstr "Âgrafe désactivée" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "H Separation" -msgstr "Séparation :" +msgstr "Séparation H" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -25901,14 +25265,12 @@ msgid "Font Outline Modulate" msgstr "Forcer la modulation blanche" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Shadow Offset X" -msgstr "Décalage X de la grille :" +msgstr "Décalage X de l'ombre" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Shadow Offset Y" -msgstr "Décalage Y de la grille :" +msgstr "Décalage Y de l'ombre" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -25966,14 +25328,12 @@ msgid "Space" msgstr "Scène principale" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Folded" -msgstr "Dossier :" +msgstr "Replié" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Fold" -msgstr "Dossier :" +msgstr "Replier" #: scene/resources/default_theme/default_theme.cpp msgid "Font Color Readonly" @@ -26092,14 +25452,12 @@ msgid "Close Highlight" msgstr "Éclairage direct" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Close H Offset" -msgstr "Décalage de la grille :" +msgstr "Fermer décalage H" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Close V Offset" -msgstr "Décalage de la grille :" +msgstr "Fermer décalage V" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -26127,9 +25485,8 @@ msgid "Labeled Separator Right" msgstr "Séparateur nommé" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Separator" -msgstr "Opérateur de couleur." +msgstr "Séparateur de police" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -26137,14 +25494,12 @@ msgid "Font Color Accel" msgstr "Renommer l'item de couleur" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Font Color Separator" -msgstr "Opérateur de couleur." +msgstr "Séparateur de couleur de police" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "V Separation" -msgstr "Séparation :" +msgstr "Séparation V" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -26192,9 +25547,8 @@ msgid "Title Offset" msgstr "Décalage d’Octet" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Close Offset" -msgstr "Décalage de la grille :" +msgstr "Fermer de décalage" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -26324,9 +25678,8 @@ msgid "Icon Margin" msgstr "Définir la marge" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Line Separation" -msgstr "Séparation :" +msgstr "Séparation de line" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -26386,9 +25739,8 @@ msgid "Large" msgstr "Cible" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Folder" -msgstr "Dossier :" +msgstr "Dossier" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -26426,9 +25778,8 @@ msgid "Label Width" msgstr "Étendu à Gauche" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Screen Picker" -msgstr "Opérateur d'écran." +msgstr "Sélecteur d'écran" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -26489,14 +25840,12 @@ msgid "Mono Font" msgstr "Police Principale" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Table H Separation" -msgstr "Séparation :" +msgstr "Séparation H de table" #: scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Table V Separation" -msgstr "Séparation :" +msgstr "Séparation V de table" #: scene/resources/default_theme/default_theme.cpp #, fuzzy @@ -26661,7 +26010,7 @@ msgstr "Condition" #: scene/resources/environment.cpp msgid "Fog" -msgstr "" +msgstr "Brouillard" #: scene/resources/environment.cpp msgid "Sun Color" @@ -26757,14 +26106,12 @@ msgid "Max Steps" msgstr "Pas" #: scene/resources/environment.cpp -#, fuzzy msgid "Fade In" -msgstr "Fondu entrant (s) :" +msgstr "Fondu entrant" #: scene/resources/environment.cpp -#, fuzzy msgid "Fade Out" -msgstr "Fondu sortant (s) :" +msgstr "Fondu sortant" #: scene/resources/environment.cpp #, fuzzy @@ -26843,54 +26190,52 @@ msgstr "2" #: scene/resources/environment.cpp #: servers/audio/effects/audio_effect_chorus.cpp msgid "3" -msgstr "" +msgstr "3" #: scene/resources/environment.cpp #: servers/audio/effects/audio_effect_chorus.cpp msgid "4" -msgstr "" +msgstr "4" #: scene/resources/environment.cpp msgid "5" -msgstr "" +msgstr "5" #: scene/resources/environment.cpp msgid "6" -msgstr "" +msgstr "6" #: scene/resources/environment.cpp msgid "7" -msgstr "" +msgstr "7" #: scene/resources/environment.cpp msgid "Bloom" -msgstr "" +msgstr "Flou lumineux" #: scene/resources/environment.cpp msgid "HDR Threshold" -msgstr "" +msgstr "Seuil HDR" #: scene/resources/environment.cpp msgid "HDR Luminance Cap" -msgstr "" +msgstr "Limite de luminance HDR" #: scene/resources/environment.cpp -#, fuzzy msgid "HDR Scale" -msgstr "Mode mise à l'échelle" +msgstr "Échelle HDR" #: scene/resources/environment.cpp msgid "Bicubic Upscale" -msgstr "" +msgstr "Redimensionnement Bicubique" #: scene/resources/environment.cpp msgid "Adjustments" -msgstr "" +msgstr "Ajustements" #: scene/resources/environment.cpp -#, fuzzy msgid "Brightness" -msgstr "Lumière" +msgstr "Luminosité" #: scene/resources/environment.cpp msgid "Saturation" @@ -26898,22 +26243,19 @@ msgstr "Saturation" #: scene/resources/environment.cpp msgid "Color Correction" -msgstr "Correction de Couleur" +msgstr "Correction des couleurs" #: scene/resources/font.cpp -#, fuzzy msgid "Ascent" -msgstr "Récents :" +msgstr "Inclinaison" #: scene/resources/font.cpp -#, fuzzy msgid "Distance Field" -msgstr "Mode Sans Distraction" +msgstr "Champ de distance" #: scene/resources/gradient.cpp -#, fuzzy msgid "Raw Data" -msgstr "Profondeur" +msgstr "Données brutes" #: scene/resources/gradient.cpp msgid "Offsets" @@ -26921,62 +26263,55 @@ msgstr "Décalages" #: scene/resources/height_map_shape.cpp msgid "Map Width" -msgstr "" +msgstr "Largeur de la carte" #: scene/resources/height_map_shape.cpp -#, fuzzy msgid "Map Depth" -msgstr "Profondeur" +msgstr "Profondeur de la carte" #: scene/resources/height_map_shape.cpp -#, fuzzy msgid "Map Data" -msgstr "Profondeur" +msgstr "Données de la carte" #: scene/resources/line_shape_2d.cpp msgid "D" -msgstr "" +msgstr "D" #: scene/resources/material.cpp -#, fuzzy msgid "Next Pass" -msgstr "Plan suivant" +msgstr "Passe suivante" #: scene/resources/material.cpp msgid "Use Shadow To Opacity" msgstr "" #: scene/resources/material.cpp -#, fuzzy msgid "Unshaded" -msgstr "Afficher sans ombrage" +msgstr "Sans ombrage" #: scene/resources/material.cpp -#, fuzzy msgid "Vertex Lighting" -msgstr "Éclairage direct" +msgstr "Éclairage de sommet" #: scene/resources/material.cpp -#, fuzzy msgid "Use Point Size" -msgstr "Vue de devant" +msgstr "Utiliser la taille de point" #: scene/resources/material.cpp msgid "World Triplanar" -msgstr "" +msgstr "Monde Triplanaire" #: scene/resources/material.cpp msgid "Albedo Tex Force sRGB" -msgstr "" +msgstr "Forcer sRGB dans la texture d'albédo" #: scene/resources/material.cpp msgid "Do Not Receive Shadows" -msgstr "" +msgstr "Ne pas recevoir d'ombres" #: scene/resources/material.cpp -#, fuzzy msgid "Disable Ambient Light" -msgstr "Indenter vers la droite" +msgstr "Désactiver la lumière ambiante" #: scene/resources/material.cpp msgid "Ensure Correct Normals" @@ -26984,70 +26319,63 @@ msgstr "Assurer des Normales Correctes" #: scene/resources/material.cpp msgid "Albedo Tex MSDF" -msgstr "" +msgstr "Texture d'albédo MSDF" #: scene/resources/material.cpp -#, fuzzy msgid "Vertex Color" -msgstr "Vertex" +msgstr "Couleur de sommet" #: scene/resources/material.cpp msgid "Use As Albedo" -msgstr "" +msgstr "Utiliser comme albédo" #: scene/resources/material.cpp msgid "Is sRGB" -msgstr "" +msgstr "Est sRGB" #: scene/resources/material.cpp servers/visual_server.cpp msgid "Parameters" msgstr "Paramètres" #: scene/resources/material.cpp -#, fuzzy msgid "Diffuse Mode" -msgstr "Mode navigation" +msgstr "Mode diffus" #: scene/resources/material.cpp -#, fuzzy msgid "Specular Mode" -msgstr "Mode Règle" +msgstr "Mode spéculaire" #: scene/resources/material.cpp -#, fuzzy msgid "Depth Draw Mode" -msgstr "Mode d’interpolation" +msgstr "Mode de dessin en profondeur" #: scene/resources/material.cpp -#, fuzzy msgid "Line Width" -msgstr "Étendu à Gauche" +msgstr "Largeur de ligne" #: scene/resources/material.cpp -#, fuzzy msgid "Point Size" -msgstr "Vue de devant" +msgstr "Taille de point" #: scene/resources/material.cpp msgid "Billboard Mode" -msgstr "Mode billboard" +msgstr "Mode Billboard" #: scene/resources/material.cpp msgid "Billboard Keep Scale" -msgstr "Garder l'échelle du billboard" +msgstr "Garder l'échelle du Billboard" #: scene/resources/material.cpp msgid "Grow" -msgstr "" +msgstr "Croître" #: scene/resources/material.cpp -#, fuzzy msgid "Grow Amount" -msgstr "Quantité :" +msgstr "Quantité de croissance" #: scene/resources/material.cpp msgid "Use Alpha Scissor" -msgstr "" +msgstr "Utiliser la découpe alpha" #: scene/resources/material.cpp #, fuzzy @@ -27066,7 +26394,7 @@ msgstr "Image %" #: scene/resources/material.cpp msgid "Albedo" -msgstr "" +msgstr "Albédo" #: scene/resources/material.cpp msgid "Metallic" @@ -27092,7 +26420,7 @@ msgstr "" #: scene/resources/material.cpp msgid "Rim" -msgstr "Bordure" +msgstr "Bord" #: scene/resources/material.cpp #, fuzzy @@ -27216,9 +26544,8 @@ msgid "Color Format" msgstr "Format de Couleur" #: scene/resources/multimesh.cpp -#, fuzzy msgid "Transform Format" -msgstr "Transformation annulée." +msgstr "Format de transformation" #: scene/resources/multimesh.cpp msgid "Custom Data Format" @@ -27234,9 +26561,8 @@ msgid "Visible Instance Count" msgstr "" #: scene/resources/navigation_mesh.cpp -#, fuzzy msgid "Sampling" -msgstr "Mise à l'échelle :" +msgstr "Échantillonnage" #: scene/resources/navigation_mesh.cpp #, fuzzy @@ -27244,9 +26570,8 @@ msgid "Partition Type" msgstr "Définir type de variable" #: scene/resources/navigation_mesh.cpp -#, fuzzy msgid "Parsed Geometry Type" -msgstr "Analyse de la géométrie..." +msgstr "Type de la géométrie analysée" #: scene/resources/navigation_mesh.cpp msgid "Source Geometry Mode" @@ -27303,9 +26628,8 @@ msgid "Details" msgstr "Afficher par défaut" #: scene/resources/navigation_mesh.cpp -#, fuzzy msgid "Sample Distance" -msgstr "Choisissez distance :" +msgstr "Échantillonner la distance" #: scene/resources/navigation_mesh.cpp #, fuzzy @@ -27376,12 +26700,10 @@ msgid "Color Modifier" msgstr "Ralentissement de la vue libre" #: scene/resources/particles_material.cpp -#, fuzzy msgid "Point Texture" -msgstr "Points d'Émission :" +msgstr "Texture ponctuelle" #: scene/resources/particles_material.cpp -#, fuzzy msgid "Normal Texture" msgstr "Texture Normale" @@ -27413,9 +26735,8 @@ msgid "Absorbent" msgstr "" #: scene/resources/plane_shape.cpp -#, fuzzy msgid "Plane" -msgstr "Plan :" +msgstr "Plan" #: scene/resources/primitive_meshes.cpp #, fuzzy @@ -27489,9 +26810,8 @@ msgid "Bone" msgstr "Os" #: scene/resources/sky.cpp -#, fuzzy msgid "Radiance Size" -msgstr "Taille du contour :" +msgstr "Taille du rayonnement" #: scene/resources/sky.cpp msgid "Panorama" @@ -27783,9 +27103,8 @@ msgid "Default Cell Height" msgstr "En période de test" #: scene/resources/world.cpp scene/resources/world_2d.cpp -#, fuzzy msgid "Default Edge Connection Margin" -msgstr "Modifier la connexion :" +msgstr "Marge de connexion des bords par défaut" #: scene/resources/world_2d.cpp msgid "Canvas" @@ -27939,11 +27258,11 @@ msgstr "Ressource" #: servers/audio/effects/audio_effect_limiter.cpp msgid "Ceiling dB" -msgstr "" +msgstr "Plafond de dB" #: servers/audio/effects/audio_effect_limiter.cpp msgid "Threshold dB" -msgstr "" +msgstr "Seuil de dB" #: servers/audio/effects/audio_effect_limiter.cpp msgid "Soft Clip dB" @@ -27955,37 +27274,36 @@ msgstr "" #: servers/audio/effects/audio_effect_phaser.cpp msgid "Range Min Hz" -msgstr "" +msgstr "Borne inférieure de la plage (Hz)" #: servers/audio/effects/audio_effect_phaser.cpp msgid "Range Max Hz" -msgstr "" +msgstr "Borne supérieure de la plage (Hz)" #: servers/audio/effects/audio_effect_pitch_shift.cpp msgid "Oversampling" -msgstr "" +msgstr "Suréchantillonnage" #: servers/audio/effects/audio_effect_pitch_shift.cpp #: servers/audio/effects/audio_effect_spectrum_analyzer.cpp msgid "FFT Size" -msgstr "Taille FFT" +msgstr "Taille des FFTs" #: servers/audio/effects/audio_effect_reverb.cpp msgid "Predelay" -msgstr "" +msgstr "Pré-retarder" #: servers/audio/effects/audio_effect_reverb.cpp msgid "Msec" -msgstr "" +msgstr "Millisec" #: servers/audio/effects/audio_effect_reverb.cpp msgid "Room Size" -msgstr "" +msgstr "Taille de la salle" #: servers/audio/effects/audio_effect_reverb.cpp -#, fuzzy msgid "High-pass" -msgstr "Contourner" +msgstr "Passe-haut" #: servers/audio/effects/audio_effect_spectrum_analyzer.cpp msgid "Tap Back Pos" @@ -27996,27 +27314,24 @@ msgid "Pan Pullout" msgstr "" #: servers/audio/effects/audio_effect_stereo_enhance.cpp -#, fuzzy msgid "Time Pullout (ms)" -msgstr "Délai dépassé." +msgstr "Temps de retrait (ms)" #: servers/audio/effects/audio_effect_stereo_enhance.cpp msgid "Surround" -msgstr "" +msgstr "Surround" #: servers/audio_server.cpp -#, fuzzy msgid "Enable Audio Input" -msgstr "Renommer le bus audio" +msgstr "Activer l’entrée audio" #: servers/audio_server.cpp -#, fuzzy msgid "Output Latency" -msgstr "Sortie" +msgstr "Latence de sortie" #: servers/audio_server.cpp msgid "Channel Disable Threshold dB" -msgstr "" +msgstr "Désactiver le seuil de dB du canal" #: servers/audio_server.cpp #, fuzzy @@ -28025,43 +27340,39 @@ msgstr "Changer le temps de mélange" #: servers/audio_server.cpp msgid "Video Delay Compensation (ms)" -msgstr "" +msgstr "Compensation de retard vidéo (ms)" #: servers/audio_server.cpp -#, fuzzy msgid "Bus Count" -msgstr "Ajouter un port d'entrée" +msgstr "Nombre de ports" #: servers/audio_server.cpp -#, fuzzy msgid "Capture Device" -msgstr "Capturer depuis Pixel" +msgstr "Périphérique de capture" #: servers/audio_server.cpp -#, fuzzy msgid "Global Rate Scale" -msgstr "Variable globale" +msgstr "Echelle de débit global" #: servers/camera/camera_feed.cpp msgid "Feed" -msgstr "" +msgstr "Flux" #: servers/camera/camera_feed.cpp -#, fuzzy msgid "Is Active" -msgstr "Perspective" +msgstr "Est active" #: servers/physics/space_sw.cpp servers/physics_2d/space_2d_sw.cpp msgid "Sleep Threshold Linear" -msgstr "" +msgstr "Seuil linéaire de veille" #: servers/physics/space_sw.cpp servers/physics_2d/space_2d_sw.cpp msgid "Sleep Threshold Angular" -msgstr "" +msgstr "Seuil angulaire de veille" #: servers/physics/space_sw.cpp servers/physics_2d/space_2d_sw.cpp msgid "Time Before Sleep" -msgstr "" +msgstr "Temps avant veille" #: servers/physics_2d/physics_2d_server_sw.cpp msgid "BP Hash Table Size" @@ -28073,48 +27384,43 @@ msgstr "" #: servers/physics_2d_server.cpp servers/physics_server.cpp msgid "Inverse Mass" -msgstr "" +msgstr "Masse inverse" #: servers/physics_2d_server.cpp servers/physics_server.cpp -#, fuzzy msgid "Inverse Inertia" -msgstr "Vue libre gauche" +msgstr "Inertie inverse" #: servers/physics_2d_server.cpp servers/physics_server.cpp msgid "Total Angular Damp" -msgstr "" +msgstr "Amortissage angulaire total" #: servers/physics_2d_server.cpp servers/physics_server.cpp -#, fuzzy msgid "Total Linear Damp" -msgstr "Linéaire" +msgstr "Amortissage linéaire total" #: servers/physics_2d_server.cpp servers/physics_server.cpp -#, fuzzy msgid "Total Gravity" -msgstr "Aperçu par défaut" +msgstr "Gravité totale" #: servers/physics_2d_server.cpp servers/physics_server.cpp -#, fuzzy msgid "Linear Velocity" -msgstr "Initialiser" +msgstr "Vélocité linéaire" #: servers/physics_2d_server.cpp servers/physics_server.cpp msgid "Exclude" -msgstr "" +msgstr "Exclure" #: servers/physics_2d_server.cpp servers/physics_server.cpp msgid "Shape RID" -msgstr "" +msgstr "RID de forme" #: servers/physics_2d_server.cpp servers/physics_server.cpp -#, fuzzy msgid "Collide With Bodies" -msgstr "Mode collision" +msgstr "Collisions avec les corps" #: servers/physics_2d_server.cpp servers/physics_server.cpp msgid "Collide With Areas" -msgstr "" +msgstr "Collisions avec les zones" #: servers/physics_2d_server.cpp servers/physics_server.cpp msgid "Motion Remainder" @@ -28356,14 +27662,12 @@ msgid "Use Software Skinning" msgstr "" #: servers/visual_server.cpp -#, fuzzy msgid "Ninepatch Mode" -msgstr "Mode d’interpolation" +msgstr "Mode Ninepatch" #: servers/visual_server.cpp -#, fuzzy msgid "OpenGL" -msgstr "Ouvrir" +msgstr "OpenGL" #: servers/visual_server.cpp msgid "Batching Send Null" @@ -28388,12 +27692,11 @@ msgstr "Traitement en lot" #: servers/visual_server.cpp msgid "Use Batching" -msgstr "" +msgstr "Utiliser le traitement en lot" #: servers/visual_server.cpp -#, fuzzy msgid "Use Batching In Editor" -msgstr "Mise à jour de l'éditeur" +msgstr "Utiliser le traitement en lot dans l'éditeur" #: servers/visual_server.cpp msgid "Single Rect Fallback" @@ -28417,7 +27720,7 @@ msgstr "Nombre Maximal d'Éléments Joints" #: servers/visual_server.cpp msgid "Batch Buffer Size" -msgstr "" +msgstr "Taille de tampon des lots" #: servers/visual_server.cpp msgid "Item Reordering Lookahead" @@ -28428,21 +27731,20 @@ msgid "Flash Batching" msgstr "" #: servers/visual_server.cpp -#, fuzzy msgid "Diagnose Frame" -msgstr "Coller une image" +msgstr "Diagnostiquer la trame" #: servers/visual_server.cpp msgid "GLES2" -msgstr "" +msgstr "GLES2" #: servers/visual_server.cpp msgid "Compatibility" -msgstr "" +msgstr "Compatibilité" #: servers/visual_server.cpp msgid "Disable Half Float" -msgstr "" +msgstr "Désactiver les demi Float" #: servers/visual_server.cpp #, fuzzy @@ -28450,31 +27752,28 @@ msgid "Enable High Float" msgstr "Activer la priorité" #: servers/visual_server.cpp -#, fuzzy msgid "Precision" -msgstr "Expression" +msgstr "Précision" #: servers/visual_server.cpp msgid "UV Contract" -msgstr "" +msgstr "Contraction UV" #: servers/visual_server.cpp msgid "UV Contract Amount" -msgstr "" +msgstr "Quantité de contraction UV" #: servers/visual_server.cpp -#, fuzzy msgid "Use Simple PVS" -msgstr "Utiliser le magnétisme d'échelle" +msgstr "Utiliser PVS simple" #: servers/visual_server.cpp msgid "PVS Logging" -msgstr "" +msgstr "Journal PVS" #: servers/visual_server.cpp -#, fuzzy msgid "Use Signals" -msgstr "Signaux" +msgstr "Utiliser les signaux" #: servers/visual_server.cpp #, fuzzy @@ -28493,27 +27792,24 @@ msgstr "Voir la suppression de l'occlusion" #: servers/visual_server.cpp msgid "Max Active Spheres" -msgstr "" +msgstr "Nombre maximum de sphères actives" #: servers/visual_server.cpp -#, fuzzy msgid "Max Active Polygons" -msgstr "Déplacer le polygone" +msgstr "Nombre maximum de polygones actifs" #: servers/visual_server.cpp -#, fuzzy msgid "Shader Compilation Mode" -msgstr "Mode d’interpolation" +msgstr "Mode de compilation des shaders" #: servers/visual_server.cpp msgid "Max Simultaneous Compiles" -msgstr "" +msgstr "Nombre de compilations simultanées" #: servers/visual_server.cpp msgid "Log Active Async Compiles Count" msgstr "" #: servers/visual_server.cpp -#, fuzzy msgid "Shader Cache Size (MB)" -msgstr "Changer la taille d'une caméra" +msgstr "Taille du cache de shader (Mo)" diff --git a/editor/translations/ga.po b/editor/translations/ga.po index 17fc0b03fa..87e005f5f3 100644 --- a/editor/translations/ga.po +++ b/editor/translations/ga.po @@ -2720,8 +2720,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "CrannBeochan" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19452,14 +19453,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19480,14 +19480,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/gl.po b/editor/translations/gl.po index 191093a45d..29db0e8063 100644 --- a/editor/translations/gl.po +++ b/editor/translations/gl.po @@ -2851,7 +2851,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Copiar Ruta do Nodo" #: editor/editor_export.cpp @@ -20550,15 +20550,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Extensión inválida." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20580,15 +20580,15 @@ msgstr "Nome inválido." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Extensión inválida." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/he.po b/editor/translations/he.po index 2003351f93..abaada7880 100644 --- a/editor/translations/he.po +++ b/editor/translations/he.po @@ -2807,7 +2807,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "העתקת נתיב המפרק" #: editor/editor_export.cpp @@ -20707,15 +20707,15 @@ msgstr "לא ניתן לפתוח תבנית לייצוא:" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "סיומת לא חוקית." #: platform/windows/export/export.cpp #, fuzzy @@ -20739,15 +20739,15 @@ msgstr "שם שגוי." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "סיומת לא חוקית." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/hi.po b/editor/translations/hi.po index 7faa61ab12..e5a41404d0 100644 --- a/editor/translations/hi.po +++ b/editor/translations/hi.po @@ -2804,8 +2804,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "खंड कौपी कीजिये" #: editor/editor_export.cpp #, fuzzy @@ -20309,15 +20310,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "गलत फॉण्ट का आकार |" #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20339,15 +20340,15 @@ msgstr "अमान्य नाम." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "गलत फॉण्ट का आकार |" #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/hr.po b/editor/translations/hr.po index 6d2b3b07da..e473c6556c 100644 --- a/editor/translations/hr.po +++ b/editor/translations/hr.po @@ -2773,8 +2773,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Animacija" #: editor/editor_export.cpp #, fuzzy @@ -19817,15 +19818,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Nevažeće ime." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -19847,15 +19848,15 @@ msgstr "Nevažeće ime." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Nevažeće ime." #: platform/windows/export/export.cpp msgid "Failed to remove temporary file \"%s\"." diff --git a/editor/translations/hu.po b/editor/translations/hu.po index cc7024a260..b35be76368 100644 --- a/editor/translations/hu.po +++ b/editor/translations/hu.po @@ -2872,7 +2872,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Node Útvonal Másolása" #: editor/editor_export.cpp @@ -20510,15 +20510,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Érvénytelen kiterjesztés." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20540,15 +20540,15 @@ msgstr "Érvénytelen név." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Érvénytelen kiterjesztés." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/id.po b/editor/translations/id.po index 8c447326e3..7d839357cd 100644 --- a/editor/translations/id.po +++ b/editor/translations/id.po @@ -45,8 +45,8 @@ msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2022-07-23 03:57+0000\n" -"Last-Translator: FellowMustard <rachmawanng33@gmail.com>\n" +"PO-Revision-Date: 2022-07-31 18:34+0000\n" +"Last-Translator: ProgrammerIndonesia 44 <elo.jhy@gmail.com>\n" "Language-Team: Indonesian <https://hosted.weblate.org/projects/godot-engine/" "godot/id/>\n" "Language: id\n" @@ -427,9 +427,8 @@ msgid "Command" msgstr "Perintah" #: core/os/input_event.cpp -#, fuzzy msgid "Physical" -msgstr " (Secara fisik)" +msgstr "(Secara fisik)" #: core/os/input_event.cpp scene/2d/touch_screen_button.cpp #: scene/gui/base_button.cpp scene/gui/texture_button.cpp @@ -2805,13 +2804,12 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Salin Lokasi Node" #: editor/editor_export.cpp -#, fuzzy msgid "Completed successfully." -msgstr "Paket Sukses Terpasang!" +msgstr "Sukses." #: editor/editor_export.cpp #, fuzzy @@ -3290,9 +3288,8 @@ msgid "Save a File" msgstr "Simpan sebuah File" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp -#, fuzzy msgid "Access" -msgstr "Sukses!" +msgstr "Akses" #: editor/editor_file_dialog.cpp editor/editor_settings.cpp #, fuzzy @@ -12382,9 +12379,8 @@ msgid "Available Node-based types:" msgstr "Profil yang Tersedia:" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Type name is empty!" -msgstr "Nama berkas kosong." +msgstr "Nama tipe kosong!" #: editor/plugins/theme_editor_plugin.cpp #, fuzzy @@ -19289,9 +19285,8 @@ msgid "Could not find keystore, unable to export." msgstr "Tidak dapat menemukan keystore, tidak bisa ekspor." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Could not start apksigner executable." -msgstr "Tidak dapat memulai subproses!" +msgstr "Tidak dapat memulai apksigner." #: platform/android/export/export_plugin.cpp msgid "'apksigner' returned with error #%d" @@ -19324,9 +19319,8 @@ msgid "Invalid filename! Android APK requires the *.apk extension." msgstr "Nama berkas tidak valid! APK Android memerlukan ekstensi *.apk ." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Unsupported export format!" -msgstr "Format ekspor tidak didukung!\n" +msgstr "Format ekspor tidak didukung!" #: platform/android/export/export_plugin.cpp msgid "" @@ -19337,15 +19331,12 @@ msgstr "" "versinya. Silakan pasang ulang dari menu 'Proyek'." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "" "Android build version mismatch: Template installed: %s, Godot version: %s. " "Please reinstall Android build template from 'Project' menu." msgstr "" -"Versi build Android tidak cocok:\n" -" Templat terpasang: %s\n" -" Versi Godot: %s\n" -"Silakan pasang ulang templat build Android dari menu 'Project'." +"Versi build Android tidak cocok: Templat terpasang: %s, Versi Godot: %s. " +"Silakan pasang ulang templat build Android dari menu 'Proyek'." #: platform/android/export/export_plugin.cpp msgid "" @@ -19353,9 +19344,8 @@ msgid "" msgstr "" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Could not export project files to gradle project." -msgstr "Tidak dapat menyunting proyek gradle dalam lokasi proyek\n" +msgstr "Tidak dapat mengekspor file proyek ke dalam lokasi proyek gradle." #: platform/android/export/export_plugin.cpp msgid "Could not write expansion package file!" @@ -19366,13 +19356,12 @@ msgid "Building Android Project (gradle)" msgstr "Membangun Proyek Android (gradle)" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "" "Building of Android project failed, check output for the error. " "Alternatively visit docs.godotengine.org for Android build documentation." msgstr "" -"Pembangunan proyek Android gagal, periksa output untuk galatnya.\n" -"Atau kunjungi docs.godotengine.org untuk dokumentasi build Android." +"Pembangunan proyek Android gagal, periksa output untuk galatnya. Atau " +"kunjungi docs.godotengine.org untuk dokumentasi build Android." #: platform/android/export/export_plugin.cpp msgid "Moving output" @@ -19397,11 +19386,8 @@ msgid "Creating APK..." msgstr "Membuat kontur..." #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Could not find template APK to export: \"%s\"." -msgstr "" -"Tidak dapat menemukan contoh APK untuk ekspor:\n" -"%s" +msgstr "Tidak dapat menemukan contoh APK untuk ekspor: \"%s\"" #: platform/android/export/export_plugin.cpp msgid "" @@ -19560,9 +19546,8 @@ msgid "Capabilities" msgstr "Kapabilitas" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Access Wi-Fi" -msgstr "Sukses!" +msgstr "Akses Wi-Fi" #: platform/iphone/export/export.cpp #, fuzzy @@ -20110,9 +20095,8 @@ msgid "Could not open icon file \"%s\"." msgstr "Tidak dapat ekspor berkas proyek" #: platform/osx/export/export.cpp -#, fuzzy msgid "Could not start xcrun executable." -msgstr "Tidak dapat memulai subproses!" +msgstr "Tidak dapat memulai subproses xcrun." #: platform/osx/export/export.cpp #, fuzzy @@ -20190,9 +20174,8 @@ msgid "DMG Creation" msgstr "Arah" #: platform/osx/export/export.cpp -#, fuzzy msgid "Could not start hdiutil executable." -msgstr "Tidak dapat memulai subproses!" +msgstr "Tidak dapat memulai subproses hdiutil." #: platform/osx/export/export.cpp msgid "`hdiutil create` failed - file exists." @@ -20274,7 +20257,7 @@ msgstr "Proyeksi" #: platform/osx/export/export.cpp #, fuzzy msgid "Could not open file to read from path \"%s\"." -msgstr "Tidak dapat menyunting proyek gradle dalam lokasi proyek\n" +msgstr "Tidak dapat membuka file untuk membaca dari jalur \"%s\"." #: platform/osx/export/export.cpp msgid "Invalid bundle identifier:" @@ -20659,15 +20642,15 @@ msgstr "Tidak dapat menemukan keystore, tidak bisa ekspor." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Ekstensi tidak valid." #: platform/windows/export/export.cpp #, fuzzy @@ -20691,15 +20674,15 @@ msgstr "Nama tidak sah." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Ekstensi tidak valid." #: platform/windows/export/export.cpp #, fuzzy @@ -25445,9 +25428,8 @@ msgid "Draw 2D Outlines" msgstr "Buat Garis Tepi" #: scene/main/scene_tree.cpp servers/visual_server.cpp -#, fuzzy msgid "Reflections" -msgstr "Arah" +msgstr "Refleksi" #: scene/main/scene_tree.cpp #, fuzzy @@ -26803,9 +26785,8 @@ msgstr "" #: scene/resources/environment.cpp #: servers/audio/effects/audio_effect_chorus.cpp -#, fuzzy msgid "2" -msgstr "2D" +msgstr "2" #: scene/resources/environment.cpp #: servers/audio/effects/audio_effect_chorus.cpp diff --git a/editor/translations/is.po b/editor/translations/is.po index 7a990ebd6b..512c660eef 100644 --- a/editor/translations/is.po +++ b/editor/translations/is.po @@ -2767,8 +2767,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Fjarlægja val" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19724,14 +19725,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19752,14 +19752,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/it.po b/editor/translations/it.po index 1d89d28a99..2c9f7eb6fe 100644 --- a/editor/translations/it.po +++ b/editor/translations/it.po @@ -76,8 +76,8 @@ msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2022-07-23 03:57+0000\n" -"Last-Translator: ale piccia <picciatialessio2@gmail.com>\n" +"PO-Revision-Date: 2022-07-31 18:34+0000\n" +"Last-Translator: Mirko <miknsop@gmail.com>\n" "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/" "godot/it/>\n" "Language: it\n" @@ -473,6 +473,7 @@ msgid "Physical Scancode" msgstr "Scancode Fisico" #: core/os/input_event.cpp +#, fuzzy msgid "Unicode" msgstr "Unicode" @@ -900,6 +901,7 @@ msgid "Modules" msgstr "Moduli" #: core/register_core_types.cpp +#, fuzzy msgid "TCP" msgstr "TCP" @@ -2113,6 +2115,7 @@ msgid "Are you sure you want to remove all connections from the \"%s\" signal?" msgstr "Sei sicuro di voler rimuovere tutte le connessioni dal segnale \"%s\"?" #: editor/connections_dialog.cpp editor/editor_help.cpp editor/node_dock.cpp +#, fuzzy msgid "Signals" msgstr "Segnali" @@ -2811,7 +2814,7 @@ msgstr "Esportazione del progetto per la piattaforma:" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Completato con errori." #: editor/editor_export.cpp @@ -6995,6 +6998,7 @@ msgstr "Anisotropico" #: editor/import/resource_importer_layered_texture.cpp #: editor/import/resource_importer_texture.cpp +#, fuzzy msgid "sRGB" msgstr "sRGB" @@ -18020,7 +18024,6 @@ msgid "Expression" msgstr "Espressione" #: modules/visual_script/visual_script_flow_control.cpp -#, fuzzy msgid "Return" msgstr "Ritorno" @@ -18680,7 +18683,6 @@ msgid "Hand Tracking Frequency" msgstr "" #: platform/android/export/export_plugin.cpp -#, fuzzy msgid "Passthrough" msgstr "Passthrough" @@ -20336,15 +20338,15 @@ msgstr "Non è stato possibile trovare keystore, impossible esportare." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Estensione non valida." #: platform/windows/export/export.cpp #, fuzzy @@ -20368,15 +20370,15 @@ msgstr "Nome non valido." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Estensione non valida." #: platform/windows/export/export.cpp #, fuzzy @@ -20924,9 +20926,8 @@ msgstr "" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp -#, fuzzy msgid "Fixed FPS" -msgstr "Vedi FPS" +msgstr "FPS fisso" #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp @@ -26411,7 +26412,6 @@ msgid "Sky Contribution" msgstr "Condizione" #: scene/resources/environment.cpp -#, fuzzy msgid "Fog" msgstr "Nebbia" @@ -26758,7 +26758,7 @@ msgstr "" #: scene/resources/material.cpp msgid "Is sRGB" -msgstr "" +msgstr "È sRGB" #: scene/resources/material.cpp servers/visual_server.cpp #, fuzzy @@ -26876,9 +26876,8 @@ msgid "Flowmap" msgstr "" #: scene/resources/material.cpp -#, fuzzy msgid "Ambient Occlusion" -msgstr "Occlusione" +msgstr "Occlusione ambientale" #: scene/resources/material.cpp msgid "Deep Parallax" diff --git a/editor/translations/ja.po b/editor/translations/ja.po index a40939f777..60458e89df 100644 --- a/editor/translations/ja.po +++ b/editor/translations/ja.po @@ -2822,7 +2822,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "ノードのパスをコピー" #: editor/editor_export.cpp @@ -20462,15 +20462,15 @@ msgstr "キーストアが見つからないため、エクスポートできま #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "無効な実行可能ファイルです。" #: platform/windows/export/export.cpp #, fuzzy @@ -20494,15 +20494,15 @@ msgstr "無効な名前です。" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "無効な実行可能ファイルです。" #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/ka.po b/editor/translations/ka.po index ae98d76c31..2e6e0e70e7 100644 --- a/editor/translations/ka.po +++ b/editor/translations/ka.po @@ -2847,8 +2847,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "მონიშვნის მოშორება" #: editor/editor_export.cpp #, fuzzy @@ -20194,15 +20195,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "არასწორი ფონტის ზომა." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20224,15 +20225,15 @@ msgstr "არასწორი ფონტის ზომა." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "არასწორი ფონტის ზომა." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/km.po b/editor/translations/km.po index 4141c021e2..522cb30363 100644 --- a/editor/translations/km.po +++ b/editor/translations/km.po @@ -2695,8 +2695,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Anim ផ្លាស់ប្តូរ Transform" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19318,14 +19319,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19347,14 +19347,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/ko.po b/editor/translations/ko.po index af0b7e99a5..a91450dd41 100644 --- a/editor/translations/ko.po +++ b/editor/translations/ko.po @@ -2761,7 +2761,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "파일 경로 완성" #: editor/editor_export.cpp @@ -20420,15 +20420,15 @@ msgstr "keystore를 찾을 수 없어, 내보낼 수 없었습니다." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "잘못된 확장자." #: platform/windows/export/export.cpp #, fuzzy @@ -20452,15 +20452,15 @@ msgstr "올바르지 않은 이름입니다." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "잘못된 확장자." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/lt.po b/editor/translations/lt.po index 3b1140192a..66891e3f0e 100644 --- a/editor/translations/lt.po +++ b/editor/translations/lt.po @@ -2806,8 +2806,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Panaikinti pasirinkimą" #: editor/editor_export.cpp msgid "Completed successfully." @@ -20215,15 +20216,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Netinkamas šrifto dydis." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20245,15 +20246,15 @@ msgstr "Netinkamas šrifto dydis." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Netinkamas šrifto dydis." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/lv.po b/editor/translations/lv.po index f134fd5b48..c00e8d1a44 100644 --- a/editor/translations/lv.po +++ b/editor/translations/lv.po @@ -2819,7 +2819,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Kopēt mezgla ceļu" #: editor/editor_export.cpp @@ -20022,15 +20022,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Nederīgs paplašinājums." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20052,15 +20052,15 @@ msgstr "Nederīgs nosaukums." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Nederīgs paplašinājums." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/mk.po b/editor/translations/mk.po index a3390bd895..2d183ec609 100644 --- a/editor/translations/mk.po +++ b/editor/translations/mk.po @@ -2704,7 +2704,7 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "" #: editor/editor_export.cpp @@ -19363,14 +19363,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19392,14 +19391,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/ml.po b/editor/translations/ml.po index 4cb867c040..7568bc881e 100644 --- a/editor/translations/ml.po +++ b/editor/translations/ml.po @@ -2715,8 +2715,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "ചലനം ചുറ്റൽ" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19402,14 +19403,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19431,14 +19431,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/mr.po b/editor/translations/mr.po index 47b8bd3f86..4bdf5ba4fb 100644 --- a/editor/translations/mr.po +++ b/editor/translations/mr.po @@ -2715,8 +2715,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "अॅनिमेशन ट्री" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19403,14 +19404,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19432,14 +19432,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/ms.po b/editor/translations/ms.po index 055e18e0bc..61a60ad8fe 100644 --- a/editor/translations/ms.po +++ b/editor/translations/ms.po @@ -2745,8 +2745,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Salin Pilihan" #: editor/editor_export.cpp #, fuzzy @@ -20226,15 +20227,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Nama kumpulan tidak sah." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20256,15 +20257,15 @@ msgstr "Nama tidak sah." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Nama kumpulan tidak sah." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/nb.po b/editor/translations/nb.po index dac373fdc7..542d5987ca 100644 --- a/editor/translations/nb.po +++ b/editor/translations/nb.po @@ -2876,7 +2876,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Kopier Node-bane" #: editor/editor_export.cpp @@ -21049,15 +21049,15 @@ msgstr "Kunne ikke opprette mappe." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Må ha en gyldig filutvidelse." #: platform/windows/export/export.cpp #, fuzzy @@ -21081,15 +21081,15 @@ msgstr "Ugyldig navn." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Må ha en gyldig filutvidelse." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/nl.po b/editor/translations/nl.po index 40e0ddfb78..aaa0f38a1d 100644 --- a/editor/translations/nl.po +++ b/editor/translations/nl.po @@ -2916,7 +2916,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Knooppad kopiëren" #: editor/editor_export.cpp @@ -20936,15 +20936,15 @@ msgstr "Kon template niet openen voor export:" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Ongeldige extentie." #: platform/windows/export/export.cpp #, fuzzy @@ -20968,15 +20968,15 @@ msgstr "Ongeldige naam." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Ongeldige extentie." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/pl.po b/editor/translations/pl.po index 180abba988..3e4664c317 100644 --- a/editor/translations/pl.po +++ b/editor/translations/pl.po @@ -62,13 +62,14 @@ # Pixel Zone - Godot Engine Tutorials <karoltomaszewskimusic@gmail.com>, 2022. # DK0492 <doriankaczmarek28@gmail.com>, 2022. # Dawid Skubij <davidsd@tlen.pl>, 2022. +# kingofsponges <q.patex.q@gmail.com>, 2022. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2022-07-10 14:38+0000\n" -"Last-Translator: Dawid Skubij <davidsd@tlen.pl>\n" +"PO-Revision-Date: 2022-08-04 06:38+0000\n" +"Last-Translator: kingofsponges <q.patex.q@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/" "godot/pl/>\n" "Language: pl\n" @@ -77,7 +78,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.13.1-dev\n" +"X-Generator: Weblate 4.14-dev\n" #: core/bind/core_bind.cpp main/main.cpp msgid "Tablet Driver" @@ -338,7 +339,7 @@ msgstr "Członek transmisji" #: core/io/stream_peer.cpp msgid "Big Endian" -msgstr "" +msgstr "Big endian" #: core/io/stream_peer.cpp msgid "Data Array" @@ -368,9 +369,8 @@ msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Niewystarczająca ilość bajtów dla bajtów dekodujących lub zły format." #: core/math/expression.cpp -#, fuzzy msgid "Invalid input %d (not passed) in expression" -msgstr "Niewłaściwe dane %i (nie przekazane) w wyrażeniu" +msgstr "Niewłaściwe dane %d (nie przekazane) w wyrażeniu" #: core/math/expression.cpp msgid "self can't be used because instance is null (not passed)" @@ -415,14 +415,12 @@ msgid "Max Size (KB)" msgstr "Maks. rozmiar (KB)" #: core/os/input.cpp -#, fuzzy msgid "Mouse Mode" -msgstr "Tryb przesuwania" +msgstr "Tryb myszki" #: core/os/input.cpp -#, fuzzy msgid "Use Accumulated Input" -msgstr "Usuń Wejście" +msgstr "Użyj skumulowanego wejścia" #: core/os/input_event.cpp editor/project_settings_editor.cpp #: servers/audio_server.cpp @@ -501,15 +499,15 @@ msgstr "Pochylenie" #: core/os/input_event.cpp msgid "Pressure" -msgstr "Ciśnienie" +msgstr "Nacisk" #: core/os/input_event.cpp msgid "Pen Inverted" -msgstr "" +msgstr "Odwrócone pióro" #: core/os/input_event.cpp msgid "Relative" -msgstr "Relatywny" +msgstr "Względny" #: core/os/input_event.cpp scene/2d/camera_2d.cpp scene/2d/cpu_particles_2d.cpp #: scene/3d/cpu_particles.cpp scene/3d/interpolated_camera.cpp @@ -644,9 +642,8 @@ msgstr "Własna nazwa katalogu użytkownika" #: core/project_settings.cpp main/main.cpp #: platform/javascript/export/export.cpp platform/osx/export/export.cpp #: platform/uwp/os_uwp.cpp -#, fuzzy msgid "Display" -msgstr "Pokaż wszystko" +msgstr "Wyświetlanie" #: core/project_settings.cpp main/main.cpp modules/csg/csg_shape.cpp #: modules/opensimplex/noise_texture.cpp scene/2d/line_2d.cpp @@ -660,23 +657,20 @@ msgstr "Szerokość" #: scene/resources/capsule_shape_2d.cpp scene/resources/cylinder_shape.cpp #: scene/resources/font.cpp scene/resources/navigation_mesh.cpp #: scene/resources/primitive_meshes.cpp scene/resources/texture.cpp -#, fuzzy msgid "Height" -msgstr "Światło" +msgstr "Wysokość" #: core/project_settings.cpp msgid "Always On Top" msgstr "Zawsze na wierzchu" #: core/project_settings.cpp -#, fuzzy msgid "Test Width" -msgstr "Rozciągnij po lewej" +msgstr "Szerokość testowa" #: core/project_settings.cpp -#, fuzzy msgid "Test Height" -msgstr "Testowanie" +msgstr "Wysokość testowa" #: core/project_settings.cpp editor/animation_track_editor.cpp #: editor/editor_audio_buses.cpp main/main.cpp servers/audio_server.cpp @@ -699,9 +693,8 @@ msgid "Main Run Args" msgstr "Główne argumenty włączania" #: core/project_settings.cpp -#, fuzzy msgid "Scene Naming" -msgstr "Ścieżka sceny:" +msgstr "Nazywanie scen" #: core/project_settings.cpp msgid "Search In File Extensions" @@ -712,14 +705,12 @@ msgid "Script Templates Search Path" msgstr "Ścieżka wyszukiwania szablonów skryptów" #: core/project_settings.cpp -#, fuzzy msgid "Version Control Autoload On Startup" -msgstr "Automatyczne ładowanie podczas uruchamiania" +msgstr "Automatyczne ładowanie kontroli wersji podczas uruchamiania" #: core/project_settings.cpp -#, fuzzy msgid "Version Control Plugin Name" -msgstr "Kontrola wersji" +msgstr "Nazwa wtyczki kontroli wersji" #: core/project_settings.cpp scene/2d/collision_object_2d.cpp #: scene/3d/collision_object.cpp scene/gui/control.cpp @@ -1204,7 +1195,7 @@ msgstr "Ilośc:" #: editor/animation_track_editor.cpp main/main.cpp #: modules/mono/mono_gd/gd_mono.cpp msgid "Args" -msgstr "" +msgstr "Argumenty" #: editor/animation_track_editor.cpp editor/editor_settings.cpp #: editor/script_editor_debugger.cpp modules/gltf/gltf_accessor.cpp @@ -1228,7 +1219,7 @@ msgstr "Ustaw uchwyt" #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp #: scene/audio/audio_stream_player.cpp scene/gui/video_player.cpp msgid "Stream" -msgstr "" +msgstr "Strumień" #: editor/animation_track_editor.cpp #, fuzzy @@ -2254,7 +2245,7 @@ msgstr "Otwórz" #: editor/dependency_editor.cpp msgid "Owners of: %s (Total: %d)" -msgstr "" +msgstr "Właściciele: %s (Suma: %d)" #: editor/dependency_editor.cpp msgid "" @@ -2814,11 +2805,11 @@ msgstr "Wybierz" #: editor/editor_export.cpp msgid "Project export for platform:" -msgstr "" +msgstr "Eksportowanie projektu dla platformy:" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Skopiuj ścieżkę węzła" #: editor/editor_export.cpp @@ -2844,14 +2835,12 @@ msgid "Packing" msgstr "Pakowanie" #: editor/editor_export.cpp -#, fuzzy msgid "Save PCK" -msgstr "Zapisz jako" +msgstr "Zapisz plik PCK" #: editor/editor_export.cpp -#, fuzzy msgid "Cannot create file \"%s\"." -msgstr "Nie można utworzyć katalogu." +msgstr "Nie można utworzyć pliku \"%s\"." #: editor/editor_export.cpp #, fuzzy @@ -20698,17 +20687,17 @@ msgstr "Nie udało się znaleźć keystore, nie można eksportować." #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" "Narzędzie rcedit musi być skonfigurowane w Ustawieniach edytora (Eksport > " "Windows > Rcedit), aby zmienić ikonę lub dane informacji o aplikacji." #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Niepoprawny plik wykonywalny." #: platform/windows/export/export.cpp #, fuzzy @@ -20733,17 +20722,17 @@ msgstr "Niewłaściwa nazwa." #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" "Narzędzie rcedit musi być skonfigurowane w Ustawieniach edytora (Eksport > " "Windows > Rcedit), aby zmienić ikonę lub dane informacji o aplikacji." #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Niepoprawny plik wykonywalny." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/pr.po b/editor/translations/pr.po index 337e5af5c0..4c073f8542 100644 --- a/editor/translations/pr.po +++ b/editor/translations/pr.po @@ -2799,7 +2799,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Forge yer Node!" #: editor/editor_export.cpp @@ -20263,15 +20263,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Yer Calligraphy be wrongly sized." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20293,15 +20293,15 @@ msgstr "Yer Calligraphy be wrongly sized." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Yer Calligraphy be wrongly sized." #: platform/windows/export/export.cpp msgid "Failed to remove temporary file \"%s\"." diff --git a/editor/translations/pt.po b/editor/translations/pt.po index db7171b3c6..f284e0ece8 100644 --- a/editor/translations/pt.po +++ b/editor/translations/pt.po @@ -2754,7 +2754,8 @@ msgid "Project export for platform:" msgstr "Exportação do projeto para plataforma:" #: editor/editor_export.cpp -msgid "Completed with errors." +#, fuzzy +msgid "Completed with warnings." msgstr "Concluído com erros." #: editor/editor_export.cpp @@ -20408,15 +20409,15 @@ msgstr "Incapaz de encontrar keystore e exportar." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Extensão inválida." #: platform/windows/export/export.cpp #, fuzzy @@ -20440,15 +20441,15 @@ msgstr "Nome inválido." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Extensão inválida." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po index 5d2b642352..84a5ac45c3 100644 --- a/editor/translations/pt_BR.po +++ b/editor/translations/pt_BR.po @@ -149,7 +149,7 @@ msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: 2016-05-30\n" -"PO-Revision-Date: 2022-07-27 13:26+0000\n" +"PO-Revision-Date: 2022-08-04 06:38+0000\n" "Last-Translator: Felipe Kinoshita <kinofhek@gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "godot-engine/godot/pt_BR/>\n" @@ -2868,7 +2868,8 @@ msgid "Project export for platform:" msgstr "Exportação do projeto para plataforma:" #: editor/editor_export.cpp -msgid "Completed with errors." +#, fuzzy +msgid "Completed with warnings." msgstr "Concluído com erros." #: editor/editor_export.cpp @@ -5495,7 +5496,7 @@ msgstr "Tamanho da Miniatura" #: editor/editor_settings.cpp msgid "Docks" -msgstr "Docas" +msgstr "Docks" #: editor/editor_settings.cpp msgid "Scene Tree" @@ -16364,7 +16365,7 @@ msgstr "stdout" #: main/main.cpp msgid "Print FPS" -msgstr "" +msgstr "Mostrar FPS" #: main/main.cpp msgid "Verbose stdout" @@ -20360,15 +20361,15 @@ msgstr "O keystore não foi encontrado, não foi possível exportar." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Extensão inválida." #: platform/windows/export/export.cpp #, fuzzy @@ -20391,15 +20392,15 @@ msgstr "Nome Inválido." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Extensão inválida." #: platform/windows/export/export.cpp msgid "Failed to remove temporary file \"%s\"." @@ -24458,7 +24459,7 @@ msgstr "" #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Caret" -msgstr "" +msgstr "Circunflexo" #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Blink" diff --git a/editor/translations/ro.po b/editor/translations/ro.po index aaa6e1cbcb..a78712c6ba 100644 --- a/editor/translations/ro.po +++ b/editor/translations/ro.po @@ -2836,8 +2836,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Copiază Selecția" #: editor/editor_export.cpp #, fuzzy @@ -20739,15 +20740,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Trebuie să utilizaţi o extensie valida." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20769,15 +20770,15 @@ msgstr "Nume nevalid." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Trebuie să utilizaţi o extensie valida." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/ru.po b/editor/translations/ru.po index c50dce8e01..1df1d87308 100644 --- a/editor/translations/ru.po +++ b/editor/translations/ru.po @@ -2852,7 +2852,8 @@ msgid "Project export for platform:" msgstr "Экспорт проекта для платформы:" #: editor/editor_export.cpp -msgid "Completed with errors." +#, fuzzy +msgid "Completed with warnings." msgstr "Завершено с ошибками." #: editor/editor_export.cpp @@ -20280,17 +20281,17 @@ msgstr "Не удалось найти хранилище ключей, нево #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" "Инструмент rcedit должен быть настроен в Настройках редактора (Export > " "Windows > Rcedit) для изменения значка или информационных данных приложения." #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Недопустимый исполняемый файл." #: platform/windows/export/export.cpp #, fuzzy @@ -20315,17 +20316,17 @@ msgstr "Недопустимое имя." #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" "Инструмент rcedit должен быть настроен в Настройках редактора (Export > " "Windows > Rcedit) для изменения значка или информационных данных приложения." #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Недопустимый исполняемый файл." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/si.po b/editor/translations/si.po index e30d6c27ab..8ce2d1d628 100644 --- a/editor/translations/si.po +++ b/editor/translations/si.po @@ -2745,8 +2745,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "ශ්රිත:" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19620,14 +19621,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19649,14 +19649,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/sk.po b/editor/translations/sk.po index c3a64ecc2f..7cba3886ba 100644 --- a/editor/translations/sk.po +++ b/editor/translations/sk.po @@ -2854,8 +2854,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Skopírovať Výber" #: editor/editor_export.cpp #, fuzzy @@ -20662,15 +20663,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Nesprávna veľkosť písma." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20692,15 +20693,15 @@ msgstr "Neplatný Názov." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Nesprávna veľkosť písma." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/sl.po b/editor/translations/sl.po index 4f7f11baa3..ceb21aa750 100644 --- a/editor/translations/sl.po +++ b/editor/translations/sl.po @@ -2887,8 +2887,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Odstrani izbrano" #: editor/editor_export.cpp #, fuzzy @@ -20961,15 +20962,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Uporabiti moraš valjavno razširitev." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20991,15 +20992,15 @@ msgstr "Neveljavno ime." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Uporabiti moraš valjavno razširitev." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/sq.po b/editor/translations/sq.po index d011c34407..af72b686b9 100644 --- a/editor/translations/sq.po +++ b/editor/translations/sq.po @@ -2824,8 +2824,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Animacionet:" #: editor/editor_export.cpp #, fuzzy @@ -20432,15 +20433,15 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Duhet të perdorësh një shtesë të lejuar." #: platform/windows/export/export.cpp msgid "Could not find signtool executable at \"%s\"." @@ -20462,15 +20463,15 @@ msgstr "Emër i palejuar." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Duhet të perdorësh një shtesë të lejuar." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/sr_Cyrl.po b/editor/translations/sr_Cyrl.po index 4a9d933004..4231d62c6b 100644 --- a/editor/translations/sr_Cyrl.po +++ b/editor/translations/sr_Cyrl.po @@ -3003,7 +3003,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Копирај Путању Чвора" #: editor/editor_export.cpp @@ -22362,15 +22362,15 @@ msgstr "Неуспешно отварање нацрта за извоз:" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Мора се користити важећа екстензија." #: platform/windows/export/export.cpp #, fuzzy @@ -22394,15 +22394,15 @@ msgstr "Неважеће име." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Мора се користити важећа екстензија." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/sr_Latn.po b/editor/translations/sr_Latn.po index 41b23339de..b898108402 100644 --- a/editor/translations/sr_Latn.po +++ b/editor/translations/sr_Latn.po @@ -2769,8 +2769,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Kopiraj Označeno" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19709,14 +19710,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19738,14 +19738,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/sv.po b/editor/translations/sv.po index 3baefa6356..9fd6b9bf67 100644 --- a/editor/translations/sv.po +++ b/editor/translations/sv.po @@ -2852,7 +2852,7 @@ msgstr "Projektexport för plattformen:" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Kopiera Nod-Sökväg" #: editor/editor_export.cpp @@ -20723,15 +20723,15 @@ msgstr "Det gick inte att hitta nyckellager, det gick inte att exportera." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Måste använda en giltigt filändelse." #: platform/windows/export/export.cpp #, fuzzy @@ -20755,15 +20755,15 @@ msgstr "Ogiltigt namn." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Måste använda en giltigt filändelse." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/te.po b/editor/translations/te.po index 03919233f7..af4c65f062 100644 --- a/editor/translations/te.po +++ b/editor/translations/te.po @@ -2698,8 +2698,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "సంఘం" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19324,14 +19325,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -19352,14 +19352,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/th.po b/editor/translations/th.po index 1690916a54..f1eb8b716f 100644 --- a/editor/translations/th.po +++ b/editor/translations/th.po @@ -2875,7 +2875,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "คัดลอกตำแหน่งโหนด" #: editor/editor_export.cpp @@ -20710,15 +20710,15 @@ msgstr "เปิดเทมเพลตเพื่อส่งออกไม #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "นามสกุลไม่ถูกต้อง" #: platform/windows/export/export.cpp #, fuzzy @@ -20742,15 +20742,15 @@ msgstr "ชื่อผิดพลาด" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "นามสกุลไม่ถูกต้อง" #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/tl.po b/editor/translations/tl.po index cc20958dd1..fec7766383 100644 --- a/editor/translations/tl.po +++ b/editor/translations/tl.po @@ -2814,8 +2814,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr "Kopyahin Ang Pinagpipilian" #: editor/editor_export.cpp msgid "Completed successfully." @@ -19980,14 +19981,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -20010,14 +20010,13 @@ msgstr "Di-wastong pangalan." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/tr.po b/editor/translations/tr.po index 4980240671..ab58a87c36 100644 --- a/editor/translations/tr.po +++ b/editor/translations/tr.po @@ -77,13 +77,14 @@ # Deleted User <noreply+46833@weblate.org>, 2022. # Emre <mr.inkaya@gmail.com>, 2022. # Deleted User <noreply+46858@weblate.org>, 2022. +# Ümid Quliyev <lucifer25x@protonmail.com>, 2022. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2022-07-23 03:57+0000\n" -"Last-Translator: Deleted User <noreply+46858@weblate.org>\n" +"PO-Revision-Date: 2022-08-05 01:04+0000\n" +"Last-Translator: Ümid Quliyev <lucifer25x@protonmail.com>\n" "Language-Team: Turkish <https://hosted.weblate.org/projects/godot-engine/" "godot/tr/>\n" "Language: tr\n" @@ -360,7 +361,7 @@ msgstr "Veri Dizisi" #: core/io/stream_peer_ssl.cpp msgid "Blocking Handshake" -msgstr "" +msgstr "Tokalaşmayı blokla" #: core/io/udp_server.cpp msgid "Max Pending Connections" @@ -411,7 +412,6 @@ msgstr "'%s' çağrıldığında:" #: core/math/random_number_generator.cpp #: modules/opensimplex/open_simplex_noise.cpp -#, fuzzy msgid "Seed" msgstr "Tohum" @@ -449,7 +449,6 @@ msgid "Shift" msgstr "Shift" #: core/os/input_event.cpp -#, fuzzy msgid "Control" msgstr "Kontrol Tuşu" @@ -2833,7 +2832,7 @@ msgstr "Platform için proje dışa aktarımı:" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Hatalarla tamamlandı." #: editor/editor_export.cpp @@ -4459,8 +4458,9 @@ msgid "Restore Scenes On Load" msgstr "Sahne Düğümünü Al" #: editor/editor_node.cpp editor/editor_settings.cpp +#, fuzzy msgid "Show Thumbnail On Hover" -msgstr "" +msgstr "Fareyle üzerine gelindiğinde küçük resmi göster" #: editor/editor_node.cpp editor/editor_settings.cpp msgid "Inspector" @@ -4486,11 +4486,11 @@ msgstr "" #: editor/editor_node.cpp msgid "Horizontal Vector2 Editing" -msgstr "" +msgstr "Yatay Vector2 Düzenleme" #: editor/editor_node.cpp msgid "Horizontal Vector Types Editing" -msgstr "" +msgstr "Yatay Vector tipleri düzenleme" #: editor/editor_node.cpp #, fuzzy @@ -4503,8 +4503,9 @@ msgid "Resources To Open In New Inspector" msgstr "Gözetmen Bölümünde Aç" #: editor/editor_node.cpp +#, fuzzy msgid "Default Color Picker Mode" -msgstr "" +msgstr "Varsayılan renk seçme modu" #: editor/editor_node.cpp editor/plugins/version_control_editor_plugin.cpp msgid "Version Control" @@ -5380,19 +5381,19 @@ msgstr "Hepsini Görüntüle" #: editor/editor_settings.cpp msgid "Custom Display Scale" -msgstr "" +msgstr "Özel Ekran Ölçeği" #: editor/editor_settings.cpp msgid "Main Font Size" -msgstr "" +msgstr "Ana font ölçüsü" #: editor/editor_settings.cpp msgid "Code Font Size" -msgstr "" +msgstr "Kod font'u ölçüsü" #: editor/editor_settings.cpp msgid "Font Antialiased" -msgstr "" +msgstr "Kenarı yumuşatılmış font" #: editor/editor_settings.cpp msgid "Font Hinting" @@ -5405,7 +5406,7 @@ msgstr "Ana Sahne" #: editor/editor_settings.cpp msgid "Main Font Bold" -msgstr "" +msgstr "Ana font kalınlığı" #: editor/editor_settings.cpp #, fuzzy @@ -5413,8 +5414,9 @@ msgid "Code Font" msgstr "Düğüm Noktası Ekle" #: editor/editor_settings.cpp +#, fuzzy msgid "Dim Editor On Dialog Popup" -msgstr "" +msgstr "İletişim penceresinde Dim Editörü" #: editor/editor_settings.cpp main/main.cpp msgid "Low Processor Mode Sleep (µsec)" @@ -5431,11 +5433,12 @@ msgstr "Dikkat Dağıtmayan Kip" #: editor/editor_settings.cpp msgid "Automatically Open Screenshots" -msgstr "" +msgstr "Otomatik olarak ekran görüntülerini aç" #: editor/editor_settings.cpp +#, fuzzy msgid "Max Array Dictionary Items Per Page" -msgstr "" +msgstr "Her sayfada maks dizi sözlüğü öğesi" #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp #: editor/plugins/theme_editor_plugin.cpp scene/gui/control.cpp @@ -5449,7 +5452,7 @@ msgstr "Ön ayar" #: editor/editor_settings.cpp msgid "Icon And Font Color" -msgstr "" +msgstr "Simge ve Font rengi" #: editor/editor_settings.cpp #, fuzzy @@ -5463,7 +5466,7 @@ msgstr "Renk Seç" #: editor/editor_settings.cpp scene/resources/environment.cpp msgid "Contrast" -msgstr "" +msgstr "Kontrast" #: editor/editor_settings.cpp msgid "Relationship Line Opacity" @@ -5561,8 +5564,9 @@ msgid "Property Editor" msgstr "Grup Düzenleyici" #: editor/editor_settings.cpp +#, fuzzy msgid "Auto Refresh Interval" -msgstr "" +msgstr "Otomatik yenileme intervalı" #: editor/editor_settings.cpp #, fuzzy @@ -5577,7 +5581,7 @@ msgstr "Editör Teması" #: editor/editor_settings.cpp scene/3d/label_3d.cpp #: scene/resources/default_theme/default_theme.cpp msgid "Line Spacing" -msgstr "" +msgstr "Satır aralığı" #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp #: modules/gdscript/editor/gdscript_highlighter.cpp @@ -5596,7 +5600,7 @@ msgstr "" #: editor/editor_settings.cpp scene/gui/text_edit.cpp msgid "Highlight Current Line" -msgstr "" +msgstr "Geçerli satırı vurgula" #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp msgid "Highlight Type Safe Lines" @@ -5635,11 +5639,11 @@ msgstr "Gezinim" #: editor/editor_settings.cpp scene/gui/text_edit.cpp msgid "Smooth Scrolling" -msgstr "" +msgstr "Pürüzsüz kaydırma" #: editor/editor_settings.cpp scene/gui/text_edit.cpp msgid "V Scroll Speed" -msgstr "" +msgstr "V kaydırma hızı" #: editor/editor_settings.cpp #, fuzzy @@ -5648,7 +5652,7 @@ msgstr "Başlatımı Göster" #: editor/editor_settings.cpp msgid "Minimap Width" -msgstr "" +msgstr "Küçük Harita Genişliği" #: editor/editor_settings.cpp msgid "Mouse Extra Buttons Navigate History" @@ -5660,12 +5664,13 @@ msgid "Drag And Drop Selection" msgstr "GridMap Seçimi" #: editor/editor_settings.cpp +#, fuzzy msgid "Stay In Script Editor On Node Selected" -msgstr "" +msgstr "Seçilmiş Düğümde Script Editöründe Kal" #: editor/editor_settings.cpp msgid "Appearance" -msgstr "" +msgstr "Dış görünüş" #: editor/editor_settings.cpp scene/gui/text_edit.cpp #, fuzzy @@ -5691,12 +5696,14 @@ msgid "Show Info Gutter" msgstr "" #: editor/editor_settings.cpp +#, fuzzy msgid "Code Folding" -msgstr "" +msgstr "Kod katlama" #: editor/editor_settings.cpp +#, fuzzy msgid "Word Wrap" -msgstr "" +msgstr "Kelime Paketle" #: editor/editor_settings.cpp msgid "Show Line Length Guidelines" @@ -5717,7 +5724,7 @@ msgstr "Kod Düzenleyici" #: editor/editor_settings.cpp msgid "Show Members Overview" -msgstr "" +msgstr "Üyelerin Genel Bakışını Göster" #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp #, fuzzy @@ -5734,16 +5741,19 @@ msgid "Autosave Interval Secs" msgstr "" #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp +#, fuzzy msgid "Restore Scripts On Load" -msgstr "" +msgstr "Script'leri Yüklemede Eski Haline Getir" #: editor/editor_settings.cpp +#, fuzzy msgid "Auto Reload And Parse Scripts On Save" -msgstr "" +msgstr "Kaydederken Script'leri Otomatik Tekrar yükle ve Ayrıştır" #: editor/editor_settings.cpp +#, fuzzy msgid "Auto Reload Scripts On External Change" -msgstr "" +msgstr "Dış Değişiklikte Otomatik Olarak Script'i Geri Yükle" #: editor/editor_settings.cpp #, fuzzy @@ -5756,11 +5766,11 @@ msgstr "" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Cursor" -msgstr "" +msgstr "İmleç" #: editor/editor_settings.cpp msgid "Scroll Past End Of File" -msgstr "" +msgstr "Dosyanın Sonunu Kaydır" #: editor/editor_settings.cpp msgid "Block Caret" @@ -5796,7 +5806,7 @@ msgstr "" #: editor/editor_settings.cpp msgid "Code Complete Delay" -msgstr "" +msgstr "Kod Tamamlama Gecikme Süresi" #: editor/editor_settings.cpp msgid "Put Callhint Tooltip Below Current Line" @@ -5853,12 +5863,14 @@ msgid "Preview Size" msgstr "Önizleme" #: editor/editor_settings.cpp +#, fuzzy msgid "Primary Grid Color" -msgstr "" +msgstr "Birincil Izgara Rengi" #: editor/editor_settings.cpp +#, fuzzy msgid "Secondary Grid Color" -msgstr "" +msgstr "İkincil Izgara Rengi" #: editor/editor_settings.cpp #, fuzzy @@ -5895,7 +5907,7 @@ msgstr "Nokta" #: scene/resources/particles_material.cpp servers/physics_2d_server.cpp #: servers/physics_server.cpp msgid "Shape" -msgstr "" +msgstr "Şekil" #: editor/editor_settings.cpp #, fuzzy @@ -6007,7 +6019,7 @@ msgstr "Gezinim Kipi" #: editor/editor_settings.cpp msgid "Orbit Sensitivity" -msgstr "" +msgstr "Yörünge Hassasiyeti" #: editor/editor_settings.cpp msgid "Orbit Inertia" @@ -20660,15 +20672,15 @@ msgstr "Anahtar deposu bulunamadı, dışa aktarılamadı." #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Geçersiz uzantı." #: platform/windows/export/export.cpp #, fuzzy @@ -20692,15 +20704,15 @@ msgstr "Geçersiz ad." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Geçersiz uzantı." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/uk.po b/editor/translations/uk.po index 0feae1a849..d87aa168d7 100644 --- a/editor/translations/uk.po +++ b/editor/translations/uk.po @@ -2757,7 +2757,8 @@ msgid "Project export for platform:" msgstr "Експортування проєкту для платформи:" #: editor/editor_export.cpp -msgid "Completed with errors." +#, fuzzy +msgid "Completed with warnings." msgstr "Завершено з помилками." #: editor/editor_export.cpp @@ -20123,18 +20124,18 @@ msgstr "Не вдалося знайти сховище ключів. Немож #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" "Щоб мати змогу змінювати піктограму або дані щодо програми, має бути " "налаштовано інструмент rcedit у параметрах редактора (Експорт > Windows > " "Rcedit)." #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Некоректний виконуваний файл." #: platform/windows/export/export.cpp #, fuzzy @@ -20159,18 +20160,18 @@ msgstr "Некоректна назва." #: platform/windows/export/export.cpp #, fuzzy msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" "Щоб мати змогу змінювати піктограму або дані щодо програми, має бути " "налаштовано інструмент rcedit у параметрах редактора (Експорт > Windows > " "Rcedit)." #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Некоректний виконуваний файл." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/ur_PK.po b/editor/translations/ur_PK.po index 9cb56f3c21..a428250cc7 100644 --- a/editor/translations/ur_PK.po +++ b/editor/translations/ur_PK.po @@ -2764,8 +2764,9 @@ msgid "Project export for platform:" msgstr "" #: editor/editor_export.cpp -msgid "Completed with errors." -msgstr "" +#, fuzzy +msgid "Completed with warnings." +msgstr ".تمام کا انتخاب" #: editor/editor_export.cpp msgid "Completed successfully." @@ -20062,14 +20063,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +msgid "rcedit failed to modify executable: %s." msgstr "" #: platform/windows/export/export.cpp @@ -20091,14 +20091,13 @@ msgstr "" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +msgid "Signtool failed to sign executable: %s." msgstr "" #: platform/windows/export/export.cpp diff --git a/editor/translations/vi.po b/editor/translations/vi.po index 4a6164f7e1..0a6885872f 100644 --- a/editor/translations/vi.po +++ b/editor/translations/vi.po @@ -2797,7 +2797,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "Sao chép đường dẫn nút" #: editor/editor_export.cpp @@ -20574,15 +20574,15 @@ msgstr "Không thể mở bản mẫu để xuất:" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "Tên đuôi không hợp lệ." #: platform/windows/export/export.cpp #, fuzzy @@ -20606,15 +20606,15 @@ msgstr "Tên không hợp lệ." #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "Tên đuôi không hợp lệ." #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po index bd012a4c76..f25a372128 100644 --- a/editor/translations/zh_CN.po +++ b/editor/translations/zh_CN.po @@ -89,7 +89,7 @@ msgstr "" "Project-Id-Version: Chinese (Simplified) (Godot Engine)\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: 2018-01-20 12:15+0200\n" -"PO-Revision-Date: 2022-07-19 16:26+0000\n" +"PO-Revision-Date: 2022-07-29 01:36+0000\n" "Last-Translator: Haoyu Qiu <timothyqiu32@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "godot-engine/godot/zh_Hans/>\n" @@ -2791,7 +2791,8 @@ msgid "Project export for platform:" msgstr "针对平台导出项目：" #: editor/editor_export.cpp -msgid "Completed with errors." +#, fuzzy +msgid "Completed with warnings." msgstr "已完成，存在错误。" #: editor/editor_export.cpp @@ -5445,7 +5446,7 @@ msgstr "拖放选中内容" #: editor/editor_settings.cpp msgid "Stay In Script Editor On Node Selected" -msgstr "" +msgstr "选中节点时保持脚本编辑器" #: editor/editor_settings.cpp msgid "Appearance" @@ -11470,9 +11471,8 @@ msgid "New Animation" msgstr "新建动画" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Filter animations" -msgstr "筛选方法" +msgstr "筛选动画" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Speed:" @@ -19681,17 +19681,18 @@ msgid "Could not find wine executable at \"%s\"." msgstr "无法在“%s”找到 wine 可执行文件。" #: platform/windows/export/export.cpp +#, fuzzy msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" "无法启动 rcedit 可执行文件，请在编辑器设置中配置 rcedit 路径（导出 > Windows " "> Rcedit）。" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" +#, fuzzy +msgid "rcedit failed to modify executable: %s." msgstr "" "rcedit 修改可执行文件失败：\n" "%s" @@ -19713,17 +19714,18 @@ msgid "Invalid timestamp server." msgstr "时间戳服务器无效。" #: platform/windows/export/export.cpp +#, fuzzy msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" "无法启动 signtool 可执行文件，请在编辑器设置中配置 signtool 路径（导出 > " "Windows > Signtool）。" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" +#, fuzzy +msgid "Signtool failed to sign executable: %s." msgstr "" "Signtool 签名可执行文件失败：\n" "%s" diff --git a/editor/translations/zh_HK.po b/editor/translations/zh_HK.po index 424752a849..79760d0de7 100644 --- a/editor/translations/zh_HK.po +++ b/editor/translations/zh_HK.po @@ -2891,7 +2891,7 @@ msgstr "" #: editor/editor_export.cpp #, fuzzy -msgid "Completed with errors." +msgid "Completed with warnings." msgstr "複製路徑" #: editor/editor_export.cpp @@ -20867,15 +20867,15 @@ msgstr "無法新增資料夾" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "無效副檔名" #: platform/windows/export/export.cpp #, fuzzy @@ -20899,15 +20899,15 @@ msgstr "無效名稱。" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "無效副檔名" #: platform/windows/export/export.cpp #, fuzzy diff --git a/editor/translations/zh_TW.po b/editor/translations/zh_TW.po index f5568c41b5..8ad86d4b2a 100644 --- a/editor/translations/zh_TW.po +++ b/editor/translations/zh_TW.po @@ -23,7 +23,7 @@ # binotaliu <binota@protonmail.ch>, 2020. # Allen H. <w84miracle@gmail.com>, 2020. # BinotaLIU <binota@protonmail.ch>, 2020. -# BinotaLIU <me@binota.org>, 2020, 2021. +# BinotaLIU <me@binota.org>, 2020, 2021, 2022. # MintSoda <lionlxh@qq.com>, 2020. # meowmeowmeowcat <meowmeowcat1211@gmail.com>, 2021. # anthonychen <anton1554970211@126.com>, 2021. @@ -41,8 +41,8 @@ msgstr "" "Project-Id-Version: Godot Engine editor\n" "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2022-07-23 03:57+0000\n" -"Last-Translator: 菘菘 <rrt467778@gmail.com>\n" +"PO-Revision-Date: 2022-07-31 18:34+0000\n" +"Last-Translator: BinotaLIU <me@binota.org>\n" "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" "godot-engine/godot/zh_Hant/>\n" "Language: zh_TW\n" @@ -474,7 +474,7 @@ msgstr "壓力" #: core/os/input_event.cpp msgid "Pen Inverted" -msgstr "" +msgstr "反轉筆觸" #: core/os/input_event.cpp msgid "Relative" @@ -1171,14 +1171,12 @@ msgid "Type" msgstr "型別" #: editor/animation_track_editor.cpp -#, fuzzy msgid "In Handle" -msgstr "輸入把手" +msgstr "進入控點" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Out Handle" -msgstr "輸出把手" +msgstr "離開控點" #: editor/animation_track_editor.cpp #: editor/import/resource_importer_texture.cpp @@ -1350,14 +1348,12 @@ msgid "Easing:" msgstr "緩入緩出：" #: editor/animation_track_editor.cpp -#, fuzzy msgid "In-Handle:" -msgstr "設定處理程式" +msgstr "進入控點：" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Out-Handle:" -msgstr "設定處理程式" +msgstr "離開控點：" #: editor/animation_track_editor.cpp msgid "Stream:" @@ -2747,7 +2743,8 @@ msgid "Project export for platform:" msgstr "專案匯出平台：" #: editor/editor_export.cpp -msgid "Completed with errors." +#, fuzzy +msgid "Completed with warnings." msgstr "已完成，存在錯誤。" #: editor/editor_export.cpp @@ -5195,9 +5192,8 @@ msgid "Unfocused Low Processor Mode Sleep (µsec)" msgstr "未聚焦低處理器睡眠模式（微秒）" #: editor/editor_settings.cpp -#, fuzzy msgid "Separate Distraction Mode" -msgstr "專注模式" +msgstr "獨立專注模式" #: editor/editor_settings.cpp msgid "Automatically Open Screenshots" @@ -5404,7 +5400,7 @@ msgstr "拖移選擇的檔案" #: editor/editor_settings.cpp msgid "Stay In Script Editor On Node Selected" -msgstr "" +msgstr "選擇節點時保留在腳本編輯器中" #: editor/editor_settings.cpp msgid "Appearance" @@ -5423,9 +5419,8 @@ msgid "Show Bookmark Gutter" msgstr "顯示書籤欄" #: editor/editor_settings.cpp -#, fuzzy msgid "Show Breakpoint Gutter" -msgstr "跳過中斷點" +msgstr "顯示中斷點欄" #: editor/editor_settings.cpp msgid "Show Info Gutter" @@ -5464,9 +5459,8 @@ msgid "Files" msgstr "檔案" #: editor/editor_settings.cpp -#, fuzzy msgid "Trim Trailing Whitespace On Save" -msgstr "移除後方空白字元" +msgstr "保存時移除後方空白字元" #: editor/editor_settings.cpp msgid "Autosave Interval Secs" @@ -5513,9 +5507,8 @@ msgid "Caret Blink Speed" msgstr "插入符閃爍速度" #: editor/editor_settings.cpp -#, fuzzy msgid "Right Click Moves Caret" -msgstr "右鍵點擊以新增控制點" +msgstr "按一下右鍵來移動遊標" #: editor/editor_settings.cpp modules/gdscript/gdscript.cpp #: modules/gdscript/gdscript_editor.cpp @@ -5544,9 +5537,8 @@ msgid "Callhint Tooltip Offset" msgstr "呼叫提示工具提示框偏移量" #: editor/editor_settings.cpp -#, fuzzy msgid "Complete File Paths" -msgstr "複製節點路徑" +msgstr "補全檔案路徑" #: editor/editor_settings.cpp modules/gdscript/gdscript_editor.cpp msgid "Add Type Hints" @@ -5713,9 +5705,8 @@ msgid "Warped Mouse Panning" msgstr "彎曲滑鼠平移" #: editor/editor_settings.cpp -#, fuzzy msgid "Navigation Feel" -msgstr "導航模式" +msgstr "導航風格" #: editor/editor_settings.cpp msgid "Orbit Sensitivity" @@ -5972,21 +5963,20 @@ msgid "Completion Background Color" msgstr "自動補全背景顏色" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp -#, fuzzy msgid "Completion Selected Color" -msgstr "匯入所選" +msgstr "自動補全所選顏色" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Completion Existing Color" -msgstr "完成存在中顏色" +msgstr "自動補全現有顏色" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Completion Scroll Color" -msgstr "完成滾動顏色" +msgstr "自動補全捲軸顏色" #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp msgid "Completion Font Color" -msgstr "完成字型顏色" +msgstr "自動補全字型顏色" #: editor/editor_settings.cpp msgid "Text Color" @@ -6739,7 +6729,7 @@ msgstr "使用環境通道" #: editor/import/resource_importer_bitmask.cpp msgid "Create From" -msgstr "從某處建立" +msgstr "建立自" #: editor/import/resource_importer_bitmask.cpp #: servers/audio/effects/audio_effect_compressor.cpp @@ -6751,9 +6741,8 @@ msgstr "臨界值" #: editor/import/resource_importer_scene.cpp #: editor/import/resource_importer_texture.cpp #: editor/import/resource_importer_wav.cpp scene/3d/gi_probe.cpp -#, fuzzy msgid "Compress" -msgstr "元件" +msgstr "壓縮" #: editor/import/resource_importer_csv_translation.cpp msgid "Delimiter" @@ -6803,9 +6792,8 @@ msgid "sRGB" msgstr "sRGB" #: editor/import/resource_importer_layered_texture.cpp -#, fuzzy msgid "Slices" -msgstr "自動剪裁" +msgstr "切片" #: editor/import/resource_importer_layered_texture.cpp #: scene/gui/aspect_ratio_container.cpp scene/gui/control.cpp @@ -6822,9 +6810,8 @@ msgid "Vertical" msgstr "垂直" #: editor/import/resource_importer_obj.cpp -#, fuzzy msgid "Generate Tangents" -msgstr "產生點" +msgstr "產生切線" #: editor/import/resource_importer_obj.cpp msgid "Scale Mesh" @@ -6836,9 +6823,8 @@ msgstr "Mesh 偏移" #: editor/import/resource_importer_obj.cpp #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Octahedral Compression" -msgstr "設定表示式" +msgstr "八面體壓縮" #: editor/import/resource_importer_obj.cpp msgid "Optimize Mesh Flags" @@ -6926,27 +6912,24 @@ msgid "Meshes" msgstr "網格" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Ensure Tangents" -msgstr "修改曲線切線" +msgstr "確保切線" #: editor/import/resource_importer_scene.cpp msgid "Light Baking" msgstr "光照烘焙" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Lightmap Texel Size" -msgstr "烘焙光照圖" +msgstr "光照圖紋理元素大小" #: editor/import/resource_importer_scene.cpp modules/gltf/gltf_state.cpp msgid "Skins" msgstr "Skin" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Use Named Skins" -msgstr "使用縮放吸附" +msgstr "使用命名 Skin" #: editor/import/resource_importer_scene.cpp msgid "External Files" @@ -6961,9 +6944,8 @@ msgid "Filter Script" msgstr "篩選腳本" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Keep Custom Tracks" -msgstr "變換" +msgstr "保留自定軌道" #: editor/import/resource_importer_scene.cpp msgid "Optimizer" @@ -8769,7 +8751,7 @@ msgstr "縮放模式" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Shift: Scale proportionally." -msgstr "" +msgstr "Shift：按比例縮放。" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -9287,11 +9269,11 @@ msgstr "漸層編輯" #: editor/plugins/gradient_texture_2d_editor_plugin.cpp msgid "Swap GradientTexture2D Fill Points" -msgstr "" +msgstr "交換 GradientTexture2D 的填充點" #: editor/plugins/gradient_texture_2d_editor_plugin.cpp msgid "Swap Gradient Fill Points" -msgstr "" +msgstr "交換 Gradient 填充點" #: editor/plugins/gradient_texture_2d_editor_plugin.cpp msgid "Toggle Grid Snap" @@ -10096,7 +10078,7 @@ msgstr "同步骨骼到多邊形" #: editor/plugins/ray_cast_2d_editor_plugin.cpp msgid "Set cast_to" -msgstr "" +msgstr "設定 cast_to" #: editor/plugins/resource_preloader_editor_plugin.cpp msgid "ERROR: Couldn't load resource!" @@ -10425,7 +10407,7 @@ msgstr "搜尋結果" #: editor/plugins/script_editor_plugin.cpp msgid "Open Dominant Script On Scene Change" -msgstr "" +msgstr "場景更改時開啟主腳本" #: editor/plugins/script_editor_plugin.cpp msgid "External" @@ -10449,7 +10431,7 @@ msgstr "強調顯示目前的腳本" #: editor/plugins/script_editor_plugin.cpp msgid "Script Temperature History Size" -msgstr "" +msgstr "腳本溫度歷史大小" #: editor/plugins/script_editor_plugin.cpp msgid "Current Script Background Color" @@ -10469,7 +10451,7 @@ msgstr "將腳本名稱列為" #: editor/plugins/script_editor_plugin.cpp msgid "Exec Flags" -msgstr "" +msgstr "執行旗標" #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Scripts" @@ -10986,43 +10968,43 @@ msgstr "(不在GLES2中)" #: editor/plugins/spatial_editor_plugin.cpp msgid "" "Debug draw modes are only available when using the GLES3 renderer, not GLES2." -msgstr "除錯繪製模式僅在使用 GLES3 算繪引擎時可用，GLES2 不可用。" +msgstr "除錯繪製模式僅可在 GLES3 算繪引擎下使用，無法在 GLES2 下使用。" #: editor/plugins/spatial_editor_plugin.cpp msgid "Freelook Left" -msgstr "自由視圖 左" +msgstr "自由觀看 左" #: editor/plugins/spatial_editor_plugin.cpp msgid "Freelook Right" -msgstr "自由視圖 右" +msgstr "自由觀看 右" #: editor/plugins/spatial_editor_plugin.cpp msgid "Freelook Forward" -msgstr "自由視圖 前" +msgstr "自由觀看 前" #: editor/plugins/spatial_editor_plugin.cpp msgid "Freelook Backwards" -msgstr "自由視圖 後" +msgstr "自由觀看 後" #: editor/plugins/spatial_editor_plugin.cpp msgid "Freelook Up" -msgstr "自由視圖 上" +msgstr "自由觀看 上" #: editor/plugins/spatial_editor_plugin.cpp msgid "Freelook Down" -msgstr "自由視圖 下" +msgstr "自由觀看 下" #: editor/plugins/spatial_editor_plugin.cpp msgid "Freelook Speed Modifier" -msgstr "加速自由視圖速度" +msgstr "自由觀看速度調整" #: editor/plugins/spatial_editor_plugin.cpp msgid "Freelook Slow Modifier" -msgstr "放慢自由視圖速度" +msgstr "自由觀看減速調整" #: editor/plugins/spatial_editor_plugin.cpp msgid "Toggle Camera Preview" -msgstr "切換相機預覽開關" +msgstr "開啟／關閉相機預覽" #: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" @@ -11031,7 +11013,7 @@ msgstr "視圖旋轉已鎖定" #: editor/plugins/spatial_editor_plugin.cpp msgid "" "To zoom further, change the camera's clipping planes (View -> Settings...)" -msgstr "若要再繼續放大，請至 檢視 -> 設定... 修改攝影機的剪裁平面" +msgstr "若要再繼續放大，請至 [檢視] -> [設定...] 修改攝影機的剪裁平面" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -11278,16 +11260,15 @@ msgstr "後置" #: editor/plugins/spatial_editor_plugin.cpp msgid "Manipulator Gizmo Size" -msgstr "" +msgstr "操縱器控制項大小" #: editor/plugins/spatial_editor_plugin.cpp msgid "Manipulator Gizmo Opacity" -msgstr "" +msgstr "操縱器控制項不透明度" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Show Viewport Rotation Gizmo" -msgstr "鎖定視角旋轉" +msgstr "顯示檢視區的旋轉控制器" #: editor/plugins/spatial_editor_plugin.cpp msgid "Unnamed Gizmo" @@ -11338,9 +11319,8 @@ msgid "Invalid geometry, can't replace by mesh." msgstr "無效的幾何圖形，無法以網格取代。" #: editor/plugins/sprite_editor_plugin.cpp -#, fuzzy msgid "Convert to MeshInstance2D" -msgstr "轉換為 Mesh2D" +msgstr "轉換為 MeshInstance2D" #: editor/plugins/sprite_editor_plugin.cpp msgid "Invalid geometry, can't create polygon." @@ -11443,9 +11423,8 @@ msgid "New Animation" msgstr "新增動畫" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Filter animations" -msgstr "篩選方法" +msgstr "篩選動畫" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Speed:" @@ -11742,9 +11721,8 @@ msgstr "" "確定要關閉嗎？" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Remove Type" -msgstr "移除圖塊" +msgstr "移除型別" #: editor/plugins/theme_editor_plugin.cpp msgid "" @@ -11787,14 +11765,12 @@ msgstr "" "手動加入更多項目於其中或從另一個主題匯入。" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Add Theme Type" -msgstr "新增項目類型" +msgstr "新增主題型別" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Remove Theme Type" -msgstr "移除項目" +msgstr "移除主題型別" #: editor/plugins/theme_editor_plugin.cpp msgid "Add Color Item" @@ -11909,9 +11885,8 @@ msgid "Select Another Theme Resource:" msgstr "選擇其他主題資源：" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Theme Resource" -msgstr "重新命名資源" +msgstr "主題資源" #: editor/plugins/theme_editor_plugin.cpp msgid "Another Theme" @@ -11923,21 +11898,19 @@ msgstr "新增類別" #: editor/plugins/theme_editor_plugin.cpp msgid "Filter the list of types or create a new custom type:" -msgstr "" +msgstr "篩選型別列表，或是建立新的自定型別：" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Available Node-based types:" -msgstr "可用設定檔：" +msgstr "可用之基於節點的型別：" #: editor/plugins/theme_editor_plugin.cpp msgid "Type name is empty!" msgstr "型別名稱為空！" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Are you sure you want to create an empty type?" -msgstr "確定要打開多個專案嗎？" +msgstr "確定要建立空型別嗎？" #: editor/plugins/theme_editor_plugin.cpp msgid "Confirm Item Rename" @@ -11967,14 +11940,12 @@ msgid "Add Item Type" msgstr "新增項目類型" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Set Variation Base Type" -msgstr "設定變數型別" +msgstr "設定變化基礎型別" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Set Base Type" -msgstr "更改基礎型別" +msgstr "設定基礎型別" #: editor/plugins/theme_editor_plugin.cpp msgid "Show Default" @@ -11994,13 +11965,13 @@ msgstr "複寫所有預設類別項目。" #: editor/plugins/theme_editor_plugin.cpp msgid "Select the variation base type from a list of available types." -msgstr "" +msgstr "從可用的型別列表中選擇基礎型別的變化。" #: editor/plugins/theme_editor_plugin.cpp msgid "" "A type associated with a built-in class cannot be marked as a variation of " "another type." -msgstr "" +msgstr "與內建型別相關聯的型別無法被標記為另一個型別的變化。" #: editor/plugins/theme_editor_plugin.cpp msgid "Theme:" @@ -12235,55 +12206,46 @@ msgid "Clear Transform" msgstr "清除變換" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Tile Map" -msgstr "繪製圖塊地圖" +msgstr "圖塊地圖" #: editor/plugins/tile_map_editor_plugin.cpp #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Palette Min Width" -msgstr "" +msgstr "調色盤最小寬度" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Palette Item H Separation" -msgstr "帶名稱的分隔線" +msgstr "調色盤項目的水平分隔線" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Show Tile Names" -msgstr "顯示所有地區" +msgstr "顯示圖塊名稱" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Show Tile Ids" -msgstr "顯示尺規" +msgstr "顯示圖塊 ID" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Sort Tiles By Name" -msgstr "檔案排序" +msgstr "以名稱排序圖塊" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Bucket Fill Preview" -msgstr "油漆桶填滿" +msgstr "油漆桶填充預覽" #: editor/plugins/tile_map_editor_plugin.cpp #: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy msgid "Editor Side" -msgstr "編輯器" +msgstr "編輯器側欄" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Display Grid" -msgstr "顯示過度繪圖" +msgstr "顯示柵欄" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Axis Color" -msgstr "選擇顏色" +msgstr "座標軸顏色" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Add Texture(s) to TileSet." @@ -12616,7 +12578,6 @@ msgid "This property can't be changed." msgstr "該屬性無法修改。" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Snap Options" msgstr "吸附選項" @@ -12645,9 +12606,8 @@ msgid "Separation" msgstr "間距" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Selected Tile" -msgstr "選擇" +msgstr "所選圖塊" #: editor/plugins/tile_set_editor_plugin.cpp scene/2d/cpu_particles_2d.cpp #: scene/2d/light_2d.cpp scene/2d/line_2d.cpp scene/2d/mesh_instance_2d.cpp @@ -12656,9 +12616,8 @@ msgstr "選擇" #: scene/gui/nine_patch_rect.cpp scene/gui/texture_rect.cpp #: scene/resources/material.cpp scene/resources/sky.cpp #: scene/resources/style_box.cpp scene/resources/visual_shader_nodes.cpp -#, fuzzy msgid "Texture" -msgstr "純文字" +msgstr "紋理貼圖" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Tex Offset" @@ -12672,86 +12631,72 @@ msgstr "材質" #: editor/plugins/tile_set_editor_plugin.cpp scene/2d/canvas_item.cpp #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp scene/resources/style_box.cpp -#, fuzzy msgid "Modulate" -msgstr "填充" +msgstr "調變" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Mode" -msgstr "切換模式" +msgstr "圖塊模式" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Autotile Bitmask Mode" -msgstr "優先模式" +msgstr "自動圖塊的位元遮罩模式" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Subtile Size" msgstr "子圖塊大小" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Subtile Spacing" -msgstr "行間距" +msgstr "自圖塊間距" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Occluder Offset" -msgstr "建立遮光多邊形" +msgstr "遮光偏移" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Navigation Offset" -msgstr "導航模式" +msgstr "導航偏移" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Shape Offset" msgstr "形狀偏移" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Shape Transform" -msgstr "變換" +msgstr "形狀變換" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Selected Collision" -msgstr "碰撞" +msgstr "所選碰撞" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Selected Collision One Way" -msgstr "僅搜尋所選區域" +msgstr "所選碰撞單向" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Selected Collision One Way Margin" -msgstr "碰撞模式" +msgstr "所選碰撞單向外邊距" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Selected Navigation" -msgstr "顯示導航" +msgstr "所選導航" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Selected Occlusion" -msgstr "選擇" +msgstr "所選遮擋" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tileset Script" -msgstr "篩選腳本" +msgstr "圖塊集腳本" #: editor/plugins/tile_set_editor_plugin.cpp msgid "TileSet" msgstr "圖塊集" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "No VCS plugins are available." -msgstr "無可用的版本控制 (VCS) 擴充功能。" +msgstr "無可用的版本控制 (VCS) 外掛。" #: editor/plugins/version_control_editor_plugin.cpp msgid "" @@ -12759,9 +12704,8 @@ msgid "" msgstr "遠端設定是空的。使用網路的VCS功能恐無法運作。" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "No commit message was provided." -msgstr "未提供名稱。" +msgstr "未提供認可 (Commit) 訊息。" #: editor/plugins/version_control_editor_plugin.cpp msgid "Commit" @@ -12792,14 +12736,12 @@ msgid "Do you want to remove the %s branch?" msgstr "你確定要移除 %s 分支？" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Do you want to remove the %s remote?" -msgstr "確定要打開多個專案嗎？" +msgstr "確定要移除遠端「%s」？" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Apply" -msgstr "套用重設" +msgstr "套用" #: editor/plugins/version_control_editor_plugin.cpp msgid "Version Control System" @@ -12810,9 +12752,8 @@ msgid "Initialize" msgstr "初始化" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Remote Login" -msgstr "移除控制點" +msgstr "遠端登入" #: editor/plugins/version_control_editor_plugin.cpp msgid "Select SSH public key path" @@ -12843,55 +12784,48 @@ msgid "Unstage all changes" msgstr "撤銷暫存所有變更" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Commit Message" -msgstr "提交改動" +msgstr "認可 (Commit) 訊息" #: editor/plugins/version_control_editor_plugin.cpp msgid "Commit Changes" msgstr "提交改動" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Commit List" -msgstr "提交" +msgstr "認可列表" #: editor/plugins/version_control_editor_plugin.cpp msgid "Commit list size" -msgstr "簽入列表大小" +msgstr "認可列表大小" #: editor/plugins/version_control_editor_plugin.cpp msgid "Branches" msgstr "分支" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Create New Branch" -msgstr "建立新專案" +msgstr "建立分支" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Remove Branch" -msgstr "刪除動畫軌" +msgstr "移除分支" #: editor/plugins/version_control_editor_plugin.cpp msgid "Branch Name" msgstr "分支名稱" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Remotes" msgstr "遠端" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Create New Remote" -msgstr "建立新專案" +msgstr "建立遠端" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Remove Remote" -msgstr "移除項目" +msgstr "移除遠端" #: editor/plugins/version_control_editor_plugin.cpp msgid "Remote Name" @@ -12903,15 +12837,15 @@ msgstr "遠端網址" #: editor/plugins/version_control_editor_plugin.cpp msgid "Fetch" -msgstr "提取" +msgstr "截取 (Fetch)" #: editor/plugins/version_control_editor_plugin.cpp msgid "Pull" -msgstr "拉送" +msgstr "提取 (Pull)" #: editor/plugins/version_control_editor_plugin.cpp msgid "Push" -msgstr "推送" +msgstr "推送 (Push)" #: editor/plugins/version_control_editor_plugin.cpp msgid "Force Push" @@ -12919,7 +12853,7 @@ msgstr "強制推送" #: editor/plugins/version_control_editor_plugin.cpp msgid "Modified" -msgstr "已修改" +msgstr "修改" #: editor/plugins/version_control_editor_plugin.cpp msgid "Renamed" @@ -12927,11 +12861,11 @@ msgstr "重新命名" #: editor/plugins/version_control_editor_plugin.cpp msgid "Deleted" -msgstr "已刪除" +msgstr "刪除" #: editor/plugins/version_control_editor_plugin.cpp msgid "Typechange" -msgstr "格式更改" +msgstr "更改型別" #: editor/plugins/version_control_editor_plugin.cpp msgid "Unmerged" @@ -12942,14 +12876,12 @@ msgid "View:" msgstr "檢視：" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Split" -msgstr "拆分路徑" +msgstr "分割" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Unified" -msgstr "已修改" +msgstr "合併" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "(GLES3 only)" @@ -13806,11 +13738,11 @@ msgstr "可執行" #: editor/project_export.cpp msgid "Export the project for all the presets defined." -msgstr "" +msgstr "使用每個已定義的預設設定來匯出該專案。" #: editor/project_export.cpp msgid "All presets must have an export path defined for Export All to work." -msgstr "" +msgstr "所有預設設定都必須定義好匯出路徑，才可使用 [匯出全部] 功能。" #: editor/project_export.cpp msgid "Delete preset '%s'?" @@ -13921,11 +13853,12 @@ msgid "" "Note: Encryption key needs to be stored in the binary,\n" "you need to build the export templates from source." msgstr "" +"注意：加密金鑰必須以二進位形式保存，\n" +"必須從原始碼來編譯匯出樣板。" #: editor/project_export.cpp -#, fuzzy msgid "More Info..." -msgstr "移動至..." +msgstr "更多資訊..." #: editor/project_export.cpp msgid "Export PCK/Zip..." @@ -13952,18 +13885,16 @@ msgid "ZIP File" msgstr "ZIP 檔案" #: editor/project_export.cpp -#, fuzzy msgid "Godot Project Pack" -msgstr "Godot 遊戲包" +msgstr "Godot 專案包" #: editor/project_export.cpp msgid "Export templates for this platform are missing:" msgstr "缺少匯出該平台用的樣板：" #: editor/project_export.cpp -#, fuzzy msgid "Project Export" -msgstr "專案發起人" +msgstr "專案匯出" #: editor/project_export.cpp msgid "Manage Export Templates" @@ -14263,7 +14194,6 @@ msgstr "" #. TRANSLATORS: This refers to the application where users manage their Godot projects. #: editor/project_manager.cpp -#, fuzzy msgctxt "Application" msgid "Project Manager" msgstr "專案管理員" @@ -15007,6 +14937,9 @@ msgid "" "To save this branch into its own scene, open the original scene, right click " "on this branch, and select \"Save Branch as Scene\"." msgstr "" +"無法保存分支，該分支是已實體化場景的子項目。\n" +"若要將該分支保存進獨立的場景中，請開啟原始場景，並在該分支上點擊右鍵，然後選" +"擇 [將分支保存為場景]。" #: editor/scene_tree_dock.cpp msgid "" @@ -15014,6 +14947,9 @@ msgid "" "To save this branch into its own scene, open the original scene, right click " "on this branch, and select \"Save Branch as Scene\"." msgstr "" +"無法保存分支，該分支是繼承場景的一部分。\n" +"若要將該分支保存為獨立的場景，請開啟原始場景，並在該分支上點擊右鍵，然後選擇 " +"[將分支保存為場景]。" #: editor/scene_tree_dock.cpp msgid "Save New Scene As..." @@ -15039,7 +14975,7 @@ msgstr "轉為本地" #: editor/scene_tree_dock.cpp editor/scene_tree_editor.cpp msgid "Another node already uses this unique name in the scene." -msgstr "" +msgstr "另一個節點已在該場景中使用了這個不可重複的名稱。" #: editor/scene_tree_dock.cpp msgid "Enable Scene Unique Name" @@ -15121,7 +15057,7 @@ msgstr "子資源" #: editor/scene_tree_dock.cpp msgid "Access as Scene Unique Name" -msgstr "" +msgstr "以不重複的場景名稱來存取" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -15216,18 +15152,16 @@ msgid "Clear Inheritance? (No Undo!)" msgstr "確定要清除繼承嗎？（無法復原！）" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Show Scene Tree Root Selection" -msgstr "置中所選" +msgstr "顯示場景樹的根選擇" #: editor/scene_tree_dock.cpp msgid "Derive Script Globals By Name" -msgstr "" +msgstr "依照名稱來推斷腳本的全域變數" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Use Favorites Root Selection" -msgstr "完整顯示所選" +msgstr "使用我的最愛根選擇" #: editor/scene_tree_editor.cpp msgid "Toggle Visible" @@ -15255,6 +15189,8 @@ msgid "" "with the '%s' prefix in a node path.\n" "Click to disable this." msgstr "" +"該節點可在此場景中的任何地方通過在節點路徑前方加上「%s」前置詞來存取。\n" +"點擊以禁用。" #: editor/scene_tree_editor.cpp msgid "" @@ -15537,21 +15473,20 @@ msgid "Stack Frames" msgstr "堆疊框" #: editor/script_editor_debugger.cpp -#, fuzzy msgid "Filter stack variables" -msgstr "篩選圖塊" +msgstr "篩選堆疊變數" #: editor/script_editor_debugger.cpp msgid "Auto Switch To Remote Scene Tree" -msgstr "" +msgstr "自動切換至遠端場景樹" #: editor/script_editor_debugger.cpp msgid "Remote Scene Tree Refresh Interval" -msgstr "" +msgstr "遠端場景樹重新整理間隔" #: editor/script_editor_debugger.cpp msgid "Remote Inspect Refresh Interval" -msgstr "" +msgstr "遠端檢查重新整理間隔" #: editor/script_editor_debugger.cpp msgid "Network Profiler" @@ -15649,7 +15584,7 @@ msgstr "更改光照半徑" #: editor/spatial_editor_gizmos.cpp msgid "Stream Player 3D" -msgstr "" +msgstr "StreamPlayer3D" #: editor/spatial_editor_gizmos.cpp msgid "Change AudioStreamPlayer3D Emission Angle" @@ -15659,7 +15594,7 @@ msgstr "更改 AudioStreamPlayer3D 發射角" #: platform/osx/export/export.cpp #: scene/resources/default_theme/default_theme.cpp msgid "Camera" -msgstr "" +msgstr "相機" #: editor/spatial_editor_gizmos.cpp msgid "Change Camera FOV" @@ -15671,7 +15606,7 @@ msgstr "更改相機尺寸" #: editor/spatial_editor_gizmos.cpp msgid "Visibility Notifier" -msgstr "" +msgstr "VisibilityNotifier" #: editor/spatial_editor_gizmos.cpp msgid "Change Notifier AABB" @@ -15682,23 +15617,20 @@ msgid "Change Particles AABB" msgstr "更改粒子 AABB" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Reflection Probe" -msgstr "選擇屬性" +msgstr "反射探查" #: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "更改探查範圍" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "GI Probe" -msgstr "烘焙 GI 探查" +msgstr "GI 探查" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Baked Indirect Light" -msgstr "非向性光照" +msgstr "烘焙間接光照" #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp msgid "Change Sphere Shape Radius" @@ -15729,14 +15661,12 @@ msgid "Change Ray Shape Length" msgstr "更改射線形長度" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Navigation Edge" -msgstr "導航模式" +msgstr "導航邊界" #: editor/spatial_editor_gizmos.cpp -#, fuzzy msgid "Navigation Edge Disabled" -msgstr "導航模式" +msgstr "已禁用導航邊界" #: editor/spatial_editor_gizmos.cpp #, fuzzy @@ -19984,15 +19914,15 @@ msgstr "找不到金鑰儲存區，無法匯出。" #: platform/windows/export/export.cpp msgid "" -"Could not start rcedit executable, configure rcedit path in the Editor " -"Settings (Export > Windows > Rcedit)." +"Could not start rcedit executable. Configure rcedit path in the Editor " +"Settings (Export > Windows > Rcedit), or disable \"Application > Modify " +"Resources\" in the export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"rcedit failed to modify executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "rcedit failed to modify executable: %s." +msgstr "無效的副檔名。" #: platform/windows/export/export.cpp #, fuzzy @@ -20015,15 +19945,15 @@ msgstr "無效的名稱。" #: platform/windows/export/export.cpp msgid "" -"Could not start signtool executable, configure signtool path in the Editor " -"Settings (Export > Windows > Signtool)." +"Could not start signtool executable. Configure signtool path in the Editor " +"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the " +"export preset." msgstr "" #: platform/windows/export/export.cpp -msgid "" -"Signtool failed to sign executable:\n" -"%s" -msgstr "" +#, fuzzy +msgid "Signtool failed to sign executable: %s." +msgstr "無效的副檔名。" #: platform/windows/export/export.cpp msgid "Failed to remove temporary file \"%s\"." @@ -26646,9 +26576,8 @@ msgid "Normal Texture" msgstr "法線紋理貼圖" #: scene/resources/particles_material.cpp -#, fuzzy msgid "Color Texture" -msgstr "編輯器主題" +msgstr "顏色紋理貼圖" #: scene/resources/particles_material.cpp #, fuzzy |
