diff options
Diffstat (limited to 'editor')
69 files changed, 1254 insertions, 1046 deletions
diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index 92b4683018..ab8ae71904 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation_bezier_editor.cpp @@ -602,6 +602,8 @@ void AnimationBezierTrackEdit::_select_at_anim(const Ref<Animation> &p_anim, int } void AnimationBezierTrackEdit::_gui_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (p_event->is_pressed()) { if (ED_GET_SHORTCUT("animation_editor/duplicate_selection")->is_shortcut(p_event)) { duplicate_selection(); diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 4274fb993f..4fe2d2bb2a 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -1641,6 +1641,8 @@ void AnimationTimelineEdit::_play_position_draw() { } void AnimationTimelineEdit::_gui_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MOUSE_BUTTON_LEFT && hsize_rect.has_point(mb->get_position())) { @@ -2522,6 +2524,8 @@ String AnimationTrackEdit::get_tooltip(const Point2 &p_pos) const { } void AnimationTrackEdit::_gui_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (p_event->is_pressed()) { if (ED_GET_SHORTCUT("animation_editor/duplicate_selection")->is_shortcut(p_event)) { emit_signal("duplicate_request"); diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index 1028d34fb2..506a327ffc 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation_track_editor_plugins.cpp @@ -1036,6 +1036,8 @@ void AnimationTrackEditTypeAudio::drop_data(const Point2 &p_point, const Variant } void AnimationTrackEditTypeAudio::_gui_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventMouseMotion> mm = p_event; if (!len_resizing && mm.is_valid()) { bool use_hsize_cursor = false; diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 11be365f0a..6ed2cb9d9c 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -109,6 +109,8 @@ void FindReplaceBar::_notification(int p_what) { } void FindReplaceBar::_unhandled_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventKey> k = p_event; if (!k.is_valid() || !k->is_pressed()) { return; @@ -140,7 +142,7 @@ bool FindReplaceBar::_search(uint32_t p_flags, int p_from_line, int p_from_col) bool found = text_editor->search(text, p_flags, p_from_line, p_from_col, line, col); if (found) { - if (!preserve_cursor) { + if (!preserve_cursor && !is_selection_only()) { text_editor->unfold_line(line); text_editor->cursor_set_line(line, false); text_editor->cursor_set_column(col + text.length(), false); @@ -691,6 +693,8 @@ FindReplaceBar::FindReplaceBar() { // This function should be used to handle shortcuts that could otherwise // be handled too late if they weren't handled here. void CodeTextEditor::_input(const Ref<InputEvent> &event) { + ERR_FAIL_COND(event.is_null()); + const Ref<InputEventKey> key_event = event; if (!key_event.is_valid() || !key_event->is_pressed() || !text_editor->has_focus()) { return; diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index c4290b7cca..6befee090b 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -43,28 +43,34 @@ void EditorProfiler::_make_metric_ptrs(Metric &m) { } } +EditorProfiler::Metric EditorProfiler::_get_frame_metric(int index) { + return frame_metrics[(frame_metrics.size() + last_metric - (total_metrics - 1) + index) % frame_metrics.size()]; +} + void EditorProfiler::add_frame_metric(const Metric &p_metric, bool p_final) { ++last_metric; if (last_metric >= frame_metrics.size()) { last_metric = 0; } + total_metrics++; + if (total_metrics > frame_metrics.size()) { + total_metrics = frame_metrics.size(); + } + frame_metrics.write[last_metric] = p_metric; _make_metric_ptrs(frame_metrics.write[last_metric]); updating_frame = true; - cursor_metric_edit->set_max(frame_metrics[last_metric].frame_number); - cursor_metric_edit->set_min(MAX(frame_metrics[last_metric].frame_number - frame_metrics.size(), 0)); + clear_button->set_disabled(false); + cursor_metric_edit->set_editable(true); + cursor_metric_edit->set_max(p_metric.frame_number); + cursor_metric_edit->set_min(_get_frame_metric(0).frame_number); if (!seeking) { - cursor_metric_edit->set_value(frame_metrics[last_metric].frame_number); - if (hover_metric != -1) { - hover_metric++; - if (hover_metric >= frame_metrics.size()) { - hover_metric = 0; - } - } + cursor_metric_edit->set_value(p_metric.frame_number); } + updating_frame = false; if (frame_delay->is_stopped()) { @@ -83,6 +89,7 @@ void EditorProfiler::clear() { metric_size = CLAMP(metric_size, 60, 1024); frame_metrics.clear(); frame_metrics.resize(metric_size); + total_metrics = 0; last_metric = -1; variables->clear(); plot_sigs.clear(); @@ -93,6 +100,7 @@ void EditorProfiler::clear() { cursor_metric_edit->set_min(0); cursor_metric_edit->set_max(100); // Doesn't make much sense, but we can't have min == max. Doesn't hurt. cursor_metric_edit->set_value(0); + cursor_metric_edit->set_editable(false); updating_frame = false; hover_metric = -1; seeking = false; @@ -187,11 +195,8 @@ void EditorProfiler::_update_plot() { const bool use_self = display_time->get_selected() == DISPLAY_SELF_TIME; float highest = 0; - for (int i = 0; i < frame_metrics.size(); i++) { - const Metric &m = frame_metrics[i]; - if (!m.valid) { - continue; - } + for (int i = 0; i < total_metrics; i++) { + const Metric &m = _get_frame_metric(i); for (Set<StringName>::Element *E = plot_sigs.front(); E; E = E->next()) { const Map<StringName, Metric::Category *>::Element *F = m.category_ptrs.find(E->get()); @@ -220,78 +225,43 @@ void EditorProfiler::_update_plot() { int *column = columnv.ptrw(); - Map<StringName, int> plot_prev; - //Map<StringName,int> plot_max; + Map<StringName, int> prev_plots; - for (int i = 0; i < w; i++) { + for (int i = 0; i < total_metrics * w / frame_metrics.size() - 1; i++) { for (int j = 0; j < h * 4; j++) { column[j] = 0; } int current = i * frame_metrics.size() / w; - int next = (i + 1) * frame_metrics.size() / w; - if (next > frame_metrics.size()) { - next = frame_metrics.size(); - } - if (next == current) { - next = current + 1; //just because for loop must work - } for (Set<StringName>::Element *E = plot_sigs.front(); E; E = E->next()) { - int plot_pos = -1; + const Metric &m = _get_frame_metric(current); - for (int j = current; j < next; j++) { - //wrap - int idx = last_metric + 1 + j; - while (idx >= frame_metrics.size()) { - idx -= frame_metrics.size(); - } - - //get - const Metric &m = frame_metrics[idx]; - if (!m.valid) { - continue; //skip because invalid - } + float value = 0; - float value = 0; - - const Map<StringName, Metric::Category *>::Element *F = m.category_ptrs.find(E->get()); - if (F) { - value = F->get()->total_time; - } + const Map<StringName, Metric::Category *>::Element *F = m.category_ptrs.find(E->get()); + if (F) { + value = F->get()->total_time; + } - const Map<StringName, Metric::Category::Item *>::Element *G = m.item_ptrs.find(E->get()); - if (G) { - if (use_self) { - value = G->get()->self; - } else { - value = G->get()->total; - } + const Map<StringName, Metric::Category::Item *>::Element *G = m.item_ptrs.find(E->get()); + if (G) { + if (use_self) { + value = G->get()->self; + } else { + value = G->get()->total; } - - plot_pos = MAX(CLAMP(int(value * h / highest), 0, h - 1), plot_pos); } + int plot_pos = CLAMP(int(value * h / highest), 0, h - 1); + int prev_plot = plot_pos; - Map<StringName, int>::Element *H = plot_prev.find(E->get()); + Map<StringName, int>::Element *H = prev_plots.find(E->get()); if (H) { prev_plot = H->get(); H->get() = plot_pos; } else { - plot_prev[E->get()] = plot_pos; - } - - if (plot_pos == -1 && prev_plot == -1) { - //don't bother drawing - continue; - } - - if (prev_plot != -1 && plot_pos == -1) { - plot_pos = prev_plot; - } - - if (prev_plot == -1 && plot_pos != -1) { - prev_plot = plot_pos; + prev_plots[E->get()] = plot_pos; } plot_pos = h - plot_pos - 1; @@ -352,15 +322,13 @@ void EditorProfiler::_update_plot() { } void EditorProfiler::_update_frame() { - int cursor_metric = _get_cursor_index(); - - ERR_FAIL_INDEX(cursor_metric, frame_metrics.size()); + int cursor_metric = cursor_metric_edit->get_value() - _get_frame_metric(0).frame_number; updating_frame = true; variables->clear(); TreeItem *root = variables->create_item(); - const Metric &m = frame_metrics[cursor_metric]; + const Metric &m = _get_frame_metric(cursor_metric); int dtime = display_time->get_selected(); @@ -410,6 +378,7 @@ void EditorProfiler::_activate_pressed() { if (activate->is_pressed()) { activate->set_icon(get_theme_icon("Stop", "EditorIcons")); activate->set_text(TTR("Stop")); + _clear_pressed(); } else { activate->set_icon(get_theme_icon("Play", "EditorIcons")); activate->set_text(TTR("Start")); @@ -418,6 +387,7 @@ void EditorProfiler::_activate_pressed() { } void EditorProfiler::_clear_pressed() { + clear_button->set_disabled(true); clear(); _update_plot(); } @@ -430,30 +400,16 @@ void EditorProfiler::_notification(int p_what) { } void EditorProfiler::_graph_tex_draw() { - if (last_metric < 0) { + if (total_metrics == 0) { return; } if (seeking) { - int max_frames = frame_metrics.size(); - int frame = cursor_metric_edit->get_value() - (frame_metrics[last_metric].frame_number - max_frames + 1); - if (frame < 0) { - frame = 0; - } - - int cur_x = frame * graph->get_size().x / max_frames; - + int frame = cursor_metric_edit->get_value() - _get_frame_metric(0).frame_number; + int cur_x = (2 * frame + 1) * graph->get_size().x / (2 * frame_metrics.size()) + 1; graph->draw_line(Vector2(cur_x, 0), Vector2(cur_x, graph->get_size().y), Color(1, 1, 1, 0.8)); } - - if (hover_metric != -1 && frame_metrics[hover_metric].valid) { - int max_frames = frame_metrics.size(); - int frame = frame_metrics[hover_metric].frame_number - (frame_metrics[last_metric].frame_number - max_frames + 1); - if (frame < 0) { - frame = 0; - } - - int cur_x = frame * graph->get_size().x / max_frames; - + if (hover_metric > -1 && hover_metric < total_metrics) { + int cur_x = (2 * hover_metric + 1) * graph->get_size().x / (2 * frame_metrics.size()) + 1; graph->draw_line(Vector2(cur_x, 0), Vector2(cur_x, graph->get_size().y), Color(1, 1, 1, 0.4)); } } @@ -484,10 +440,10 @@ void EditorProfiler::_graph_tex_input(const Ref<InputEvent> &p_ev) { if ( (mb.is_valid() && mb->get_button_index() == MOUSE_BUTTON_LEFT && mb->is_pressed()) || (mm.is_valid())) { - int x = me->get_position().x; + int x = me->get_position().x - 1; x = x * frame_metrics.size() / graph->get_size().width; - bool show_hover = x >= 0 && x < frame_metrics.size(); + hover_metric = x; if (x < 0) { x = 0; @@ -497,41 +453,11 @@ void EditorProfiler::_graph_tex_input(const Ref<InputEvent> &p_ev) { x = frame_metrics.size() - 1; } - int metric = frame_metrics.size() - x - 1; - metric = last_metric - metric; - while (metric < 0) { - metric += frame_metrics.size(); - } - - if (show_hover) { - hover_metric = metric; - - } else { - hover_metric = -1; - } - if (mb.is_valid() || mm->get_button_mask() & MOUSE_BUTTON_MASK_LEFT) { - //cursor_metric=x; updating_frame = true; - //metric may be invalid, so look for closest metric that is valid, this makes snap feel better - bool valid = false; - for (int i = 0; i < frame_metrics.size(); i++) { - if (frame_metrics[metric].valid) { - valid = true; - break; - } - - metric++; - if (metric >= frame_metrics.size()) { - metric = 0; - } - } - - if (valid) { - cursor_metric_edit->set_value(frame_metrics[metric].frame_number); - } - + if (x < total_metrics) + cursor_metric_edit->set_value(_get_frame_metric(x).frame_number); updating_frame = false; if (activate->is_pressed()) { @@ -552,24 +478,6 @@ void EditorProfiler::_graph_tex_input(const Ref<InputEvent> &p_ev) { } } -int EditorProfiler::_get_cursor_index() const { - if (last_metric < 0) { - return 0; - } - if (!frame_metrics[last_metric].valid) { - return 0; - } - - int diff = (frame_metrics[last_metric].frame_number - cursor_metric_edit->get_value()); - - int idx = last_metric - diff; - while (idx < 0) { - idx += frame_metrics.size(); - } - - return idx; -} - void EditorProfiler::disable_seeking() { seeking = false; graph->update(); @@ -659,6 +567,7 @@ EditorProfiler::EditorProfiler() { clear_button = memnew(Button); clear_button->set_text(TTR("Clear")); clear_button->connect("pressed", callable_mp(this, &EditorProfiler::_clear_pressed)); + clear_button->set_disabled(true); hb->add_child(clear_button); hb->add_child(memnew(Label(TTR("Measure:")))); @@ -687,6 +596,8 @@ EditorProfiler::EditorProfiler() { cursor_metric_edit = memnew(SpinBox); cursor_metric_edit->set_h_size_flags(SIZE_FILL); + cursor_metric_edit->set_value(0); + cursor_metric_edit->set_editable(false); hb->add_child(cursor_metric_edit); cursor_metric_edit->connect("value_changed", callable_mp(this, &EditorProfiler::_cursor_metric_changed)); @@ -726,6 +637,7 @@ EditorProfiler::EditorProfiler() { int metric_size = CLAMP(int(EDITOR_DEF("debugger/profiler_frame_history_size", 600)), 60, 1024); frame_metrics.resize(metric_size); + total_metrics = 0; last_metric = -1; hover_metric = -1; diff --git a/editor/debugger/editor_profiler.h b/editor/debugger/editor_profiler.h index e16bde41f6..8880824b87 100644 --- a/editor/debugger/editor_profiler.h +++ b/editor/debugger/editor_profiler.h @@ -106,13 +106,13 @@ private: SpinBox *cursor_metric_edit; Vector<Metric> frame_metrics; + int total_metrics; int last_metric; int max_functions; bool updating_frame; - //int cursor_metric; int hover_metric; float graph_height; @@ -139,14 +139,14 @@ private: void _graph_tex_draw(); void _graph_tex_input(const Ref<InputEvent> &p_ev); - int _get_cursor_index() const; - Color _get_color_from_signature(const StringName &p_signature) const; void _cursor_metric_changed(double); void _combo_changed(int); + Metric _get_frame_metric(int index); + protected: void _notification(int p_what); static void _bind_methods(); diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 2ed937b6ff..d962658484 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -38,16 +38,15 @@ #include "core/version_hash.gen.h" void EditorAbout::_theme_changed() { - Control *base = EditorNode::get_singleton()->get_gui_base(); - Ref<Font> font = base->get_theme_font("source", "EditorFonts"); - int font_size = base->get_theme_font_size("source_size", "EditorFonts"); + const Ref<Font> font = get_theme_font("source", "EditorFonts"); + const int font_size = get_theme_font_size("source_size", "EditorFonts"); _tpl_text->add_theme_font_override("normal_font", font); _tpl_text->add_theme_font_size_override("normal_font_size", font_size); _tpl_text->add_theme_constant_override("line_separation", 6 * EDSCALE); _license_text->add_theme_font_override("normal_font", font); _license_text->add_theme_font_size_override("normal_font_size", font_size); _license_text->add_theme_constant_override("line_separation", 6 * EDSCALE); - _logo->set_texture(base->get_theme_icon("Logo", "EditorIcons")); + _logo->set_texture(get_theme_icon("Logo", "EditorIcons")); } void EditorAbout::_notification(int p_what) { diff --git a/editor/editor_about.h b/editor/editor_about.h index efb7245e78..2823220a8a 100644 --- a/editor/editor_about.h +++ b/editor/editor_about.h @@ -44,6 +44,10 @@ #include "editor_scale.h" +/** + * NOTE: Do not assume the EditorNode singleton to be available in this class' methods. + * EditorAbout is also used from the project manager where EditorNode isn't initialized. + */ class EditorAbout : public AcceptDialog { GDCLASS(EditorAbout, AcceptDialog); diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 3a5ebe8e85..e7934bed0a 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -531,6 +531,8 @@ void EditorAudioBus::_effect_add(int p_which) { } void EditorAudioBus::_gui_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid() && mb->get_button_index() == MOUSE_BUTTON_RIGHT && mb->is_pressed()) { Vector2 pos = Vector2(mb->get_position().x, mb->get_position().y); diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index f78da9569f..75815fa750 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -125,6 +125,8 @@ void EditorFileDialog::_notification(int p_what) { } void EditorFileDialog::_unhandled_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventKey> k = p_event; if (k.is_valid()) { diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 283713cd3c..a747652a2f 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -1908,6 +1908,8 @@ void FindBar::_hide_bar() { } void FindBar::_unhandled_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventKey> k = p_event; if (k.is_valid()) { if (k->is_pressed() && (rich_text_label->has_focus() || is_a_parent_of(get_focus_owner()))) { diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp index a1ff87fe2e..23226ffa9b 100644 --- a/editor/editor_help_search.cpp +++ b/editor/editor_help_search.cpp @@ -123,7 +123,7 @@ void EditorHelpSearch::_notification(int p_what) { if (search->work()) { // Search done. - // Only point to the perfect match if it's a new search, and not just reopening a old one. + // Only point to the match if it's a new search, and not just reopening a old one. if (!old_search) { results_tree->ensure_cursor_is_visible(); } else { @@ -310,6 +310,7 @@ bool EditorHelpSearch::Runner::_phase_match_classes_init() { iterator_doc = EditorHelp::get_doc_data()->class_list.front(); matches.clear(); matched_item = nullptr; + match_highest_score = 0; return true; } @@ -460,16 +461,20 @@ bool EditorHelpSearch::Runner::_match_string(const String &p_term, const String } void EditorHelpSearch::Runner::_match_item(TreeItem *p_item, const String &p_text) { - if (!matched_item) { - if (search_flags & SEARCH_CASE_SENSITIVE) { - if (p_text.casecmp_to(term) == 0) { - matched_item = p_item; - } - } else { - if (p_text.nocasecmp_to(term) == 0) { - matched_item = p_item; - } - } + float inverse_length = 1.f / float(p_text.length()); + + // Favor types where search term is a substring close to the start of the type. + float w = 0.5f; + int pos = p_text.findn(term); + float score = (pos > -1) ? 1.0f - w * MIN(1, 3 * pos * inverse_length) : MAX(0.f, .9f - w); + + // Favor shorter items: they resemble the search term more. + w = 0.1f; + score *= (1 - w) + w * (term.length() * inverse_length); + + if (match_highest_score == 0 || score > match_highest_score) { + matched_item = p_item; + match_highest_score = score; } } diff --git a/editor/editor_help_search.h b/editor/editor_help_search.h index 0e236d523d..350a02315f 100644 --- a/editor/editor_help_search.h +++ b/editor/editor_help_search.h @@ -124,6 +124,7 @@ class EditorHelpSearch::Runner : public Reference { TreeItem *root_item = nullptr; Map<String, TreeItem *> class_items; TreeItem *matched_item = nullptr; + float match_highest_score = 0; bool _is_class_disabled_by_feature_profile(const StringName &p_class); diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 70d1a514b5..738b2f9f82 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -682,6 +682,8 @@ bool EditorProperty::is_selected() const { } void EditorProperty::_gui_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (property == StringName()) { return; } @@ -1354,6 +1356,8 @@ void EditorInspectorSection::setup(const String &p_section, const String &p_labe } void EditorInspectorSection::_gui_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (!foldable) { return; } @@ -2566,9 +2570,9 @@ void EditorInspector::_update_script_class_properties(const Object &p_object, Li } // Script Variables -> to insert: NodeC..B..A -> bottom (insert_here) - List<PropertyInfo>::Element *script_variables = NULL; - List<PropertyInfo>::Element *bottom = NULL; - List<PropertyInfo>::Element *insert_here = NULL; + List<PropertyInfo>::Element *script_variables = nullptr; + List<PropertyInfo>::Element *bottom = nullptr; + List<PropertyInfo>::Element *insert_here = nullptr; for (List<PropertyInfo>::Element *E = r_list.front(); E; E = E->next()) { PropertyInfo &pi = E->get(); if (pi.name != "Script Variables") { diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 21f1d05304..055baeb81e 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -390,6 +390,8 @@ void EditorNode::_update_title() { } void EditorNode::_unhandled_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventKey> k = p_event; if (k.is_valid() && k->is_pressed() && !k->is_echo()) { EditorPlugin *old_editor = editor_plugin_screen; @@ -792,17 +794,27 @@ void EditorNode::_fs_changed() { } preset.unref(); } + if (preset.is_null()) { - export_error = vformat( - "Invalid export preset name: %s. Make sure `export_presets.cfg` is present in the current directory.", - preset_name); + DirAccessRef da = DirAccess::create(DirAccess::ACCESS_RESOURCES); + if (da->file_exists("res://export_presets.cfg")) { + export_error = vformat( + "Invalid export preset name: %s.\nThe following presets were detected in this project's `export_presets.cfg`:\n\n", + preset_name); + for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); ++i) { + // Write the preset name between double quotes since it needs to be written between quotes on the command line if it contains spaces. + export_error += vformat(" \"%s\"\n", EditorExport::get_singleton()->get_export_preset(i)->get_name()); + } + } else { + export_error = "This project doesn't have an `export_presets.cfg` file at its root.\nCreate an export preset from the \"Project > Export\" dialog and try again."; + } } else { Ref<EditorExportPlatform> platform = preset->get_platform(); const String export_path = export_defer.path.is_empty() ? preset->get_export_path() : export_defer.path; if (export_path.is_empty()) { - export_error = vformat("Export preset '%s' doesn't have a default export path, and none was specified.", preset_name); + export_error = vformat("Export preset \"%s\" doesn't have a default export path, and none was specified.", preset_name); } else if (platform.is_null()) { - export_error = vformat("Export preset '%s' doesn't have a matching platform.", preset_name); + export_error = vformat("Export preset \"%s\" doesn't have a matching platform.", preset_name); } else { Error err = OK; if (export_defer.pack_only) { // Only export .pck or .zip data pack. @@ -815,7 +827,7 @@ void EditorNode::_fs_changed() { String config_error; bool missing_templates; if (!platform->can_export(preset, config_error, missing_templates)) { - ERR_PRINT(vformat("Cannot export project with preset '%s' due to configuration errors:\n%s", preset_name, config_error)); + ERR_PRINT(vformat("Cannot export project with preset \"%s\" due to configuration errors:\n%s", preset_name, config_error)); err = missing_templates ? ERR_FILE_NOT_FOUND : ERR_UNCONFIGURED; } else { err = platform->export_project(preset, export_defer.debug, export_path); @@ -825,13 +837,13 @@ void EditorNode::_fs_changed() { case OK: break; case ERR_FILE_NOT_FOUND: - export_error = vformat("Project export failed for preset '%s', the export template appears to be missing.", preset_name); + export_error = vformat("Project export failed for preset \"%s\". The export template appears to be missing.", preset_name); break; case ERR_FILE_BAD_PATH: - export_error = vformat("Project export failed for preset '%s', the target path '%s' appears to be invalid.", preset_name, export_path); + export_error = vformat("Project export failed for preset \"%s\". The target path \"%s\" appears to be invalid.", preset_name, export_path); break; default: - export_error = vformat("Project export failed with error code %d for preset '%s'.", (int)err, preset_name); + export_error = vformat("Project export failed with error code %d for preset \"%s\".", (int)err, preset_name); break; } } @@ -1377,7 +1389,7 @@ void EditorNode::_save_scene_with_preview(String p_file, int p_idx) { // which would result in an invalid texture. if (c3d == 0 && c2d == 0) { img.instance(); - img->create(1, 1, 0, Image::FORMAT_RGB8); + img->create(1, 1, false, Image::FORMAT_RGB8); } else if (c3d < c2d) { Ref<ViewportTexture> viewport_texture = scene_root->get_texture(); if (viewport_texture->get_width() > 0 && viewport_texture->get_height() > 0) { @@ -5880,6 +5892,8 @@ EditorNode::EditorNode() { EDITOR_DEF("interface/inspector/resources_to_open_in_new_inspector", "Script,MeshLibrary,TileSet"); EDITOR_DEF("interface/inspector/default_color_picker_mode", 0); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "interface/inspector/default_color_picker_mode", PROPERTY_HINT_ENUM, "RGB,HSV,RAW", PROPERTY_USAGE_DEFAULT)); + EDITOR_DEF("interface/inspector/default_color_picker_shape", (int32_t)ColorPicker::SHAPE_VHS_CIRCLE); + EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "interface/inspector/default_color_picker_shape", PROPERTY_HINT_ENUM, "HSV Rectangle,HSV Rectangle Wheel,VHS Circle", PROPERTY_USAGE_DEFAULT)); EDITOR_DEF("run/auto_save/save_before_running", true); theme_base = memnew(Control); diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index c0cecbc651..eabcbacd9a 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -160,6 +160,10 @@ void EditorInterface::edit_resource(const Ref<Resource> &p_resource) { EditorNode::get_singleton()->edit_resource(p_resource); } +void EditorInterface::edit_node(Node *p_node) { + EditorNode::get_singleton()->edit_node(p_node); +} + void EditorInterface::open_scene_from_path(const String &scene_path) { if (EditorNode::get_singleton()->is_changing_scene()) { return; @@ -262,6 +266,10 @@ Control *EditorInterface::get_base_control() { return EditorNode::get_singleton()->get_gui_base(); } +float EditorInterface::get_editor_scale() const { + return EDSCALE; +} + void EditorInterface::set_plugin_enabled(const String &p_plugin, bool p_enabled) { EditorNode::get_singleton()->set_addon_plugin_enabled(p_plugin, p_enabled, true); } @@ -306,7 +314,9 @@ void EditorInterface::_bind_methods() { ClassDB::bind_method(D_METHOD("get_editor_settings"), &EditorInterface::get_editor_settings); ClassDB::bind_method(D_METHOD("get_script_editor"), &EditorInterface::get_script_editor); ClassDB::bind_method(D_METHOD("get_base_control"), &EditorInterface::get_base_control); + ClassDB::bind_method(D_METHOD("get_editor_scale"), &EditorInterface::get_editor_scale); ClassDB::bind_method(D_METHOD("edit_resource", "resource"), &EditorInterface::edit_resource); + ClassDB::bind_method(D_METHOD("edit_node", "node"), &EditorInterface::edit_node); ClassDB::bind_method(D_METHOD("open_scene_from_path", "scene_filepath"), &EditorInterface::open_scene_from_path); ClassDB::bind_method(D_METHOD("reload_scene_from_path", "scene_filepath"), &EditorInterface::reload_scene_from_path); ClassDB::bind_method(D_METHOD("play_main_scene"), &EditorInterface::play_main_scene); diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index ae9fcfb28a..67b163eabf 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -71,6 +71,7 @@ public: Control *get_editor_main_control(); void edit_resource(const Ref<Resource> &p_resource); + void edit_node(Node *p_node); void open_scene_from_path(const String &scene_path); void reload_scene_from_path(const String &scene_path); @@ -100,6 +101,7 @@ public: FileSystemDock *get_file_system_dock(); Control *get_base_control(); + float get_editor_scale() const; void set_plugin_enabled(const String &p_plugin, bool p_enabled); bool is_plugin_enabled(const String &p_plugin) const; diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index f46d677aec..4ea993af5b 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -649,14 +649,16 @@ public: Color color = get_theme_color("highlight_color", "Editor"); for (int i = 0; i < 2; i++) { Point2 ofs(4, vofs); - if (i == 1) + if (i == 1) { ofs.y += bsize + 1; + } ofs += rect.position; for (int j = 0; j < 10; j++) { Point2 o = ofs + Point2(j * (bsize + 1), 0); - if (j >= 5) + if (j >= 5) { o.x += 1; + } const int idx = i * 10 + j; const bool on = value & (1 << idx); @@ -2188,6 +2190,9 @@ void EditorPropertyColor::_picker_created() { } else if (default_color_mode == 2) { picker->get_picker()->set_raw_mode(true); } + + int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape"); + picker->get_picker()->set_picker_shape((ColorPicker::PickerShapeType)picker_shape); } void EditorPropertyColor::_picker_opening() { @@ -3282,7 +3287,7 @@ void EditorInspectorDefaultPlugin::parse_begin(Object *p_object) { } bool EditorInspectorDefaultPlugin::parse_property(Object *p_object, Variant::Type p_type, const String &p_path, PropertyHint p_hint, const String &p_hint_text, int p_usage, bool p_wide) { - float default_float_step = EDITOR_GET("interface/inspector/default_float_step"); + double default_float_step = EDITOR_GET("interface/inspector/default_float_step"); switch (p_type) { // atomic types diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp index c09d78826c..8577ccb9db 100644 --- a/editor/editor_spin_slider.cpp +++ b/editor/editor_spin_slider.cpp @@ -47,6 +47,8 @@ String EditorSpinSlider::get_text_value() const { } void EditorSpinSlider::_gui_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (read_only) { return; } diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 35cf330714..4c5c3af765 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -1282,6 +1282,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_icon("preset_bg", "ColorPicker", theme->get_icon("GuiMiniCheckerboard", "EditorIcons")); theme->set_icon("overbright_indicator", "ColorPicker", theme->get_icon("OverbrightIndicator", "EditorIcons")); theme->set_icon("bar_arrow", "ColorPicker", theme->get_icon("ColorPickerBarArrow", "EditorIcons")); + theme->set_icon("picker_cursor", "ColorPicker", theme->get_icon("PickerCursor", "EditorIcons")); theme->set_icon("bg", "ColorPickerButton", theme->get_icon("GuiMiniCheckerboard", "EditorIcons")); diff --git a/editor/editor_translation_parser.cpp b/editor/editor_translation_parser.cpp index 51bd9b3383..fd36372dde 100644 --- a/editor/editor_translation_parser.cpp +++ b/editor/editor_translation_parser.cpp @@ -38,8 +38,9 @@ EditorTranslationParser *EditorTranslationParser::singleton = nullptr; Error EditorTranslationParserPlugin::parse_file(const String &p_path, Vector<String> *r_ids, Vector<Vector<String>> *r_ids_ctx_plural) { - if (!get_script_instance()) + if (!get_script_instance()) { return ERR_UNAVAILABLE; + } if (get_script_instance()->has_method("parse_file")) { Array ids; @@ -70,8 +71,9 @@ Error EditorTranslationParserPlugin::parse_file(const String &p_path, Vector<Str } void EditorTranslationParserPlugin::get_recognized_extensions(List<String> *r_extensions) const { - if (!get_script_instance()) + if (!get_script_instance()) { return; + } if (get_script_instance()->has_method("get_recognized_extensions")) { Array extensions = get_script_instance()->call("get_recognized_extensions"); diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index d6ae901ca9..899070f036 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -2621,8 +2621,9 @@ void FileSystemDock::_get_imported_files(const String &p_path, Vector<String> &f } void FileSystemDock::_update_import_dock() { - if (!import_dock_needs_update) + if (!import_dock_needs_update) { return; + } // List selected. Vector<String> selected; @@ -2633,8 +2634,9 @@ void FileSystemDock::_update_import_dock() { } else { // Use the file list. for (int i = 0; i < files->get_item_count(); i++) { - if (!files->is_selected(i)) + if (!files->is_selected(i)) { continue; + } selected.push_back(files->get_item_metadata(i)); } diff --git a/editor/icons/GuiScrollBg.svg b/editor/icons/GuiScrollBg.svg index dd5c60e534..7cfe647368 100644 --- a/editor/icons/GuiScrollBg.svg +++ b/editor/icons/GuiScrollBg.svg @@ -1 +1 @@ -<svg height="12" viewBox="0 0 12 11.999999" width="12" xmlns="http://www.w3.org/2000/svg"/> +<svg height="12" viewBox="0 0 12 11.999999" width="12" xmlns="http://www.w3.org/2000/svg"><circle cx="6" cy="6" fill="#fff" fill-opacity=".082353" r="2"/></svg> diff --git a/editor/icons/GuiScrollGrabber.svg b/editor/icons/GuiScrollGrabber.svg index 16edfb567c..935f9361dd 100644 --- a/editor/icons/GuiScrollGrabber.svg +++ b/editor/icons/GuiScrollGrabber.svg @@ -1 +1 @@ -<svg height="12" viewBox="0 0 12 11.999999" width="12" xmlns="http://www.w3.org/2000/svg"><circle cx="6" cy="6" fill="#fff" fill-opacity=".27451" r="2"/></svg> +<svg height="12" viewBox="0 0 12 11.999999" width="12" xmlns="http://www.w3.org/2000/svg"><circle cx="6" cy="6" fill="#fff" fill-opacity=".294118" r="3"/></svg> diff --git a/editor/icons/PickerCursor.svg b/editor/icons/PickerCursor.svg new file mode 100644 index 0000000000..88ee3f55ce --- /dev/null +++ b/editor/icons/PickerCursor.svg @@ -0,0 +1 @@ +<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8 2a6 6 0 0 0 -6 6 6 6 0 0 0 6 6 6 6 0 0 0 6-6 6 6 0 0 0 -6-6zm0 1a5 5 0 0 1 5 5 5 5 0 0 1 -5 5 5 5 0 0 1 -5-5 5 5 0 0 1 5-5z" fill="#fff"/><path d="m8 3a5 5 0 0 0 -5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0 -5-5zm-.0605469 1a4 4 0 0 1 .0605469 0 4 4 0 0 1 4 4 4 4 0 0 1 -4 4 4 4 0 0 1 -4-4 4 4 0 0 1 3.9394531-4z"/></svg> diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 080393e570..d3183e5a8d 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -1688,7 +1688,7 @@ Node *EditorSceneImporterCollada::import_scene(const String &p_path, uint32_t p_ state.use_mesh_builtin_materials = true; state.bake_fps = p_bake_fps; - Error err = state.load(p_path, flags, p_flags & EditorSceneImporter::IMPORT_GENERATE_TANGENT_ARRAYS, 0); + Error err = state.load(p_path, flags, p_flags & EditorSceneImporter::IMPORT_GENERATE_TANGENT_ARRAYS, false); if (r_err) { *r_err = err; diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp index 5c522e3176..dd62c72d8a 100644 --- a/editor/import/resource_importer_obj.cpp +++ b/editor/import/resource_importer_obj.cpp @@ -427,7 +427,7 @@ static Error _parse_obj(const String &p_path, List<Ref<Mesh>> &r_meshes, bool p_ Node *EditorOBJImporter::import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err) { List<Ref<Mesh>> meshes; - Error err = _parse_obj(p_path, meshes, false, p_flags & IMPORT_GENERATE_TANGENT_ARRAYS, 0, Vector3(1, 1, 1), Vector3(0, 0, 0), r_missing_deps); + Error err = _parse_obj(p_path, meshes, false, p_flags & IMPORT_GENERATE_TANGENT_ARRAYS, false, Vector3(1, 1, 1), Vector3(0, 0, 0), r_missing_deps); if (err != OK) { if (r_err) { diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index 9041b815ca..4bb56beaeb 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -1241,7 +1241,7 @@ void ResourceImporterScene::_generate_meshes(Node *p_node, const Dictionary &p_m if (mesh.is_valid()) { mesh_node->set_mesh(mesh); for (int i = 0; i < mesh->get_surface_count(); i++) { - mesh_node->set_surface_material(i, src_mesh_node->get_surface_material(i)); + mesh_node->set_surface_override_material(i, src_mesh_node->get_surface_material(i)); } } } diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 03481dfb38..612a8f30a4 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -1219,6 +1219,8 @@ void AnimationPlayerEditor::_onion_skinning_menu(int p_option) { } void AnimationPlayerEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) { + ERR_FAIL_COND(p_ev.is_null()); + 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_keycode()) { diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index 1345adc8ee..fd47d9964e 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -557,8 +557,15 @@ void EditorAssetLibrary::_notification(int p_what) { error_label->raise(); } break; case NOTIFICATION_VISIBILITY_CHANGED: { - if (is_visible() && initial_loading) { - _repository_changed(0); // Update when shown for the first time. + if (is_visible()) { + // Focus the search box automatically when switching to the Templates tab (in the Project Manager) + // or switching to the AssetLib tab (in the editor). + // The Project Manager's project filter box is automatically focused in the project manager code. + filter->grab_focus(); + + if (initial_loading) { + _repository_changed(0); // Update when shown for the first time. + } } } break; case NOTIFICATION_PROCESS: { @@ -606,6 +613,8 @@ void EditorAssetLibrary::_update_repository_options() { } void EditorAssetLibrary::_unhandled_key_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + const Ref<InputEventKey> key = p_event; if (key.is_valid() && key->is_pressed()) { @@ -1332,6 +1341,11 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) { library_main->add_theme_constant_override("separation", 10 * EDSCALE); filter = memnew(LineEdit); + if (templates_only) { + filter->set_placeholder(TTR("Search templates, projects, and demos")); + } else { + filter->set_placeholder(TTR("Search assets (excluding templates, projects, and demos)")); + } search_hb->add_child(filter); filter->set_h_size_flags(Control::SIZE_EXPAND_FILL); filter->connect("text_changed", callable_mp(this, &EditorAssetLibrary::_search_text_changed)); diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index d4e06aa9ca..fc3e15aa52 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -472,6 +472,8 @@ float CanvasItemEditor::snap_angle(float p_target, float p_start) const { } void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) { + ERR_FAIL_COND(p_ev.is_null()); + Ref<InputEventKey> k = p_ev; if (!is_visible_in_tree()) { @@ -802,11 +804,15 @@ void CanvasItemEditor::_find_canvas_items_in_rect(const Rect2 &p_rect, Node *p_n bool CanvasItemEditor::_select_click_on_item(CanvasItem *item, Point2 p_click_pos, bool p_append) { bool still_selected = true; - if (p_append) { + if (p_append && !editor_selection->get_selected_node_list().is_empty()) { if (editor_selection->is_selected(item)) { // Already in the selection, remove it from the selected nodes editor_selection->remove_node(item); still_selected = false; + + if (editor_selection->get_selected_node_list().size() == 1) { + editor->push_item(editor_selection->get_selected_node_list()[0]); + } } else { // Add the item to the selection editor_selection->add_node(item); @@ -2587,6 +2593,9 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) { } _find_canvas_items_in_rect(Rect2(bsfrom, bsto - bsfrom), scene, &selitems); + if (selitems.size() == 1 && editor_selection->get_selected_node_list().is_empty()) { + editor->push_item(selitems[0]); + } for (List<CanvasItem *>::Element *E = selitems.front(); E; E = E->next()) { editor_selection->add_node(E->get()); } @@ -5376,9 +5385,6 @@ void CanvasItemEditor::_focus_selection(int p_op) { rect = rect.merge(canvas_item_rect); } }; - if (count == 0) { - return; - } if (p_op == VIEW_CENTER_TO_SELECTION) { center = rect.position + rect.size / 2; diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp index 77719104b1..9d29c31522 100644 --- a/editor/plugins/mesh_editor_plugin.cpp +++ b/editor/plugins/mesh_editor_plugin.cpp @@ -33,6 +33,8 @@ #include "editor/editor_scale.h" void MeshEditor::_gui_input(Ref<InputEvent> p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventMouseMotion> mm = p_event; if (mm.is_valid() && mm->get_button_mask() & MOUSE_BUTTON_MASK_LEFT) { rot_x -= mm->get_relative().y * 0.01; diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp index f8932cd534..6f1f243444 100644 --- a/editor/plugins/mesh_library_editor_plugin.cpp +++ b/editor/plugins/mesh_library_editor_plugin.cpp @@ -93,7 +93,7 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library, mesh = mesh->duplicate(); for (int j = 0; j < mesh->get_surface_count(); ++j) { - Ref<Material> mat = mi->get_surface_material(j); + Ref<Material> mat = mi->get_surface_override_material(j); if (mat.is_valid()) { mesh->surface_set_material(j, mat); diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 81c59fc0a9..13c7814dac 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -185,6 +185,8 @@ void ViewportRotationControl::_get_sorted_axis(Vector<Axis2D> &r_axis) { } void ViewportRotationControl::_gui_input(Ref<InputEvent> p_event) { + ERR_FAIL_COND(p_event.is_null()); + const Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid() && mb->get_button_index() == MOUSE_BUTTON_LEFT) { Vector2 pos = mb->get_position(); @@ -1277,7 +1279,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) { clicked = ObjectID(); clicked_includes_current = false; - if ((spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT && b->get_control()) || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE) { + if ((spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT && b->get_command()) || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE) { /* HANDLE ROTATION */ if (get_selected_count() == 0) { break; //bye @@ -1472,7 +1474,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) { Vector3 ray_pos = _get_ray_pos(m->get_position()); Vector3 ray = _get_ray(m->get_position()); - float snap = EDITOR_GET("interface/inspector/default_float_step"); + double snap = EDITOR_GET("interface/inspector/default_float_step"); int snap_step_decimals = Math::range_step_decimals(snap); switch (_edit.mode) { @@ -1766,7 +1768,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) { Vector3 y_axis = (click - _edit.center).normalized(); Vector3 x_axis = plane.normal.cross(y_axis).normalized(); - float angle = Math::atan2(x_axis.dot(intersection - _edit.center), y_axis.dot(intersection - _edit.center)); + double angle = Math::atan2(x_axis.dot(intersection - _edit.center), y_axis.dot(intersection - _edit.center)); if (_edit.snap || spatial_editor->is_snap_enabled()) { snap = spatial_editor->get_rotate_snap(); @@ -2213,6 +2215,12 @@ void Node3DEditorViewport::scale_cursor_distance(real_t scale) { cursor.distance = CLAMP(cursor.distance * scale, min_distance, max_distance); } + if (cursor.distance == max_distance || cursor.distance == min_distance) { + zoom_failed_attempts_count++; + } else { + zoom_failed_attempts_count = 0; + } + zoom_indicator_delay = ZOOM_FREELOOK_INDICATOR_DELAY_S; surface->update(); } @@ -2394,6 +2402,7 @@ void Node3DEditorViewport::_notification(int p_what) { zoom_indicator_delay -= delta; if (zoom_indicator_delay <= 0) { surface->update(); + zoom_limit_label->hide(); } } @@ -2533,6 +2542,8 @@ void Node3DEditorViewport::_notification(int p_what) { cpu_time += cpu_time_history[i]; } cpu_time /= FRAME_TIME_HISTORY; + // Prevent unrealistically low values. + cpu_time = MAX(0.01, cpu_time); gpu_time_history[gpu_time_history_index] = RS::get_singleton()->viewport_get_measured_render_time_gpu(viewport->get_viewport_rid()); gpu_time_history_index = (gpu_time_history_index + 1) % FRAME_TIME_HISTORY; @@ -2541,16 +2552,19 @@ void Node3DEditorViewport::_notification(int p_what) { gpu_time += gpu_time_history[i]; } gpu_time /= FRAME_TIME_HISTORY; + // Prevent division by zero for the FPS counter (and unrealistically low values). + // This limits the reported FPS to 100000. + gpu_time = MAX(0.01, gpu_time); // Color labels depending on performance level ("good" = green, "OK" = yellow, "bad" = red). // Middle point is at 15 ms. - cpu_time_label->set_text(vformat(TTR("CPU Time: %s ms"), String::num(cpu_time, 1))); + cpu_time_label->set_text(vformat(TTR("CPU Time: %s ms"), rtos(cpu_time).pad_decimals(1))); cpu_time_label->add_theme_color_override( "font_color", frame_time_gradient->get_color_at_offset( Math::range_lerp(cpu_time, 0, 30, 0, 1))); - gpu_time_label->set_text(vformat(TTR("GPU Time: %s ms"), String::num(gpu_time, 1))); + gpu_time_label->set_text(vformat(TTR("GPU Time: %s ms"), rtos(gpu_time).pad_decimals(1))); // Middle point is at 15 ms. gpu_time_label->add_theme_color_override( "font_color", @@ -2768,6 +2782,7 @@ void Node3DEditorViewport::_draw() { } else { // Show zoom + zoom_limit_label->set_visible(zoom_failed_attempts_count > 15); real_t min_distance = MAX(camera->get_near() * 4, ZOOM_FREELOOK_MIN); real_t max_distance = MIN(camera->get_far() / 4, ZOOM_FREELOOK_MAX); @@ -3545,10 +3560,6 @@ void Node3DEditorViewport::reset() { } void Node3DEditorViewport::focus_selection() { - if (!get_selected_count()) { - return; - } - Vector3 center; int count = 0; @@ -3645,9 +3656,9 @@ Vector3 Node3DEditorViewport::_get_instance_position(const Point2 &p_pos) const AABB Node3DEditorViewport::_calculate_spatial_bounds(const Node3D *p_parent, bool p_exclude_top_level_transform) { AABB bounds; - const MeshInstance3D *mesh_instance = Object::cast_to<MeshInstance3D>(p_parent); - if (mesh_instance) { - bounds = mesh_instance->get_aabb(); + const VisualInstance3D *visual_instance = Object::cast_to<VisualInstance3D>(p_parent); + if (visual_instance) { + bounds = visual_instance->get_aabb(); } for (int i = 0; i < p_parent->get_child_count(); i++) { @@ -4130,6 +4141,15 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, Edito locked_label->set_text(TTR("View Rotation Locked")); locked_label->hide(); + zoom_limit_label = memnew(Label); + zoom_limit_label->set_anchors_and_offsets_preset(LayoutPreset::PRESET_BOTTOM_LEFT); + zoom_limit_label->set_offset(Side::SIDE_TOP, -28 * EDSCALE); + zoom_limit_label->set_text(TTR("To zoom further, change the camera's clipping planes (View -> Settings...)")); + zoom_limit_label->set_name("ZoomLimitMessageLabel"); + zoom_limit_label->add_theme_color_override("font_color", Color(1, 1, 1, 1)); + zoom_limit_label->hide(); + surface->add_child(zoom_limit_label); + frame_time_gradient = memnew(Gradient); // The color is set when the theme changes. frame_time_gradient->add_point(0.5, Color()); @@ -4192,6 +4212,8 @@ Node3DEditorViewport::~Node3DEditorViewport() { ////////////////////////////////////////////////////////////// void Node3DEditorViewportContainer::_gui_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid() && mb->get_button_index() == MOUSE_BUTTON_LEFT) { @@ -6159,6 +6181,8 @@ void Node3DEditor::snap_selected_nodes_to_floor() { } void Node3DEditor::_unhandled_key_input(Ref<InputEvent> p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (!is_visible_in_tree()) { return; } diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h index ff4a941b06..70329f90c7 100644 --- a/editor/plugins/node_3d_editor_plugin.h +++ b/editor/plugins/node_3d_editor_plugin.h @@ -295,6 +295,7 @@ private: Label *info_label; Label *cinema_label; Label *locked_label; + Label *zoom_limit_label; VBoxContainer *top_right_vbox; ViewportRotationControl *rotation_control; @@ -418,6 +419,7 @@ private: void scale_freelook_speed(real_t scale); real_t zoom_indicator_delay; + int zoom_failed_attempts_count = 0; RID move_gizmo_instance[3], move_plane_gizmo_instance[3], rotate_gizmo_instance[4], scale_gizmo_instance[3], scale_plane_gizmo_instance[3]; diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index b298474406..58e6717a3d 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -2706,6 +2706,8 @@ void ScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co } void ScriptEditor::_unhandled_key_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (!is_visible_in_tree() || !p_event->is_pressed() || p_event->is_echo()) { return; } diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 3534809891..c982207224 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -1721,6 +1721,9 @@ void ScriptTextEditor::_enable_code_editor() { color_picker->set_raw_mode(true); } + int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape"); + color_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape); + quick_open = memnew(ScriptEditorQuickOpen); quick_open->connect("goto_line", callable_mp(this, &ScriptTextEditor::_goto_line)); add_child(quick_open); diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index 8f8a4b3054..ed3b746678 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -205,7 +205,7 @@ void ShaderTextEditor::_code_complete_script(const String &p_code, List<ScriptCo ShaderLanguage sl; String calltip; - sl.complete(p_code, ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(shader->get_mode())), ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(shader->get_mode())), ShaderTypes::get_singleton()->get_types(), _get_global_variable_type, r_options, calltip); + sl.complete(p_code, ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(shader->get_mode())), ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(shader->get_mode())), ShaderLanguage::VaryingFunctionNames(), ShaderTypes::get_singleton()->get_types(), _get_global_variable_type, r_options, calltip); get_text_editor()->set_code_hint(calltip); } @@ -219,7 +219,7 @@ void ShaderTextEditor::_validate_script() { ShaderLanguage sl; - Error err = sl.compile(code, ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(shader->get_mode())), ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(shader->get_mode())), ShaderTypes::get_singleton()->get_types(), _get_global_variable_type); + Error err = sl.compile(code, ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(shader->get_mode())), ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(shader->get_mode())), ShaderLanguage::VaryingFunctionNames(), ShaderTypes::get_singleton()->get_types(), _get_global_variable_type); if (err != OK) { String error_text = "error(" + itos(sl.get_error_line()) + "): " + sl.get_error_text(); diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp index 121ccfa417..404ef62eca 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.cpp +++ b/editor/plugins/skeleton_3d_editor_plugin.cpp @@ -167,16 +167,18 @@ void BoneTransformEditor::_notification(int p_what) { } void BoneTransformEditor::_value_changed(const double p_value) { - if (updating) + if (updating) { return; + } Transform tform = compute_transform_from_vector3s(); _change_transform(tform); } void BoneTransformEditor::_value_changed_vector3(const String p_property_name, const Vector3 p_vector, const StringName p_edited_property_name, const bool p_boolean) { - if (updating) + if (updating) { return; + } Transform tform = compute_transform_from_vector3s(); _change_transform(tform); } @@ -194,8 +196,9 @@ Transform BoneTransformEditor::compute_transform_from_vector3s() const { } void BoneTransformEditor::_value_changed_transform(const String p_property_name, const Transform p_transform, const StringName p_edited_property_name, const bool p_boolean) { - if (updating) + if (updating) { return; + } _change_transform(p_transform); } @@ -222,11 +225,13 @@ void BoneTransformEditor::update_enabled_checkbox() { } void BoneTransformEditor::_update_properties() { - if (updating) + if (updating) { return; + } - if (skeleton == nullptr) + if (skeleton == nullptr) { return; + } updating = true; @@ -235,11 +240,13 @@ void BoneTransformEditor::_update_properties() { } void BoneTransformEditor::_update_custom_pose_properties() { - if (updating) + if (updating) { return; + } - if (skeleton == nullptr) + if (skeleton == nullptr) { return; + } updating = true; @@ -287,14 +294,16 @@ void BoneTransformEditor::set_toggle_enabled(const bool p_enabled) { } void BoneTransformEditor::_key_button_pressed() { - if (skeleton == nullptr) + if (skeleton == nullptr) { return; + } const BoneId bone_id = property.get_slicec('/', 1).to_int(); const String name = skeleton->get_bone_name(bone_id); - if (name.is_empty()) + if (name.is_empty()) { return; + } // Need to normalize the basis before you key it Transform tform = compute_transform_from_vector3s(); @@ -405,8 +414,9 @@ PhysicalBone3D *Skeleton3DEditor::create_physical_bone(int bone_id, int bone_chi Variant Skeleton3DEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) { TreeItem *selected = joint_tree->get_selected(); - if (!selected) + if (!selected) { return Variant(); + } Ref<Texture> icon = selected->get_icon(0); @@ -431,27 +441,32 @@ Variant Skeleton3DEditor::get_drag_data_fw(const Point2 &p_point, Control *p_fro bool Skeleton3DEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { TreeItem *target = joint_tree->get_item_at_position(p_point); - if (!target) + if (!target) { return false; + } const String path = target->get_metadata(0); - if (!path.begins_with("bones/")) + if (!path.begins_with("bones/")) { return false; + } TreeItem *selected = Object::cast_to<TreeItem>(Dictionary(p_data)["node"]); - if (target == selected) + if (target == selected) { return false; + } const String path2 = target->get_metadata(0); - if (!path2.begins_with("bones/")) + if (!path2.begins_with("bones/")) { return false; + } return true; } void Skeleton3DEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { - if (!can_drop_data_fw(p_point, p_data, p_from)) + if (!can_drop_data_fw(p_point, p_data, p_from)) { return; + } TreeItem *target = joint_tree->get_item_at_position(p_point); TreeItem *selected = Object::cast_to<TreeItem>(Dictionary(p_data)["node"]); @@ -500,6 +515,8 @@ void Skeleton3DEditor::_joint_tree_selection_changed() { rest_editor->set_target(bone_path + "rest"); custom_pose_editor->set_target(bone_path + "custom_pose"); + _update_properties(); + pose_editor->set_visible(true); rest_editor->set_visible(true); custom_pose_editor->set_visible(true); @@ -510,19 +527,23 @@ void Skeleton3DEditor::_joint_tree_rmb_select(const Vector2 &p_pos) { } void Skeleton3DEditor::_update_properties() { - if (rest_editor) + if (rest_editor) { rest_editor->_update_properties(); - if (pose_editor) + } + if (pose_editor) { pose_editor->_update_properties(); - if (custom_pose_editor) + } + if (custom_pose_editor) { custom_pose_editor->_update_custom_pose_properties(); + } } void Skeleton3DEditor::update_joint_tree() { joint_tree->clear(); - if (skeleton == nullptr) + if (skeleton == nullptr) { return; + } TreeItem *root = joint_tree->create_item(); diff --git a/editor/plugins/texture_layered_editor_plugin.cpp b/editor/plugins/texture_layered_editor_plugin.cpp index 265d4ccc1e..89ed98d53e 100644 --- a/editor/plugins/texture_layered_editor_plugin.cpp +++ b/editor/plugins/texture_layered_editor_plugin.cpp @@ -35,6 +35,8 @@ #include "editor/editor_settings.h" void TextureLayeredEditor::_gui_input(Ref<InputEvent> p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventMouseMotion> mm = p_event; if (mm.is_valid() && mm->get_button_mask() & MOUSE_BUTTON_MASK_LEFT) { y_rot += -mm->get_relative().x * 0.01; diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index 69bdc05b3a..80ce0623bb 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -384,6 +384,20 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) { port_offset += 2; } + if (is_resizable) { + Ref<VisualShaderNodeComment> comment_node = Object::cast_to<VisualShaderNodeComment>(vsnode.ptr()); + if (comment_node.is_valid()) { + node->set_comment(true); + + Label *comment_label = memnew(Label); + node->add_child(comment_label); + comment_label->set_h_size_flags(Control::SIZE_EXPAND_FILL); + comment_label->set_v_size_flags(Control::SIZE_EXPAND_FILL); + comment_label->set_mouse_filter(Control::MouseFilter::MOUSE_FILTER_STOP); + comment_label->set_text(comment_node->get_description()); + } + } + Ref<VisualShaderNodeUniform> uniform = vsnode; if (uniform.is_valid()) { VisualShaderEditor::get_singleton()->graph->add_child(node); @@ -1119,16 +1133,24 @@ void VisualShaderEditor::_update_options_menu() { } void VisualShaderEditor::_set_mode(int p_which) { - if (p_which == VisualShader::MODE_PARTICLES) { + if (p_which == VisualShader::MODE_SKY) { + edit_type_standart->set_visible(false); + edit_type_particles->set_visible(false); + edit_type_sky->set_visible(true); + edit_type = edit_type_sky; + mode = MODE_FLAGS_SKY; + } else if (p_which == VisualShader::MODE_PARTICLES) { edit_type_standart->set_visible(false); edit_type_particles->set_visible(true); + edit_type_sky->set_visible(false); edit_type = edit_type_particles; - particles_mode = true; + mode = MODE_FLAGS_PARTICLES; } else { edit_type_particles->set_visible(false); edit_type_standart->set_visible(true); + edit_type_sky->set_visible(false); edit_type = edit_type_standart; - particles_mode = false; + mode = MODE_FLAGS_SPATIAL_CANVASITEM; } visual_shader->set_shader_type(get_current_shader_type()); } @@ -1289,8 +1311,10 @@ void VisualShaderEditor::_update_graph() { VisualShader::Type VisualShaderEditor::get_current_shader_type() const { VisualShader::Type type; - if (particles_mode) { + if (mode & MODE_FLAGS_PARTICLES) { type = VisualShader::Type(edit_type->get_selected() + 3); + } else if (mode & MODE_FLAGS_SKY) { + type = VisualShader::Type(edit_type->get_selected() + 6); } else { type = VisualShader::Type(edit_type->get_selected()); } @@ -1624,6 +1648,92 @@ void VisualShaderEditor::_preview_select_port(int p_node, int p_port) { undo_redo->commit_action(); } +void VisualShaderEditor::_comment_title_popup_show(const Point2 &p_position, int p_node_id) { + VisualShader::Type type = get_current_shader_type(); + Ref<VisualShaderNodeComment> node = visual_shader->get_node(type, p_node_id); + if (node.is_null()) { + return; + } + comment_title_change_edit->set_text(node->get_title()); + comment_title_change_popup->set_meta("id", p_node_id); + comment_title_change_popup->popup(); + comment_title_change_popup->set_position(p_position); +} + +void VisualShaderEditor::_comment_title_text_changed(const String &p_new_text) { + comment_title_change_edit->set_size(Size2(-1, -1)); + comment_title_change_popup->set_size(Size2(-1, -1)); +} + +void VisualShaderEditor::_comment_title_text_entered(const String &p_new_text) { + comment_title_change_popup->hide(); +} + +void VisualShaderEditor::_comment_title_popup_focus_out() { + comment_title_change_popup->hide(); +} + +void VisualShaderEditor::_comment_title_popup_hide() { + ERR_FAIL_COND(!comment_title_change_popup->has_meta("id")); + int node_id = (int)comment_title_change_popup->get_meta("id"); + + VisualShader::Type type = get_current_shader_type(); + Ref<VisualShaderNodeComment> node = visual_shader->get_node(type, node_id); + + ERR_FAIL_COND(node.is_null()); + + if (node->get_title() == comment_title_change_edit->get_text()) { + return; // nothing changed - ignored + } + undo_redo->create_action(TTR("Set Comment Node Title")); + undo_redo->add_do_method(node.ptr(), "set_title", comment_title_change_edit->get_text()); + undo_redo->add_undo_method(node.ptr(), "set_title", node->get_title()); + undo_redo->add_do_method(graph_plugin.ptr(), "update_node", (int)type, node_id); + undo_redo->add_undo_method(graph_plugin.ptr(), "update_node", (int)type, node_id); + undo_redo->commit_action(); +} + +void VisualShaderEditor::_comment_desc_popup_show(const Point2 &p_position, int p_node_id) { + VisualShader::Type type = get_current_shader_type(); + Ref<VisualShaderNodeComment> node = visual_shader->get_node(type, p_node_id); + if (node.is_null()) { + return; + } + comment_desc_change_edit->set_text(node->get_description()); + comment_desc_change_popup->set_meta("id", p_node_id); + comment_desc_change_popup->popup(); + comment_desc_change_popup->set_position(p_position); +} + +void VisualShaderEditor::_comment_desc_text_changed() { + comment_desc_change_edit->set_size(Size2(-1, -1)); + comment_desc_change_popup->set_size(Size2(-1, -1)); +} + +void VisualShaderEditor::_comment_desc_confirm() { + comment_desc_change_popup->hide(); +} + +void VisualShaderEditor::_comment_desc_popup_hide() { + ERR_FAIL_COND(!comment_desc_change_popup->has_meta("id")); + int node_id = (int)comment_desc_change_popup->get_meta("id"); + + VisualShader::Type type = get_current_shader_type(); + Ref<VisualShaderNodeComment> node = visual_shader->get_node(type, node_id); + + ERR_FAIL_COND(node.is_null()); + + if (node->get_description() == comment_desc_change_edit->get_text()) { + return; // nothing changed - ignored + } + undo_redo->create_action(TTR("Set Comment Node Description")); + undo_redo->add_do_method(node.ptr(), "set_description", comment_desc_change_edit->get_text()); + undo_redo->add_undo_method(node.ptr(), "set_description", node->get_title()); + undo_redo->add_do_method(graph_plugin.ptr(), "update_node", (int)type, node_id); + undo_redo->add_undo_method(graph_plugin.ptr(), "update_node", (int)type, node_id); + undo_redo->commit_action(); +} + void VisualShaderEditor::_uniform_line_edit_changed(const String &p_text, int p_node_id) { VisualShader::Type type = get_current_shader_type(); @@ -2507,6 +2617,7 @@ void VisualShaderEditor::_graph_gui_input(const Ref<InputEvent> &p_event) { if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MOUSE_BUTTON_RIGHT) { selected_constants.clear(); selected_uniforms.clear(); + selected_comment = -1; List<int> to_change; for (int i = 0; i < graph->get_child_count(); i++) { @@ -2517,17 +2628,27 @@ void VisualShaderEditor::_graph_gui_input(const Ref<InputEvent> &p_event) { to_change.push_back(id); Ref<VisualShaderNode> node = visual_shader->get_node(type, id); - VisualShaderNodeConstant *cnode = Object::cast_to<VisualShaderNodeConstant>(node.ptr()); - if (cnode != nullptr) { + + VisualShaderNodeComment *comment_node = Object::cast_to<VisualShaderNodeComment>(node.ptr()); + if (comment_node != nullptr) { + selected_comment = id; + } + VisualShaderNodeConstant *constant_node = Object::cast_to<VisualShaderNodeConstant>(node.ptr()); + if (constant_node != nullptr) { selected_constants.insert(id); } - VisualShaderNodeUniform *unode = Object::cast_to<VisualShaderNodeUniform>(node.ptr()); - if (unode != nullptr) { + VisualShaderNodeUniform *uniform_node = Object::cast_to<VisualShaderNodeUniform>(node.ptr()); + if (uniform_node != nullptr && uniform_node->is_convertible_to_constant()) { selected_uniforms.insert(id); } } } } + + if (to_change.size() > 1) { + selected_comment = -1; + } + if (to_change.is_empty() && copy_nodes_buffer.is_empty()) { _show_members_dialog(true); } else { @@ -2548,16 +2669,34 @@ void VisualShaderEditor::_graph_gui_input(const Ref<InputEvent> &p_event) { if (temp != -1) { popup_menu->remove_item(temp); } + temp = popup_menu->get_item_index(NodeMenuOptions::SEPARATOR3); + if (temp != -1) { + popup_menu->remove_item(temp); + } + temp = popup_menu->get_item_index(NodeMenuOptions::SET_COMMENT_TITLE); + if (temp != -1) { + popup_menu->remove_item(temp); + } + temp = popup_menu->get_item_index(NodeMenuOptions::SET_COMMENT_DESCRIPTION); + if (temp != -1) { + popup_menu->remove_item(temp); + } - if (selected_constants.size() > 0 || selected_uniforms.size() > 0) { + if (selected_comment != -1) { popup_menu->add_separator("", NodeMenuOptions::SEPARATOR2); + popup_menu->add_item(TTR("Set Comment Title"), NodeMenuOptions::SET_COMMENT_TITLE); + popup_menu->add_item(TTR("Set Comment Description"), NodeMenuOptions::SET_COMMENT_DESCRIPTION); + } + + if (selected_constants.size() > 0 || selected_uniforms.size() > 0) { + popup_menu->add_separator("", NodeMenuOptions::SEPARATOR3); if (selected_constants.size() > 0) { popup_menu->add_item(TTR("Convert Constant(s) to Uniform(s)"), NodeMenuOptions::CONVERT_CONSTANTS_TO_UNIFORMS); } if (selected_uniforms.size() > 0) { - popup_menu->add_item(TTR("Convert Uniforms(s) to Constant(s)"), NodeMenuOptions::CONVERT_UNIFORMS_TO_CONSTANTS); + popup_menu->add_item(TTR("Convert Uniform(s) to Constant(s)"), NodeMenuOptions::CONVERT_UNIFORMS_TO_CONSTANTS); } } @@ -2896,7 +3035,14 @@ void VisualShaderEditor::_paste_nodes(bool p_use_custom_position, const Vector2 } void VisualShaderEditor::_mode_selected(int p_id) { - visual_shader->set_shader_type(particles_mode ? VisualShader::Type(p_id + 3) : VisualShader::Type(p_id)); + int offset = 0; + if (mode & MODE_FLAGS_PARTICLES) { + offset = 3; + } else if (mode & MODE_FLAGS_SKY) { + offset = 6; + } + + visual_shader->set_shader_type(VisualShader::Type(p_id + offset)); _update_options_menu(); _update_graph(); } @@ -3111,6 +3257,12 @@ void VisualShaderEditor::_node_menu_id_pressed(int p_idx) { case NodeMenuOptions::CONVERT_UNIFORMS_TO_CONSTANTS: _convert_constants_to_uniforms(true); break; + case NodeMenuOptions::SET_COMMENT_TITLE: + _comment_title_popup_show(get_global_mouse_position(), selected_comment); + break; + case NodeMenuOptions::SET_COMMENT_DESCRIPTION: + _comment_desc_popup_show(get_global_mouse_position(), selected_comment); + break; default: break; } @@ -3263,7 +3415,7 @@ void VisualShaderEditor::_update_preview() { ShaderLanguage sl; - Error err = sl.compile(code, ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(visual_shader->get_mode())), ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(visual_shader->get_mode())), ShaderTypes::get_singleton()->get_types(), _get_global_variable_type); + Error err = sl.compile(code, ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(visual_shader->get_mode())), ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(visual_shader->get_mode())), ShaderLanguage::VaryingFunctionNames(), ShaderTypes::get_singleton()->get_types(), _get_global_variable_type); for (int i = 0; i < preview_text->get_line_count(); i++) { preview_text->set_line_as_marked(i, false); @@ -3396,10 +3548,17 @@ VisualShaderEditor::VisualShaderEditor() { edit_type_particles->select(0); edit_type_particles->connect("item_selected", callable_mp(this, &VisualShaderEditor::_mode_selected)); + edit_type_sky = memnew(OptionButton); + edit_type_sky->add_item(TTR("Sky")); + edit_type_sky->select(0); + edit_type_sky->connect("item_selected", callable_mp(this, &VisualShaderEditor::_mode_selected)); + edit_type = edit_type_standart; graph->get_zoom_hbox()->add_child(edit_type_particles); graph->get_zoom_hbox()->move_child(edit_type_particles, 0); + graph->get_zoom_hbox()->add_child(edit_type_sky); + graph->get_zoom_hbox()->move_child(edit_type_sky, 0); graph->get_zoom_hbox()->add_child(edit_type_standart); graph->get_zoom_hbox()->move_child(edit_type_standart, 0); @@ -3534,6 +3693,35 @@ VisualShaderEditor::VisualShaderEditor() { alert->get_label()->set_custom_minimum_size(Size2(400, 60) * EDSCALE); add_child(alert); + comment_title_change_popup = memnew(PopupPanel); + comment_title_change_edit = memnew(LineEdit); + comment_title_change_edit->set_expand_to_text_length(true); + comment_title_change_edit->connect("text_changed", callable_mp(this, &VisualShaderEditor::_comment_title_text_changed)); + comment_title_change_edit->connect("text_entered", callable_mp(this, &VisualShaderEditor::_comment_title_text_entered)); + comment_title_change_popup->add_child(comment_title_change_edit); + comment_title_change_edit->set_size(Size2(-1, -1)); + comment_title_change_popup->set_size(Size2(-1, -1)); + comment_title_change_popup->connect("focus_exited", callable_mp(this, &VisualShaderEditor::_comment_title_popup_focus_out)); + comment_title_change_popup->connect("popup_hide", callable_mp(this, &VisualShaderEditor::_comment_title_popup_hide)); + add_child(comment_title_change_popup); + + comment_desc_change_popup = memnew(PopupPanel); + VBoxContainer *comment_desc_vbox = memnew(VBoxContainer); + comment_desc_change_popup->add_child(comment_desc_vbox); + comment_desc_change_edit = memnew(TextEdit); + comment_desc_change_edit->connect("text_changed", callable_mp(this, &VisualShaderEditor::_comment_desc_text_changed)); + comment_desc_vbox->add_child(comment_desc_change_edit); + comment_desc_change_edit->set_custom_minimum_size(Size2(300 * EDSCALE, 150 * EDSCALE)); + comment_desc_change_edit->set_size(Size2(-1, -1)); + comment_desc_change_popup->set_size(Size2(-1, -1)); + comment_desc_change_popup->connect("focus_exited", callable_mp(this, &VisualShaderEditor::_comment_desc_confirm)); + comment_desc_change_popup->connect("popup_hide", callable_mp(this, &VisualShaderEditor::_comment_desc_popup_hide)); + Button *comment_desc_confirm_button = memnew(Button); + comment_desc_confirm_button->set_text(TTR("OK")); + comment_desc_vbox->add_child(comment_desc_confirm_button); + comment_desc_confirm_button->connect("pressed", callable_mp(this, &VisualShaderEditor::_comment_desc_confirm)); + add_child(comment_desc_change_popup); + /////////////////////////////////////// // SHADER NODES TREE OPTIONS /////////////////////////////////////// @@ -3618,6 +3806,7 @@ VisualShaderEditor::VisualShaderEditor() { const String input_param_for_vertex_and_fragment_shader_modes = TTR("'%s' input parameter for vertex and fragment shader modes."); const String input_param_for_fragment_and_light_shader_modes = TTR("'%s' input parameter for fragment and light shader modes."); const String input_param_for_fragment_shader_mode = TTR("'%s' input parameter for fragment shader mode."); + const String input_param_for_sky_shader_mode = TTR("'%s' input parameter for sky shader mode."); const String input_param_for_light_shader_mode = TTR("'%s' input parameter for light shader mode."); const String input_param_for_vertex_shader_mode = TTR("'%s' input parameter for vertex shader mode."); const String input_param_for_emit_shader_mode = TTR("'%s' input parameter for emit shader mode."); @@ -3747,35 +3936,35 @@ VisualShaderEditor::VisualShaderEditor() { // SKY INPUTS - add_options.push_back(AddOption("AtCubeMapPass", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "at_cubemap_pass"), "at_cubemap_pass", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("AtHalfResPass", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "at_half_res_pass"), "at_half_res_pass", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("AtQuarterResPass", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "at_quarter_res_pass"), "at_quarter_res_pass", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("EyeDir", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "eyedir"), "eyedir", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("HalfResColor", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "half_res_color"), "half_res_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("HalfResAlpha", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "half_res_alpha"), "half_res_alpha", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light0Color", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light0_color"), "light0_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light0Direction", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light0_direction"), "light0_direction", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light0Enabled", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light0_enabled"), "light0_enabled", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light0Energy", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light0_energy"), "light0_energy", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light1Color", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light1_color"), "light1_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light1Direction", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light1_direction"), "light1_direction", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light1Enabled", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light1_enabled"), "light1_enabled", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light1Energy", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light1_energy"), "light1_energy", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light2Color", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light2_color"), "light2_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light2Direction", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light2_direction"), "light2_direction", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light2Enabled", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light2_enabled"), "light2_enabled", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light2Energy", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light2_energy"), "light2_energy", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light3Color", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light3_color"), "light3_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light3Direction", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light3_direction"), "light3_direction", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light3Enabled", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light3_enabled"), "light3_enabled", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Light3Energy", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "light3_energy"), "light3_energy", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Position", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "position"), "position", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("QuarterResColor", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "quarter_res_color"), "quarter_res_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("QuarterResAlpha", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "quarter_res_alpha"), "quarter_res_alpha", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Radiance", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "radiance"), "radiance", VisualShaderNode::PORT_TYPE_SAMPLER, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("ScreenUV", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "screen_uv"), "screen_uv", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("SkyCoords", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "sky_coords"), "sky_coords", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); - add_options.push_back(AddOption("Time", "Input", "Fragment", "VisualShaderNodeInput", vformat(input_param_for_fragment_shader_mode, "time"), "time", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_FRAGMENT, Shader::MODE_SKY)); + add_options.push_back(AddOption("AtCubeMapPass", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "at_cubemap_pass"), "at_cubemap_pass", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("AtHalfResPass", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "at_half_res_pass"), "at_half_res_pass", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("AtQuarterResPass", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "at_quarter_res_pass"), "at_quarter_res_pass", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("EyeDir", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "eyedir"), "eyedir", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("HalfResColor", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "half_res_color"), "half_res_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("HalfResAlpha", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "half_res_alpha"), "half_res_alpha", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light0Color", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light0_color"), "light0_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light0Direction", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light0_direction"), "light0_direction", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light0Enabled", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light0_enabled"), "light0_enabled", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light0Energy", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light0_energy"), "light0_energy", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light1Color", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light1_color"), "light1_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light1Direction", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light1_direction"), "light1_direction", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light1Enabled", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light1_enabled"), "light1_enabled", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light1Energy", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light1_energy"), "light1_energy", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light2Color", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light2_color"), "light2_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light2Direction", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light2_direction"), "light2_direction", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light2Enabled", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light2_enabled"), "light2_enabled", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light2Energy", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light2_energy"), "light2_energy", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light3Color", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light3_color"), "light3_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light3Direction", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light3_direction"), "light3_direction", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light3Enabled", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light3_enabled"), "light3_enabled", VisualShaderNode::PORT_TYPE_BOOLEAN, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Light3Energy", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "light3_energy"), "light3_energy", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Position", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "position"), "position", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("QuarterResColor", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "quarter_res_color"), "quarter_res_color", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("QuarterResAlpha", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "quarter_res_alpha"), "quarter_res_alpha", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Radiance", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "radiance"), "radiance", VisualShaderNode::PORT_TYPE_SAMPLER, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("ScreenUV", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "screen_uv"), "screen_uv", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("SkyCoords", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "sky_coords"), "sky_coords", VisualShaderNode::PORT_TYPE_VECTOR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); + add_options.push_back(AddOption("Time", "Input", "Sky", "VisualShaderNodeInput", vformat(input_param_for_sky_shader_mode, "time"), "time", VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_SKY, Shader::MODE_SKY)); // SCALAR @@ -3971,6 +4160,7 @@ VisualShaderEditor::VisualShaderEditor() { // SPECIAL + add_options.push_back(AddOption("Comment", "Special", "", "VisualShaderNodeComment", TTR("A rectangular area with a description string for better graph organization."))); add_options.push_back(AddOption("Expression", "Special", "", "VisualShaderNodeExpression", TTR("Custom Godot Shader Language expression, with custom amount of input and output ports. This is a direct injection of code into the vertex/fragment/light function, do not use it to write the function declarations inside."))); add_options.push_back(AddOption("Fresnel", "Special", "", "VisualShaderNodeFresnel", TTR("Returns falloff based on the dot product of surface normal and view direction of camera (pass associated inputs to it)."), -1, VisualShaderNode::PORT_TYPE_SCALAR)); add_options.push_back(AddOption("GlobalExpression", "Special", "", "VisualShaderNodeGlobalExpression", TTR("Custom Godot Shader Language expression, which is placed on top of the resulted shader. You can place various function definitions inside and call it later in the Expressions. You can also declare varyings, uniforms and constants."))); diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h index 182bed6ba6..6d57d38cab 100644 --- a/editor/plugins/visual_shader_editor_plugin.h +++ b/editor/plugins/visual_shader_editor_plugin.h @@ -67,7 +67,7 @@ private: VisualShader::Type type = VisualShader::Type::TYPE_MAX; VisualShaderNode *visual_node = nullptr; GraphNode *graph_node = nullptr; - bool preview_visible = 0; + bool preview_visible = false; int preview_pos = 0; Map<int, InputPort> input_ports; Map<int, Port> output_ports; @@ -141,6 +141,7 @@ class VisualShaderEditor : public VBoxContainer { OptionButton *edit_type = nullptr; OptionButton *edit_type_standart; OptionButton *edit_type_particles; + OptionButton *edit_type_sky; PanelContainer *error_panel; Label *error_label; @@ -161,9 +162,22 @@ class VisualShaderEditor : public VBoxContainer { PopupMenu *popup_menu; MenuButton *tools; + PopupPanel *comment_title_change_popup = nullptr; + LineEdit *comment_title_change_edit = nullptr; + + PopupPanel *comment_desc_change_popup = nullptr; + TextEdit *comment_desc_change_edit = nullptr; + bool preview_first = true; bool preview_showed = false; - bool particles_mode; + + enum ShaderModeFlags { + MODE_FLAGS_SPATIAL_CANVASITEM = 1, + MODE_FLAGS_SKY = 2, + MODE_FLAGS_PARTICLES = 4 + }; + + int mode = MODE_FLAGS_SPATIAL_CANVASITEM; enum TypeFlags { TYPE_FLAGS_VERTEX = 1, @@ -177,6 +191,10 @@ class VisualShaderEditor : public VBoxContainer { TYPE_FLAGS_END = 4 }; + enum SkyTypeFlags { + TYPE_FLAGS_SKY = 1, + }; + enum ToolsMenuOptions { EXPAND_ALL, COLLAPSE_ALL @@ -192,6 +210,9 @@ class VisualShaderEditor : public VBoxContainer { SEPARATOR2, // ignore CONVERT_CONSTANTS_TO_UNIFORMS, CONVERT_UNIFORMS_TO_CONSTANTS, + SEPARATOR3, // ignore + SET_COMMENT_TITLE, + SET_COMMENT_DESCRIPTION, }; Tree *members; @@ -325,6 +346,7 @@ class VisualShaderEditor : public VBoxContainer { Set<int> selected_constants; Set<int> selected_uniforms; + int selected_comment = -1; void _convert_constants_to_uniforms(bool p_vice_versa); void _replace_node(VisualShader::Type p_type_id, int p_node_id, const StringName &p_from, const StringName &p_to); @@ -334,6 +356,17 @@ class VisualShaderEditor : public VBoxContainer { void _connection_to_empty(const String &p_from, int p_from_slot, const Vector2 &p_release_position); void _connection_from_empty(const String &p_to, int p_to_slot, const Vector2 &p_release_position); + void _comment_title_popup_show(const Point2 &p_position, int p_node_id); + void _comment_title_popup_hide(); + void _comment_title_popup_focus_out(); + void _comment_title_text_changed(const String &p_new_text); + void _comment_title_text_entered(const String &p_new_text); + + void _comment_desc_popup_show(const Point2 &p_position, int p_node_id); + void _comment_desc_popup_hide(); + void _comment_desc_confirm(); + void _comment_desc_text_changed(); + void _uniform_line_edit_changed(const String &p_text, int p_node_id); void _uniform_line_edit_focus_out(Object *line_edit, int p_node_id); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index eda9499783..e51e8ee82e 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -296,7 +296,7 @@ private: String sp = _test_path(); if (sp != "") { // If the project name is empty or default, infer the project name from the selected folder name - if (project_name->get_text() == "" || project_name->get_text() == TTR("New Game Project")) { + if (project_name->get_text().strip_edges() == "" || project_name->get_text().strip_edges() == TTR("New Game Project")) { sp = sp.replace("\\", "/"); int lidx = sp.rfind("/"); @@ -380,16 +380,17 @@ private: } void _create_folder() { - if (project_name->get_text() == "" || created_folder_path != "" || project_name->get_text().ends_with(".") || project_name->get_text().ends_with(" ")) { - set_message(TTR("Invalid Project Name."), MESSAGE_WARNING); + const String project_name_no_edges = project_name->get_text().strip_edges(); + if (project_name_no_edges == "" || created_folder_path != "" || project_name_no_edges.ends_with(".")) { + set_message(TTR("Invalid project name."), MESSAGE_WARNING); return; } DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); if (d->change_dir(project_path->get_text()) == OK) { - if (!d->dir_exists(project_name->get_text())) { - if (d->make_dir(project_name->get_text()) == OK) { - d->change_dir(project_name->get_text()); + if (!d->dir_exists(project_name_no_edges)) { + if (d->make_dir(project_name_no_edges) == OK) { + d->change_dir(project_name_no_edges); String dir_str = d->get_current_dir(); project_path->set_text(dir_str); _path_text_changed(dir_str); @@ -415,7 +416,7 @@ private: _test_path(); - if (p_text == "") { + if (p_text.strip_edges() == "") { set_message(TTR("It would be a good idea to name your project."), MESSAGE_ERROR); } } @@ -442,7 +443,7 @@ private: set_message(vformat(TTR("Couldn't load project.godot in project path (error %d). It may be missing or corrupted."), err), MESSAGE_ERROR); } else { ProjectSettings::CustomMap edited_settings; - edited_settings["application/config/name"] = project_name->get_text(); + edited_settings["application/config/name"] = project_name->get_text().strip_edges(); if (current->save_custom(dir2.plus_file("project.godot"), edited_settings, Vector<String>(), true) != OK) { set_message(TTR("Couldn't edit project.godot in project path."), MESSAGE_ERROR); @@ -483,7 +484,7 @@ private: initial_settings["rendering/textures/vram_compression/import_etc2"] = false; initial_settings["rendering/textures/vram_compression/import_etc"] = true; } - initial_settings["application/config/name"] = project_name->get_text(); + initial_settings["application/config/name"] = project_name->get_text().strip_edges(); initial_settings["application/config/icon"] = "res://icon.png"; initial_settings["rendering/environment/defaults/default_environment"] = "res://default_env.tres"; @@ -1031,7 +1032,7 @@ public: int get_project_count() const; void select_project(int p_index); void select_first_visible_project(); - void erase_selected_projects(); + void erase_selected_projects(bool p_delete_project_contents); Vector<Item> get_selected_projects() const; const Set<String> &get_selected_project_keys() const; void ensure_project_visible(int p_index); @@ -1686,7 +1687,7 @@ void ProjectList::toggle_select(int p_index) { item.control->update(); } -void ProjectList::erase_selected_projects() { +void ProjectList::erase_selected_projects(bool p_delete_project_contents) { if (_selected_project_keys.size() == 0) { return; } @@ -1697,6 +1698,10 @@ void ProjectList::erase_selected_projects() { EditorSettings::get_singleton()->erase("projects/" + item.project_key); EditorSettings::get_singleton()->erase("favorite_projects/" + item.project_key); + if (p_delete_project_contents) { + OS::get_singleton()->move_to_trash(item.path); + } + memdelete(item.control); _projects.remove(i); --i; @@ -1847,6 +1852,9 @@ void ProjectManager::_notification(int p_what) { case NOTIFICATION_WM_CLOSE_REQUEST: { _dim_window(); } break; + case NOTIFICATION_WM_ABOUT: { + _show_about(); + } break; } } @@ -1882,6 +1890,8 @@ void ProjectManager::_update_project_buttons() { } void ProjectManager::_unhandled_key_input(const Ref<InputEvent> &p_ev) { + ERR_FAIL_COND(p_ev.is_null()); + Ref<InputEventKey> k = p_ev; if (k.is_valid()) { @@ -2215,7 +2225,7 @@ void ProjectManager::_rename_project() { } void ProjectManager::_erase_project_confirm() { - _project_list->erase_selected_projects(); + _project_list->erase_selected_projects(delete_project_contents->is_pressed()); _update_project_buttons(); } @@ -2233,12 +2243,13 @@ void ProjectManager::_erase_project() { String confirm_message; if (selected_list.size() >= 2) { - confirm_message = vformat(TTR("Remove %d projects from the list?\nThe project folders' contents won't be modified."), selected_list.size()); + confirm_message = vformat(TTR("Remove %d projects from the list?"), selected_list.size()); } else { - confirm_message = TTR("Remove this project from the list?\nThe project folder's contents won't be modified."); + confirm_message = TTR("Remove this project from the list?"); } - erase_ask->set_text(confirm_message); + erase_ask_label->set_text(confirm_message); + delete_project_contents->set_pressed(false); erase_ask->popup_centered(); } @@ -2247,6 +2258,10 @@ void ProjectManager::_erase_missing_projects() { erase_missing_ask->popup_centered(); } +void ProjectManager::_show_about() { + about->popup_centered(Size2(780, 500) * EDSCALE); +} + void ProjectManager::_language_selected(int p_id) { String lang = language_btn->get_item_metadata(p_id); EditorSettings::get_singleton()->set("interface/editor/editor_language", lang); @@ -2331,6 +2346,17 @@ void ProjectManager::_on_order_option_changed(int p_idx) { } } +void ProjectManager::_on_tab_changed(int p_tab) { + if (p_tab == 0) { // Projects + // Automatically grab focus when the user moves from the Templates tab + // back to the Projects tab. + search_box->grab_focus(); + } + + // The Templates tab's search field is focused on display in the asset + // library editor plugin code. +} + void ProjectManager::_on_search_term_changed(const String &p_term) { _project_list->set_search_term(p_term); _project_list->sort_projects(); @@ -2425,12 +2451,7 @@ ProjectManager::ProjectManager() { } // TRANSLATORS: This refers to the application where users manage their Godot projects. - if (TS->is_locale_right_to_left(TranslationServer::get_singleton()->get_tool_locale())) { - // For RTL languages, embed translated part of the title (using control characters) to ensure correct order. - DisplayServer::get_singleton()->window_set_title(VERSION_NAME + String(" - ") + String::chr(0x202B) + TTR("Project Manager") + String::chr(0x202C) + String::chr(0x200E) + " - " + String::chr(0xA9) + " 2007-2021 Juan Linietsky, Ariel Manzur & Godot Contributors"); - } else { - DisplayServer::get_singleton()->window_set_title(VERSION_NAME + String(" - ") + TTR("Project Manager") + " - " + String::chr(0xA9) + " 2007-2021 Juan Linietsky, Ariel Manzur & Godot Contributors"); - } + DisplayServer::get_singleton()->window_set_title(VERSION_NAME + String(" - ") + TTR("Project Manager")); FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("filesystem/file_dialog/show_hidden_files")); @@ -2456,6 +2477,7 @@ ProjectManager::ProjectManager() { center_box->add_child(tabs); tabs->set_anchors_and_offsets_preset(Control::PRESET_WIDE); tabs->set_tab_align(TabContainer::ALIGN_LEFT); + tabs->connect("tab_changed", callable_mp(this, &ProjectManager::_on_tab_changed)); HBoxContainer *projects_hb = memnew(HBoxContainer); projects_hb->set_name(TTR("Projects")); @@ -2472,8 +2494,8 @@ ProjectManager::ProjectManager() { search_tree_vb->add_child(hb); search_box = memnew(LineEdit); - search_box->set_placeholder(TTR("Search")); - search_box->set_tooltip(TTR("The search box filters projects by name and last path component.\nTo filter projects by name and full path, the query must contain at least one `/` character.")); + search_box->set_placeholder(TTR("Filter projects")); + search_box->set_tooltip(TTR("This field filters projects by name and last path component.\nTo filter projects by name and full path, the query must contain at least one `/` character.")); search_box->connect("text_changed", callable_mp(this, &ProjectManager::_on_search_term_changed)); search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); hb->add_child(search_box); @@ -2563,6 +2585,13 @@ ProjectManager::ProjectManager() { erase_missing_btn->set_text(TTR("Remove Missing")); erase_missing_btn->connect("pressed", callable_mp(this, &ProjectManager::_erase_missing_projects)); tree_vb->add_child(erase_missing_btn); + + tree_vb->add_spacer(); + + about_btn = memnew(Button); + about_btn->set_text(TTR("About")); + about_btn->connect("pressed", callable_mp(this, &ProjectManager::_show_about)); + tree_vb->add_child(about_btn); } { @@ -2651,6 +2680,16 @@ ProjectManager::ProjectManager() { erase_ask->get_ok_button()->connect("pressed", callable_mp(this, &ProjectManager::_erase_project_confirm)); add_child(erase_ask); + VBoxContainer *erase_ask_vb = memnew(VBoxContainer); + erase_ask->add_child(erase_ask_vb); + + erase_ask_label = memnew(Label); + erase_ask_vb->add_child(erase_ask_label); + + delete_project_contents = memnew(CheckBox); + delete_project_contents->set_text(TTR("Also delete project contents (no undo!)")); + erase_ask_vb->add_child(delete_project_contents); + multi_open_ask = memnew(ConfirmationDialog); multi_open_ask->get_ok_button()->set_text(TTR("Edit")); multi_open_ask->get_ok_button()->connect("pressed", callable_mp(this, &ProjectManager::_open_selected_projects)); @@ -2686,6 +2725,9 @@ ProjectManager::ProjectManager() { open_templates->get_ok_button()->set_text(TTR("Open Asset Library")); open_templates->connect("confirmed", callable_mp(this, &ProjectManager::_open_asset_library)); add_child(open_templates); + + about = memnew(EditorAbout); + add_child(about); } _load_recent_projects(); diff --git a/editor/project_manager.h b/editor/project_manager.h index 6dc0e67cba..a66b7c4ab6 100644 --- a/editor/project_manager.h +++ b/editor/project_manager.h @@ -31,6 +31,7 @@ #ifndef PROJECT_MANAGER_H #define PROJECT_MANAGER_H +#include "editor/editor_about.h" #include "editor/plugins/asset_library_editor_plugin.h" #include "scene/gui/dialogs.h" #include "scene/gui/file_dialog.h" @@ -62,18 +63,24 @@ class ProjectManager : public Control { Button *rename_btn; Button *erase_btn; Button *erase_missing_btn; + Button *about_btn; EditorAssetLibrary *asset_library; FileDialog *scan_dir; ConfirmationDialog *language_restart_ask; + ConfirmationDialog *erase_ask; + Label *erase_ask_label; + CheckBox *delete_project_contents; + ConfirmationDialog *erase_missing_ask; ConfirmationDialog *multi_open_ask; ConfirmationDialog *multi_run_ask; ConfirmationDialog *multi_scan_ask; ConfirmationDialog *ask_update_settings; ConfirmationDialog *open_templates; + EditorAbout *about; HBoxContainer *settings_hb; @@ -96,6 +103,7 @@ class ProjectManager : public Control { void _erase_missing_projects(); void _erase_project_confirm(); void _erase_missing_projects_confirm(); + void _show_about(); void _update_project_buttons(); void _language_selected(int p_id); void _restart_confirm(); @@ -116,6 +124,7 @@ class ProjectManager : public Control { void _files_dropped(PackedStringArray p_files, int p_screen); void _on_order_option_changed(int p_idx); + void _on_tab_changed(int p_tab); void _on_search_term_changed(const String &p_term); protected: diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 0a4f432e4a..1a010b9168 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -832,6 +832,9 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: } else if (default_color_mode == 2) { color_picker->set_raw_mode(true); } + + int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape"); + color_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape); } color_picker->show(); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index f1dd40dfb1..a6d1a118b8 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -61,6 +61,8 @@ void SceneTreeDock::_quick_open() { } void SceneTreeDock::_input(Ref<InputEvent> p_event) { + ERR_FAIL_COND(p_event.is_null()); + Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == MOUSE_BUTTON_LEFT) { @@ -69,6 +71,8 @@ void SceneTreeDock::_input(Ref<InputEvent> p_event) { } void SceneTreeDock::_unhandled_key_input(Ref<InputEvent> p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (get_focus_owner() && get_focus_owner()->is_text_field()) { return; } @@ -3095,6 +3099,7 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel edit_remote->set_h_size_flags(SIZE_EXPAND_FILL); edit_remote->set_text(TTR("Remote")); edit_remote->set_toggle_mode(true); + edit_remote->set_tooltip(TTR("If selected, the Remote scene tree dock will cause the project to stutter every time it updates.\nSwitch back to the Local scene tree dock to improve performance.")); edit_remote->connect("pressed", callable_mp(this, &SceneTreeDock::_remote_tree_selected)); edit_local = memnew(Button); diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index b5e9aec854..ec37fa53b3 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -120,7 +120,7 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i } undo_redo->commit_action(); } else if (p_id == BUTTON_WARNING) { - String config_err = n->get_configuration_warning(); + String config_err = n->get_configuration_warnings_as_string(); if (config_err == String()) { return; } @@ -252,9 +252,9 @@ bool SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent, bool p_scroll if (can_rename) { //should be can edit.. - String warning = p_node->get_configuration_warning(); + String warning = p_node->get_configuration_warnings_as_string(); if (!warning.is_empty()) { - item->add_button(0, get_theme_icon("NodeWarning", "EditorIcons"), BUTTON_WARNING, false, TTR("Node configuration warning:") + "\n" + p_node->get_configuration_warning()); + item->add_button(0, get_theme_icon("NodeWarning", "EditorIcons"), BUTTON_WARNING, false, TTR("Node configuration warning:") + "\n" + warning); } int num_connections = p_node->get_persistent_signal_connection_count(); diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index b707f6c353..288cc2db48 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -238,6 +238,14 @@ String ScriptCreateDialog::_validate_path(const String &p_path, bool p_file_must return ""; } +String ScriptCreateDialog::_get_class_name() const { + if (has_named_classes) { + return class_name->get_text(); + } else { + return ProjectSettings::get_singleton()->localize_path(file_path->get_text()).get_file().get_basename(); + } +} + void ScriptCreateDialog::_class_name_changed(const String &p_name) { if (_validate_class(class_name->get_text())) { is_class_name_valid = true; @@ -287,13 +295,7 @@ void ScriptCreateDialog::ok_pressed() { } void ScriptCreateDialog::_create_new() { - String cname_param; - - if (has_named_classes) { - cname_param = class_name->get_text(); - } else { - cname_param = ProjectSettings::get_singleton()->localize_path(file_path->get_text()).get_file().get_basename(); - } + String cname_param = _get_class_name(); Ref<Script> scr; if (script_template != "") { @@ -687,6 +689,10 @@ void ScriptCreateDialog::_update_dialog() { builtin_warning_label->set_visible(is_built_in); + // Check if the script name is the same as the parent class. + // This warning isn't relevant if the script is built-in. + script_name_warning_label->set_visible(!is_built_in && _get_class_name() == parent_name->get_text()); + if (is_built_in) { get_ok_button()->set_text(TTR("Create")); parent_name->set_editable(true); @@ -768,6 +774,14 @@ ScriptCreateDialog::ScriptCreateDialog() { builtin_warning_label->set_autowrap(true); builtin_warning_label->hide(); + script_name_warning_label = memnew(Label); + script_name_warning_label->set_text( + TTR("Warning: Having the script name be the same as a built-in type is usually not desired.")); + vb->add_child(script_name_warning_label); + script_name_warning_label->add_theme_color_override("font_color", Color(1, 0.85, 0.4)); + script_name_warning_label->set_autowrap(true); + script_name_warning_label->hide(); + status_panel = memnew(PanelContainer); status_panel->set_h_size_flags(Control::SIZE_FILL); status_panel->add_child(vb); diff --git a/editor/script_create_dialog.h b/editor/script_create_dialog.h index e898b6f927..d6417b9d33 100644 --- a/editor/script_create_dialog.h +++ b/editor/script_create_dialog.h @@ -50,6 +50,7 @@ class ScriptCreateDialog : public ConfirmationDialog { Label *error_label; Label *path_error_label; Label *builtin_warning_label; + Label *script_name_warning_label; PanelContainer *status_panel; LineEdit *parent_name; Button *parent_browse_button; @@ -110,6 +111,7 @@ class ScriptCreateDialog : public ConfirmationDialog { bool _validate_parent(const String &p_string); bool _validate_class(const String &p_string); String _validate_path(const String &p_path, bool p_file_must_exist); + String _get_class_name() const; void _class_name_changed(const String &p_name); void _parent_name_changed(const String &p_parent); void _template_changed(int p_template = 0); diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 3852c389c7..81af4996ed 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -139,6 +139,8 @@ void EditorSettingsDialog::_notification(int p_what) { } void EditorSettingsDialog::_unhandled_input(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + const Ref<InputEventKey> k = p_event; if (k.is_valid() && k->is_pressed()) { @@ -391,9 +393,10 @@ void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column TreeItem *ti = Object::cast_to<TreeItem>(p_item); ERR_FAIL_COND(!ti); + button_idx = p_idx; + if (ti->get_metadata(0) == "Common") { // Editing a Built-in action, which can have multiple bindings. - button_idx = p_idx; editing_action = true; current_action = ti->get_text(0); diff --git a/editor/translations/af.po b/editor/translations/af.po index cfee3af954..a60466f417 100644 --- a/editor/translations/af.po +++ b/editor/translations/af.po @@ -6,12 +6,13 @@ # Julius Stopforth <jjstopforth@gmail.com>, 2018. # Isa Tippens <isatippens2@gmail.com>, 2019. # Henry Geyser <thegoat187@gmail.com>, 2020. +# Henry LeRoux <henry.leroux@ocsbstudent.ca>, 2021. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-12-01 20:29+0000\n" -"Last-Translator: Henry Geyser <thegoat187@gmail.com>\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" +"Last-Translator: Henry LeRoux <henry.leroux@ocsbstudent.ca>\n" "Language-Team: Afrikaans <https://hosted.weblate.org/projects/godot-engine/" "godot/af/>\n" "Language: af\n" @@ -19,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 4.4-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -216,14 +217,12 @@ msgid "Animation Playback Track" msgstr "" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Animation length (frames)" -msgstr "Animasie lengte (in sekondes)." +msgstr "Animasie lengte (in rame)." #: editor/animation_track_editor.cpp -#, fuzzy msgid "Animation length (seconds)" -msgstr "Animasie lengte (in sekondes)." +msgstr "Animasie lengte (in sekondes)" #: editor/animation_track_editor.cpp #, fuzzy diff --git a/editor/translations/cs.po b/editor/translations/cs.po index bc20742d40..17e44a4863 100644 --- a/editor/translations/cs.po +++ b/editor/translations/cs.po @@ -19,17 +19,18 @@ # Emil Jiřà Tywoniak <emil.tywoniak@gmail.com>, 2020, 2021. # Filip Vincůrek <vincurek.f@gmail.com>, 2020. # Ondrej Pavelka <ondrej.pavelka@outlook.com>, 2020. -# ZbynÄ›k <zbynek.fiala@gmail.com>, 2020. +# ZbynÄ›k <zbynek.fiala@gmail.com>, 2020, 2021. # Daniel KřÞ <Daniel.kriz@protonmail.com>, 2020. # VladimirBlazek <vblazek042@gmail.com>, 2020. # kubajz22 <til.jakubesko@seznam.cz>, 2020. # Václav Blažej <vaclavblazej@seznam.cz>, 2020, 2021. +# ProfJack <profjackcz@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-08 15:33+0000\n" -"Last-Translator: Václav Blažej <vaclavblazej@seznam.cz>\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" +"Last-Translator: ProfJack <profjackcz@gmail.com>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/godot-engine/godot/" "cs/>\n" "Language: cs\n" @@ -37,7 +38,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 4.5.1\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -354,7 +355,7 @@ msgstr "ZmÄ›nit režim interpolace animace" #: editor/animation_track_editor.cpp msgid "Change Animation Loop Mode" -msgstr "ZmÄ›nit režim smyÄky animace" +msgstr "ZmÄ›nit mód smyÄky animace" #: editor/animation_track_editor.cpp msgid "Remove Anim Track" @@ -3677,6 +3678,7 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"Importovánà tohoto souboru bylo zakázáno, takže jej nelze otevÅ™Ãt pro úpravy." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4067,23 +4069,20 @@ msgid "Saving..." msgstr "UkládánÃ..." #: editor/import_defaults_editor.cpp -#, fuzzy msgid "Select Importer" -msgstr "Režim výbÄ›ru" +msgstr "Vybrat Importér" #: editor/import_defaults_editor.cpp -#, fuzzy msgid "Importer:" -msgstr "Import" +msgstr "Importér:" #: editor/import_defaults_editor.cpp -#, fuzzy msgid "Reset to Defaults" -msgstr "NaÄÃst výchozÃ" +msgstr "Obnovit výchozÃ" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Zachovat soubor (bez importu)" #: editor/import_dock.cpp msgid "%d Files" @@ -5092,11 +5091,11 @@ msgstr "Stahovánà tohoto assetu právÄ› probÃhá!" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Recently Updated" -msgstr "Naposledy upravené" +msgstr "Nedávno aktualizované" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Least Recently Updated" -msgstr "Naposledy neupravené" +msgstr "Dlouho neaktualizované" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Name (A-Z)" @@ -5184,7 +5183,7 @@ msgid "" "Can't determine a save path for lightmap images.\n" "Save your scene and try again." msgstr "" -"Nelze urÄit cestu uloženà pro svÄ›telnou mapu obrázku.\n" +"Nelze urÄit cestu pro uloženà obrázků svÄ›telné mapy.\n" "Uložte scénu (obrázky se uložà do stejného adresáře) nebo vyberte cestu pro " "uloženà z vlastnosti BakedLightmap." @@ -7349,9 +7348,8 @@ msgid "Yaw" msgstr "Náklon" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Size" -msgstr "Velikost: " +msgstr "Velikost" #: editor/plugins/spatial_editor_plugin.cpp msgid "Objects Drawn" @@ -10399,7 +10397,6 @@ msgid "Plugins" msgstr "Pluginy" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Import Defaults" msgstr "NaÄÃst výchozÃ" @@ -10651,9 +10648,8 @@ msgid "Instance Child Scene" msgstr "PÅ™idat instanci scény" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Can't paste root node into the same scene." -msgstr "Nelze manipulovat s uzly z cizà scény!" +msgstr "Nelze vložit koÅ™enový uzel do stejné scény." #: editor/scene_tree_dock.cpp msgid "Paste Node(s)" @@ -11621,7 +11617,7 @@ msgstr "Následné zpracovánÃ" #: modules/lightmapper_cpu/lightmapper_cpu.cpp #, fuzzy msgid "Plotting lightmaps" -msgstr "Vykreslenà svÄ›tel:" +msgstr "Vykreslovánà svÄ›telných map" #: modules/mono/csharp_script.cpp msgid "Class name can't be a reserved keyword" @@ -12436,11 +12432,11 @@ msgstr "Prázdný CollisionPolygon2D nemá pÅ™i kolizi žádný efekt." #: scene/2d/collision_polygon_2d.cpp msgid "Invalid polygon. At least 3 points are needed in 'Solids' build mode." -msgstr "" +msgstr "Chybný polygon. Alespoň 3 body jsou potÅ™eba v 'Solids' build módu." #: scene/2d/collision_polygon_2d.cpp msgid "Invalid polygon. At least 2 points are needed in 'Segments' build mode." -msgstr "" +msgstr "Chybný polygon. Alespoň 2 body jsou potÅ™eba v 'Segments' build módu." #: scene/2d/collision_shape_2d.cpp msgid "" @@ -13059,6 +13055,8 @@ msgid "" "The sampler port is connected but not used. Consider changing the source to " "'SamplerPort'." msgstr "" +"Sampler port je pÅ™ipojen, ale nenà použitý. Zvažte zmÄ›nu zdroje na " +"'SamplerPort'." #: scene/resources/visual_shader_nodes.cpp msgid "Invalid source for preview." diff --git a/editor/translations/de.po b/editor/translations/de.po index 4521c7fdbc..f70522a365 100644 --- a/editor/translations/de.po +++ b/editor/translations/de.po @@ -71,7 +71,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-09 04:13+0000\n" +"PO-Revision-Date: 2021-03-31 03:53+0000\n" "Last-Translator: So Wieso <sowieso@dukun.de>\n" "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/" "godot/de/>\n" @@ -80,7 +80,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 4.5.1\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -3761,6 +3761,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"Für diese Datei wurde die Import-Funktion deaktiviert, sie kann folglich " +"nicht zum Bearbeiten geöffnet werden." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4166,7 +4168,7 @@ msgstr "Auf Standardwerte zurücksetzen" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Datei behalten (kein Import)" #: editor/import_dock.cpp msgid "%d Files" diff --git a/editor/translations/es.po b/editor/translations/es.po index 78a2edd4ce..7fc20c2f14 100644 --- a/editor/translations/es.po +++ b/editor/translations/es.po @@ -63,7 +63,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-10 22:14+0000\n" +"PO-Revision-Date: 2021-03-31 03:53+0000\n" "Last-Translator: Javier Ocampos <xavier.ocampos@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/" "godot/es/>\n" @@ -72,7 +72,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 4.5.2-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -211,7 +211,7 @@ msgstr "Cambiar Transformación de la Animación" #: editor/animation_track_editor.cpp msgid "Anim Change Keyframe Value" -msgstr "Cambiar Valor de la Clave de Animación" +msgstr "Cambiar Valor de Fotogramas Clave de Animación" #: editor/animation_track_editor.cpp msgid "Anim Change Call" @@ -219,7 +219,7 @@ msgstr "Cambiar Llamada de Animación" #: editor/animation_track_editor.cpp msgid "Anim Multi Change Keyframe Time" -msgstr "Cambiar Tiempo de Múltiples Keyframes de Animación" +msgstr "Cambiar Tiempo de Múltiples Fotogramas Clave de Animación" #: editor/animation_track_editor.cpp msgid "Anim Multi Change Transition" @@ -231,7 +231,7 @@ msgstr "Cambiar Múltiples Transforms de Animación" #: editor/animation_track_editor.cpp msgid "Anim Multi Change Keyframe Value" -msgstr "Cambiar Valor de Múltiples Keyframes de Animación" +msgstr "Cambiar Valor de Múltiples Fotogramas Clave de Animación" #: editor/animation_track_editor.cpp msgid "Anim Multi Change Call" @@ -272,7 +272,7 @@ msgstr "Pista de Reproducción de Animación" #: editor/animation_track_editor.cpp msgid "Animation length (frames)" -msgstr "Duración de la animación (frames)" +msgstr "Duración de la animación (fotogramas)" #: editor/animation_track_editor.cpp msgid "Animation length (seconds)" @@ -3314,7 +3314,7 @@ msgstr "Medida:" #: editor/editor_profiler.cpp msgid "Frame Time (sec)" -msgstr "Duración de Frame (seg)" +msgstr "Duración de Fotogramas (seg)" #: editor/editor_profiler.cpp msgid "Average Time (sec)" @@ -3322,11 +3322,11 @@ msgstr "Tiempo Promedio (seg)" #: editor/editor_profiler.cpp msgid "Frame %" -msgstr "Frame %" +msgstr "Fotograma %" #: editor/editor_profiler.cpp msgid "Physics Frame %" -msgstr "Frames de FÃsica %" +msgstr "Fotogramas de FÃsica %" #: editor/editor_profiler.cpp msgid "Inclusive" @@ -3338,7 +3338,7 @@ msgstr "Propio" #: editor/editor_profiler.cpp msgid "Frame #:" -msgstr "Frame #:" +msgstr "Fotograma #:" #: editor/editor_profiler.cpp msgid "Time" @@ -3759,6 +3759,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"Se ha desactivado la importación de este archivo, por lo que no se puede " +"abrir para editarlo." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4163,7 +4165,7 @@ msgstr "Restablecer Valores por Defecto" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Mantener Archivo (No Importar)" #: editor/import_dock.cpp msgid "%d Files" @@ -5805,7 +5807,7 @@ msgstr "Centrar Selección" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Frame Selection" -msgstr "Encuadrar Selección" +msgstr "Seleccionar Fotogramas" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Preview Canvas Scale" @@ -7954,15 +7956,15 @@ msgstr "Configuración:" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "No Frames Selected" -msgstr "No hay Frames Seleccionados" +msgstr "No hay Fotogramas Seleccionados" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Add %d Frame(s)" -msgstr "Añadir %d Frame(s)" +msgstr "Añadir %d Fotograma(s)" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Add Frame" -msgstr "Añadir Frame" +msgstr "Añadir Fotograma" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Unable to load images" @@ -7970,7 +7972,7 @@ msgstr "No se pueden cargar las imágenes" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "ERROR: Couldn't load frame resource!" -msgstr "ERROR: ¡No se pudo cargar el recurso de frames!" +msgstr "ERROR: ¡No se pudo cargar el recurso de fotogramas!" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Resource clipboard is empty or not a texture!" @@ -7978,7 +7980,7 @@ msgstr "¡El portapapeles de recursos esta vacÃo o no es una textura!" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Paste Frame" -msgstr "Pegar Frame" +msgstr "Pegar Fotograma" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Add Empty" @@ -7994,7 +7996,7 @@ msgstr "(vacÃo)" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Move Frame" -msgstr "Mover Frame" +msgstr "Mover Fotograma" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Animations:" @@ -8014,7 +8016,7 @@ msgstr "Loop" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Animation Frames:" -msgstr "Frames de Animación:" +msgstr "Fotogramas de Animación:" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Add a Texture from File" @@ -8022,7 +8024,7 @@ msgstr "Añadir Textura desde Archivo" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Add Frames from a Sprite Sheet" -msgstr "Añadir Frames desde un Sprite Sheet" +msgstr "Añadir Fotogramas desde un Sprite Sheet" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Insert Empty (Before)" @@ -8042,7 +8044,7 @@ msgstr "Mover (Después)" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Select Frames" -msgstr "Seleccionar Frames" +msgstr "Seleccionar Fotogramas" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Horizontal:" @@ -8054,11 +8056,11 @@ msgstr "Vertical:" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Select/Clear All Frames" -msgstr "Seleccionar/Limpiar Todos los Frames" +msgstr "Seleccionar/Limpiar Todos los Fotogramas" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Create Frames from Sprite Sheet" -msgstr "Crear Frames a partir de Sprite Sheet" +msgstr "Crear Fotogramas a partir de un Sprite Sheet" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "SpriteFrames" @@ -11333,7 +11335,7 @@ msgstr "Inspeccionar Instancia Siguiente" #: editor/script_editor_debugger.cpp msgid "Stack Frames" -msgstr "Frames del Stack" +msgstr "Fotogramas Apilados" #: editor/script_editor_debugger.cpp msgid "Profiler" @@ -12570,7 +12572,7 @@ msgid "" "order for AnimatedSprite to display frames." msgstr "" "Se debe crear o establecer un recurso SpriteFrames en la propiedad \"Frames" -"\" para que AnimatedSprite pueda mostrar frames." +"\" para que AnimatedSprite pueda mostrar los fotogramas." #: scene/2d/canvas_modulate.cpp msgid "" @@ -13055,7 +13057,7 @@ msgid "" "order for AnimatedSprite3D to display frames." msgstr "" "Se debe crear o establecer un recurso SpriteFrames en la propiedad \"Frames" -"\" para que AnimatedSprite3D pueda mostrar frames." +"\" para que AnimatedSprite3D pueda mostrar los fotogramas." #: scene/3d/vehicle_body.cpp msgid "" diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po index c628655b4d..ef65c1d220 100644 --- a/editor/translations/es_AR.po +++ b/editor/translations/es_AR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-09 04:13+0000\n" +"PO-Revision-Date: 2021-03-31 03:53+0000\n" "Last-Translator: Lisandro Lorea <lisandrolorea@gmail.com>\n" "Language-Team: Spanish (Argentina) <https://hosted.weblate.org/projects/" "godot-engine/godot/es_AR/>\n" @@ -30,7 +30,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 4.5.1\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -3711,6 +3711,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"Se ha desactivado la importación de este archivo, por lo que no se puede " +"abrir para editarlo." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4114,7 +4116,7 @@ msgstr "Restablecer Valores Por Defecto" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Mantener Archivo (No Importar)" #: editor/import_dock.cpp msgid "%d Files" diff --git a/editor/translations/fi.po b/editor/translations/fi.po index 19959ec1f0..c60ab24d1d 100644 --- a/editor/translations/fi.po +++ b/editor/translations/fi.po @@ -11,12 +11,13 @@ # Tapani Niemi <tapani.niemi@kapsi.fi>, 2018, 2019, 2020, 2021. # Tuomas Lähteenmäki <lahtis@gmail.com>, 2019. # Matti Niskanen <matti.t.niskanen@gmail.com>, 2020. +# Severi Vidnäs <severi.vidnas@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-10 22:14+0000\n" -"Last-Translator: Tapani Niemi <tapani.niemi@kapsi.fi>\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" +"Last-Translator: Severi Vidnäs <severi.vidnas@gmail.com>\n" "Language-Team: Finnish <https://hosted.weblate.org/projects/godot-engine/" "godot/fi/>\n" "Language: fi\n" @@ -24,7 +25,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 4.5.2-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1760,7 +1761,7 @@ msgstr "Uusi" #: editor/editor_feature_profile.cpp editor/editor_node.cpp #: editor/project_manager.cpp msgid "Import" -msgstr "Tuonti" +msgstr "Tuo" #: editor/editor_feature_profile.cpp editor/project_export.cpp msgid "Export" @@ -3669,6 +3670,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"Tuonti on poistettu käytöstä tälle tiedostolle, joten sitä ei voi avata " +"muokkausta varten." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4074,7 +4077,7 @@ msgstr "Palauta oletusarvoihin" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Pidä tiedosto (ei tuontia)" #: editor/import_dock.cpp msgid "%d Files" diff --git a/editor/translations/hu.po b/editor/translations/hu.po index cf758b874f..448c79c7f1 100644 --- a/editor/translations/hu.po +++ b/editor/translations/hu.po @@ -15,12 +15,13 @@ # thekeymethod <csokan.andras87@protonmail.ch>, 2020. # Czmorek Dávid <czmdav.soft@gmail.com>, 2020. # Újvári Marcell <mmarci72@gmail.com>, 2021. +# GergÅ‘ Pistai <gergopistai@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-01-22 10:21+0000\n" -"Last-Translator: Újvári Marcell <mmarci72@gmail.com>\n" +"PO-Revision-Date: 2021-03-31 03:53+0000\n" +"Last-Translator: GergÅ‘ Pistai <gergopistai@gmail.com>\n" "Language-Team: Hungarian <https://hosted.weblate.org/projects/godot-engine/" "godot/hu/>\n" "Language: hu\n" @@ -28,7 +29,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 4.5-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -673,15 +674,15 @@ msgstr "Összes/semmi kijelölése" #: editor/animation_track_editor_plugins.cpp msgid "Add Audio Track Clip" -msgstr "" +msgstr "Hangsávklip hozzáadása" #: editor/animation_track_editor_plugins.cpp msgid "Change Audio Track Clip Start Offset" -msgstr "" +msgstr "Hangsáv klip eltolt kezdési idejének módosÃtása" #: editor/animation_track_editor_plugins.cpp msgid "Change Audio Track Clip End Offset" -msgstr "" +msgstr "Hangsáv klip eltolt befejezési idejének módosÃtása" #: editor/array_property_edit.cpp msgid "Resize Array" @@ -732,9 +733,8 @@ msgid "Replace All" msgstr "Összes cseréje" #: editor/code_editor.cpp -#, fuzzy msgid "Selection Only" -msgstr "Csak a kijelölés" +msgstr "Csak kijelölés" #: editor/code_editor.cpp editor/plugins/script_text_editor.cpp #: editor/plugins/text_editor.cpp @@ -771,7 +771,7 @@ msgstr "Sor és oszlopszámok." #: editor/connections_dialog.cpp msgid "Method in target node must be specified." -msgstr "" +msgstr "Nevezze el a metódust a cél node-ban." #: editor/connections_dialog.cpp msgid "Method name must be a valid identifier." @@ -915,9 +915,8 @@ msgid "Signals" msgstr "Jelzések" #: editor/connections_dialog.cpp -#, fuzzy msgid "Filter signals" -msgstr "Csempék szűrése" +msgstr "Jelek szűrése" #: editor/connections_dialog.cpp msgid "Are you sure you want to remove all connections from this signal?" @@ -1045,14 +1044,14 @@ msgid "Owners Of:" msgstr "Tulajdonosai:" #: editor/dependency_editor.cpp -#, fuzzy msgid "" "Remove selected files from the project? (no undo)\n" "You can find the removed files in the system trash to restore them." -msgstr "EltávolÃtja a kiválasztott fájlokat a projektbÅ‘l? (nem visszavonható)" +msgstr "" +"EltávolÃtja a kiválasztott fájlokat a projektbÅ‘l? (nem visszavonható)\n" +"Az eltávolÃtott fájlokat a lomtárban találja, ha visszaállÃtaná Å‘ket." #: editor/dependency_editor.cpp -#, fuzzy msgid "" "The files being removed are required by other resources in order for them to " "work.\n" @@ -1060,7 +1059,8 @@ msgid "" "You can find the removed files in the system trash to restore them." msgstr "" "Az eltávolÃtandó fájlokat szükségelik más források a működésükhöz.\n" -"EltávolÃtja Å‘ket ennek ellenére? (nem visszavonható)" +"EltávolÃtja Å‘ket ennek ellenére? (nem visszavonható)\n" +"Az eltávolÃtott fájlokat a lomtárban találja, ha visszaállÃtaná Å‘ket." #: editor/dependency_editor.cpp msgid "Cannot remove:" @@ -1202,7 +1202,6 @@ msgid "Third-party Licenses" msgstr "Harmadik féltÅ‘l származó licencek" #: editor/editor_about.cpp -#, fuzzy msgid "" "Godot Engine relies on a number of third-party free and open source " "libraries, all compatible with the terms of its MIT license. The following " @@ -1591,12 +1590,16 @@ msgid "" "Target platform requires 'ETC' texture compression for GLES2. Enable 'Import " "Etc' in Project Settings." msgstr "" +"A célplatformnak 'ETC' textúra tömörÃtésre van szüksége GLES2-höz. " +"Engedélyezze az 'Import Etc' beállÃtást a Projekt BeállÃtásokban." #: editor/editor_export.cpp msgid "" "Target platform requires 'ETC2' texture compression for GLES3. Enable " "'Import Etc 2' in Project Settings." msgstr "" +"A célplatformnak 'ETC2' textúra tömörÃtésre van szüksége GLES3-höz. " +"Engedélyezze az 'Import Etc 2' beállÃtást a Projekt BeállÃtásokban." #: editor/editor_export.cpp msgid "" @@ -1605,18 +1608,27 @@ msgid "" "Enable 'Import Etc' in Project Settings, or disable 'Driver Fallback " "Enabled'." msgstr "" +"A célplatformnak 'ETC' textúra tömörÃtésre van szüksége a tartalék driverhez " +"GLES2-höz.\n" +"Engedélyezze az 'Import Etc' beállÃtást a Projekt BeállÃtásokban, vagy " +"kapcsolja ki a 'Driver Fallback Enabled' beállÃtást." #: editor/editor_export.cpp msgid "" "Target platform requires 'PVRTC' texture compression for GLES2. Enable " "'Import Pvrtc' in Project Settings." msgstr "" +"A célplatformnak 'PVRTC' textúra tömörÃtésre van szüksége GLES2-höz. " +"Engedélyezze az 'Import Pvrtc' beállÃtást a Projekt BeállÃtásokban." #: editor/editor_export.cpp msgid "" "Target platform requires 'ETC2' or 'PVRTC' texture compression for GLES3. " "Enable 'Import Etc 2' or 'Import Pvrtc' in Project Settings." msgstr "" +"A célplatformnak 'ETC2' vagy 'PVRTC' textúra tömörÃtésre van szüksége GLES3-" +"hoz. Engedélyezze az 'Import Etc 2' vagy 'Import Pvrtc' beállÃtást a Projekt " +"BeállÃtásokban." #: editor/editor_export.cpp msgid "" @@ -1625,6 +1637,9 @@ msgid "" "Enable 'Import Pvrtc' in Project Settings, or disable 'Driver Fallback " "Enabled'." msgstr "" +"A célplatformnak 'PVRTC' textúra tömörÃtésre van szüksége GLES2-höz.\n" +"Engedélyezze az 'Import Pvrtc' beállÃtást a Projekt BeállÃtásokban, vagy " +"kapcsolja ki a 'Driver Fallback Enabled' beállÃtást." #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp @@ -1644,7 +1659,7 @@ msgstr "Sablon fájl nem található:" #: editor/editor_export.cpp msgid "On 32-bit exports the embedded PCK cannot be bigger than 4 GiB." -msgstr "" +msgstr "32-bites exportokon a beágyazott PCK nem lehet nagyobb mint 4 GiB." #: editor/editor_feature_profile.cpp msgid "3D Editor" @@ -1664,12 +1679,11 @@ msgstr "Jelenetfa szerkesztése" #: editor/editor_feature_profile.cpp msgid "Node Dock" -msgstr "" +msgstr "Node dokk" #: editor/editor_feature_profile.cpp -#, fuzzy msgid "FileSystem Dock" -msgstr "Fájlrendszer" +msgstr "Fájlrendszer dokk" #: editor/editor_feature_profile.cpp msgid "Import Dock" @@ -1810,7 +1824,7 @@ msgstr "Válassza ezt a mappát" #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp msgid "Copy Path" -msgstr "Útvonal másolása" +msgstr "Útvonal Másolása" #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp msgid "Open in File Manager" @@ -1879,11 +1893,11 @@ msgstr "Ugrás Fel" #: editor/editor_file_dialog.cpp msgid "Toggle Hidden Files" -msgstr "" +msgstr "Rejtett fálok megjelenÃtése/elrejtése" #: editor/editor_file_dialog.cpp msgid "Toggle Favorite" -msgstr "" +msgstr "Kedvencek Mutatása/Elrejtése" #: editor/editor_file_dialog.cpp msgid "Toggle Mode" @@ -1891,7 +1905,7 @@ msgstr "Mód váltása" #: editor/editor_file_dialog.cpp msgid "Focus Path" -msgstr "" +msgstr "Elérési Út Fókuszálása" #: editor/editor_file_dialog.cpp msgid "Move Favorite Up" @@ -1926,7 +1940,6 @@ msgid "Toggle the visibility of hidden files." msgstr "A rejtett fájlok láthatóságának ki- és bekapcsolása." #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp -#, fuzzy msgid "View items as a grid of thumbnails." msgstr "Az elemek megtekintése bélyegkép-rácsként." @@ -2117,9 +2130,8 @@ msgid "Property:" msgstr "Tulajdonság:" #: editor/editor_inspector.cpp -#, fuzzy msgid "Set" -msgstr "BeállÃtás" +msgstr "BeállÃt" #: editor/editor_inspector.cpp msgid "Set Multiple:" @@ -2272,6 +2284,9 @@ msgid "" "This scene can't be saved because there is a cyclic instancing inclusion.\n" "Please resolve it and then attempt to save again." msgstr "" +"Ezt a jelenetet nem lehet elmenteni, mivel ciklikus peldányosÃtást " +"tartalmaz.\n" +"Kérem oldja meg a problémát, aztán próbáljon meg ismét menteni." #: editor/editor_node.cpp msgid "" @@ -2306,6 +2321,9 @@ msgid "" "An error occurred while trying to save the editor layout.\n" "Make sure the editor's user data path is writable." msgstr "" +"Hiba történt a szerkesztÅ‘ elrendezésének mentése közben.\n" +"Bizonyosodjon meg róla, hogy a szerkesztÅ‘ felhasználói elérési útján " +"engedélyezve van az Ãrás." #: editor/editor_node.cpp msgid "" @@ -2313,16 +2331,19 @@ msgid "" "To restore the Default layout to its base settings, use the Delete Layout " "option and delete the Default layout." msgstr "" +"Alapértelmezett szerkesztÅ‘ elrendezés felülÃrva.\n" +"Hogy visszaállÃtsa az alapértelmezett elrendezést az eredeti beállÃtásokra, " +"használja az Elrendezés Törlése opciót és törölje az alapértelmezett " +"elrendezést." #: editor/editor_node.cpp msgid "Layout name not found!" msgstr "Elrendezés neve nem található!" #: editor/editor_node.cpp -#, fuzzy msgid "Restored the Default layout to its base settings." msgstr "" -"Az alapértelmezett elrendezés vissza lett állÃtva az alap beállÃtásokra." +"Az alapértelmezett elrendezés vissza lett állÃtva az eredeti beállÃtásokra." #: editor/editor_node.cpp msgid "" @@ -2382,7 +2403,7 @@ msgstr "Nincs meghatározva Scene a futtatáshoz." #: editor/editor_node.cpp msgid "Save scene before running..." -msgstr "" +msgstr "Futtatás elÅ‘tt mentse a jelenetet..." #: editor/editor_node.cpp msgid "Could not start subprocess!" @@ -2390,23 +2411,23 @@ msgstr "Az alprocesszt nem lehetett elindÃtani!" #: editor/editor_node.cpp editor/filesystem_dock.cpp msgid "Open Scene" -msgstr "Scene megnyitás" +msgstr "Jelenet megnyitása" #: editor/editor_node.cpp msgid "Open Base Scene" -msgstr "Alap Scene megnyitás" +msgstr "Alap Jelenet Megnyitása" #: editor/editor_node.cpp msgid "Quick Open..." -msgstr "Gyors megnyitás..." +msgstr "Gyors Megnyitás..." #: editor/editor_node.cpp msgid "Quick Open Scene..." -msgstr "Jelenet gyors megnyitása..." +msgstr "Jelenet Gyors Megnyitása..." #: editor/editor_node.cpp msgid "Quick Open Script..." -msgstr "Szkript gyors megnyitás..." +msgstr "Szkript Gyors Megnyitás..." #: editor/editor_node.cpp msgid "Save & Close" @@ -2422,11 +2443,11 @@ msgstr "%s módosÃtott erÅ‘forrás mentve." #: editor/editor_node.cpp msgid "A root node is required to save the scene." -msgstr "" +msgstr "Egy gyökér node szükséges a jelenet mentéséhez." #: editor/editor_node.cpp msgid "Save Scene As..." -msgstr "Scene mentés másként..." +msgstr "Scene Mentése Másként..." #: editor/editor_node.cpp editor/scene_tree_dock.cpp msgid "This operation can't be done without a scene." @@ -2530,7 +2551,6 @@ msgstr "" "megbukott." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: '%s'." msgstr "" "Nem található szkript mezÅ‘ az addon pluginnak a következÅ‘ helyen: 'res://" @@ -2737,7 +2757,7 @@ msgstr "Legutóbbi Megnyitása" #: editor/editor_node.cpp msgid "Save Scene" -msgstr "Scene mentés" +msgstr "Jelenet Mentése" #: editor/editor_node.cpp msgid "Save All Scenes" @@ -2763,7 +2783,7 @@ msgstr "Visszavonás" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Redo" -msgstr "Mégis" +msgstr "Újra" #: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." @@ -2834,12 +2854,10 @@ msgid "" msgstr "" #: editor/editor_node.cpp -#, fuzzy msgid "Small Deploy with Network Filesystem" -msgstr "Kis TelepÃtés Hálózati FS-sel" +msgstr "Kis TelepÃtés Hálózati Fájlrendszerrel" #: editor/editor_node.cpp -#, fuzzy msgid "" "When this option is enabled, using one-click deploy for Android will only " "export an executable without the project data.\n" @@ -2860,52 +2878,46 @@ msgid "Visible Collision Shapes" msgstr "Látható Ãœtközési Alakzatok" #: editor/editor_node.cpp -#, fuzzy msgid "" "When this option is enabled, collision shapes and raycast nodes (for 2D and " "3D) will be visible in the running project." msgstr "" -"Az ütközési alakzatok és a fénysugárkövetÅ‘ Node-ok (mind 2D-hez és 3D-hez) " -"láthatóak lesznek a játék futásakor, ha ez az opció be van kapcsolva." +"Ha ez az opció be van kapcsolva, az ütközési alakzatok és a sugárkövetÅ‘ Node-" +"ok (mind 2D-hez és 3D-hez) láthatóak lesznek a játék futásakor." #: editor/editor_node.cpp msgid "Visible Navigation" msgstr "Látható Navigáció" #: editor/editor_node.cpp -#, fuzzy msgid "" "When this option is enabled, navigation meshes and polygons will be visible " "in the running project." msgstr "" -"A navigációs hálók és sokszögek láthatóak lesznek a játék futásakor, ha ez " -"az opció be van kapcsolva." +"Ha ez az opció be van kapcsolva, a navigációs hálók és sokszögek láthatóak " +"lesznek a játék futásakor." #: editor/editor_node.cpp -#, fuzzy msgid "Synchronize Scene Changes" -msgstr "Jelenet változtatások szinkronizálása" +msgstr "Jelenet Változások Szinkronizálása" #: editor/editor_node.cpp -#, fuzzy msgid "" "When this option is enabled, any changes made to the scene in the editor " "will be replicated in the running project.\n" "When used remotely on a device, this is more efficient when the network " "filesystem option is enabled." msgstr "" -"Ha ez a beállÃtás be van kapcsolva, bármilyen változtatás a jeleneten a " -"szerkesztÅ‘ben le lesz másolva a futó játékba.\n" -"Ha egy távoli eszközön használja, sokkal hatékonyabb a hálózati " -"fájlrendszerrel együtt." +"Ha ez a beállÃtás be van kapcsolva, bármely a jeleneten való változtatás a " +"szerkesztbÅ‘l, a futó projekre is alkalmazva lesz.\n" +"Távoli eszköz használatakor hatékonyabb, ha a hálózati fájlrendszer opció " +"engedélyezve van." #: editor/editor_node.cpp -#, fuzzy msgid "Synchronize Script Changes" msgstr "Szkript Változtatások Szinkronizálása" #: editor/editor_node.cpp -#, fuzzy msgid "" "When this option is enabled, any script that is saved will be reloaded in " "the running project.\n" @@ -2914,8 +2926,8 @@ msgid "" msgstr "" "Ha ez a beállÃtás be van kapcsolva, bármilyen szkript, amit elment, újra " "betöltÅ‘dik a futó játékba.\n" -"Ha egy távoli eszközön használja, sokkal hatékonyabb a hálózati " -"fájlrendszerrel együtt." +"Távoli eszköz használatakor hatékonyabb, ha a hálózati fájlrendszer opció " +"engedélyezve van." #: editor/editor_node.cpp editor/script_create_dialog.cpp msgid "Editor" @@ -2950,9 +2962,8 @@ msgid "Open Editor Data/Settings Folder" msgstr "SzerkesztÅ‘ adatok/beállÃtások mappa megnyitása" #: editor/editor_node.cpp -#, fuzzy msgid "Open Editor Data Folder" -msgstr "A szerkesztÅ‘ adatmappájának megnyitása" +msgstr "SzerkesztÅ‘ Adatmappájának Megnyitása" #: editor/editor_node.cpp msgid "Open Editor Settings Folder" @@ -2984,9 +2995,8 @@ msgid "Report a Bug" msgstr "Hiba bejelentése" #: editor/editor_node.cpp -#, fuzzy msgid "Send Docs Feedback" -msgstr "Visszajelzés a Dokumentumokról" +msgstr "Visszajelzé Küldése s A Dokumentumokról" #: editor/editor_node.cpp editor/plugins/asset_library_editor_plugin.cpp msgid "Community" @@ -3022,7 +3032,7 @@ msgstr "Szerkesztett Scene futtatása." #: editor/editor_node.cpp msgid "Play Scene" -msgstr "Scene futtatás" +msgstr "Scene Futtatása" #: editor/editor_node.cpp msgid "Play custom scene" @@ -3081,6 +3091,7 @@ msgstr "Nincs Mentés" #: editor/editor_node.cpp msgid "Android build template is missing, please install relevant templates." msgstr "" +"Hiányzó Android épÃtési-sablon, kérem telepÃtse az ide tartozó sablonokat." #: editor/editor_node.cpp msgid "Manage Templates" @@ -3104,6 +3115,10 @@ msgid "" "Remove the \"res://android/build\" directory manually before attempting this " "operation again." msgstr "" +"Az Android épÃtési-sablon már telepÃtve van a projektbe és nem lesz " +"felülÃrva.\n" +"TávolÃtsa el a(z) \"res://android/build\" könyvtárat manuálisan, mivelÅ‘tt " +"újra megkÃsérelné a műveletet." #: editor/editor_node.cpp msgid "Import Templates From ZIP File" @@ -3126,13 +3141,12 @@ msgid "Open & Run a Script" msgstr "Szkriptet Megnyit és Futtat" #: editor/editor_node.cpp -#, fuzzy msgid "" "The following files are newer on disk.\n" "What action should be taken?" msgstr "" "A alábbi fájlok újabbak a lemezen.\n" -"Mit szeretne lépni?:" +"Mit szeretne tenni?" #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp #: editor/plugins/shader_editor_plugin.cpp @@ -3154,7 +3168,7 @@ msgstr "Betöltési Hibák" #: editor/editor_node.cpp editor/plugins/tile_map_editor_plugin.cpp msgid "Select" -msgstr "Kiválaszt" +msgstr "Kiválasztás" #: editor/editor_node.cpp msgid "Open 2D Editor" @@ -3385,14 +3399,13 @@ msgid "Add Key/Value Pair" msgstr "Kulcs/érték pár hozzáadása" #: editor/editor_run_native.cpp -#, fuzzy msgid "" "No runnable export preset found for this platform.\n" "Please add a runnable preset in the Export menu or define an existing preset " "as runnable." msgstr "" "Nem található futtatható exportállomány ehhez a platformhoz.\n" -"Adjon hozzá egy futtatható exportállományt az export menüben." +"Kérem adjon hozzá egy futtatható exportállományt az export menüben." #: editor/editor_run_script.cpp msgid "Write your logic in the _run() method." @@ -3553,12 +3566,11 @@ msgid "Cannot remove temporary file:" msgstr "Az ideiglenes fájl nem távolÃtható el:" #: editor/export_template_manager.cpp -#, fuzzy msgid "" "Templates installation failed.\n" "The problematic templates archives can be found at '%s'." msgstr "" -"A sablonok telepÃtése nem sikerült.\n" +"A sablonok telepÃtése sikertelen.\n" "A problémás sablonok archÃvuma megtalálható a következÅ‘ helyen: '%s'." #: editor/export_template_manager.cpp @@ -3792,9 +3804,8 @@ msgid "Duplicate..." msgstr "MegkettÅ‘zés..." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Move to Trash" -msgstr "AutoLoad Ãthelyezése" +msgstr "Lomtárba Helyezés" #: editor/filesystem_dock.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Rename..." @@ -3903,19 +3914,16 @@ msgid "Searching..." msgstr "Keresés…" #: editor/find_in_files.cpp -#, fuzzy msgid "%d match in %d file." -msgstr "%d egyezés." +msgstr "%d egyezés %d fájlban." #: editor/find_in_files.cpp -#, fuzzy msgid "%d matches in %d file." -msgstr "%d egyezés." +msgstr "%d egyezés %d fájlban." #: editor/find_in_files.cpp -#, fuzzy msgid "%d matches in %d files." -msgstr "%d egyezés." +msgstr "%d egyezések %d fájlban." #: editor/groups_editor.cpp msgid "Add to Group" @@ -4053,19 +4061,16 @@ msgid "Saving..." msgstr "Mentés..." #: editor/import_defaults_editor.cpp -#, fuzzy msgid "Select Importer" -msgstr "Kiválasztó Mód" +msgstr "Importer Kiválasztása" #: editor/import_defaults_editor.cpp -#, fuzzy msgid "Importer:" -msgstr "Importálás" +msgstr "Importáló:" #: editor/import_defaults_editor.cpp -#, fuzzy msgid "Reset to Defaults" -msgstr "Alapértelmezett Betöltése" +msgstr "VisszaállÃtás Alapértelmezettre" #: editor/import_dock.cpp msgid "Keep File (No Import)" @@ -4105,7 +4110,6 @@ msgstr "" "Az importált fájl tÃpusának módosÃtásához a szerkesztÅ‘t újra kell indÃtani." #: editor/import_dock.cpp -#, fuzzy msgid "" "WARNING: Assets exist that use this resource, they may stop loading properly." msgstr "" @@ -4390,7 +4394,6 @@ msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp -#, fuzzy msgid "No triangles exist, so no blending can take place." msgstr "Nincsenek háromszögek, Ãgy nem történhet keverés." @@ -4820,7 +4823,7 @@ msgstr "Lejátszási mód:" #: editor/plugins/animation_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "AnimationTree" -msgstr "" +msgstr "AnimációFa" #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "New name:" @@ -5029,9 +5032,8 @@ msgid "Got:" msgstr "Kapott:" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Failed SHA-256 hash check" -msgstr "sha256 hash ellenÅ‘rzés megbukott" +msgstr "SHA-256 hash ellenÅ‘rzés megbukot" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Asset Download Error:" @@ -5209,7 +5211,7 @@ msgstr "Fény Besütése" #: editor/plugins/baked_lightmap_editor_plugin.cpp #, fuzzy msgid "Select lightmap bake file:" -msgstr "Válasszon sablonfájlt" +msgstr "Válasszon fénytérkép sablonfájlt:" #: editor/plugins/camera_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -5281,19 +5283,17 @@ msgid "Set CanvasItem \"%s\" Pivot Offset to (%d, %d)" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Rotate %d CanvasItems" -msgstr "CanvasItem forgatása" +msgstr "%d CanvasItem Forgatása" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Rotate CanvasItem \"%s\" to %d degrees" -msgstr "CanvasItem forgatása" +msgstr "\"%s\" CanvasItem Forgatása %d fokra" #: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy msgid "Move CanvasItem \"%s\" Anchor" -msgstr "CanvasItem áthelyezése" +msgstr "CanvasItem \"%s\" Horgony Mozgatása" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Scale Node2D \"%s\" to (%s, %s)" @@ -5304,24 +5304,20 @@ msgid "Resize Control \"%s\" to (%d, %d)" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Scale %d CanvasItems" -msgstr "CanvasItem méretezése" +msgstr "%d CanvasItem Méretezése" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Scale CanvasItem \"%s\" to (%s, %s)" -msgstr "CanvasItem méretezése" +msgstr "\"%s\" CanvasItem Méretezése (%s, %s)-ra/re" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Move %d CanvasItems" -msgstr "CanvasItem áthelyezése" +msgstr "%d CanvasItem Ãthelyezése" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Move CanvasItem \"%s\" to (%d, %d)" -msgstr "CanvasItem áthelyezése" +msgstr "%s CanvasItem mozgatása (%d, %d)-ra/re" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "" @@ -5400,9 +5396,8 @@ msgid "HCenter Wide" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Full Rect" -msgstr "Teljes téglalap" +msgstr "Teljes Téglalap" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Keep Ratio" @@ -5422,10 +5417,13 @@ msgstr "Horgonyok MódosÃtása" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy msgid "" "Game Camera Override\n" "Overrides game camera with editor viewport camera." msgstr "" +"Játék Kamera FelülÃrás.\n" +"FelülÃrja a játék kamerát szerkesztÅ‘i nézetablak kamerával." #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -5516,12 +5514,12 @@ msgstr "Alt + Jobb Egérgomb: Mélységi lista választás" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp msgid "Move Mode" -msgstr "" +msgstr "Mozgató Mód" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp msgid "Rotate Mode" -msgstr "Forgató mód" +msgstr "Forgató Mód" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -5864,7 +5862,6 @@ msgid "Emission Colors" msgstr "Kibocsátási szÃnek" #: editor/plugins/cpu_particles_editor_plugin.cpp -#, fuzzy msgid "CPUParticles" msgstr "CPU-részecskék" @@ -5879,7 +5876,6 @@ msgid "Create Emission Points From Node" msgstr "Kibocsátási pontok létrehozása a Node alapján" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Flat 0" msgstr "Lapos 0" @@ -5928,9 +5924,8 @@ msgid "Right Linear" msgstr "Jobb lineáris" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Load Preset" -msgstr "ElÅ‘re beállÃtott betöltése" +msgstr "BeállÃtás Betöltése" #: editor/plugins/curve_editor_plugin.cpp msgid "Remove Curve Point" @@ -6271,7 +6266,6 @@ msgstr "Navigációs Sokszög Létrehozása" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp -#, fuzzy msgid "Convert to CPUParticles" msgstr "Konvertálás CPU-részecskékké" @@ -6288,9 +6282,8 @@ msgid "Can only set point into a ParticlesMaterial process material" msgstr "Csak egy ParticlesMaterial feldolgozó anyagba állÃthat pontot" #: editor/plugins/particles_2d_editor_plugin.cpp -#, fuzzy msgid "Convert to CPUParticles2D" -msgstr "Konvertálás CPU-részecskékké" +msgstr "Konvertálás CPUParticles2D-re" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp @@ -6575,18 +6568,16 @@ msgid "Move Points" msgstr "Pontok mozgatása" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Command: Rotate" -msgstr "Húzás: Forgatás" +msgstr "Command: Forgatás" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Shift: Move All" msgstr "Shift: Mind Mozgatása" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Shift+Command: Scale" -msgstr "Shift + Ctrl: Skálázás" +msgstr "Shif+Command: Méretezés" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Ctrl: Rotate" @@ -6631,14 +6622,12 @@ msgid "Radius:" msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Copy Polygon to UV" -msgstr "Sokszög és UV létrehozása" +msgstr "Sokszög UV-ba másolása" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Copy UV to Polygon" -msgstr "Csontok szinkronizálása a sokszöggel" +msgstr "UV Másolása Sokszögbe" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Clear UV" @@ -6685,9 +6674,8 @@ msgid "Grid Step Y:" msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Sync Bones to Polygon" -msgstr "Csontok szinkronizálása a sokszöggel" +msgstr "Csontok Szinkronizálása Sokszögre" #: editor/plugins/resource_preloader_editor_plugin.cpp msgid "ERROR: Couldn't load resource!" @@ -6847,7 +6835,6 @@ msgid "Filter scripts" msgstr "Szkriptek szűrése" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Toggle alphabetical sorting of the method list." msgstr "Ãbécészerinti rendezés változtatása a metóduslistában." @@ -7121,7 +7108,7 @@ msgstr "Ãtváltás Megjegyzésre" #: editor/plugins/script_text_editor.cpp msgid "Fold/Unfold Line" -msgstr "Sor Összezárása / Kibontása" +msgstr "Sor Összezárása/Kibontása" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" @@ -7141,7 +7128,7 @@ msgstr "Szimbólum Befejezése" #: editor/plugins/script_text_editor.cpp msgid "Evaluate Selection" -msgstr "" +msgstr "Kijelölés Kiértékelése" #: editor/plugins/script_text_editor.cpp msgid "Trim Trailing Whitespace" @@ -7231,7 +7218,6 @@ msgid "Set Rest Pose to Bones" msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp -#, fuzzy msgid "Skeleton2D" msgstr "Csontváz2D" @@ -7261,27 +7247,27 @@ msgstr "" #: editor/plugins/spatial_editor_plugin.cpp msgid "Orthogonal" -msgstr "" +msgstr "Ortogonális" #: editor/plugins/spatial_editor_plugin.cpp msgid "Perspective" -msgstr "" +msgstr "PerspektÃva" #: editor/plugins/spatial_editor_plugin.cpp msgid "Transform Aborted." -msgstr "" +msgstr "ÃtalakÃtás MegszakÃtva." #: editor/plugins/spatial_editor_plugin.cpp msgid "X-Axis Transform." -msgstr "" +msgstr "X-Tengely Transzformáció." #: editor/plugins/spatial_editor_plugin.cpp msgid "Y-Axis Transform." -msgstr "" +msgstr "Y-tengely Transzformáció." #: editor/plugins/spatial_editor_plugin.cpp msgid "Z-Axis Transform." -msgstr "Z-Tengely transzformáció" +msgstr "Z-Tengely Transzformáció." #: editor/plugins/spatial_editor_plugin.cpp msgid "View Plane Transform." @@ -7316,9 +7302,8 @@ msgid "Yaw" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Size" -msgstr "Méret: " +msgstr "Méret" #: editor/plugins/spatial_editor_plugin.cpp msgid "Objects Drawn" @@ -7572,7 +7557,7 @@ msgstr "" #: editor/plugins/spatial_editor_plugin.cpp msgid "Insert Animation Key" -msgstr "" +msgstr "Animációs Kulcs Beszúrása" #: editor/plugins/spatial_editor_plugin.cpp msgid "Focus Origin" @@ -7861,9 +7846,8 @@ msgid "Loop" msgstr "Ciklus" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Animation Frames:" -msgstr "Animációs képkockák:" +msgstr "Animációs Képkockák:" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Add a Texture from File" @@ -7918,9 +7902,8 @@ msgid "Set Region Rect" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp -#, fuzzy msgid "Set Margin" -msgstr "Margó beállÃtása" +msgstr "Margó BeállÃtása" #: editor/plugins/texture_region_editor_plugin.cpp msgid "Snap Mode:" @@ -8044,12 +8027,10 @@ msgid "Submenu" msgstr "" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Subitem 1" msgstr "Alelem 1" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Subitem 2" msgstr "Alelem 2" @@ -8125,7 +8106,7 @@ msgstr "Érvénytelen csempék javÃtása" #: editor/plugins/tile_map_editor_plugin.cpp #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Cut Selection" -msgstr "Kijelölés kivágása" +msgstr "Kijelölés Kivágása" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Paint TileMap" @@ -8153,16 +8134,15 @@ msgstr "Csempe keresése" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Transpose" -msgstr "" +msgstr "Transzpozálás" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Disable Autotile" msgstr "" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Enable Priority" -msgstr "Prioritás engedélyezése" +msgstr "Prioritás Engedélyezése" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Filter tiles" @@ -8217,9 +8197,8 @@ msgid "Add Texture(s) to TileSet." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Remove selected Texture from TileSet." -msgstr "TávolÃtsa el a kijelölt textúrát a csempekészletbÅ‘l." +msgstr "Kijelölj textúra eltávolÃtása TileSet-bÅ‘l." #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from Scene" @@ -8258,7 +8237,6 @@ msgid "Select the previous shape, subtile, or Tile." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Region" msgstr "Régió" @@ -8275,7 +8253,6 @@ msgid "Navigation" msgstr "Navigáció" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Bitmask" msgstr "Bitmaszk" @@ -8336,23 +8313,20 @@ msgid "Create a new rectangle." msgstr "Új téglalap létrehozása." #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "New Rectangle" -msgstr "Új Scene" +msgstr "Új Négyszög" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Új sokszög létrehozása." #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "New Polygon" -msgstr "Sokszög Mozgatása" +msgstr "Új Sokszög" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Delete Selected Shape" -msgstr "Kijelöltek törlése" +msgstr "Kijelölt Alakzat Törlése" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Keep polygon inside region Rect." @@ -8676,7 +8650,6 @@ msgid "Remove output port" msgstr "Kimeneti port eltávolÃtása" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Set expression" msgstr "Kifejezés beállÃtása" @@ -8697,9 +8670,8 @@ msgid "Add Node to Visual Shader" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Node(s) Moved" -msgstr "Node eltávolÃtva" +msgstr "Node(ok) Ãthelyezve" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Duplicate Nodes" @@ -8719,9 +8691,8 @@ msgid "Visual Shader Input Type Changed" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "UniformRef Name Changed" -msgstr "A paraméter megváltozott" +msgstr "UniformRef Név Megváltozott" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" @@ -8744,7 +8715,6 @@ msgid "Create Shader Node" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Color function." msgstr "SzÃn függvény." @@ -8805,7 +8775,6 @@ msgid "SoftLight operator." msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Color constant." msgstr "SzÃnállandó." @@ -8880,7 +8849,6 @@ msgid "" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Boolean constant." msgstr "Logikai állandó." @@ -8893,7 +8861,6 @@ msgid "'%s' input parameter for all shader modes." msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Input parameter." msgstr "Bemeneti paraméter." @@ -8922,12 +8889,10 @@ msgid "'%s' input parameter for vertex and fragment shader mode." msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Scalar function." msgstr "Skalárfüggvény." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Scalar operator." msgstr "Skalár operátor." @@ -9154,9 +9119,8 @@ msgid "Subtracts scalar from scalar." msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Scalar constant." -msgstr "Skaláris állandó." +msgstr "Skalár állandó." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Scalar uniform." @@ -9234,12 +9198,10 @@ msgid "Transform uniform." msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Vector function." -msgstr "Vektor függvény." +msgstr "Vektorfüggvény." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Vector operator." msgstr "Vektor operátor." @@ -9358,7 +9320,6 @@ msgid "Subtracts vector from vector." msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Vector constant." msgstr "Vektor állandó." @@ -9499,9 +9460,8 @@ msgid "" msgstr "" #: editor/project_export.cpp -#, fuzzy msgid "Export Path" -msgstr "Exportálási útvonal" +msgstr "Exportálási Útvonal" #: editor/project_export.cpp msgid "Resources" @@ -9541,7 +9501,7 @@ msgstr "" #: editor/project_export.cpp msgid "Features" -msgstr "" +msgstr "Funkciók" #: editor/project_export.cpp msgid "Custom (comma-separated):" @@ -9556,9 +9516,8 @@ msgid "Script" msgstr "Szkript" #: editor/project_export.cpp -#, fuzzy msgid "Script Export Mode:" -msgstr "Szkript exportálás módja:" +msgstr "Szkript Exportálás Mód:" #: editor/project_export.cpp msgid "Text" @@ -9621,9 +9580,8 @@ msgid "The path specified doesn't exist." msgstr "A megadott útvonal nem létezik." #: editor/project_manager.cpp -#, fuzzy msgid "Error opening package file (it's not in ZIP format)." -msgstr "Hiba a csomagfájl megnyitása során (az nem ZIP formátumú)." +msgstr "Hiba a csomagfájl megnyitása során (nem ZIP formátumú)." #: editor/project_manager.cpp msgid "" @@ -9773,12 +9731,10 @@ msgid "Error: Project is missing on the filesystem." msgstr "" #: editor/project_manager.cpp -#, fuzzy msgid "Can't open project at '%s'." msgstr "A projekt nem nyitható meg a(z) %s helyen." #: editor/project_manager.cpp -#, fuzzy msgid "Are you sure to open more than one project?" msgstr "Biztos, hogy egynél több projektet nyit meg?" @@ -9870,9 +9826,8 @@ msgid "Projects" msgstr "Projektek" #: editor/project_manager.cpp -#, fuzzy msgid "Loading, please wait..." -msgstr "Tükrök letöltése, kérjük várjon..." +msgstr "Betöltés, kérem várjon..." #: editor/project_manager.cpp msgid "Last Modified" @@ -9967,10 +9922,9 @@ msgstr "Eszköz" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Press a Key..." -msgstr "Nyomjon le egy billentyűt" +msgstr "Nyomjon meg egy billentyűt..." #: editor/project_settings_editor.cpp -#, fuzzy msgid "Mouse Button Index:" msgstr "Egérgomb index:" @@ -10051,9 +10005,8 @@ msgid "Middle Button." msgstr "KözépsÅ‘ Egérgomb." #: editor/project_settings_editor.cpp -#, fuzzy msgid "Wheel Up." -msgstr "Felfelé görgetés." +msgstr "Felfelé Görgetés." #: editor/project_settings_editor.cpp msgid "Wheel Down." @@ -10182,7 +10135,6 @@ msgid "Index:" msgstr "Index:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Localization" msgstr "Lokalizáció" @@ -10400,8 +10352,9 @@ msgid "snake_case to PascalCase" msgstr "" #: editor/rename_dialog.cpp +#, fuzzy msgid "Case" -msgstr "" +msgstr "Eset" #: editor/rename_dialog.cpp msgid "To Lowercase" @@ -10420,45 +10373,46 @@ msgid "Regular Expression Error:" msgstr "Reguláris Kifejezési Hiba:" #: editor/rename_dialog.cpp -#, fuzzy msgid "At character %s" msgstr "A(z) %s karakternél" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" -msgstr "" +msgstr "Node új szülÅ‘höz rendelése" #: editor/reparent_dialog.cpp msgid "Reparent Location (Select new Parent):" -msgstr "" +msgstr "HelyszÃn új szülÅ‘höz rendelése (Új szülÅ‘ kiválasztása):" #: editor/reparent_dialog.cpp msgid "Keep Global Transform" -msgstr "" +msgstr "Globális Transzformáció Megtartása" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent" -msgstr "" +msgstr "Új szülÅ‘ hozzárendelése" #: editor/run_settings_dialog.cpp msgid "Run Mode:" -msgstr "" +msgstr "Futás Mód:" #: editor/run_settings_dialog.cpp +#, fuzzy msgid "Current Scene" -msgstr "" +msgstr "Jelenlegi Jelenet" #: editor/run_settings_dialog.cpp msgid "Main Scene" -msgstr "" +msgstr "FÅ‘ Jelenet" #: editor/run_settings_dialog.cpp msgid "Main Scene Arguments:" -msgstr "" +msgstr "FÅ‘ Jelenet Argumentumok:" #: editor/run_settings_dialog.cpp +#, fuzzy msgid "Scene Run Settings" -msgstr "" +msgstr "Jelenet IndÃtási BeállÃtások" #: editor/scene_tree_dock.cpp msgid "No parent to instance the scenes at." @@ -10476,24 +10430,24 @@ msgstr "" #: editor/scene_tree_dock.cpp msgid "Instance Scene(s)" -msgstr "" +msgstr "Jelenet(ek) PéldányosÃtása" #: editor/scene_tree_dock.cpp +#, fuzzy msgid "Replace with Branch Scene" -msgstr "" +msgstr "Kicserélés Ãg Jelenettel" #: editor/scene_tree_dock.cpp msgid "Instance Child Scene" -msgstr "" +msgstr "Gyermek Jelenet PeldányosÃtása" #: editor/scene_tree_dock.cpp msgid "Can't paste root node into the same scene." -msgstr "" +msgstr "Gyökér node nem illeszthetÅ‘ be azonos jelenetbe." #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Paste Node(s)" -msgstr "Node-ok beillesztése" +msgstr "Node(ok) beillesztése" #: editor/scene_tree_dock.cpp msgid "Detach Script" @@ -10513,7 +10467,7 @@ msgstr "" #: editor/scene_tree_dock.cpp msgid "Duplicate Node(s)" -msgstr "" +msgstr "Node(ok) MegkettÅ‘zése" #: editor/scene_tree_dock.cpp msgid "Can't reparent nodes in inherited scenes, order of nodes can't change." @@ -10541,7 +10495,7 @@ msgstr "" #: editor/scene_tree_dock.cpp msgid "Delete the root node \"%s\"?" -msgstr "" +msgstr "Gyökér node törlése \"%s\"?" #: editor/scene_tree_dock.cpp msgid "Delete node \"%s\" and its children?" @@ -10585,23 +10539,23 @@ msgstr "" #: editor/scene_tree_dock.cpp msgid "Create Root Node:" -msgstr "Gyökér node létrehozása:" +msgstr "Gyökér Node Létrehozása:" #: editor/scene_tree_dock.cpp msgid "2D Scene" -msgstr "2D jelenet" +msgstr "2D Jelenet" #: editor/scene_tree_dock.cpp msgid "3D Scene" -msgstr "3D jelenet" +msgstr "3D Jelenet" #: editor/scene_tree_dock.cpp msgid "User Interface" -msgstr "" +msgstr "Felhasználói Felület" #: editor/scene_tree_dock.cpp msgid "Other Node" -msgstr "" +msgstr "Másik Node" #: editor/scene_tree_dock.cpp msgid "Can't operate on nodes from a foreign scene!" @@ -10616,9 +10570,8 @@ msgid "Attach Script" msgstr "" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Cut Node(s)" -msgstr "Node-ok kivágása" +msgstr "Node(ok) Kivágása" #: editor/scene_tree_dock.cpp msgid "Remove Node(s)" @@ -10744,14 +10697,12 @@ msgid "Unlock Node" msgstr "Node feloldása" #: editor/scene_tree_editor.cpp -#, fuzzy msgid "Button Group" msgstr "Gombcsoport" #: editor/scene_tree_editor.cpp -#, fuzzy msgid "(Connecting From)" -msgstr "(Csatlakozás innen)" +msgstr "(Csatlakozás Innen)" #: editor/scene_tree_editor.cpp msgid "Node configuration warning:" @@ -10834,9 +10785,8 @@ msgid "Path is not local." msgstr "Az útvonal nem helyi." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Invalid base path." -msgstr "Érvénytelen alapútvonal." +msgstr "Érvénytelen Alapútvonal." #: editor/script_create_dialog.cpp msgid "A directory with the same name exists." @@ -11094,7 +11044,7 @@ msgstr "" #: editor/settings_config_dialog.cpp msgid "Erase Shortcut" -msgstr "" +msgstr "Gyorsbillentyű törlése" #: editor/settings_config_dialog.cpp msgid "Restore Shortcut" @@ -11419,29 +11369,24 @@ msgid "Preparing data structures" msgstr "" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Generate buffers" -msgstr "AABB Generálása" +msgstr "Bufferek Generálása" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Direct lighting" -msgstr "Irányok" +msgstr "Közvetlen megvilágÃtás" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Indirect lighting" -msgstr "Behúzás Jobbra" +msgstr "Közvetett megvilágÃtás" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Post processing" -msgstr "Kifejezés beállÃtása" +msgstr "Utófeldolgozás" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Plotting lightmaps" -msgstr "Fénytérképek Létrehozása" +msgstr "Fénytérképek Ãbrázolása" #: modules/mono/csharp_script.cpp msgid "Class name can't be a reserved keyword" @@ -11653,7 +11598,7 @@ msgstr "" #: modules/visual_script/visual_script_editor.cpp msgid "Duplicate VisualScript Nodes" -msgstr "" +msgstr "VisualScript Node-ok MegkettÅ‘zése" #: modules/visual_script/visual_script_editor.cpp msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." @@ -12130,7 +12075,6 @@ msgid "Using default boot splash image." msgstr "" #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid package short name." msgstr "Érvénytelen rövid csomagnév." @@ -12139,19 +12083,16 @@ msgid "Invalid package unique name." msgstr "Érvénytelen egyedi csomagnév." #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid package publisher display name." msgstr "Érvénytelen csomagközzétevÅ‘ megjelenÃtendÅ‘ neve." #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid product GUID." -msgstr "Érvénytelen termékazonosÃtó." +msgstr "Érvénytelen termék GUID." #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid publisher GUID." -msgstr "Érvénytelen közzétevÅ‘i GUID." +msgstr "Érvénytelen kiadó GUID." #: platform/uwp/export/export.cpp msgid "Invalid background color." @@ -12393,14 +12334,12 @@ msgid "Finding meshes and lights" msgstr "" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Preparing geometry (%d/%d)" -msgstr "Geometria Elemzése…" +msgstr "Geometria ElÅ‘készÃtése (%d/%d)" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Preparing environment" -msgstr "Geometria Elemzése…" +msgstr "Környezet elÅ‘készÃtése" #: scene/3d/baked_lightmap.cpp #, fuzzy @@ -12413,9 +12352,8 @@ msgid "Saving lightmaps" msgstr "Fénytérképek Létrehozása" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Done" -msgstr "Kész!" +msgstr "Kész" #: scene/3d/collision_object.cpp msgid "" @@ -12691,9 +12629,8 @@ msgid "Must use a valid extension." msgstr "Használjon érvényes kiterjesztést." #: scene/gui/graph_edit.cpp -#, fuzzy msgid "Enable grid minimap." -msgstr "Illesztés Engedélyezése" +msgstr "Rács kistérkép engedélyezése." #: scene/gui/popup.cpp msgid "" @@ -12746,7 +12683,6 @@ msgid "" msgstr "" #: scene/resources/visual_shader_nodes.cpp -#, fuzzy msgid "Invalid source for preview." msgstr "Érvénytelen forrás az elÅ‘nézethez." diff --git a/editor/translations/id.po b/editor/translations/id.po index 5a31ccdd6e..6657101598 100644 --- a/editor/translations/id.po +++ b/editor/translations/id.po @@ -30,12 +30,13 @@ # Habib Rohman <revolusi147id@gmail.com>, 2020. # Hanz <hanzhaxors@gmail.com>, 2021. # Reza Almanda <rezaalmanda27@gmail.com>, 2021. +# Naufal Adriansyah <naufaladrn90@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-29 21:57+0000\n" -"Last-Translator: Hanz <hanzhaxors@gmail.com>\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" +"Last-Translator: Naufal Adriansyah <naufaladrn90@gmail.com>\n" "Language-Team: Indonesian <https://hosted.weblate.org/projects/godot-engine/" "godot/id/>\n" "Language: id\n" @@ -3693,6 +3694,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"Mengimpor telah didisable untuk berkas ini, jadi itu tidak bisa dibuka untuk " +"disunting." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4096,7 +4099,7 @@ msgstr "Kembalikan ke Nilai Baku" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Simpan Berkas (Tanpa Impor)" #: editor/import_dock.cpp msgid "%d Files" diff --git a/editor/translations/ja.po b/editor/translations/ja.po index 5fa91fdc34..6c6340e9b8 100644 --- a/editor/translations/ja.po +++ b/editor/translations/ja.po @@ -36,8 +36,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-08 15:33+0000\n" -"Last-Translator: Wataru Onuki <bettawat@yahoo.co.jp>\n" +"PO-Revision-Date: 2021-04-01 02:04+0000\n" +"Last-Translator: nitenook <admin@alterbaum.net>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/godot-engine/" "godot/ja/>\n" "Language: ja\n" @@ -45,7 +45,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 4.5.1\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -11258,7 +11258,7 @@ msgstr "グラフを表示ã™ã‚‹ã«ã¯ã€ãƒªã‚¹ãƒˆã‹ã‚‰ã‚¢ã‚¤ãƒ†ãƒ ã‚’1ã¤ä»¥ä¸ #: editor/script_editor_debugger.cpp msgid "List of Video Memory Usage by Resource:" -msgstr "リソースã«ã‚ˆã‚‹ãƒ“デオメモリーã®ä½¿ç”¨ä¸€è¦§:" +msgstr "リソースã«ã‚ˆã‚‹ãƒ“デオメモリーã®æ¶ˆè²»é‡ä¸€è¦§:" #: editor/script_editor_debugger.cpp msgid "Total:" @@ -11282,7 +11282,7 @@ msgstr "フォーマット" #: editor/script_editor_debugger.cpp msgid "Usage" -msgstr "使用法" +msgstr "消費é‡" #: editor/script_editor_debugger.cpp msgid "Misc" diff --git a/editor/translations/ko.po b/editor/translations/ko.po index f2809af204..0fcbd51720 100644 --- a/editor/translations/ko.po +++ b/editor/translations/ko.po @@ -21,12 +21,13 @@ # Jun Hyung Shin <shmishmi79@gmail.com>, 2020. # Yongjin Jo <wnrhd114@gmail.com>, 2020. # Yungjoong Song <yungjoong.song@gmail.com>, 2020. +# Henry LeRoux <henry.leroux@ocsbstudent.ca>, 2021. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-12 09:17+0000\n" -"Last-Translator: Myeongjin Lee <aranet100@gmail.com>\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" +"Last-Translator: Henry LeRoux <henry.leroux@ocsbstudent.ca>\n" "Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/" "godot/ko/>\n" "Language: ko\n" @@ -34,7 +35,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 4.5.2-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -3667,6 +3668,7 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"ì´ íŒŒì¼ì— 대해 ê°€ì ¸ 오기가 비활성화ë˜ì—ˆìœ¼ë©° íŽ¸ì§‘ì„ ìœ„í•´ ì—´ 수 없습니다." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." diff --git a/editor/translations/nb.po b/editor/translations/nb.po index df1f7395ce..172439dc43 100644 --- a/editor/translations/nb.po +++ b/editor/translations/nb.po @@ -16,12 +16,13 @@ # Revolution <revosw@gmail.com>, 2019. # Petter Reinholdtsen <pere-weblate@hungry.com>, 2019, 2020. # Patrick Sletvold <patricksletvold@hotmail.com>, 2021. +# Kristoffer <kskau93@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-02-27 00:47+0000\n" -"Last-Translator: Anonymous <GentleSaucepan@protonmail.com>\n" +"PO-Revision-Date: 2021-03-31 03:53+0000\n" +"Last-Translator: Kristoffer <kskau93@gmail.com>\n" "Language-Team: Norwegian BokmÃ¥l <https://hosted.weblate.org/projects/godot-" "engine/godot/nb_NO/>\n" "Language: nb\n" @@ -29,7 +30,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 4.5\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -663,7 +664,7 @@ msgstr "Velg spor Ã¥ kopiere" #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: editor/scene_tree_dock.cpp scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" -msgstr "Lim inn" +msgstr "Kopier" #: editor/animation_track_editor.cpp #, fuzzy @@ -1591,7 +1592,7 @@ msgstr "Velg en Mappe" #: editor/filesystem_dock.cpp editor/project_manager.cpp #: scene/gui/file_dialog.cpp msgid "Create Folder" -msgstr "Lag mappe" +msgstr "Lag Mappe" #: editor/editor_dir_dialog.cpp editor/editor_file_dialog.cpp #: editor/editor_plugin_settings.cpp editor/filesystem_dock.cpp @@ -1706,9 +1707,8 @@ msgid "3D Editor" msgstr "Redigeringsverktøy" #: editor/editor_feature_profile.cpp -#, fuzzy msgid "Script Editor" -msgstr "Ã…pne SkriptEditor" +msgstr "Skript Redigeringsverktøy" #: editor/editor_feature_profile.cpp msgid "Asset Library" @@ -1724,9 +1724,8 @@ msgid "Node Dock" msgstr "Flytt Modus" #: editor/editor_feature_profile.cpp -#, fuzzy msgid "FileSystem Dock" -msgstr "FilSystem" +msgstr "FilSystem Panel" #: editor/editor_feature_profile.cpp #, fuzzy @@ -1882,7 +1881,7 @@ msgstr "Kutt Noder" #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp msgid "Copy Path" -msgstr "Kopier Sti" +msgstr "Kopier Bane" #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp #, fuzzy @@ -1941,27 +1940,27 @@ msgstr "Lagre ei fil" #: editor/editor_file_dialog.cpp msgid "Go Back" -msgstr "GÃ¥ tilbake" +msgstr "GÃ¥ Tilbake" #: editor/editor_file_dialog.cpp msgid "Go Forward" -msgstr "GÃ¥ framover" +msgstr "GÃ¥ Fremover" #: editor/editor_file_dialog.cpp msgid "Go Up" -msgstr "GÃ¥ oppover" +msgstr "GÃ¥ Oppover" #: editor/editor_file_dialog.cpp msgid "Toggle Hidden Files" -msgstr "Veksle visning av skjulte filer" +msgstr "Veksle Visning av Skjulte Filer" #: editor/editor_file_dialog.cpp msgid "Toggle Favorite" -msgstr "Veksle favorittmerkering" +msgstr "Veksle Favorittmarkering" #: editor/editor_file_dialog.cpp msgid "Toggle Mode" -msgstr "Veksle modus" +msgstr "Veksle Modus" #: editor/editor_file_dialog.cpp msgid "Focus Path" @@ -2132,7 +2131,7 @@ msgstr "" #: editor/editor_help_search.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp msgid "Search Help" -msgstr "Søk hjelp" +msgstr "Søk Hjelp" #: editor/editor_help_search.cpp msgid "Case Sensitive" @@ -2244,7 +2243,7 @@ msgstr "Tøm" #: editor/editor_log.cpp msgid "Clear Output" -msgstr "Nullstill resultat" +msgstr "Nullstill Resultat" #: editor/editor_network_profiler.cpp editor/editor_node.cpp #: editor/editor_profiler.cpp @@ -2619,9 +2618,8 @@ msgid "Close Scene" msgstr "Lukk Scene" #: editor/editor_node.cpp -#, fuzzy msgid "Reopen Closed Scene" -msgstr "Lukk Scene" +msgstr "GjenÃ¥pne Lukket Scene" #: editor/editor_node.cpp #, fuzzy @@ -2842,9 +2840,8 @@ msgid "Save Scene" msgstr "Lagre Scene" #: editor/editor_node.cpp -#, fuzzy msgid "Save All Scenes" -msgstr "Lagre alle Scener" +msgstr "Lagre Alle Scener" #: editor/editor_node.cpp msgid "Convert To..." @@ -3036,9 +3033,8 @@ msgid "Editor Layout" msgstr "Redigeringsverktøy Layout" #: editor/editor_node.cpp -#, fuzzy msgid "Take Screenshot" -msgstr "Lagre Scene" +msgstr "Ta Skjermbilde" #: editor/editor_node.cpp msgid "Screenshots are stored in the Editor Data/Settings Folder." @@ -3046,7 +3042,7 @@ msgstr "Skjermavbildninger lagres i redigeringsdata/innstillingsmappen." #: editor/editor_node.cpp msgid "Toggle Fullscreen" -msgstr "Skru av/pÃ¥ Fullskjerm" +msgstr "Veksle Fullskjerm" #: editor/editor_node.cpp #, fuzzy @@ -3119,7 +3115,7 @@ msgstr "" #: editor/editor_node.cpp msgid "Pause Scene" -msgstr "Sett scenen pÃ¥ pause" +msgstr "Sett Scenen PÃ¥ Pause" #: editor/editor_node.cpp msgid "Stop the scene." @@ -3180,9 +3176,8 @@ msgid "Inspector" msgstr "Inspektør" #: editor/editor_node.cpp -#, fuzzy msgid "Expand Bottom Panel" -msgstr "Utvid alle" +msgstr "Utvid Nederste Panel" #: editor/editor_node.cpp msgid "Output" @@ -3282,7 +3277,7 @@ msgstr "Ã…pne 3D-redigeringsverktøy" #: editor/editor_node.cpp msgid "Open Script Editor" -msgstr "Ã…pne SkriptEditor" +msgstr "Ã…pne Skriptredigeringsverktøy" #: editor/editor_node.cpp editor/project_manager.cpp msgid "Open Asset Library" @@ -4014,9 +4009,8 @@ msgid "Create Script" msgstr "Opprett skript" #: editor/find_in_files.cpp editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Find in Files" -msgstr "%d flere filer" +msgstr "Finn i Filer" #: editor/find_in_files.cpp #, fuzzy @@ -5766,9 +5760,8 @@ msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/texture_region_editor_plugin.cpp #: editor/plugins/tile_set_editor_plugin.cpp scene/gui/graph_edit.cpp -#, fuzzy msgid "Zoom Reset" -msgstr "Zoom Ut" +msgstr "Zoom Resett" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -5804,9 +5797,8 @@ msgstr "Roter Modus" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Scale Mode" -msgstr "Velg Modus" +msgstr "Skaler Modus" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -5827,9 +5819,8 @@ msgid "Pan Mode" msgstr "Panorerings-Modus" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Ruler Mode" -msgstr "Velg Modus" +msgstr "Linjal Modus" #: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy @@ -5837,9 +5828,8 @@ msgid "Toggle smart snapping." msgstr "SlÃ¥ av/pÃ¥ snapping" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Use Smart Snap" -msgstr "Bruk Snap" +msgstr "Bruk Smart Snap" #: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy @@ -5847,9 +5837,8 @@ msgid "Toggle grid snapping." msgstr "SlÃ¥ av/pÃ¥ snapping" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Use Grid Snap" -msgstr "Bruk Snap" +msgstr "Bruk Rutenett Snap" #: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy @@ -5957,13 +5946,12 @@ msgid "View" msgstr "Visning" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Always Show Grid" -msgstr "Vis Rutenett" +msgstr "Alltid Vis Rutenett" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show Helpers" -msgstr "Vis hjelpere" +msgstr "Vis Hjelpere" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show Rulers" @@ -5971,7 +5959,7 @@ msgstr "Vis linjaler" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show Guides" -msgstr "Vis veiledere" +msgstr "Vis Veiledere" #: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy @@ -6045,7 +6033,7 @@ msgstr "Kopier Pose" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Clear Pose" -msgstr "Fjern Pose" +msgstr "Fjern Posering" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Multiply grid step by 2" @@ -6056,9 +6044,8 @@ msgid "Divide grid step by 2" msgstr "Del rutenett-steg med 2" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Pan View" -msgstr "Bakvisning" +msgstr "Panoreringsvisning" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Add %s" @@ -7188,12 +7175,12 @@ msgstr "%s-klassereferanse" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp msgid "Find Next" -msgstr "Finn neste" +msgstr "Finn Neste" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp msgid "Find Previous" -msgstr "Finn forrige" +msgstr "Finn Forrige" #: editor/plugins/script_editor_plugin.cpp #, fuzzy @@ -7243,13 +7230,12 @@ msgid "Open..." msgstr "Ã…pne" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Reopen Closed Script" -msgstr "Kjør Skript" +msgstr "GjenÃ¥pne Lukket Skript" #: editor/plugins/script_editor_plugin.cpp msgid "Save All" -msgstr "Lagre Alle" +msgstr "Lagre Alt" #: editor/plugins/script_editor_plugin.cpp msgid "Soft Reload Script" @@ -7260,9 +7246,8 @@ msgid "Copy Script Path" msgstr "Kopier Skript-Sti" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "History Previous" -msgstr "Finn forrige" +msgstr "Historie Forrige" #: editor/plugins/script_editor_plugin.cpp msgid "History Next" @@ -7308,7 +7293,7 @@ msgstr "Søk" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp msgid "Step Into" -msgstr "Tre inn i" +msgstr "Tre Inn I" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp msgid "Step Over" @@ -7403,9 +7388,8 @@ msgid "Line" msgstr "Linje:" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Function" -msgstr "Fjern Funksjon" +msgstr "GÃ¥ til Funksjon" #: editor/plugins/script_text_editor.cpp msgid "Only resources from filesystem can be dropped." @@ -7430,7 +7414,7 @@ msgstr "" #: editor/plugins/script_text_editor.cpp editor/plugins/text_editor.cpp msgid "Uppercase" -msgstr "Store versaler" +msgstr "Store bokstaver" #: editor/plugins/script_text_editor.cpp editor/plugins/text_editor.cpp msgid "Lowercase" @@ -7470,9 +7454,8 @@ msgid "Select All" msgstr "Velg Alle" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Delete Line" -msgstr "Slett Valgte" +msgstr "Slett Linje" #: editor/plugins/script_text_editor.cpp msgid "Indent Left" @@ -7484,12 +7467,11 @@ msgstr "Innrykk Høyre" #: editor/plugins/script_text_editor.cpp msgid "Toggle Comment" -msgstr "Veksle kommentar" +msgstr "Veksle Kommentar" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Fold/Unfold Line" -msgstr "Slett Valgte" +msgstr "Veksle Linjebretting" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" @@ -7501,34 +7483,31 @@ msgstr "Brett ut alle linjer" #: editor/plugins/script_text_editor.cpp msgid "Clone Down" -msgstr "Klon nedover" +msgstr "Klon Nedover" #: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Evaluate Selection" -msgstr "Skaler Utvalg" +msgstr "Evaluer Seleksjon" #: editor/plugins/script_text_editor.cpp msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Convert Indent to Spaces" -msgstr "Konverter til store versaler" +msgstr "Konverter Innrykk til Mellomrom" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Convert Indent to Tabs" -msgstr "Konverter til store versaler" +msgstr "Konverter Inrykk til Tabs" #: editor/plugins/script_text_editor.cpp msgid "Auto Indent" -msgstr "Automatisk innrykk" +msgstr "Automatisk Innrykk" #: editor/plugins/script_text_editor.cpp #, fuzzy @@ -7540,19 +7519,16 @@ msgid "Contextual Help" msgstr "" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Toggle Bookmark" -msgstr "Veksle kommentar" +msgstr "Veksle Bokmerke" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Next Bookmark" -msgstr "GÃ¥ til Neste Steg" +msgstr "GÃ¥ til Neste Bokmerke" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Previous Bookmark" -msgstr "GÃ¥ til tidligere redigert dokument." +msgstr "GÃ¥ til Forrige Bokmerke" #: editor/plugins/script_text_editor.cpp #, fuzzy @@ -7584,9 +7560,8 @@ msgid "Go to Next Breakpoint" msgstr "GÃ¥ til Neste Steg" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Go to Previous Breakpoint" -msgstr "GÃ¥ til tidligere redigert dokument." +msgstr "GÃ¥ til Forrige Steg" #: editor/plugins/shader_editor_plugin.cpp msgid "" @@ -7959,7 +7934,7 @@ msgstr "Høyrevisning" #: editor/plugins/spatial_editor_plugin.cpp msgid "Switch Perspective/Orthogonal View" -msgstr "Bytt perspektiv/ortogonal fremvisning" +msgstr "Bytt Perspektiv/Ortogonal Fremvisning" #: editor/plugins/spatial_editor_plugin.cpp msgid "Insert Animation Key" @@ -7983,9 +7958,8 @@ msgid "Transform" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Snap Object to Floor" -msgstr "Snap til rutenett" +msgstr "Snap Objekt til Gulv" #: editor/plugins/spatial_editor_plugin.cpp msgid "Transform Dialog..." @@ -8538,9 +8512,8 @@ msgid "Theme File" msgstr "Tema" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Erase Selection" -msgstr "Fjern Utvalg" +msgstr "Fjern Seleksjon" #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy @@ -8549,9 +8522,8 @@ msgstr "Ugyldig navn." #: editor/plugins/tile_map_editor_plugin.cpp #: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy msgid "Cut Selection" -msgstr "Plasser Utvalg I Midten" +msgstr "Klipp ut Seleksjon" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Paint TileMap" @@ -8574,9 +8546,8 @@ msgid "Erase TileMap" msgstr "" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Find Tile" -msgstr "Finn neste" +msgstr "Finn Flis" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Transpose" @@ -8621,14 +8592,12 @@ msgid "Pick Tile" msgstr "" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Rotate Left" -msgstr "Roter Modus" +msgstr "Roter til Venstre" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Rotate Right" -msgstr "Roter Polygon" +msgstr "Roter til Høyre" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Flip Horizontally" @@ -8639,9 +8608,8 @@ msgid "Flip Vertically" msgstr "" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Clear Transform" -msgstr "Anim Forandre Omforming" +msgstr "Nullstill Transformasjon" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy @@ -8676,18 +8644,16 @@ msgid "New Atlas" msgstr "Ny %s" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Next Coordinate" -msgstr "Neste skript" +msgstr "Neste Koordinat" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Select the next shape, subtile, or Tile." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Previous Coordinate" -msgstr "Forrige skript" +msgstr "Forrige Koordinat" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Select the previous shape, subtile, or Tile." @@ -8709,9 +8675,8 @@ msgid "Occlusion" msgstr "Rediger Poly" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Navigation" -msgstr "Animasjonsnode" +msgstr "Navigasjon" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy @@ -8729,44 +8694,36 @@ msgid "Z Index" msgstr "Panorerings-Modus" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Region Mode" -msgstr "Roter Modus" +msgstr "Region Modus" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Collision Mode" -msgstr "Animasjonsnode" +msgstr "Kollisjon Modus" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Occlusion Mode" -msgstr "Rediger Poly" +msgstr "Okklusjon Modus" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Navigation Mode" -msgstr "Animasjonsnode" +msgstr "Navigasjon Modus" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Bitmask Mode" -msgstr "Roter Modus" +msgstr "Bitmaske Modus" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Priority Mode" -msgstr "Eksporter Prosjekt" +msgstr "Prioritet Modus" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Icon Mode" -msgstr "Panorerings-Modus" +msgstr "Ikon Modus" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Z Index Mode" -msgstr "Panorerings-Modus" +msgstr "Z Indeks Modus" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Copy bitmask." @@ -9058,9 +9015,8 @@ msgid "Detect new changes" msgstr "Lag ny %s" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Changes" -msgstr "Forandre" +msgstr "Endringer" #: editor/plugins/version_control_editor_plugin.cpp msgid "Modified" @@ -10025,7 +9981,7 @@ msgstr "Ressurser" #: editor/project_export.cpp msgid "Export all resources in the project" -msgstr "Eksporter alle ressurser til prosjektet" +msgstr "Eksporter alle ressurser i prosjektet" #: editor/project_export.cpp msgid "Export selected scenes (and dependencies)" @@ -10033,7 +9989,7 @@ msgstr "Eksporter valgte scener (og avhengigheter)" #: editor/project_export.cpp msgid "Export selected resources (and dependencies)" -msgstr "Exporter valgte ressurs (og avhengigheter)" +msgstr "Exporter valgte ressurser (og avhengigheter)" #: editor/project_export.cpp msgid "Export Mode:" @@ -10057,7 +10013,7 @@ msgstr "" #: editor/project_export.cpp msgid "Features" -msgstr "" +msgstr "Egenskaper" #: editor/project_export.cpp msgid "Custom (comma-separated):" @@ -10855,9 +10811,8 @@ msgid "Select Method" msgstr "" #: editor/rename_dialog.cpp editor/scene_tree_dock.cpp -#, fuzzy msgid "Batch Rename" -msgstr "Endre navn" +msgstr "Endre Navn pÃ¥ Parti" #: editor/rename_dialog.cpp msgid "Replace:" @@ -11276,9 +11231,8 @@ msgid "Save Branch as Scene" msgstr "" #: editor/scene_tree_dock.cpp editor/script_editor_debugger.cpp -#, fuzzy msgid "Copy Node Path" -msgstr "Kopier Noder" +msgstr "Kopier Node-bane" #: editor/scene_tree_dock.cpp msgid "Delete (No Confirm)" @@ -12488,24 +12442,20 @@ msgid "Copy Nodes" msgstr "Kopier Noder" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Cut Nodes" -msgstr "Kutt Noder" +msgstr "Klipp ut Noder" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Make Function" -msgstr "Fjern Funksjon" +msgstr "Lag Funksjon" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Refresh Graph" -msgstr "Oppdater" +msgstr "Oppdater Graf" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Edit Member" -msgstr "Medlemmer" +msgstr "Rediger Medlem" #: modules/visual_script/visual_script_flow_control.cpp msgid "Input type not iterable: " diff --git a/editor/translations/pl.po b/editor/translations/pl.po index 0679df64ce..7da98bc87c 100644 --- a/editor/translations/pl.po +++ b/editor/translations/pl.po @@ -51,7 +51,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-24 23:44+0000\n" +"PO-Revision-Date: 2021-04-01 02:04+0000\n" "Last-Translator: Tomek <kobewi4e@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/" "godot/pl/>\n" @@ -61,7 +61,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.5.2-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -3705,6 +3705,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"Importowanie zostaÅ‚o wyÅ‚Ä…czone dla tego pliku, wiÄ™c nie może być otwarty do " +"edytowania." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4110,7 +4112,7 @@ msgstr "Resetuj do domyÅ›lnych" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Zachowaj plik (brak importu)" #: editor/import_dock.cpp msgid "%d Files" diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po index 0907db141e..45e2050732 100644 --- a/editor/translations/pt_BR.po +++ b/editor/translations/pt_BR.po @@ -113,12 +113,13 @@ # Ricardo Zamarrenho Carvalho Correa <ricardozcc17@gmail.com>, 2021. # Diego dos Reis Macedo <diego_dragon97@hotmail.com>, 2021. # Lucas E. <lukas.ed45@gmail.com>, 2021. +# Gabriel Silveira <gabomfim99@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: 2016-05-30\n" -"PO-Revision-Date: 2021-03-24 23:44+0000\n" -"Last-Translator: Renato Rotenberg <renato.rotenberg@gmail.com>\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" +"Last-Translator: Gabriel Silveira <gabomfim99@gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "godot-engine/godot/pt_BR/>\n" "Language: pt_BR\n" @@ -126,7 +127,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 4.5.2-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -3790,6 +3791,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"A importação foi desativada para este arquivo, por isso não pode ser aberto " +"para edição." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4193,7 +4196,7 @@ msgstr "Redefinir para os padrões" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Manter Arquivo (Sem Importação)" #: editor/import_dock.cpp msgid "%d Files" diff --git a/editor/translations/ru.po b/editor/translations/ru.po index 471c8a13b7..193b47de8c 100644 --- a/editor/translations/ru.po +++ b/editor/translations/ru.po @@ -96,8 +96,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-16 15:25+0000\n" -"Last-Translator: Danil Alexeev <danil@alexeev.xyz>\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" +"Last-Translator: narrnika <narr13niki@gmail.com>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/" "godot/ru/>\n" "Language: ru\n" @@ -106,7 +106,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 4.5.2-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -3759,6 +3759,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"Импорт был отключён Ð´Ð»Ñ Ñтого файла, поÑтому его Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð´Ð»Ñ " +"редактированиÑ." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4162,7 +4164,7 @@ msgstr "СброÑить наÑтройки" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Сохранить файл (без импорта)" #: editor/import_dock.cpp msgid "%d Files" diff --git a/editor/translations/th.po b/editor/translations/th.po index 844bf4b4ac..4ac8875aa6 100644 --- a/editor/translations/th.po +++ b/editor/translations/th.po @@ -4,7 +4,7 @@ # This file is distributed under the same license as the Godot source code. # Kaveeta Vivatchai <goodytong@gmail.com>, 2017. # Poommetee Ketson (Noshyaar) <poommetee@protonmail.com>, 2017-2018. -# Thanachart Monpassorn <nunf_2539@hotmail.com>, 2020. +# Thanachart Monpassorn <nunf_2539@hotmail.com>, 2020, 2021. # Anonymous <noreply@weblate.org>, 2020. # Lon3r <mptube.p@gmail.com>, 2020. # Kongfa Warorot <gongpha@hotmail.com>, 2020, 2021. @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-02-15 10:51+0000\n" -"Last-Translator: Kongfa Warorot <gongpha@hotmail.com>\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" +"Last-Translator: Thanachart Monpassorn <nunf_2539@hotmail.com>\n" "Language-Team: Thai <https://hosted.weblate.org/projects/godot-engine/godot/" "th/>\n" "Language: th\n" @@ -21,7 +21,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 4.5-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -2489,9 +2489,8 @@ msgid "Unable to enable addon plugin at: '%s' parsing of config failed." msgstr "ไม่สามารถเปิดใช้งานปลั๊à¸à¸à¸´à¸™: '%s'" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: '%s'." -msgstr "ไม่พบชื่à¸à¸ªà¸„ริปต์ในปลั๊à¸à¸à¸´à¸™: 'res://addons/%s'" +msgstr "ไม่พบไฟล์สคริปต์สำหรับปลั๊à¸à¸à¸´à¸™à¸—ี่: '%s'." #: editor/editor_node.cpp msgid "Unable to load addon script from path: '%s'." @@ -3069,13 +3068,12 @@ msgid "Open & Run a Script" msgstr "เปิดà¹à¸¥à¸°à¸£à¸±à¸™à¸ªà¸„ริปต์" #: editor/editor_node.cpp -#, fuzzy msgid "" "The following files are newer on disk.\n" "What action should be taken?" msgstr "" -"ไฟล์ต่à¸à¹„ปนี้ในดิสà¸à¹Œà¹ƒà¸«à¸¡à¹ˆà¸à¸§à¹ˆà¸²\n" -"จะทำà¸à¸¢à¹ˆà¸²à¸‡à¹„รต่à¸à¹„ป?:" +"ไฟล์เหล่านี้มีความใหม่à¸à¸§à¹ˆà¸²à¸šà¸™à¸”ิสà¸à¹Œ\n" +"ต้à¸à¸‡à¸ˆà¸°à¸—ำà¸à¸¢à¹ˆà¸²à¸‡à¹„รต่à¸à¹„ป?" #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp #: editor/plugins/shader_editor_plugin.cpp @@ -3605,7 +3603,7 @@ msgstr "สถานะ: นำเข้าไฟล์ล้มเหลว ภ#: editor/filesystem_dock.cpp msgid "" "Importing has been disabled for this file, so it can't be opened for editing." -msgstr "" +msgstr "à¸à¸²à¸£à¸™à¸³à¹€à¸‚้าไฟล์นี้ถูà¸à¸›à¸´à¸”, ดังนั้นจึงไม่สามารถเปิดเพื่à¸à¹à¸à¹‰à¹„ขใดๆได้" #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -3993,23 +3991,20 @@ msgid "Saving..." msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึà¸..." #: editor/import_defaults_editor.cpp -#, fuzzy msgid "Select Importer" -msgstr "โหมดเลืà¸à¸" +msgstr "เลืà¸à¸à¸•à¸±à¸§à¸™à¸³à¹€à¸‚้า" #: editor/import_defaults_editor.cpp -#, fuzzy msgid "Importer:" -msgstr "นำเข้า" +msgstr "ตัวนำเข้า:" #: editor/import_defaults_editor.cpp -#, fuzzy msgid "Reset to Defaults" -msgstr "โหลดค่าเริ่มต้น" +msgstr "รีเซ็ตเป็นค่าเริ่มต้น" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "เà¸à¹‡à¸šà¹„ฟล์ (ไม่นำเข้า)" #: editor/import_dock.cpp msgid "%d Files" @@ -4966,9 +4961,8 @@ msgid "Got:" msgstr "ที่ได้รับ:" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Failed SHA-256 hash check" -msgstr "ผิดพลาดในà¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¹à¸®à¸Š SHA256" +msgstr "ผิดพลาดในà¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¹à¸®à¸Š SHA-256" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Asset Download Error:" @@ -5099,13 +5093,12 @@ msgid "Assets ZIP File" msgstr "ทรัพยาà¸à¸£à¹„ฟล์ ZIP" #: editor/plugins/baked_lightmap_editor_plugin.cpp -#, fuzzy msgid "" "Can't determine a save path for lightmap images.\n" "Save your scene and try again." msgstr "" -"ไม่สามารถเลืà¸à¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡à¸—ี่จะบันทึà¸à¸ าพ lightmap\n" -"à¸à¸£à¸¸à¸“าบันทึà¸à¸‰à¸²à¸ (เพื่à¸à¸šà¸±à¸™à¸—ึà¸à¸ าพในโฟลเดà¸à¸£à¹Œà¹€à¸”ียวà¸à¸±à¸™) หรืà¸à¸£à¸°à¸šà¸¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡à¹ƒà¸™à¸„ุณสมบัติขà¸à¸‡ BakedLightmap" +"ไม่สามารถà¸à¸³à¸«à¸™à¸”ตำà¹à¸«à¸™à¹ˆà¸‡à¸à¸²à¸£à¸šà¸±à¸™à¸—ึà¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸ าพ lightmap\n" +"ลà¸à¸‡à¸šà¸±à¸™à¸—ึà¸à¸‰à¸²à¸à¸‚à¸à¸‡à¸„ุณà¹à¸¥à¹‰à¸§à¸¥à¸à¸‡à¸à¸µà¸à¸„รั้ง" #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" @@ -5120,27 +5113,28 @@ msgstr "ผิดพลาดขณะสร้างภาพ lightmap à¸à¸£à¸ #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed determining lightmap size. Maximum lightmap size too small?" -msgstr "" +msgstr "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ขนาด lightmap ล้มเหลว ขนาด lightmap สูงสุดเล็à¸à¹€à¸à¸´à¸™à¹„ป?" #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "Some mesh is invalid. Make sure the UV2 channel values are contained within " "the [0.0,1.0] square region." -msgstr "" +msgstr "mesh บางส่วนไม่ถูà¸à¸•à¹‰à¸à¸‡ ตรวจสà¸à¸šà¹ƒà¸«à¹‰à¹à¸™à¹ˆà¹ƒà¸ˆà¸§à¹ˆà¸²à¸„่า UV2 à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸žà¸·à¹‰à¸™à¸—ี่สี่เหลี่ยม [0.0,1.0]" #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "Godot editor was built without ray tracing support, lightmaps can't be baked." msgstr "" +"เà¸à¸”ิเตà¸à¸£à¹Œ Godot ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¹‚ดยไม่ได้สนับสนุน ray tracing ดังนั้นจึงไม่สามารถ bake lightmaps " +"ได้" #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Bake Lightmaps" msgstr "สร้าง Lightmaps" #: editor/plugins/baked_lightmap_editor_plugin.cpp -#, fuzzy msgid "Select lightmap bake file:" -msgstr "เลืà¸à¸à¹„ฟล์เทมเพลต" +msgstr "เลืà¸à¸à¹„ฟล์ bake ขà¸à¸‡ lightmap :" #: editor/plugins/camera_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -6220,9 +6214,8 @@ msgid "Can only set point into a ParticlesMaterial process material" msgstr "สามารถà¸à¸³à¸«à¸™à¸”จุดให้à¹à¸à¹ˆ ParticlesMaterial เท่านั้น" #: editor/plugins/particles_2d_editor_plugin.cpp -#, fuzzy msgid "Convert to CPUParticles2D" -msgstr "à¹à¸›à¸¥à¸‡à¹€à¸›à¹‡à¸™ CPUParticles" +msgstr "à¹à¸›à¸¥à¸‡à¹€à¸›à¹‡à¸™ CPUParticles2D" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp @@ -7247,9 +7240,8 @@ msgid "Yaw" msgstr "Yaw" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Size" -msgstr "ขนาด: " +msgstr "ขนาด" #: editor/plugins/spatial_editor_plugin.cpp msgid "Objects Drawn" @@ -9885,9 +9877,8 @@ msgid "Projects" msgstr "โปรเจà¸à¸•à¹Œ" #: editor/project_manager.cpp -#, fuzzy msgid "Loading, please wait..." -msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸£à¸µà¸¢à¸à¸‚้à¸à¸¡à¸¹à¸¥ โปรดรà¸..." +msgstr "à¸à¸³à¸¥à¸±à¸‡à¹‚หลด โปรดรà¸..." #: editor/project_manager.cpp msgid "Last Modified" @@ -10255,9 +10246,8 @@ msgid "Plugins" msgstr "ปลั๊à¸à¸à¸´à¸™" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Import Defaults" -msgstr "โหลดค่าเริ่มต้น" +msgstr "นำเข้าค่าเริ่มต้น" #: editor/property_editor.cpp msgid "Preset..." @@ -10506,12 +10496,10 @@ msgid "Instance Child Scene" msgstr "à¸à¸´à¸™à¸ªà¹à¸•à¸™à¸‹à¹Œà¸‰à¸²à¸à¸¥à¸¹à¸" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Can't paste root node into the same scene." -msgstr "ทำà¸à¸±à¸šà¹‚หนดขà¸à¸‡à¸‰à¸²à¸à¸à¸·à¹ˆà¸™à¹„ม่ได้!" +msgstr "ไม่สามารถวางโหนดราà¸à¹ƒà¸™à¸‰à¸²à¸à¹€à¸”ียวà¸à¸±à¸™" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Paste Node(s)" msgstr "วางโหนด" @@ -10641,7 +10629,6 @@ msgid "Attach Script" msgstr "à¹à¸™à¸šà¸ªà¸„ริปต์" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Cut Node(s)" msgstr "ตัดโหนด" @@ -11446,36 +11433,31 @@ msgstr "มà¸à¸šà¸—รัพยาà¸à¸£ MeshLibrary ให้à¸à¸±à¸š GridMap #: modules/lightmapper_cpu/lightmapper_cpu.cpp msgid "Begin Bake" -msgstr "" +msgstr "เริ่มต้น Bake" #: modules/lightmapper_cpu/lightmapper_cpu.cpp msgid "Preparing data structures" -msgstr "" +msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¹‚ครงสร้างข้à¸à¸¡à¸¹à¸¥" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Generate buffers" -msgstr "สร้าง AABB" +msgstr "สร้างบัฟเฟà¸à¸£à¹Œ" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Direct lighting" -msgstr "ทิศทาง" +msgstr "lighting à¹à¸šà¸šà¸•à¸£à¸‡" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Indirect lighting" -msgstr "ย่à¸à¸«à¸™à¹‰à¸²à¸‚วา" +msgstr "lighting à¹à¸šà¸šà¸à¹‰à¸à¸¡" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Post processing" msgstr "หลังประมวลผล" #: modules/lightmapper_cpu/lightmapper_cpu.cpp -#, fuzzy msgid "Plotting lightmaps" -msgstr "วางà¹à¸™à¸§à¹à¸ªà¸‡:" +msgstr "à¸à¸³à¸¥à¸±à¸‡à¸žà¸¥à¹‡à¸à¸• lightmaps" #: modules/mono/csharp_script.cpp msgid "Class name can't be a reserved keyword" @@ -11975,9 +11957,8 @@ msgid "Select device from the list" msgstr "เลืà¸à¸à¸à¸¸à¸›à¸à¸£à¸“์จาà¸à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸" #: platform/android/export/export.cpp -#, fuzzy msgid "Unable to find the 'apksigner' tool." -msgstr "ไม่สามารถหา zipalign tool" +msgstr "ไม่สามารถหาเครื่à¸à¸‡à¸¡à¸·à¸ 'apksigner'" #: platform/android/export/export.cpp msgid "" @@ -11994,14 +11975,12 @@ msgid "Release keystore incorrectly configured in the export preset." msgstr "Release keystore à¸à¸³à¸«à¸™à¸”ค่าไว้à¸à¸¢à¹ˆà¸²à¸‡à¹„ม่ถูà¸à¸•à¹‰à¸à¸‡à¹ƒà¸™à¸žà¸£à¸µà¹€à¸‹à¹‡à¸•à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸ªà¹ˆà¸‡à¸à¸à¸" #: platform/android/export/export.cpp -#, fuzzy msgid "A valid Android SDK path is required in Editor Settings." -msgstr "ที่à¸à¸¢à¸¹à¹ˆ Android SDK ผิดพลาดสำหรับà¸à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¹à¸šà¸šà¸à¸³à¸«à¸™à¸”เà¸à¸‡à¹ƒà¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าเà¸à¸”ิเตà¸à¸£à¹Œ" +msgstr "ต้à¸à¸‡à¸à¸²à¸£à¸—ี่à¸à¸¢à¸¹à¹ˆà¸‚à¸à¸‡ Android SDK ที่ถูà¸à¸•à¹‰à¸à¸‡ ในà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าเà¸à¸”ิเตà¸à¸£à¹Œ" #: platform/android/export/export.cpp -#, fuzzy msgid "Invalid Android SDK path in Editor Settings." -msgstr "ที่à¸à¸¢à¸¹à¹ˆ Android SDK ผิดพลาดสำหรับà¸à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¹à¸šà¸šà¸à¸³à¸«à¸™à¸”เà¸à¸‡à¹ƒà¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าเà¸à¸”ิเตà¸à¸£à¹Œ" +msgstr "ที่à¸à¸¢à¸¹à¹ˆ Android SDK ไม่ถูà¸à¸•à¹‰à¸à¸‡à¹ƒà¸™à¸•à¸±à¹‰à¸‡à¸„่าขà¸à¸‡à¹€à¸à¸”ิเตà¸à¸£à¹Œ" #: platform/android/export/export.cpp msgid "Missing 'platform-tools' directory!" @@ -12009,12 +11988,11 @@ msgstr "ไดเร็à¸à¸—à¸à¸£à¸µ 'platform-tools' หายไป!" #: platform/android/export/export.cpp msgid "Unable to find Android SDK platform-tools' adb command." -msgstr "" +msgstr "ไม่พบคำสั่ง adb ขà¸à¸‡ Android SDK platform-tools" #: platform/android/export/export.cpp -#, fuzzy msgid "Please check in the Android SDK directory specified in Editor Settings." -msgstr "ที่à¸à¸¢à¸¹à¹ˆ Android SDK ผิดพลาดสำหรับà¸à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¹à¸šà¸šà¸à¸³à¸«à¸™à¸”เà¸à¸‡à¹ƒà¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าเà¸à¸”ิเตà¸à¸£à¹Œ" +msgstr "โปรดตรวจสà¸à¸šà¹ƒà¸™à¹„ดเร็à¸à¸—à¸à¸£à¸µ Android SDK ที่ระบุใตัวตั้งค่าขà¸à¸‡à¹€à¸à¸”ิเตà¸à¸£à¹Œ" #: platform/android/export/export.cpp msgid "Missing 'build-tools' directory!" @@ -12022,7 +12000,7 @@ msgstr "ไดเร็à¸à¸—à¸à¸£à¸µ 'build-tools' หายไป!" #: platform/android/export/export.cpp msgid "Unable to find Android SDK build-tools' apksigner command." -msgstr "" +msgstr "ไม่พบคำสั่ง apksigner ขà¸à¸‡ Android SDK build-tools" #: platform/android/export/export.cpp msgid "Invalid public key for APK expansion." @@ -12270,11 +12248,11 @@ msgstr "CollisionPolygon2D ที่ว่างเปล่าจะไม่ภ#: scene/2d/collision_polygon_2d.cpp msgid "Invalid polygon. At least 3 points are needed in 'Solids' build mode." -msgstr "" +msgstr "โพลีà¸à¸à¸™à¹„ม่ถูà¸à¸•à¹‰à¸à¸‡ ต้à¸à¸‡à¸¡à¸µà¸à¸¢à¹ˆà¸²à¸‡à¸™à¹‰à¸à¸¢ 3 จุด ในโหมดà¸à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¹à¸šà¸š 'Solids'" #: scene/2d/collision_polygon_2d.cpp msgid "Invalid polygon. At least 2 points are needed in 'Segments' build mode." -msgstr "" +msgstr "โพลีà¸à¸à¸™à¹„ม่ถูà¸à¸•à¹‰à¸à¸‡ ต้à¸à¸‡à¸¡à¸µà¸à¸¢à¹ˆà¸²à¸‡à¸™à¹‰à¸à¸¢ 2 จุด ในโหมดà¸à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¹à¸šà¸š 'Segments'" #: scene/2d/collision_shape_2d.cpp msgid "" @@ -12463,27 +12441,23 @@ msgstr "ARVROrigin จำเป็นต้à¸à¸‡à¸¡à¸µ ARVRCamera เป็นà #: scene/3d/baked_lightmap.cpp msgid "Finding meshes and lights" -msgstr "" +msgstr "à¸à¸³à¸¥à¸±à¸‡à¸«à¸² meshes à¹à¸¥à¸° lights" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Preparing geometry (%d/%d)" -msgstr "วิเคราะห์พื้นผิว..." +msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸£à¸¹à¸›à¹€à¸£à¸‚าคณิต (%d/%d)" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Preparing environment" -msgstr "à¹à¸ªà¸”งสภาพà¹à¸§à¸”ล้à¸à¸¡" +msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸ªà¸ าพà¹à¸§à¸”ล้à¸à¸¡" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Generating capture" -msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¸£à¹‰à¸²à¸‡ Lightmaps" +msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¸£à¹‰à¸²à¸‡ capture" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Saving lightmaps" -msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¸£à¹‰à¸²à¸‡ Lightmaps" +msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึภlightmaps" #: scene/3d/baked_lightmap.cpp msgid "Done" @@ -12855,7 +12829,7 @@ msgstr "ขนาดวิวพà¸à¸£à¹Œà¸•à¸ˆà¸°à¸•à¹‰à¸à¸‡à¸¡à¸²à¸à¸à¸§à¹ˆ msgid "" "The sampler port is connected but not used. Consider changing the source to " "'SamplerPort'." -msgstr "" +msgstr "พà¸à¸£à¹Œà¸•à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸à¸¢à¸¹à¹ˆà¹à¸•à¹ˆà¹„ม่ได้ใช้ ควรที่จะเปลี่ยนเป็น \"SamplerPort\"" #: scene/resources/visual_shader_nodes.cpp msgid "Invalid source for preview." diff --git a/editor/translations/tr.po b/editor/translations/tr.po index b10bf6f02b..619bd94bb1 100644 --- a/editor/translations/tr.po +++ b/editor/translations/tr.po @@ -61,8 +61,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-16 10:40+0000\n" -"Last-Translator: furkan atalar <fatalar55@gmail.com>\n" +"PO-Revision-Date: 2021-03-31 03:53+0000\n" +"Last-Translator: OÄŸuz Ersen <oguzersen@protonmail.com>\n" "Language-Team: Turkish <https://hosted.weblate.org/projects/godot-engine/" "godot/tr/>\n" "Language: tr\n" @@ -70,7 +70,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 4.5.2-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -2579,9 +2579,8 @@ msgstr "" "baÅŸarısız oldu." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: '%s'." -msgstr "Eklentideki betik alanı bulunamıyor: 'res://addons/%s'." +msgstr "Eklentide için betik alanı bulunamıyor: '%s'." #: editor/editor_node.cpp msgid "Unable to load addon script from path: '%s'." @@ -3725,6 +3724,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"İçe aktarma bu dosya için devre dışı bırakıldı, bu nedenle düzenleme için " +"açılamıyor." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4130,7 +4131,7 @@ msgstr "Varsayılanlara dön" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Dosyayı Koru (İçeri Aktarma Yok)" #: editor/import_dock.cpp msgid "%d Files" @@ -10459,9 +10460,8 @@ msgid "Plugins" msgstr "Eklentiler" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Import Defaults" -msgstr "Varsayılanları İçe Aktar" +msgstr "Öntanımlı İçe Aktarma Ayarları" #: editor/property_editor.cpp msgid "Preset..." @@ -12503,11 +12503,12 @@ msgstr "BoÅŸ bir CollisionPolygon2D'nin çarpışmaya hiçbir etkisi yoktur." #: scene/2d/collision_polygon_2d.cpp msgid "Invalid polygon. At least 3 points are needed in 'Solids' build mode." -msgstr "" +msgstr "Geçersiz çokgen. 'Solids' oluÅŸturma modunda en az 3 nokta gereklidir." #: scene/2d/collision_polygon_2d.cpp msgid "Invalid polygon. At least 2 points are needed in 'Segments' build mode." msgstr "" +"Geçersiz çokgen. 'Segments' oluÅŸturma modunda en az 2 nokta gereklidir." #: scene/2d/collision_shape_2d.cpp msgid "" diff --git a/editor/translations/uk.po b/editor/translations/uk.po index 0fabbe77b4..3dd58a87f4 100644 --- a/editor/translations/uk.po +++ b/editor/translations/uk.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: Ukrainian (Godot Engine)\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-10 22:14+0000\n" -"Last-Translator: Tymofij Lytvynenko <till.svit@gmail.com>\n" +"PO-Revision-Date: 2021-03-31 03:53+0000\n" +"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/godot-engine/" "godot/uk/>\n" "Language: uk\n" @@ -30,7 +30,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 4.5.2-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -3698,6 +3698,8 @@ msgstr "" msgid "" "Importing has been disabled for this file, so it can't be opened for editing." msgstr "" +"Ð†Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ файла вимкнено, тому його не можна відкрити Ð´Ð»Ñ " +"редагуваннÑ." #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4101,7 +4103,7 @@ msgstr "Відновити типові параметри" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "Зберегти файл (не імпортувати)" #: editor/import_dock.cpp msgid "%d Files" diff --git a/editor/translations/vi.po b/editor/translations/vi.po index d01cefc0c7..fa600ca176 100644 --- a/editor/translations/vi.po +++ b/editor/translations/vi.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-29 21:57+0000\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" "Last-Translator: Rev <revolnoom7801@gmail.com>\n" "Language-Team: Vietnamese <https://hosted.weblate.org/projects/godot-engine/" "godot/vi/>\n" @@ -524,7 +524,6 @@ msgid "Group tracks by node or display them as plain list." msgstr "Nhóm các track bởi nút hoặc hiển thị chúng dạng danh sách Ä‘Æ¡n giản." #: editor/animation_track_editor.cpp -#, fuzzy msgid "Snap:" msgstr "DÃnh:" @@ -1571,7 +1570,7 @@ msgstr "LÆ°u trữ tệp tin:" #: editor/editor_export.cpp msgid "No export template found at the expected path:" -msgstr "" +msgstr "Không thấy mẫu xuất nà o ở Ä‘Æ°á»ng dẫn mong đợi:" #: editor/editor_export.cpp msgid "Packing" @@ -1605,22 +1604,20 @@ msgstr "" "Trình Ä‘iá»u khiển Dá»± phòng'." #: editor/editor_export.cpp -#, fuzzy msgid "" "Target platform requires 'PVRTC' texture compression for GLES2. Enable " "'Import Pvrtc' in Project Settings." msgstr "" -"Ná»n tảng yêu cầu dùng kiểu nén 'ETC' cho GLES2. Báºt 'Nháºp ETC' trong Cà i đặt " -"Dá»± án." +"Ná»n tảng yêu cầu dùng kiểu nén 'PVRTC' cho GLES2. Hãy báºt 'Nháºp Pvrtc' trong " +"Cà i đặt Dá»± án." #: editor/editor_export.cpp -#, fuzzy msgid "" "Target platform requires 'ETC2' or 'PVRTC' texture compression for GLES3. " "Enable 'Import Etc 2' or 'Import Pvrtc' in Project Settings." msgstr "" -"Ná»n tảng yêu cầu dùng kiểu nén 'ETC2' cho GLES3. Báºt 'Nháºp ETC2' trong Cà i " -"đặt Dá»± án." +"Ná»n tảng yêu cầu dùng kiểu nén 'ETC2' hoặc 'PVRTC' cho GLES3. Hãy báºt 'Nháºp " +"ETC2' hoặc 'Nháºp Pvrtc' trong Cà i đặt Dá»± án." #: editor/editor_export.cpp #, fuzzy @@ -1643,8 +1640,9 @@ msgstr "Không tìm thấy mẫu gỡ lá»—i tuỳ chỉnh." #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp +#, fuzzy msgid "Custom release template not found." -msgstr "" +msgstr "Không tìm thấy mẫu phát hà nh tùy chỉnh." #: editor/editor_export.cpp platform/javascript/export/export.cpp msgid "Template file not found:" @@ -2534,18 +2532,22 @@ msgstr "" #: editor/editor_node.cpp msgid "Unable to load addon script from path: '%s'." -msgstr "" +msgstr "Không thể nạp tệp lệnh bổ trợ từ Ä‘Æ°á»ng dẫn: '%s'." #: editor/editor_node.cpp msgid "" "Unable to load addon script from path: '%s' There seems to be an error in " "the code, please check the syntax." msgstr "" +"Không thể nạp tệp lệnh bổ trợ từ Ä‘Æ°á»ng dẫn: '%s' Có vẻ có lá»—i trong mã " +"nguồn, hãy kiểm tra lại cú pháp." #: editor/editor_node.cpp msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." msgstr "" +"Không thể tải script addon từ Ä‘Æ°á»ng dẫn: '%s' Kiểu gốc không phải " +"EditorPlugin." #: editor/editor_node.cpp msgid "Unable to load addon script from path: '%s' Script is not in tool mode." @@ -3222,7 +3224,6 @@ msgid "Average Time (sec)" msgstr "Thá»i gian trung bình (giây)" #: editor/editor_profiler.cpp -#, fuzzy msgid "Frame %" msgstr "Khung hình %" @@ -3255,7 +3256,6 @@ msgid "Edit Text:" msgstr "Sá»a văn bản:" #: editor/editor_properties.cpp editor/script_create_dialog.cpp -#, fuzzy msgid "On" msgstr "Báºt" @@ -3626,7 +3626,6 @@ msgid "Godot Export Templates" msgstr "Các mẫu xuất bản Godot" #: editor/export_template_manager.cpp -#, fuzzy msgid "Export Template Manager" msgstr "Trình quản lý Mẫu Xuất" @@ -4022,14 +4021,12 @@ msgid "Generating Lightmaps" msgstr "" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating for Mesh: " msgstr "Tạo cho lÆ°á»›i: " #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Running Custom Script..." -msgstr "Chạy Táºp lệnh Tá»± chá»n ..." +msgstr "Chạy Tệp lệnh Tá»± chá»n ..." #: editor/import/resource_importer_scene.cpp msgid "Couldn't load post-import script:" @@ -4152,12 +4149,10 @@ msgid "Open in Help" msgstr "Mở trong Trợ giúp" #: editor/inspector_dock.cpp -#, fuzzy msgid "Create a new resource in memory and edit it." msgstr "Tạo tà i nguyên má»›i trong bá»™ nhá»› rồi chỉnh sá»a." #: editor/inspector_dock.cpp -#, fuzzy msgid "Load an existing resource from disk and edit it." msgstr "Tải tà i nguyên có sẵn trong Ä‘Ä©a rồi chỉnh sá»a." @@ -4343,7 +4338,6 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp scene/gui/graph_edit.cpp -#, fuzzy msgid "Enable snap and show grid." msgstr "Báºt DÃnh và hiện lÆ°á»›i." @@ -5001,14 +4995,12 @@ msgid "Request failed, return code:" msgstr "Yêu cầu thất bại, trả lại code:" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request failed." msgstr "Yêu cầu thất bại." #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Cannot save response to:" -msgstr "Không thể gỡ bá»:" +msgstr "Không thể lÆ°u phản hồi tá»›i:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Write error." @@ -5093,7 +5085,7 @@ msgstr "Cáºp nháºt gần đây" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Least Recently Updated" -msgstr "" +msgstr "Lâu chÆ°a cáºp nháºt nhất" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Name (A-Z)" @@ -5104,14 +5096,12 @@ msgid "Name (Z-A)" msgstr "Tên (Z-A)" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "License (A-Z)" -msgstr "Cấp phép" +msgstr "Giấy phép (A-Z)" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "License (Z-A)" -msgstr "Cấp phép" +msgstr "Giấy phép (Z-A)" #: editor/plugins/asset_library_editor_plugin.cpp msgid "First" @@ -5170,9 +5160,8 @@ msgid "Testing" msgstr "Kiểm tra" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Loading..." -msgstr "Nạp ..." +msgstr "Äang tải..." #: editor/plugins/asset_library_editor_plugin.cpp msgid "Assets ZIP File" @@ -5224,7 +5213,6 @@ msgid "Preview" msgstr "Xem thá»" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Configure Snap" msgstr "Cà i đặt DÃnh" @@ -5241,9 +5229,8 @@ msgid "Primary Line Every:" msgstr "ÄÆ°á»ng kẻ chÃnh Má»—i:" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "steps" -msgstr "2 bÆ°á»›c" +msgstr "bÆ°á»›c" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Rotation Offset:" @@ -5254,9 +5241,8 @@ msgid "Rotation Step:" msgstr "BÆ°á»›c xoay:" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Scale Step:" -msgstr "Tá»· lệ:" +msgstr "BÆ°á»›c thu phóng:" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Move Vertical Guide" @@ -5288,58 +5274,49 @@ msgstr "Tạo Ä‘Æ°á»ng căn ngang và dá»c" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Set CanvasItem \"%s\" Pivot Offset to (%d, %d)" -msgstr "" +msgstr "Äặt Ä‘á»™ dá»i của CanvasItem \"%s\" tá»›i (%d, %d)" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Rotate %d CanvasItems" -msgstr "Xoay CanvasItem" +msgstr "Xoay %d CanvasItem" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Rotate CanvasItem \"%s\" to %d degrees" -msgstr "Xoay CanvasItem" +msgstr "Xoay CanvasItem \"%s\" thà nh %d Ä‘á»™" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Move CanvasItem \"%s\" Anchor" -msgstr "Di chuyển CanvasItem" +msgstr "Di chuyển neo CanvasItem \"%s\"" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Scale Node2D \"%s\" to (%s, %s)" -msgstr "" +msgstr "Thu phóng Node2D \"%s\" thà nh (%s, %s)" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Resize Control \"%s\" to (%d, %d)" msgstr "Chỉnh kÃch cỡ Nút Äiá»u khiển \"%s\" thà nh (%d, %d)" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Scale %d CanvasItems" -msgstr "Tỉ lệ CanvasItem" +msgstr "Thu phóng %d CanvasItem" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Scale CanvasItem \"%s\" to (%s, %s)" -msgstr "Tỉ lệ CanvasItem" +msgstr "Thu phóng CanvasItem \"%s\" thà nh (%s, %s)" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Move %d CanvasItems" -msgstr "Di chuyển CanvasItem" +msgstr "Di chuyển %d CanvasItem" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Move CanvasItem \"%s\" to (%d, %d)" -msgstr "Di chuyển CanvasItem" +msgstr "Di chuyển CanvasItem \"%s\" tá»›i (%d, %d)" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "" "Children of containers have their anchors and margins values overridden by " "their parent." -msgstr "" -"Mục con trong thùng chứa có giá trị neo và lá» của chúng được ghi đè bởi cha " -"chúng." +msgstr "Các nút Container sẽ ép các nút con theo neo và lá» mà nó xác định." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Presets for the anchors and margins values of a Control node." @@ -5350,8 +5327,7 @@ msgid "" "When active, moving Control nodes changes their anchors instead of their " "margins." msgstr "" -"Khi hoạt Ä‘á»™ng, các nút Control di chuyển thay đổi các neo thay vì lá» của " -"chúng." +"Khi báºt, di chuyển các nút Control sẽ thay đổi neo thay vì lá» của chúng." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Top Left" @@ -5426,7 +5402,7 @@ msgstr "Giữ Tỉ lệ" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Anchors only" -msgstr "Chỉ các neo" +msgstr "Chỉ neo" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Change Anchors and Margins" @@ -5526,9 +5502,8 @@ msgid "Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Alt+RMB: Depth list selection" -msgstr "Alt+chuá»™t phải: Chá»n theo thứ tá»± trên dÆ°á»›i" +msgstr "Alt+chuá»™t phải: Chá»n theo tầng" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -5572,17 +5547,14 @@ msgid "Toggle smart snapping." msgstr "Báºt tắt DÃnh thông minh." #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Use Smart Snap" msgstr "Sá» dụng DÃnh thông minh" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggle grid snapping." msgstr "Báºt tắt DÃnh lÆ°á»›i." #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Use Grid Snap" msgstr "Sá» dụng DÃnh lÆ°á»›i" @@ -5599,7 +5571,6 @@ msgid "Use Scale Snap" msgstr "DÃnh theo bÆ°á»›c tỉ lệ" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap Relative" msgstr "DÃnh tÆ°Æ¡ng đối" @@ -5687,7 +5658,6 @@ msgid "Always Show Grid" msgstr "Hiện lÆ°á»›i" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Show Helpers" msgstr "Hiển thị trợ giúp" @@ -5700,9 +5670,8 @@ msgid "Show Guides" msgstr "Hiện Ä‘Æ°á»ng căn" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Show Origin" -msgstr "Hiện Ä‘iểm gốc" +msgstr "Hiện Gốc" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show Viewport" @@ -5764,7 +5733,6 @@ msgid "Insert Key (Existing Tracks)" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Copy Pose" msgstr "Sao chép TÆ° thế" @@ -5843,9 +5811,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 "Restart ngay" +msgstr "Khởi Ä‘á»™ng lại" #: editor/plugins/cpu_particles_2d_editor_plugin.cpp #: editor/plugins/particles_2d_editor_plugin.cpp @@ -5989,7 +5956,6 @@ msgid "Gradient Edited" msgstr "" #: editor/plugins/item_list_editor_plugin.cpp -#, fuzzy msgid "Item %d" msgstr "Mục %d" @@ -6176,7 +6142,6 @@ msgid "Create Outline Mesh" msgstr "Tạo lÆ°á»›i viá»n" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "Outline Size:" msgstr "KÃch cỡ viá»n:" @@ -6185,7 +6150,6 @@ msgid "UV Channel Debug" msgstr "" #: editor/plugins/mesh_library_editor_plugin.cpp -#, fuzzy msgid "Remove item %d?" msgstr "Xóa mục %d?" @@ -6342,7 +6306,7 @@ msgstr "Xóa Animation" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp msgid "Generation Time (sec):" -msgstr "" +msgstr "Thá»i gian tạo (giây):" #: editor/plugins/particles_editor_plugin.cpp msgid "The geometry's faces don't contain any area." @@ -6355,7 +6319,7 @@ msgstr "Cảnh không chứa tệp lệnh." #: editor/plugins/particles_editor_plugin.cpp msgid "\"%s\" doesn't inherit from Spatial." -msgstr "" +msgstr "\"%s\" không kế thừa từ Spatial." #: editor/plugins/particles_editor_plugin.cpp msgid "\"%s\" doesn't contain geometry." @@ -6403,7 +6367,7 @@ msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" -msgstr "" +msgstr "Xóa Ä‘iểm khá»i Ä‘Æ°á»ng cong" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Out-Control from Curve" @@ -6416,7 +6380,7 @@ msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp msgid "Add Point to Curve" -msgstr "" +msgstr "Thêm Äiểm và o ÄÆ°á»ng cong" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Split Curve" @@ -6424,7 +6388,7 @@ msgstr "Chia Ä‘Æ°á»ng Curve" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Move Point in Curve" -msgstr "" +msgstr "Di chuyển Äiểm trên ÄÆ°á»ng cong" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Move In-Control in Curve" @@ -6451,7 +6415,7 @@ msgstr "Nhấp: Tạo Point" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Left Click: Split Segment (in curve)" -msgstr "" +msgstr "Chuá»™t trái: Phân tách các Ä‘oạn (trong Ä‘Æ°á»ng cong)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp @@ -6465,7 +6429,7 @@ msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp msgid "Add Point (in empty space)" -msgstr "" +msgstr "Thêm Ä‘iểm (trong không gian trống)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp @@ -6475,31 +6439,33 @@ msgstr "Xóa Point" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" -msgstr "" +msgstr "Äóng Ä‘Æ°á»ng cong" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp editor/plugins/theme_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp editor/project_export.cpp msgid "Options" -msgstr "" +msgstr "Tùy chá»n" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +#, fuzzy msgid "Mirror Handle Angles" -msgstr "" +msgstr "Äối xứng góc tay cầm" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +#, fuzzy msgid "Mirror Handle Lengths" -msgstr "" +msgstr "Äối xứng Ä‘á»™ dà i tay cầm" #: editor/plugins/path_editor_plugin.cpp msgid "Curve Point #" -msgstr "" +msgstr "Äiểm uốn #" #: editor/plugins/path_editor_plugin.cpp msgid "Set Curve Point Position" -msgstr "" +msgstr "Äặt vị trà điểm uốn" #: editor/plugins/path_editor_plugin.cpp msgid "Set Curve In Position" @@ -6511,7 +6477,7 @@ msgstr "" #: editor/plugins/path_editor_plugin.cpp msgid "Split Path" -msgstr "" +msgstr "Tách Ä‘Æ°á»ng" #: editor/plugins/path_editor_plugin.cpp msgid "Remove Path Point" @@ -6527,7 +6493,7 @@ msgstr "" #: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" -msgstr "" +msgstr "Phân tách Ä‘oạn (trong Ä‘Æ°á»ng cong)" #: editor/plugins/physical_bone_plugin.cpp msgid "Move Joint" @@ -6540,7 +6506,7 @@ msgstr "Thuá»™c tÃnh xÆ°Æ¡ng của nút Polygon2D không trỠđến nút Skel #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Sync Bones" -msgstr "" +msgstr "Äồng bá»™ XÆ°Æ¡ng" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "" @@ -6572,7 +6538,7 @@ msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Invalid Polygon (need 3 different vertices)" -msgstr "" +msgstr "Äa giác không hợp lệ (cần 3 đỉnh khác nhau)" #: editor/plugins/polygon_2d_editor_plugin.cpp #, fuzzy @@ -6637,7 +6603,7 @@ msgstr "Shift: Di chuyển tất" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Shift+Command: Scale" -msgstr "" +msgstr "Shift+Command: Thu phóng" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Ctrl: Rotate" @@ -6645,7 +6611,7 @@ msgstr "Ctrl: Xoay" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Shift+Ctrl: Scale" -msgstr "" +msgstr "Shift+Ctrl: Thu phóng" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Move Polygon" @@ -6806,7 +6772,7 @@ msgstr "Äóng và lÆ°u thay đổi?" #: editor/plugins/script_editor_plugin.cpp msgid "Error writing TextFile:" -msgstr "" +msgstr "Lá»—i viết TextFile:" #: editor/plugins/script_editor_plugin.cpp #, fuzzy @@ -6850,7 +6816,7 @@ msgstr "LÆ°u Scene vá»›i tên..." #: editor/plugins/script_editor_plugin.cpp msgid "Can't obtain the script for running." -msgstr "" +msgstr "Không thể lấy tệp lệnh để chạy." #: editor/plugins/script_editor_plugin.cpp msgid "Script failed reloading, check console for errors." @@ -6893,7 +6859,7 @@ msgstr "Tìm tiếp" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp msgid "Find Previous" -msgstr "" +msgstr "Tìm trÆ°á»›c đó" #: editor/plugins/script_editor_plugin.cpp #, fuzzy @@ -6902,7 +6868,7 @@ msgstr "Lá»c các thuá»™c tÃnh" #: editor/plugins/script_editor_plugin.cpp msgid "Toggle alphabetical sorting of the method list." -msgstr "" +msgstr "Báºt/tắt sắp xếp danh sách phÆ°Æ¡ng thức theo bảng chữ cái." #: editor/plugins/script_editor_plugin.cpp #, fuzzy @@ -7089,7 +7055,7 @@ msgstr "" #: editor/plugins/script_text_editor.cpp msgid "[Ignore]" -msgstr "" +msgstr "[Bá» qua]" #: editor/plugins/script_text_editor.cpp msgid "Line" @@ -7119,15 +7085,15 @@ msgstr "Chá»n mà u" #: editor/plugins/script_text_editor.cpp editor/plugins/text_editor.cpp msgid "Convert Case" -msgstr "" +msgstr "Chuyển đổi Hoa thÆ°á»ng" #: editor/plugins/script_text_editor.cpp editor/plugins/text_editor.cpp msgid "Uppercase" -msgstr "" +msgstr "Chữ hoa" #: editor/plugins/script_text_editor.cpp editor/plugins/text_editor.cpp msgid "Lowercase" -msgstr "" +msgstr "Chữ thÆ°á»ng" #: editor/plugins/script_text_editor.cpp editor/plugins/text_editor.cpp msgid "Capitalize" @@ -7135,12 +7101,12 @@ msgstr "" #: editor/plugins/script_text_editor.cpp editor/plugins/text_editor.cpp msgid "Syntax Highlighter" -msgstr "" +msgstr "Nổi mà u cú pháp" #: editor/plugins/script_text_editor.cpp #: editor/plugins/shader_editor_plugin.cpp editor/plugins/text_editor.cpp msgid "Bookmarks" -msgstr "" +msgstr "Dấu trang" #: editor/plugins/script_text_editor.cpp msgid "Breakpoints" @@ -7149,7 +7115,7 @@ msgstr "Äiểm dừng" #: editor/plugins/script_text_editor.cpp #: editor/plugins/shader_editor_plugin.cpp editor/plugins/text_editor.cpp msgid "Go To" -msgstr "" +msgstr "Äi tá»›i" #: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp @@ -7163,31 +7129,31 @@ msgstr "Chá»n Toà n Bá»™" #: editor/plugins/script_text_editor.cpp msgid "Delete Line" -msgstr "" +msgstr "Xóa dòng" #: editor/plugins/script_text_editor.cpp msgid "Indent Left" -msgstr "" +msgstr "Thụt lá» Trái" #: editor/plugins/script_text_editor.cpp msgid "Indent Right" -msgstr "" +msgstr "Thụt lá» phải" #: editor/plugins/script_text_editor.cpp msgid "Toggle Comment" -msgstr "" +msgstr "Báºt/tắt chú thÃch" #: editor/plugins/script_text_editor.cpp msgid "Fold/Unfold Line" -msgstr "" +msgstr "Cuá»™n/Trải dòng" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" -msgstr "" +msgstr "Cuá»™n tất cả các dòng" #: editor/plugins/script_text_editor.cpp msgid "Unfold All Lines" -msgstr "" +msgstr "Trải tất cả các dòng" #: editor/plugins/script_text_editor.cpp msgid "Clone Down" @@ -7204,19 +7170,19 @@ msgstr "Chá»n Scale" #: editor/plugins/script_text_editor.cpp msgid "Trim Trailing Whitespace" -msgstr "" +msgstr "Xóa khoảng trắng cuối dòng" #: editor/plugins/script_text_editor.cpp msgid "Convert Indent to Spaces" -msgstr "" +msgstr "Chuyển thụt lá» thà nh Dấu cách" #: editor/plugins/script_text_editor.cpp msgid "Convert Indent to Tabs" -msgstr "" +msgstr "Chuyển thụt lá» thà nh Tab" #: editor/plugins/script_text_editor.cpp msgid "Auto Indent" -msgstr "" +msgstr "Thụt lá» Tá»± Ä‘á»™ng" #: editor/plugins/script_text_editor.cpp #, fuzzy @@ -7244,7 +7210,7 @@ msgstr "Äến Step trÆ°á»›c đó" #: editor/plugins/script_text_editor.cpp msgid "Remove All Bookmarks" -msgstr "" +msgstr "Xóa hết má»i dấu trang" #: editor/plugins/script_text_editor.cpp msgid "Go to Function..." @@ -7256,12 +7222,13 @@ msgstr "Äến Dòng..." #: editor/plugins/script_text_editor.cpp #: modules/visual_script/visual_script_editor.cpp +#, fuzzy msgid "Toggle Breakpoint" -msgstr "" +msgstr "Tạo Ä‘iểm dừng" #: editor/plugins/script_text_editor.cpp msgid "Remove All Breakpoints" -msgstr "" +msgstr "Xóa hết má»i Ä‘iểm dừng" #: editor/plugins/script_text_editor.cpp #, fuzzy @@ -7298,19 +7265,19 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" -msgstr "" +msgstr "Skeleton2D" #: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Make Rest Pose (From Bones)" -msgstr "" +msgstr "Tạo tÆ° thế nghỉ (Từ XÆ°Æ¡ng)" #: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Set Bones to Rest Pose" -msgstr "" +msgstr "Äặt XÆ°Æ¡ng thà nh TÆ° thế Nghỉ" #: editor/plugins/skeleton_editor_plugin.cpp msgid "Create physical bones" -msgstr "" +msgstr "Tạo xÆ°Æ¡ng váºt lý" #: editor/plugins/skeleton_editor_plugin.cpp #, fuzzy @@ -7318,8 +7285,9 @@ msgid "Skeleton" msgstr "Xóa Point" #: editor/plugins/skeleton_editor_plugin.cpp +#, fuzzy msgid "Create physical skeleton" -msgstr "" +msgstr "Tạo bá»™ xÆ°Æ¡ng váºt lý" #: editor/plugins/skeleton_ik_editor_plugin.cpp msgid "Play IK" @@ -7462,7 +7430,6 @@ msgid "Align Rotation with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp -#, fuzzy msgid "No parent to instance a child at." msgstr "Không có nút mẹ để khởi tạo nút con." @@ -7511,7 +7478,6 @@ msgid "View FPS" msgstr "Xem tốc Ä‘á»™ khung hình" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Half Resolution" msgstr "Ná»a Ä‘á»™ phân giải" @@ -7593,14 +7559,13 @@ msgstr "" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Snap Nodes To Floor" -msgstr "DÃnh các nút lên Sà n" +msgstr "DÃnh Nút lên Sà n" #: editor/plugins/spatial_editor_plugin.cpp msgid "Couldn't find a solid floor to snap the selection to." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "" "Drag: Rotate\n" "Alt+Drag: Move\n" @@ -7611,7 +7576,6 @@ msgstr "" "Alt+Chuá»™t phải: Chá»n theo tầng" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Use Local Space" msgstr "Sá» dụng Không gian Cục bá»™" @@ -7670,9 +7634,8 @@ msgid "Transform" msgstr "Biến đổi" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Snap Object to Floor" -msgstr "DÃnh váºt vá»›i Sà n" +msgstr "DÃnh Váºt lên Sà n" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy @@ -7778,7 +7741,6 @@ msgid "Pre" msgstr "TrÆ°á»›c" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Post" msgstr "Sau" @@ -8266,7 +8228,6 @@ msgid "Enable Priority" msgstr "" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Filter tiles" msgstr "Lá»c ô" @@ -8596,7 +8557,6 @@ msgid "Clear Tile Bitmask" msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Make Polygon Concave" msgstr "Biến thà nh Ä‘a giác lõm" @@ -8628,9 +8588,8 @@ msgid "Edit Tile Priority" msgstr "Chỉnh Ä‘á»™ Æ°u tiên của ô" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Edit Tile Z Index" -msgstr "Sá»a chiá»u Z của ô" +msgstr "Sá»a chiá»u sâu (Z) của ô" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy @@ -8739,7 +8698,6 @@ msgstr "Äổi" #: editor/plugins/version_control_editor_plugin.cpp #: modules/gdnative/gdnative_library_singleton_editor.cpp -#, fuzzy msgid "Status" msgstr "Trạng thái" @@ -9282,7 +9240,6 @@ msgid "Finds the truncated value of the parameter." msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Adds scalar to scalar." msgstr "Cá»™ng hai số." @@ -9291,7 +9248,6 @@ msgid "Divides scalar by scalar." msgstr "Chia hai số." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Multiplies scalar by scalar." msgstr "Nhân hai số." @@ -10703,7 +10659,6 @@ msgid "Detach Script" msgstr "ÄÃnh kèm Script" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "This operation can't be done on the tree root." msgstr "Thao tác nà y không thể áp dụng lên gốc của cây." @@ -10840,12 +10795,11 @@ msgid "Change type of node(s)" msgstr "Äổi loại của các nút" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "" "Couldn't save new scene. Likely dependencies (instances) couldn't be " "satisfied." msgstr "" -"Không thể lÆ°u cảnh má»›i. Có khi là do không thá»a mãn được các phần phụ thuá»™c." +"Không thể lÆ°u cảnh má»›i. Có vẻ là do không thá»a mãn được các phần phụ thuá»™c." #: editor/scene_tree_dock.cpp msgid "Error saving scene." @@ -10864,9 +10818,8 @@ msgid "Clear Inheritance" msgstr "Xóa Kế thừa" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Editable Children" -msgstr "Các Con có thể sá»a" +msgstr "Các nút Con có thể sá»a" #: editor/scene_tree_dock.cpp msgid "Load As Placeholder" @@ -10917,7 +10870,6 @@ msgid "Copy Node Path" msgstr "Sao chép Ä‘Æ°á»ng dẫn nút" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Delete (No Confirm)" msgstr "Xóa (Không há»i lại)" @@ -10948,11 +10900,11 @@ msgstr "" #: editor/scene_tree_dock.cpp msgid "Local" -msgstr "" +msgstr "Cục bá»™" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" -msgstr "" +msgstr "Xóa Kế thừa? (Mất tăm luôn đấy!)" #: editor/scene_tree_editor.cpp msgid "Toggle Visible" @@ -11017,6 +10969,8 @@ msgid "" "Children are not selectable.\n" "Click to make selectable." msgstr "" +"Không thể chá»n Con của nút nà y.\n" +"Bấm và o đây để có thể chá»n chúng." #: editor/scene_tree_editor.cpp msgid "Toggle Visibility" @@ -11027,6 +10981,8 @@ msgid "" "AnimationPlayer is pinned.\n" "Click to unpin." msgstr "" +"AnimationPlayer đã được ghim.\n" +"Bấm để bá» ghim." #: editor/scene_tree_editor.cpp msgid "Invalid node name, the following characters are not allowed:" @@ -11050,11 +11006,11 @@ msgstr "Chá»n má»™t Nút" #: editor/script_create_dialog.cpp msgid "Path is empty." -msgstr "" +msgstr "ÄÆ°á»ng dẫn trống." #: editor/script_create_dialog.cpp msgid "Filename is empty." -msgstr "" +msgstr "Tên tệp trống." #: editor/script_create_dialog.cpp msgid "Path is not local." @@ -11075,17 +11031,16 @@ msgid "File does not exist." msgstr "Tệp không tồn tại." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Invalid extension." msgstr "Tên Ä‘uôi không hợp lệ." #: editor/script_create_dialog.cpp msgid "Wrong extension chosen." -msgstr "" +msgstr "Sai Ä‘uôi mở rá»™ng." #: editor/script_create_dialog.cpp msgid "Error loading template '%s'" -msgstr "" +msgstr "Lá»—i nạp mẫu '%s'" #: editor/script_create_dialog.cpp msgid "Error - Could not create script in filesystem." @@ -11093,7 +11048,7 @@ msgstr "" #: editor/script_create_dialog.cpp msgid "Error loading script from %s" -msgstr "" +msgstr "Lá»—i nạp tệp lệnh từ %s" #: editor/script_create_dialog.cpp #, fuzzy @@ -11101,12 +11056,13 @@ msgid "Overrides" msgstr "Ghi đè" #: editor/script_create_dialog.cpp +#, fuzzy msgid "N/A" -msgstr "" +msgstr "Không có" #: editor/script_create_dialog.cpp msgid "Open Script / Choose Location" -msgstr "" +msgstr "Mở tệp lệnh / Chá»n vị trÃ" #: editor/script_create_dialog.cpp #, fuzzy @@ -11114,8 +11070,9 @@ msgid "Open Script" msgstr "Tạo Script" #: editor/script_create_dialog.cpp +#, fuzzy msgid "File exists, it will be reused." -msgstr "" +msgstr "Tệp tồn tại, và sẽ được dùng lại." #: editor/script_create_dialog.cpp #, fuzzy @@ -11137,11 +11094,11 @@ msgstr "Animation tree khả dụng." #: editor/script_create_dialog.cpp msgid "Allowed: a-z, A-Z, 0-9, _ and ." -msgstr "" +msgstr "Äược dùng: a-z, A-Z, 0-9, _ và ." #: editor/script_create_dialog.cpp msgid "Built-in script (into scene file)." -msgstr "" +msgstr "Tệp lệnh tÃch hợp (và o tệp cảnh)." #: editor/script_create_dialog.cpp msgid "Will create a new script file." @@ -11149,7 +11106,7 @@ msgstr "Sẽ tạo má»™t tệp lệnh má»›i." #: editor/script_create_dialog.cpp msgid "Will load an existing script file." -msgstr "" +msgstr "Sẽ nạp má»™t tệp lệnh đã tồn tại." #: editor/script_create_dialog.cpp #, fuzzy @@ -11161,6 +11118,8 @@ msgid "" "Note: Built-in scripts have some limitations and can't be edited using an " "external editor." msgstr "" +"LÆ°u ý: Tệp lệnh tÃch hợp có má»™t số hạn chế và không thể chỉnh sá»a bằng trình " +"biên soạn bên ngoà i." #: editor/script_create_dialog.cpp msgid "Class Name:" @@ -11184,7 +11143,7 @@ msgstr "" #: editor/script_editor_debugger.cpp msgid "Bytes:" -msgstr "" +msgstr "Bytes:" #: editor/script_editor_debugger.cpp msgid "Warning:" @@ -11212,8 +11171,9 @@ msgid "Source:" msgstr "Nguồn:" #: editor/script_editor_debugger.cpp +#, fuzzy msgid "C++ Source:" -msgstr "" +msgstr "Tệp nguồn C++:" #: editor/script_editor_debugger.cpp msgid "Stack Trace" @@ -11221,7 +11181,7 @@ msgstr "" #: editor/script_editor_debugger.cpp msgid "Errors" -msgstr "" +msgstr "Lá»—i" #: editor/script_editor_debugger.cpp msgid "Child process connected." @@ -11229,7 +11189,7 @@ msgstr "Äã kết nối tiến trình con." #: editor/script_editor_debugger.cpp msgid "Copy Error" -msgstr "" +msgstr "Sao chép lá»—i" #: editor/script_editor_debugger.cpp msgid "Video RAM" @@ -11261,28 +11221,31 @@ msgid "Network Profiler" msgstr "Xuất hồ sÆ¡" #: editor/script_editor_debugger.cpp +#, fuzzy msgid "Monitor" -msgstr "" +msgstr "Mà n hình" #: editor/script_editor_debugger.cpp msgid "Value" -msgstr "" +msgstr "Giá trị" #: editor/script_editor_debugger.cpp +#, fuzzy msgid "Monitors" -msgstr "" +msgstr "Mà n hình" #: editor/script_editor_debugger.cpp msgid "Pick one or more items from the list to display the graph." -msgstr "" +msgstr "Chá»n má»™t hoặc nhiá»u mục từ danh sách để hiển thị biểu đồ." #: editor/script_editor_debugger.cpp msgid "List of Video Memory Usage by Resource:" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy msgid "Total:" -msgstr "" +msgstr "Tổng:" #: editor/script_editor_debugger.cpp #, fuzzy @@ -11291,23 +11254,24 @@ msgstr "Xuất hồ sÆ¡" #: editor/script_editor_debugger.cpp msgid "Resource Path" -msgstr "" +msgstr "ÄÆ°á»ng dẫn Tà i nguyên" #: editor/script_editor_debugger.cpp msgid "Type" -msgstr "" +msgstr "Kiểu" #: editor/script_editor_debugger.cpp msgid "Format" -msgstr "" +msgstr "Äịnh dạng" #: editor/script_editor_debugger.cpp msgid "Usage" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy msgid "Misc" -msgstr "" +msgstr "Khác" #: editor/script_editor_debugger.cpp msgid "Clicked Control:" @@ -11331,15 +11295,15 @@ msgstr "" #: editor/settings_config_dialog.cpp msgid "Erase Shortcut" -msgstr "" +msgstr "Xóa lối tắt" #: editor/settings_config_dialog.cpp msgid "Restore Shortcut" -msgstr "" +msgstr "Khôi phục lối tắt" #: editor/settings_config_dialog.cpp msgid "Change Shortcut" -msgstr "" +msgstr "Thay đổi Lối tắt" #: editor/settings_config_dialog.cpp msgid "Editor Settings" @@ -11347,7 +11311,7 @@ msgstr "Cà i đặt Trình biên táºp" #: editor/settings_config_dialog.cpp msgid "Shortcuts" -msgstr "" +msgstr "Lối tắt" #: editor/settings_config_dialog.cpp msgid "Binding" @@ -11355,7 +11319,7 @@ msgstr "" #: editor/spatial_editor_gizmos.cpp msgid "Change Light Radius" -msgstr "" +msgstr "Thay đổi bán kÃnh ánh sáng" #: editor/spatial_editor_gizmos.cpp msgid "Change AudioStreamPlayer3D Emission Angle" @@ -11382,8 +11346,9 @@ msgid "Change Probe Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp +#, fuzzy msgid "Change Sphere Shape Radius" -msgstr "" +msgstr "Thay đổi bán kÃnh hình cầu" #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp msgid "Change Box Shape Extents" @@ -11512,7 +11477,6 @@ msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" #: modules/gdscript/gdscript_functions.cpp -#, fuzzy msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Từ Ä‘iển không hợp lệ (Lá»›p con không hợp lệ)" @@ -12661,13 +12625,15 @@ msgstr "" #: scene/3d/arvr_nodes.cpp msgid "ARVRAnchor must have an ARVROrigin node as its parent." -msgstr "" +msgstr "ARVRAnchor phải là con của nút ARVROrigin." #: scene/3d/arvr_nodes.cpp msgid "" "The anchor ID must not be 0 or this anchor won't be bound to an actual " "anchor." msgstr "" +"ID của neo phải là 0, nếu không thì neo nà y sẽ không bị rà ng buá»™c vá»›i neo " +"thá»±c." #: scene/3d/arvr_nodes.cpp msgid "ARVROrigin requires an ARVRCamera child node." diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po index a1c1bd4aea..e043d0f05a 100644 --- a/editor/translations/zh_CN.po +++ b/editor/translations/zh_CN.po @@ -81,7 +81,7 @@ msgid "" msgstr "" "Project-Id-Version: Chinese (Simplified) (Godot Engine)\n" "POT-Creation-Date: 2018-01-20 12:15+0200\n" -"PO-Revision-Date: 2021-03-21 12:25+0000\n" +"PO-Revision-Date: 2021-04-05 14:28+0000\n" "Last-Translator: Haoyu Qiu <timothyqiu32@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "godot-engine/godot/zh_Hans/>\n" @@ -90,7 +90,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 4.5.2-dev\n" +"X-Generator: Weblate 4.6-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -1376,7 +1376,7 @@ msgstr "总线选项" #: editor/editor_audio_buses.cpp editor/filesystem_dock.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "Duplicate" -msgstr "æ‹·è´" +msgstr "å¤åˆ¶" #: editor/editor_audio_buses.cpp msgid "Reset Volume" @@ -3662,7 +3662,7 @@ msgstr "状æ€ï¼šå¯¼å…¥æ–‡ä»¶å¤±è´¥ã€‚请手动修å¤æ–‡ä»¶åŽé‡æ–°å¯¼å…¥ã€‚" #: editor/filesystem_dock.cpp msgid "" "Importing has been disabled for this file, so it can't be opened for editing." -msgstr "" +msgstr "该文件的导入已被ç¦ç”¨ï¼Œå› æ¤ä¸èƒ½æ‰“开进行编辑。" #: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." @@ -4063,7 +4063,7 @@ msgstr "é‡ç½®ä¸ºé»˜è®¤å€¼" #: editor/import_dock.cpp msgid "Keep File (No Import)" -msgstr "" +msgstr "ä¿ç•™æ–‡ä»¶ï¼ˆä¸å¯¼å…¥ï¼‰" #: editor/import_dock.cpp msgid "%d Files" @@ -5204,7 +5204,7 @@ msgstr "设置å¸é™„" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Grid Offset:" -msgstr "ç½‘æ ¼å移é‡:" +msgstr "ç½‘æ ¼å移：" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Grid Step:" @@ -5220,7 +5220,7 @@ msgstr "æ¥" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Rotation Offset:" -msgstr "旋转å移é‡:" +msgstr "旋转å移：" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Rotation Step:" @@ -7502,7 +7502,7 @@ msgstr "" "\n" "ç眼：Gizmo å¯è§ã€‚\n" "é—眼：Gizmo éšè—。\n" -"åŠç眼：Gizmo 也å¯ç©¿è¿‡ä¸é€æ˜Žçš„表é¢å¯è§ï¼ˆâ€œX-Ray - X å…‰â€ï¼‰ã€‚" +"åŠç眼：Gizmo 也å¯ç©¿è¿‡ä¸é€æ˜Žçš„表é¢å¯è§ï¼ˆâ€œX å…‰â€ï¼‰ã€‚" #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap Nodes To Floor" @@ -7931,7 +7931,7 @@ msgstr "自动è£å‰ª" #: editor/plugins/texture_region_editor_plugin.cpp msgid "Offset:" -msgstr "å移é‡ï¼š" +msgstr "å移：" #: editor/plugins/texture_region_editor_plugin.cpp msgid "Step:" |
