diff options
Diffstat (limited to 'editor')
137 files changed, 2541 insertions, 1861 deletions
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index c8f7e88082..ddd702fc6c 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -122,7 +122,7 @@ void FindReplaceBar::_unhandled_input(const Ref<InputEvent> &p_event) { bool accepted = true; - switch (k->get_scancode()) { + switch (k->get_keycode()) { case KEY_ESCAPE: { @@ -1257,7 +1257,7 @@ void CodeTextEditor::clone_lines_down() { text_editor->cursor_set_line(cursor_new_line); text_editor->cursor_set_column(cursor_new_column); if (selection_active) { - text_editor->select(to_line, to_column, 2 * to_line - from_line, 2 * to_column - from_column); + text_editor->select(to_line, to_column, 2 * to_line - from_line, to_line == from_line ? 2 * to_column - from_column : to_column); } text_editor->end_complex_operation(); diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index bb59ddad46..3e09a9a760 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -127,10 +127,10 @@ void CreateDialog::_text_changed(const String &p_newtext) { void CreateDialog::_sbox_input(const Ref<InputEvent> &p_ie) { Ref<InputEventKey> k = p_ie; - if (k.is_valid() && (k->get_scancode() == KEY_UP || - k->get_scancode() == KEY_DOWN || - k->get_scancode() == KEY_PAGEUP || - k->get_scancode() == KEY_PAGEDOWN)) { + if (k.is_valid() && (k->get_keycode() == KEY_UP || + k->get_keycode() == KEY_DOWN || + k->get_keycode() == KEY_PAGEUP || + k->get_keycode() == KEY_PAGEDOWN)) { search_options->call("_gui_input", k); search_box->accept_event(); diff --git a/editor/debugger/editor_debugger_inspector.cpp b/editor/debugger/editor_debugger_inspector.cpp index 6ada212323..9587daf93e 100644 --- a/editor/debugger/editor_debugger_inspector.cpp +++ b/editor/debugger/editor_debugger_inspector.cpp @@ -30,8 +30,8 @@ #include "editor_debugger_inspector.h" +#include "core/debugger/debugger_marshalls.h" #include "core/io/marshalls.h" -#include "core/script_debugger_remote.h" #include "editor/editor_node.h" #include "scene/debugger/scene_debugger.h" @@ -91,6 +91,7 @@ EditorDebuggerInspector::EditorDebuggerInspector() { } EditorDebuggerInspector::~EditorDebuggerInspector() { + clear_cache(); memdelete(variables); } @@ -225,7 +226,7 @@ Object *EditorDebuggerInspector::get_object(ObjectID p_id) { void EditorDebuggerInspector::add_stack_variable(const Array &p_array) { - ScriptDebuggerRemote::ScriptStackVariable var; + DebuggerMarshalls::ScriptStackVariable var; var.deserialize(p_array); String n = var.name; Variant v = var.value; diff --git a/editor/debugger/editor_debugger_node.cpp b/editor/debugger/editor_debugger_node.cpp index fba86f2954..f4a8102b79 100644 --- a/editor/debugger/editor_debugger_node.cpp +++ b/editor/debugger/editor_debugger_node.cpp @@ -31,9 +31,12 @@ #include "editor_debugger_node.h" #include "editor/debugger/editor_debugger_tree.h" +#include "editor/debugger/script_editor_debugger.h" #include "editor/editor_log.h" #include "editor/editor_node.h" #include "editor/plugins/script_editor_plugin.h" +#include "scene/gui/menu_button.h" +#include "scene/gui/tab_container.h" template <typename Func> void _for_all(TabContainer *p_node, const Func &p_func) { @@ -49,7 +52,6 @@ EditorDebuggerNode *EditorDebuggerNode::singleton = NULL; EditorDebuggerNode::EditorDebuggerNode() { if (!singleton) singleton = this; - server.instance(); add_constant_override("margin_left", -EditorNode::get_singleton()->get_gui_base()->get_stylebox("BottomPanelDebuggerOverride", "EditorStyles")->get_margin(MARGIN_LEFT)); add_constant_override("margin_right", -EditorNode::get_singleton()->get_gui_base()->get_stylebox("BottomPanelDebuggerOverride", "EditorStyles")->get_margin(MARGIN_RIGHT)); @@ -179,10 +181,9 @@ Error EditorDebuggerNode::start() { EditorNode::get_singleton()->make_bottom_panel_item_visible(this); } - int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port"); - const Error err = server->listen(remote_port); + server = Ref<EditorDebuggerServer>(EditorDebuggerServer::create_default()); + const Error err = server->start(); if (err != OK) { - EditorNode::get_log()->add_message(String("Error listening on port ") + itos(remote_port), EditorLog::MSG_TYPE_ERROR); return err; } set_process(true); @@ -191,9 +192,10 @@ Error EditorDebuggerNode::start() { } void EditorDebuggerNode::stop() { - if (server->is_listening()) { + if (server.is_valid()) { server->stop(); EditorNode::get_log()->add_message("--- Debugging process stopped ---", EditorLog::MSG_TYPE_EDITOR); + server.unref(); } // Also close all debugging sessions. _for_all(tabs, [&](ScriptEditorDebugger *dbg) { @@ -231,9 +233,15 @@ void EditorDebuggerNode::_notification(int p_what) { break; } - if (p_what != NOTIFICATION_PROCESS || !server->is_listening()) + if (p_what != NOTIFICATION_PROCESS || !server.is_valid()) return; + if (!server.is_valid() || !server->is_active()) { + stop(); + return; + } + server->poll(); + // Errors and warnings int error_count = 0; int warning_count = 0; @@ -293,9 +301,8 @@ void EditorDebuggerNode::_notification(int p_what) { if (tabs->get_tab_count() <= 4) { // Max 4 debugging sessions active. debugger = _add_debugger(); } else { - // We already have too many sessions, disconnecting new clients to prevent it from hanging. - // (Not keeping a reference to the connection will disconnect it) - server->take_connection(); + // We already have too many sessions, disconnecting new clients to prevent them from hanging. + server->take_connection()->close(); return; // Can't add, stop here. } } @@ -462,6 +469,26 @@ void EditorDebuggerNode::reload_scripts() { }); } +void EditorDebuggerNode::debug_next() { + get_default_debugger()->debug_next(); +} + +void EditorDebuggerNode::debug_step() { + get_default_debugger()->debug_step(); +} + +void EditorDebuggerNode::debug_break() { + get_default_debugger()->debug_break(); +} + +void EditorDebuggerNode::debug_continue() { + get_default_debugger()->debug_continue(); +} + +String EditorDebuggerNode::get_var_value(const String &p_var) const { + return get_default_debugger()->get_var_value(p_var); +} + // LiveEdit/Inspector void EditorDebuggerNode::request_remote_tree() { get_current_debugger()->request_remote_tree(); diff --git a/editor/debugger/editor_debugger_node.h b/editor/debugger/editor_debugger_node.h index 13a1d6dcb3..6181ccdb5f 100644 --- a/editor/debugger/editor_debugger_node.h +++ b/editor/debugger/editor_debugger_node.h @@ -31,17 +31,30 @@ #ifndef EDITOR_DEBUGGER_NODE_H #define EDITOR_DEBUGGER_NODE_H -#include "core/io/tcp_server.h" -#include "editor/debugger/script_editor_debugger.h" -#include "scene/gui/button.h" -#include "scene/gui/tab_container.h" +#include "editor/debugger/editor_debugger_server.h" +#include "scene/gui/margin_container.h" +class Button; class EditorDebuggerTree; +class EditorDebuggerRemoteObject; +class MenuButton; +class ScriptEditorDebugger; +class TabContainer; class EditorDebuggerNode : public MarginContainer { GDCLASS(EditorDebuggerNode, MarginContainer); +public: + enum CameraOverride { + OVERRIDE_NONE, + OVERRIDE_2D, + OVERRIDE_3D_1, // 3D Viewport 1 + OVERRIDE_3D_2, // 3D Viewport 2 + OVERRIDE_3D_3, // 3D Viewport 3 + OVERRIDE_3D_4 // 3D Viewport 4 + }; + private: enum Options { DEBUG_NEXT, @@ -71,7 +84,7 @@ private: } }; - Ref<TCP_Server> server = NULL; + Ref<EditorDebuggerServer> server; TabContainer *tabs = NULL; Button *debugger_button = NULL; MenuButton *script_menu = NULL; @@ -87,7 +100,7 @@ private: bool auto_switch_remote_scene_tree = false; bool debug_with_external_editor = false; bool hide_on_stop = true; - ScriptEditorDebugger::CameraOverride camera_override = ScriptEditorDebugger::OVERRIDE_NONE; + CameraOverride camera_override = OVERRIDE_NONE; Map<Breakpoint, bool> breakpoints; ScriptEditorDebugger *_add_debugger(); @@ -130,10 +143,10 @@ public: ScriptEditorDebugger *get_default_debugger() const; ScriptEditorDebugger *get_debugger(int p_debugger) const; - void debug_next() { get_default_debugger()->debug_next(); } - void debug_step() { get_default_debugger()->debug_step(); } - void debug_break() { get_default_debugger()->debug_break(); } - void debug_continue() { get_default_debugger()->debug_continue(); } + void debug_next(); + void debug_step(); + void debug_break(); + void debug_continue(); void set_script_debug_button(MenuButton *p_button); @@ -141,7 +154,7 @@ public: debugger_button = p_button; } - String get_var_value(const String &p_var) const { return get_default_debugger()->get_var_value(p_var); } + String get_var_value(const String &p_var) const; Ref<Script> get_dump_stack_script() const { return stack_script; } // Why do we need this? bool get_debug_with_external_editor() { return debug_with_external_editor; } @@ -167,8 +180,8 @@ public: void live_debug_reparent_node(const NodePath &p_at, const NodePath &p_new_place, const String &p_new_name, int p_at_pos); // Camera - void set_camera_override(ScriptEditorDebugger::CameraOverride p_override) { camera_override = p_override; } - ScriptEditorDebugger::CameraOverride get_camera_override() { return camera_override; } + void set_camera_override(CameraOverride p_override) { camera_override = p_override; } + CameraOverride get_camera_override() { return camera_override; } Error start(); diff --git a/editor/debugger/editor_debugger_server.cpp b/editor/debugger/editor_debugger_server.cpp new file mode 100644 index 0000000000..c80988a662 --- /dev/null +++ b/editor/debugger/editor_debugger_server.cpp @@ -0,0 +1,90 @@ +/*************************************************************************/ +/* editor_debugger_server.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 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_debugger_server.h" + +#include "core/io/marshalls.h" +#include "core/io/tcp_server.h" +#include "core/os/mutex.h" +#include "core/os/thread.h" +#include "editor/editor_log.h" +#include "editor/editor_node.h" +#include "editor/editor_settings.h" + +class EditorDebuggerServerTCP : public EditorDebuggerServer { + +private: + Ref<TCP_Server> server; + +public: + virtual void poll() {} + virtual Error start(); + virtual void stop(); + virtual bool is_active() const; + virtual bool is_connection_available() const; + virtual Ref<RemoteDebuggerPeer> take_connection(); + + EditorDebuggerServerTCP(); +}; + +EditorDebuggerServerTCP::EditorDebuggerServerTCP() { + server.instance(); +} + +Error EditorDebuggerServerTCP::start() { + int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port"); + const Error err = server->listen(remote_port); + if (err != OK) { + EditorNode::get_log()->add_message(String("Error listening on port ") + itos(remote_port), EditorLog::MSG_TYPE_ERROR); + return err; + } + return err; +} + +void EditorDebuggerServerTCP::stop() { + server->stop(); +} + +bool EditorDebuggerServerTCP::is_active() const { + return server->is_listening(); +} + +bool EditorDebuggerServerTCP::is_connection_available() const { + return server->is_listening() && server->is_connection_available(); +} + +Ref<RemoteDebuggerPeer> EditorDebuggerServerTCP::take_connection() { + ERR_FAIL_COND_V(!is_connection_available(), Ref<RemoteDebuggerPeer>()); + return memnew(RemoteDebuggerPeerTCP(server->take_connection())); +} + +EditorDebuggerServer *EditorDebuggerServer::create_default() { + return memnew(EditorDebuggerServerTCP); +} diff --git a/editor/debugger/editor_debugger_server.h b/editor/debugger/editor_debugger_server.h new file mode 100644 index 0000000000..e9798c90b3 --- /dev/null +++ b/editor/debugger/editor_debugger_server.h @@ -0,0 +1,49 @@ +/*************************************************************************/ +/* editor_debugger_server.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 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_DEBUGGER_CONNECTION_H +#define EDITOR_DEBUGGER_CONNECTION_H + +#include "core/debugger/remote_debugger_peer.h" +#include "core/reference.h" + +class EditorDebuggerServer : public Reference { + +public: + static EditorDebuggerServer *create_default(); + virtual void poll() = 0; + virtual Error start() = 0; + virtual void stop() = 0; + virtual bool is_active() const = 0; + virtual bool is_connection_available() const = 0; + virtual Ref<RemoteDebuggerPeer> take_connection() = 0; +}; + +#endif // EDITOR_DEBUGGER_CONNECTION_H diff --git a/editor/editor_network_profiler.cpp b/editor/debugger/editor_network_profiler.cpp index a9ef21bb87..21ef66d1aa 100644 --- a/editor/editor_network_profiler.cpp +++ b/editor/debugger/editor_network_profiler.cpp @@ -31,8 +31,8 @@ #include "editor_network_profiler.h" #include "core/os/os.h" -#include "editor_scale.h" -#include "editor_settings.h" +#include "editor/editor_scale.h" +#include "editor/editor_settings.h" void EditorNetworkProfiler::_bind_methods() { ADD_SIGNAL(MethodInfo("enable_profiling", PropertyInfo(Variant::BOOL, "enable"))); @@ -58,7 +58,7 @@ void EditorNetworkProfiler::_update_frame() { TreeItem *root = counters_display->create_item(); - for (Map<ObjectID, MultiplayerAPI::ProfilingInfo>::Element *E = nodes_data.front(); E; E = E->next()) { + for (Map<ObjectID, DebuggerMarshalls::MultiplayerNodeInfo>::Element *E = nodes_data.front(); E; E = E->next()) { TreeItem *node = counters_display->create_item(root); @@ -95,7 +95,7 @@ void EditorNetworkProfiler::_clear_pressed() { } } -void EditorNetworkProfiler::add_node_frame_data(const MultiplayerAPI::ProfilingInfo p_frame) { +void EditorNetworkProfiler::add_node_frame_data(const DebuggerMarshalls::MultiplayerNodeInfo p_frame) { if (!nodes_data.has(p_frame.node)) { nodes_data.insert(p_frame.node, p_frame); diff --git a/editor/editor_network_profiler.h b/editor/debugger/editor_network_profiler.h index 680131c288..f532dc5dd0 100644 --- a/editor/editor_network_profiler.h +++ b/editor/debugger/editor_network_profiler.h @@ -31,6 +31,7 @@ #ifndef EDITORNETWORKPROFILER_H #define EDITORNETWORKPROFILER_H +#include "core/debugger/debugger_marshalls.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/label.h" @@ -50,7 +51,7 @@ private: Timer *frame_delay; - Map<ObjectID, MultiplayerAPI::ProfilingInfo> nodes_data; + Map<ObjectID, DebuggerMarshalls::MultiplayerNodeInfo> nodes_data; void _update_frame(); @@ -62,7 +63,7 @@ protected: static void _bind_methods(); public: - void add_node_frame_data(const MultiplayerAPI::ProfilingInfo p_frame); + void add_node_frame_data(const DebuggerMarshalls::MultiplayerNodeInfo p_frame); void set_bandwidth(int p_incoming, int p_outgoing); bool is_profiling(); diff --git a/editor/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index 64b633e656..2f3ad210b2 100644 --- a/editor/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -31,8 +31,8 @@ #include "editor_profiler.h" #include "core/os/os.h" -#include "editor_scale.h" -#include "editor_settings.h" +#include "editor/editor_scale.h" +#include "editor/editor_settings.h" void EditorProfiler::_make_metric_ptrs(Metric &m) { diff --git a/editor/editor_profiler.h b/editor/debugger/editor_profiler.h index 0a442ddd5c..0a442ddd5c 100644 --- a/editor/editor_profiler.h +++ b/editor/debugger/editor_profiler.h diff --git a/editor/editor_visual_profiler.cpp b/editor/debugger/editor_visual_profiler.cpp index 1999fccddf..52aa418922 100644 --- a/editor/editor_visual_profiler.cpp +++ b/editor/debugger/editor_visual_profiler.cpp @@ -31,8 +31,8 @@ #include "editor_visual_profiler.h" #include "core/os/os.h" -#include "editor_scale.h" -#include "editor_settings.h" +#include "editor/editor_scale.h" +#include "editor/editor_settings.h" void EditorVisualProfiler::add_frame_metric(const Metric &p_metric) { @@ -824,7 +824,7 @@ EditorVisualProfiler::EditorVisualProfiler() { frame_delay->set_wait_time(0.1); frame_delay->set_one_shot(true); add_child(frame_delay); - frame_delay->connect("timeout", callable_mp(this, &EditorVisualProfiler::_update_frame)); + frame_delay->connect("timeout", callable_mp(this, &EditorVisualProfiler::_update_frame), make_binds(false)); plot_delay = memnew(Timer); plot_delay->set_wait_time(0.1); diff --git a/editor/editor_visual_profiler.h b/editor/debugger/editor_visual_profiler.h index 5194c08b96..5194c08b96 100644 --- a/editor/editor_visual_profiler.h +++ b/editor/debugger/editor_visual_profiler.h diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 40c79b08e6..920f4d858a 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -30,21 +30,22 @@ #include "script_editor_debugger.h" +#include "core/debugger/debugger_marshalls.h" #include "core/io/marshalls.h" #include "core/project_settings.h" -#include "core/script_debugger_remote.h" #include "core/ustring.h" +#include "editor/debugger/editor_network_profiler.h" +#include "editor/debugger/editor_profiler.h" +#include "editor/debugger/editor_visual_profiler.h" #include "editor/editor_log.h" -#include "editor/editor_network_profiler.h" #include "editor/editor_node.h" -#include "editor/editor_profiler.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "editor/editor_visual_profiler.h" #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/plugins/spatial_editor_plugin.h" #include "editor/property_editor.h" #include "main/performance.h" +#include "scene/3d/camera.h" #include "scene/debugger/scene_debugger.h" #include "scene/gui/dialogs.h" #include "scene/gui/label.h" @@ -58,12 +59,14 @@ #include "scene/gui/tree.h" #include "scene/resources/packed_scene.h" +using CameraOverride = EditorDebuggerNode::CameraOverride; + void ScriptEditorDebugger::_put_msg(String p_message, Array p_data) { if (is_session_active()) { Array msg; msg.push_back(p_message); msg.push_back(p_data); - ppeer->put_var(msg); + peer->put_message(msg); } } @@ -141,7 +144,7 @@ void ScriptEditorDebugger::save_node(ObjectID p_id, const String &p_file) { Array msg; msg.push_back(p_id); msg.push_back(p_file); - _put_msg("save_node", msg); + _put_msg("scene:save_node", msg); } void ScriptEditorDebugger::_file_selected(const String &p_file) { @@ -183,7 +186,7 @@ void ScriptEditorDebugger::_file_selected(const String &p_file) { void ScriptEditorDebugger::request_remote_tree() { - _put_msg("request_scene_tree", Array()); + _put_msg("scene:request_scene_tree", Array()); } const SceneDebuggerTree *ScriptEditorDebugger::get_remote_tree() { @@ -196,7 +199,7 @@ void ScriptEditorDebugger::update_remote_object(ObjectID p_obj_id, const String msg.push_back(p_obj_id); msg.push_back(p_prop); msg.push_back(p_value); - _put_msg("set_object_property", msg); + _put_msg("scene:set_object_property", msg); } void ScriptEditorDebugger::request_remote_object(ObjectID p_obj_id) { @@ -204,7 +207,7 @@ void ScriptEditorDebugger::request_remote_object(ObjectID p_obj_id) { ERR_FAIL_COND(p_obj_id.is_null()); Array msg; msg.push_back(p_obj_id); - _put_msg("inspect_object", msg); + _put_msg("scene:inspect_object", msg); } Object *ScriptEditorDebugger::get_remote_object(ObjectID p_id) { @@ -226,7 +229,7 @@ void ScriptEditorDebugger::_remote_object_property_updated(ObjectID p_id, const void ScriptEditorDebugger::_video_mem_request() { - _put_msg("request_video_mem", Array()); + _put_msg("core:memory", Array()); } Size2 ScriptEditorDebugger::get_minimum_size() const { @@ -267,36 +270,36 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da emit_signal("breaked", false, false); profiler->set_enabled(true); profiler->disable_seeking(); - } else if (p_msg == "message:set_pid") { + } else if (p_msg == "set_pid") { ERR_FAIL_COND(p_data.size() < 1); remote_pid = p_data[0]; - } else if (p_msg == "message:click_ctrl") { + } else if (p_msg == "scene:click_ctrl") { ERR_FAIL_COND(p_data.size() < 2); clicked_ctrl->set_text(p_data[0]); clicked_ctrl_type->set_text(p_data[1]); - } else if (p_msg == "message:scene_tree") { + } else if (p_msg == "scene:scene_tree") { scene_tree->nodes.clear(); scene_tree->deserialize(p_data); emit_signal("remote_tree_updated"); _update_buttons_state(); - } else if (p_msg == "message:inspect_object") { + } else if (p_msg == "scene:inspect_object") { ObjectID id = inspector->add_object(p_data); if (id.is_valid()) emit_signal("remote_object_updated", id); - } else if (p_msg == "message:video_mem") { + } else if (p_msg == "memory:usage") { vmem_tree->clear(); TreeItem *root = vmem_tree->create_item(); - ScriptDebuggerRemote::ResourceUsage usage; + DebuggerMarshalls::ResourceUsage usage; usage.deserialize(p_data); int total = 0; - for (List<ScriptDebuggerRemote::ResourceInfo>::Element *E = usage.infos.front(); E; E = E->next()) { + for (List<DebuggerMarshalls::ResourceInfo>::Element *E = usage.infos.front(); E; E = E->next()) { TreeItem *it = vmem_tree->create_item(root); String type = E->get().type; @@ -316,7 +319,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da } else if (p_msg == "stack_dump") { - ScriptDebuggerRemote::ScriptStackDump stack; + DebuggerMarshalls::ScriptStackDump stack; stack.deserialize(p_data); stack_dump->clear(); @@ -349,10 +352,10 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da } else if (p_msg == "output") { ERR_FAIL_COND(p_data.size() < 1); - String t = p_data[0]; - EditorNode::get_log()->add_message(t); - - } else if (p_msg == "performance") { + ERR_FAIL_COND(p_data[0].get_type() != Variant::PACKED_STRING_ARRAY); + Vector<String> strings = p_data[0]; + EditorNode::get_log()->add_message(String("\n").join(strings)); + } else if (p_msg == "performance:profile_frame") { Vector<float> p; p.resize(p_data.size()); for (int i = 0; i < p_data.size(); i++) { @@ -385,36 +388,28 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da perf_history.push_front(p); perf_draw->update(); - } else if (p_msg == "visual_profile") { - // TODO check me. - uint64_t frame = p_data[0]; - Vector<String> names = p_data[1]; - Vector<real_t> values = p_data[2]; + } else if (p_msg == "visual:profile_frame") { + DebuggerMarshalls::VisualProfilerFrame frame; + frame.deserialize(p_data); EditorVisualProfiler::Metric metric; - metric.areas.resize(names.size()); - metric.frame_number = frame; + metric.areas.resize(frame.areas.size()); + metric.frame_number = frame.frame_number; metric.valid = true; { EditorVisualProfiler::Metric::Area *areas_ptr = metric.areas.ptrw(); - int metric_count = names.size(); - - const String *rs = names.ptr(); - const real_t *rr = values.ptr(); - - for (int i = 0; i < metric_count; i++) { - - areas_ptr[i].name = rs[i]; - areas_ptr[i].cpu_time = rr[i * 2 + 0]; - areas_ptr[i].gpu_time = rr[i * 2 + 1]; + for (int i = 0; i < frame.areas.size(); i++) { + areas_ptr[i].name = frame.areas[i].name; + areas_ptr[i].cpu_time = frame.areas[i].cpu_msec; + areas_ptr[i].gpu_time = frame.areas[i].gpu_msec; } } visual_profiler->add_frame_metric(metric); } else if (p_msg == "error") { - ScriptDebuggerRemote::OutputError oe; + DebuggerMarshalls::OutputError oe; ERR_FAIL_COND_MSG(oe.deserialize(p_data) == false, "Failed to deserialize error message"); // Format time. @@ -520,15 +515,15 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da else error_count++; - } else if (p_msg == "profile_sig") { + } else if (p_msg == "servers:function_signature") { // Cache a profiler signature. - ScriptDebuggerRemote::ProfilerSignature sig; + DebuggerMarshalls::ScriptFunctionSignature sig; sig.deserialize(p_data); profiler_signature[sig.id] = sig.name; - } else if (p_msg == "profile_frame" || p_msg == "profile_total") { + } else if (p_msg == "servers:profile_frame" || p_msg == "servers:profile_total") { EditorProfiler::Metric metric; - ScriptDebuggerRemote::ProfilerFrame frame; + DebuggerMarshalls::ServersProfilerFrame frame; frame.deserialize(p_data); metric.valid = true; metric.frame_number = frame.frame_number; @@ -536,10 +531,8 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da metric.idle_time = frame.idle_time; metric.physics_time = frame.physics_time; metric.physics_frame_time = frame.physics_frame_time; - int frame_data_amount = frame.frames_data.size(); - int frame_function_amount = frame.frame_functions.size(); - if (frame_data_amount) { + if (frame.servers.size()) { EditorProfiler::Metric::Category frame_time; frame_time.signature = "category_frame_time"; frame_time.name = "Frame Time"; @@ -573,42 +566,42 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da metric.categories.push_back(frame_time); } - for (int i = 0; i < frame_data_amount; i++) { + for (int i = 0; i < frame.servers.size(); i++) { + const DebuggerMarshalls::ServerInfo &srv = frame.servers[i]; EditorProfiler::Metric::Category c; - String name = frame.frames_data[i].name; - Array values = frame.frames_data[i].data; + const String name = srv.name; c.name = name.capitalize(); - c.items.resize(values.size() / 2); + c.items.resize(srv.functions.size()); c.total_time = 0; c.signature = "categ::" + name; - for (int j = 0; j < values.size(); j += 2) { + for (int j = 0; j < srv.functions.size(); j++) { EditorProfiler::Metric::Category::Item item; item.calls = 1; item.line = 0; - item.name = values[j]; - item.self = values[j + 1]; + item.name = srv.functions[j].name; + item.self = srv.functions[j].time; item.total = item.self; item.signature = "categ::" + name + "::" + item.name; item.name = item.name.capitalize(); c.total_time += item.total; - c.items.write[j / 2] = item; + c.items.write[j] = item; } metric.categories.push_back(c); } EditorProfiler::Metric::Category funcs; funcs.total_time = frame.script_time; - funcs.items.resize(frame_function_amount); + funcs.items.resize(frame.script_functions.size()); funcs.name = "Script Functions"; funcs.signature = "script_functions"; - for (int i = 0; i < frame_function_amount; i++) { + for (int i = 0; i < frame.script_functions.size(); i++) { - int signature = frame.frame_functions[i].sig_id; - int calls = frame.frame_functions[i].call_count; - float total = frame.frame_functions[i].total_time; - float self = frame.frame_functions[i].self_time; + int signature = frame.script_functions[i].sig_id; + int calls = frame.script_functions[i].call_count; + float total = frame.script_functions[i].total_time; + float self = frame.script_functions[i].self_time; EditorProfiler::Metric::Category::Item item; if (profiler_signature.has(signature)) { @@ -639,24 +632,28 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da metric.categories.push_back(funcs); - if (p_msg == "profile_frame") + if (p_msg == "servers:profile_frame") profiler->add_frame_metric(metric, false); else profiler->add_frame_metric(metric, true); - } else if (p_msg == "network_profile") { - ScriptDebuggerRemote::NetworkProfilerFrame frame; + } else if (p_msg == "network:profile_frame") { + DebuggerMarshalls::NetworkProfilerFrame frame; frame.deserialize(p_data); for (int i = 0; i < frame.infos.size(); i++) { network_profiler->add_node_frame_data(frame.infos[i]); } - } else if (p_msg == "network_bandwidth") { + + } else if (p_msg == "network:bandwidth") { ERR_FAIL_COND(p_data.size() < 2); network_profiler->set_bandwidth(p_data[0], p_data[1]); - } else if (p_msg == "kill_me") { + } else if (p_msg == "request_quit") { emit_signal("stop_requested"); _stop_and_notify(); + + } else { + WARN_PRINT("unknown message " + p_msg); } } @@ -776,7 +773,7 @@ void ScriptEditorDebugger::_notification(int p_what) { if (is_session_active()) { - if (camera_override == OVERRIDE_2D) { + if (camera_override == CameraOverride::OVERRIDE_2D) { CanvasItemEditor *editor = CanvasItemEditor::get_singleton(); Dictionary state = editor->get_state(); @@ -789,10 +786,10 @@ void ScriptEditorDebugger::_notification(int p_what) { Array msg; msg.push_back(transform); - _put_msg("override_camera_2D:transform", msg); + _put_msg("scene:override_camera_2D:transform", msg); - } else if (camera_override >= OVERRIDE_3D_1) { - int viewport_idx = camera_override - OVERRIDE_3D_1; + } else if (camera_override >= CameraOverride::OVERRIDE_3D_1) { + int viewport_idx = camera_override - CameraOverride::OVERRIDE_3D_1; SpatialEditorViewport *viewport = SpatialEditor::get_singleton()->get_editor_viewport(viewport_idx); Camera *const cam = viewport->get_camera(); @@ -807,34 +804,15 @@ void ScriptEditorDebugger::_notification(int p_what) { } msg.push_back(cam->get_znear()); msg.push_back(cam->get_zfar()); - _put_msg("override_camera_3D:transform", msg); + _put_msg("scene:override_camera_3D:transform", msg); } } - if (!is_session_active()) { - _stop_and_notify(); - break; - }; - - if (ppeer->get_available_packet_count() <= 0) { - break; - }; - const uint64_t until = OS::get_singleton()->get_ticks_msec() + 20; - while (ppeer->get_available_packet_count() > 0) { + while (peer->has_message()) { - Variant cmd; - Error ret = ppeer->get_var(cmd); - if (ret != OK) { - _stop_and_notify(); - ERR_FAIL_MSG("Error decoding variant from peer"); - } - if (cmd.get_type() != Variant::ARRAY) { - _stop_and_notify(); - ERR_FAIL_MSG("Invalid message format received from peer"); - } - Array arr = cmd; + Array arr = peer->get_message(); if (arr.size() != 2 || arr[0].get_type() != Variant::STRING || arr[1].get_type() != Variant::ARRAY) { _stop_and_notify(); ERR_FAIL_MSG("Invalid message format received from peer"); @@ -844,6 +822,10 @@ void ScriptEditorDebugger::_notification(int p_what) { if (OS::get_singleton()->get_ticks_msec() > until) break; } + if (!is_session_active()) { + _stop_and_notify(); + break; + }; } break; case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { @@ -875,14 +857,14 @@ void ScriptEditorDebugger::_clear_execution() { inspector->clear_stack_variables(); } -void ScriptEditorDebugger::start(Ref<StreamPeerTCP> p_connection) { +void ScriptEditorDebugger::start(Ref<RemoteDebuggerPeer> p_peer) { error_count = 0; warning_count = 0; stop(); - connection = p_connection; - ppeer->set_stream_peer(connection); + peer = p_peer; + ERR_FAIL_COND(p_peer.is_null()); perf_history.clear(); for (int i = 0; i < Performance::MONITOR_MAX; i++) { @@ -893,19 +875,11 @@ void ScriptEditorDebugger::start(Ref<StreamPeerTCP> p_connection) { set_process(true); breaked = false; can_debug = true; - camera_override = OVERRIDE_NONE; + camera_override = CameraOverride::OVERRIDE_NONE; tabs->set_current_tab(0); _set_reason_text(TTR("Debug session started."), MESSAGE_SUCCESS); _update_buttons_state(); - - if (profiler->is_profiling()) { - _profiler_activate(true); - } - - if (network_profiler->is_profiling()) { - _network_profiler_activate(true); - } } void ScriptEditorDebugger::_update_buttons_state() { @@ -936,10 +910,10 @@ void ScriptEditorDebugger::stop() { _clear_execution(); inspector->clear_cache(); - ppeer->set_stream_peer(Ref<StreamPeer>()); - if (connection.is_valid()) { - connection.unref(); + if (peer.is_valid()) { + peer->close(); + peer.unref(); reason->set_text(""); reason->set_tooltip(""); } @@ -952,49 +926,31 @@ void ScriptEditorDebugger::stop() { _update_buttons_state(); } -void ScriptEditorDebugger::_profiler_activate(bool p_enable) { - - if (p_enable) { - profiler_signature.clear(); - Array msg; - int max_funcs = EditorSettings::get_singleton()->get("debugger/profiler_frame_max_functions"); - max_funcs = CLAMP(max_funcs, 16, 512); - msg.push_back(max_funcs); - _put_msg("start_profiling", msg); - print_verbose("Starting profiling."); - - } else { - _put_msg("stop_profiling", Array()); - print_verbose("Ending profiling."); - } -} - -void ScriptEditorDebugger::_visual_profiler_activate(bool p_enable) { - - if (!connection.is_valid()) - return; - - if (p_enable) { - profiler_signature.clear(); - _put_msg("start_visual_profiling", Array()); - print_verbose("Starting visual profiling."); - - } else { - _put_msg("stop_visual_profiling", Array()); - print_verbose("Ending visual profiling."); - } -} - -void ScriptEditorDebugger::_network_profiler_activate(bool p_enable) { - - if (p_enable) { - profiler_signature.clear(); - _put_msg("start_network_profiling", Array()); - print_verbose("Starting network profiling."); +void ScriptEditorDebugger::_profiler_activate(bool p_enable, int p_type) { - } else { - _put_msg("stop_network_profiling", Array()); - print_verbose("Ending network profiling."); + Array data; + data.push_back(p_enable); + switch (p_type) { + case PROFILER_NETWORK: + _put_msg("profiler:network", data); + break; + case PROFILER_VISUAL: + _put_msg("profiler:visual", data); + break; + case PROFILER_SCRIPTS_SERVERS: + if (p_enable) { + // Clear old script signatures. (should we move all this into the profiler?) + profiler_signature.clear(); + // Add max funcs options to request. + Array opts; + int max_funcs = EditorSettings::get_singleton()->get("debugger/profiler_frame_max_functions"); + opts.push_back(CLAMP(max_funcs, 16, 512)); + data.push_back(opts); + } + _put_msg("profiler:servers", data); + break; + default: + ERR_FAIL_MSG("Invalid profiler type"); } } @@ -1045,7 +1001,7 @@ int ScriptEditorDebugger::_get_node_path_cache(const NodePath &p_path) { Array msg; msg.push_back(p_path); msg.push_back(last_path_id); - _put_msg("live_node_path", msg); + _put_msg("scene:live_node_path", msg); return last_path_id; } @@ -1063,7 +1019,7 @@ int ScriptEditorDebugger::_get_res_path_cache(const String &p_path) { Array msg; msg.push_back(p_path); msg.push_back(last_path_id); - _put_msg("live_res_path", msg); + _put_msg("scene:live_res_path", msg); return last_path_id; } @@ -1095,7 +1051,7 @@ void ScriptEditorDebugger::_method_changed(Object *p_base, const StringName &p_n //no pointers, sorry msg.push_back(*argptr[i]); } - _put_msg("live_node_call", msg); + _put_msg("scene:live_node_call", msg); return; } @@ -1114,7 +1070,7 @@ void ScriptEditorDebugger::_method_changed(Object *p_base, const StringName &p_n //no pointers, sorry msg.push_back(*argptr[i]); } - _put_msg("live_res_call", msg); + _put_msg("scene:live_res_call", msg); return; } @@ -1140,7 +1096,7 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p msg.push_back(pathid); msg.push_back(p_property); msg.push_back(res->get_path()); - _put_msg("live_node_prop_res", msg); + _put_msg("scene:live_node_prop_res", msg); } } else { @@ -1148,7 +1104,7 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p msg.push_back(pathid); msg.push_back(p_property); msg.push_back(p_value); - _put_msg("live_node_prop", msg); + _put_msg("scene:live_node_prop", msg); } return; @@ -1169,7 +1125,7 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p msg.push_back(pathid); msg.push_back(p_property); msg.push_back(res2->get_path()); - _put_msg("live_res_prop_res", msg); + _put_msg("scene:live_res_prop_res", msg); } } else { @@ -1177,7 +1133,7 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p msg.push_back(pathid); msg.push_back(p_property); msg.push_back(p_value); - _put_msg("live_res_prop", msg); + _put_msg("scene:live_res_prop", msg); } return; @@ -1255,7 +1211,7 @@ void ScriptEditorDebugger::update_live_edit_root() { msg.push_back(editor->get_edited_scene()->get_filename()); else msg.push_back(""); - _put_msg("live_set_root", msg); + _put_msg("scene:live_set_root", msg); live_edit_root->set_text(np); } @@ -1266,7 +1222,7 @@ void ScriptEditorDebugger::live_debug_create_node(const NodePath &p_parent, cons msg.push_back(p_parent); msg.push_back(p_type); msg.push_back(p_name); - _put_msg("live_create_node", msg); + _put_msg("scene:live_create_node", msg); } } @@ -1277,7 +1233,7 @@ void ScriptEditorDebugger::live_debug_instance_node(const NodePath &p_parent, co msg.push_back(p_parent); msg.push_back(p_path); msg.push_back(p_name); - _put_msg("live_instance_node", msg); + _put_msg("scene:live_instance_node", msg); } } void ScriptEditorDebugger::live_debug_remove_node(const NodePath &p_at) { @@ -1285,7 +1241,7 @@ void ScriptEditorDebugger::live_debug_remove_node(const NodePath &p_at) { if (live_debug) { Array msg; msg.push_back(p_at); - _put_msg("live_remove_node", msg); + _put_msg("scene:live_remove_node", msg); } } void ScriptEditorDebugger::live_debug_remove_and_keep_node(const NodePath &p_at, ObjectID p_keep_id) { @@ -1294,7 +1250,7 @@ void ScriptEditorDebugger::live_debug_remove_and_keep_node(const NodePath &p_at, Array msg; msg.push_back(p_at); msg.push_back(p_keep_id); - _put_msg("live_remove_and_keep_node", msg); + _put_msg("scene:live_remove_and_keep_node", msg); } } void ScriptEditorDebugger::live_debug_restore_node(ObjectID p_id, const NodePath &p_at, int p_at_pos) { @@ -1304,7 +1260,7 @@ void ScriptEditorDebugger::live_debug_restore_node(ObjectID p_id, const NodePath msg.push_back(p_id); msg.push_back(p_at); msg.push_back(p_at_pos); - _put_msg("live_restore_node", msg); + _put_msg("scene:live_restore_node", msg); } } void ScriptEditorDebugger::live_debug_duplicate_node(const NodePath &p_at, const String &p_new_name) { @@ -1313,7 +1269,7 @@ void ScriptEditorDebugger::live_debug_duplicate_node(const NodePath &p_at, const Array msg; msg.push_back(p_at); msg.push_back(p_new_name); - _put_msg("live_duplicate_node", msg); + _put_msg("scene:live_duplicate_node", msg); } } void ScriptEditorDebugger::live_debug_reparent_node(const NodePath &p_at, const NodePath &p_new_place, const String &p_new_name, int p_at_pos) { @@ -1324,32 +1280,32 @@ void ScriptEditorDebugger::live_debug_reparent_node(const NodePath &p_at, const msg.push_back(p_new_place); msg.push_back(p_new_name); msg.push_back(p_at_pos); - _put_msg("live_reparent_node", msg); + _put_msg("scene:live_reparent_node", msg); } } -ScriptEditorDebugger::CameraOverride ScriptEditorDebugger::get_camera_override() const { +CameraOverride ScriptEditorDebugger::get_camera_override() const { return camera_override; } void ScriptEditorDebugger::set_camera_override(CameraOverride p_override) { - if (p_override == OVERRIDE_2D && camera_override != OVERRIDE_2D) { + if (p_override == CameraOverride::OVERRIDE_2D && camera_override != CameraOverride::OVERRIDE_2D) { Array msg; msg.push_back(true); - _put_msg("override_camera_2D:set", msg); - } else if (p_override != OVERRIDE_2D && camera_override == OVERRIDE_2D) { + _put_msg("scene:override_camera_2D:set", msg); + } else if (p_override != CameraOverride::OVERRIDE_2D && camera_override == CameraOverride::OVERRIDE_2D) { Array msg; msg.push_back(false); - _put_msg("override_camera_2D:set", msg); - } else if (p_override >= OVERRIDE_3D_1 && camera_override < OVERRIDE_3D_1) { + _put_msg("scene:override_camera_2D:set", msg); + } else if (p_override >= CameraOverride::OVERRIDE_3D_1 && camera_override < CameraOverride::OVERRIDE_3D_1) { Array msg; msg.push_back(true); - _put_msg("override_camera_3D:set", msg); - } else if (p_override < OVERRIDE_3D_1 && camera_override >= OVERRIDE_3D_1) { + _put_msg("scene:override_camera_3D:set", msg); + } else if (p_override < CameraOverride::OVERRIDE_3D_1 && camera_override >= CameraOverride::OVERRIDE_3D_1) { Array msg; msg.push_back(false); - _put_msg("override_camera_3D:set", msg); + _put_msg("scene:override_camera_3D:set", msg); } camera_override = p_override; @@ -1423,7 +1379,6 @@ void ScriptEditorDebugger::_clear_errors_list() { error_tree->clear(); error_count = 0; warning_count = 0; - _notification(NOTIFICATION_PROCESS); } // Right click on specific file(s) or folder(s). @@ -1502,8 +1457,6 @@ void ScriptEditorDebugger::_bind_methods() { ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { - ppeer = Ref<PacketPeerStream>(memnew(PacketPeerStream)); - ppeer->set_input_buffer_max_size((1024 * 1024 * 8) - 4); // 8 MiB should be enough, minus 4 bytes for separator. editor = p_editor; tabs = memnew(TabContainer); @@ -1655,7 +1608,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { profiler = memnew(EditorProfiler); profiler->set_name(TTR("Profiler")); tabs->add_child(profiler); - profiler->connect("enable_profiling", callable_mp(this, &ScriptEditorDebugger::_profiler_activate)); + profiler->connect("enable_profiling", callable_mp(this, &ScriptEditorDebugger::_profiler_activate), varray(PROFILER_SCRIPTS_SERVERS)); profiler->connect("break_request", callable_mp(this, &ScriptEditorDebugger::_profiler_seeked)); } @@ -1663,14 +1616,14 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { visual_profiler = memnew(EditorVisualProfiler); visual_profiler->set_name(TTR("Visual Profiler")); tabs->add_child(visual_profiler); - visual_profiler->connect("enable_profiling", callable_mp(this, &ScriptEditorDebugger::_visual_profiler_activate)); + visual_profiler->connect("enable_profiling", callable_mp(this, &ScriptEditorDebugger::_profiler_activate), varray(PROFILER_VISUAL)); } { //network profiler network_profiler = memnew(EditorNetworkProfiler); network_profiler->set_name(TTR("Network Profiler")); tabs->add_child(network_profiler); - network_profiler->connect("enable_profiling", callable_mp(this, &ScriptEditorDebugger::_network_profiler_activate)); + network_profiler->connect("enable_profiling", callable_mp(this, &ScriptEditorDebugger::_profiler_activate), varray(PROFILER_NETWORK)); } { //monitors @@ -1824,7 +1777,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { add_child(msgdialog); live_debug = true; - camera_override = OVERRIDE_NONE; + camera_override = CameraOverride::OVERRIDE_NONE; last_path_id = false; error_count = 0; warning_count = 0; @@ -1833,8 +1786,9 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { ScriptEditorDebugger::~ScriptEditorDebugger() { - ppeer->set_stream_peer(Ref<StreamPeer>()); - - inspector->clear_cache(); + if (peer.is_valid()) { + peer->close(); + peer.unref(); + } memdelete(scene_tree); } diff --git a/editor/debugger/script_editor_debugger.h b/editor/debugger/script_editor_debugger.h index fd034ba983..e7ce917543 100644 --- a/editor/debugger/script_editor_debugger.h +++ b/editor/debugger/script_editor_debugger.h @@ -31,14 +31,13 @@ #ifndef SCRIPT_EDITOR_DEBUGGER_H #define SCRIPT_EDITOR_DEBUGGER_H -#include "core/io/packet_peer.h" -#include "core/io/stream_peer_tcp.h" +#include "core/os/os.h" #include "editor/debugger/editor_debugger_inspector.h" -#include "editor/editor_inspector.h" -#include "editor/property_editor.h" -#include "scene/3d/camera.h" -#include "scene/gui/box_container.h" +#include "editor/debugger/editor_debugger_node.h" +#include "editor/debugger/editor_debugger_server.h" +#include "editor/editor_file_dialog.h" #include "scene/gui/button.h" +#include "scene/gui/margin_container.h" class Tree; class EditorNode; @@ -61,16 +60,6 @@ class ScriptEditorDebugger : public MarginContainer { friend class EditorDebuggerNode; -public: - enum CameraOverride { - OVERRIDE_NONE, - OVERRIDE_2D, - OVERRIDE_3D_1, // 3D Viewport 1 - OVERRIDE_3D_2, // 3D Viewport 2 - OVERRIDE_3D_3, // 3D Viewport 3 - OVERRIDE_3D_4 // 3D Viewport 4 - }; - private: enum MessageType { MESSAGE_ERROR, @@ -78,6 +67,12 @@ private: MESSAGE_SUCCESS, }; + enum ProfilerType { + PROFILER_NETWORK, + PROFILER_VISUAL, + PROFILER_SCRIPTS_SERVERS + }; + AcceptDialog *msgdialog; LineEdit *clicked_ctrl; @@ -132,8 +127,7 @@ private: EditorDebuggerInspector *inspector; SceneDebuggerTree *scene_tree; - Ref<StreamPeerTCP> connection; - Ref<PacketPeerStream> ppeer; + Ref<RemoteDebuggerPeer> peer; HashMap<NodePath, int> node_path_cache; int last_path_id; @@ -151,7 +145,7 @@ private: bool live_debug; - CameraOverride camera_override; + EditorDebuggerNode::CameraOverride camera_override; void _performance_draw(); void _performance_select(); @@ -183,12 +177,9 @@ private: void _expand_errors_list(); void _collapse_errors_list(); - void _visual_profiler_activate(bool p_enable); - void _profiler_activate(bool p_enable); + void _profiler_activate(bool p_enable, int p_profiler); void _profiler_seeked(); - void _network_profiler_activate(bool p_enable); - void _clear_errors_list(); void _error_tree_item_rmb_selected(const Vector2 &p_pos); @@ -216,7 +207,7 @@ public: void request_remote_tree(); const SceneDebuggerTree *get_remote_tree(); - void start(Ref<StreamPeerTCP> p_connection); + void start(Ref<RemoteDebuggerPeer> p_peer); void stop(); void debug_skip_breakpoints(); @@ -228,7 +219,7 @@ public: void debug_continue(); bool is_breaked() const { return breaked; } bool is_debuggable() const { return can_debug; } - bool is_session_active() { return connection.is_valid() && connection->is_connected_to_host(); }; + bool is_session_active() { return peer.is_valid() && peer->is_peer_connected(); }; int get_remote_pid() const { return remote_pid; } int get_error_count() const { return error_count; } @@ -252,8 +243,8 @@ public: void live_debug_duplicate_node(const NodePath &p_at, const String &p_new_name); void live_debug_reparent_node(const NodePath &p_at, const NodePath &p_new_place, const String &p_new_name, int p_at_pos); - CameraOverride get_camera_override() const; - void set_camera_override(CameraOverride p_override); + EditorDebuggerNode::CameraOverride get_camera_override() const; + void set_camera_override(EditorDebuggerNode::CameraOverride p_override); void set_breakpoint(const String &p_path, int p_line, bool p_enabled); diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 3fd9e3182d..38ff9cd5fc 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -555,9 +555,11 @@ void DocData::generate(bool p_basic_types) { argument_doc_from_arginfo(ad, mi.arguments[j]); ad.name = arginfo.name; - int defarg = mi.default_arguments.size() - mi.arguments.size() + j; - if (defarg >= 0) - ad.default_value = mi.default_arguments[defarg]; + int darg_idx = mi.default_arguments.size() - mi.arguments.size() + j; + if (darg_idx >= 0) { + Variant default_arg = mi.default_arguments[darg_idx]; + ad.default_value = default_arg.get_construct_string(); + } method.arguments.push_back(ad); } @@ -674,7 +676,6 @@ void DocData::generate(bool p_basic_types) { argument_doc_from_arginfo(ad, mi.arguments[j]); int darg_idx = j - (mi.arguments.size() - mi.default_arguments.size()); - if (darg_idx >= 0) { Variant default_arg = E->get().default_arguments[darg_idx]; ad.default_value = default_arg.get_construct_string(); diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 3a216c163f..d77216697e 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -549,7 +549,7 @@ void EditorAudioBus::_effect_add(int p_which) { void EditorAudioBus::_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventKey> k = p_event; - if (k.is_valid() && k->is_pressed() && k->get_scancode() == KEY_DELETE && !k->is_echo()) { + if (k.is_valid() && k->is_pressed() && k->get_keycode() == KEY_DELETE && !k->is_echo()) { accept_event(); emit_signal("delete_request"); } diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index 6262680454..250fa6b3e0 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -199,7 +199,10 @@ Vector<String> EditorFileDialog::get_selected_files() const { void EditorFileDialog::update_dir() { - dir->set_text(dir_access->get_current_dir()); + if (drives->is_visible()) { + drives->select(dir_access->get_current_drive()); + } + dir->set_text(dir_access->get_current_dir(false)); // Disable "Open" button only when selecting file(s) mode. get_ok()->set_disabled(_is_open_should_be_disabled()); @@ -691,7 +694,7 @@ void EditorFileDialog::update_file_name() { String base_name = file_str.get_basename(); Vector<String> filter_substr = filter_str.split(";"); if (filter_substr.size() >= 2) { - file_str = base_name + "." + filter_substr[1].strip_edges().to_lower(); + file_str = base_name + "." + filter_substr[0].strip_edges().lstrip("*.").to_lower(); } else { file_str = base_name + "." + filter_str.get_extension().strip_edges().to_lower(); } @@ -946,7 +949,7 @@ void EditorFileDialog::add_filter(const String &p_filter) { String EditorFileDialog::get_current_dir() const { - return dir->get_text(); + return dir_access->get_current_dir(); } String EditorFileDialog::get_current_file() const { @@ -954,7 +957,7 @@ String EditorFileDialog::get_current_file() const { } String EditorFileDialog::get_current_path() const { - return dir->get_text().plus_file(file->get_text()); + return dir_access->get_current_dir().plus_file(file->get_text()); } void EditorFileDialog::set_current_dir(const String &p_dir) { @@ -1149,6 +1152,12 @@ void EditorFileDialog::_update_drives() { drives->hide(); } else { drives->clear(); + Node *dp = drives->get_parent(); + if (dp) { + dp->remove_child(drives); + } + dp = dir_access->drives_are_shortcuts() ? shortcuts_container : drives_container; + dp->add_child(drives); drives->show(); for (int i = 0; i < dir_access->get_drive_count(); i++) { @@ -1383,6 +1392,7 @@ void EditorFileDialog::_bind_methods() { ClassDB::bind_method(D_METHOD("is_showing_hidden_files"), &EditorFileDialog::is_showing_hidden_files); ClassDB::bind_method(D_METHOD("_update_file_name"), &EditorFileDialog::update_file_name); ClassDB::bind_method(D_METHOD("_update_dir"), &EditorFileDialog::update_dir); + ClassDB::bind_method(D_METHOD("_update_file_list"), &EditorFileDialog::update_file_list); ClassDB::bind_method(D_METHOD("_thumbnail_done"), &EditorFileDialog::_thumbnail_done); ClassDB::bind_method(D_METHOD("set_display_mode", "mode"), &EditorFileDialog::set_display_mode); ClassDB::bind_method(D_METHOD("get_display_mode"), &EditorFileDialog::get_display_mode); @@ -1517,6 +1527,9 @@ EditorFileDialog::EditorFileDialog() { pathhb->add_child(memnew(Label(TTR("Path:")))); + drives_container = memnew(HBoxContainer); + pathhb->add_child(drives_container); + dir = memnew(LineEdit); pathhb->add_child(dir); dir->set_h_size_flags(SIZE_EXPAND_FILL); @@ -1560,8 +1573,10 @@ EditorFileDialog::EditorFileDialog() { mode_list->set_tooltip(TTR("View items as a list.")); pathhb->add_child(mode_list); + shortcuts_container = memnew(HBoxContainer); + pathhb->add_child(shortcuts_container); + drives = memnew(OptionButton); - pathhb->add_child(drives); drives->connect("item_selected", callable_mp(this, &EditorFileDialog::_select_drive)); makedir = memnew(Button); diff --git a/editor/editor_file_dialog.h b/editor/editor_file_dialog.h index 8b48604b31..998ac33761 100644 --- a/editor/editor_file_dialog.h +++ b/editor/editor_file_dialog.h @@ -100,6 +100,8 @@ private: ToolButton *dir_next; ToolButton *dir_up; + HBoxContainer *drives_container; + HBoxContainer *shortcuts_container; OptionButton *drives; ItemList *item_list; PopupMenu *item_menu; diff --git a/editor/editor_folding.cpp b/editor/editor_folding.cpp index 8308cd760b..507a77e641 100644 --- a/editor/editor_folding.cpp +++ b/editor/editor_folding.cpp @@ -133,6 +133,8 @@ void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p } void EditorFolding::save_scene_folding(const Node *p_scene, const String &p_path) { + ERR_FAIL_NULL(p_scene); + FileAccessRef file_check = FileAccess::create(FileAccess::ACCESS_RESOURCES); if (!file_check->file_exists(p_path)) //This can happen when creating scene from FilesystemDock. It has path, but no file. return; diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index db2f9c53d9..171b7a2176 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -256,6 +256,10 @@ void editor_register_fonts(Ref<Theme> p_theme) { MAKE_DEFAULT_FONT(df_rulers, 8 * EDSCALE); p_theme->set_font("rulers", "EditorFonts", df_rulers); + // Rotation widget font + MAKE_DEFAULT_FONT(df_rotation_control, 14 * EDSCALE); + p_theme->set_font("rotation_control", "EditorFonts", df_rotation_control); + // Code font MAKE_SOURCE_FONT(df_code, int(EDITOR_GET("interface/editor/code_font_size")) * EDSCALE); p_theme->set_font("source", "EditorFonts", df_code); diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 00c053e09f..b26fa77e16 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -66,7 +66,7 @@ void EditorHelp::_unhandled_key_input(const Ref<InputEvent> &p_ev) { Ref<InputEventKey> k = p_ev; - if (k.is_valid() && k->get_control() && k->get_scancode() == KEY_F) { + if (k.is_valid() && k->get_control() && k->get_keycode() == KEY_F) { search->grab_focus(); search->select_all(); @@ -1803,7 +1803,7 @@ void FindBar::_unhandled_input(const Ref<InputEvent> &p_event) { bool accepted = true; - switch (k->get_scancode()) { + switch (k->get_keycode()) { case KEY_ESCAPE: { diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp index 8ca308572b..f7ce2dd4fc 100644 --- a/editor/editor_help_search.cpp +++ b/editor/editor_help_search.cpp @@ -66,7 +66,7 @@ void EditorHelpSearch::_search_box_gui_input(const Ref<InputEvent> &p_event) { // Redirect up and down navigational key events to the results list. Ref<InputEventKey> key = p_event; if (key.is_valid()) { - switch (key->get_scancode()) { + switch (key->get_keycode()) { case KEY_UP: case KEY_DOWN: case KEY_PAGEUP: diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 3f99048ba6..ed5a411d8b 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "editor_inspector.h" + #include "array_property_edit.h" #include "dictionary_property_edit.h" #include "editor_feature_profile.h" @@ -2052,16 +2053,16 @@ void EditorInspector::_edit_set(const String &p_name, const Variant &p_value, bo } } -void EditorInspector::_property_changed(const String &p_path, const Variant &p_value, const String &p_name, bool changing) { +void EditorInspector::_property_changed(const String &p_path, const Variant &p_value, const String &p_name, bool p_changing) { // The "changing" variable must be true for properties that trigger events as typing occurs, - // like "text_changed" signal. eg: Text property of Label, Button, RichTextLabel, etc. - if (changing) + // like "text_changed" signal. E.g. text property of Label, Button, RichTextLabel, etc. + if (p_changing) this->changing++; _edit_set(p_path, p_value, false, p_name); - if (changing) + if (p_changing) this->changing--; if (restart_request_props.has(p_path)) { diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 7ad55a13ad..7a1542d30f 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -302,7 +302,7 @@ class EditorInspector : public ScrollContainer { void _edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all, const String &p_changed_field); - void _property_changed(const String &p_path, const Variant &p_value, const String &p_name = "", bool changing = false); + void _property_changed(const String &p_path, const Variant &p_value, const String &p_name = "", bool p_changing = false); void _property_changed_update_all(const String &p_path, const Variant &p_value, const String &p_name = "", bool p_changing = false); void _multiple_properties_changed(Vector<String> p_paths, Array p_values); void _property_keyed(const String &p_path, bool p_advance); diff --git a/editor/editor_layouts_dialog.cpp b/editor/editor_layouts_dialog.cpp index 5d4a9e738e..776fbd9314 100644 --- a/editor/editor_layouts_dialog.cpp +++ b/editor/editor_layouts_dialog.cpp @@ -45,7 +45,7 @@ void EditorLayoutsDialog::_line_gui_input(const Ref<InputEvent> &p_event) { if (!k->is_pressed()) return; - switch (k->get_scancode()) { + switch (k->get_keycode()) { case KEY_KP_ENTER: case KEY_ENTER: { diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 6f8027ba64..323684effe 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -67,6 +67,7 @@ #include "servers/physics_2d_server.h" #include "editor/audio_stream_preview.h" +#include "editor/debugger/editor_debugger_node.h" #include "editor/dependency_editor.h" #include "editor/editor_about.h" #include "editor/editor_audio_buses.h" @@ -87,7 +88,6 @@ #include "editor/editor_spin_slider.h" #include "editor/editor_themes.h" #include "editor/export_template_manager.h" -#include "editor/fileserver/editor_file_server.h" #include "editor/filesystem_dock.h" #include "editor/import/editor_import_collada.h" #include "editor/import/editor_scene_importer_gltf.h" @@ -414,8 +414,6 @@ void EditorNode::_notification(int p_what) { _editor_select(EDITOR_3D); } - _update_debug_options(); - /* DO NOT LOAD SCENES HERE, WAIT FOR FILE SCANNING AND REIMPORT TO COMPLETE */ } break; @@ -1420,7 +1418,6 @@ void EditorNode::_mark_unsaved_scenes() { String path = node->get_filename(); if (!(path == String() || FileAccess::exists(path))) { - node->set_filename(""); if (i == editor_data.get_edited_scene()) set_current_version(-1); else @@ -2050,12 +2047,7 @@ void EditorNode::_run(bool p_current, const String &p_custom) { args = ProjectSettings::get_singleton()->get("editor/main_run_args"); skip_breakpoints = EditorDebuggerNode::get_singleton()->is_skip_breakpoints(); - int instances = 1; - if (debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_TWO))) - instances = 2; - - Error error = editor_run.run(run_filename, args, breakpoints, skip_breakpoints, instances); - + Error error = editor_run.run(run_filename, args, breakpoints, skip_breakpoints); if (error != OK) { show_accept(TTR("Could not start subprocess!"), TTR("OK")); @@ -2485,16 +2477,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { run_settings_dialog->popup_run_settings(); } break; - case RUN_DEBUG_ONE: { - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_ONE), true); - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_TWO), false); - - } break; - case RUN_DEBUG_TWO: { - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_TWO), true); - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_ONE), false); - - } break; case RUN_SETTINGS: { project_settings->popup_project_settings(); @@ -2565,65 +2547,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { } _discard_changes(); } break; - case RUN_FILE_SERVER: { - - bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_FILE_SERVER)); - - if (ischecked) { - file_server->stop(); - run_native->set_deploy_dumb(false); - } else { - file_server->start(); - run_native->set_deploy_dumb(true); - } - - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_FILE_SERVER), !ischecked); - EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_file_server", !ischecked); - } break; - case RUN_LIVE_DEBUG: { - - bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_LIVE_DEBUG)); - - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_LIVE_DEBUG), !ischecked); - EditorDebuggerNode::get_singleton()->set_live_debugging(!ischecked); - EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_live_debug", !ischecked); - - } break; - case RUN_DEPLOY_REMOTE_DEBUG: { - - bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG)); - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG), !ischecked); - run_native->set_deploy_debug_remote(!ischecked); - EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_deploy_remote_debug", !ischecked); - - } break; - case RUN_DEBUG_COLLISONS: { - - bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_COLLISONS)); - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_COLLISONS), !ischecked); - run_native->set_debug_collisions(!ischecked); - editor_run.set_debug_collisions(!ischecked); - EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_debug_collisons", !ischecked); - - } break; - case RUN_DEBUG_NAVIGATION: { - - bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION)); - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION), !ischecked); - run_native->set_debug_navigation(!ischecked); - editor_run.set_debug_navigation(!ischecked); - EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_debug_navigation", !ischecked); - - } break; - case RUN_RELOAD_SCRIPTS: { - - bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS)); - debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS), !ischecked); - - ScriptEditor::get_singleton()->set_live_auto_reload_running_scripts(!ischecked); - EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_reload_scripts", !ischecked); - - } break; case SETTINGS_UPDATE_CONTINUOUSLY: { EditorSettings::get_singleton()->set("interface/editor/update_continuously", true); @@ -2869,23 +2792,6 @@ void EditorNode::_discard_changes(const String &p_str) { } } -void EditorNode::_update_debug_options() { - - bool check_deploy_remote = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_deploy_remote_debug", false); - bool check_file_server = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_file_server", false); - bool check_debug_collisons = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_collisons", false); - bool check_debug_navigation = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_navigation", false); - bool check_live_debug = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_live_debug", false); - bool check_reload_scripts = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_reload_scripts", false); - - if (check_deploy_remote) _menu_option_confirm(RUN_DEPLOY_REMOTE_DEBUG, true); - if (check_file_server) _menu_option_confirm(RUN_FILE_SERVER, true); - if (check_debug_collisons) _menu_option_confirm(RUN_DEBUG_COLLISONS, true); - if (check_debug_navigation) _menu_option_confirm(RUN_DEBUG_NAVIGATION, true); - if (check_live_debug) _menu_option_confirm(RUN_LIVE_DEBUG, true); - if (check_reload_scripts) _menu_option_confirm(RUN_RELOAD_SCRIPTS, true); -} - void EditorNode::_update_file_menu_opened() { Ref<ShortCut> close_scene_sc = ED_GET_SHORTCUT("editor/close_scene"); @@ -3279,7 +3185,7 @@ void EditorNode::_clear_undo_history() { void EditorNode::set_current_scene(int p_idx) { //Save the folding in case the scene gets reloaded. - if (editor_data.get_scene_path(p_idx) != "") + if (editor_data.get_scene_path(p_idx) != "" && editor_data.get_edited_scene_root(p_idx)) editor_folding.save_scene_folding(editor_data.get_edited_scene_root(p_idx), editor_data.get_scene_path(p_idx)); if (editor_data.check_and_update_scene(p_idx)) { @@ -6190,42 +6096,13 @@ EditorNode::EditorNode() { main_editor_button_vb = memnew(HBoxContainer); menu_hb->add_child(main_editor_button_vb); + // Options are added and handled by DebuggerEditorPlugin debug_menu = memnew(MenuButton); debug_menu->set_flat(false); debug_menu->set_switch_on_hover(true); debug_menu->set_text(TTR("Debug")); debug_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); left_menu_hb->add_child(debug_menu); - - p = debug_menu->get_popup(); - p->set_hide_on_window_lose_focus(true); - p->set_hide_on_checkable_item_selection(false); - p->add_check_shortcut(ED_SHORTCUT("editor/deploy_with_remote_debug", TTR("Deploy with Remote Debug")), RUN_DEPLOY_REMOTE_DEBUG); - p->set_item_tooltip(p->get_item_count() - 1, TTR("When exporting or deploying, the resulting executable will attempt to connect to the IP of this computer in order to be debugged.")); - p->add_check_shortcut(ED_SHORTCUT("editor/small_deploy_with_network_fs", TTR("Small Deploy with Network FS")), RUN_FILE_SERVER); - p->set_item_tooltip(p->get_item_count() - 1, TTR("When this option is enabled, export or deploy will produce a minimal executable.\nThe filesystem will be provided from the project by the editor over the network.\nOn Android, deploy will use the USB cable for faster performance. This option speeds up testing for games with a large footprint.")); - p->add_separator(); - p->add_check_shortcut(ED_SHORTCUT("editor/visible_collision_shapes", TTR("Visible Collision Shapes")), RUN_DEBUG_COLLISONS); - p->set_item_tooltip(p->get_item_count() - 1, TTR("Collision shapes and raycast nodes (for 2D and 3D) will be visible on the running game if this option is turned on.")); - p->add_check_shortcut(ED_SHORTCUT("editor/visible_navigation", TTR("Visible Navigation")), RUN_DEBUG_NAVIGATION); - p->set_item_tooltip(p->get_item_count() - 1, TTR("Navigation meshes and polygons will be visible on the running game if this option is turned on.")); - p->add_separator(); - //those are now on by default, since they are harmless - p->add_check_shortcut(ED_SHORTCUT("editor/sync_scene_changes", TTR("Sync Scene Changes")), RUN_LIVE_DEBUG); - p->set_item_tooltip(p->get_item_count() - 1, TTR("When this option is turned on, any changes made to the scene in the editor will be replicated in the running game.\nWhen used remotely on a device, this is more efficient with network filesystem.")); - p->set_item_checked(p->get_item_count() - 1, true); - p->add_check_shortcut(ED_SHORTCUT("editor/sync_script_changes", TTR("Sync Script Changes")), RUN_RELOAD_SCRIPTS); - p->set_item_tooltip(p->get_item_count() - 1, TTR("When this option is turned on, any script that is saved will be reloaded on the running game.\nWhen used remotely on a device, this is more efficient with network filesystem.")); - p->set_item_checked(p->get_item_count() - 1, true); - - // Multi-instance, start/stop - p->add_separator(); - p->add_radio_check_item(TTR("Debug 1 instance"), RUN_DEBUG_ONE); - p->add_radio_check_item(TTR("Debug 2 instances"), RUN_DEBUG_TWO); - p->set_item_checked(p->get_item_index(RUN_DEBUG_ONE), true); - - p->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option)); - menu_hb->add_spacer(); settings_menu = memnew(MenuButton); @@ -6607,9 +6484,7 @@ EditorNode::EditorNode() { add_child(preview_gen); //plugin stuff - file_server = memnew(EditorFileServer); - - add_editor_plugin(memnew(DebuggerEditorPlugin(this))); + add_editor_plugin(memnew(DebuggerEditorPlugin(this, debug_menu))); add_editor_plugin(memnew(AnimationPlayerEditorPlugin(this))); add_editor_plugin(memnew(CanvasItemEditorPlugin(this))); add_editor_plugin(memnew(SpatialEditorPlugin(this))); @@ -6841,7 +6716,6 @@ EditorNode::~EditorNode() { memdelete(editor_plugins_over); memdelete(editor_plugins_force_over); memdelete(editor_plugins_force_input_forwarding); - memdelete(file_server); memdelete(progress_hb); EditorSettings::destroy(); diff --git a/editor/editor_node.h b/editor/editor_node.h index 0b3de5c142..e2badff88d 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -162,17 +162,9 @@ private: RUN_PLAY_NATIVE, RUN_PLAY_CUSTOM_SCENE, RUN_SCENE_SETTINGS, - RUN_DEBUG_ONE, - RUN_DEBUG_TWO, RUN_SETTINGS, RUN_PROJECT_DATA_FOLDER, RUN_PROJECT_MANAGER, - RUN_FILE_SERVER, - RUN_LIVE_DEBUG, - RUN_DEBUG_COLLISONS, - RUN_DEBUG_NAVIGATION, - RUN_DEPLOY_REMOTE_DEBUG, - RUN_RELOAD_SCRIPTS, RUN_VCS_SETTINGS, RUN_VCS_SHUT_DOWN, SETTINGS_UPDATE_CONTINUOUSLY, @@ -412,8 +404,6 @@ private: EditorResourcePreview *resource_preview; EditorFolding editor_folding; - EditorFileServer *file_server; - struct BottomPanelItem { String name; Control *control; @@ -455,7 +445,6 @@ private: void _save_screenshot(NodePath p_path); void _tool_menu_option(int p_idx); - void _update_debug_options(); void _update_file_menu_opened(); void _update_file_menu_closed(); diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 2135e70de3..10ecdb19c0 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -862,7 +862,7 @@ void EditorPlugin::_bind_methods() { ClassDB::add_virtual_method(get_class_static(), MethodInfo("forward_canvas_force_draw_over_viewport", PropertyInfo(Variant::OBJECT, "overlay", PROPERTY_HINT_RESOURCE_TYPE, "Control"))); ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::BOOL, "forward_spatial_gui_input", PropertyInfo(Variant::OBJECT, "camera", PROPERTY_HINT_RESOURCE_TYPE, "Camera"), PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"))); ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::STRING, "get_plugin_name")); - ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::OBJECT, "get_plugin_icon")); + ClassDB::add_virtual_method(get_class_static(), MethodInfo(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "get_plugin_icon")); ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::BOOL, "has_main_screen")); ClassDB::add_virtual_method(get_class_static(), MethodInfo("make_visible", PropertyInfo(Variant::BOOL, "visible"))); ClassDB::add_virtual_method(get_class_static(), MethodInfo("edit", PropertyInfo(Variant::OBJECT, "object"))); diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp index 4ae6ced35b..c2a6aeb582 100644 --- a/editor/editor_properties_array_dict.cpp +++ b/editor/editor_properties_array_dict.cpp @@ -165,10 +165,10 @@ EditorPropertyDictionaryObject::EditorPropertyDictionaryObject() { ///////////////////// ARRAY /////////////////////////// -void EditorPropertyArray::_property_changed(const String &p_prop, Variant p_value, const String &p_name, bool changing) { +void EditorPropertyArray::_property_changed(const String &p_property, Variant p_value, const String &p_name, bool p_changing) { - if (p_prop.begins_with("indices")) { - int idx = p_prop.get_slice("/", 1).to_int(); + if (p_property.begins_with("indices")) { + int idx = p_property.get_slice("/", 1).to_int(); Variant array = object->get_array(); array.set(idx, p_value); emit_changed(get_edited_property(), array, "", true); @@ -213,7 +213,7 @@ void EditorPropertyArray::_change_type_menu(int p_index) { update_property(); } -void EditorPropertyArray::_object_id_selected(const String &p_property, ObjectID p_id) { +void EditorPropertyArray::_object_id_selected(const StringName &p_property, ObjectID p_id) { emit_signal("object_id_selected", p_property, p_id); } @@ -528,16 +528,16 @@ EditorPropertyArray::EditorPropertyArray() { ///////////////////// DICTIONARY /////////////////////////// -void EditorPropertyDictionary::_property_changed(const String &p_prop, Variant p_value, const String &p_name, bool changing) { +void EditorPropertyDictionary::_property_changed(const String &p_property, Variant p_value, const String &p_name, bool p_changing) { - if (p_prop == "new_item_key") { + if (p_property == "new_item_key") { object->set_new_item_key(p_value); - } else if (p_prop == "new_item_value") { + } else if (p_property == "new_item_value") { object->set_new_item_value(p_value); - } else if (p_prop.begins_with("indices")) { - int idx = p_prop.get_slice("/", 1).to_int(); + } else if (p_property.begins_with("indices")) { + int idx = p_property.get_slice("/", 1).to_int(); Dictionary dict = object->get_dict(); Variant key = dict.get_key_at_index(idx); dict[key] = p_value; @@ -969,7 +969,7 @@ void EditorPropertyDictionary::update_property() { } } -void EditorPropertyDictionary::_object_id_selected(const String &p_property, ObjectID p_id) { +void EditorPropertyDictionary::_object_id_selected(const StringName &p_property, ObjectID p_id) { emit_signal("object_id_selected", p_property, p_id); } diff --git a/editor/editor_properties_array_dict.h b/editor/editor_properties_array_dict.h index d4f8abf583..51a4be1b3a 100644 --- a/editor/editor_properties_array_dict.h +++ b/editor/editor_properties_array_dict.h @@ -100,11 +100,11 @@ class EditorPropertyArray : public EditorProperty { void _page_changed(double p_page); void _length_changed(double p_page); void _edit_pressed(); - void _property_changed(const String &p_prop, Variant p_value, const String &p_name = String(), bool changing = false); + void _property_changed(const String &p_property, Variant p_value, const String &p_name = "", bool p_changing = false); void _change_type(Object *p_button, int p_index); void _change_type_menu(int p_index); - void _object_id_selected(const String &p_property, ObjectID p_id); + void _object_id_selected(const StringName &p_property, ObjectID p_id); void _remove_pressed(int p_index); protected: @@ -135,12 +135,12 @@ class EditorPropertyDictionary : public EditorProperty { void _page_changed(double p_page); void _edit_pressed(); - void _property_changed(const String &p_prop, Variant p_value, const String &p_name = String(), bool changing = false); + void _property_changed(const String &p_property, Variant p_value, const String &p_name = "", bool p_changing = false); void _change_type(Object *p_button, int p_index); void _change_type_menu(int p_index); void _add_key_value(); - void _object_id_selected(const String &p_property, ObjectID p_id); + void _object_id_selected(const StringName &p_property, ObjectID p_id); protected: static void _bind_methods(); diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 40482dc367..3c401a6fc7 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -217,7 +217,7 @@ void EditorResourcePreview::_thread() { exited = false; while (!exit) { - preview_sem->wait(); + preview_sem.wait(); preview_mutex.lock(); if (queue.size()) { @@ -379,7 +379,7 @@ void EditorResourcePreview::queue_edited_resource_preview(const Ref<Resource> &p queue.push_back(item); } - preview_sem->post(); + preview_sem.post(); } void EditorResourcePreview::queue_resource_preview(const String &p_path, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata) { @@ -403,7 +403,7 @@ void EditorResourcePreview::queue_resource_preview(const String &p_path, Object queue.push_back(item); } - preview_sem->post(); + preview_sem.post(); } void EditorResourcePreview::add_preview_generator(const Ref<EditorResourcePreviewGenerator> &p_generator) { @@ -462,7 +462,7 @@ void EditorResourcePreview::start() { void EditorResourcePreview::stop() { if (thread) { exit = true; - preview_sem->post(); + preview_sem.post(); while (!exited) { OS::get_singleton()->delay_usec(10000); VisualServer::get_singleton()->sync(); //sync pending stuff, as thread may be blocked on visual server @@ -476,7 +476,6 @@ void EditorResourcePreview::stop() { EditorResourcePreview::EditorResourcePreview() { thread = NULL; singleton = this; - preview_sem = SemaphoreOld::create(); order = 0; exit = false; exited = false; @@ -485,5 +484,4 @@ EditorResourcePreview::EditorResourcePreview() { EditorResourcePreview::~EditorResourcePreview() { stop(); - memdelete(preview_sem); } diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index ae347c0469..0e1684963c 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -71,7 +71,7 @@ class EditorResourcePreview : public Node { List<QueueItem> queue; Mutex preview_mutex; - SemaphoreOld *preview_sem; + Semaphore preview_sem; Thread *thread; volatile bool exit; volatile bool exited; diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index 3200a0ac8b..9f0e1f2349 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -38,7 +38,7 @@ EditorRun::Status EditorRun::get_status() const { return status; } -Error EditorRun::run(const String &p_scene, const String &p_custom_args, const List<String> &p_breakpoints, const bool &p_skip_breakpoints, const int &p_instances) { +Error EditorRun::run(const String &p_scene, const String &p_custom_args, const List<String> &p_breakpoints, const bool &p_skip_breakpoints) { List<String> args; @@ -57,6 +57,8 @@ Error EditorRun::run(const String &p_scene, const String &p_custom_args, const L args.push_back("--allow_focus_steal_pid"); args.push_back(itos(OS::get_singleton()->get_process_id())); + bool debug_collisions = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_collisons", false); + bool debug_navigation = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_navigation", false); if (debug_collisions) { args.push_back("--debug-collisions"); } @@ -187,7 +189,8 @@ Error EditorRun::run(const String &p_scene, const String &p_custom_args, const L }; printf("\n"); - for (int i = 0; i < p_instances; i++) { + int instances = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_instances", 1); + for (int i = 0; i < instances; i++) { OS::ProcessID pid = 0; Error err = OS::get_singleton()->execute(exec, args, false, &pid); ERR_FAIL_COND_V(err, err); @@ -226,29 +229,7 @@ void EditorRun::stop() { status = STATUS_STOP; } -void EditorRun::set_debug_collisions(bool p_debug) { - - debug_collisions = p_debug; -} - -bool EditorRun::get_debug_collisions() const { - - return debug_collisions; -} - -void EditorRun::set_debug_navigation(bool p_debug) { - - debug_navigation = p_debug; -} - -bool EditorRun::get_debug_navigation() const { - - return debug_navigation; -} - EditorRun::EditorRun() { status = STATUS_STOP; - debug_collisions = false; - debug_navigation = false; } diff --git a/editor/editor_run.h b/editor/editor_run.h index 389a1e6b20..06050436a9 100644 --- a/editor/editor_run.h +++ b/editor/editor_run.h @@ -45,13 +45,11 @@ public: List<OS::ProcessID> pids; private: - bool debug_collisions; - bool debug_navigation; Status status; public: Status get_status() const; - Error run(const String &p_scene, const String &p_custom_args, const List<String> &p_breakpoints, const bool &p_skip_breakpoints = false, const int &p_instances = 1); + Error run(const String &p_scene, const String &p_custom_args, const List<String> &p_breakpoints, const bool &p_skip_breakpoints = false); void run_native_notify() { status = STATUS_PLAY; } void stop(); @@ -59,12 +57,6 @@ public: bool has_child_process(OS::ProcessID p_pid) const; int get_child_process_count() const { return pids.size(); } - void set_debug_collisions(bool p_debug); - bool get_debug_collisions() const; - - void set_debug_navigation(bool p_debug); - bool get_debug_navigation() const; - EditorRun(); }; diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp index e57b4cc7b5..464666ac6a 100644 --- a/editor/editor_run_native.cpp +++ b/editor/editor_run_native.cpp @@ -136,6 +136,12 @@ void EditorRunNative::_run_native(int p_idx, int p_platform) { emit_signal("native_run"); int flags = 0; + + bool deploy_debug_remote = is_deploy_debug_remote_enabled(); + bool deploy_dumb = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_file_server", false); + bool debug_collisions = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_collisons", false); + bool debug_navigation = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_navigation", false); + if (deploy_debug_remote) flags |= EditorExportPlatform::DEBUG_FLAG_REMOTE_DEBUG; if (deploy_dumb) @@ -157,53 +163,14 @@ void EditorRunNative::_bind_methods() { ADD_SIGNAL(MethodInfo("native_run")); } -void EditorRunNative::set_deploy_dumb(bool p_enabled) { - - deploy_dumb = p_enabled; -} - -bool EditorRunNative::is_deploy_dumb_enabled() const { - - return deploy_dumb; -} - -void EditorRunNative::set_deploy_debug_remote(bool p_enabled) { - - deploy_debug_remote = p_enabled; -} - bool EditorRunNative::is_deploy_debug_remote_enabled() const { - return deploy_debug_remote; -} - -void EditorRunNative::set_debug_collisions(bool p_debug) { - - debug_collisions = p_debug; -} - -bool EditorRunNative::get_debug_collisions() const { - - return debug_collisions; -} - -void EditorRunNative::set_debug_navigation(bool p_debug) { - - debug_navigation = p_debug; -} - -bool EditorRunNative::get_debug_navigation() const { - - return debug_navigation; + return EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_deploy_remote_debug", false); } EditorRunNative::EditorRunNative() { set_process(true); first = true; - deploy_dumb = false; - deploy_debug_remote = false; - debug_collisions = false; - debug_navigation = false; resume_idx = 0; resume_platform = 0; } diff --git a/editor/editor_run_native.h b/editor/editor_run_native.h index be2e6d269d..5f2236b88c 100644 --- a/editor/editor_run_native.h +++ b/editor/editor_run_native.h @@ -40,10 +40,6 @@ class EditorRunNative : public HBoxContainer { Map<int, MenuButton *> menus; bool first; - bool deploy_dumb; - bool deploy_debug_remote; - bool debug_collisions; - bool debug_navigation; int resume_idx; int resume_platform; @@ -55,18 +51,8 @@ protected: void _notification(int p_what); public: - void set_deploy_dumb(bool p_enabled); - bool is_deploy_dumb_enabled() const; - - void set_deploy_debug_remote(bool p_enabled); bool is_deploy_debug_remote_enabled() const; - void set_debug_collisions(bool p_debug); - bool get_debug_collisions() const; - - void set_debug_navigation(bool p_debug); - bool get_debug_navigation() const; - void resume_run_native(); EditorRunNative(); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 3f3d79c83a..ae16a50279 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -1531,7 +1531,7 @@ Ref<ShortCut> ED_SHORTCUT(const String &p_path, const String &p_name, uint32_t p ie.instance(); ie->set_unicode(p_keycode & KEY_CODE_MASK); - ie->set_scancode(p_keycode & KEY_CODE_MASK); + ie->set_keycode(p_keycode & KEY_CODE_MASK); ie->set_shift(bool(p_keycode & KEY_MASK_SHIFT)); ie->set_alt(bool(p_keycode & KEY_MASK_ALT)); ie->set_control(bool(p_keycode & KEY_MASK_CTRL)); diff --git a/editor/editor_settings.h b/editor/editor_settings.h index 4caa494d59..d4dd19ee10 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -117,7 +117,7 @@ private: void _get_property_list(List<PropertyInfo> *p_list) const; void _add_property_info_bind(const Dictionary &p_info); - void _load_defaults(Ref<ConfigFile> p_extra_config = NULL); + void _load_defaults(Ref<ConfigFile> p_extra_config = Ref<ConfigFile>()); void _load_default_text_editor_theme(); bool _save_text_editor_theme(String p_file); bool _is_default_text_editor_theme(String p_theme_name); diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index bbf741948b..9328a5e04d 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -547,9 +547,7 @@ void ExportTemplateManager::_notification(int p_what) { bool ExportTemplateManager::can_install_android_template() { const String templates_dir = EditorSettings::get_singleton()->get_templates_dir().plus_file(VERSION_FULL_CONFIG); - return FileAccess::exists(templates_dir.plus_file("android_source.zip")) && - FileAccess::exists(templates_dir.plus_file("android_release.apk")) && - FileAccess::exists(templates_dir.plus_file("android_debug.apk")); + return FileAccess::exists(templates_dir.plus_file("android_source.zip")); } Error ExportTemplateManager::install_android_template() { @@ -563,13 +561,6 @@ Error ExportTemplateManager::install_android_template() { // Make res://android dir (if it does not exist). da->make_dir("android"); { - // Add an empty .gdignore file to avoid scan. - FileAccessRef f = FileAccess::open("res://android/.gdignore", FileAccess::WRITE); - ERR_FAIL_COND_V(!f, ERR_CANT_CREATE); - f->store_line(""); - f->close(); - } - { // Add version, to ensure building won't work if template and Godot version don't match. FileAccessRef f = FileAccess::open("res://android/.build_version", FileAccess::WRITE); ERR_FAIL_COND_V(!f, ERR_CANT_CREATE); @@ -577,8 +568,19 @@ Error ExportTemplateManager::install_android_template() { f->close(); } - Error err = da->make_dir_recursive("android/build"); + // Create the android plugins directory. + Error err = da->make_dir_recursive("android/plugins"); + ERR_FAIL_COND_V(err != OK, err); + + err = da->make_dir_recursive("android/build"); ERR_FAIL_COND_V(err != OK, err); + { + // Add an empty .gdignore file to avoid scan. + FileAccessRef f = FileAccess::open("res://android/build/.gdignore", FileAccess::WRITE); + ERR_FAIL_COND_V(!f, ERR_CANT_CREATE); + f->store_line(""); + f->close(); + } // Uncompress source template. diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index cc62e93268..6c69f46941 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -323,7 +323,7 @@ void FileSystemDock::_notification(int p_what) { file_list_popup->connect("id_pressed", callable_mp(this, &FileSystemDock::_file_list_rmb_option)); tree_popup->connect("id_pressed", callable_mp(this, &FileSystemDock::_tree_rmb_option)); - current_path->connect("text_entered", callable_mp(this, &FileSystemDock::_navigate_to_path)); + current_path->connect("text_entered", callable_mp(this, &FileSystemDock::_navigate_to_path), make_binds(false)); always_show_folders = bool(EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders")); @@ -1406,8 +1406,8 @@ bool FileSystemDock::_check_existing() { return true; } -void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool overwrite) { - if (!overwrite) { +void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool p_overwrite) { + if (!p_overwrite) { to_move_path = p_to_path; bool can_move = _check_existing(); if (!can_move) { @@ -2620,7 +2620,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { move_dialog = memnew(EditorDirDialog); move_dialog->get_ok()->set_text(TTR("Move")); add_child(move_dialog); - move_dialog->connect("dir_selected", callable_mp(this, &FileSystemDock::_move_operation_confirm)); + move_dialog->connect("dir_selected", callable_mp(this, &FileSystemDock::_move_operation_confirm), make_binds(false)); rename_dialog = memnew(ConfirmationDialog); VBoxContainer *rename_dialog_vb = memnew(VBoxContainer); diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 1969f85e72..00f8cd9d50 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -222,7 +222,7 @@ private: void _duplicate_operation_confirm(); void _move_with_overwrite(); bool _check_existing(); - void _move_operation_confirm(const String &p_to_path, bool overwrite = false); + void _move_operation_confirm(const String &p_to_path, bool p_overwrite = false); void _tree_rmb_option(int p_option); void _file_list_rmb_option(int p_option); diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp index 650aaa9043..b4c9a01f2a 100644 --- a/editor/groups_editor.cpp +++ b/editor/groups_editor.cpp @@ -659,6 +659,7 @@ void GroupsEditor::_show_group_dialog() { } void GroupsEditor::_bind_methods() { + ClassDB::bind_method("update_tree", &GroupsEditor::update_tree); } GroupsEditor::GroupsEditor() { diff --git a/editor/icons/Keyboard.svg b/editor/icons/Keyboard.svg index bd8736278d..c76e88e5e3 100644 --- a/editor/icons/Keyboard.svg +++ b/editor/icons/Keyboard.svg @@ -1 +1 @@ -<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill-opacity=".99608" transform="translate(0 -1036.4)"><path d="m4 2a1 1 0 0 0 -1 1v9.084a1 .91667 0 0 0 1 .91602h8a1 .91667 0 0 0 1-.91602v-9.084a1 1 0 0 0 -1-1zm-3 2v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-9h-1v9a.99998.99998 0 0 1 -1 1h-10a1 1 0 0 1 -1-1v-9zm4 0h2v3l2-3h2l-2 3 2 4h-2l-2-4v4h-2z" fill="#e0e0e0" transform="translate(0 1036.4)"/><path d="m27 1038.4h7v14h-7z" fill="#fff"/></g></svg>
\ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M4 2a1 1 0 0 0-1 1v9.084c0 .506.448.916 1 .916h8c.552 0 1-.41 1-.916V3a1 1 0 0 0-1-1H4zm1.543 1.139h1.393L8.77 7.338h1.295v.437c.708.052 1.246.239 1.61.559.368.316.55.747.55 1.295 0 .552-.182.99-.55 1.314-.368.32-.906.505-1.61.553v.467H8.771v-.473c-.708-.06-1.247-.248-1.615-.564-.364-.316-.545-.75-.545-1.297 0-.548.181-.977.545-1.29.368-.315.907-.504 1.615-.564v-.437H7.307l-.282-.733H5.43l-.284.733H3.707l1.836-4.2zm.684 1.39l-.409 1.057h.817l-.408-1.057zm3.84 4.338v1.526c.28-.04.483-.12.607-.24.124-.125.185-.302.185-.53 0-.224-.063-.396-.191-.516-.124-.12-.326-.2-.602-.24zm-1.296.006c-.284.04-.487.12-.61.24-.12.116-.182.288-.182.516 0 .22.065.392.193.512.132.12.331.202.6.246V8.873z" fill="#e0e0e0" fill-opacity=".996"/><path d="M27 2h7v14h-7z" fill="#fff" fill-opacity=".996"/><path fill="#e0e0e0" fill-opacity=".996" d="M1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4z"/></svg>
\ No newline at end of file diff --git a/editor/icons/KeyboardPhysical.svg b/editor/icons/KeyboardPhysical.svg new file mode 100644 index 0000000000..2bd35bc78e --- /dev/null +++ b/editor/icons/KeyboardPhysical.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M4 2a1 1 0 0 0-1 1v9.084c0 .506.448.916 1 .916h8c.552 0 1-.41 1-.916V3a1 1 0 0 0-1-1zm2.762 1.768h2.476l3.264 7.464H9.898l-.502-1.3H6.561l-.502 1.3H3.498zm1.217 2.474L7.254 8.12h1.45z" fill="#e0e0e0" fill-opacity=".996"/><path d="M27 2h7v14h-7z" fill="#fff" fill-opacity=".996"/><path fill="#e0e0e0" fill-opacity=".996" d="M1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4z"/></svg>
\ No newline at end of file diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index 016aee12cf..61b3239169 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -105,7 +105,7 @@ class InspectorDock : public VBoxContainer { void _warning_pressed(); void _resource_created(); - void _resource_selected(const RES &p_res, const String &p_property = ""); + void _resource_selected(const RES &p_res, const String &p_property); void _edit_forward(); void _edit_back(); void _menu_collapseall(); diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index 6e950e8c0b..8d5444db73 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -533,7 +533,7 @@ bool AbstractPolygon2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) if (k.is_valid() && k->is_pressed()) { - if (k->get_scancode() == KEY_DELETE || k->get_scancode() == KEY_BACKSPACE) { + if (k->get_keycode() == KEY_DELETE || k->get_keycode() == KEY_BACKSPACE) { if (wip_active && selected_point.polygon == -1) { @@ -555,10 +555,10 @@ bool AbstractPolygon2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) return true; } } - } else if (wip_active && k->get_scancode() == KEY_ENTER) { + } else if (wip_active && k->get_keycode() == KEY_ENTER) { _wip_close(); - } else if (wip_active && k->get_scancode() == KEY_ESCAPE) { + } else if (wip_active && k->get_keycode() == KEY_ESCAPE) { _wip_cancel(); } } diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp index d5d5727ad9..7916ac71ea 100644 --- a/editor/plugins/animation_blend_space_1d_editor.cpp +++ b/editor/plugins/animation_blend_space_1d_editor.cpp @@ -42,7 +42,7 @@ StringName AnimationNodeBlendSpace1DEditor::get_blend_position_path() const { void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventKey> k = p_event; - if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->get_scancode() == KEY_DELETE && !k->is_echo()) { + if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->get_keycode() == KEY_DELETE && !k->is_echo()) { if (selected_point != -1) { _erase_selected(); accept_event(); diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index 363c3a0e0a..663f2dde05 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -73,7 +73,7 @@ StringName AnimationNodeBlendSpace2DEditor::get_blend_position_path() const { void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventKey> k = p_event; - if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->get_scancode() == KEY_DELETE && !k->is_echo()) { + if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->get_keycode() == KEY_DELETE && !k->is_echo()) { if (selected_point != -1 || selected_triangle != -1) { _erase_selected(); accept_event(); diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 0450f3c472..af12335a27 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -1268,7 +1268,7 @@ void AnimationPlayerEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) { Ref<InputEventKey> k = p_ev; if (is_visible_in_tree() && k.is_valid() && k->is_pressed() && !k->is_echo() && !k->get_alt() && !k->get_control() && !k->get_metakey()) { - switch (k->get_scancode()) { + switch (k->get_keycode()) { case KEY_A: { if (!k->get_shift()) diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp index 77a8489f9e..cae959e1f4 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/plugins/animation_state_machine_editor.cpp @@ -69,7 +69,7 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv return; Ref<InputEventKey> k = p_event; - if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->get_scancode() == KEY_DELETE && !k->is_echo()) { + if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->get_keycode() == KEY_DELETE && !k->is_echo()) { if (selected_node != StringName() || selected_transition_to != StringName() || selected_transition_from != StringName()) { _erase_selected(); accept_event(); diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index e598fc5d8b..80b7e6ffc8 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -617,7 +617,7 @@ void EditorAssetLibrary::_unhandled_input(const Ref<InputEvent> &p_event) { if (key.is_valid() && key->is_pressed()) { - if (key->get_scancode_with_modifiers() == (KEY_MASK_CMD | KEY_F) && is_visible_in_tree()) { + if (key->get_keycode_with_modifiers() == (KEY_MASK_CMD | KEY_F) && is_visible_in_tree()) { filter->grab_focus(); filter->select_all(); @@ -1360,7 +1360,7 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) { filter->set_h_size_flags(SIZE_EXPAND_FILL); filter->connect("text_entered", callable_mp(this, &EditorAssetLibrary::_search_text_entered)); search = memnew(Button(TTR("Search"))); - search->connect("pressed", callable_mp(this, &EditorAssetLibrary::_search)); + search->connect("pressed", callable_mp(this, &EditorAssetLibrary::_search), make_binds(0)); search_hb->add_child(search); if (!p_templates_only) diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index fd522f9109..5629e3854d 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -462,7 +462,15 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, unsig } float CanvasItemEditor::snap_angle(float p_target, float p_start) const { - return (((smart_snap_active || snap_rotation) ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL)) && snap_rotation_step != 0) ? Math::stepify(p_target - snap_rotation_offset, snap_rotation_step) + snap_rotation_offset : p_target; + if (((smart_snap_active || snap_rotation) ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL)) && snap_rotation_step != 0) { + if (snap_relative) { + return Math::stepify(p_target - snap_rotation_offset, snap_rotation_step) + snap_rotation_offset + (p_start - (int)(p_start / snap_rotation_step) * snap_rotation_step); + } else { + return Math::stepify(p_target - snap_rotation_offset, snap_rotation_step) + snap_rotation_offset; + } + } else { + return p_target; + } } void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) { @@ -472,7 +480,7 @@ void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) { if (!is_visible_in_tree() || get_viewport()->gui_has_modal_stack()) return; - if (k->get_scancode() == KEY_CONTROL || k->get_scancode() == KEY_ALT || k->get_scancode() == KEY_SHIFT) { + if (k->get_keycode() == KEY_CONTROL || k->get_keycode() == KEY_ALT || k->get_keycode() == KEY_SHIFT) { viewport->update(); } @@ -1315,7 +1323,7 @@ bool CanvasItemEditor::_gui_input_pivot(const Ref<InputEvent> &p_event) { // Drag the pivot (in pivot mode / with V key) if (drag_type == DRAG_NONE) { if ((b.is_valid() && b->is_pressed() && b->get_button_index() == BUTTON_LEFT && tool == TOOL_EDIT_PIVOT) || - (k.is_valid() && k->is_pressed() && !k->is_echo() && k->get_scancode() == KEY_V)) { + (k.is_valid() && k->is_pressed() && !k->is_echo() && k->get_keycode() == KEY_V)) { List<CanvasItem *> selection = _get_edited_canvas_items(); // Filters the selection with nodes that allow setting the pivot @@ -1367,7 +1375,7 @@ bool CanvasItemEditor::_gui_input_pivot(const Ref<InputEvent> &p_event) { // Confirm the pivot move if ((b.is_valid() && !b->is_pressed() && b->get_button_index() == BUTTON_LEFT && tool == TOOL_EDIT_PIVOT) || - (k.is_valid() && !k->is_pressed() && k->get_scancode() == KEY_V)) { + (k.is_valid() && !k->is_pressed() && k->get_keycode() == KEY_V)) { _commit_canvas_item_state(drag_selection, TTR("Move pivot")); drag_type = DRAG_NONE; return true; @@ -2109,7 +2117,7 @@ bool CanvasItemEditor::_gui_input_move(const Ref<InputEvent> &p_event) { // Move the canvas items with the arrow keys if (k.is_valid() && k->is_pressed() && (tool == TOOL_SELECT || tool == TOOL_MOVE) && - (k->get_scancode() == KEY_UP || k->get_scancode() == KEY_DOWN || k->get_scancode() == KEY_LEFT || k->get_scancode() == KEY_RIGHT)) { + (k->get_keycode() == KEY_UP || k->get_keycode() == KEY_DOWN || k->get_keycode() == KEY_LEFT || k->get_keycode() == KEY_RIGHT)) { if (!k->is_echo()) { // Start moving the canvas items with the keyboard drag_selection = _get_edited_canvas_items(); @@ -2135,13 +2143,13 @@ bool CanvasItemEditor::_gui_input_move(const Ref<InputEvent> &p_event) { bool move_local_base_rotated = k->get_control() || k->get_metakey(); Vector2 dir; - if (k->get_scancode() == KEY_UP) + if (k->get_keycode() == KEY_UP) dir += Vector2(0, -1); - else if (k->get_scancode() == KEY_DOWN) + else if (k->get_keycode() == KEY_DOWN) dir += Vector2(0, 1); - else if (k->get_scancode() == KEY_LEFT) + else if (k->get_keycode() == KEY_LEFT) dir += Vector2(-1, 0); - else if (k->get_scancode() == KEY_RIGHT) + else if (k->get_keycode() == KEY_RIGHT) dir += Vector2(1, 0); if (k->get_shift()) dir *= grid_step * Math::pow(2.0, grid_step_multiplier); @@ -2197,7 +2205,7 @@ bool CanvasItemEditor::_gui_input_move(const Ref<InputEvent> &p_event) { } if (k.is_valid() && !k->is_pressed() && drag_type == DRAG_KEY_MOVE && tool == TOOL_SELECT && - (k->get_scancode() == KEY_UP || k->get_scancode() == KEY_DOWN || k->get_scancode() == KEY_LEFT || k->get_scancode() == KEY_RIGHT)) { + (k->get_keycode() == KEY_UP || k->get_keycode() == KEY_DOWN || k->get_keycode() == KEY_LEFT || k->get_keycode() == KEY_RIGHT)) { // Confirm canvas items move by arrow keys if ((!Input::get_singleton()->is_key_pressed(KEY_UP)) && (!Input::get_singleton()->is_key_pressed(KEY_DOWN)) && @@ -2210,7 +2218,7 @@ bool CanvasItemEditor::_gui_input_move(const Ref<InputEvent> &p_event) { return true; } - return (k.is_valid() && (k->get_scancode() == KEY_UP || k->get_scancode() == KEY_DOWN || k->get_scancode() == KEY_LEFT || k->get_scancode() == KEY_RIGHT)); // Accept the key event in any case + return (k.is_valid() && (k->get_keycode() == KEY_UP || k->get_keycode() == KEY_DOWN || k->get_keycode() == KEY_LEFT || k->get_keycode() == KEY_RIGHT)); // Accept the key event in any case } bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) { @@ -2387,7 +2395,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) { } } - if (k.is_valid() && k->is_pressed() && k->get_scancode() == KEY_ESCAPE && drag_type == DRAG_NONE && tool == TOOL_SELECT) { + if (k.is_valid() && k->is_pressed() && k->get_keycode() == KEY_ESCAPE && drag_type == DRAG_NONE && tool == TOOL_SELECT) { // Unselect everything editor_selection->clear(); viewport->update(); @@ -3992,7 +4000,7 @@ void CanvasItemEditor::_notification(int p_what) { if (!is_visible() && override_camera_button->is_pressed()) { EditorDebuggerNode *debugger = EditorDebuggerNode::get_singleton(); - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE); + debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_NONE); override_camera_button->set_pressed(false); } } @@ -4348,9 +4356,9 @@ void CanvasItemEditor::_button_override_camera(bool p_pressed) { EditorDebuggerNode *debugger = EditorDebuggerNode::get_singleton(); if (p_pressed) { - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_2D); + debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_2D); } else { - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE); + debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_NONE); } } diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index adf859eb1e..878787231d 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -238,7 +238,7 @@ void CurveEditor::on_gui_input(const Ref<InputEvent> &p_event) { const InputEventKey &key = **key_ref; if (key.is_pressed() && _selected_point != -1) { - if (key.get_scancode() == KEY_DELETE) + if (key.get_keycode() == KEY_DELETE) remove_point(_selected_point); } } diff --git a/editor/plugins/debugger_editor_plugin.cpp b/editor/plugins/debugger_editor_plugin.cpp index 2534a2cc17..c4069ac2ab 100644 --- a/editor/plugins/debugger_editor_plugin.cpp +++ b/editor/plugins/debugger_editor_plugin.cpp @@ -32,8 +32,11 @@ #include "core/os/keyboard.h" #include "editor/debugger/editor_debugger_node.h" +#include "editor/editor_node.h" +#include "editor/fileserver/editor_file_server.h" +#include "scene/gui/menu_button.h" -DebuggerEditorPlugin::DebuggerEditorPlugin(EditorNode *p_editor) { +DebuggerEditorPlugin::DebuggerEditorPlugin(EditorNode *p_editor, MenuButton *p_debug_menu) { ED_SHORTCUT("debugger/step_into", TTR("Step Into"), KEY_F11); ED_SHORTCUT("debugger/step_over", TTR("Step Over"), KEY_F10); ED_SHORTCUT("debugger/break", TTR("Break")); @@ -41,11 +44,152 @@ DebuggerEditorPlugin::DebuggerEditorPlugin(EditorNode *p_editor) { ED_SHORTCUT("debugger/keep_debugger_open", TTR("Keep Debugger Open")); ED_SHORTCUT("debugger/debug_with_external_editor", TTR("Debug with External Editor")); + // File Server for deploy with remote fs. + file_server = memnew(EditorFileServer); + EditorDebuggerNode *debugger = memnew(EditorDebuggerNode); Button *db = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Debugger"), debugger); debugger->set_tool_button(db); + + // Main editor debug menu. + debug_menu = p_debug_menu; + PopupMenu *p = debug_menu->get_popup(); + p->set_hide_on_window_lose_focus(true); + p->set_hide_on_checkable_item_selection(false); + p->add_check_shortcut(ED_SHORTCUT("editor/deploy_with_remote_debug", TTR("Deploy with Remote Debug")), RUN_DEPLOY_REMOTE_DEBUG); + p->set_item_tooltip(p->get_item_count() - 1, TTR("When exporting or deploying, the resulting executable will attempt to connect to the IP of this computer in order to be debugged.")); + p->add_check_shortcut(ED_SHORTCUT("editor/small_deploy_with_network_fs", TTR("Small Deploy with Network FS")), RUN_FILE_SERVER); + p->set_item_tooltip(p->get_item_count() - 1, TTR("When this option is enabled, export or deploy will produce a minimal executable.\nThe filesystem will be provided from the project by the editor over the network.\nOn Android, deploy will use the USB cable for faster performance. This option speeds up testing for games with a large footprint.")); + p->add_separator(); + p->add_check_shortcut(ED_SHORTCUT("editor/visible_collision_shapes", TTR("Visible Collision Shapes")), RUN_DEBUG_COLLISONS); + p->set_item_tooltip(p->get_item_count() - 1, TTR("Collision shapes and raycast nodes (for 2D and 3D) will be visible on the running game if this option is turned on.")); + p->add_check_shortcut(ED_SHORTCUT("editor/visible_navigation", TTR("Visible Navigation")), RUN_DEBUG_NAVIGATION); + p->set_item_tooltip(p->get_item_count() - 1, TTR("Navigation meshes and polygons will be visible on the running game if this option is turned on.")); + p->add_separator(); + //those are now on by default, since they are harmless + p->add_check_shortcut(ED_SHORTCUT("editor/sync_scene_changes", TTR("Sync Scene Changes")), RUN_LIVE_DEBUG); + p->set_item_tooltip(p->get_item_count() - 1, TTR("When this option is turned on, any changes made to the scene in the editor will be replicated in the running game.\nWhen used remotely on a device, this is more efficient with network filesystem.")); + p->set_item_checked(p->get_item_count() - 1, true); + p->add_check_shortcut(ED_SHORTCUT("editor/sync_script_changes", TTR("Sync Script Changes")), RUN_RELOAD_SCRIPTS); + p->set_item_tooltip(p->get_item_count() - 1, TTR("When this option is turned on, any script that is saved will be reloaded on the running game.\nWhen used remotely on a device, this is more efficient with network filesystem.")); + p->set_item_checked(p->get_item_count() - 1, true); + + // Multi-instance, start/stop + instances_menu = memnew(PopupMenu); + instances_menu->set_name("run_instances"); + instances_menu->set_hide_on_checkable_item_selection(false); + + p->add_child(instances_menu); + p->add_separator(); + p->add_submenu_item(TTR("Run Multiple Instances"), "run_instances"); + + instances_menu->add_radio_check_item(TTR("Run 1 Instance")); + instances_menu->set_item_metadata(0, 1); + instances_menu->add_radio_check_item(TTR("Run 2 Instances")); + instances_menu->set_item_metadata(1, 2); + instances_menu->add_radio_check_item(TTR("Run 3 Instances")); + instances_menu->set_item_metadata(2, 3); + instances_menu->add_radio_check_item(TTR("Run 4 Instances")); + instances_menu->set_item_metadata(3, 4); + instances_menu->set_item_checked(0, true); + instances_menu->connect("index_pressed", callable_mp(this, &DebuggerEditorPlugin::_select_run_count)); + p->connect("id_pressed", callable_mp(this, &DebuggerEditorPlugin::_menu_option)); } DebuggerEditorPlugin::~DebuggerEditorPlugin() { - // Should delete debugger? + memdelete(file_server); +} + +void DebuggerEditorPlugin::_select_run_count(int p_index) { + int len = instances_menu->get_item_count(); + for (int idx = 0; idx < len; idx++) { + instances_menu->set_item_checked(idx, idx == p_index); + } + EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_debug_instances", instances_menu->get_item_metadata(p_index)); +} + +void DebuggerEditorPlugin::_menu_option(int p_option) { + switch (p_option) { + case RUN_FILE_SERVER: { + + bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_FILE_SERVER)); + + if (ischecked) { + file_server->stop(); + } else { + file_server->start(); + } + + debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_FILE_SERVER), !ischecked); + EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_file_server", !ischecked); + + } break; + case RUN_LIVE_DEBUG: { + + bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_LIVE_DEBUG)); + + debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_LIVE_DEBUG), !ischecked); + EditorDebuggerNode::get_singleton()->set_live_debugging(!ischecked); + EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_live_debug", !ischecked); + + } break; + case RUN_DEPLOY_REMOTE_DEBUG: { + + bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG)); + debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG), !ischecked); + EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_deploy_remote_debug", !ischecked); + + } break; + case RUN_DEBUG_COLLISONS: { + + bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_COLLISONS)); + debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_COLLISONS), !ischecked); + EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_debug_collisons", !ischecked); + + } break; + case RUN_DEBUG_NAVIGATION: { + + bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION)); + debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION), !ischecked); + EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_debug_navigation", !ischecked); + + } break; + case RUN_RELOAD_SCRIPTS: { + + bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS)); + debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS), !ischecked); + + ScriptEditor::get_singleton()->set_live_auto_reload_running_scripts(!ischecked); + EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_reload_scripts", !ischecked); + + } break; + } +} + +void DebuggerEditorPlugin::_notification(int p_what) { + if (p_what == NOTIFICATION_READY) + _update_debug_options(); +} + +void DebuggerEditorPlugin::_update_debug_options() { + bool check_deploy_remote = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_deploy_remote_debug", false); + bool check_file_server = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_file_server", false); + bool check_debug_collisions = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_collisons", false); + bool check_debug_navigation = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_navigation", false); + bool check_live_debug = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_live_debug", false); + bool check_reload_scripts = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_reload_scripts", false); + int instances = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_instances", 1); + + if (check_deploy_remote) _menu_option(RUN_DEPLOY_REMOTE_DEBUG); + if (check_file_server) _menu_option(RUN_FILE_SERVER); + if (check_debug_collisions) _menu_option(RUN_DEBUG_COLLISONS); + if (check_debug_navigation) _menu_option(RUN_DEBUG_NAVIGATION); + if (check_live_debug) _menu_option(RUN_LIVE_DEBUG); + if (check_reload_scripts) _menu_option(RUN_RELOAD_SCRIPTS); + + int len = instances_menu->get_item_count(); + for (int idx = 0; idx < len; idx++) { + bool checked = (int)instances_menu->get_item_metadata(idx) == instances; + instances_menu->set_item_checked(idx, checked); + } } diff --git a/editor/plugins/debugger_editor_plugin.h b/editor/plugins/debugger_editor_plugin.h index 05d6ece72d..5ec6399921 100644 --- a/editor/plugins/debugger_editor_plugin.h +++ b/editor/plugins/debugger_editor_plugin.h @@ -31,19 +31,41 @@ #ifndef DEBUGGER_EDITOR_PLUGIN_H #define DEBUGGER_EDITOR_PLUGIN_H -#include "editor/debugger/editor_debugger_node.h" -#include "editor/editor_node.h" #include "editor/editor_plugin.h" +class EditorNode; +class EditorFileServer; +class MenuButton; +class PopupMenu; + class DebuggerEditorPlugin : public EditorPlugin { GDCLASS(DebuggerEditorPlugin, EditorPlugin); +private: + MenuButton *debug_menu; + EditorFileServer *file_server; + PopupMenu *instances_menu; + + enum MenuOptions { + RUN_FILE_SERVER, + RUN_LIVE_DEBUG, + RUN_DEBUG_COLLISONS, + RUN_DEBUG_NAVIGATION, + RUN_DEPLOY_REMOTE_DEBUG, + RUN_RELOAD_SCRIPTS, + }; + + void _update_debug_options(); + void _notification(int p_what); + void _select_run_count(int p_index); + void _menu_option(int p_option); + public: virtual String get_name() const { return "Debugger"; } bool has_main_screen() const { return false; } - DebuggerEditorPlugin(EditorNode *p_node); + DebuggerEditorPlugin(EditorNode *p_node, MenuButton *p_menu); ~DebuggerEditorPlugin(); }; diff --git a/editor/plugins/gi_probe_editor_plugin.cpp b/editor/plugins/gi_probe_editor_plugin.cpp index ddcbb11f7c..c077c23e8a 100644 --- a/editor/plugins/gi_probe_editor_plugin.cpp +++ b/editor/plugins/gi_probe_editor_plugin.cpp @@ -70,22 +70,33 @@ void GIProbeEditorPlugin::_notification(int p_what) { return; } - String text; - - Vector3i size = gi_probe->get_estimated_cell_size(); - text = itos(size.x) + ", " + itos(size.y) + ", " + itos(size.z); + const Vector3i size = gi_probe->get_estimated_cell_size(); + String text = vformat(String::utf8("%d × %d × %d"), size.x, size.y, size.z); int data_size = 4; if (GLOBAL_GET("rendering/quality/gi_probes/anisotropic")) { data_size += 4; } - text += " - VRAM Size: " + String::num(size.x * size.y * size.z * data_size / (1024.0 * 1024.0), 2) + " Mb."; + const double size_mb = size.x * size.y * size.z * data_size / (1024.0 * 1024.0); + text += " - " + vformat(TTR("VRAM Size: %s MB"), String::num(size_mb, 2)); if (bake_info->get_text() == text) { return; } - bake_info->add_color_override("font_color", bake_info->get_color("success_color", "Editor")); + // Color the label depending on the estimated performance level. + Color color; + if (size_mb <= 16.0 + CMP_EPSILON) { + // Fast. + color = bake_info->get_color("success_color", "Editor"); + } else if (size_mb <= 64.0 + CMP_EPSILON) { + // Medium. + color = bake_info->get_color("warning_color", "Editor"); + } else { + // Slow. + color = bake_info->get_color("error_color", "Editor"); + } + bake_info->add_color_override("font_color", color); bake_info->set_text(text); } } diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index fd9c8f6f39..bb03cad285 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -37,7 +37,6 @@ #include "core/os/os.h" #include "core/project_settings.h" #include "editor/debugger/editor_debugger_node.h" -#include "editor/debugger/script_editor_debugger.h" #include "editor/editor_node.h" #include "editor/editor_run_script.h" #include "editor/editor_scale.h" @@ -166,10 +165,10 @@ void ScriptEditorQuickOpen::_sbox_input(const Ref<InputEvent> &p_ie) { Ref<InputEventKey> k = p_ie; - if (k.is_valid() && (k->get_scancode() == KEY_UP || - k->get_scancode() == KEY_DOWN || - k->get_scancode() == KEY_PAGEUP || - k->get_scancode() == KEY_PAGEDOWN)) { + if (k.is_valid() && (k->get_keycode() == KEY_UP || + k->get_keycode() == KEY_DOWN || + k->get_keycode() == KEY_PAGEUP || + k->get_keycode() == KEY_PAGEDOWN)) { search_options->call("_gui_input", k); search_box->accept_event(); diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index d3d64f0dc5..02168a4c97 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -1600,7 +1600,7 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) { if (mb.is_valid() && mb->get_button_index() == BUTTON_RIGHT && mb->is_pressed()) { local_pos = mb->get_global_position() - tx->get_global_position(); create_menu = true; - } else if (k.is_valid() && k->get_scancode() == KEY_MENU) { + } else if (k.is_valid() && k->get_keycode() == KEY_MENU) { local_pos = tx->_get_cursor_pixel_pos(); create_menu = true; } diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index 31f126cc0a..01b1e21153 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -522,7 +522,7 @@ void ShaderEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) { } Ref<InputEventKey> k = ev; - if (k.is_valid() && k->is_pressed() && k->get_scancode() == KEY_MENU) { + if (k.is_valid() && k->is_pressed() && k->get_keycode() == KEY_MENU) { TextEdit *tx = shader_editor->get_text_edit(); _make_context_menu(tx->is_selection_active(), (get_global_transform().inverse() * tx->get_global_transform()).xform(tx->_get_cursor_pixel_pos())); context_menu->grab_focus(); diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index dd006316f7..647d64c627 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -76,6 +76,176 @@ #define MIN_FOV 0.01 #define MAX_FOV 179 +void ViewportRotationControl::_notification(int p_what) { + + if (p_what == NOTIFICATION_ENTER_TREE) { + axis_menu_options.clear(); + axis_menu_options.push_back(SpatialEditorViewport::VIEW_RIGHT); + axis_menu_options.push_back(SpatialEditorViewport::VIEW_TOP); + axis_menu_options.push_back(SpatialEditorViewport::VIEW_FRONT); + axis_menu_options.push_back(SpatialEditorViewport::VIEW_LEFT); + axis_menu_options.push_back(SpatialEditorViewport::VIEW_BOTTOM); + axis_menu_options.push_back(SpatialEditorViewport::VIEW_REAR); + + axis_colors.clear(); + axis_colors.push_back(get_color("axis_x_color", "Editor")); + axis_colors.push_back(get_color("axis_y_color", "Editor")); + axis_colors.push_back(get_color("axis_z_color", "Editor")); + update(); + + if (!is_connected("mouse_exited", callable_mp(this, &ViewportRotationControl::_on_mouse_exited))) { + connect("mouse_exited", callable_mp(this, &ViewportRotationControl::_on_mouse_exited)); + } + } + + if (p_what == NOTIFICATION_DRAW && viewport != nullptr) { + _draw(); + } +} + +void ViewportRotationControl::_draw() { + Vector2i center = get_size() / 2.0; + float radius = get_size().x / 2.0; + + if (focused_axis > -2 || orbiting) { + draw_circle(center, radius, Color(0.5, 0.5, 0.5, 0.25)); + } + + Vector<Axis2D> axis_to_draw; + _get_sorted_axis(axis_to_draw); + for (int i = 0; i < axis_to_draw.size(); ++i) { + _draw_axis(axis_to_draw[i]); + } +} + +void ViewportRotationControl::_draw_axis(const Axis2D &p_axis) { + bool focused = focused_axis == p_axis.axis; + bool positive = p_axis.axis < 3; + bool front = (Math::abs(p_axis.z_axis) <= 0.001 && positive) || p_axis.z_axis > 0.001; + int direction = p_axis.axis % 3; + + Color axis_color = axis_colors[direction]; + + if (!front) { + axis_color = axis_color.darkened(0.4); + } + Color c = focused ? Color(0.9, 0.9, 0.9) : axis_color; + + if (positive) { + Vector2i center = get_size() / 2.0; + draw_line(center, p_axis.screen_point, c, 1.5 * EDSCALE); + } + + if (front) { + String axis_name = direction == 0 ? "X" : (direction == 1 ? "Y" : "Z"); + draw_circle(p_axis.screen_point, AXIS_CIRCLE_RADIUS, c); + draw_char(get_font("rotation_control", "EditorFonts"), p_axis.screen_point + Vector2i(-4, 5) * EDSCALE, axis_name, "", Color(0.3, 0.3, 0.3)); + } else { + draw_circle(p_axis.screen_point, AXIS_CIRCLE_RADIUS * (0.55 + (0.2 * (1.0 + p_axis.z_axis))), c); + } +} + +void ViewportRotationControl::_get_sorted_axis(Vector<Axis2D> &r_axis) { + Vector2i center = get_size() / 2.0; + float radius = get_size().x / 2.0; + + float axis_radius = radius - AXIS_CIRCLE_RADIUS - 2.0 * EDSCALE; + Basis camera_basis = viewport->to_camera_transform(viewport->cursor).get_basis().inverse(); + + for (int i = 0; i < 3; ++i) { + Vector3 axis_3d = camera_basis.get_axis(i); + Vector2i axis_vector = Vector2(axis_3d.x, -axis_3d.y) * axis_radius; + + if (Math::abs(axis_3d.z) < 1.0) { + Axis2D pos_axis; + pos_axis.axis = i; + pos_axis.screen_point = center + axis_vector; + pos_axis.z_axis = axis_3d.z; + r_axis.push_back(pos_axis); + + Axis2D neg_axis; + neg_axis.axis = i + 3; + neg_axis.screen_point = center - axis_vector; + neg_axis.z_axis = -axis_3d.z; + r_axis.push_back(neg_axis); + } else { + // Special case when the camera is aligned with one axis + Axis2D axis; + axis.axis = i + (axis_3d.z < 0 ? 0 : 3); + axis.screen_point = center; + axis.z_axis = 1.0; + r_axis.push_back(axis); + } + } + + r_axis.sort_custom<Axis2DCompare>(); +} + +void ViewportRotationControl::_gui_input(Ref<InputEvent> p_event) { + const Ref<InputEventMouseButton> mb = p_event; + if (mb.is_valid() && mb->get_button_index() == BUTTON_LEFT) { + Vector2 pos = mb->get_position(); + if (mb->is_pressed()) { + if (pos.distance_to(get_size() / 2.0) < get_size().x / 2.0) { + orbiting = true; + } + } else { + if (focused_axis > -1) { + viewport->_menu_option(axis_menu_options[focused_axis]); + _update_focus(); + } + orbiting = false; + } + } + + const Ref<InputEventMouseMotion> mm = p_event; + if (mm.is_valid()) { + if (orbiting) { + viewport->_nav_orbit(mm, viewport->_get_warped_mouse_motion(mm)); + focused_axis = -1; + } else { + _update_focus(); + } + } +} + +void ViewportRotationControl::_update_focus() { + int original_focus = focused_axis; + focused_axis = -2; + Vector2 mouse_pos = get_local_mouse_position(); + + if (mouse_pos.distance_to(get_size() / 2.0) < get_size().x / 2.0) { + focused_axis = -1; + } + + Vector<Axis2D> axes; + _get_sorted_axis(axes); + + for (int i = 0; i < axes.size(); i++) { + const Axis2D &axis = axes[i]; + if (mouse_pos.distance_to(axis.screen_point) < AXIS_CIRCLE_RADIUS) { + focused_axis = axis.axis; + } + } + + if (focused_axis != original_focus) { + update(); + } +} + +void ViewportRotationControl::_on_mouse_exited() { + focused_axis = -2; + update(); +} + +void ViewportRotationControl::set_viewport(SpatialEditorViewport *p_viewport) { + viewport = p_viewport; +} + +void ViewportRotationControl::_bind_methods() { + ClassDB::bind_method(D_METHOD("_gui_input"), &ViewportRotationControl::_gui_input); +} + void SpatialEditorViewport::_update_camera(float p_interp_delta) { bool is_orthogonal = camera->get_projection() == Camera::PROJECTION_ORTHOGONAL; @@ -104,6 +274,14 @@ void SpatialEditorViewport::_update_camera(float p_interp_delta) { camera_cursor.x_rot = Math::lerp(old_camera_cursor.x_rot, cursor.x_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia))); camera_cursor.y_rot = Math::lerp(old_camera_cursor.y_rot, cursor.y_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia))); + if (Math::abs(camera_cursor.x_rot - cursor.x_rot) < 0.1) { + camera_cursor.x_rot = cursor.x_rot; + } + + if (Math::abs(camera_cursor.y_rot - cursor.y_rot) < 0.1) { + camera_cursor.y_rot = cursor.y_rot; + } + Vector3 forward = to_camera_transform(camera_cursor).basis.xform(Vector3(0, 0, -1)); camera_cursor.pos = camera_cursor.eye_pos + forward * camera_cursor.distance; @@ -131,6 +309,14 @@ void SpatialEditorViewport::_update_camera(float p_interp_delta) { camera_cursor.x_rot = Math::lerp(old_camera_cursor.x_rot, cursor.x_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia))); camera_cursor.y_rot = Math::lerp(old_camera_cursor.y_rot, cursor.y_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia))); + if (Math::abs(camera_cursor.x_rot - cursor.x_rot) < 0.1) { + camera_cursor.x_rot = cursor.x_rot; + } + + if (Math::abs(camera_cursor.y_rot - cursor.y_rot) < 0.1) { + camera_cursor.y_rot = cursor.y_rot; + } + camera_cursor.pos = old_camera_cursor.pos.linear_interpolate(cursor.pos, MIN(1.f, p_interp_delta * (1 / translation_inertia))); camera_cursor.distance = Math::lerp(old_camera_cursor.distance, cursor.distance, MIN(1.f, p_interp_delta * (1 / zoom_inertia))); } @@ -157,12 +343,16 @@ void SpatialEditorViewport::_update_camera(float p_interp_delta) { camera->set_global_transform(to_camera_transform(camera_cursor)); - if (orthogonal) - camera->set_orthogonal(2 * cursor.distance, 0.1, 8192); - else + if (orthogonal) { + float half_fov = Math::deg2rad(get_fov()) / 2.0; + float height = 2.0 * cursor.distance * Math::tan(half_fov); + camera->set_orthogonal(height, 0.1, 8192); + } else { camera->set_perspective(get_fov(), get_znear(), get_zfar()); + } update_transform_gizmo_view(); + rotation_control->update(); } } @@ -548,6 +738,10 @@ void SpatialEditorViewport::_update_name() { String view_mode = orthogonal ? TTR("Orthogonal") : TTR("Perspective"); + if (auto_orthogonal) { + view_mode += " [auto]"; + } + if (name != "") view_menu->set_text(name + " " + view_mode); else @@ -1873,11 +2067,11 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { if (!orthogonal && ED_IS_SHORTCUT("spatial_editor/freelook_toggle", p_event)) { set_freelook_active(!is_freelook_active()); - } else if (k->get_scancode() == KEY_ESCAPE) { + } else if (k->get_keycode() == KEY_ESCAPE) { set_freelook_active(false); } - if (k->get_scancode() == KEY_SPACE) { + if (k->get_keycode() == KEY_SPACE) { if (!k->is_pressed()) emit_signal("toggle_maximize_view", this); } } @@ -1938,6 +2132,10 @@ void SpatialEditorViewport::_nav_orbit(Ref<InputEventWithModifiers> p_event, con return; } + if (orthogonal && auto_orthogonal) { + _menu_option(VIEW_PERSPECTIVE); + } + real_t degrees_per_pixel = EditorSettings::get_singleton()->get("editors/3d/navigation_feel/orbit_sensitivity"); real_t radians_per_pixel = Math::deg2rad(degrees_per_pixel); bool invert_y_axis = EditorSettings::get_singleton()->get("editors/3d/navigation/invert_y_axis"); @@ -1963,6 +2161,10 @@ void SpatialEditorViewport::_nav_look(Ref<InputEventWithModifiers> p_event, cons return; } + if (orthogonal && auto_orthogonal) { + _menu_option(VIEW_PERSPECTIVE); + } + real_t degrees_per_pixel = EditorSettings::get_singleton()->get("editors/3d/navigation_feel/orbit_sensitivity"); real_t radians_per_pixel = Math::deg2rad(degrees_per_pixel); bool invert_y_axis = EditorSettings::get_singleton()->get("editors/3d/navigation/invert_y_axis"); @@ -2074,8 +2276,8 @@ static bool is_shortcut_pressed(const String &p_path) { return false; } const Input &input = *Input::get_singleton(); - int scancode = k->get_scancode(); - return input.is_key_pressed(scancode); + int keycode = k->get_keycode(); + return input.is_key_pressed(keycode); } void SpatialEditorViewport::_update_freelook(real_t delta) { @@ -2154,6 +2356,7 @@ void SpatialEditorViewport::_notification(int p_what) { set_freelook_active(false); } call_deferred("update_transform_gizmo_view"); + rotation_control->set_visible(EditorSettings::get_singleton()->get("editors/3d/navigation/show_viewport_rotation_gizmo")); } if (p_what == NOTIFICATION_RESIZED) { @@ -2526,6 +2729,7 @@ void SpatialEditorViewport::_menu_option(int p_option) { cursor.x_rot = Math_PI / 2.0; set_message(TTR("Top View."), 2); name = TTR("Top"); + _set_auto_orthogonal(); _update_name(); } break; @@ -2535,6 +2739,7 @@ void SpatialEditorViewport::_menu_option(int p_option) { cursor.x_rot = -Math_PI / 2.0; set_message(TTR("Bottom View."), 2); name = TTR("Bottom"); + _set_auto_orthogonal(); _update_name(); } break; @@ -2544,6 +2749,7 @@ void SpatialEditorViewport::_menu_option(int p_option) { cursor.y_rot = Math_PI / 2.0; set_message(TTR("Left View."), 2); name = TTR("Left"); + _set_auto_orthogonal(); _update_name(); } break; @@ -2553,6 +2759,7 @@ void SpatialEditorViewport::_menu_option(int p_option) { cursor.y_rot = -Math_PI / 2.0; set_message(TTR("Right View."), 2); name = TTR("Right"); + _set_auto_orthogonal(); _update_name(); } break; @@ -2562,6 +2769,7 @@ void SpatialEditorViewport::_menu_option(int p_option) { cursor.y_rot = 0; set_message(TTR("Front View."), 2); name = TTR("Front"); + _set_auto_orthogonal(); _update_name(); } break; @@ -2571,6 +2779,7 @@ void SpatialEditorViewport::_menu_option(int p_option) { cursor.y_rot = Math_PI; set_message(TTR("Rear View."), 2); name = TTR("Rear"); + _set_auto_orthogonal(); _update_name(); } break; @@ -2668,6 +2877,7 @@ void SpatialEditorViewport::_menu_option(int p_option) { view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), true); view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), false); orthogonal = false; + auto_orthogonal = false; call_deferred("update_transform_gizmo_view"); _update_name(); @@ -2677,10 +2887,22 @@ void SpatialEditorViewport::_menu_option(int p_option) { view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), false); view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), true); orthogonal = true; + auto_orthogonal = false; call_deferred("update_transform_gizmo_view"); _update_name(); } break; + case VIEW_AUTO_ORTHOGONAL: { + + int idx = view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL); + bool current = view_menu->get_popup()->is_item_checked(idx); + current = !current; + view_menu->get_popup()->set_item_checked(idx, current); + if (auto_orthogonal) { + auto_orthogonal = false; + _update_name(); + } + } break; case VIEW_LOCK_ROTATION: { int idx = view_menu->get_popup()->get_item_index(VIEW_LOCK_ROTATION); @@ -2835,6 +3057,13 @@ void SpatialEditorViewport::_menu_option(int p_option) { } } +void SpatialEditorViewport::_set_auto_orthogonal() { + if (!orthogonal && view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL))) { + _menu_option(VIEW_ORTHOGONAL); + auto_orthogonal = true; + } +} + void SpatialEditorViewport::_preview_exited_scene() { preview_camera->disconnect("toggled", callable_mp(this, &SpatialEditorViewport::_toggle_camera_preview)); @@ -3043,6 +3272,18 @@ void SpatialEditorViewport::set_state(const Dictionary &p_state) { else _menu_option(VIEW_PERSPECTIVE); } + if (p_state.has("view_name")) { + name = p_state["view_name"]; + _update_name(); + } + if (p_state.has("auto_orthogonal")) { + auto_orthogonal = p_state["auto_orthogonal"]; + _update_name(); + } + if (p_state.has("auto_orthogonal_enabled")) { + bool enabled = p_state["auto_orthogonal_enabled"]; + view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL), enabled); + } if (p_state.has("display_mode")) { int display = p_state["display_mode"]; @@ -3137,6 +3378,9 @@ Dictionary SpatialEditorViewport::get_state() const { d["distance"] = cursor.distance; d["use_environment"] = camera->get_environment().is_valid(); d["use_orthogonal"] = camera->get_projection() == Camera::PROJECTION_ORTHOGONAL; + d["view_name"] = name; + d["auto_orthogonal"] = auto_orthogonal; + d["auto_orthogonal_enabled"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL)); if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL))) d["display_mode"] = VIEW_DISPLAY_NORMAL; else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_WIREFRAME))) @@ -3173,6 +3417,7 @@ void SpatialEditorViewport::_bind_methods() { void SpatialEditorViewport::reset() { orthogonal = false; + auto_orthogonal = false; lock_rotation = false; message_time = 0; message = ""; @@ -3574,6 +3819,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed clicked_includes_current = false; orthogonal = false; + auto_orthogonal = false; lock_rotation = false; message_time = 0; zoom_indicator_delay = 0.0; @@ -3626,6 +3872,8 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed view_menu->get_popup()->add_radio_check_item(TTR("Perspective") + " (" + ED_GET_SHORTCUT("spatial_editor/switch_perspective_orthogonal")->get_as_text() + ")", VIEW_PERSPECTIVE); view_menu->get_popup()->add_radio_check_item(TTR("Orthogonal") + " (" + ED_GET_SHORTCUT("spatial_editor/switch_perspective_orthogonal")->get_as_text() + ")", VIEW_ORTHOGONAL); view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), true); + view_menu->get_popup()->add_check_item(TTR("Auto Orthogonal Enabled"), VIEW_AUTO_ORTHOGONAL); + view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL), true); view_menu->get_popup()->add_separator(); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_lock_rotation", TTR("Lock View Rotation")), VIEW_LOCK_ROTATION); view_menu->get_popup()->add_separator(); @@ -3650,7 +3898,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed display_submenu->add_separator(); display_submenu->add_radio_check_item(TTR("Roughness Limiter"), VIEW_DISPLAY_DEBUG_ROUGHNESS_LIMITER); display_submenu->set_name("display_advanced"); - view_menu->get_popup()->add_submenu_item(TTR("Display Advanced..."), "display_advanced"); + view_menu->get_popup()->add_submenu_item(TTR("Display Advanced..."), "display_advanced", VIEW_DISPLAY_ADVANCED); view_menu->get_popup()->add_separator(); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_environment", TTR("View Environment")), VIEW_ENVIRONMENT); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_gizmos", TTR("View Gizmos")), VIEW_GIZMOS); @@ -3753,6 +4001,28 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed locked_label->set_text(TTR("View Rotation Locked")); locked_label->hide(); + top_right_vbox = memnew(VBoxContainer); + top_right_vbox->set_anchors_and_margins_preset(PRESET_TOP_RIGHT, PRESET_MODE_MINSIZE, 2.0 * EDSCALE); + top_right_vbox->set_h_grow_direction(GROW_DIRECTION_BEGIN); + + rotation_control = memnew(ViewportRotationControl); + rotation_control->set_custom_minimum_size(Size2(80, 80) * EDSCALE); + rotation_control->set_h_size_flags(SIZE_SHRINK_END); + rotation_control->set_viewport(this); + top_right_vbox->add_child(rotation_control); + + fps_label = memnew(Label); + fps_label->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -90 * EDSCALE); + fps_label->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 10 * EDSCALE); + fps_label->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -10 * EDSCALE); + fps_label->set_h_grow_direction(GROW_DIRECTION_BEGIN); + fps_label->set_tooltip(TTR("Note: The FPS value displayed is the editor's framerate.\nIt cannot be used as a reliable indication of in-game performance.")); + fps_label->set_mouse_filter(MOUSE_FILTER_PASS); // Otherwise tooltip doesn't show. + top_right_vbox->add_child(fps_label); + fps_label->hide(); + + surface->add_child(top_right_vbox); + accept = NULL; freelook_active = false; @@ -4308,13 +4578,15 @@ void SpatialEditor::set_state(const Dictionary &p_state) { } if (d.has("translate_snap")) - snap_translate->set_text(d["translate_snap"]); + snap_translate_value = d["translate_snap"]; if (d.has("rotate_snap")) - snap_rotate->set_text(d["rotate_snap"]); + snap_rotate_value = d["rotate_snap"]; if (d.has("scale_snap")) - snap_scale->set_text(d["scale_snap"]); + snap_scale_value = d["scale_snap"]; + + _snap_update(); if (d.has("local_coords")) { tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_pressed(d["local_coords"]); @@ -4421,6 +4693,20 @@ void SpatialEditor::edit(Spatial *p_spatial) { } } +void SpatialEditor::_snap_changed() { + + snap_translate_value = snap_translate->get_text().to_double(); + snap_rotate_value = snap_rotate->get_text().to_double(); + snap_scale_value = snap_scale->get_text().to_double(); +} + +void SpatialEditor::_snap_update() { + + snap_translate->set_text(String::num(snap_translate_value)); + snap_rotate->set_text(String::num(snap_rotate_value)); + snap_scale->set_text(String::num(snap_scale_value)); +} + void SpatialEditor::_xform_dialog_action() { Transform t; @@ -4487,12 +4773,12 @@ void SpatialEditor::_menu_item_toggled(bool pressed, int p_option) { case MENU_TOOL_OVERRIDE_CAMERA: { EditorDebuggerNode *const debugger = EditorDebuggerNode::get_singleton(); + using Override = EditorDebuggerNode::CameraOverride; if (pressed) { - using Override = ScriptEditorDebugger::CameraOverride; debugger->set_camera_override((Override)(Override::OVERRIDE_3D_1 + camera_override_viewport_id)); } else { - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE); + debugger->set_camera_override(Override::OVERRIDE_NONE); } } break; @@ -4545,8 +4831,8 @@ void SpatialEditor::_update_camera_override_viewport(Object *p_viewport) { EditorDebuggerNode *const debugger = EditorDebuggerNode::get_singleton(); camera_override_viewport_id = current_viewport->index; - if (debugger->get_camera_override() >= ScriptEditorDebugger::OVERRIDE_3D_1) { - using Override = ScriptEditorDebugger::CameraOverride; + if (debugger->get_camera_override() >= EditorDebuggerNode::OVERRIDE_3D_1) { + using Override = EditorDebuggerNode::CameraOverride; debugger->set_camera_override((Override)(Override::OVERRIDE_3D_1 + camera_override_viewport_id)); } @@ -5503,7 +5789,7 @@ void SpatialEditor::_notification(int p_what) { if (!is_visible() && tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->is_pressed()) { EditorDebuggerNode *debugger = EditorDebuggerNode::get_singleton(); - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE); + debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_NONE); tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->set_pressed(false); } } @@ -5901,25 +6187,30 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { /* SNAP DIALOG */ + snap_translate_value = 1; + snap_rotate_value = 15; + snap_scale_value = 10; + snap_dialog = memnew(ConfirmationDialog); snap_dialog->set_title(TTR("Snap Settings")); add_child(snap_dialog); + snap_dialog->connect("confirmed", callable_mp(this, &SpatialEditor::_snap_changed)); + snap_dialog->get_cancel()->connect("pressed", callable_mp(this, &SpatialEditor::_snap_update)); VBoxContainer *snap_dialog_vbc = memnew(VBoxContainer); snap_dialog->add_child(snap_dialog_vbc); snap_translate = memnew(LineEdit); - snap_translate->set_text("1"); snap_dialog_vbc->add_margin_child(TTR("Translate Snap:"), snap_translate); snap_rotate = memnew(LineEdit); - snap_rotate->set_text("15"); snap_dialog_vbc->add_margin_child(TTR("Rotate Snap (deg.):"), snap_rotate); snap_scale = memnew(LineEdit); - snap_scale->set_text("10"); snap_dialog_vbc->add_margin_child(TTR("Scale Snap (%):"), snap_scale); + _snap_update(); + /* SETTINGS DIALOG */ settings_dialog = memnew(ConfirmationDialog); @@ -6022,6 +6313,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "editors/3d/manipulator_gizmo_size", PROPERTY_HINT_RANGE, "16,1024,1")); EDITOR_DEF("editors/3d/manipulator_gizmo_opacity", 0.4); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::FLOAT, "editors/3d/manipulator_gizmo_opacity", PROPERTY_HINT_RANGE, "0,1,0.01")); + EDITOR_DEF("editors/3d/navigation/show_viewport_rotation_gizmo", true); over_gizmo_handle = -1; } diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index a4d6b13389..489bce1e15 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -33,6 +33,7 @@ #include "editor/editor_node.h" #include "editor/editor_plugin.h" +#include "editor/editor_scale.h" #include "scene/3d/immediate_geometry.h" #include "scene/3d/light.h" #include "scene/3d/visual_instance.h" @@ -41,6 +42,7 @@ class Camera; class SpatialEditor; class EditorSpatialGizmoPlugin; +class SpatialEditorViewport; class ViewportContainer; class EditorSpatialGizmo : public SpatialGizmo { @@ -138,10 +140,48 @@ public: ~EditorSpatialGizmo(); }; +class ViewportRotationControl : public Control { + GDCLASS(ViewportRotationControl, Control); + + struct Axis2D { + Vector2i screen_point; + float z_axis = -99.0; + int axis = -1; + }; + + struct Axis2DCompare { + _FORCE_INLINE_ bool operator()(const Axis2D &l, const Axis2D &r) const { + return l.z_axis < r.z_axis; + } + }; + + SpatialEditorViewport *viewport = nullptr; + Vector<Color> axis_colors; + Vector<int> axis_menu_options; + bool orbiting = false; + int focused_axis = -2; + + const float AXIS_CIRCLE_RADIUS = 8.0f * EDSCALE; + +protected: + static void _bind_methods(); + void _notification(int p_what); + void _gui_input(Ref<InputEvent> p_event); + void _draw(); + void _draw_axis(const Axis2D &p_axis); + void _get_sorted_axis(Vector<Axis2D> &r_axis); + void _update_focus(); + void _on_mouse_exited(); + +public: + void set_viewport(SpatialEditorViewport *p_viewport); +}; + class SpatialEditorViewport : public Control { GDCLASS(SpatialEditorViewport, Control); friend class SpatialEditor; + friend class ViewportRotationControl; enum { VIEW_TOP, @@ -168,6 +208,7 @@ class SpatialEditorViewport : public Control { VIEW_DISPLAY_OVERDRAW, VIEW_DISPLAY_SHADELESS, VIEW_DISPLAY_LIGHTING, + VIEW_DISPLAY_ADVANCED, VIEW_DISPLAY_NORMAL_BUFFER, VIEW_DISPLAY_DEBUG_SHADOW_ATLAS, VIEW_DISPLAY_DEBUG_DIRECTIONAL_SHADOW_ATLAS, @@ -179,6 +220,7 @@ class SpatialEditorViewport : public Control { VIEW_DISPLAY_DEBUG_ROUGHNESS_LIMITER, VIEW_LOCK_ROTATION, VIEW_CINEMATIC_PREVIEW, + VIEW_AUTO_ORTHOGONAL, VIEW_MAX }; @@ -199,6 +241,7 @@ private: int index; String name; void _menu_option(int p_option); + void _set_auto_orthogonal(); Spatial *preview_node; AABB *preview_bounds; Vector<String> selected_files; @@ -223,6 +266,7 @@ private: Camera *camera; bool transforming; bool orthogonal; + bool auto_orthogonal; bool lock_rotation; float gizmo_scale; @@ -231,10 +275,13 @@ private: TextureRect *crosshair; Label *info_label; - Label *fps_label; Label *cinema_label; Label *locked_label; + VBoxContainer *top_right_vbox; + ViewportRotationControl *rotation_control; + Label *fps_label; + struct _RayResult { Spatial *item; @@ -545,6 +592,9 @@ private: Ref<StandardMaterial3D> plane_gizmo_color_hl[3]; int over_gizmo_handle; + float snap_translate_value; + float snap_rotate_value; + float snap_scale_value; Ref<ArrayMesh> selection_box; RID indicators; @@ -624,6 +674,8 @@ private: SpinBox *settings_znear; SpinBox *settings_zfar; + void _snap_changed(); + void _snap_update(); void _xform_dialog_action(); void _menu_item_pressed(int p_option); void _menu_item_toggled(bool pressed, int p_option); diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 288aeb5c4a..5d615c7553 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -990,7 +990,7 @@ SpriteFramesEditor::SpriteFramesEditor() { empty2->connect("pressed", callable_mp(this, &SpriteFramesEditor::_empty2_pressed)); move_up->connect("pressed", callable_mp(this, &SpriteFramesEditor::_up_pressed)); move_down->connect("pressed", callable_mp(this, &SpriteFramesEditor::_down_pressed)); - file->connect("files_selected", callable_mp(this, &SpriteFramesEditor::_file_load_request)); + file->connect("files_selected", callable_mp(this, &SpriteFramesEditor::_file_load_request), make_binds(-1)); loading_scene = false; sel = -1; diff --git a/editor/plugins/text_editor.cpp b/editor/plugins/text_editor.cpp index 8d3788dea7..35f23ccf1d 100644 --- a/editor/plugins/text_editor.cpp +++ b/editor/plugins/text_editor.cpp @@ -582,7 +582,7 @@ void TextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) { } Ref<InputEventKey> k = ev; - if (k.is_valid() && k->is_pressed() && k->get_scancode() == KEY_MENU) { + if (k.is_valid() && k->is_pressed() && k->get_keycode() == KEY_MENU) { TextEdit *tx = code_editor->get_text_edit(); int line = tx->cursor_get_line(); _make_context_menu(tx->is_selection_active(), tx->can_fold(line), tx->is_folded(line), (get_global_transform().inverse() * tx->get_global_transform()).xform(tx->_get_cursor_pixel_pos())); diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index 82f04aaac4..017f986469 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -359,10 +359,10 @@ void TileMapEditor::_sbox_input(const Ref<InputEvent> &p_ie) { Ref<InputEventKey> k = p_ie; - if (k.is_valid() && (k->get_scancode() == KEY_UP || - k->get_scancode() == KEY_DOWN || - k->get_scancode() == KEY_PAGEUP || - k->get_scancode() == KEY_PAGEDOWN)) { + if (k.is_valid() && (k->get_keycode() == KEY_UP || + k->get_keycode() == KEY_DOWN || + k->get_keycode() == KEY_PAGEUP || + k->get_keycode() == KEY_PAGEDOWN)) { palette->call("_gui_input", k); search_box->accept_event(); @@ -1377,7 +1377,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) { if (k.is_valid() && k->is_pressed()) { - if (last_tool == TOOL_NONE && tool == TOOL_PICKING && k->get_scancode() == KEY_SHIFT && k->get_command()) { + if (last_tool == TOOL_NONE && tool == TOOL_PICKING && k->get_keycode() == KEY_SHIFT && k->get_command()) { // trying to draw a rectangle with the painting tool, so change to the correct tool tool = last_tool; @@ -1385,7 +1385,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) { _update_button_tool(); } - if (k->get_scancode() == KEY_ESCAPE) { + if (k->get_keycode() == KEY_ESCAPE) { if (tool == TOOL_PASTING) copydata.clear(); @@ -1506,7 +1506,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) { if (tool == TOOL_NONE) { - if (k->get_scancode() == KEY_SHIFT && k->get_command()) { + if (k->get_keycode() == KEY_SHIFT && k->get_command()) { tool = TOOL_PICKING; _update_button_tool(); @@ -1514,9 +1514,9 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) { } else if (tool == TOOL_PICKING) { #ifdef APPLE_STYLE_KEYS - if (k->get_scancode() == KEY_META) { + if (k->get_keycode() == KEY_META) { #else - if (k->get_scancode() == KEY_CONTROL) { + if (k->get_keycode() == KEY_CONTROL) { #endif // Go back to that last tool if KEY_CONTROL was released. tool = last_tool; diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index b3b9afb811..9100e28352 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -1663,10 +1663,10 @@ void VisualShaderEditor::_show_members_dialog(bool at_mouse_pos) { void VisualShaderEditor::_sbox_input(const Ref<InputEvent> &p_ie) { Ref<InputEventKey> ie = p_ie; - if (ie.is_valid() && (ie->get_scancode() == KEY_UP || - ie->get_scancode() == KEY_DOWN || - ie->get_scancode() == KEY_ENTER || - ie->get_scancode() == KEY_KP_ENTER)) { + if (ie.is_valid() && (ie->get_keycode() == KEY_UP || + ie->get_keycode() == KEY_DOWN || + ie->get_keycode() == KEY_ENTER || + ie->get_keycode() == KEY_KP_ENTER)) { members->call("_gui_input", ie); node_filter->accept_event(); @@ -2978,7 +2978,7 @@ class VisualShaderNodePluginDefaultEditor : public VBoxContainer { Ref<Resource> parent_resource; public: - void _property_changed(const String &prop, const Variant &p_value, const String &p_field, bool p_changing = false) { + void _property_changed(const String &p_property, const Variant &p_value, const String &p_field = "", bool p_changing = false) { if (p_changing) return; @@ -2986,13 +2986,13 @@ public: UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo(); updating = true; - undo_redo->create_action(TTR("Edit Visual Property") + ": " + prop, UndoRedo::MERGE_ENDS); - undo_redo->add_do_property(node.ptr(), prop, p_value); - undo_redo->add_undo_property(node.ptr(), prop, node->get(prop)); + undo_redo->create_action(TTR("Edit Visual Property") + ": " + p_property, UndoRedo::MERGE_ENDS); + undo_redo->add_do_property(node.ptr(), p_property, p_value); + undo_redo->add_undo_property(node.ptr(), p_property, node->get(p_property)); if (p_value.get_type() == Variant::OBJECT) { - RES prev_res = node->get(prop); + RES prev_res = node->get(p_property); RES curr_res = p_value; if (curr_res.is_null()) { diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 79f3745d11..94f9bf2767 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -1899,7 +1899,7 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) { // This is handled by the platform implementation on macOS, // so only define the shortcut on other platforms #ifndef OSX_ENABLED - if (k->get_scancode_with_modifiers() == (KEY_MASK_CMD | KEY_Q)) { + if (k->get_keycode_with_modifiers() == (KEY_MASK_CMD | KEY_Q)) { _dim_window(); get_tree()->quit(); } @@ -1908,9 +1908,9 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) { if (tabs->get_current_tab() != 0) return; - bool scancode_handled = true; + bool keycode_handled = true; - switch (k->get_scancode()) { + switch (k->get_keycode()) { case KEY_ENTER: { @@ -1967,14 +1967,14 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) { if (k->get_command()) this->project_filter->search_box->grab_focus(); else - scancode_handled = false; + keycode_handled = false; } break; default: { - scancode_handled = false; + keycode_handled = false; } break; } - if (scancode_handled) { + if (keycode_handled) { accept_event(); } } @@ -2740,7 +2740,8 @@ void ProjectListFilter::_filter_option_selected(int p_idx) { FilterOption selected = (FilterOption)(filter_option->get_selected()); if (_current_filter != selected) { _current_filter = selected; - emit_signal("filter_changed"); + if (is_inside_tree()) + emit_signal("filter_changed"); } } diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index b4f101b47b..7d8a4a733d 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -82,7 +82,7 @@ void ProjectSettingsEditor::_unhandled_input(const Ref<InputEvent> &p_event) { if (k.is_valid() && is_window_modal_on_top() && k->is_pressed()) { - if (k->get_scancode_with_modifiers() == (KEY_MASK_CMD | KEY_F)) { + if (k->get_keycode_with_modifiers() == (KEY_MASK_CMD | KEY_F)) { if (search_button->is_pressed()) { search_box->grab_focus(); search_box->select_all(); @@ -110,7 +110,8 @@ void ProjectSettingsEditor::_notification(int p_what) { translation_list->connect("button_pressed", callable_mp(this, &ProjectSettingsEditor::_translation_delete)); _update_actions(); - popup_add->add_icon_item(get_icon("Keyboard", "EditorIcons"), TTR("Key "), INPUT_KEY); //"Key " - because the word 'key' has already been used as a key animation + popup_add->add_icon_item(get_icon("Keyboard", "EditorIcons"), TTR("Key"), INPUT_KEY); //"Key " - because the word 'key' has already been used as a key animation + popup_add->add_icon_item(get_icon("KeyboardPhysical", "EditorIcons"), TTR("Physical Key"), INPUT_KEY_PHYSICAL); popup_add->add_icon_item(get_icon("JoyButton", "EditorIcons"), TTR("Joy Button"), INPUT_JOY_BUTTON); popup_add->add_icon_item(get_icon("JoyAxis", "EditorIcons"), TTR("Joy Axis"), INPUT_JOY_MOTION); popup_add->add_icon_item(get_icon("Mouse", "EditorIcons"), TTR("Mouse Button"), INPUT_MOUSE_BUTTON); @@ -146,6 +147,7 @@ void ProjectSettingsEditor::_notification(int p_what) { search_box->set_clear_button_enabled(true); action_add_error->add_color_override("font_color", get_color("error_color", "Editor")); popup_add->set_item_icon(popup_add->get_item_index(INPUT_KEY), get_icon("Keyboard", "EditorIcons")); + popup_add->set_item_icon(popup_add->get_item_index(INPUT_KEY_PHYSICAL), get_icon("KeyboardPhysical", "EditorIcons")); popup_add->set_item_icon(popup_add->get_item_index(INPUT_JOY_BUTTON), get_icon("JoyButton", "EditorIcons")); popup_add->set_item_icon(popup_add->get_item_index(INPUT_JOY_MOTION), get_icon("JoyAxis", "EditorIcons")); popup_add->set_item_icon(popup_add->get_item_index(INPUT_MOUSE_BUTTON), get_icon("Mouse", "EditorIcons")); @@ -361,7 +363,13 @@ void ProjectSettingsEditor::_press_a_key_confirm() { Ref<InputEventKey> ie; ie.instance(); - ie->set_scancode(last_wait_for_key->get_scancode()); + if (press_a_key_physical) { + ie->set_physical_keycode(last_wait_for_key->get_physical_keycode()); + ie->set_keycode(0); + } else { + ie->set_physical_keycode(0); + ie->set_keycode(last_wait_for_key->get_keycode()); + } ie->set_shift(last_wait_for_key->get_shift()); ie->set_alt(last_wait_for_key->get_alt()); ie->set_control(last_wait_for_key->get_control()); @@ -379,8 +387,14 @@ void ProjectSettingsEditor::_press_a_key_confirm() { Ref<InputEventKey> aie = events[i]; if (aie.is_null()) continue; - if (aie->get_scancode_with_modifiers() == ie->get_scancode_with_modifiers()) { - return; + if (!press_a_key_physical) { + if (aie->get_keycode_with_modifiers() == ie->get_keycode_with_modifiers()) { + return; + } + } else { + if (aie->get_physical_keycode_with_modifiers() == ie->get_physical_keycode_with_modifiers()) { + return; + } } } @@ -441,10 +455,10 @@ void ProjectSettingsEditor::_wait_for_key(const Ref<InputEvent> &p_event) { Ref<InputEventKey> k = p_event; - if (k.is_valid() && k->is_pressed() && k->get_scancode() != 0) { + if (k.is_valid() && k->is_pressed() && k->get_keycode() != 0) { last_wait_for_key = p_event; - const String str = keycode_get_string(k->get_scancode_with_modifiers()); + const String str = (press_a_key_physical) ? keycode_get_string(k->get_physical_keycode_with_modifiers()) + TTR(" (Physical)") : keycode_get_string(k->get_keycode_with_modifiers()); press_a_key_label->set_text(str); press_a_key->get_ok()->set_disabled(false); @@ -460,6 +474,7 @@ void ProjectSettingsEditor::_add_item(int p_item, Ref<InputEvent> p_exiting_even case INPUT_KEY: { + press_a_key_physical = false; press_a_key_label->set_text(TTR("Press a Key...")); press_a_key->get_ok()->set_disabled(true); last_wait_for_key = Ref<InputEvent>(); @@ -467,6 +482,16 @@ void ProjectSettingsEditor::_add_item(int p_item, Ref<InputEvent> p_exiting_even press_a_key->grab_focus(); } break; + case INPUT_KEY_PHYSICAL: { + + press_a_key_physical = true; + press_a_key_label->set_text(TTR("Press a Key...")); + + last_wait_for_key = Ref<InputEvent>(); + press_a_key->popup_centered(Size2(250, 80) * EDSCALE); + press_a_key->grab_focus(); + + } break; case INPUT_MOUSE_BUTTON: { device_index_label->set_text(TTR("Mouse Button Index:")); @@ -547,7 +572,11 @@ void ProjectSettingsEditor::_edit_item(Ref<InputEvent> p_exiting_event) { InputType ie_type; if ((Ref<InputEventKey>(p_exiting_event)).is_valid()) { - ie_type = INPUT_KEY; + if ((Ref<InputEventKey>(p_exiting_event))->get_keycode() != 0) { + ie_type = INPUT_KEY; + } else { + ie_type = INPUT_KEY_PHYSICAL; + } } else if ((Ref<InputEventJoypadButton>(p_exiting_event)).is_valid()) { ie_type = INPUT_JOY_BUTTON; @@ -745,10 +774,14 @@ void ProjectSettingsEditor::_update_actions() { Ref<InputEventKey> k = event; if (k.is_valid()) { - const String str = keycode_get_string(k->get_scancode_with_modifiers()); + const String str = (k->get_keycode() == 0) ? keycode_get_string(k->get_physical_keycode_with_modifiers()) + TTR(" (Physical)") : keycode_get_string(k->get_keycode_with_modifiers()); action2->set_text(0, str); - action2->set_icon(0, get_icon("Keyboard", "EditorIcons")); + if ((k->get_keycode() != 0)) { + action2->set_icon(0, get_icon("Keyboard", "EditorIcons")); + } else { + action2->set_icon(0, get_icon("KeyboardPhysical", "EditorIcons")); + } } Ref<InputEventJoypadButton> jb = event; @@ -1924,6 +1957,8 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { add_child(popup_add); popup_add->connect("id_pressed", callable_mp(this, &ProjectSettingsEditor::_add_item), make_binds(Ref<InputEvent>())); + press_a_key_physical = false; + press_a_key = memnew(ConfirmationDialog); press_a_key->set_focus_mode(FOCUS_ALL); add_child(press_a_key); diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h index 5755b258c3..52e7612acd 100644 --- a/editor/project_settings_editor.h +++ b/editor/project_settings_editor.h @@ -45,6 +45,7 @@ class ProjectSettingsEditor : public AcceptDialog { enum InputType { INPUT_KEY, + INPUT_KEY_PHYSICAL, INPUT_JOY_BUTTON, INPUT_JOY_MOTION, INPUT_MOUSE_BUTTON @@ -77,6 +78,7 @@ class ProjectSettingsEditor : public AcceptDialog { OptionButton *type; PopupMenu *popup_add; ConfirmationDialog *press_a_key; + bool press_a_key_physical; Label *press_a_key_label; ConfirmationDialog *device_input; OptionButton *device_id; @@ -117,7 +119,7 @@ class ProjectSettingsEditor : public AcceptDialog { void _item_del(); void _update_actions(); void _save(); - void _add_item(int p_item, Ref<InputEvent> p_exiting_event = NULL); + void _add_item(int p_item, Ref<InputEvent> p_exiting_event = Ref<InputEvent>()); void _edit_item(Ref<InputEvent> p_exiting_event); void _action_check(String p_action); diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index 9f49ffcd28..ede7b860d6 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -45,7 +45,7 @@ void PropertySelector::_sbox_input(const Ref<InputEvent> &p_ie) { if (k.is_valid()) { - switch (k->get_scancode()) { + switch (k->get_keycode()) { case KEY_UP: case KEY_DOWN: case KEY_PAGEUP: diff --git a/editor/quick_open.cpp b/editor/quick_open.cpp index 0214fc6bfc..8a5fad269f 100644 --- a/editor/quick_open.cpp +++ b/editor/quick_open.cpp @@ -83,7 +83,7 @@ void EditorQuickOpen::_sbox_input(const Ref<InputEvent> &p_ie) { Ref<InputEventKey> k = p_ie; if (k.is_valid()) { - switch (k->get_scancode()) { + switch (k->get_keycode()) { case KEY_UP: case KEY_DOWN: case KEY_PAGEUP: diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index b6741ccaec..c5ebf40482 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1127,7 +1127,7 @@ void SceneTreeDock::_notification(int p_what) { } break; case NOTIFICATION_ENTER_TREE: { - clear_inherit_confirm->connect("confirmed", callable_mp(this, &SceneTreeDock::_tool_selected), varray(TOOL_SCENE_CLEAR_INHERITANCE_CONFIRM)); + clear_inherit_confirm->connect("confirmed", callable_mp(this, &SceneTreeDock::_tool_selected), make_binds(TOOL_SCENE_CLEAR_INHERITANCE_CONFIRM, false)); } break; case NOTIFICATION_EXIT_TREE: { @@ -2739,7 +2739,7 @@ void SceneTreeDock::_update_create_root_dialog() { void SceneTreeDock::_favorite_root_selected(const String &p_class) { selected_favorite_root = p_class; - _tool_selected(TOOL_CREATE_FAVORITE, false); + _tool_selected(TOOL_CREATE_FAVORITE); } void SceneTreeDock::_feature_profile_changed() { diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index ff708f9229..cf93fab9a8 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -163,7 +163,7 @@ void EditorSettingsDialog::_unhandled_input(const Ref<InputEvent> &p_event) { handled = true; } - if (k->get_scancode_with_modifiers() == (KEY_MASK_CMD | KEY_F)) { + if (k->get_keycode_with_modifiers() == (KEY_MASK_CMD | KEY_F)) { _focus_current_search_box(); handled = true; } @@ -317,10 +317,10 @@ void EditorSettingsDialog::_wait_for_key(const Ref<InputEvent> &p_event) { Ref<InputEventKey> k = p_event; - if (k.is_valid() && k->is_pressed() && k->get_scancode() != 0) { + if (k.is_valid() && k->is_pressed() && k->get_keycode() != 0) { last_wait_for_key = k; - const String str = keycode_get_string(k->get_scancode_with_modifiers()); + const String str = keycode_get_string(k->get_keycode_with_modifiers()); press_a_key_label->set_text(str); press_a_key->accept_event(); @@ -334,7 +334,7 @@ void EditorSettingsDialog::_press_a_key_confirm() { Ref<InputEventKey> ie; ie.instance(); - ie->set_scancode(last_wait_for_key->get_scancode()); + ie->set_keycode(last_wait_for_key->get_keycode()); ie->set_shift(last_wait_for_key->get_shift()); ie->set_control(last_wait_for_key->get_control()); ie->set_alt(last_wait_for_key->get_alt()); diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index c155430eae..d6e443ec14 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -2724,10 +2724,11 @@ GIProbeGizmoPlugin::GIProbeGizmoPlugin() { create_material("gi_probe_material", gizmo_color); - gizmo_color.a = 0.5; + // This gizmo draws a lot of lines. Use a low opacity to make it not too intrusive. + gizmo_color.a = 0.1; create_material("gi_probe_internal_material", gizmo_color); - gizmo_color.a = 0.1; + gizmo_color.a = 0.05; create_material("gi_probe_solid_material", gizmo_color); create_icon_material("gi_probe_icon", SpatialEditor::get_singleton()->get_icon("GizmoGIProbe", "EditorIcons")); diff --git a/editor/translations/af.po b/editor/translations/af.po index eab0005cb1..23afeb2e55 100644 --- a/editor/translations/af.po +++ b/editor/translations/af.po @@ -1551,6 +1551,10 @@ msgstr "Naam" msgid "Singleton" msgstr "EnkelHouer" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Toneel word Opgedateer" @@ -1850,7 +1854,7 @@ msgstr "Open 'n Lêer" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Verfris" @@ -4072,10 +4076,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "Hulpbron" @@ -6042,7 +6042,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Skep Intekening" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12344,6 +12344,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/ar.po b/editor/translations/ar.po index c9520d2669..2cd523ec69 100644 --- a/editor/translations/ar.po +++ b/editor/translations/ar.po @@ -1515,6 +1515,10 @@ msgstr "الأسم" msgid "Singleton" msgstr "الفردية" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "لصق المُعامل" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "يُحدث المشهد" @@ -1824,7 +1828,7 @@ msgstr "أظهر في مدير الملفات" msgid "New Folder..." msgstr "مجلد جديد..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "تحديث" @@ -4132,10 +4136,6 @@ msgid "Copy Params" msgstr "إنسخ المُعامل" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "لصق المُعامل" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "خطأ: لا مصدر حركة علي الحافظة!" @@ -6174,7 +6174,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "إنشاء متصادم محدب قريب" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12606,6 +12606,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/bg.po b/editor/translations/bg.po index 2281de6a8e..651776b6ab 100644 --- a/editor/translations/bg.po +++ b/editor/translations/bg.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-14 03:19+0000\n" +"PO-Revision-Date: 2020-02-28 13:33+0000\n" "Last-Translator: Любомир Василев <lyubomirv@abv.bg>\n" "Language-Team: Bulgarian <https://hosted.weblate.org/projects/godot-engine/" "godot/bg/>\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -70,31 +70,31 @@ msgstr "" #: core/ustring.cpp msgid "B" -msgstr "" +msgstr "Б" #: core/ustring.cpp msgid "KiB" -msgstr "" +msgstr "КиБ" #: core/ustring.cpp msgid "MiB" -msgstr "" +msgstr "МиБ" #: core/ustring.cpp msgid "GiB" -msgstr "" +msgstr "ГиБ" #: core/ustring.cpp msgid "TiB" -msgstr "" +msgstr "ТиБ" #: core/ustring.cpp msgid "PiB" -msgstr "" +msgstr "ПиБ" #: core/ustring.cpp msgid "EiB" -msgstr "" +msgstr "ЕиБ" #: editor/animation_bezier_editor.cpp msgid "Free" @@ -110,7 +110,7 @@ msgstr "Огледално" #: editor/animation_bezier_editor.cpp editor/editor_profiler.cpp msgid "Time:" -msgstr "" +msgstr "Време:" #: editor/animation_bezier_editor.cpp msgid "Value:" @@ -130,7 +130,7 @@ msgstr "" #: editor/animation_bezier_editor.cpp msgid "Add Bezier Point" -msgstr "" +msgstr "Добавяне на точка на Безие" #: editor/animation_bezier_editor.cpp msgid "Move Bezier Points" @@ -1462,6 +1462,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Обновяване на сцената" @@ -1738,7 +1742,7 @@ msgstr "Показване във файловия мениджър" msgid "New Folder..." msgstr "Нова папка..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3874,10 +3878,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5277,23 +5277,20 @@ msgid "Pan Mode" msgstr "Панорамен режим" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Ruler Mode" -msgstr "Режим на Селектиране" +msgstr "Режим на линията" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggle smart snapping." -msgstr "Добави Breakpoint" +msgstr "Превключване на умното прилепване." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Smart Snap" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggle grid snapping." -msgstr "Добави Breakpoint" +msgstr "Превключване на прилепването към решетката." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Grid Snap" @@ -5337,23 +5334,20 @@ msgid "Snap to Node Anchor" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to Node Sides" -msgstr "Избиране на всичко" +msgstr "Прилепване към страните на възела" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to Node Center" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to Other Nodes" -msgstr "Поставяне на възелите" +msgstr "Прилепване към другите възли" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to Guides" -msgstr "Избиране на всичко" +msgstr "Прилепване към водачите" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -5376,9 +5370,8 @@ msgid "Restores the object's children's ability to be selected." msgstr "Възстановява на способността да се избират децата на обекта." #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Skeleton Options" -msgstr "Само Селекцията" +msgstr "Опции на скелета" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show Bones" @@ -5389,9 +5382,8 @@ msgid "Make Custom Bone(s) from Node(s)" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Clear Custom Bones" -msgstr "Възпроизвеждане на сцена по избор" +msgstr "Изчистване на персонализираните кости" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -5530,9 +5522,8 @@ msgid "" msgstr "" #: editor/plugins/collision_polygon_editor_plugin.cpp -#, fuzzy msgid "Create Polygon3D" -msgstr "Създаване на папка" +msgstr "Създаване на Polygon3D" #: editor/plugins/collision_polygon_editor_plugin.cpp msgid "Edit Poly" @@ -5555,9 +5546,8 @@ msgstr "" #: editor/plugins/cpu_particles_editor_plugin.cpp #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp -#, fuzzy msgid "Restart" -msgstr "Автоматично Рестартиране:" +msgstr "Рестартиране" #: editor/plugins/cpu_particles_2d_editor_plugin.cpp #: editor/plugins/particles_2d_editor_plugin.cpp @@ -5653,14 +5643,12 @@ msgid "Load Curve Preset" msgstr "" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Add Point" -msgstr "Добави Възел..." +msgstr "Добавяне на точка" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Remove Point" -msgstr "LMB: Премести Точка." +msgstr "Премахване на точката" #: editor/plugins/curve_editor_plugin.cpp #, fuzzy @@ -5755,9 +5743,8 @@ msgid "Can't create multiple convex collision shapes for the scene root." msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create any collision shapes." -msgstr "Неуспешно създаване на папка." +msgstr "Не могат да бъдат създадени никакви форми за колизии." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy @@ -5831,7 +5818,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Създаване на папка" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -5892,11 +5879,12 @@ msgid "Remove item %d?" msgstr "" #: editor/plugins/mesh_library_editor_plugin.cpp -#, fuzzy msgid "" "Update from existing scene?:\n" "%s" -msgstr "Обновяване от Cцена" +msgstr "" +"Обновяване от съществуващата сцена?:\n" +"%s" #: editor/plugins/mesh_library_editor_plugin.cpp #, fuzzy @@ -6053,9 +6041,8 @@ msgid "\"%s\" doesn't inherit from Spatial." msgstr "" #: editor/plugins/particles_editor_plugin.cpp -#, fuzzy msgid "\"%s\" doesn't contain geometry." -msgstr "Възелът не съдържа геометрия." +msgstr "„%s“ не съдържа геометрия." #: editor/plugins/particles_editor_plugin.cpp #, fuzzy @@ -6231,9 +6218,8 @@ msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/physical_bone_plugin.cpp -#, fuzzy msgid "Move Joint" -msgstr "LMB: Премести Точка." +msgstr "Преместване на ставата" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "" @@ -6265,28 +6251,24 @@ msgid "Create Polygon & UV" msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Create Internal Vertex" -msgstr "Създай нова хоризонтална помощна линия" +msgstr "Създаване на вътрешен вертекс" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Remove Internal Vertex" -msgstr "Премахни вертикална помощна линия" +msgstr "Премахване на вътрешния вертекс" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Invalid Polygon (need 3 different vertices)" msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Add Custom Polygon" -msgstr "Приставки" +msgstr "Добавяне на персонализиран полигон" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Remove Custom Polygon" -msgstr "Преместване на Полигон" +msgstr "Премахване на персонализирания полигон" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Transform UV Map" @@ -6314,23 +6296,20 @@ msgid "UV" msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Points" -msgstr "LMB: Премести Точка." +msgstr "Точки" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Polygons" -msgstr "Полигон->UV" +msgstr "Полигони" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Bones" msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Move Points" -msgstr "LMB: Премести Точка." +msgstr "Преместване на точките" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Ctrl: Rotate" @@ -6391,9 +6370,8 @@ msgid "Clear UV" msgstr "Изчистване на UV" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Grid Settings" -msgstr "Настройки" +msgstr "Настройки на решетката" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Snap" @@ -6506,38 +6484,32 @@ msgid "Error writing TextFile:" msgstr "Грешка при записването:" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Could not load file at:" -msgstr "Грешка, не можа да се зареди файла." +msgstr "Файлът не може да бъде зареден:" #: editor/plugins/script_editor_plugin.cpp msgid "Error saving file!" msgstr "Грешка при записването на файла!" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Error while saving theme." -msgstr "Грешка при записване." +msgstr "Грешка при запазването на темата." #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Error Saving" msgstr "Грешка при запазване" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Error importing theme." -msgstr "Грешка при внасяне на темата" +msgstr "Грешка при внасянето на темата." #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Error Importing" -msgstr "Имаше грешка при внасянето" +msgstr "Грешка при внасянето" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "New Text File..." -msgstr "Нов TextFile..." +msgstr "Нов текстов файл…" #: editor/plugins/script_editor_plugin.cpp msgid "Open File" @@ -6595,23 +6567,20 @@ msgid "Find Previous" msgstr "" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Filter scripts" -msgstr "Поставяне на възелите" +msgstr "Филтриране на скриптовете" #: editor/plugins/script_editor_plugin.cpp msgid "Toggle alphabetical sorting of the method list." msgstr "" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Filter methods" -msgstr "Поставяне на възелите" +msgstr "Филтриране на методите" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Sort" -msgstr "Подреждане:" +msgstr "Сортиране" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp @@ -6638,14 +6607,12 @@ msgid "File" msgstr "Файл" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Open..." -msgstr "Отвори" +msgstr "Отваряне…" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Reopen Closed Script" -msgstr "Нова сцена" +msgstr "Повторно отваряне на затворения скрипт" #: editor/plugins/script_editor_plugin.cpp msgid "Save All" @@ -6674,9 +6641,8 @@ msgid "Theme" msgstr "Тема" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Import Theme..." -msgstr "Внасяне на тема" +msgstr "Внасяне на тема…" #: editor/plugins/script_editor_plugin.cpp msgid "Reload Theme" @@ -6724,9 +6690,8 @@ msgid "Debug with External Editor" msgstr "" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Open Godot online documentation." -msgstr "Отвори документацията на Godot онлайн" +msgstr "Отваряне на документацията на Godot в Интернет." #: editor/plugins/script_editor_plugin.cpp msgid "Request Docs" @@ -6775,18 +6740,16 @@ msgid "Debugger" msgstr "Дебъгер" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Search Results" -msgstr "Търсене" +msgstr "Резултати от търсенето" #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Scripts" msgstr "Изчистване на последните скриптове" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Connections to method:" -msgstr "Свързване..." +msgstr "Връзки към метода:" #: editor/plugins/script_text_editor.cpp editor/script_editor_debugger.cpp msgid "Source" @@ -6810,9 +6773,8 @@ msgid "(ignore)" msgstr "" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Function" -msgstr "Отиди на Ред" +msgstr "Към функция" #: editor/plugins/script_text_editor.cpp msgid "Only resources from filesystem can be dropped." @@ -6862,9 +6824,8 @@ msgid "Bookmarks" msgstr "" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Breakpoints" -msgstr "Създай точки." +msgstr "Точки на прекъсване" #: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp @@ -6913,9 +6874,8 @@ msgid "Complete Symbol" msgstr "Знак за авт. довършване" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Evaluate Selection" -msgstr "Центрирай върху Селекцията" +msgstr "Изчисляване на избраното" #: editor/plugins/script_text_editor.cpp msgid "Trim Trailing Whitespace" @@ -6934,42 +6894,36 @@ msgid "Auto Indent" msgstr "" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Find in Files..." -msgstr "Намери във файлове" +msgstr "Търсене във файловете…" #: editor/plugins/script_text_editor.cpp msgid "Contextual Help" msgstr "" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Toggle Bookmark" -msgstr "Добави Breakpoint" +msgstr "Превключване на отметка" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Next Bookmark" -msgstr "Отиди на следващия Breakpoint" +msgstr "Към следващата отметка" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Previous Bookmark" -msgstr "Отиди на Предишния Breakpoint" +msgstr "Към предходната отметка" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Remove All Bookmarks" -msgstr "Премахни Всички Breakpoint-ове" +msgstr "Премахване на всички отметки" #: editor/plugins/script_text_editor.cpp msgid "Go to Function..." msgstr "" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Line..." -msgstr "Отиди на Ред" +msgstr "Към ред…" #: editor/plugins/script_text_editor.cpp #: modules/visual_script/visual_script_editor.cpp @@ -6981,23 +6935,20 @@ msgid "Remove All Breakpoints" msgstr "Премахване на всички точки на прекъсване" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Next Breakpoint" -msgstr "Отиди на следващия Breakpoint" +msgstr "Към следващата точка на прекъсване" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Previous Breakpoint" -msgstr "Отиди на Предишния Breakpoint" +msgstr "Към предходната точка на прекъсване" #: editor/plugins/shader_editor_plugin.cpp -#, fuzzy msgid "" "This shader has been modified on on disk.\n" "What action should be taken?" msgstr "" -"Следните файлове са по-нови на диска.\n" -"Кое действие трябва да се предприеме?:" +"Този шеъдър е бил променен на диска.\n" +"Какво да се предприеме?" #: editor/plugins/shader_editor_plugin.cpp msgid "Shader" @@ -8496,42 +8447,36 @@ msgid "Change output port name" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Remove input port" -msgstr "Затваряне на всичко" +msgstr "Премахване на входния порт" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Remove output port" -msgstr "Внасяне на текстури" +msgstr "Премахване на изходния порт" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Set expression" -msgstr "Двуизмерна текстура" +msgstr "Задаване на израз" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Resize VisualShader node" -msgstr "Поставяне на възелите" +msgstr "Преоразмеряване на възела VisualShader" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Set Uniform Name" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Set Input Default Port" -msgstr "Задай по Подразбиране за '%s'" +msgstr "Задаване на входен порт по подразбиране" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node to Visual Shader" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Duplicate Nodes" -msgstr "Направи дупликат на Key(s)" +msgstr "Дублиране на възлите" #: editor/plugins/visual_shader_editor_plugin.cpp #: modules/visual_script/visual_script_editor.cpp @@ -8539,9 +8484,8 @@ msgid "Paste Nodes" msgstr "Поставяне на възлите" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Delete Nodes" -msgstr "Избиране на всичко" +msgstr "Изтриване на възлите" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Visual Shader Input Type Changed" @@ -8560,19 +8504,16 @@ msgid "Light" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Show resulted shader code." -msgstr "Създай Възел" +msgstr "Показване на получения код на шейдъра." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Create Shader Node" -msgstr "Създай Възел" +msgstr "Създаване на възел с шейдър" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Color function." -msgstr "Отиди на Ред" +msgstr "Функция за цвят." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Color operator." @@ -8631,14 +8572,12 @@ msgid "SoftLight operator." msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Color constant." -msgstr "Постоянно" +msgstr "Константа за цвят." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Color uniform." -msgstr "Изнасяне към платформа" +msgstr "Uniform за цвят." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Returns the boolean result of the %s comparison between two parameters." @@ -9260,9 +9199,8 @@ msgid "VisualShader" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Edit Visual Property" -msgstr "Промени Филтрите" +msgstr "Редактиране на визуалното свойство" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Visual Shader Mode Changed" @@ -9307,9 +9245,8 @@ msgid "Release" msgstr "" #: editor/project_export.cpp -#, fuzzy msgid "Exporting All" -msgstr "Изнасяне за %s" +msgstr "Изнасяне на всичко" #: editor/project_export.cpp msgid "The given export path doesn't exist:" @@ -9334,9 +9271,8 @@ msgid "" msgstr "" #: editor/project_export.cpp -#, fuzzy msgid "Export Path" -msgstr "Изнасяне на проекта" +msgstr "Път за изнасяне" #: editor/project_export.cpp msgid "Resources" @@ -9383,9 +9319,8 @@ msgid "Make Patch" msgstr "" #: editor/project_export.cpp -#, fuzzy msgid "Pack File" -msgstr "Файл:" +msgstr "Пакетен файл" #: editor/project_export.cpp msgid "Features" @@ -9400,14 +9335,12 @@ msgid "Feature List:" msgstr "" #: editor/project_export.cpp -#, fuzzy msgid "Script" -msgstr "Нов скрипт" +msgstr "Скрипт" #: editor/project_export.cpp -#, fuzzy msgid "Script Export Mode:" -msgstr "Режим на изнасяне:" +msgstr "Режим на изнасяне на скриптове:" #: editor/project_export.cpp msgid "Text" @@ -9430,28 +9363,24 @@ msgid "Script Encryption Key (256-bits as hex):" msgstr "" #: editor/project_export.cpp -#, fuzzy msgid "Export PCK/Zip" -msgstr "Изнасяне" +msgstr "Изнасяне на PCK/Zip" #: editor/project_export.cpp msgid "Export Project" msgstr "Изнасяне на проекта" #: editor/project_export.cpp -#, fuzzy msgid "Export mode?" -msgstr "Режим на изнасяне:" +msgstr "Режим на изнасяне?" #: editor/project_export.cpp -#, fuzzy msgid "Export All" -msgstr "Изнасяне" +msgstr "Изнасяне на всичко" #: editor/project_export.cpp editor/project_manager.cpp -#, fuzzy msgid "ZIP File" -msgstr "Файл:" +msgstr "Файл ZIP" #: editor/project_export.cpp msgid "Godot Game Pack" @@ -9483,14 +9412,12 @@ msgid "" msgstr "" #: editor/project_manager.cpp -#, fuzzy msgid "Please choose an empty folder." -msgstr "Моля, изнесете извън папката на проекта!" +msgstr "Моля, изберете празна папка." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a \"project.godot\" or \".zip\" file." -msgstr "Моля, изнесете извън папката на проекта!" +msgstr "Моля, изберете файл от тип „project.godot“ или „.zip“." #: editor/project_manager.cpp msgid "This directory already contains a Godot project." @@ -9505,14 +9432,12 @@ msgid "Imported Project" msgstr "Внесен проект" #: editor/project_manager.cpp -#, fuzzy msgid "Invalid Project Name." -msgstr "Име:" +msgstr "Неправилно име на проект." #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't create folder." -msgstr "Неуспешно създаване на папка." +msgstr "Папката не може да бъде създадена." #: editor/project_manager.cpp msgid "There is already a folder in this path with the specified name." @@ -9541,36 +9466,32 @@ msgid "Couldn't create project.godot in project path." msgstr "" #: editor/project_manager.cpp -#, fuzzy msgid "Rename Project" -msgstr "Нов проект" +msgstr "Преименуване на проекта" #: editor/project_manager.cpp msgid "Import Existing Project" msgstr "Внасяне на съществуващ проект" #: editor/project_manager.cpp -#, fuzzy msgid "Import & Edit" -msgstr "Внасяне и отваряне" +msgstr "Внасяне и редактиране" #: editor/project_manager.cpp msgid "Create New Project" msgstr "Създаване на нов проект" #: editor/project_manager.cpp -#, fuzzy msgid "Create & Edit" -msgstr "Създаване" +msgstr "Създаване и редактиране" #: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -#, fuzzy msgid "Install & Edit" -msgstr "Инсталиране" +msgstr "Инсталиране и редактиране" #: editor/project_manager.cpp msgid "Project Name:" @@ -9581,9 +9502,8 @@ msgid "Project Path:" msgstr "Път до проекта:" #: editor/project_manager.cpp -#, fuzzy msgid "Project Installation Path:" -msgstr "Път:" +msgstr "Път на инсталация на проекта:" #: editor/project_manager.cpp msgid "Renderer:" @@ -9622,18 +9542,16 @@ msgid "Unnamed Project" msgstr "" #: editor/project_manager.cpp -#, fuzzy msgid "Missing Project" -msgstr "Внасяне на съществуващ проект" +msgstr "Проектът липсва" #: editor/project_manager.cpp msgid "Error: Project is missing on the filesystem." msgstr "" #: editor/project_manager.cpp -#, fuzzy msgid "Can't open project at '%s'." -msgstr "Създаване на нов проект" +msgstr "Не може да бъде отворен проектът в „%s“." #: editor/project_manager.cpp msgid "Are you sure to open more than one project?" @@ -9722,9 +9640,8 @@ msgid "Project Manager" msgstr "Управление на проектите" #: editor/project_manager.cpp -#, fuzzy msgid "Projects" -msgstr "Проект" +msgstr "Проекти" #: editor/project_manager.cpp msgid "Last Modified" @@ -9743,9 +9660,8 @@ msgid "New Project" msgstr "Нов проект" #: editor/project_manager.cpp -#, fuzzy msgid "Remove Missing" -msgstr "Затваряне на всичко" +msgstr "Премахване на липсващите" #: editor/project_manager.cpp msgid "Templates" @@ -9756,9 +9672,8 @@ msgid "Restart Now" msgstr "" #: editor/project_manager.cpp -#, fuzzy msgid "Can't run project" -msgstr "Създаване на нов проект" +msgstr "Проектът не може да бъде пуснат" #: editor/project_manager.cpp msgid "" @@ -9789,9 +9704,8 @@ msgid "" msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy msgid "An action with the name '%s' already exists." -msgstr "Вече съществува файл или папка с това име." +msgstr "Вече съществува действие с името „%s“." #: editor/project_settings_editor.cpp msgid "Rename Input Action Event" @@ -9806,9 +9720,8 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy msgid "All Devices" -msgstr "Устройство" +msgstr "Всички устройства" #: editor/project_settings_editor.cpp msgid "Device" @@ -9843,24 +9756,20 @@ msgid "Wheel Down Button" msgstr "Колелце надолу" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Wheel Left Button" -msgstr "Колелце нагоре" +msgstr "Ляв бутон на колелцето" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Wheel Right Button" -msgstr "Дясно копче" +msgstr "Десен бутон на колелцето" #: editor/project_settings_editor.cpp -#, fuzzy msgid "X Button 1" -msgstr "Копче 6" +msgstr "Бутон X 1" #: editor/project_settings_editor.cpp -#, fuzzy msgid "X Button 2" -msgstr "Копче 6" +msgstr "Бутон X 2" #: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" @@ -10017,9 +9926,8 @@ msgid "Action:" msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Action" -msgstr "Описание:" +msgstr "Действие" #: editor/project_settings_editor.cpp msgid "Deadzone" @@ -10066,19 +9974,16 @@ msgid "Locales Filter" msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show All Locales" -msgstr "Събери всички Редове" +msgstr "Показване на всички езици" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show Selected Locales Only" -msgstr "Само Селекцията" +msgstr "Показване само на избраните езици" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Filter mode:" -msgstr "Поставяне на възелите" +msgstr "Режим на филтриране:" #: editor/project_settings_editor.cpp msgid "Locales:" @@ -10121,18 +10026,16 @@ msgid "Assign" msgstr "" #: editor/property_editor.cpp -#, fuzzy msgid "Select Node" -msgstr "Избиране на всичко" +msgstr "Избиране на възел" #: editor/property_editor.cpp msgid "Error loading file: Not a resource!" msgstr "" #: editor/property_editor.cpp -#, fuzzy msgid "Pick a Node" -msgstr "Поставяне" +msgstr "Изберете възел" #: editor/property_editor.cpp msgid "Bit %d, val %d." @@ -10143,9 +10046,8 @@ msgid "Select Property" msgstr "Избиране на свойство" #: editor/property_selector.cpp -#, fuzzy msgid "Select Virtual Method" -msgstr "Изберете метод" +msgstr "Избиране на виртуален метод" #: editor/property_selector.cpp msgid "Select Method" @@ -10164,9 +10066,8 @@ msgid "Suffix" msgstr "" #: editor/rename_dialog.cpp -#, fuzzy msgid "Use Regular Expressions" -msgstr "Двуизмерна текстура" +msgstr "Използване на регулярни изрази" #: editor/rename_dialog.cpp msgid "Advanced Options" @@ -10177,18 +10078,16 @@ msgid "Substitute" msgstr "" #: editor/rename_dialog.cpp -#, fuzzy msgid "Node name" -msgstr "Възел" +msgstr "Име на възела" #: editor/rename_dialog.cpp msgid "Node's parent name, if available" msgstr "" #: editor/rename_dialog.cpp -#, fuzzy msgid "Node type" -msgstr "Възел" +msgstr "Тип на възела" #: editor/rename_dialog.cpp msgid "Current scene name" @@ -10217,9 +10116,8 @@ msgid "Initial value for the counter" msgstr "" #: editor/rename_dialog.cpp -#, fuzzy msgid "Step" -msgstr "Стъпка (сек.):" +msgstr "Стъпка" #: editor/rename_dialog.cpp msgid "Amount by which counter is incremented for each node" @@ -10338,9 +10236,8 @@ msgid "Instance Child Scene" msgstr "" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Clear Script" -msgstr "Нова сцена" +msgstr "Премахване на скрипта" #: editor/scene_tree_dock.cpp msgid "This operation can't be done on the tree root." @@ -10371,14 +10268,12 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Make node as Root" -msgstr "Запазване на сцената" +msgstr "Превръщане на възела в корен" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Delete %d nodes?" -msgstr "Избиране на всичко" +msgstr "Изтриване на %d възела?" #: editor/scene_tree_dock.cpp msgid "Delete the root node \"%s\"?" @@ -10389,9 +10284,8 @@ msgid "Delete node \"%s\" and its children?" msgstr "" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Delete node \"%s\"?" -msgstr "Избиране на всичко" +msgstr "Изтриване на възела „%s“?" #: editor/scene_tree_dock.cpp msgid "Can not perform with the root node." @@ -10422,33 +10316,28 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "New Scene Root" -msgstr "Запазване на сцената" +msgstr "Нов корен на сцената" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Create Root Node:" -msgstr "Създаване на папка" +msgstr "Създаване на коренен възел:" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "2D Scene" -msgstr "Сцена" +msgstr "2-измерна сцена" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "3D Scene" -msgstr "Сцена" +msgstr "3-измерна сцена" #: editor/scene_tree_dock.cpp msgid "User Interface" msgstr "" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Other Node" -msgstr "Избиране на всичко" +msgstr "Друг възел" #: editor/scene_tree_dock.cpp msgid "Can't operate on nodes from a foreign scene!" @@ -10459,9 +10348,8 @@ msgid "Can't operate on nodes the current scene inherits from!" msgstr "" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Attach Script" -msgstr "Нова сцена" +msgstr "Закачане на скрипт" #: editor/scene_tree_dock.cpp msgid "Remove Node(s)" @@ -10502,9 +10390,8 @@ msgid "Load As Placeholder" msgstr "" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Open Documentation" -msgstr "Отвори документацията на Godot онлайн" +msgstr "Отваряне на документацията" #: editor/scene_tree_dock.cpp msgid "Add Child Node" @@ -10843,18 +10730,16 @@ msgid "Child process connected." msgstr "Разкачи" #: editor/script_editor_debugger.cpp -#, fuzzy msgid "Copy Error" -msgstr "Грешки" +msgstr "Копиране на грешката" #: editor/script_editor_debugger.cpp msgid "Video RAM" msgstr "" #: editor/script_editor_debugger.cpp -#, fuzzy msgid "Skip Breakpoints" -msgstr "Създай точки." +msgstr "Пропускане на точките на прекъсване" #: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" @@ -11046,9 +10931,8 @@ msgid "Select dependencies of the library for this entry" msgstr "" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Remove current entry" -msgstr "Преместване на пътечката нагоре." +msgstr "Премахване на текущия елемент" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" @@ -11059,14 +10943,12 @@ msgid "Platform:" msgstr "" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Platform" -msgstr "Изнасяне към платформа" +msgstr "Платформа" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Dynamic Library" -msgstr "Изнасяне на библиотеката" +msgstr "Динамична библиотека" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Add an architecture entry" @@ -11086,9 +10968,8 @@ msgid "Disabled GDNative Singleton" msgstr "" #: modules/gdnative/gdnative_library_singleton_editor.cpp -#, fuzzy msgid "Library" -msgstr "Изнасяне на библиотеката" +msgstr "Библиотека" #: modules/gdnative/gdnative_library_singleton_editor.cpp msgid "Libraries: " @@ -11099,9 +10980,8 @@ msgid "GDNative" msgstr "" #: modules/gdscript/gdscript_functions.cpp -#, fuzzy msgid "Step argument is zero!" -msgstr "Стъпката на range() е нула!" +msgstr "Аргументът за стъпката е нула!" #: modules/gdscript/gdscript_functions.cpp #, fuzzy @@ -12244,6 +12124,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/bn.po b/editor/translations/bn.po index a7f287be62..77ff28a113 100644 --- a/editor/translations/bn.po +++ b/editor/translations/bn.po @@ -1583,6 +1583,10 @@ msgstr "নাম" msgid "Singleton" msgstr "একক-বস্তু/সিঙ্গেলটোন" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "মানসমূহ প্রতিলেপন/পেস্ট করুন" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "দৃশ্য হাল নাগাদ হচ্ছে" @@ -1899,7 +1903,7 @@ msgstr "ফাইল-ম্যানেজারে দেখুন" msgid "New Folder..." msgstr "ফোল্ডার তৈরি করুন" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "রিফ্রেস করুন" @@ -4323,10 +4327,6 @@ msgid "Copy Params" msgstr "মানসমূহ প্রতিলিপি/কপি করুন" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "মানসমূহ প্রতিলেপন/পেস্ট করুন" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "রিসোর্সের ক্লীপবোর্ড খালি!" @@ -6414,7 +6414,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "কনভেক্স কলিশ়ন সহোদর তৈরি করুন" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -13163,6 +13163,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/ca.po b/editor/translations/ca.po index fb0a3af30c..15d4265ef4 100644 --- a/editor/translations/ca.po +++ b/editor/translations/ca.po @@ -1497,6 +1497,10 @@ msgstr "Nom" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Enganxa els Paràmetres" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Actualitzant l'Escena" @@ -1784,7 +1788,7 @@ msgstr "Mostrar en el Gestor de Fitxers" msgid "New Folder..." msgstr "Nou Directori..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Refresca" @@ -4060,10 +4064,6 @@ msgid "Copy Params" msgstr "Copia els Paràmetres" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Enganxa els Paràmetres" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Edita el Porta-retalls de Recursos" @@ -6062,7 +6062,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Crea col·lisions convexes entre nodes germans" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12763,6 +12763,11 @@ msgstr "" "Les formes de tipus pla no funcionen bé i se suprimiran en futures versions. " "Si us plau, no els utilitzeu." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Res és visible perquè no s'ha assignat cap malla." diff --git a/editor/translations/cs.po b/editor/translations/cs.po index 39bcef5430..f3ae992410 100644 --- a/editor/translations/cs.po +++ b/editor/translations/cs.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-19 08:56+0000\n" +"PO-Revision-Date: 2020-03-01 05:50+0000\n" "Last-Translator: Vojtěch Šamla <auzkok@seznam.cz>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/godot-engine/godot/" "cs/>\n" @@ -31,7 +31,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 3.11\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -702,9 +702,8 @@ msgid "Line Number:" msgstr "Číslo řádku:" #: editor/code_editor.cpp -#, fuzzy msgid "%d replaced." -msgstr "Nahradit..." +msgstr "%d nahrazeno." #: editor/code_editor.cpp editor/editor_help.cpp msgid "%d match." @@ -1501,6 +1500,10 @@ msgstr "Název" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Vložit parametry" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Aktualizuji scénu" @@ -1788,7 +1791,7 @@ msgstr "Zobrazit ve správci souborů" msgid "New Folder..." msgstr "Nová složka..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Obnovit" @@ -2297,7 +2300,6 @@ msgstr "" "pochopili tento proces." #: editor/editor_node.cpp -#, fuzzy msgid "" "This resource belongs to a scene that was instanced or inherited.\n" "Changes to it won't be kept when saving the current scene." @@ -2314,7 +2316,6 @@ msgstr "" "panelu Import a znovu ho importujte." #: editor/editor_node.cpp -#, fuzzy msgid "" "This scene was imported, so changes to it won't be kept.\n" "Instancing it or inheriting will allow making changes to it.\n" @@ -2327,7 +2328,6 @@ msgstr "" "pochopili tento proces." #: editor/editor_node.cpp -#, fuzzy msgid "" "This is a remote object, so changes to it won't be kept.\n" "Please read the documentation relevant to debugging to better understand " @@ -2733,17 +2733,16 @@ msgid "Project Settings..." msgstr "Nastavení projektu..." #: editor/editor_node.cpp editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Version Control" -msgstr "Verze:" +msgstr "Správa verzí" #: editor/editor_node.cpp editor/plugins/version_control_editor_plugin.cpp msgid "Set Up Version Control" -msgstr "" +msgstr "Nastavit správu verzí" #: editor/editor_node.cpp msgid "Shut Down Version Control" -msgstr "" +msgstr "Vypnout správu verzí" #: editor/editor_node.cpp msgid "Export..." @@ -2873,9 +2872,8 @@ msgid "Editor Layout" msgstr "Rozložení editoru" #: editor/editor_node.cpp -#, fuzzy msgid "Take Screenshot" -msgstr "Dává smysl!" +msgstr "Vytvořit snímek obrazovky" #: editor/editor_node.cpp #, fuzzy @@ -2932,7 +2930,7 @@ msgstr "Online dokumentace" #: editor/editor_node.cpp msgid "Q&A" -msgstr "Q&A" +msgstr "Otázky a odpovědi" #: editor/editor_node.cpp msgid "Issue Tracker" @@ -2996,19 +2994,16 @@ msgid "Spins when the editor window redraws." msgstr "Točí se, když se okno editoru překresluje." #: editor/editor_node.cpp -#, fuzzy msgid "Update Continuously" -msgstr "Spojité" +msgstr "Aktualizovat průběžně" #: editor/editor_node.cpp -#, fuzzy msgid "Update When Changed" -msgstr "Akualizovat změny" +msgstr "Akualizovat při změně" #: editor/editor_node.cpp -#, fuzzy msgid "Hide Update Spinner" -msgstr "Vypnout aktualizační kolečko" +msgstr "Schovat aktualizační kolečko" #: editor/editor_node.cpp msgid "FileSystem" @@ -3118,9 +3113,8 @@ msgid "Warning!" msgstr "Varování!" #: editor/editor_path.cpp -#, fuzzy msgid "No sub-resources found." -msgstr "Dílčí zdroje" +msgstr "Nebyly nalezeny žádné dílčí zdroje." #: editor/editor_plugin.cpp msgid "Creating Mesh Previews" @@ -3372,7 +3366,6 @@ msgid "Import From Node:" msgstr "Import z uzlu:" #: editor/export_template_manager.cpp -#, fuzzy msgid "Redownload" msgstr "Stáhnout znovu" @@ -3434,9 +3427,8 @@ msgid "Importing:" msgstr "Importování:" #: editor/export_template_manager.cpp -#, fuzzy msgid "Error getting the list of mirrors." -msgstr "Chyba při vytváření podpisového objektu." +msgstr "Chyba při získávání seznamu zrcadel." #: editor/export_template_manager.cpp msgid "Error parsing JSON of mirror list. Please report this issue!" @@ -3483,22 +3475,20 @@ msgid "Download Complete." msgstr "Stahování dokončeno." #: editor/export_template_manager.cpp -#, fuzzy msgid "Cannot remove temporary file:" -msgstr "Nelze uložit motiv do souboru:" +msgstr "Nelze odstranit dočasný soubor:" #: editor/export_template_manager.cpp -#, fuzzy msgid "" "Templates installation failed.\n" "The problematic templates archives can be found at '%s'." msgstr "" -"Instalace šablon selhala. Problémové archivy šablon lze nalézt na '%s'." +"Instalace šablon selhala.\n" +"Problémové archivy šablon lze nalézt na '%s'." #: editor/export_template_manager.cpp -#, fuzzy msgid "Error requesting URL:" -msgstr "Chyba požadavku o url: " +msgstr "Chyba žádosti o URL:" #: editor/export_template_manager.cpp msgid "Connecting to Mirror..." @@ -3568,14 +3558,12 @@ msgid "Remove Template" msgstr "Odstranit šablonu" #: editor/export_template_manager.cpp -#, fuzzy msgid "Select Template File" msgstr "Vybrat soubor šablony" #: editor/export_template_manager.cpp -#, fuzzy msgid "Godot Export Templates" -msgstr "Spravovat exportní šablony" +msgstr "Exportní šablony Godotu" #: editor/export_template_manager.cpp msgid "Export Template Manager" @@ -3624,9 +3612,8 @@ msgid "No name provided." msgstr "Nebylo poskytnuto žádné jméno." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Provided name contains invalid characters." -msgstr "Poskytnuté jméno obsahuje neplatné znaky" +msgstr "Poskytnuté jméno obsahuje neplatné znaky." #: editor/filesystem_dock.cpp msgid "A file or folder with this name already exists." @@ -3653,31 +3640,26 @@ msgid "Duplicating folder:" msgstr "Duplikace složky:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "New Inherited Scene" -msgstr "Nová odvozená scéna..." +msgstr "Nová odvozená scéna" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Set As Main Scene" -msgstr "Hlavní scéna" +msgstr "Nastavit jako hlavní scénu" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scenes" -msgstr "Otevřít scénu" +msgstr "Otevřít scény" #: editor/filesystem_dock.cpp msgid "Instance" msgstr "Instance" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Add to Favorites" msgstr "Přidat do oblíbených" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Remove from Favorites" msgstr "Odebrat z oblíbených" @@ -3702,9 +3684,8 @@ msgid "Move To..." msgstr "Přesunout do..." #: editor/filesystem_dock.cpp -#, fuzzy msgid "New Scene..." -msgstr "Nová scéna" +msgstr "Nová scéna..." #: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp msgid "New Script..." @@ -3732,21 +3713,18 @@ msgid "Rename" msgstr "Přejmenovat" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Previous Folder/File" -msgstr "Předchozí složka" +msgstr "Předchozí složka/soubor" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Next Folder/File" -msgstr "Další složka" +msgstr "Další složka/soubor" #: editor/filesystem_dock.cpp msgid "Re-Scan Filesystem" msgstr "Znovu skenovat souborový systém" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Toggle Split Mode" msgstr "Přepnout režim rozdělení" @@ -3775,9 +3753,8 @@ msgid "Overwrite" msgstr "Přepsat" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Create Scene" -msgstr "Vytvořit ze scény" +msgstr "Vytvořit scénu" #: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp msgid "Create Script" @@ -3855,14 +3832,12 @@ msgid "Invalid group name." msgstr "Neplatný název skupiny." #: editor/groups_editor.cpp -#, fuzzy msgid "Rename Group" -msgstr "Spravovat skupiny" +msgstr "Přejmenovat skupinu" #: editor/groups_editor.cpp -#, fuzzy msgid "Delete Group" -msgstr "Odstranit rozložení" +msgstr "Odstranit skupinu" #: editor/groups_editor.cpp editor/node_dock.cpp msgid "Groups" @@ -3887,9 +3862,8 @@ msgid "Empty groups will be automatically removed." msgstr "" #: editor/groups_editor.cpp -#, fuzzy msgid "Group Editor" -msgstr "Otevřít editor skriptů" +msgstr "Editor skupin" #: editor/groups_editor.cpp msgid "Manage Groups" @@ -3973,9 +3947,8 @@ msgid "Saving..." msgstr "Ukládání..." #: editor/import_dock.cpp -#, fuzzy msgid "%d Files" -msgstr " Soubory" +msgstr "%d souborů" #: editor/import_dock.cpp msgid "Set as Default for '%s'" @@ -4034,10 +4007,6 @@ msgid "Copy Params" msgstr "Kopírovat parametry" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Vložit parametry" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "Schránka zdroje je prázdná!" @@ -4099,9 +4068,8 @@ msgid "MultiNode Set" msgstr "" #: editor/node_dock.cpp -#, fuzzy msgid "Select a single node to edit its signals and groups." -msgstr "Zvolit uzel pro editaci signálů a skupin." +msgstr "Zvolte vybraný uzel pro editaci jeho signálů a skupin." #: editor/plugin_config_dialog.cpp msgid "Edit a Plugin" @@ -4378,9 +4346,8 @@ msgid "Delete Node(s)" msgstr "Odstranit uzel/uzly" #: editor/plugins/animation_blend_tree_editor_plugin.cpp -#, fuzzy msgid "Toggle Filter On/Off" -msgstr "Aktivovat/Deaktivovat tuto stopu." +msgstr "Aktivovat/Deaktivovat filtr" #: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "Change Filter" @@ -4998,11 +4965,11 @@ msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Name (A-Z)" -msgstr "" +msgstr "Název (A-Z)" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Name (Z-A)" -msgstr "" +msgstr "Název (Z-A)" #: editor/plugins/asset_library_editor_plugin.cpp msgid "License (A-Z)" @@ -5978,7 +5945,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Vytvořit navigační polygon" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -6862,7 +6829,7 @@ msgstr "Otevřít online dokumentaci Godotu." #: editor/plugins/script_editor_plugin.cpp msgid "Request Docs" -msgstr "" +msgstr "Požádat o dokumentaci" #: editor/plugins/script_editor_plugin.cpp msgid "Help improve the Godot documentation by giving feedback." @@ -8468,9 +8435,8 @@ msgid "Make Concave" msgstr "Přesunout polygon" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Create Collision Polygon" -msgstr "Vytvořit navigační polygon" +msgstr "Vytvořit kolizní polygon" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy @@ -9905,9 +9871,8 @@ msgid "Project Manager" msgstr "Správce projektů" #: editor/project_manager.cpp -#, fuzzy msgid "Projects" -msgstr "Projekt" +msgstr "Projekty" #: editor/project_manager.cpp msgid "Last Modified" @@ -9926,9 +9891,8 @@ msgid "New Project" msgstr "Nový projekt" #: editor/project_manager.cpp -#, fuzzy msgid "Remove Missing" -msgstr "Odstranit bod" +msgstr "Odstranit nenalezené" #: editor/project_manager.cpp msgid "Templates" @@ -10431,14 +10395,12 @@ msgid "Keep" msgstr "" #: editor/rename_dialog.cpp -#, fuzzy msgid "PascalCase to snake_case" -msgstr "CamelCase na under_scored" +msgstr "PascalCase na snake_case" #: editor/rename_dialog.cpp -#, fuzzy msgid "snake_case to PascalCase" -msgstr "under_scored na CamelCase" +msgstr "snake_case na PascalCase" #: editor/rename_dialog.cpp msgid "Case" @@ -10457,14 +10419,12 @@ msgid "Reset" msgstr "Resetovat" #: editor/rename_dialog.cpp -#, fuzzy msgid "Regular Expression Error" -msgstr "Regulární výrazy" +msgstr "Chyba regulárního výrazu" #: editor/rename_dialog.cpp -#, fuzzy msgid "At character %s" -msgstr "Platné znaky:" +msgstr "Na znaku %s" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" @@ -10634,9 +10594,8 @@ msgid "User Interface" msgstr "Uživatelské rozhraní" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Other Node" -msgstr "Smazat uzel" +msgstr "Jiný uzel" #: editor/scene_tree_dock.cpp msgid "Can't operate on nodes from a foreign scene!" @@ -11505,7 +11464,7 @@ msgstr "" #: modules/recast/navigation_mesh_generator.cpp msgid "Done!" -msgstr "" +msgstr "Hotovo!" #: modules/visual_script/visual_script.cpp #, fuzzy @@ -11811,24 +11770,20 @@ msgid "Members:" msgstr "Členové:" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Change Base Type:" -msgstr "Změnit základní typ" +msgstr "Změnit základní typ:" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Add Nodes..." -msgstr "Přidat uzel..." +msgstr "Přidat uzly..." #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Add Function..." -msgstr "Přidat funkci" +msgstr "Přidat funkci..." #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "function_name" -msgstr "Funkce:" +msgstr "název_funkce" #: modules/visual_script/visual_script_editor.cpp #, fuzzy @@ -11852,19 +11807,16 @@ msgid "Cut Nodes" msgstr "Vyjmout uzly" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Make Function" -msgstr "Přejmenovat funkci" +msgstr "Vytvořit funkci" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Refresh Graph" -msgstr "Obnovit" +msgstr "Obnovit graf" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Edit Member" -msgstr "Členové" +msgstr "Upravit členy" #: modules/visual_script/visual_script_flow_control.cpp msgid "Input type not iterable: " @@ -12420,6 +12372,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/da.po b/editor/translations/da.po index e575e1a015..3d2c4cb48b 100644 --- a/editor/translations/da.po +++ b/editor/translations/da.po @@ -1554,6 +1554,10 @@ msgstr "Navn" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Indsæt Parametre" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Opdatere Scene" @@ -1858,7 +1862,7 @@ msgstr "Vis i Filhåndtering" msgid "New Folder..." msgstr "Opret mappe..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Opdater" @@ -4164,10 +4168,6 @@ msgid "Copy Params" msgstr "Kopier Parametre" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Indsæt Parametre" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "FEJL: Ingen animationsressource i udklipsholder!" @@ -6173,7 +6173,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Opret Poly" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12648,6 +12648,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/de.po b/editor/translations/de.po index 3e8c61025a..14d9926ecb 100644 --- a/editor/translations/de.po +++ b/editor/translations/de.po @@ -48,12 +48,13 @@ # David May <wasser@gmail.com>, 2019. # Draco Drache <jan.holger.te@gmail.com>, 2019. # Jonas <dotchucknorris@gmx.de>, 2019. +# PagDev <pag.develop@gmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-16 15:20+0000\n" -"Last-Translator: So Wieso <sowieso@dukun.de>\n" +"PO-Revision-Date: 2020-03-08 22:32+0000\n" +"Last-Translator: PagDev <pag.develop@gmail.com>\n" "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/" "godot/de/>\n" "Language: de\n" @@ -61,7 +62,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1538,6 +1539,10 @@ msgstr "Name" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Parameter einfügen" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Aktualisiere Szene" @@ -1825,7 +1830,7 @@ msgstr "Im Dateimanager anzeigen" msgid "New Folder..." msgstr "Neuer Ordner..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Aktualisieren" @@ -2992,7 +2997,7 @@ msgstr "Problem-Melder" #: editor/editor_node.cpp editor/plugins/asset_library_editor_plugin.cpp msgid "Community" -msgstr "Internetgemeinschaft" +msgstr "Community" #: editor/editor_node.cpp msgid "About" @@ -4084,10 +4089,6 @@ msgid "Copy Params" msgstr "Parameter kopieren" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Parameter einfügen" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Ressourcen-Zwischenablage bearbeiten" @@ -5914,7 +5915,7 @@ msgstr "Mesh ist leer!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Couldn't create a Trimesh collision shape." -msgstr "Konnte Trimesh-Kollisionselement nicht erzeugen." +msgstr "Trimesh-Kollisions-Shape konnte nicht erstellt werden." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" @@ -6028,7 +6029,8 @@ msgstr "" "Dies ist die präziseste (aber langsamste) Methode für Kollisionsberechnungen." #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +#, fuzzy +msgid "Create Single Convex Collision Sibling" msgstr "Ein einzelnes konvexes Kollisionsunterelement erzeugen" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -10114,7 +10116,7 @@ msgstr "Ereignis hinzufügen" #: editor/project_settings_editor.cpp msgid "Button" -msgstr "Knopf" +msgstr "\"Button\"" #: editor/project_settings_editor.cpp msgid "Left Button." @@ -12120,7 +12122,7 @@ msgstr "Verwende Standard-Startbildschirm-Bilddatei." #: platform/uwp/export/export.cpp msgid "Invalid package short name." -msgstr "Ungültiger Paketekurzname." +msgstr "Ungültiger Paket-Kurzname." #: platform/uwp/export/export.cpp msgid "Invalid package unique name." @@ -12478,6 +12480,11 @@ msgstr "" "Plane-Shapes funktionieren nicht gut und werden in einer zukünftigen Version " "entfernt. Von der Nutzung wird abgeraten." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Nichts ist sichtbar da kein Mesh zugewiesen wurden." diff --git a/editor/translations/de_CH.po b/editor/translations/de_CH.po index f4db15a122..84e1dd1599 100644 --- a/editor/translations/de_CH.po +++ b/editor/translations/de_CH.po @@ -4,35 +4,38 @@ # This file is distributed under the same license as the Godot source code. # Christian Fisch <christian.fiesel@gmail.com>, 2016. # Nils <nfa106008@iet-gibb.ch>, 2020. +# anonymous <noreply@weblate.org>, 2020. +# PagDev <pag.develop@gmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-01-20 11:39+0000\n" -"Last-Translator: Nils <nfa106008@iet-gibb.ch>\n" -"Language-Team: German (Swiss High) <https://hosted.weblate.org/projects/" +"PO-Revision-Date: 2020-03-08 22:33+0000\n" +"Last-Translator: PagDev <pag.develop@gmail.com>\n" +"Language-Team: German (Switzerland) <https://hosted.weblate.org/projects/" "godot-engine/godot/de_CH/>\n" "Language: de_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" +"Ungültiger Argument-Typ in convert()-Aufruf, TYPE_*-Konstanten benötigt." #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp msgid "Expected a string of length 1 (a character)." -msgstr "" +msgstr "Es wurde eine Zeichenfolge der Länge 1 (a character) erwartet." #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/mono/glue/gd_glue.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." -msgstr "" +msgstr "Nicht genügend Bytes zum Decodieren von Bytes oder ungültiges Format." #: core/math/expression.cpp msgid "Invalid input %i (not passed) in expression" @@ -1501,6 +1504,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1796,7 +1803,7 @@ msgstr "Datei öffnen" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -4020,10 +4027,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -6015,7 +6018,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Node erstellen" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12412,6 +12415,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/editor.pot b/editor/translations/editor.pot index 1db40e52cb..232f6eb087 100644 --- a/editor/translations/editor.pot +++ b/editor/translations/editor.pot @@ -1446,6 +1446,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1722,7 +1726,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3855,10 +3859,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5739,7 +5739,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11825,6 +11825,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/el.po b/editor/translations/el.po index 6aa7a07f5d..fb9029a861 100644 --- a/editor/translations/el.po +++ b/editor/translations/el.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-02 08:51+0000\n" +"PO-Revision-Date: 2020-03-08 22:32+0000\n" "Last-Translator: George Tsiamasiotis <gtsiam@windowslive.com>\n" "Language-Team: Greek <https://hosted.weblate.org/projects/godot-engine/godot/" "el/>\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -693,9 +693,8 @@ msgid "Line Number:" msgstr "Αρ. γραμμής:" #: editor/code_editor.cpp -#, fuzzy msgid "%d replaced." -msgstr "Αντικατάσταση..." +msgstr "%d αντικαταστάθηκαν." #: editor/code_editor.cpp editor/editor_help.cpp msgid "%d match." @@ -1497,6 +1496,10 @@ msgstr "Όνομα" msgid "Singleton" msgstr "Μονοσύνολο" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Επικόλληση παραμέτρων" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Ενημέρωση σκηνής" @@ -1783,7 +1786,7 @@ msgstr "Εμφάνιση στη διαχείριση αρχείων" msgid "New Folder..." msgstr "Νέος φάκελος..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Αναναίωση" @@ -4045,10 +4048,6 @@ msgid "Copy Params" msgstr "Αντιγραφή παραμέτρων" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Επικόλληση παραμέτρων" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Επεξεργασία προχείρου πόρων" @@ -5879,9 +5878,8 @@ msgid "Mesh is empty!" msgstr "Το πλέγμα είναι άδειο!" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create a Trimesh collision shape." -msgstr "Δημιουργία αδελφού σύγκρουσης πλέγατος τριγώνων" +msgstr "Αδυναμία δημιουργίας σχήματος σύγκρουσης τριγώνων." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" @@ -5898,29 +5896,30 @@ msgstr "Δημιουργία Στατικού Σχήματος Πλέγματο #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create a single convex collision shape for the scene root." msgstr "" +"Αδυναμια δημιουργίας μοναδικού κυρτού σχήματος σύγκρουσης για την ρίζα " +"σκηνής." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Couldn't create a single convex collision shape." -msgstr "" +msgstr "Αδυναμία δημιουργίας μοναδικού κυρτού σχήματος σύγκρουσης." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Single Convex Shape" -msgstr "Δημιουργία Κυρτών Σχημάτων" +msgstr "Δημιουργία Μοναδικού Κυρτού Σχήματος" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create multiple convex collision shapes for the scene root." msgstr "" +"Αδυναμία δημιουργίας πολλαπλών κυρτών σχημάτων σύγκρουσης για την ρίζα " +"σκηνής." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create any collision shapes." -msgstr "Αδύνατη η δημιουργία φακέλου." +msgstr "Αδυναμία δημιουργίας σχημάτων σύγκρουσης." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Shapes" -msgstr "Δημιουργία Κυρτών Σχημάτων" +msgstr "Δημιουργία Πολλαπλών Κυρτών Σχημάτων" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" @@ -5976,6 +5975,9 @@ msgid "" "automatically.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Δημιουργεί ένα StaticBody και του αναθέτει αυτόματα ένα σχήμα σύγκρουσης " +"βασισμένο σε πολύγωνα.\n" +"Είναι η πιο ακριβής (αλλά αργότερη) επιλογή για εντοπισμό σύγκρουσης." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" @@ -5986,28 +5988,33 @@ msgid "" "Creates a polygon-based collision shape.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Δημιουργεί ένα σχήμα σύγκρουσης βασισμένο σε πολύγωνα.\n" +"Είναι η πιο ακριβής (αλλά αργότερη) επιλογή για εντοπισμό σύγκρουσης." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" -msgstr "Δημιουργία Κυρτού Αδελφού Σύγκρουσης" +msgid "Create Single Convex Collision Sibling" +msgstr "Δημιουργία Μοναδικών Κυρτών Αδελφών Σύγκρουσης" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a single convex collision shape.\n" "This is the fastest (but least accurate) option for collision detection." msgstr "" +"Δημιουργεί ένα μοναδικό κυρτό σχήμα σύγκρουσης.\n" +"Είναι η γρηγορότερη (αλλά πιο ανακριβής) επιλογή για εντοπισμό σύγκρουσης." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Collision Siblings" -msgstr "Δημιουργία Κυρτού Αδελφού Σύγκρουσης" +msgstr "Δημιουργία Πολλαπλών Κυρτών Αδελφών Σύγκρουσης" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a polygon-based collision shape.\n" "This is a performance middle-ground between the two above options." msgstr "" +"Δημιουργεί ένα σχήμα σύγκρουσης βασισμένο σε πολύγωνα.\n" +"Είναι μια επιλογή μέσης απόδοσης σχετικά με τις παραπάνω επιλογές." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh..." @@ -6020,6 +6027,10 @@ msgid "" "This can be used instead of the SpatialMaterial Grow property when using " "that property isn't possible." msgstr "" +"Δημιουργεί ένα στατικό πλέγμα περιγράμματος με αντίστροφα κανονικά " +"διανύσματα.\n" +"Είναι εναλλακτική της ιδιότητας Grow του SpatialMaterial, για όταν η " +"τελευταία δεν είναι διαθέσιμη." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "View UV1" @@ -9613,34 +9624,29 @@ msgid "Export With Debug" msgstr "Εξαγωγή με αποσφαλμάτωση" #: editor/project_manager.cpp -#, fuzzy msgid "The path specified doesn't exist." -msgstr "Η διαδρομή δεν υπάρχει." +msgstr "Η ορισμένη διαδρομή δεν υπάρχει." #: editor/project_manager.cpp -#, fuzzy msgid "Error opening package file (it's not in ZIP format)." -msgstr "Σφάλμα ανοίγματος αρχείου πακέτου, δεν είναι σε μορφή ZIP." +msgstr "Σφάλμα ανοίγματος αρχείου πακέτου (δεν είναι σε μορφή ZIP)." #: editor/project_manager.cpp -#, fuzzy msgid "" "Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file." -msgstr "Άκυρο αρχείο έργου «.zip», δεν περιέχει αρχείο «project.godot»." +msgstr "Άκυρο αρχείο έργου «.zip»: Δεν περιέχει αρχείο «project.godot»." #: editor/project_manager.cpp msgid "Please choose an empty folder." msgstr "Παρακαλούμε επιλέξτε έναν άδειο φάκελο." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a \"project.godot\" or \".zip\" file." msgstr "Παρακαλούμε επιλέξτε ένα αρχείο «project.godot» ή «.zip»." #: editor/project_manager.cpp -#, fuzzy msgid "This directory already contains a Godot project." -msgstr "Ο κατάλογος περιέχει ήδη ένα έργο της Godot." +msgstr "Ο κατάλογος αυτός περιέχει ήδη ένα έργο της Godot." #: editor/project_manager.cpp msgid "New Game Project" @@ -10339,9 +10345,8 @@ msgid "Suffix" msgstr "Επίθεμα" #: editor/rename_dialog.cpp -#, fuzzy msgid "Use Regular Expressions" -msgstr "Κανονικές Εκφράσεις" +msgstr "Χρήση Κανονικών Εκφράσεων" #: editor/rename_dialog.cpp msgid "Advanced Options" @@ -10380,7 +10385,6 @@ msgstr "" "Σύγκριση επιλογών μετρητή." #: editor/rename_dialog.cpp -#, fuzzy msgid "Per-level Counter" msgstr "Μετρητής Ανά Επίπεδο" @@ -10421,14 +10425,12 @@ msgid "Keep" msgstr "Διατήρηση" #: editor/rename_dialog.cpp -#, fuzzy msgid "PascalCase to snake_case" -msgstr "CamelCase σε under_scored" +msgstr "PascalCase σε snake_case" #: editor/rename_dialog.cpp -#, fuzzy msgid "snake_case to PascalCase" -msgstr "under_scored σε CamelCase" +msgstr "snake_case σε PascalCase" #: editor/rename_dialog.cpp msgid "Case" @@ -10447,14 +10449,12 @@ msgid "Reset" msgstr "Επαναφορά" #: editor/rename_dialog.cpp -#, fuzzy msgid "Regular Expression Error" -msgstr "Κανονικές Εκφράσεις" +msgstr "Σφάλμα Κανονικής Εκφράσεως" #: editor/rename_dialog.cpp -#, fuzzy msgid "At character %s" -msgstr "Έγκυροι χαρακτήρες:" +msgstr "Στον χαρακτήρα %s" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" @@ -10925,9 +10925,8 @@ msgid "Invalid inherited parent name or path." msgstr "Άκυρο όνομα κληρονομημένου γονέα ή διαδρομή." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Script path/name is valid." -msgstr "Έγκυρη δέσμη ενεργειών." +msgstr "Άκυρη διαδρομή/όνομα δέσμης ενεργειών." #: editor/script_create_dialog.cpp msgid "Allowed: a-z, A-Z, 0-9, _ and ." @@ -11018,9 +11017,8 @@ msgid "Copy Error" msgstr "Αντιγραφή σφάλματος" #: editor/script_editor_debugger.cpp -#, fuzzy msgid "Video RAM" -msgstr "Βίντεο μνήμη" +msgstr "Βίντεο RAM" #: editor/script_editor_debugger.cpp msgid "Skip Breakpoints" @@ -12444,6 +12442,11 @@ msgstr "" "Τα επίπεδα σχήματα δεν λειτουργούν καλά και θα αφαιρεθούν σε μελλοντικές " "εκδόσεις. Παρακαλώ μην τα χρησιμοποιήσετε." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Τίποτα δεν είναι ορατό, επειδή δεν έχει οριστεί κανένα πλέγματα." diff --git a/editor/translations/eo.po b/editor/translations/eo.po index 37f49a4908..cd84f54a40 100644 --- a/editor/translations/eo.po +++ b/editor/translations/eo.po @@ -1484,6 +1484,10 @@ msgstr "Nomo" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp #, fuzzy msgid "Updating Scene" @@ -1767,7 +1771,7 @@ msgstr "Montri en dosiermastrumilo" msgid "New Folder..." msgstr "Nova dosierujo..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Aktualigi" @@ -3959,10 +3963,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5856,7 +5856,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11993,6 +11993,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/es.po b/editor/translations/es.po index 80e0f9240c..ed82e80658 100644 --- a/editor/translations/es.po +++ b/editor/translations/es.po @@ -47,7 +47,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-04 21:53+0000\n" +"PO-Revision-Date: 2020-02-27 07:01+0000\n" "Last-Translator: Javier Ocampos <xavier.ocampos@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/" "godot/es/>\n" @@ -56,7 +56,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -730,9 +730,8 @@ msgid "Line Number:" msgstr "Número de Línea:" #: editor/code_editor.cpp -#, fuzzy msgid "%d replaced." -msgstr "Reemplazar..." +msgstr "%d reemplazado." #: editor/code_editor.cpp editor/editor_help.cpp msgid "%d match." @@ -1534,6 +1533,10 @@ msgstr "Nombre" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Pegar Parámetros" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Actualizando Escena" @@ -1824,7 +1827,7 @@ msgstr "Mostrar en Explorador de Archivos" msgid "New Folder..." msgstr "Nueva Carpeta..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Recargar" @@ -1968,7 +1971,7 @@ msgstr "(Re)Importando Assets" #: editor/editor_help.cpp editor/plugins/spatial_editor_plugin.cpp msgid "Top" -msgstr "Cima" +msgstr "Superior" #: editor/editor_help.cpp msgid "Class:" @@ -2447,7 +2450,7 @@ msgstr "Esta operación no puede realizarse sin una escena." #: editor/editor_node.cpp msgid "Export Mesh Library" -msgstr "Exportar Librería de Meshes" +msgstr "Exportar Librería de Mallas" #: editor/editor_node.cpp msgid "This operation can't be done without a root node." @@ -2867,8 +2870,8 @@ msgid "" "Collision shapes and raycast nodes (for 2D and 3D) will be visible on the " "running game if this option is turned on." msgstr "" -"Los Collision shapes y nodos raycast (para 2D y 3D) serán visibles durante " -"la ejecución del juego cuando esta opción queda activada." +"Las formas de colisión y los nodos raycast (para 2D y 3D) serán visibles " +"durante la ejecución del juego si esta opción está activada." #: editor/editor_node.cpp msgid "Visible Navigation" @@ -2879,8 +2882,8 @@ msgid "" "Navigation meshes and polygons will be visible on the running game if this " "option is turned on." msgstr "" -"Si activas esta opción podrás ver las mallas y polígonos de navegación " -"durante la ejecución del juego." +"Las mallas de navegación y los polígonos serán visibles durante la ejecución " +"del juego si esta opción está activada." #: editor/editor_node.cpp msgid "Sync Scene Changes" @@ -3184,7 +3187,7 @@ msgstr "No se encontró ningún sub-recurso." #: editor/editor_plugin.cpp msgid "Creating Mesh Previews" -msgstr "Creando Vistas Previas de Mesh/es" +msgstr "Creando Previsualización de Mallas" #: editor/editor_plugin.cpp msgid "Thumbnail..." @@ -4000,7 +4003,7 @@ msgstr "Generando Lightmaps" #: editor/import/resource_importer_scene.cpp msgid "Generating for Mesh: " -msgstr "Generando para Mesh: " +msgstr "Generando para la Malla: " #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script..." @@ -4084,10 +4087,6 @@ msgid "Copy Params" msgstr "Copiar Parámetros" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Pegar Parámetros" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Editar Portapapeles de Recursos" @@ -5146,8 +5145,8 @@ msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" -"No hay meshes para hacer bake. Asegúrate que contienen un canal UV2 y que el " -"flag 'Bake Light' esta activado." +"No hay mallas para hacer bake. Asegúrate que contengan un canal UV2 y que la " +"opción de 'Bake Light' está activada." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." @@ -5265,8 +5264,8 @@ msgid "" "When active, moving Control nodes changes their anchors instead of their " "margins." msgstr "" -"Cuando está activo, el movimiento de los nodos de Control cambian sus " -"anclajes en lugar de sus márgenes." +"Cuando esté activo, los nodos de Control en movimiento cambian sus anclas en " +"lugar de sus márgenes." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Top Left" @@ -5810,7 +5809,7 @@ msgstr "CPUParticles" #: editor/plugins/cpu_particles_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp msgid "Create Emission Points From Mesh" -msgstr "Crear Puntos de Emisión Desde Mesh" +msgstr "Crear Puntos de Emisión desde la Malla" #: editor/plugins/cpu_particles_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp @@ -5911,12 +5910,11 @@ msgstr "Crear Polígono Oclusor" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" -msgstr "¡El Mesh está vacío!" +msgstr "¡La malla está vacía!" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create a Trimesh collision shape." -msgstr "Crear Collider Triangular Hermano" +msgstr "No se pudo crear una forma de colisión Triangular." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" @@ -5928,50 +5926,51 @@ msgstr "¡No puedes hacer esto en una escena raíz!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Static Shape" -msgstr "Crear Shape Estático Triangular" +msgstr "Crear Forma Estática Triangular" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create a single convex collision shape for the scene root." msgstr "" +"No se pudo crear una única forma de colisión convexa para la raíz de la " +"escena." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Couldn't create a single convex collision shape." -msgstr "" +msgstr "No pudo crear una única forma de colisión convexa." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Single Convex Shape" -msgstr "Crear Shape(s) Convexo(s)" +msgstr "Crear una Única Forma Convexa" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create multiple convex collision shapes for the scene root." msgstr "" +"No se pudieron crear múltiples formas de colisión convexas para la raíz de " +"la escena." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create any collision shapes." -msgstr "No se pudo crear la carpeta." +msgstr "No pudo crear ninguna forma de colisión." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Shapes" -msgstr "Crear Shape(s) Convexo(s)" +msgstr "Crear Múltiples Formas Convexas" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" -msgstr "Crear Navigation Mesh" +msgstr "Crear Malla de Navegación" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "El Mesh contenedor no es del tipo ArrayMesh." +msgstr "La Malla contenedora no es del tipo ArrayMesh." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "Fallo el UV Unwrap ¿el mesh podría no ser manifold?" +msgstr "Fallo del UV Unwrap ¿la malla podría no ser múltiple?" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "No hay meshes para depurar." +msgstr "No hay mallas para depurar." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" @@ -5979,15 +5978,15 @@ msgstr "El modelo no tiene UV en esta capa" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" -msgstr "¡MeshInstance le falta un Mesh!" +msgstr "¡MeshInstance carece de una Malla!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh has not surface to create outlines from!" -msgstr "¡El mesh no tiene una superficie de donde crear contornos!" +msgstr "¡La malla no tiene una superficie para crear contornos!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh primitive type is not PRIMITIVE_TRIANGLES!" -msgstr "¡El tipo primitivo de mesh no es PRIMITIVE_TRIANGLES!" +msgstr "¡El tipo primitivo de malla no es PRIMITIVE_TRIANGLES!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Could not create outline!" @@ -5999,7 +5998,7 @@ msgstr "Crear Outline" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh" -msgstr "Mesh" +msgstr "Malla" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Static Body" @@ -6011,6 +6010,9 @@ msgid "" "automatically.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Crea un StaticBody y le asigna automáticamente una forma de colisión basada " +"en polígonos.\n" +"Es la opción más precisa (pero la más lenta) para la detección de colisiones." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" @@ -6021,32 +6023,37 @@ msgid "" "Creates a polygon-based collision shape.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Crea una forma de colisión basada en polígonos.\n" +"Es la opción más precisa (pero la más lenta) para la detección de colisiones." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" -msgstr "Crear Collider Convexo Hermano(s)" +msgid "Create Single Convex Collision Sibling" +msgstr "Crear una Única Colisión Convexa Hermana" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a single convex collision shape.\n" "This is the fastest (but least accurate) option for collision detection." msgstr "" +"Crea una única forma de colisión convexa.\n" +"Es la opción más rápida (pero menos precisa) para la detección de colisiones." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Collision Siblings" -msgstr "Crear Collider Convexo Hermano(s)" +msgstr "Crear Múltiples Colisiones Convexas Hermanas" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a polygon-based collision shape.\n" "This is a performance middle-ground between the two above options." msgstr "" +"Crea una forma de colisión basada en polígonos.\n" +"Este es un punto medio de rendimiento entre las dos opciones anteriores." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh..." -msgstr "Crear Outline Mesh..." +msgstr "Crear Malla de Contorno..." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" @@ -6055,6 +6062,10 @@ msgid "" "This can be used instead of the SpatialMaterial Grow property when using " "that property isn't possible." msgstr "" +"Crea una malla de contorno estático. La malla de contorno tendrá sus " +"normales invertidas automáticamente.\n" +"Esto puede ser usado en lugar de la propiedad Grow de SpatialMaterial cuando " +"el uso de esa propiedad no sea posible." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "View UV1" @@ -6070,7 +6081,7 @@ msgstr "Desenvuelva UV2 para Lightmap/AO" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" -msgstr "Crear Outline Mesh" +msgstr "Crear Malla de Contorno" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Outline Size:" @@ -6094,7 +6105,7 @@ msgstr "" #: editor/plugins/mesh_library_editor_plugin.cpp msgid "Mesh Library" -msgstr "Librería de Meshes" +msgstr "Librería de Mallas" #: editor/plugins/mesh_library_editor_plugin.cpp #: editor/plugins/theme_editor_plugin.cpp @@ -6116,23 +6127,27 @@ msgstr "Actualizar desde escena" #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and no MultiMesh set in node)." msgstr "" -"No se especificó mesh de origen (y no hay MultiMesh establecido en el nodo)." +"No se ha especificado una malla de origen (y no se ha establecido un " +"MultiMesh en el nodo)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and MultiMesh contains no Mesh)." -msgstr "No se especificó mesh de origen (y MultiMesh no contiene ningún Mesh)." +msgstr "" +"No se ha especificado una malla de origen (y MultiMesh no contiene ninguna " +"Malla)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (invalid path)." -msgstr "Mesh de origen inválido (ruta inválida)." +msgstr "El origen de la malla es inválido (ruta inválida)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (not a MeshInstance)." -msgstr "Mesh de origen inválido (no es un MeshInstance)." +msgstr "El origen de la malla es inválido (no es un MeshInstance)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (contains no Mesh resource)." -msgstr "Mesh de origen inválido (no contiene ningún recurso Mesh)." +msgstr "" +"El origen de la malla es inválido (no contiene ningún recurso de Malla)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No surface source specified." @@ -6152,7 +6167,7 @@ msgstr "El origen de la superficie no es correcto (sin caras)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Select a Source Mesh:" -msgstr "Selecciona una Mesh de Origen:" +msgstr "Selecciona una Malla de Origen:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Select a Target Surface:" @@ -6164,7 +6179,7 @@ msgstr "Llenar superficie" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Populate MultiMesh" -msgstr "Llenar MultiMesh" +msgstr "Rellenar MultiMesh" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Target Surface:" @@ -6172,7 +6187,7 @@ msgstr "Superficie objetivo:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Source Mesh:" -msgstr "Mesh de Origen:" +msgstr "Malla de Origen:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "X-Axis" @@ -6188,7 +6203,7 @@ msgstr "Eje-Z" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh Up Axis:" -msgstr "Eje Superior del Mesh:" +msgstr "Eje Superior de la Malla:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Rotation:" @@ -7680,11 +7695,12 @@ msgstr "¡El sprite esta vacío!" #: editor/plugins/sprite_editor_plugin.cpp msgid "Can't convert a sprite using animation frames to mesh." -msgstr "No se puede convertir a mesh un sprite que usa frames de animación." +msgstr "" +"No se puede convertir en malla un sprite usando fotogramas de animación." #: editor/plugins/sprite_editor_plugin.cpp msgid "Invalid geometry, can't replace by mesh." -msgstr "Geometría inválida, no se puede reemplazar por mesh." +msgstr "Geometría inválida, no puede ser reemplazada por una malla." #: editor/plugins/sprite_editor_plugin.cpp msgid "Convert to Mesh2D" @@ -9639,33 +9655,29 @@ msgid "Export With Debug" msgstr "Exportar Con Depuración" #: editor/project_manager.cpp -#, fuzzy msgid "The path specified doesn't exist." -msgstr "La ruta no existe." +msgstr "La ruta especificada no existe." #: editor/project_manager.cpp -#, fuzzy msgid "Error opening package file (it's not in ZIP format)." -msgstr "Error al abrir el archivo comprimido, no está en formato ZIP." +msgstr "Error al abrir el archivo del paquete (no está en formato ZIP)." #: editor/project_manager.cpp -#, fuzzy msgid "" "Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file." msgstr "" -"Archivo de projecto '.zip' inválido, no contiene un archivo 'project.godot'." +"Archivo de proyecto \".zip\" inválido; no contiene un archivo \"project.godot" +"\"." #: editor/project_manager.cpp msgid "Please choose an empty folder." msgstr "Por favor elija una carpeta vacía." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a \"project.godot\" or \".zip\" file." -msgstr "Por favor selecciona un archivo 'project.godot' o '.zip'." +msgstr "Por favor, elige un archivo \"project.godot\" o \".zip\"." #: editor/project_manager.cpp -#, fuzzy msgid "This directory already contains a Godot project." msgstr "El directorio ya contiene un proyecto de Godot." @@ -10366,9 +10378,8 @@ msgid "Suffix" msgstr "Sufijo" #: editor/rename_dialog.cpp -#, fuzzy msgid "Use Regular Expressions" -msgstr "Expresiones regulares" +msgstr "Usa Expresiones Regulares" #: editor/rename_dialog.cpp msgid "Advanced Options" @@ -10407,9 +10418,8 @@ msgstr "" "Comparar opciones de contador." #: editor/rename_dialog.cpp -#, fuzzy msgid "Per-level Counter" -msgstr "Contador por Nivel" +msgstr "Contador Por Nivel" #: editor/rename_dialog.cpp msgid "If set the counter restarts for each group of child nodes" @@ -10448,14 +10458,12 @@ msgid "Keep" msgstr "Conservar" #: editor/rename_dialog.cpp -#, fuzzy msgid "PascalCase to snake_case" -msgstr "CamelCase a under_scored" +msgstr "PascalCase a snake_case" #: editor/rename_dialog.cpp -#, fuzzy msgid "snake_case to PascalCase" -msgstr "under_scored a CamelCase" +msgstr "snake_case a PascalCase" #: editor/rename_dialog.cpp msgid "Case" @@ -10474,14 +10482,12 @@ msgid "Reset" msgstr "Resetear" #: editor/rename_dialog.cpp -#, fuzzy msgid "Regular Expression Error" -msgstr "Expresiones regulares" +msgstr "Error de Expresión Regular" #: editor/rename_dialog.cpp -#, fuzzy msgid "At character %s" -msgstr "Caracteres válidos:" +msgstr "En el carácter %s" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" @@ -10948,9 +10954,8 @@ msgid "Invalid inherited parent name or path." msgstr "Nombre o ruta del padre heredado inválido." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Script path/name is valid." -msgstr "El script es válido." +msgstr "La ruta/nombre del script es correcta." #: editor/script_create_dialog.cpp msgid "Allowed: a-z, A-Z, 0-9, _ and ." @@ -11041,9 +11046,8 @@ msgid "Copy Error" msgstr "Copiar Error" #: editor/script_editor_debugger.cpp -#, fuzzy msgid "Video RAM" -msgstr "Memoria de Vídeo" +msgstr "Vídeo RAM" #: editor/script_editor_debugger.cpp msgid "Skip Breakpoints" @@ -11187,31 +11191,31 @@ msgstr "Cambiar Alcance de la Sonda" #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp msgid "Change Sphere Shape Radius" -msgstr "Cambiar Radio de Sphere Shape" +msgstr "Cambiar Radio de la Forma Esférica" #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp msgid "Change Box Shape Extents" -msgstr "Cambiar Radio de Box Shape" +msgstr "Cambiar Extensión de la Forma de la Caja" #: editor/spatial_editor_gizmos.cpp msgid "Change Capsule Shape Radius" -msgstr "Cambiar Radio de Capsule Shape" +msgstr "Cambiar Radio de la Forma de la Cápsula" #: editor/spatial_editor_gizmos.cpp msgid "Change Capsule Shape Height" -msgstr "Cambiar Altura de Capsule Shape" +msgstr "Cambiar Altura de la Forma de la Cápsula" #: editor/spatial_editor_gizmos.cpp msgid "Change Cylinder Shape Radius" -msgstr "Cambiar Radio de Cylinder Shape" +msgstr "Cambiar Radio de la Forma del Cilindro" #: editor/spatial_editor_gizmos.cpp msgid "Change Cylinder Shape Height" -msgstr "Cambiar Altura de Cylinder Shape" +msgstr "Cambiar Altura de la Forma del Cilindro" #: editor/spatial_editor_gizmos.cpp msgid "Change Ray Shape Length" -msgstr "Cambiar Longitud de Ray Shape" +msgstr "Cambiar Longitud de la Forma del Rayo" #: modules/csg/csg_gizmos.cpp msgid "Change Cylinder Radius" @@ -11339,15 +11343,15 @@ msgstr "Plano:" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Next Floor" -msgstr "Siguiente Suelo" +msgstr "Siguiente Plano" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Previous Floor" -msgstr "Anterior Suelo" +msgstr "Anterior Plano" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Floor:" -msgstr "Suelo:" +msgstr "Plano:" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Delete Selection" @@ -11447,11 +11451,12 @@ msgstr "Seleccionar Distancia:" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Filter meshes" -msgstr "Filtrar meshes" +msgstr "Filtrar mallas" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Give a MeshLibrary resource to this GridMap to use its meshes." -msgstr "Asignar un recurso MeshLibrary a este GridMap para usar sus meshes." +msgstr "" +"Proporciona un recurso MeshLibrary a este GridMap para usar sus mallas." #: modules/mono/csharp_script.cpp msgid "Class name can't be a reserved keyword" @@ -11467,7 +11472,7 @@ msgstr "Bake NavMesh" #: modules/recast/navigation_mesh_editor_plugin.cpp msgid "Clear the navigation mesh." -msgstr "Limpiar el navigation mesh." +msgstr "Limpiar la malla de navegación." #: modules/recast/navigation_mesh_generator.cpp msgid "Setting up Configuration..." @@ -11507,11 +11512,11 @@ msgstr "Creando polymesh..." #: modules/recast/navigation_mesh_generator.cpp msgid "Converting to native navigation mesh..." -msgstr "Convertir a navigation mesh nativo..." +msgstr "Convertir a malla de navegación nativa..." #: modules/recast/navigation_mesh_generator.cpp msgid "Navigation Mesh Generator Setup:" -msgstr "Configuración del Generador de Navigation Mesh:" +msgstr "Configuración del Generador de Mallas de Navegación:" #: modules/recast/navigation_mesh_generator.cpp msgid "Parsing Geometry..." @@ -12230,8 +12235,8 @@ msgid "" "A shape must be provided for CollisionShape2D to function. Please create a " "shape resource for it!" msgstr "" -"Para que CollisionShape2D funcione, se debe proporcionar un shape. Por " -"favor, ¡crea un recurso shape para ello!" +"Para que funcione CollisionShape2D se debe proporcionar una forma. Por " +"favor, ¡crea un recurso de forma para ello!" #: scene/2d/cpu_particles_2d.cpp msgid "" @@ -12323,10 +12328,9 @@ msgid "" "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" -"Los cambios en el tamaño del RigidBody2D (en los modos \"character\" o " -"\"rigid\") serán sobre-escritos por el motor de físicas cuando éste se " -"ejecute.\n" -"En lugar de esto, cambie el tamaño en las formas de colisión hijas." +"Los cambios en el tamaño de RigidBody2D (en los modos character o rigid) " +"serán anulados por el motor de la física cuando esté ejecutándose.\n" +"En su lugar, cambia el tamaño en las formas de colisión de los hijos." #: scene/2d/remote_transform_2d.cpp msgid "Path property must point to a valid Node2D node to work." @@ -12408,7 +12412,7 @@ msgstr "(Tiempo restante: %d:%02d s)" #: scene/3d/baked_lightmap.cpp msgid "Plotting Meshes: " -msgstr "Trazando Meshes: " +msgstr "Trazando Mallas: " #: scene/3d/baked_lightmap.cpp msgid "Plotting Lights:" @@ -12420,7 +12424,7 @@ msgstr "Finalizar Trazado" #: scene/3d/baked_lightmap.cpp msgid "Lighting Meshes: " -msgstr "Iluminando Meshes: " +msgstr "Iluminación de Mallas: " #: scene/3d/collision_object.cpp msgid "" @@ -12462,8 +12466,8 @@ msgid "" "A shape must be provided for CollisionShape to function. Please create a " "shape resource for it." msgstr "" -"Se debe proporcionar un shape para que CollisionShape funcione. Por favor, " -"crea un recurso shape para ello." +"Se debe proporcionar una forma para que CollisionShape funcione. Por favor, " +"crea un recurso de forma para ello." #: scene/3d/collision_shape.cpp msgid "" @@ -12473,9 +12477,14 @@ msgstr "" "Las formas tipo plano no funcionan bien y se eliminarán en futuras " "versiones. Por favor, no las uses." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." -msgstr "Nada visible ya que no se asignó ningún mesh." +msgstr "No hay nada visible porque no se ha asignado ninguna malla." #: scene/3d/cpu_particles.cpp msgid "" @@ -12487,7 +12496,7 @@ msgstr "" #: scene/3d/gi_probe.cpp msgid "Plotting Meshes" -msgstr "Trazando Meshes" +msgstr "Trazando Mallas" #: scene/3d/gi_probe.cpp msgid "" @@ -12531,7 +12540,8 @@ msgstr "" msgid "" "Nothing is visible because meshes have not been assigned to draw passes." msgstr "" -"Nada es visible porque las mallas no se han asignado a los pases de dibujo." +"No hay nada visible porque no se han asignado mallas para los pases de " +"dibujo." #: scene/3d/particles.cpp msgid "" @@ -12560,9 +12570,9 @@ msgid "" "by the physics engine when running.\n" "Change the size in children collision shapes instead." msgstr "" -"Los cambios en el tamaño del RigidBody (en los modos \"character\" o \"rigid" -"\") serán sobre-escritos por el motor de físicas cuando se ejecute.\n" -"En lugar de esto, cambie el tamaño en las formas de colisión hijas." +"Cualquier cambio en el tamaño de RigidBody (en modo character o rigid) será " +"anulado por el motor de la física cuando esté ejecutándose.\n" +"En su lugar, cambia el tamaño en las formas de colisión de los hijos." #: scene/3d/remote_transform.cpp msgid "" @@ -12574,7 +12584,7 @@ msgstr "" #: scene/3d/soft_body.cpp msgid "This body will be ignored until you set a mesh." -msgstr "Este cuerpo será ignorado hasta que se establezca un mesh." +msgstr "Este cuerpo será ignorado hasta que se establezca una malla." #: scene/3d/soft_body.cpp msgid "" @@ -12582,9 +12592,9 @@ msgid "" "running.\n" "Change the size in children collision shapes instead." msgstr "" -"Los cambios de tamaño a un SoftBody serán sobrescritos por el motor de " -"física al ejecutar.\n" -"En su lugar, cambia el tamaño de los collision shapes hijos." +"Los cambios de tamaño de SoftBody serán anulados por el motor de física " +"cuando esté ejecutándose.\n" +"En su lugar, cambia el tamaño en las formas de colisión de los hijos." #: scene/3d/sprite_3d.cpp msgid "" diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po index e7aa5cb780..dce0d89b7e 100644 --- a/editor/translations/es_AR.po +++ b/editor/translations/es_AR.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-18 15:09+0000\n" -"Last-Translator: Lisandro Lorea <lisandrolorea@gmail.com>\n" +"PO-Revision-Date: 2020-02-27 07:01+0000\n" +"Last-Translator: Javier Ocampos <xavier.ocampos@gmail.com>\n" "Language-Team: Spanish (Argentina) <https://hosted.weblate.org/projects/" "godot-engine/godot/es_AR/>\n" "Language: es_AR\n" @@ -27,7 +27,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.11\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1502,6 +1502,10 @@ msgstr "Nombre" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Pegar Parámetros" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Actualizando Escena" @@ -1791,7 +1795,7 @@ msgstr "Mostrar en Explorador de Archivos" msgid "New Folder..." msgstr "Nueva Carpeta..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Refrescar" @@ -4049,10 +4053,6 @@ msgid "Copy Params" msgstr "Copiar Parámetros" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Pegar Parámetros" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Editar Portapapeles de Recursos" @@ -5879,7 +5879,7 @@ msgstr "¡El Mesh está vacío!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Couldn't create a Trimesh collision shape." -msgstr "No se pudo crear una forma de colisión Trimersh." +msgstr "No se pudo crear una forma de colisión Trimesh." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" @@ -5904,7 +5904,7 @@ msgstr "No se pudo crear una forma de colisión única." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Single Convex Shape" -msgstr "Crear Forma Convexa Unica" +msgstr "Crear Forma Convexa Única" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create multiple convex collision shapes for the scene root." @@ -5991,7 +5991,8 @@ msgstr "" "Esta es la opción mas exacta (pero más lenta) de detección de colisiones." #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +#, fuzzy +msgid "Create Single Convex Collision Sibling" msgstr "Crear Colisión Convexa Unica como Nodo Hermano" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -10445,7 +10446,7 @@ msgstr "Error de Expresión Regular" #: editor/rename_dialog.cpp msgid "At character %s" -msgstr "En el caracter %s" +msgstr "En el carácter %s" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" @@ -10914,7 +10915,7 @@ msgstr "Ruta o nombre del padre heredado inválido." #: editor/script_create_dialog.cpp msgid "Script path/name is valid." -msgstr "La ruta/nombre del script es inválida." +msgstr "La ruta/nombre del script es correcta." #: editor/script_create_dialog.cpp msgid "Allowed: a-z, A-Z, 0-9, _ and ." @@ -12430,6 +12431,11 @@ msgstr "" "Las formas tipo plano no funcionan bien y serán removidas en versiones " "futuras. Evitá usarlas." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Nada visible ya que no se asignó ningún mesh." diff --git a/editor/translations/et.po b/editor/translations/et.po index 059a200138..9b9d9b9137 100644 --- a/editor/translations/et.po +++ b/editor/translations/et.po @@ -1454,6 +1454,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1730,7 +1734,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3868,10 +3872,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5758,7 +5758,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11856,6 +11856,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/eu.po b/editor/translations/eu.po index 2829912826..1075a4a046 100644 --- a/editor/translations/eu.po +++ b/editor/translations/eu.po @@ -1451,6 +1451,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1727,7 +1731,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3860,10 +3864,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5744,7 +5744,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11830,6 +11830,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/fa.po b/editor/translations/fa.po index 377bbfbb67..caee80995e 100644 --- a/editor/translations/fa.po +++ b/editor/translations/fa.po @@ -12,12 +12,14 @@ # Mahdi <sadisticwarlock@gmail.com>, 2018. # hpn33 <hamed.hpn332@gmail.com>, 2019. # Focus <saeeddashticlash@gmail.com>, 2019. +# anonymous <noreply@weblate.org>, 2020. +# mohamad por <mohamad24xx@gmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-09-26 11:50+0000\n" -"Last-Translator: Focus <saeeddashticlash@gmail.com>\n" +"PO-Revision-Date: 2020-03-08 22:33+0000\n" +"Last-Translator: mohamad por <mohamad24xx@gmail.com>\n" "Language-Team: Persian <https://hosted.weblate.org/projects/godot-engine/" "godot/fa/>\n" "Language: fa\n" @@ -25,7 +27,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.9-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -37,14 +39,14 @@ msgstr "" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp msgid "Expected a string of length 1 (a character)." -msgstr "" +msgstr "یک رشته (string) در اندازه 1 (کاراکتر) انتظار می رود." #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/mono/glue/gd_glue.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" -"تعداد بایت های مورد نظر برای رمزگشایی بایت ها کافی نیست ، و یا فرمت نامعتبر " +"تعداد بایت های مورد نظر برای رمزگشایی بایت ها کافی نیست، و یا فرمت نامعتبر " "است ." #: core/math/expression.cpp @@ -127,24 +129,23 @@ msgstr "ارزش:" #: editor/animation_bezier_editor.cpp msgid "Insert Key Here" -msgstr "کلید را وارد کن" +msgstr "کلید را اینجا وارد کن" #: editor/animation_bezier_editor.cpp msgid "Duplicate Selected Key(s)" -msgstr "کلید تکراری درست کن" +msgstr "کلیدهای انتخاب شده تکراری درست کن" #: editor/animation_bezier_editor.cpp msgid "Delete Selected Key(s)" -msgstr "کلیدها را پاک کن" +msgstr "کلیدهای انخاب شده را پاک کن" #: editor/animation_bezier_editor.cpp msgid "Add Bezier Point" -msgstr "Bezier Point را اضافه کنید" +msgstr "Bezier Point را اضافه کن" #: editor/animation_bezier_editor.cpp -#, fuzzy msgid "Move Bezier Points" -msgstr "برداشتن نقطه" +msgstr "Bezier Points را جابجا کن" #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" @@ -292,7 +293,7 @@ msgstr "زمان(s): " #: editor/animation_track_editor.cpp msgid "Toggle Track Enabled" -msgstr "Toggle Track Enabled" +msgstr "ضامن ترک فعال است" #: editor/animation_track_editor.cpp msgid "Continuous" @@ -337,8 +338,9 @@ msgid "Insert Key" msgstr "درج کلید" #: editor/animation_track_editor.cpp +#, fuzzy msgid "Duplicate Key(s)" -msgstr "کپی کردن (Duplicate ) کلید(key)" +msgstr "نسخه همانند (Duplicate ) کلید(key)" #: editor/animation_track_editor.cpp msgid "Delete Key(s)" @@ -434,16 +436,15 @@ msgstr "" #: editor/animation_track_editor.cpp msgid "Not possible to add a new track without a root" -msgstr "" +msgstr "بدون ریشه اضافه کردن مسیر امکان پذیر نیست" #: editor/animation_track_editor.cpp msgid "Invalid track for Bezier (no suitable sub-properties)" msgstr "" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Add Bezier Track" -msgstr "ترک را اضافه کن" +msgstr "ترک Bezier را اضافه کن" #: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." @@ -1542,6 +1543,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1849,7 +1854,7 @@ msgstr "باز شدن مدیر پروژه؟" msgid "New Folder..." msgstr "ساختن پوشه..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -4102,10 +4107,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "منبع" @@ -6104,7 +6105,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "انتخاب شده را تغییر مقیاس بده" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12630,6 +12631,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/fi.po b/editor/translations/fi.po index d8fa02de0f..d590546571 100644 --- a/editor/translations/fi.po +++ b/editor/translations/fi.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-16 15:21+0000\n" +"PO-Revision-Date: 2020-02-21 23:33+0000\n" "Last-Translator: Tapani Niemi <tapani.niemi@kapsi.fi>\n" "Language-Team: Finnish <https://hosted.weblate.org/projects/godot-engine/" "godot/fi/>\n" @@ -23,7 +23,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 3.11.1\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1489,6 +1489,10 @@ msgstr "Nimi" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Liitä parametrit" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Päivitetään skeneä" @@ -1777,7 +1781,7 @@ msgstr "Näytä tiedostonhallinnassa" msgid "New Folder..." msgstr "Uusi kansio..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Päivitä" @@ -3948,9 +3952,8 @@ msgid "Saving..." msgstr "Tallennetaan..." #: editor/import_dock.cpp -#, fuzzy msgid "%d Files" -msgstr " Tiedostot" +msgstr "%d tiedostoa" #: editor/import_dock.cpp msgid "Set as Default for '%s'" @@ -4011,10 +4014,6 @@ msgid "Copy Params" msgstr "Kopioi parametrit" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Liitä parametrit" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Muokkaa resurssien leikepöytää" @@ -5946,7 +5945,8 @@ msgstr "" "Tämä on tarkin (mutta hitain) vaihtoehto törmäystunnistukselle." #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +#, fuzzy +msgid "Create Single Convex Collision Sibling" msgstr "Luo yksittäisen konveksin törmäysmuodon sisaret" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12358,6 +12358,11 @@ msgstr "" "Tasomuodot eivät toimi hyvin ja ne tullaan poistaamaan tulevissa versioissa. " "Ole hyvä ja älä käytä niitä." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Mitään ei näy, koska meshiä ei ole asetettu." diff --git a/editor/translations/fil.po b/editor/translations/fil.po index 9616bfc1be..60445be723 100644 --- a/editor/translations/fil.po +++ b/editor/translations/fil.po @@ -1459,6 +1459,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1735,7 +1739,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3871,10 +3875,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5759,7 +5759,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11854,6 +11854,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/fr.po b/editor/translations/fr.po index 8cbba6643c..2c53fcb8e2 100644 --- a/editor/translations/fr.po +++ b/editor/translations/fr.po @@ -74,7 +74,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-18 15:09+0000\n" +"PO-Revision-Date: 2020-02-27 07:01+0000\n" "Last-Translator: Pierre Caye <pierrecaye@laposte.net>\n" "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/" "godot/fr/>\n" @@ -83,7 +83,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.11\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1563,6 +1563,10 @@ msgstr "Nom" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Coller les paramètres" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Mise à jour de la scène" @@ -1850,7 +1854,7 @@ msgstr "Montrer dans le gestionnaire de fichiers" msgid "New Folder..." msgstr "Nouveau dossier..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Rafraîchir" @@ -4118,10 +4122,6 @@ msgid "Copy Params" msgstr "Copier paramètres" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Coller les paramètres" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Modifier le Presse-papiers de la ressource" @@ -6071,8 +6071,8 @@ msgstr "" "collisions." #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" -msgstr "Créer une(des) collision(s) convexe(s) unique(s) sœur(s)" +msgid "Create Single Convex Collision Sibling" +msgstr "Créer une unique collision convexe sœur" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" @@ -6085,7 +6085,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Multiple Convex Collision Siblings" -msgstr "Créer une(des) collision(s) convexe(s) multiple(s) sœur(s)" +msgstr "Créer une collision convexe multiple sœur(s)" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" @@ -12539,6 +12539,11 @@ msgstr "" "Les formes planes ne fonctionnent pas bien et seront supprimées dans les " "versions futures. S'il vous plaît, ne les utilisez pas." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Rien n'est visible car aucun maillage n'a été assigné." diff --git a/editor/translations/ga.po b/editor/translations/ga.po index 018d095c92..e4e77fffc1 100644 --- a/editor/translations/ga.po +++ b/editor/translations/ga.po @@ -1453,6 +1453,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1729,7 +1733,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3866,10 +3870,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5753,7 +5753,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11851,6 +11851,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/he.po b/editor/translations/he.po index 1aa8c9d306..17e04827a0 100644 --- a/editor/translations/he.po +++ b/editor/translations/he.po @@ -10,12 +10,13 @@ # Ido Dana <idodana01@gmail.com>, 2019. # Daniel Dovgun <daniel.dovgun@gmail.com>, 2019. # MordechaiHadad <Mordechai.hadad01@gmail.com>, 2019. +# Daniel <danielharush5252@gmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-09-07 13:51+0000\n" -"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" +"PO-Revision-Date: 2020-02-25 09:41+0000\n" +"Last-Translator: Daniel <danielharush5252@gmail.com>\n" "Language-Team: Hebrew <https://hosted.weblate.org/projects/godot-engine/" "godot/he/>\n" "Language: he\n" @@ -24,7 +25,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && " "n % 10 == 0) ? 2 : 3));\n" -"X-Generator: Weblate 3.9-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -33,7 +34,7 @@ msgstr "משתנה סוג לא חוקי לפונקציית convert(), יש ל #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp msgid "Expected a string of length 1 (a character)." -msgstr "" +msgstr "צופה מחרוזת באורך 1 (תו)" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/mono/glue/gd_glue.cpp @@ -1534,6 +1535,10 @@ msgstr "שם" msgid "Singleton" msgstr "יחידני" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "הדבקת משתנים" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "הסצנה מתעדכנת" @@ -1839,7 +1844,7 @@ msgstr "הצגה במנהל הקבצים" msgid "New Folder..." msgstr "תיקייה חדשה…" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "רענון" @@ -4096,10 +4101,6 @@ msgid "Copy Params" msgstr "העתקת משתנים" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "הדבקת משתנים" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "לוח גזירי המשאבים ריק!" @@ -6105,7 +6106,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "יצירת מצולע" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12508,6 +12509,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/hi.po b/editor/translations/hi.po index 9278e63fc9..d043407257 100644 --- a/editor/translations/hi.po +++ b/editor/translations/hi.po @@ -1483,6 +1483,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1765,7 +1769,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3920,10 +3924,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "एडिट रिसोर्स क्लिपबोर्ड" @@ -5808,7 +5808,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "सदस्यता बनाएं" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12034,6 +12034,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/hr.po b/editor/translations/hr.po index 5922d2effb..ce8191c638 100644 --- a/editor/translations/hr.po +++ b/editor/translations/hr.po @@ -1468,6 +1468,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1744,7 +1748,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3885,10 +3889,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5785,7 +5785,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11910,6 +11910,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/hu.po b/editor/translations/hu.po index 4a2e0eb506..cbe475b022 100644 --- a/editor/translations/hu.po +++ b/editor/translations/hu.po @@ -1553,6 +1553,10 @@ msgstr "Név" msgid "Singleton" msgstr "Egyke" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Paraméterek Beillesztése" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Scene Frissítése" @@ -1859,7 +1863,7 @@ msgstr "Mutat Fájlkezelőben" msgid "New Folder..." msgstr "Új Mappa..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Frissítés" @@ -4199,10 +4203,6 @@ msgid "Copy Params" msgstr "Paraméterek Másolása" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Paraméterek Beillesztése" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "Az erőforrás vágólap üres!" @@ -6258,7 +6258,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Konvex Ütközési Testvér Létrehozása" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12699,6 +12699,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/id.po b/editor/translations/id.po index 6a76af5db6..c4ead514c6 100644 --- a/editor/translations/id.po +++ b/editor/translations/id.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-16 15:21+0000\n" +"PO-Revision-Date: 2020-03-08 22:33+0000\n" "Last-Translator: Sofyan Sugianto <sofyanartem@gmail.com>\n" "Language-Team: Indonesian <https://hosted.weblate.org/projects/godot-engine/" "godot/id/>\n" @@ -38,7 +38,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -708,9 +708,8 @@ msgid "Line Number:" msgstr "Nomor Baris:" #: editor/code_editor.cpp -#, fuzzy msgid "%d replaced." -msgstr "Gantikan..." +msgstr "%d telah diganti." #: editor/code_editor.cpp editor/editor_help.cpp msgid "%d match." @@ -1508,6 +1507,10 @@ msgstr "Nama" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Tempel Parameter" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Memperbarui Skena" @@ -1794,7 +1797,7 @@ msgstr "Tampilkan di Manajer Berkas" msgid "New Folder..." msgstr "Buat Direktori..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Segarkan" @@ -3973,9 +3976,8 @@ msgid "Saving..." msgstr "Menyimpan..." #: editor/import_dock.cpp -#, fuzzy msgid "%d Files" -msgstr " Berkas" +msgstr "%d Berkas" #: editor/import_dock.cpp msgid "Set as Default for '%s'" @@ -4034,10 +4036,6 @@ msgid "Copy Params" msgstr "Salin Parameter" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Tempel Parameter" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Sunting Papan Klip Resource" @@ -5852,9 +5850,8 @@ msgid "Mesh is empty!" msgstr "Mesh kosong!" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create a Trimesh collision shape." -msgstr "Buat Trimesh Collision Sibling" +msgstr "Tidak dapat membuat bentuk collision Trimesh." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" @@ -5886,14 +5883,13 @@ msgid "Can't create multiple convex collision shapes for the scene root." msgstr "Tidak dapat membuat beberapa convex collision shape untuk skena root." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create any collision shapes." -msgstr "Tidak dapat membuat folder." +msgstr "Tidak dapat membuat bentuk collision." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy msgid "Create Multiple Convex Shapes" -msgstr "Buat Bentuk Cembung" +msgstr "Buat Beberapa Bentuk Cembung" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" @@ -5969,8 +5965,8 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" -msgstr "Buat Convex Collision Sibling" +msgid "Create Single Convex Collision Sibling" +msgstr "Buat Saudara Tunggal Convex Collision" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" @@ -5982,9 +5978,8 @@ msgstr "" "deteksi collision." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Collision Siblings" -msgstr "Buat Convex Collision Sibling" +msgstr "Buat Beberapa Saudara Convex Collision" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" @@ -6005,6 +6000,10 @@ msgid "" "This can be used instead of the SpatialMaterial Grow property when using " "that property isn't possible." msgstr "" +"Buat outline mesh statis. Outline mesh akan memiliki garis normal yang akan " +"dibalik otomatis.\n" +"Ini dapat digunakan sebagai pengganti properti Grow dari SpatialMaterial " +"ketika tidak dapat menggunakan properti itu." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "View UV1" @@ -9594,32 +9593,29 @@ msgid "Export With Debug" msgstr "Ekspor dengan Awakutu" #: editor/project_manager.cpp -#, fuzzy msgid "The path specified doesn't exist." -msgstr "Lokasi ini tidak ada." +msgstr "Lokasi yang ditentukan tidak ada." #: editor/project_manager.cpp -#, fuzzy msgid "Error opening package file (it's not in ZIP format)." -msgstr "Gagal saat membuka paket, tidak dalam bentuk zip." +msgstr "Galat saat membuka berkas paket (tidak dalam format ZIP)." #: editor/project_manager.cpp -#, fuzzy msgid "" "Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file." -msgstr "Berkas proyek '.zip' tidak valid, tidak berisi berkas 'project.godot'." +msgstr "" +"Berkas proyek \".zip\" tidak valid; tidak terdapat berkas \"project.godot\" " +"di dalamnya." #: editor/project_manager.cpp msgid "Please choose an empty folder." msgstr "Silakan pilih direktori kosong." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a \"project.godot\" or \".zip\" file." -msgstr "Silakan pilih berkas 'project.godot' atau '.zip'." +msgstr "Silakan pilih berkas \"project.godot\" atau \".zip\"." #: editor/project_manager.cpp -#, fuzzy msgid "This directory already contains a Godot project." msgstr "Direktori ini sudah berisi proyek Godot." @@ -10317,9 +10313,8 @@ msgid "Suffix" msgstr "Akhiran" #: editor/rename_dialog.cpp -#, fuzzy msgid "Use Regular Expressions" -msgstr "Ekspresi Reguler" +msgstr "Gunakan Ekspresi Reguler" #: editor/rename_dialog.cpp msgid "Advanced Options" @@ -10358,7 +10353,6 @@ msgstr "" "Bandingkan opsi penghitung." #: editor/rename_dialog.cpp -#, fuzzy msgid "Per-level Counter" msgstr "Penghitung per Level" @@ -10399,14 +10393,12 @@ msgid "Keep" msgstr "Pertahankan" #: editor/rename_dialog.cpp -#, fuzzy msgid "PascalCase to snake_case" -msgstr "CamelCase ke under_score" +msgstr "PascalCase ke snake_case" #: editor/rename_dialog.cpp -#, fuzzy msgid "snake_case to PascalCase" -msgstr "under_score ke CamelCase" +msgstr "snake_case ke PascalCase" #: editor/rename_dialog.cpp msgid "Case" @@ -10425,14 +10417,12 @@ msgid "Reset" msgstr "Reset" #: editor/rename_dialog.cpp -#, fuzzy msgid "Regular Expression Error" -msgstr "Ekspresi Reguler" +msgstr "Kesalahan Ekspresi Reguler" #: editor/rename_dialog.cpp -#, fuzzy msgid "At character %s" -msgstr "Karakter sah:" +msgstr "Pada karakter %s" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" @@ -10616,6 +10606,8 @@ msgstr "Tidak dapat bekerja pada node dari skena luar!" #: editor/scene_tree_dock.cpp msgid "Can't operate on nodes the current scene inherits from!" msgstr "" +"Tidak dapat mengoperasikan perintah ini pada node skena saat ini yang " +"mewarisi skena lain!" #: editor/scene_tree_dock.cpp msgid "Attach Script" @@ -10898,9 +10890,8 @@ msgid "Invalid inherited parent name or path." msgstr "Nama atau lokasi parent yang diwariskan tidak valid." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Script path/name is valid." -msgstr "Skrip valid." +msgstr "Lokasi/nama skrip valid." #: editor/script_create_dialog.cpp msgid "Allowed: a-z, A-Z, 0-9, _ and ." @@ -10991,9 +10982,8 @@ msgid "Copy Error" msgstr "Salin Galat" #: editor/script_editor_debugger.cpp -#, fuzzy msgid "Video RAM" -msgstr "Memori Video" +msgstr "RAM Video" #: editor/script_editor_debugger.cpp msgid "Skip Breakpoints" @@ -11308,8 +11298,9 @@ msgid "GridMap Paste Selection" msgstr "Rekat(Paste) Seleksi GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy msgid "GridMap Paint" -msgstr "" +msgstr "Cat GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" @@ -11655,6 +11646,9 @@ msgid "" "Can't drop properties because script '%s' is not used in this scene.\n" "Drop holding 'Shift' to just copy the signature." msgstr "" +"Tidak dapat drop properti karena skrip '%s' sedang tidak digunakan dalam " +"skena ini.\n" +"Drop dengan menekan 'Shift' untuk hanya menyalin tanda tangan (signature)." #: modules/visual_script/visual_script_editor.cpp msgid "Add Getter Property" @@ -11726,11 +11720,11 @@ msgstr "" #: modules/visual_script/visual_script_editor.cpp msgid "Select at least one node with sequence port." -msgstr "" +msgstr "Pilih setidaknya satu node dengan port urutan." #: modules/visual_script/visual_script_editor.cpp msgid "Try to only have one sequence input in selection." -msgstr "" +msgstr "Usahakan hanya memiliki satu input urutan dalam pemilihan." #: modules/visual_script/visual_script_editor.cpp msgid "Create Function" @@ -11758,7 +11752,7 @@ msgstr "Mengedit Sinyal:" #: modules/visual_script/visual_script_editor.cpp msgid "Make Tool:" -msgstr "" +msgstr "Buat Alat:" #: modules/visual_script/visual_script_editor.cpp msgid "Members:" @@ -11798,7 +11792,7 @@ msgstr "Salin Node" #: modules/visual_script/visual_script_editor.cpp msgid "Cut Nodes" -msgstr "" +msgstr "Potong Node" #: modules/visual_script/visual_script_editor.cpp msgid "Make Function" @@ -11875,15 +11869,15 @@ msgstr "Cari VisualScript" #: modules/visual_script/visual_script_property_selector.cpp msgid "Get %s" -msgstr "" +msgstr "Dapatkan %s" #: modules/visual_script/visual_script_property_selector.cpp msgid "Set %s" -msgstr "" +msgstr "Setel %s" #: platform/android/export/export.cpp msgid "Package name is missing." -msgstr "" +msgstr "Nama paket tidak ada." #: platform/android/export/export.cpp msgid "Package segments must be of non-zero length." @@ -12361,6 +12355,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/is.po b/editor/translations/is.po index 7f0ab2f719..213e7d239b 100644 --- a/editor/translations/is.po +++ b/editor/translations/is.po @@ -1486,6 +1486,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1765,7 +1769,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3908,10 +3912,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5816,7 +5816,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Breyta Viðbót" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11971,6 +11971,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/it.po b/editor/translations/it.po index 77956e9233..738718a0fa 100644 --- a/editor/translations/it.po +++ b/editor/translations/it.po @@ -48,8 +48,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-18 15:09+0000\n" -"Last-Translator: Douglas Fiedler <dognew@gmail.com>\n" +"PO-Revision-Date: 2020-02-27 07:01+0000\n" +"Last-Translator: Micila Micillotto <micillotto@gmail.com>\n" "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/" "godot/it/>\n" "Language: it\n" @@ -57,7 +57,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.11\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1529,6 +1529,10 @@ msgstr "Nome" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Incolla Parametri" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Aggiornamento scena" @@ -1816,7 +1820,7 @@ msgstr "Mostra nel gestore file" msgid "New Folder..." msgstr "Nuova cartella..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Aggiorna" @@ -4075,10 +4079,6 @@ msgid "Copy Params" msgstr "Copia parametri" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Incolla Parametri" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Modifica Appunti Risorse" @@ -5924,29 +5924,30 @@ msgstr "Crea Forma Statica Trimesh" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create a single convex collision shape for the scene root." msgstr "" +"Impossibile creare una singola forma di collisione convessa per la radice " +"della scena." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Couldn't create a single convex collision shape." -msgstr "" +msgstr "Impossibile creare una singola forma di collisione convessa." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Single Convex Shape" -msgstr "Crea una o più forme Convesse" +msgstr "Crea Singola Forma di Collisione Convessa" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create multiple convex collision shapes for the scene root." msgstr "" +"Impossibile creare più forme di collisione convesse per la radice della " +"scena." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create any collision shapes." -msgstr "Impossibile creare la cartella." +msgstr "Impossibile creare alcuna forma di collisione." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Shapes" -msgstr "Crea una o più forme Convesse" +msgstr "Crea Multiple Forme Covesse" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" @@ -6003,6 +6004,10 @@ msgid "" "automatically.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Crea una StaticBody e le assegna automaticamente una forma di collisione " +"basata sui poligoni.\n" +"Questa é l'opzione piú accurata (anche se piú lenta) per il calcolo delle " +"collisioni." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" @@ -6013,28 +6018,36 @@ msgid "" "Creates a polygon-based collision shape.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Crea una forma di collisione basata sui poligoni.\n" +"Questa é l'opzione piú accurata (anche se piú lenta) per il calcolo delle " +"collisioni." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" -msgstr "Crea Fratello(i) di Collisione Convessa" +msgid "Create Single Convex Collision Sibling" +msgstr "Crea Singolo Fratello di Collisione Convessa" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a single convex collision shape.\n" "This is the fastest (but least accurate) option for collision detection." msgstr "" +"Crea una singola forma di collisione convessa.\n" +"Questa é l'opzione piú veloce (anche se meno accurata) per il calcolo delle " +"collisioni." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Collision Siblings" -msgstr "Crea Fratello(i) di Collisione Convessa" +msgstr "Crea Multipli Fratelli di Collsione Convessa" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a polygon-based collision shape.\n" "This is a performance middle-ground between the two above options." msgstr "" +"Crea una forma di collisione basata sui poligoni.\n" +"Questa opzione é, in termini di perfomance, un compromesso tra le due " +"opzioni prima di questa." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh..." @@ -6047,6 +6060,10 @@ msgid "" "This can be used instead of the SpatialMaterial Grow property when using " "that property isn't possible." msgstr "" +"Crea intorno una mesh statica. Questa mesh avrà le suoe normali invertite " +"automaticamente.\n" +"Questo puó essere usato come sostitutivo per la proprietà Grow (ingrandisci) " +"delle SpatialMaterial quando questa non é disponibile." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "View UV1" @@ -9636,35 +9653,31 @@ msgid "Export With Debug" msgstr "Esporta Con Debug" #: editor/project_manager.cpp -#, fuzzy msgid "The path specified doesn't exist." -msgstr "Percorso non esistente." +msgstr "Il percorso specificato non é esistente." #: editor/project_manager.cpp -#, fuzzy msgid "Error opening package file (it's not in ZIP format)." -msgstr "Errore nell'apertura del file package: non è in formato ZIP." +msgstr "Errore nell'apertura del file package (non è in formato ZIP)." #: editor/project_manager.cpp -#, fuzzy msgid "" "Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file." msgstr "" -"File di progetto '.zip' non valido, non contiene un file 'project.godot'." +"File progetto '.zip' non valido; non contiene un file denominato 'project." +"godot'." #: editor/project_manager.cpp msgid "Please choose an empty folder." msgstr "Si prega di scegliere una cartella vuota." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a \"project.godot\" or \".zip\" file." -msgstr "Si prega di scegliere un file 'project.godot' o '.zip'." +msgstr "Perfavore, scegli un file 'project.godot' o '.zip'." #: editor/project_manager.cpp -#, fuzzy msgid "This directory already contains a Godot project." -msgstr "La Cartella contiene già un progetto di Godot." +msgstr "Questa cartella contiene già un progetto Godot." #: editor/project_manager.cpp msgid "New Game Project" @@ -10363,9 +10376,8 @@ msgid "Suffix" msgstr "Suffisso" #: editor/rename_dialog.cpp -#, fuzzy msgid "Use Regular Expressions" -msgstr "Espressioni Regolari" +msgstr "Usa Espressioni Regolari" #: editor/rename_dialog.cpp msgid "Advanced Options" @@ -10404,7 +10416,6 @@ msgstr "" "Confronta le opzioni del contatore." #: editor/rename_dialog.cpp -#, fuzzy msgid "Per-level Counter" msgstr "Contatore per Livello" @@ -10445,14 +10456,12 @@ msgid "Keep" msgstr "Mantieni" #: editor/rename_dialog.cpp -#, fuzzy msgid "PascalCase to snake_case" -msgstr "CamelCase a under_score" +msgstr "PascalCase a snake_case" #: editor/rename_dialog.cpp -#, fuzzy msgid "snake_case to PascalCase" -msgstr "under_score a CamelCase" +msgstr "snake_case a PascalCase" #: editor/rename_dialog.cpp msgid "Case" @@ -10471,14 +10480,12 @@ msgid "Reset" msgstr "Reset" #: editor/rename_dialog.cpp -#, fuzzy msgid "Regular Expression Error" -msgstr "Espressioni Regolari" +msgstr "Errore Espressione Regolare" #: editor/rename_dialog.cpp -#, fuzzy msgid "At character %s" -msgstr "Caratteri validi:" +msgstr "Al carattere %s" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" @@ -10944,9 +10951,8 @@ msgid "Invalid inherited parent name or path." msgstr "Nome o percorso genitore ereditato non valido." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Script path/name is valid." -msgstr "Lo script è valido." +msgstr "Il nome e la path dello script sono validi." #: editor/script_create_dialog.cpp msgid "Allowed: a-z, A-Z, 0-9, _ and ." @@ -11037,9 +11043,8 @@ msgid "Copy Error" msgstr "Errore di Copia" #: editor/script_editor_debugger.cpp -#, fuzzy msgid "Video RAM" -msgstr "Mem Video" +msgstr "RAM Video" #: editor/script_editor_debugger.cpp msgid "Skip Breakpoints" @@ -12468,6 +12473,11 @@ msgstr "" "Le forme planari non funzionano bene e verranno rimosse nelle versioni " "future. Per favore, non usarle." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Niente è visibile perché non è stata assegnata alcuna mesh." diff --git a/editor/translations/ja.po b/editor/translations/ja.po index c0298bb075..3c14b17b53 100644 --- a/editor/translations/ja.po +++ b/editor/translations/ja.po @@ -35,7 +35,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-16 15:20+0000\n" +"PO-Revision-Date: 2020-03-05 08:33+0000\n" "Last-Translator: Akihiro Ogoshi <technical@palsystem-game.com>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/godot-engine/" "godot/ja/>\n" @@ -44,7 +44,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1513,6 +1513,10 @@ msgstr "名前" msgid "Singleton" msgstr "シングルトン" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "パラメーターを貼り付け" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "シーンを更新" @@ -1800,7 +1804,7 @@ msgstr "ファイルマネージャーで表示" msgid "New Folder..." msgstr "新規フォルダ..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "再読込" @@ -2098,7 +2102,7 @@ msgstr "プロパティ:" #: editor/editor_inspector.cpp msgid "Set" -msgstr "設定" +msgstr "Set" #: editor/editor_inspector.cpp msgid "Set Multiple:" @@ -3975,9 +3979,8 @@ msgid "Saving..." msgstr "保存中..." #: editor/import_dock.cpp -#, fuzzy msgid "%d Files" -msgstr " ファイル" +msgstr "%d ファイル" #: editor/import_dock.cpp msgid "Set as Default for '%s'" @@ -4036,10 +4039,6 @@ msgid "Copy Params" msgstr "パラメーターをコピー" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "パラメーターを貼り付け" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "リソースのクリップボードを編集" @@ -5966,7 +5965,8 @@ msgstr "" "これは、衝突検出の最も正確な(ただし最も遅い)オプションです。" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +#, fuzzy +msgid "Create Single Convex Collision Sibling" msgstr "単一の凸型コリジョンの兄弟を作成" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -8520,19 +8520,19 @@ msgstr "出力を追加" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Scalar" -msgstr "スカラー(Scaler)" +msgstr "Scalar" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vector" -msgstr "ベクトル(Vector)" +msgstr "Vector" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Boolean" -msgstr "ブール(Boolean)" +msgstr "Boolean" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Sampler" -msgstr "サンプラー(Sampler)" +msgstr "Sampler" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add input port" @@ -10907,7 +10907,7 @@ msgstr "組み込みスクリプト:" #: editor/script_create_dialog.cpp msgid "Attach Node Script" -msgstr "ノードスクリプトを添付する" +msgstr "ノードにスクリプトをアタッチする" #: editor/script_editor_debugger.cpp msgid "Remote " @@ -11498,7 +11498,7 @@ msgstr "変数の型を設定" #: modules/visual_script/visual_script_editor.cpp msgid "Add Input Port" -msgstr "入力ポートの追加" +msgstr "入力ポートを追加" #: modules/visual_script/visual_script_editor.cpp msgid "Add Output Port" @@ -12368,6 +12368,11 @@ msgstr "" "平面シェイプはうまく機能せず、将来のバージョンでは削除される予定です。使わな" "いでください。" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "メッシュが割り当てられていないため、何も表示されません。" diff --git a/editor/translations/ka.po b/editor/translations/ka.po index 3c9ab6c79e..1aaa12d6a0 100644 --- a/editor/translations/ka.po +++ b/editor/translations/ka.po @@ -1541,6 +1541,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1828,7 +1832,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -4009,10 +4013,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5955,7 +5955,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "შექმნა" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12204,6 +12204,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/ko.po b/editor/translations/ko.po index fc23015cf8..37c950097b 100644 --- a/editor/translations/ko.po +++ b/editor/translations/ko.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-02 08:52+0000\n" +"PO-Revision-Date: 2020-03-05 08:33+0000\n" "Last-Translator: Ch. <ccwpc@hanmail.net>\n" "Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/" "godot/ko/>\n" @@ -28,7 +28,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -696,9 +696,8 @@ msgid "Line Number:" msgstr "행 번호:" #: editor/code_editor.cpp -#, fuzzy msgid "%d replaced." -msgstr "바꾸기..." +msgstr "%d개가 바뀌었습니다." #: editor/code_editor.cpp editor/editor_help.cpp msgid "%d match." @@ -1495,6 +1494,10 @@ msgstr "이름" msgid "Singleton" msgstr "싱글톤" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "매개변수 붙여넣기" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "씬 업데이트 중" @@ -1780,7 +1783,7 @@ msgstr "파일 탐색기에서 보기" msgid "New Folder..." msgstr "새 폴더..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "새로고침" @@ -3256,7 +3259,7 @@ msgstr "새 스크립트" #: editor/editor_properties.cpp editor/scene_tree_dock.cpp msgid "Extend Script" -msgstr "스크립트 펼치기" +msgstr "스크립트 상속" #: editor/editor_properties.cpp editor/property_editor.cpp msgid "New %s" @@ -3943,9 +3946,8 @@ msgid "Saving..." msgstr "저장 중..." #: editor/import_dock.cpp -#, fuzzy msgid "%d Files" -msgstr " 파일" +msgstr "파일 %d개" #: editor/import_dock.cpp msgid "Set as Default for '%s'" @@ -4004,10 +4006,6 @@ msgid "Copy Params" msgstr "매개변수 복사" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "매개변수 붙여넣기" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "리소스 클립보드 편집" @@ -5814,9 +5812,8 @@ msgid "Mesh is empty!" msgstr "메시가 없습니다!" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create a Trimesh collision shape." -msgstr "Trimesh 충돌 형제 만들기" +msgstr "Trimesh 충돌 모양을 만들 수 없습니다." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" @@ -5832,30 +5829,28 @@ msgstr "Trimesh Static Shape 만들기" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create a single convex collision shape for the scene root." -msgstr "" +msgstr "씬 루트에서 단일 convex 충돌 Shape를 만들 수 없습니다." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Couldn't create a single convex collision shape." -msgstr "" +msgstr "단일 convex 충돌 모양을 만들 수 없습니다." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy msgid "Create Single Convex Shape" -msgstr "Convex Shape 만들기" +msgstr "Convex 모양 만들기" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create multiple convex collision shapes for the scene root." -msgstr "" +msgstr "씬 루트에 다중 convex 충돌 모양을 만들 수 없습니다." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create any collision shapes." -msgstr "폴더를 만들 수 없습니다." +msgstr "충돌 모양을 만들 수 없습니다." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Shapes" -msgstr "Convex Shape 만들기" +msgstr "다중 Convex Shape 만들기" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" @@ -5911,6 +5906,9 @@ msgid "" "automatically.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"StaticBody를 하나 만들고 거기에 폴리곤 기반 충돌 모양을 하나 자동으로 만들어 " +"붙입니다.\n" +"이 방법은 가장 정확한 (하지만 가장 느린) 충돌 탐지 방법입니다." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" @@ -5921,10 +5919,12 @@ msgid "" "Creates a polygon-based collision shape.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"폴리곤 기반 충돌 모양을 하나 만듭니다.\n" +"이 방법은 가장 정확한 (하지만 가장 느린) 충돌 탐지 방법입니다." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Convex 충돌 형제 만들기" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -5932,17 +5932,21 @@ msgid "" "Creates a single convex collision shape.\n" "This is the fastest (but least accurate) option for collision detection." msgstr "" +"convex 충돌 모양을 하나 만듭니다.\n" +"이 방법은 가장 빠른 (하지만 덜 정확한) 충돌 탐지 방법입니다." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy msgid "Create Multiple Convex Collision Siblings" -msgstr "Convex 충돌 형제 만들기" +msgstr "다중 Convex 충돌 형제 만들기" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a polygon-based collision shape.\n" "This is a performance middle-ground between the two above options." msgstr "" +"폴리곤 기반 충돌 모양을 하나 만듭니다.\n" +"이 방법은 위 두 가지 옵션의 중간 정도 성능입니다." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh..." @@ -5955,6 +5959,8 @@ msgid "" "This can be used instead of the SpatialMaterial Grow property when using " "that property isn't possible." msgstr "" +"정적 외곽선 메시를 만듭니다. 외곽선 메시의 법선 벡터는 자동으로 반전됩니다.\n" +"SpatialMaterial의 Grow 속성을 사용할 수 없을 때 대신 사용할 수 있습니다." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "View UV1" @@ -9501,30 +9507,27 @@ msgid "Export With Debug" msgstr "디버그와 함께 내보내기" #: editor/project_manager.cpp -#, fuzzy msgid "The path specified doesn't exist." -msgstr "경로가 없습니다." +msgstr "지정한 경로가 없습니다." #: editor/project_manager.cpp -#, fuzzy msgid "Error opening package file (it's not in ZIP format)." -msgstr "패키지 파일을 여는 중 오류. ZIP 형식이 아닙니다." +msgstr "패키지 파일을 여는 중 오류 (ZIP 형식이 아닙니다)." #: editor/project_manager.cpp -#, fuzzy msgid "" "Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file." msgstr "" -"잘못된 '.zip' 프로젝트 파일입니다. 'project.godot' 파일을 갖고 있지 않습니다." +"잘못된 \".zip\" 프로젝트 파일입니다. \"project.godot\" 파일이 들어있지 않습니" +"다." #: editor/project_manager.cpp msgid "Please choose an empty folder." msgstr "비어있는 폴더를 선택해주세요." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a \"project.godot\" or \".zip\" file." -msgstr "'project.godot' 파일 또는 '.zip' 파일을 선택해주세요." +msgstr "\"project.godot\" 파일 또는 \".zip\" 파일을 선택해주세요." #: editor/project_manager.cpp #, fuzzy @@ -10220,9 +10223,8 @@ msgid "Suffix" msgstr "접미사" #: editor/rename_dialog.cpp -#, fuzzy msgid "Use Regular Expressions" -msgstr "정규 표현식" +msgstr "정규 표현식 사용" #: editor/rename_dialog.cpp msgid "Advanced Options" @@ -10263,7 +10265,7 @@ msgstr "" #: editor/rename_dialog.cpp #, fuzzy msgid "Per-level Counter" -msgstr "단계 별 카운터" +msgstr "단계별 카운터" #: editor/rename_dialog.cpp msgid "If set the counter restarts for each group of child nodes" @@ -10302,14 +10304,12 @@ msgid "Keep" msgstr "유지" #: editor/rename_dialog.cpp -#, fuzzy msgid "PascalCase to snake_case" -msgstr "CamelCase를 under_scored로" +msgstr "PascalCase를 snake_case로" #: editor/rename_dialog.cpp -#, fuzzy msgid "snake_case to PascalCase" -msgstr "under_scored를 CamelCase로" +msgstr "snake_case를 PascalCase로" #: editor/rename_dialog.cpp msgid "Case" @@ -10328,14 +10328,12 @@ msgid "Reset" msgstr "되돌리기" #: editor/rename_dialog.cpp -#, fuzzy msgid "Regular Expression Error" -msgstr "정규 표현식" +msgstr "정규 표현식 오류" #: editor/rename_dialog.cpp -#, fuzzy msgid "At character %s" -msgstr "올바른 문자:" +msgstr "(문자 %s 위치)" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" @@ -10795,9 +10793,8 @@ msgid "Invalid inherited parent name or path." msgstr "잘못된 상속된 부모 이름 또는 경로." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Script path/name is valid." -msgstr "스크립트가 올바릅니다." +msgstr "스크립트의 경로/이름이 올바릅니다." #: editor/script_create_dialog.cpp msgid "Allowed: a-z, A-Z, 0-9, _ and ." @@ -10888,9 +10885,8 @@ msgid "Copy Error" msgstr "복사 오류" #: editor/script_editor_debugger.cpp -#, fuzzy msgid "Video RAM" -msgstr "비디오 메모리" +msgstr "비디오 RAM" #: editor/script_editor_debugger.cpp msgid "Skip Breakpoints" @@ -12271,6 +12267,11 @@ msgstr "" "평면 Shape는 잘 작동하지 않으며 이후 버전에서 제거될 예정입니다. 사용하지 말" "아주세요." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "지정한 메시가 없어서 아무 것도 보이지 않습니다." diff --git a/editor/translations/lt.po b/editor/translations/lt.po index 60d2adc418..1f58c4a658 100644 --- a/editor/translations/lt.po +++ b/editor/translations/lt.po @@ -1503,6 +1503,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1795,7 +1799,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3983,10 +3987,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5930,7 +5930,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Keisti Poligono Skalę" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12188,6 +12188,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/lv.po b/editor/translations/lv.po index 9a6454d81b..dc0a5aa151 100644 --- a/editor/translations/lv.po +++ b/editor/translations/lv.po @@ -1512,6 +1512,10 @@ msgstr "Nosaukums" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Atjaunina Ainu" @@ -1798,7 +1802,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3976,10 +3980,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5916,7 +5916,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Izveidot" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12159,6 +12159,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/mi.po b/editor/translations/mi.po index 2e6c563aec..5ec6cc28e0 100644 --- a/editor/translations/mi.po +++ b/editor/translations/mi.po @@ -1444,6 +1444,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1720,7 +1724,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3853,10 +3857,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5737,7 +5737,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11823,6 +11823,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/ml.po b/editor/translations/ml.po index 500a1d9156..7e7149e05e 100644 --- a/editor/translations/ml.po +++ b/editor/translations/ml.po @@ -1454,6 +1454,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1730,7 +1734,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3865,10 +3869,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5753,7 +5753,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11840,6 +11840,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/mr.po b/editor/translations/mr.po index ca97848940..4ae3df9f99 100644 --- a/editor/translations/mr.po +++ b/editor/translations/mr.po @@ -1450,6 +1450,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1726,7 +1730,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3860,10 +3864,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5744,7 +5744,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11830,6 +11830,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/ms.po b/editor/translations/ms.po index d7e9bd443a..bdb52e4845 100644 --- a/editor/translations/ms.po +++ b/editor/translations/ms.po @@ -1474,6 +1474,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1751,7 +1755,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3888,10 +3892,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5791,7 +5791,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11910,6 +11910,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/nb.po b/editor/translations/nb.po index 9060ee7249..90df4e7b4f 100644 --- a/editor/translations/nb.po +++ b/editor/translations/nb.po @@ -1570,6 +1570,10 @@ msgstr "Navn" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Lim inn Parametre" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Oppdaterer Scene" @@ -1886,7 +1890,7 @@ msgstr "Vis I Filutforsker" msgid "New Folder..." msgstr "Ny Mappe..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Oppdater" @@ -4260,10 +4264,6 @@ msgid "Copy Params" msgstr "Kopier Parametre" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Lim inn Parametre" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "Ressurs-utklippstavle er tom!" @@ -6332,7 +6332,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Lag Poly" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12835,6 +12835,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/nl.po b/editor/translations/nl.po index cc5c2c978f..458ff0b5b8 100644 --- a/editor/translations/nl.po +++ b/editor/translations/nl.po @@ -44,7 +44,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-01-27 07:09+0000\n" +"PO-Revision-Date: 2020-03-08 22:33+0000\n" "Last-Translator: Stijn Hinlopen <f.a.hinlopen@gmail.com>\n" "Language-Team: Dutch <https://hosted.weblate.org/projects/godot-engine/godot/" "nl/>\n" @@ -53,7 +53,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -721,9 +721,8 @@ msgid "Line Number:" msgstr "Regelnummer:" #: editor/code_editor.cpp -#, fuzzy msgid "%d replaced." -msgstr "Vervang..." +msgstr "%d vervangen." #: editor/code_editor.cpp editor/editor_help.cpp msgid "%d match." @@ -1526,6 +1525,10 @@ msgstr "Naam" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Plak Parameters" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Scène aan het bijwerken" @@ -1812,7 +1815,7 @@ msgstr "Weergeven in Bestandsbeheer" msgid "New Folder..." msgstr "Nieuwe map..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Verversen" @@ -2714,7 +2717,7 @@ msgstr "Scène openen..." #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp msgid "Open Recent" -msgstr "Recente Scenes Openen" +msgstr "Onlangs geopend" #: editor/editor_node.cpp msgid "Save Scene" @@ -2938,7 +2941,7 @@ msgstr "Editor-functionaliteiten Beheren..." #: editor/editor_node.cpp msgid "Manage Export Templates..." -msgstr "Export Sjablonen Beheren..." +msgstr "Exportsjablonen beheren..." #: editor/editor_node.cpp editor/plugins/shader_editor_plugin.cpp msgid "Help" @@ -3771,7 +3774,7 @@ msgstr "Volgend(e) map/bestand" #: editor/filesystem_dock.cpp msgid "Re-Scan Filesystem" -msgstr "Bestandssysteem Opnieuw Scannen" +msgstr "Bestandssysteem opnieuw inlezen" #: editor/filesystem_dock.cpp msgid "Toggle Split Mode" @@ -3786,8 +3789,8 @@ msgid "" "Scanning Files,\n" "Please Wait..." msgstr "" -"Bestanden Scannen,\n" -"Wacht Alstublieft..." +"Bestanden aan het doornemen,\n" +"Wacht alstublieft..." #: editor/filesystem_dock.cpp msgid "Move" @@ -4059,10 +4062,6 @@ msgid "Copy Params" msgstr "Kopieer Parameters" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Plak Parameters" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Bron in klembord bewerken" @@ -5069,7 +5068,7 @@ msgstr "Plugins..." #: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp msgid "Sort:" -msgstr "Sorteren:" +msgstr "Sorteren op:" #: editor/plugins/asset_library_editor_plugin.cpp #: editor/project_settings_editor.cpp @@ -5885,9 +5884,8 @@ msgid "Mesh is empty!" msgstr "Mesh is leeg!" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create a Trimesh collision shape." -msgstr "Creëer Trimesh Botsing Broer" +msgstr "Kon geen Trimesh-botsingsvorm maken." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" @@ -5904,29 +5902,29 @@ msgstr "Creëer Trimesh Static Shape" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create a single convex collision shape for the scene root." msgstr "" +"Uit de scènewortel kan geen enkele convexe botsingsvorm gemaakt worden." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Couldn't create a single convex collision shape." -msgstr "" +msgstr "Kon geen enkelvoudige convexe botsingsvorm maken." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Single Convex Shape" -msgstr "Creëer Convex Shape(s)" +msgstr "Enkele convexe vorm maken" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create multiple convex collision shapes for the scene root." msgstr "" +"Uit de scènewortel kunnen niet meerdere convexe botsingsvormen gemaakt " +"worden." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create any collision shapes." -msgstr "Kon map niet aanmaken." +msgstr "Kon geen enkele botsingsvormen maken." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Shapes" -msgstr "Creëer Convex Shape(s)" +msgstr "Meerdere convexe vormen maken" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" @@ -5982,6 +5980,9 @@ msgid "" "automatically.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Maakt een StaticBody en wijst automatisch een botsingsvorm toe op basis van " +"polygonen.\n" +"Dit is de meest preciese (maar langzaamste) optie voor botsingsberekeningen." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" @@ -5992,28 +5993,33 @@ msgid "" "Creates a polygon-based collision shape.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Maakt een polygoon-gebaseerde botsingsvorm.\n" +"Dit is de meest preciese (maar langzaamste) optie voor botsingsberekeningen." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" -msgstr "Creëer Convex Collision Sibling(s)" +msgid "Create Single Convex Collision Sibling" +msgstr "Een enkele convexe botsingsonderelement aanmaken" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a single convex collision shape.\n" "This is the fastest (but least accurate) option for collision detection." msgstr "" +"Maakt een enkele convexe botsingsvorm.\n" +"Dit is de snelste (maar minst precieze) optie voor botsingsberekeningen." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Collision Siblings" -msgstr "Creëer Convex Collision Sibling(s)" +msgstr "Meerdere convexe botsingsonderelementen aanmaken" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a polygon-based collision shape.\n" "This is a performance middle-ground between the two above options." msgstr "" +"Maakt een polygoon-gebaseerde botsingsvorm.\n" +"Deze optie ligt qua prestaties tussen de twee opties hierboven." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh..." @@ -6026,6 +6032,10 @@ msgid "" "This can be used instead of the SpatialMaterial Grow property when using " "that property isn't possible." msgstr "" +"Maakt een statische omlijningsmesh. De normaalvectoren van de omlijningsmesh " +"worden automatisch omgekeerd.\n" +"Dit kan gebruikt worden wanneer de Grow eigenschap van SpatialMaterial niet " +"beschikbaar is." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "View UV1" @@ -6692,7 +6702,7 @@ msgstr "Fout bij importeren" #: editor/plugins/script_editor_plugin.cpp msgid "New Text File..." -msgstr "Nieuw Tekst Bestand..." +msgstr "Nieuw tekstbestand..." #: editor/plugins/script_editor_plugin.cpp msgid "Open File" @@ -6757,7 +6767,7 @@ msgstr "Filter scripts" #: editor/plugins/script_editor_plugin.cpp msgid "Toggle alphabetical sorting of the method list." -msgstr "Schakel het alfabetisch sorteren van de methode lijst in of uit." +msgstr "Alfabetisch sorteren van de methodelijst omschakelen." #: editor/plugins/script_editor_plugin.cpp msgid "Filter methods" @@ -6846,7 +6856,7 @@ msgstr "Sluit Docs" #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" -msgstr "Opstarten" +msgstr "Uitvoeren" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp msgid "Step Into" @@ -6858,7 +6868,7 @@ msgstr "Stap Over" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp msgid "Break" -msgstr "Breek" +msgstr "Onderbreken" #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp #: editor/script_editor_debugger.cpp @@ -7113,11 +7123,11 @@ msgstr "Ga Naar Regel..." #: editor/plugins/script_text_editor.cpp #: modules/visual_script/visual_script_editor.cpp msgid "Toggle Breakpoint" -msgstr "Breekpunt Aan- of Uitschakelen" +msgstr "Breekpunt instellen" #: editor/plugins/script_text_editor.cpp msgid "Remove All Breakpoints" -msgstr "Verwijder Alle Breekpunten" +msgstr "Alle breekpunten verwijderen" #: editor/plugins/script_text_editor.cpp msgid "Go to Next Breakpoint" @@ -9619,17 +9629,14 @@ msgid "Export With Debug" msgstr "Exporteer Met Debug" #: editor/project_manager.cpp -#, fuzzy msgid "The path specified doesn't exist." msgstr "Dit pad bestaat niet." #: editor/project_manager.cpp -#, fuzzy msgid "Error opening package file (it's not in ZIP format)." msgstr "Fout bij het openen van het pakketbestand, geen zip-formaat." #: editor/project_manager.cpp -#, fuzzy msgid "" "Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file." msgstr "Ongeldig '.zip' projectbestand, bevat geen 'project.godot' bestand." @@ -9639,14 +9646,12 @@ msgid "Please choose an empty folder." msgstr "Kies alstublieft een lege map." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a \"project.godot\" or \".zip\" file." -msgstr "Kies alstublieft een 'project.godot' of '.zip' bestand." +msgstr "Kies alstublieft een \"project.godot\" of \".zip\" bestand." #: editor/project_manager.cpp -#, fuzzy msgid "This directory already contains a Godot project." -msgstr "Map bevat al een Godot project." +msgstr "In deze map staat al een Godot project." #: editor/project_manager.cpp msgid "New Game Project" @@ -9895,8 +9900,8 @@ msgid "" "Language changed.\n" "The interface will update after restarting the editor or project manager." msgstr "" -"Taal veranderd. \n" -"De gebruikersinterface wordt bij het herstarten van de editor of " +"De taal is veranderd. \n" +"De gebruikersomgeving wordt bij het herstarten van de editor of " "projectbeheer bijgewerkt." #: editor/project_manager.cpp @@ -9921,7 +9926,7 @@ msgstr "Laatst bewerkt" #: editor/project_manager.cpp msgid "Scan" -msgstr "Scannen" +msgstr "Inlezen" #: editor/project_manager.cpp msgid "Select a Folder to Scan" @@ -9937,11 +9942,11 @@ msgstr "Lijst opruimen" #: editor/project_manager.cpp msgid "Templates" -msgstr "Templates" +msgstr "Sjablonen" #: editor/project_manager.cpp msgid "Restart Now" -msgstr "Herstart Nu" +msgstr "Nu herstarten" #: editor/project_manager.cpp msgid "Can't run project" @@ -10344,9 +10349,8 @@ msgid "Suffix" msgstr "Achtervoegsel" #: editor/rename_dialog.cpp -#, fuzzy msgid "Use Regular Expressions" -msgstr "Reguliere Expressie" +msgstr "Reguliere expressies gebruiken" #: editor/rename_dialog.cpp msgid "Advanced Options" @@ -10385,9 +10389,8 @@ msgstr "" "Vergelijk tellersopties." #: editor/rename_dialog.cpp -#, fuzzy msgid "Per-level Counter" -msgstr "Per Niveau teller" +msgstr "Per niveau teller" #: editor/rename_dialog.cpp msgid "If set the counter restarts for each group of child nodes" @@ -10428,14 +10431,12 @@ msgid "Keep" msgstr "Houd" #: editor/rename_dialog.cpp -#, fuzzy msgid "PascalCase to snake_case" -msgstr "CamelCase naar under_scored" +msgstr "PascalCase naar onder_streep" #: editor/rename_dialog.cpp -#, fuzzy msgid "snake_case to PascalCase" -msgstr "under_scored naar CamelCase" +msgstr "onder_streep naar PascalCase" #: editor/rename_dialog.cpp msgid "Case" @@ -10454,14 +10455,12 @@ msgid "Reset" msgstr "Resetten" #: editor/rename_dialog.cpp -#, fuzzy msgid "Regular Expression Error" -msgstr "Reguliere Expressie" +msgstr "Fout in reguliere expressie" #: editor/rename_dialog.cpp -#, fuzzy msgid "At character %s" -msgstr "Geldige karakters:" +msgstr "Bij teken %s" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" @@ -10927,9 +10926,8 @@ msgid "Invalid inherited parent name or path." msgstr "Ongeldige overgenomen oudernaam of pad." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Script path/name is valid." -msgstr "Script is geldig." +msgstr "Scriptpad/-naam is geldig." #: editor/script_create_dialog.cpp msgid "Allowed: a-z, A-Z, 0-9, _ and ." @@ -11020,7 +11018,6 @@ msgid "Copy Error" msgstr "Kopieer Fout" #: editor/script_editor_debugger.cpp -#, fuzzy msgid "Video RAM" msgstr "Videogeheugen" @@ -12434,6 +12431,11 @@ msgstr "" "Een vlak als vorm werkt niet goed en zal verwijderd worden in toekomstige " "versies. Gebruik wordt afgeraden." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Niets is zichtbaar want geen mesh is toegewezen." diff --git a/editor/translations/or.po b/editor/translations/or.po index 1e2acc1c86..6819e53f38 100644 --- a/editor/translations/or.po +++ b/editor/translations/or.po @@ -1450,6 +1450,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1726,7 +1730,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3859,10 +3863,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5743,7 +5743,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11829,6 +11829,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/pl.po b/editor/translations/pl.po index 48c51e8ea1..14bbb799aa 100644 --- a/editor/translations/pl.po +++ b/editor/translations/pl.po @@ -42,7 +42,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-18 15:09+0000\n" +"PO-Revision-Date: 2020-03-08 22:33+0000\n" "Last-Translator: Tomek <kobewi4e@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/" "godot/pl/>\n" @@ -52,7 +52,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 3.11\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -706,7 +706,7 @@ msgstr "Zmień rozmiar Tablicy" #: editor/array_property_edit.cpp msgid "Change Array Value Type" -msgstr "Zmień Typ Tablicy" +msgstr "Zmień typ wartości tablicy" #: editor/array_property_edit.cpp msgid "Change Array Value" @@ -1519,6 +1519,10 @@ msgstr "Nazwa" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Wklej parametry" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Aktualizowanie Sceny" @@ -1804,7 +1808,7 @@ msgstr "Pokaż w menedżerze plików" msgid "New Folder..." msgstr "Utwórz katalog..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Odśwież" @@ -3980,9 +3984,8 @@ msgid "Saving..." msgstr "Zapisywanie..." #: editor/import_dock.cpp -#, fuzzy msgid "%d Files" -msgstr " Pliki" +msgstr "%d plików" #: editor/import_dock.cpp msgid "Set as Default for '%s'" @@ -4041,10 +4044,6 @@ msgid "Copy Params" msgstr "Kopiuj parametry" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Wklej parametry" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Edytuj schowek zasobów" @@ -5965,6 +5964,9 @@ msgid "" "automatically.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Tworzy węzeł StaticBody i automatycznie przypisuje mu kształt kolizji oparty " +"na wielokątach.\n" +"To jest najdokładniejsza (ale najwolniejsza) opcja do detekcji kolizji." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" @@ -5975,28 +5977,33 @@ msgid "" "Creates a polygon-based collision shape.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Tworzy kształt kolizji oparty na wielokątach.\n" +"To jest najdokładniejsza (ale najwolniejsza) opcja do detekcji kolizji." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" -msgstr "Utwórz wypukłego sąsiada kolizji" +msgid "Create Single Convex Collision Sibling" +msgstr "Utwórz pojedynczego wypukłego sąsiada kolizji" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a single convex collision shape.\n" "This is the fastest (but least accurate) option for collision detection." msgstr "" +"Tworzy pojedynczy wypukły kształt kolizji.\n" +"To jest najszybsza (ale najmniej dokładna) opcja dla detekcji kolizji." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Create Multiple Convex Collision Siblings" -msgstr "Utwórz wypukłego sąsiada kolizji" +msgstr "Utwórz wiele wypukłych sąsiadów kolizji" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "" "Creates a polygon-based collision shape.\n" "This is a performance middle-ground between the two above options." msgstr "" +"Tworzy kształt kolizji oparty o wielokąty.\n" +"To jest złoty środek względem wydajności powyższych dwóch opcji." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh..." @@ -6009,6 +6016,10 @@ msgid "" "This can be used instead of the SpatialMaterial Grow property when using " "that property isn't possible." msgstr "" +"Tworzy statyczną siatkę obwódki. Siatka obwódki ma automatycznie odwrócone " +"normalne.\n" +"To może zostać użyte zamiast właściwości Grow w SpatialMaterial kiedy " +"używanie tej właściwości jest niemożliwe." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "View UV1" @@ -9585,35 +9596,30 @@ msgid "Export With Debug" msgstr "Eksport z debugowaniem" #: editor/project_manager.cpp -#, fuzzy msgid "The path specified doesn't exist." -msgstr "Ścieżka nie istnieje." +msgstr "Podana ścieżka nie istnieje." #: editor/project_manager.cpp -#, fuzzy msgid "Error opening package file (it's not in ZIP format)." -msgstr "Błąd otwierania pliku pakietu, nie jest w formacie ZIP." +msgstr "Błąd otwierania pliku pakietu (nie jest w formacie ZIP)." #: editor/project_manager.cpp -#, fuzzy msgid "" "Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file." msgstr "" -"Niewłaściwy projekt pliku \".zip\", nie zawiera pliku \"project.godot\"." +"Niewłaściwy plik \".zip\" projektu; nie zawiera pliku \"project.godot\"." #: editor/project_manager.cpp msgid "Please choose an empty folder." msgstr "Proszę wybrać pusty folder." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a \"project.godot\" or \".zip\" file." msgstr "Proszę wybrać plik \"project.godot\" lub \".zip\"." #: editor/project_manager.cpp -#, fuzzy msgid "This directory already contains a Godot project." -msgstr "Folder już zawiera projekt Godota." +msgstr "Ten folder już zawiera projekt Godota." #: editor/project_manager.cpp msgid "New Game Project" @@ -10311,9 +10317,8 @@ msgid "Suffix" msgstr "Przyrostek" #: editor/rename_dialog.cpp -#, fuzzy msgid "Use Regular Expressions" -msgstr "Wyrażenia regularne" +msgstr "Użyj wyrażeń regularnych" #: editor/rename_dialog.cpp msgid "Advanced Options" @@ -10352,9 +10357,8 @@ msgstr "" "Porównaj opcje licznika." #: editor/rename_dialog.cpp -#, fuzzy msgid "Per-level Counter" -msgstr "Poziomowy licznik" +msgstr "Oddzielny licznik na poziom" #: editor/rename_dialog.cpp msgid "If set the counter restarts for each group of child nodes" @@ -12392,6 +12396,11 @@ msgstr "" "Kształty płaszczyzny nie działają dobrze i zostaną usunięte w przyszłych " "wersjach. Nie używaj ich." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Nie została przypisana żadna siatka, więc nic się nie pojawi." diff --git a/editor/translations/pr.po b/editor/translations/pr.po index 2be9100ab8..873a2d506b 100644 --- a/editor/translations/pr.po +++ b/editor/translations/pr.po @@ -1499,6 +1499,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1793,7 +1797,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3988,10 +3992,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5933,7 +5933,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Yar, Blow th' Selected Down!" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12256,6 +12256,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po index 8fc0ef4f39..a96186e434 100644 --- a/editor/translations/pt_BR.po +++ b/editor/translations/pt_BR.po @@ -53,7 +53,7 @@ # Thiago Amendola <amendolathiago@gmail.com>, 2019. # Raphael Nogueira Campos <raphaelncampos@gmail.com>, 2019. # Dimenicius <vinicius.costa.92@gmail.com>, 2019. -# Davi <wokep.ma.wavid@gmail.com>, 2019. +# Davi <wokep.ma.wavid@gmail.com>, 2019, 2020. # Endrick Gustavo <endrickgb@hotmail.com>, 2019. # Hans M. Boron <hansmateusboron@gmail.com>, 2019. # Gustavo Bolanho <jdmapas@gmail.com>, 2019. @@ -82,12 +82,14 @@ # Michael Leocádio <aeronmike@gmail.com>, 2020. # Z <rainromes@gmail.com>, 2020. # Leonardo Dimano <leodimano@live.com>, 2020. +# anonymous <noreply@weblate.org>, 2020. +# Guilherme Souza Reis de Melo Lopes <gsrmlopes@gmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: 2016-05-30\n" -"PO-Revision-Date: 2020-02-18 15:09+0000\n" -"Last-Translator: Douglas Fiedler <dognew@gmail.com>\n" +"PO-Revision-Date: 2020-03-08 22:32+0000\n" +"Last-Translator: Guilherme Souza Reis de Melo Lopes <gsrmlopes@gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "godot-engine/godot/pt_BR/>\n" "Language: pt_BR\n" @@ -95,7 +97,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.11\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -118,7 +120,7 @@ msgstr "Entrada inválida %i (não passou) na expressão" #: core/math/expression.cpp msgid "self can't be used because instance is null (not passed)" -msgstr "self não pode ser usado porque a instancia é nula (não passou)" +msgstr "self não pode ser usado porque a instância é nula (não passou)" #: core/math/expression.cpp msgid "Invalid operands to operator %s, %s and %s." @@ -134,7 +136,7 @@ msgstr "Nome inválido de índice '%s' para base tipo %s" #: core/math/expression.cpp msgid "Invalid arguments to construct '%s'" -msgstr "Argumento inválido do tipo '%s'" +msgstr "Argumento inválido para construir '%s'" #: core/math/expression.cpp msgid "On call to '%s':" @@ -242,11 +244,11 @@ msgstr "Alterar Tempo de Quadro-Chave da Anim Multi" #: editor/animation_track_editor.cpp msgid "Anim Multi Change Transition" -msgstr "Transição de Animação com Múltiplas Mudanças" +msgstr "Alterar Transição da Animação" #: editor/animation_track_editor.cpp msgid "Anim Multi Change Transform" -msgstr "Transformação de Animação com Múltiplas Mudanças" +msgstr "Alterar Transformação da Anim" #: editor/animation_track_editor.cpp msgid "Anim Multi Change Keyframe Value" @@ -299,7 +301,7 @@ msgstr "Duração da Animação (em segundos)" #: editor/animation_track_editor.cpp msgid "Add Track" -msgstr "Adicionar Trilha" +msgstr "Adicionar Faixa" #: editor/animation_track_editor.cpp msgid "Animation Looping" @@ -324,7 +326,7 @@ msgstr "Alterar Valor do Trajeto" #: editor/animation_track_editor.cpp msgid "Toggle this track on/off." -msgstr "Ligar/desligar esta trilha." +msgstr "Ligar/desligar esta faixa." #: editor/animation_track_editor.cpp msgid "Update Mode (How this property is set)" @@ -340,7 +342,7 @@ msgstr "Modo Loop Enrolado (Interpolar fim com início no loop)" #: editor/animation_track_editor.cpp msgid "Remove this track." -msgstr "Remover esta trilha." +msgstr "Remover esta faixa." #: editor/animation_track_editor.cpp msgid "Time (s): " @@ -348,7 +350,7 @@ msgstr "Tempo (s): " #: editor/animation_track_editor.cpp msgid "Toggle Track Enabled" -msgstr "Habilitar Trilha" +msgstr "Habilitar Faixa" #: editor/animation_track_editor.cpp msgid "Continuous" @@ -418,11 +420,11 @@ msgstr "Remover Trilha da Anim" #: editor/animation_track_editor.cpp msgid "Create NEW track for %s and insert key?" -msgstr "Criar NOVA trilha para %s e inserir chave?" +msgstr "Criar NOVA faixa para %s e inserir chave?" #: editor/animation_track_editor.cpp msgid "Create %d NEW tracks and insert keys?" -msgstr "Criar %d NOVAS trilhas e inserir chaves?" +msgstr "Criar %d NOVAS faixas e inserir chaves?" #: editor/animation_track_editor.cpp editor/create_dialog.cpp #: editor/editor_audio_buses.cpp editor/editor_feature_profile.cpp @@ -462,7 +464,7 @@ msgstr "Alterar FPS da Animação" #: editor/animation_track_editor.cpp msgid "Rearrange Tracks" -msgstr "Reordenar Trilhas" +msgstr "Reordenar Faixas" #: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." @@ -504,11 +506,11 @@ msgstr "Adicionar Trilha Bezier" #: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." -msgstr "Caminho da trilha é inválido,então não pode adicionar uma chave." +msgstr "Caminho da faixa é inválido, então não pode adicionar uma chave." #: editor/animation_track_editor.cpp msgid "Track is not of type Spatial, can't insert key" -msgstr "Trilha não é do tipo Espacial,não pode inserir chave" +msgstr "Faixa não é do tipo Espacial, não pode inserir chave" #: editor/animation_track_editor.cpp msgid "Add Transform Track Key" @@ -732,11 +734,11 @@ msgstr "Selecionar Todos/Nenhum" #: editor/animation_track_editor_plugins.cpp msgid "Add Audio Track Clip" -msgstr "Adicionar Clipe de Trilha de Áudio" +msgstr "Adicionar Amostra de uma Trilha de Áudio" #: editor/animation_track_editor_plugins.cpp msgid "Change Audio Track Clip Start Offset" -msgstr "Alterar Offset de Início do Clipe da Trilha de Áudio" +msgstr "Mudar Deslocamento de Início da Amostra da Trilha de Áudio" #: editor/animation_track_editor_plugins.cpp msgid "Change Audio Track Clip End Offset" @@ -1441,7 +1443,7 @@ msgstr "Adicionar Canal" #: editor/editor_audio_buses.cpp msgid "Add a new Audio Bus to this layout." -msgstr "Adicionar novo Canal de Áudio a este layout." +msgstr "Adicionar um novo Canal de Áudio a este layout." #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1562,6 +1564,10 @@ msgstr "Nome" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Colar Parâmetros" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Atualizando Cena" @@ -1847,7 +1853,7 @@ msgstr "Mostrar no Gerenciador de Arquivos" msgid "New Folder..." msgstr "Nova Pasta..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Atualizar" @@ -4096,10 +4102,6 @@ msgid "Copy Params" msgstr "Copiar Parâmetros" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Colar Parâmetros" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Editar Área de Transferência de Recursos" @@ -6036,7 +6038,8 @@ msgstr "" "Este é a opção mais precisa (mas lenta) para detecção de colisão." #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +#, fuzzy +msgid "Create Single Convex Collision Sibling" msgstr "Criar Simples Colisão Convexa Irmã(s)" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12447,6 +12450,11 @@ msgstr "" "Formas planas não funcionam bem e serão removidas em versões futuras. Por " "favor não as use." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Nada é visível porque nenhuma malha foi atribuída." diff --git a/editor/translations/pt_PT.po b/editor/translations/pt_PT.po index 6bd8da8610..60009b3171 100644 --- a/editor/translations/pt_PT.po +++ b/editor/translations/pt_PT.po @@ -1499,6 +1499,10 @@ msgstr "Nome" msgid "Singleton" msgstr "Instância única" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Colar Parâmetros" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "A atualizar Cena" @@ -1785,7 +1789,7 @@ msgstr "Mostrar no Gestor de Ficheiros" msgid "New Folder..." msgstr "Nova Diretoria..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Atualizar" @@ -4026,10 +4030,6 @@ msgid "Copy Params" msgstr "Copiar Parâmetros" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Colar Parâmetros" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Editar Área de Transferência de Recursos" @@ -5958,7 +5958,8 @@ msgstr "" "Esta é a mais precisa (mas mais lenta) opção para deteção de colisão." #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +#, fuzzy +msgid "Create Single Convex Collision Sibling" msgstr "Criar Irmãos Únicos de Colisão Convexa" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12358,6 +12359,11 @@ msgstr "" "Formas planas não funcionam bem e serão removidas em futuras versões. Não as " "use por favor." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Nada é visível porque nenhuma Malha foi atribuída." diff --git a/editor/translations/ro.po b/editor/translations/ro.po index 7bd5c90156..d52127fd95 100644 --- a/editor/translations/ro.po +++ b/editor/translations/ro.po @@ -1482,6 +1482,10 @@ msgstr "Nume" msgid "Singleton" msgstr "Singleton (Unicat)" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Lipiţi Parametrii" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Scena se Actualizează" @@ -1758,7 +1762,7 @@ msgstr "Arătați în Administratorul de Fișiere" msgid "New Folder..." msgstr "Director Nou..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Reîmprospătați" @@ -4059,10 +4063,6 @@ msgid "Copy Params" msgstr "Copie Parametrii" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Lipiţi Parametrii" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "Clip-board de resurse gol !" @@ -6112,7 +6112,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Creează un Frate de Coliziune Convex" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12530,6 +12530,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/ru.po b/editor/translations/ru.po index d4efabc2cd..b05077637a 100644 --- a/editor/translations/ru.po +++ b/editor/translations/ru.po @@ -32,7 +32,7 @@ # Vadim Vergasov <vadim.vergasov2003@gmail.com>, 2018, 2019. # Аслан Снупов <aslan170505@gmail.com>, 2018. # Alexandr Eremeev <ae125529@gmail.com>, 2019. -# Ruaguzov Michael <miha890r@gmail.com>, 2019. +# Ruaguzov Michael <miha890r@gmail.com>, 2019, 2020. # Alexander Danilov <modos189@protonmail.com>, 2019. # Sergey Nakhov <true.stalin.exe@gmail.com>, 2019. # Bumerang <it.bumerang@gmail.com>, 2019. @@ -41,7 +41,7 @@ # Nikita <iron-nikita@yandex.ru>, 2019. # LeLuCh B0й <alekx@alumni.nottingham.ac.uk>, 2019. # Арсений Солодков <arsen332211@gmail.com>, 2019. -# Nikita <yakrobat@protonmail.com>, 2019. +# Nikita <yakrobat@protonmail.com>, 2019, 2020. # LAT_Rio <AlSenya@yandex.ru>, 2019. # devnp <dev.necropan@gmail.com>, 2019. # Виктор <victor8632@bk.ru>, 2019. @@ -53,7 +53,7 @@ # Sergey <www.window1@mail.ru>, 2019. # Vladislav <onion.ring@mail.ru>, 2019, 2020. # knightpp <kotteam99@gmail.com>, 2019. -# Константин Рин <email.to.rean@gmail.com>, 2019. +# Константин Рин <email.to.rean@gmail.com>, 2019, 2020. # Maxim Samburskiy <alpacones@outlook.com>, 2019. # Dima Koshel <form.eater@gmail.com>, 2019. # Danil Alexeev <danil@alexeev.xyz>, 2019, 2020. @@ -64,12 +64,14 @@ # Andy <8ofproject@gmail.com>, 2020. # Андрей Беляков <andbelandantrus@gmail.com>, 2020. # Artur Tretiak <stikyt@protonmail.com>, 2020. +# Smadjavul <o1985af@gmail.com>, 2020. +# anonymous <noreply@weblate.org>, 2020. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-14 03:18+0000\n" -"Last-Translator: Artur Tretiak <stikyt@protonmail.com>\n" +"PO-Revision-Date: 2020-03-07 21:18+0000\n" +"Last-Translator: Smadjavul <o1985af@gmail.com>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/" "godot/ru/>\n" "Language: ru\n" @@ -78,7 +80,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -96,8 +98,9 @@ msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Недостаточно байтов для декодирования байтов или неверный формат." #: core/math/expression.cpp +#, fuzzy msgid "Invalid input %i (not passed) in expression" -msgstr "Неправильный ввод %i (не был передан) в выражении" +msgstr "Некорректный ввод %i (не был передан) в выражении" #: core/math/expression.cpp msgid "self can't be used because instance is null (not passed)" @@ -388,11 +391,11 @@ msgstr "Удалить ключ(и)" #: editor/animation_track_editor.cpp msgid "Change Animation Update Mode" -msgstr "Изменить способ обновления анимации" +msgstr "Изменить режим обновления анимации" #: editor/animation_track_editor.cpp msgid "Change Animation Interpolation Mode" -msgstr "Изменить метод интерполяции анимации" +msgstr "Изменить режим интерполяции анимации" #: editor/animation_track_editor.cpp msgid "Change Animation Loop Mode" @@ -748,9 +751,8 @@ msgid "Line Number:" msgstr "Номер строки:" #: editor/code_editor.cpp -#, fuzzy msgid "%d replaced." -msgstr "Заменить..." +msgstr "%d заменено." #: editor/code_editor.cpp editor/editor_help.cpp msgid "%d match." @@ -1548,6 +1550,10 @@ msgstr "Название" msgid "Singleton" msgstr "Синглтон" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Вставить параметры" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Обновление сцены" @@ -1835,7 +1841,7 @@ msgstr "Просмотреть в проводнике" msgid "New Folder..." msgstr "Новая папка..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Обновить" @@ -1929,7 +1935,7 @@ msgstr "Обновить файлы." #: editor/editor_file_dialog.cpp msgid "(Un)favorite current folder." -msgstr "Добавить или удалить текущую папку из избранных." +msgstr "Добавить/убрать текущую папку в избранное." #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Toggle the visibility of hidden files." @@ -3285,7 +3291,7 @@ msgstr "Назначается..." #: editor/editor_properties.cpp msgid "Invalid RID" -msgstr "Неверный путь" +msgstr "Неверный RID" #: editor/editor_properties.cpp msgid "" @@ -3400,7 +3406,7 @@ msgstr "Уже существует отредактированная сцен #: editor/editor_run_script.cpp msgid "Couldn't instance script:" -msgstr "Скрипт не соответствует требованиям:" +msgstr "Не удалось создать экземпляр скрипта:" #: editor/editor_run_script.cpp msgid "Did you forget the 'tool' keyword?" @@ -3477,7 +3483,7 @@ msgstr "Неверный формат version.txt файла внутри шаб #: editor/export_template_manager.cpp msgid "No version.txt found inside templates." -msgstr "Не найден version.txt файл в шаблонах." +msgstr "Файл version.txt не найден в шаблонах." #: editor/export_template_manager.cpp msgid "Error creating path for templates:" @@ -4013,9 +4019,8 @@ msgid "Saving..." msgstr "Сохранение..." #: editor/import_dock.cpp -#, fuzzy msgid "%d Files" -msgstr " Файлы" +msgstr "%d файлов" #: editor/import_dock.cpp msgid "Set as Default for '%s'" @@ -4039,7 +4044,7 @@ msgstr "Переимпортировать" #: editor/import_dock.cpp msgid "Save scenes, re-import and restart" -msgstr "Сохранить сцены, импортировать заново и перезапустить" +msgstr "Сохранить сцены, переимпортировать и перезапустить" #: editor/import_dock.cpp msgid "Changing the type of an imported file requires editor restart." @@ -4074,10 +4079,6 @@ msgid "Copy Params" msgstr "Копировать параметры" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Вставить параметры" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Редактировать ресурс в буфере обмена" @@ -5247,7 +5248,9 @@ msgstr "Предустановки для якорей и значения от msgid "" "When active, moving Control nodes changes their anchors instead of their " "margins." -msgstr "При активном движении узлы Control меняют свои якоря вместо полей." +msgstr "" +"Когда активно, у перемещаемых узлов Control будут изменяться значения якорей " +"вместо отступов." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Top Left" @@ -5897,9 +5900,8 @@ msgid "Mesh is empty!" msgstr "Полисетка пуста!" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Couldn't create a Trimesh collision shape." -msgstr "Создать вогнутую область столкновения" +msgstr "Невозможно создать треугольную сетку для формы столкновений." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" @@ -5930,6 +5932,7 @@ msgstr "Создать выпуклую форму(ы)" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Can't create multiple convex collision shapes for the scene root." msgstr "" +"Невозможно создать несколько выпуклых форм столкновения для корня сцены." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy @@ -5995,6 +5998,9 @@ msgid "" "automatically.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Создает StaticBody и автоматически присваивает ему форму столкновения на " +"основе полигона.\n" +"Это самый точный (но самый медленный) способ обнаружения столкновений." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" @@ -6005,10 +6011,12 @@ msgid "" "Creates a polygon-based collision shape.\n" "This is the most accurate (but slowest) option for collision detection." msgstr "" +"Создает форму столкновения на основе полигона.\n" +"Это самый точный (но самый медленный) способ обнаружения столкновений." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Создать выпуклую область столкновения" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -6016,6 +6024,8 @@ msgid "" "Creates a single convex collision shape.\n" "This is the fastest (but least accurate) option for collision detection." msgstr "" +"Создаёт выпуклую форму столкновения.\n" +"Это самый быстрый (но наименее точный) способ обнаружения столкновений." #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy @@ -6027,6 +6037,8 @@ msgid "" "Creates a polygon-based collision shape.\n" "This is a performance middle-ground between the two above options." msgstr "" +"Создает форму столкновения на основе полигона.\n" +"Это средний по производительности вариант между двумя предыдущими." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh..." @@ -9315,7 +9327,7 @@ msgstr "Вычитает вектор из вектора." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vector constant." -msgstr "Векторную константа." +msgstr "Векторная константа." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vector uniform." @@ -9755,7 +9767,7 @@ msgid "" "Not recommended for web games" msgstr "" "Более высокое качество графики\n" -"Все функции доступны\n" +"Доступны все функции\n" "Несовместимо со старым оборудованием\n" "Не рекомендуется для веб-игр" @@ -10467,7 +10479,7 @@ msgstr "Регулярное выражение" #: editor/rename_dialog.cpp #, fuzzy msgid "At character %s" -msgstr "Допустимые символы:" +msgstr "На символе %s" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" @@ -11745,7 +11757,7 @@ msgstr "Изменить размер комментария" #: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." -msgstr "Не удаётся скопировать узел функцию." +msgstr "Не удаётся копировать узел функции." #: modules/visual_script/visual_script_editor.cpp msgid "Clipboard is empty!" @@ -12437,6 +12449,11 @@ msgstr "" "Формы плоскостей не очень хорошо работают и будут удалены в последующих " "версиях. Пожалуйста, не используйте их." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Ничто не видно, потому что не назначена сетка." diff --git a/editor/translations/si.po b/editor/translations/si.po index 15bc5975ef..119818e11f 100644 --- a/editor/translations/si.po +++ b/editor/translations/si.po @@ -1473,6 +1473,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1749,7 +1753,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3886,10 +3890,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5794,7 +5794,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11921,6 +11921,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/sk.po b/editor/translations/sk.po index 709d2964ca..50cf59efdc 100644 --- a/editor/translations/sk.po +++ b/editor/translations/sk.po @@ -1511,6 +1511,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1801,7 +1805,7 @@ msgstr "Otvoriť súbor" msgid "New Folder..." msgstr "Vytvoriť adresár" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -4003,10 +4007,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5964,7 +5964,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Vytvoriť adresár" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12297,6 +12297,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/sl.po b/editor/translations/sl.po index 3a30fcac1a..e8a0b4c2a1 100644 --- a/editor/translations/sl.po +++ b/editor/translations/sl.po @@ -1561,6 +1561,10 @@ msgstr "Ime" msgid "Singleton" msgstr "Posameznik" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Prilepi Parametre" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Posodabljanje Scene" @@ -1867,7 +1871,7 @@ msgstr "Pokaži V Upravitelju Datotek" msgid "New Folder..." msgstr "Nova Mapa..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Osveži" @@ -4187,10 +4191,6 @@ msgid "Copy Params" msgstr "Kopiraj Parametre" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Prilepi Parametre" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "NAPAKA: Ni animacije virov na odložišču!" @@ -6233,7 +6233,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Ustvarite Poligon" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12668,6 +12668,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/sq.po b/editor/translations/sq.po index 65ea4fdb56..60ac25f6f4 100644 --- a/editor/translations/sq.po +++ b/editor/translations/sq.po @@ -1498,6 +1498,10 @@ msgstr "Emri" msgid "Singleton" msgstr "Vetmitar" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Ngjit Parametrat" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Duke Përditësuar Skenën" @@ -1805,7 +1809,7 @@ msgstr "Shfaq në Menaxherin e Skedarëve" msgid "New Folder..." msgstr "Folder i Ri..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Rifresko" @@ -4100,10 +4104,6 @@ msgid "Copy Params" msgstr "Kopjo Parametrat" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Ngjit Parametrat" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Modifiko Resursin 'Clipboard'" @@ -6021,7 +6021,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Krijo një Poligon" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12237,6 +12237,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/sr_Cyrl.po b/editor/translations/sr_Cyrl.po index 7b6f9a73b1..5f5f3786a7 100644 --- a/editor/translations/sr_Cyrl.po +++ b/editor/translations/sr_Cyrl.po @@ -1562,6 +1562,10 @@ msgstr "Име" msgid "Singleton" msgstr "Синглетон" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Налепи параметре" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Ажурирање сцене" @@ -1871,7 +1875,7 @@ msgstr "Покажи у менаџеру датотека" msgid "New Folder..." msgstr "Нови директоријум..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Освежи" @@ -4213,10 +4217,6 @@ msgid "Copy Params" msgstr "Копирај параметре" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Налепи параметре" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "Нема ресурса за копирање!" @@ -6265,7 +6265,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Направи конвексног сударног брата" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12782,6 +12782,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/sr_Latn.po b/editor/translations/sr_Latn.po index 3bbd854cb0..c36e64d459 100644 --- a/editor/translations/sr_Latn.po +++ b/editor/translations/sr_Latn.po @@ -1482,6 +1482,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1759,7 +1763,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3903,10 +3907,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5824,7 +5824,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Napravi" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12009,6 +12009,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/sv.po b/editor/translations/sv.po index 0c35991d32..3f7fee23b7 100644 --- a/editor/translations/sv.po +++ b/editor/translations/sv.po @@ -1553,6 +1553,10 @@ msgstr "Namn" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Klistra in Params" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Uppdaterar Scen" @@ -1859,7 +1863,7 @@ msgstr "Visa I Filhanteraren" msgid "New Folder..." msgstr "Ny Mapp..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Uppdatera" @@ -4171,10 +4175,6 @@ msgid "Copy Params" msgstr "Kopiera Params" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Klistra in Params" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "Resurs" @@ -6180,7 +6180,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Skapa Prenumeration" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12618,6 +12618,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/ta.po b/editor/translations/ta.po index ae6b41bf5c..5300f984bb 100644 --- a/editor/translations/ta.po +++ b/editor/translations/ta.po @@ -1474,6 +1474,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1751,7 +1755,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3890,10 +3894,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5793,7 +5793,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11916,6 +11916,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/te.po b/editor/translations/te.po index 836675db64..d76be13ec1 100644 --- a/editor/translations/te.po +++ b/editor/translations/te.po @@ -1452,6 +1452,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1728,7 +1732,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3861,10 +3865,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5745,7 +5745,7 @@ msgid "" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -11832,6 +11832,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/th.po b/editor/translations/th.po index 30dba54a16..a56f6338ab 100644 --- a/editor/translations/th.po +++ b/editor/translations/th.po @@ -1557,6 +1557,10 @@ msgstr "ชื่อ" msgid "Singleton" msgstr "ซิงเกิลตัน" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "วางตัวแปร" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "อัพเดทฉาก" @@ -1869,7 +1873,7 @@ msgstr "แสดงในตัวจัดการไฟล์" msgid "New Folder..." msgstr "สร้างโฟลเดอร์..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "รีเฟรช" @@ -4142,10 +4146,6 @@ msgid "Copy Params" msgstr "คัดลอกตัวแปร" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "วางตัวแปร" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "คลิปบอร์ดไม่มีรีซอร์ส!" @@ -6187,7 +6187,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "สร้างรูปทรงตันกายภาพเป็นโหนดญาติ" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12761,6 +12761,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp #, fuzzy msgid "Nothing is visible because no mesh has been assigned." diff --git a/editor/translations/tr.po b/editor/translations/tr.po index 207c91e7c3..c73724c7b7 100644 --- a/editor/translations/tr.po +++ b/editor/translations/tr.po @@ -1526,6 +1526,10 @@ msgstr "İsim" msgid "Singleton" msgstr "Tekil" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Parametreleri Yapıştır" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Sahne Güncelleniyor" @@ -1811,7 +1815,7 @@ msgstr "Dosya Yöneticisinde Göster" msgid "New Folder..." msgstr "Yeni Klasör..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Yenile" @@ -4048,10 +4052,6 @@ msgid "Copy Params" msgstr "Değişkenleri Tıpkıla" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Parametreleri Yapıştır" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Kaynak Panosunu Düzenle" @@ -5980,7 +5980,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Dışbükey Çarpışma Komşusu Oluştur" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12381,6 +12381,11 @@ msgstr "" "Düzlem şekli iyi çalışmıyor ve gelecek versiyonlarda çıkarılacak. Lütfen " "kullanmayın." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Hiçbirşey görünebilir değil çünkü hiçbir model atanmış değil." diff --git a/editor/translations/uk.po b/editor/translations/uk.po index 32cb1e33cd..bfb614f493 100644 --- a/editor/translations/uk.po +++ b/editor/translations/uk.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Ukrainian (Godot Engine)\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-02-16 15:20+0000\n" +"PO-Revision-Date: 2020-02-21 23:32+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/godot-engine/" "godot/uk/>\n" @@ -27,7 +27,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 3.11.1\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1503,6 +1503,10 @@ msgstr "Назва" msgid "Singleton" msgstr "Одинак (шаблон проєктування)" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Вставити параметри" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Оновлення сцени" @@ -1790,7 +1794,7 @@ msgstr "Показати у менеджері файлів" msgid "New Folder..." msgstr "Створити теку..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Оновити" @@ -3973,9 +3977,8 @@ msgid "Saving..." msgstr "Збереження..." #: editor/import_dock.cpp -#, fuzzy msgid "%d Files" -msgstr " Файли" +msgstr "%d файлів" #: editor/import_dock.cpp msgid "Set as Default for '%s'" @@ -4034,10 +4037,6 @@ msgid "Copy Params" msgstr "Копіювати параметри" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Вставити параметри" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Редагувати буфер ресурсів" @@ -5975,7 +5974,8 @@ msgstr "" "Цей найточніший (але найповільніший) варіант для виявлення зіткнень." #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +#, fuzzy +msgid "Create Single Convex Collision Sibling" msgstr "Створити єдині опуклі області зіткнення" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12411,6 +12411,11 @@ msgstr "" "Форми площин не працюють як слід, їх буде вилучено у наступних версіях. Будь " "ласка, не використовуйте їх." +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "Нічого не видно, оскільки не призначено сітки." diff --git a/editor/translations/ur_PK.po b/editor/translations/ur_PK.po index 00c647fba1..815f92af6a 100644 --- a/editor/translations/ur_PK.po +++ b/editor/translations/ur_PK.po @@ -1475,6 +1475,10 @@ msgstr "" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "" @@ -1761,7 +1765,7 @@ msgstr "" msgid "New Folder..." msgstr "" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "" @@ -3937,10 +3941,6 @@ msgid "Copy Params" msgstr "" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "" @@ -5876,7 +5876,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "سب سکریپشن بنائیں" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12126,6 +12126,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/vi.po b/editor/translations/vi.po index 9c81e2b063..31b7f3ceb7 100644 --- a/editor/translations/vi.po +++ b/editor/translations/vi.po @@ -1501,6 +1501,10 @@ msgstr "Tên" msgid "Singleton" msgstr "Singleton" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "Dán các đối số" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "Cập nhật Cảnh" @@ -1782,7 +1786,7 @@ msgstr "Xem trong trình quản lý tệp" msgid "New Folder..." msgstr "Thư mục mới ..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "Làm mới" @@ -4004,10 +4008,6 @@ msgid "Copy Params" msgstr "Sao chép các đối số" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "Dán các đối số" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "Chỉnh sửa Tài nguyên trên Clipboard" @@ -5956,7 +5956,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "Tạo" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12271,6 +12271,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po index e984a05e3a..e7108c6e61 100644 --- a/editor/translations/zh_CN.po +++ b/editor/translations/zh_CN.po @@ -64,8 +64,8 @@ msgid "" msgstr "" "Project-Id-Version: Chinese (Simplified) (Godot Engine)\n" "POT-Creation-Date: 2018-01-20 12:15+0200\n" -"PO-Revision-Date: 2020-02-16 15:21+0000\n" -"Last-Translator: Haoyu Qiu <timothyqiu32@gmail.com>\n" +"PO-Revision-Date: 2020-03-08 22:33+0000\n" +"Last-Translator: Revan Ji <jiruifancr@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "godot-engine/godot/zh_Hans/>\n" "Language: zh_CN\n" @@ -73,7 +73,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1526,6 +1526,10 @@ msgstr "名称" msgid "Singleton" msgstr "单例" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "粘贴参数" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "更新场景" @@ -1804,7 +1808,7 @@ msgstr "在文件管理器中显示" msgid "New Folder..." msgstr "新建文件夹..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "刷新" @@ -3929,9 +3933,8 @@ msgid "Saving..." msgstr "保存中..." #: editor/import_dock.cpp -#, fuzzy msgid "%d Files" -msgstr " 文件" +msgstr "%d个文件" #: editor/import_dock.cpp msgid "Set as Default for '%s'" @@ -3988,10 +3991,6 @@ msgid "Copy Params" msgstr "复制参数" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "粘贴参数" - -#: editor/inspector_dock.cpp msgid "Edit Resource Clipboard" msgstr "编辑资源剪贴板" @@ -4527,7 +4526,7 @@ msgstr "未来" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Depth" -msgstr "深度" +msgstr "Depth(深度)" #: editor/plugins/animation_player_editor_plugin.cpp msgid "1 step" @@ -5898,7 +5897,8 @@ msgstr "" "这是最准确（但是最慢）的碰撞检测手段。" #: editor/plugins/mesh_instance_editor_plugin.cpp -msgid "Create Single Convex Collision Siblings" +#, fuzzy +msgid "Create Single Convex Collision Sibling" msgstr "创建单一凸碰撞同级" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12149,6 +12149,11 @@ msgid "" "don't use them." msgstr "平面形状无法正常工作，未来版本将被删除。请勿使用。" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "无物可见，因为没有指定网格。" diff --git a/editor/translations/zh_HK.po b/editor/translations/zh_HK.po index 23b5c90459..a228d6ee60 100644 --- a/editor/translations/zh_HK.po +++ b/editor/translations/zh_HK.po @@ -1583,6 +1583,11 @@ msgstr "名稱" msgid "Singleton" msgstr "" +#: editor/editor_data.cpp editor/inspector_dock.cpp +#, fuzzy +msgid "Paste Params" +msgstr "貼上參數" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "更新場景" @@ -1891,7 +1896,7 @@ msgstr "開啟 Project Manager?" msgid "New Folder..." msgstr "新增資料夾" -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "重新整理" @@ -4214,11 +4219,6 @@ msgstr "複製參數" #: editor/inspector_dock.cpp #, fuzzy -msgid "Paste Params" -msgstr "貼上參數" - -#: editor/inspector_dock.cpp -#, fuzzy msgid "Edit Resource Clipboard" msgstr "錯誤：剪貼簿沒有動畫！" @@ -6231,7 +6231,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "縮放selection" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -12698,6 +12698,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" diff --git a/editor/translations/zh_TW.po b/editor/translations/zh_TW.po index 9678b2f8cb..466e8db554 100644 --- a/editor/translations/zh_TW.po +++ b/editor/translations/zh_TW.po @@ -19,12 +19,13 @@ # Kenneth Lo <closer.tw@gmail.com>, 2019. # SIYU FU <1002492607@qq.com>, 2019. # 鄭惟中 <biglionlion06@gmail.com>, 2020. +# Alexander Wang <zxcvb22217@gmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-01-30 03:56+0000\n" -"Last-Translator: 鄭惟中 <biglionlion06@gmail.com>\n" +"PO-Revision-Date: 2020-03-01 19:57+0000\n" +"Last-Translator: Alexander Wang <zxcvb22217@gmail.com>\n" "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" "godot-engine/godot/zh_Hant/>\n" "Language: zh_TW\n" @@ -32,7 +33,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1568,6 +1569,10 @@ msgstr "名稱" msgid "Singleton" msgstr "單例" +#: editor/editor_data.cpp editor/inspector_dock.cpp +msgid "Paste Params" +msgstr "貼上參數" + #: editor/editor_data.cpp msgid "Updating Scene" msgstr "更新場景" @@ -1885,7 +1890,7 @@ msgstr "在檔案管理員內顯示" msgid "New Folder..." msgstr "新增資料夾..." -#: editor/editor_file_dialog.cpp +#: editor/editor_file_dialog.cpp editor/find_in_files.cpp #: editor/plugins/version_control_editor_plugin.cpp msgid "Refresh" msgstr "重新整理" @@ -4186,10 +4191,6 @@ msgid "Copy Params" msgstr "複製參數" #: editor/inspector_dock.cpp -msgid "Paste Params" -msgstr "貼上參數" - -#: editor/inspector_dock.cpp #, fuzzy msgid "Edit Resource Clipboard" msgstr "資源路徑" @@ -6214,7 +6215,7 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy -msgid "Create Single Convex Collision Siblings" +msgid "Create Single Convex Collision Sibling" msgstr "創建碰撞多邊形" #: editor/plugins/mesh_instance_editor_plugin.cpp @@ -10178,15 +10179,15 @@ msgstr "專案" #: editor/project_manager.cpp msgid "Last Modified" -msgstr "" +msgstr "最後修改時間" #: editor/project_manager.cpp msgid "Scan" -msgstr "" +msgstr "掃描" #: editor/project_manager.cpp msgid "Select a Folder to Scan" -msgstr "" +msgstr "選擇一個資料夾來掃描" #: editor/project_manager.cpp msgid "New Project" @@ -10199,7 +10200,7 @@ msgstr "刪除點" #: editor/project_manager.cpp msgid "Templates" -msgstr "" +msgstr "模板" #: editor/project_manager.cpp msgid "Restart Now" @@ -12701,6 +12702,11 @@ msgid "" "don't use them." msgstr "" +#: scene/3d/collision_shape.cpp +msgid "" +"ConcavePolygonShape doesn't support RigidBody in another mode than static." +msgstr "" + #: scene/3d/cpu_particles.cpp msgid "Nothing is visible because no mesh has been assigned." msgstr "" |
