diff options
144 files changed, 3612 insertions, 1270 deletions
@@ -88,6 +88,7 @@ Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Pieter-Jan Briers <pieterjan.briers+git@gmail.com> <pieterjan.briers@gmail.com> Poommetee Ketson <poommetee@protonmail.com> Przemysław Gołąb (n-pigeon) <golab.przemyslaw@gmail.com> +Rafał Mikrut <mikrutrafal54@gmail.com> Ralf Hölzemer <r.hoelzemer@posteo.de> <rollenrolm@posteo.de> Ralf Hölzemer <r.hoelzemer@posteo.de> <rollenrolm@users.noreply.github.com> Ramesh Ravone <ramesh.maran443@gmail.com> @@ -112,4 +113,5 @@ Wilhem Barbier <nounoursheureux@openmailbox.org> <wilhem.b@free.fr> Wilhem Barbier <nounoursheureux@openmailbox.org> <schtroumps31@gmail.com> Will Nations <willnationsdev@gmail.com> yg2f <yoann@terminajones.com> +Zak Stam <zakscomputers@hotmail.com> Zher Huei Lee <lee.zh.92@gmail.com> diff --git a/AUTHORS.md b/AUTHORS.md index e9d095aae3..4dfb97641a 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -29,6 +29,7 @@ name is available. Aaron Franke (aaronfranke) Alexander Holland (AlexHolly) + Alexey Khoroshavin (allkhor) Alket Rexhepi (alketii) Andrea Catania (AndreaCatania) Andreas Haas (Hinsbart) @@ -61,6 +62,7 @@ name is available. DualMatrix Emmanuel Barroga (codecustard) Emmanuel Leblond (touilleMan) + Eoin O'Neill (Eoin-ONeill-Yokai) Eric Lasota (elasota) Erik Selecký (rxlecky) est31 @@ -76,6 +78,7 @@ name is available. Gordon MacPherson (RevoluPowered) Guilherme Felipe de C. G. da Silva (guilhermefelipecgs) Hanif Bin Ariffin (hbina) + Haoyu Qiu (timothyqiu) Hein-Pieter van Braam-Stewart (hpvb) Hiroshi Ogawa (hi-ogawa) homer666 @@ -101,6 +104,7 @@ name is available. Leon Krause (eska014) Lucien Menassol (Kanabenki) m4nu3lf + Marcel Admiraal (madmiraal) Marcelo Fernandez (marcelofg55) Marc Gilleron (Zylann) Marcin Zawiejski (dragmz) @@ -164,5 +168,6 @@ name is available. Xavier Cho (mysticfall) yg2f (SuperUserNameMan) Yuri Roubinsky (Chaosus) + Zak Stam (zaksnet) Zher Huei Lee (leezh) ZuBsPaCe @@ -12,27 +12,23 @@ generous deed immortalized in the next stable release of Godot Engine. ## Platinum sponsors - Enjin Coin <https://enjincoin.io> Heroic Labs <https://heroiclabs.com> Interblock <http://interblockgaming.com> ## Gold sponsors Gamblify <https://www.gamblify.com> - Image Campus <https://www.imagecampus.edu.ar> Moonwards <https://www.moonwards.com> ## Mini sponsors AD Ford Alan Beauchamp - Anandarup Mallik + Anand Mallik Andrew Dunai Brandon Lamb Christopher Montesano - Christoph Woinke Darkhan Baimyrza - Denis Malyavin Edward Flick Gamechuck GameDev.net @@ -54,7 +50,6 @@ generous deed immortalized in the next stable release of Godot Engine. Mike King Nathan Warden Neal Gompa (Conan Kudo) - ScottMakesGames Slobodan Milnovic Stephan Lanfermann Steve @@ -64,7 +59,6 @@ generous deed immortalized in the next stable release of Godot Engine. ## Gold donors Andrei - cheese65536 Dave David Gehrig David Snopek @@ -73,7 +67,6 @@ generous deed immortalized in the next stable release of Godot Engine. Florian Rämisch GiulianoB Jakub Grzesik - K9Kraken Manuele Finocchiaro Officine Pixel S.n.c. Retro Village @@ -95,7 +88,6 @@ generous deed immortalized in the next stable release of Godot Engine. Default Name Florian Breisch Gamejunkey - Gero Javier Roman Jay Horton Joel Höglund @@ -107,22 +99,22 @@ generous deed immortalized in the next stable release of Godot Engine. Luke Maciej Pendolski Matthew Hillier + Mohamed Ikbel Boulabiar Mored1984 - Paul LaMotte Péter Magyar Rob Messick Ryan Badour Scott Wadden Sergey Shawn Yu - The Architect thechris Tom Langwaldt tukon Unseen Domains + William Wold Alex Khayrullin - Branwyn Tylwyth + Branwyn “Bee” Tylwyth Chris Goddard Chris Serino Christian Padilla @@ -144,6 +136,7 @@ generous deed immortalized in the next stable release of Godot Engine. Robert Willes Ronnie Ashlock Thomas Bjarnelöf + Valryia Vincent Henderson Wojciech Chojnacki Xavier PATRICELLI @@ -153,7 +146,6 @@ generous deed immortalized in the next stable release of Godot Engine. Alexey Dyadchenko Andreas Funke André Frélicot - andres eduardo lopez Andrew Bowen aoshiwik Ben Botwin @@ -178,17 +170,16 @@ generous deed immortalized in the next stable release of Godot Engine. Hysteria Idzard Kwadijk Jared White + Jeff Nyte Jeremy Sims Jerry Ling Joe Flood Jose Malheiro Joshua Lesperance - Juan T Chen Juan Velandia Juraj Móza Kasper Jeppesen kinfox - Maarten Elings Marcelo Dornbusch Lopes Markus Fehr Markus Wiesner @@ -220,6 +211,7 @@ generous deed immortalized in the next stable release of Godot Engine. Tobias Bocanegra Urho Zie Weaver + 蕭惟允 ## Silver donors @@ -232,6 +224,7 @@ generous deed immortalized in the next stable release of Godot Engine. Adam Nakonieczny Adam N Webber Adam Smeltzer + Adam Szymański Adisibio Adrian Demetrescu Agustinus Arya @@ -240,7 +233,6 @@ generous deed immortalized in the next stable release of Godot Engine. Albin Jonasson Svärdsby Alder Stefano Alessandro Senese - Alexandre Alex Davies-Moore Allen Schade Andreas Evers @@ -252,11 +244,11 @@ generous deed immortalized in the next stable release of Godot Engine. Angelos Arnaoutis Anthony Bongiovanni Anthony Staunton - Anton Kurkin AP Condomines Arda Erol Arseniy M Arthur S. Muszynski + Asger Atilla Kiran Aubrey Falconer Avencherus @@ -281,6 +273,7 @@ generous deed immortalized in the next stable release of Godot Engine. Christian Winter Christoffer Sundbom Christopher Schmitt + Christoph Woinke Clay Heaton Collin Shooltz Daniel Johnson @@ -291,6 +284,7 @@ generous deed immortalized in the next stable release of Godot Engine. David May David Rapisarda David Woodard + Dennis Idzikowsky Dominic Cooney Dominik Wetzel Donn Eddy @@ -304,23 +298,22 @@ generous deed immortalized in the next stable release of Godot Engine. Ellen Marie Dash Elmeri '- Duy Kevin Nguyen Emanuel Kotzayan - Ennemoser Ernst Eric Ellingson - Eric Martini Eric Williams Erkki Seppälä - EugeneTel Evan Rose + Fancy Ants Studios + Fekinox Felix Kollmann + fengjiongmax Flaredown - Florian Richer + Forty Doubleu FuDiggity G3Dev sàrl Gadzhi Kharkharov gamedev by Celio Gary Hulst George Marques - gmmath Greg Olson GREGORY C FEIN Greg P @@ -334,16 +327,13 @@ generous deed immortalized in the next stable release of Godot Engine. Iiari IndustrialRobot Isaac Morton - Jack Newley Jaiden Gerig Jaime Ruiz-Borau Vizárraga Jako Danar James A F Manley Jannik Gröger Jax - Jed Jeff Hungerford - Jeff Nyte Jennifer Graves Jeremy Kahn Jesse Dubay @@ -360,7 +350,6 @@ generous deed immortalized in the next stable release of Godot Engine. Jon Bonazza Jon Sully Jose Aleman - Jose Andrés Mejias Rojas Jose C. Rubio Joseph Catrambone Juanfran @@ -369,7 +358,6 @@ generous deed immortalized in the next stable release of Godot Engine. JungleRobba Justin Spedding Kaiser Bald0 - Kamuna Kauzig KC Chan Keedong Park @@ -389,7 +377,6 @@ generous deed immortalized in the next stable release of Godot Engine. Lionel Gaillard LunaticInAHat Lurkars - Macil Major Haul Malcolm Malik Ahmed @@ -422,7 +409,6 @@ generous deed immortalized in the next stable release of Godot Engine. Neil Blakey-Milner Nerdforge Nicholas - Nicholas Bettencourt Nick Macholl Niclas Eriksen Nicolás Montaña @@ -439,6 +425,7 @@ generous deed immortalized in the next stable release of Godot Engine. Paul Gieske Paul Mason Paweł Kowal + Pedro Assuncao Penguin Petrus Prinsloo Philip Cohoe @@ -451,7 +438,6 @@ generous deed immortalized in the next stable release of Godot Engine. Raphael Leroux Remi Rampin Rémi Verschelde - Rezgi Ricardo Alcantara Richard Diss Richard Ivánek @@ -476,11 +462,10 @@ generous deed immortalized in the next stable release of Godot Engine. Shane Shane Sicienski Shane Spoor - Simon Ledam Simon Wenner SK smbe19 - Sootstone + Stonepyre Svenne Krap tezuvholovdr thomas @@ -489,7 +474,6 @@ generous deed immortalized in the next stable release of Godot Engine. tiansheng li Tim Drumheller Timothy B. MacDonald - TJRHTK Tobbun Tom Fulp Tom Glenn @@ -499,9 +483,11 @@ generous deed immortalized in the next stable release of Godot Engine. Troy Bonneau Tryggve Sollid Turgut Temucin + Tyler Compton Tyler Stafos UltyX Vaiktorg + Vaughan Ling Victor Vigilant Watch Vincent Cloutier @@ -514,7 +500,7 @@ generous deed immortalized in the next stable release of Godot Engine. Wout Standaert Wyatt Goodin Yegor - 蕭惟允 + Yuri Sizov ## Bronze donors diff --git a/core/variant_op.cpp b/core/variant_op.cpp index ea9e29e744..ae47397558 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -1118,6 +1118,8 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_SHIFT_LEFT, INT) { if (p_b.type != INT) _RETURN_FAIL; + if (p_b._data._int < 0 || p_b._data._int >= 64) + _RETURN_FAIL; _RETURN(p_a._data._int << p_b._data._int); } @@ -1129,6 +1131,8 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_SHIFT_RIGHT, INT) { if (p_b.type != INT) _RETURN_FAIL; + if (p_b._data._int < 0 || p_b._data._int >= 64) + _RETURN_FAIL; _RETURN(p_a._data._int >> p_b._data._int); } diff --git a/doc/classes/CharFXTransform.xml b/doc/classes/CharFXTransform.xml index 399530bb5d..ef9a366c86 100644 --- a/doc/classes/CharFXTransform.xml +++ b/doc/classes/CharFXTransform.xml @@ -11,17 +11,6 @@ <link>https://github.com/Eoin-ONeill-Yokai/Godot-Rich-Text-Effect-Test-Project</link> </tutorials> <methods> - <method name="get_value_or"> - <return type="Variant"> - </return> - <argument index="0" name="key" type="String"> - </argument> - <argument index="1" name="default_value" type="Variant"> - </argument> - <description> - Returns the value for [code]key[/code] in the [member env] [Dictionary], or [code]default_value[/code] if [code]key[/code] isn't defined in [member env]. If the value's type doesn't match [code]default_value[/code]'s type, this method will return [code]default_value[/code]. - </description> - </method> </methods> <members> <member name="absolute_index" type="int" setter="set_absolute_index" getter="get_absolute_index" default="0"> diff --git a/doc/classes/HTTPClient.xml b/doc/classes/HTTPClient.xml index 57d2c6ff96..3a63b2dc07 100644 --- a/doc/classes/HTTPClient.xml +++ b/doc/classes/HTTPClient.xml @@ -112,13 +112,13 @@ Generates a GET/POST application/x-www-form-urlencoded style query string from a provided dictionary, e.g.: [codeblock] var fields = {"username": "user", "password": "pass"} - String query_string = http_client.query_string_from_dict(fields) + var query_string = http_client.query_string_from_dict(fields) # Returns "username=user&password=pass" [/codeblock] Furthermore, if a key has a [code]null[/code] value, only the key itself is added, without equal sign and value. If the value is an array, for each value in it a pair with the same key is added. [codeblock] var fields = {"single": 123, "not_valued": null, "multiple": [22, 33, 44]} - String query_string = http_client.query_string_from_dict(fields) + var query_string = http_client.query_string_from_dict(fields) # Returns "single=123&not_valued&multiple=22&multiple=33&multiple=44" [/codeblock] </description> diff --git a/doc/classes/Mesh.xml b/doc/classes/Mesh.xml index f7b3b0d7ea..d4804930e1 100644 --- a/doc/classes/Mesh.xml +++ b/doc/classes/Mesh.xml @@ -40,6 +40,14 @@ Generate a [TriangleMesh] from the mesh. </description> </method> + <method name="get_aabb" qualifiers="const"> + <return type="AABB"> + </return> + <description> + Returns the smallest [AABB] enclosing this mesh. Not affected by [code]custom_aabb[/code]. + [b]Note:[/b] This is only implemented for [ArrayMesh] and [PrimitiveMesh]. + </description> + </method> <method name="get_faces" qualifiers="const"> <return type="PoolVector3Array"> </return> diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index 1d00bb5712..20a1a182e3 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -348,7 +348,7 @@ <member name="debug/gdscript/warnings/unused_argument" type="bool" setter="" getter="" default="true"> If [code]true[/code], enables warnings when a function parameter is unused. </member> - <member name="debug/gdscript/warnings/unused_class_variable" type="bool" setter="" getter="" default="true"> + <member name="debug/gdscript/warnings/unused_class_variable" type="bool" setter="" getter="" default="false"> If [code]true[/code], enables warnings when a member variable is unused. </member> <member name="debug/gdscript/warnings/unused_signal" type="bool" setter="" getter="" default="true"> @@ -437,6 +437,9 @@ <member name="display/window/vsync/vsync_via_compositor" type="bool" setter="" getter="" default="false"> If [code]Use Vsync[/code] is enabled and this setting is [code]true[/code], enables vertical synchronization via the operating system's window compositor when in windowed mode and the compositor is enabled. This will prevent stutter in certain situations. (Windows only.) </member> + <member name="display/window/ios/hide_home_indicator" type="bool" setter="" getter="" default="true"> + If [code]true[/code], the home indicator is hidden automatically. This only affects iOS devices without a physical home button. + </member> <member name="editor/script_templates_search_path" type="String" setter="" getter="" default=""res://script_templates""> </member> <member name="editor/search_in_file_extensions" type="PoolStringArray" setter="" getter="" default="PoolStringArray( "gd", "shader" )"> diff --git a/doc/classes/Tween.xml b/doc/classes/Tween.xml index aa995e6cbe..cf75e71358 100644 --- a/doc/classes/Tween.xml +++ b/doc/classes/Tween.xml @@ -34,9 +34,9 @@ </argument> <argument index="5" name="duration" type="float"> </argument> - <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType"> + <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType" default="0"> </argument> - <argument index="7" name="ease_type" type="int" enum="Tween.EaseType"> + <argument index="7" name="ease_type" type="int" enum="Tween.EaseType" default="2"> </argument> <argument index="8" name="delay" type="float" default="0"> </argument> @@ -60,9 +60,9 @@ </argument> <argument index="5" name="duration" type="float"> </argument> - <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType"> + <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType" default="0"> </argument> - <argument index="7" name="ease_type" type="int" enum="Tween.EaseType"> + <argument index="7" name="ease_type" type="int" enum="Tween.EaseType" default="2"> </argument> <argument index="8" name="delay" type="float" default="0"> </argument> @@ -137,9 +137,9 @@ </argument> <argument index="4" name="duration" type="float"> </argument> - <argument index="5" name="trans_type" type="int" enum="Tween.TransitionType"> + <argument index="5" name="trans_type" type="int" enum="Tween.TransitionType" default="0"> </argument> - <argument index="6" name="ease_type" type="int" enum="Tween.EaseType"> + <argument index="6" name="ease_type" type="int" enum="Tween.EaseType" default="2"> </argument> <argument index="7" name="delay" type="float" default="0"> </argument> @@ -161,9 +161,9 @@ </argument> <argument index="4" name="duration" type="float"> </argument> - <argument index="5" name="trans_type" type="int" enum="Tween.TransitionType"> + <argument index="5" name="trans_type" type="int" enum="Tween.TransitionType" default="0"> </argument> - <argument index="6" name="ease_type" type="int" enum="Tween.EaseType"> + <argument index="6" name="ease_type" type="int" enum="Tween.EaseType" default="2"> </argument> <argument index="7" name="delay" type="float" default="0"> </argument> @@ -292,9 +292,9 @@ </argument> <argument index="5" name="duration" type="float"> </argument> - <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType"> + <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType" default="0"> </argument> - <argument index="7" name="ease_type" type="int" enum="Tween.EaseType"> + <argument index="7" name="ease_type" type="int" enum="Tween.EaseType" default="2"> </argument> <argument index="8" name="delay" type="float" default="0"> </argument> @@ -318,9 +318,9 @@ </argument> <argument index="5" name="duration" type="float"> </argument> - <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType"> + <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType" default="0"> </argument> - <argument index="7" name="ease_type" type="int" enum="Tween.EaseType"> + <argument index="7" name="ease_type" type="int" enum="Tween.EaseType" default="2"> </argument> <argument index="8" name="delay" type="float" default="0"> </argument> diff --git a/doc/classes/VisualShaderNodeTexture.xml b/doc/classes/VisualShaderNodeTexture.xml index a94b798745..4150b36c9c 100644 --- a/doc/classes/VisualShaderNodeTexture.xml +++ b/doc/classes/VisualShaderNodeTexture.xml @@ -28,6 +28,8 @@ </constant> <constant name="SOURCE_DEPTH" value="4" enum="Source"> </constant> + <constant name="SOURCE_PORT" value="5" enum="Source"> + </constant> <constant name="TYPE_DATA" value="0" enum="TextureType"> </constant> <constant name="TYPE_COLOR" value="1" enum="TextureType"> diff --git a/doc/classes/float.xml b/doc/classes/float.xml index 4c4ea83157..7164e8cb0a 100644 --- a/doc/classes/float.xml +++ b/doc/classes/float.xml @@ -33,7 +33,7 @@ <argument index="0" name="from" type="String"> </argument> <description> - Cast a [String] value to a floating-point value. This method accepts float value strings like [code]"1.23"[/code] and exponential notation strings for its parameter so calling [code]float("1e3")[/code] will return 1000.0 and calling [code]float("1e-3")[/code] will return 0.001. + Cast a [String] value to a floating-point value. This method accepts float value strings like [code]"1.23"[/code] and exponential notation strings for its parameter so calling [code]float("1e3")[/code] will return 1000.0 and calling [code]float("1e-3")[/code] will return 0.001. Calling this method with an invalid float string will return 0. This method stops parsing at the first invalid character and will return the parsed result so far, so calling [code]float("1a3")[/code] will return 1 while calling [code]float("1e3a2")[/code] will return 1000.0. </description> </method> </methods> diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index 1db1625194..3b2851fbcd 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -1898,9 +1898,20 @@ void RasterizerCanvasGLES2::canvas_light_shadow_buffer_update(RID p_buffer, cons } state.canvas_shadow_shader.set_uniform(CanvasShadowShaderGLES2::WORLD_MATRIX, instance->xform_cache); - if (cull != instance->cull_cache) { - cull = instance->cull_cache; + VS::CanvasOccluderPolygonCullMode transformed_cull_cache = instance->cull_cache; + + if (transformed_cull_cache != VS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED && + (p_light_xform.basis_determinant() * instance->xform_cache.basis_determinant()) < 0) { + transformed_cull_cache = + transformed_cull_cache == VS::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE ? + VS::CANVAS_OCCLUDER_POLYGON_CULL_COUNTER_CLOCKWISE : + VS::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE; + } + + if (cull != transformed_cull_cache) { + + cull = transformed_cull_cache; switch (cull) { case VS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED: { diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp index 7e9b6fdb82..94cb286b0e 100644 --- a/drivers/gles2/shader_compiler_gles2.cpp +++ b/drivers/gles2/shader_compiler_gles2.cpp @@ -911,7 +911,7 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() { actions[VS::SHADER_CANVAS_ITEM].renames["VERTEX"] = "outvec.xy"; actions[VS::SHADER_CANVAS_ITEM].renames["UV"] = "uv"; - actions[VS::SHADER_CANVAS_ITEM].renames["POINT_SIZE"] = "gl_PointSize"; + actions[VS::SHADER_CANVAS_ITEM].renames["POINT_SIZE"] = "point_size"; actions[VS::SHADER_CANVAS_ITEM].renames["WORLD_MATRIX"] = "modelview_matrix"; actions[VS::SHADER_CANVAS_ITEM].renames["PROJECTION_MATRIX"] = "projection_matrix"; @@ -986,7 +986,7 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() { actions[VS::SHADER_SPATIAL].renames["UV"] = "uv_interp"; actions[VS::SHADER_SPATIAL].renames["UV2"] = "uv2_interp"; actions[VS::SHADER_SPATIAL].renames["COLOR"] = "color_interp"; - actions[VS::SHADER_SPATIAL].renames["POINT_SIZE"] = "gl_PointSize"; + actions[VS::SHADER_SPATIAL].renames["POINT_SIZE"] = "point_size"; // gl_InstanceID is not available in OpenGL ES 2.0 actions[VS::SHADER_SPATIAL].renames["INSTANCE_ID"] = "0"; diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index 08548ded17..afce403a9f 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -149,6 +149,8 @@ void main() { uv = uv_attrib; #endif + float point_size = 1.0; + { vec2 src_vtx = outvec.xy; /* clang-format off */ @@ -158,6 +160,8 @@ VERTEX_SHADER_CODE /* clang-format on */ } + gl_PointSize = point_size; + #if !defined(SKIP_TRANSFORM_USED) outvec = extra_matrix_instance * outvec; outvec = modelview_matrix * outvec; diff --git a/drivers/gles2/shaders/scene.glsl b/drivers/gles2/shaders/scene.glsl index 930d3cd9d4..63eee4eb87 100644 --- a/drivers/gles2/shaders/scene.glsl +++ b/drivers/gles2/shaders/scene.glsl @@ -423,6 +423,8 @@ void main() { #define projection_matrix local_projection_matrix #define world_transform world_matrix + float point_size = 1.0; + { /* clang-format off */ @@ -431,6 +433,7 @@ VERTEX_SHADER_CODE /* clang-format on */ } + gl_PointSize = point_size; vec4 outvec = vertex; // use local coordinates diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index c798dff839..1803a3dbbe 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -1887,9 +1887,20 @@ void RasterizerCanvasGLES3::canvas_light_shadow_buffer_update(RID p_buffer, cons } state.canvas_shadow_shader.set_uniform(CanvasShadowShaderGLES3::WORLD_MATRIX, instance->xform_cache); - if (cull != instance->cull_cache) { - cull = instance->cull_cache; + VS::CanvasOccluderPolygonCullMode transformed_cull_cache = instance->cull_cache; + + if (transformed_cull_cache != VS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED && + (p_light_xform.basis_determinant() * instance->xform_cache.basis_determinant()) < 0) { + transformed_cull_cache = + transformed_cull_cache == VS::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE ? + VS::CANVAS_OCCLUDER_POLYGON_CULL_COUNTER_CLOCKWISE : + VS::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE; + } + + if (cull != transformed_cull_cache) { + + cull = transformed_cull_cache; switch (cull) { case VS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED: { diff --git a/drivers/gles3/shader_compiler_gles3.cpp b/drivers/gles3/shader_compiler_gles3.cpp index 7499962da3..e78ecbae34 100644 --- a/drivers/gles3/shader_compiler_gles3.cpp +++ b/drivers/gles3/shader_compiler_gles3.cpp @@ -913,7 +913,7 @@ ShaderCompilerGLES3::ShaderCompilerGLES3() { actions[VS::SHADER_CANVAS_ITEM].renames["VERTEX"] = "outvec.xy"; actions[VS::SHADER_CANVAS_ITEM].renames["UV"] = "uv"; - actions[VS::SHADER_CANVAS_ITEM].renames["POINT_SIZE"] = "gl_PointSize"; + actions[VS::SHADER_CANVAS_ITEM].renames["POINT_SIZE"] = "point_size"; actions[VS::SHADER_CANVAS_ITEM].renames["WORLD_MATRIX"] = "modelview_matrix"; actions[VS::SHADER_CANVAS_ITEM].renames["PROJECTION_MATRIX"] = "projection_matrix"; @@ -970,7 +970,7 @@ ShaderCompilerGLES3::ShaderCompilerGLES3() { actions[VS::SHADER_SPATIAL].renames["UV"] = "uv_interp"; actions[VS::SHADER_SPATIAL].renames["UV2"] = "uv2_interp"; actions[VS::SHADER_SPATIAL].renames["COLOR"] = "color_interp"; - actions[VS::SHADER_SPATIAL].renames["POINT_SIZE"] = "gl_PointSize"; + actions[VS::SHADER_SPATIAL].renames["POINT_SIZE"] = "point_size"; actions[VS::SHADER_SPATIAL].renames["INSTANCE_ID"] = "gl_InstanceID"; //builtins diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index 7255b0425c..53f84abf51 100644 --- a/drivers/gles3/shaders/canvas.glsl +++ b/drivers/gles3/shaders/canvas.glsl @@ -150,6 +150,7 @@ void main() { #define extra_matrix extra_matrix_instance + float point_size = 1.0; //for compatibility with the fragment shader we need to use uv here vec2 uv = uv_interp; { @@ -160,6 +161,7 @@ VERTEX_SHADER_CODE /* clang-format on */ } + gl_PointSize = point_size; uv_interp = uv; #ifdef USE_NINEPATCH diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl index b4ceb7dcfd..549a36817e 100644 --- a/drivers/gles3/shaders/scene.glsl +++ b/drivers/gles3/shaders/scene.glsl @@ -432,6 +432,8 @@ void main() { } #endif + float point_size = 1.0; + highp mat4 modelview = camera_inverse_matrix * world_matrix; { /* clang-format off */ @@ -441,6 +443,8 @@ VERTEX_SHADER_CODE /* clang-format on */ } + gl_PointSize = point_size; + // using local coordinates (default) #if !defined(SKIP_TRANSFORM_USED) && !defined(VERTEX_WORLD_COORDS_USED) diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 4f7432cd65..9b7f255e46 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -185,11 +185,11 @@ void EditorHelp::_class_desc_resized() { void EditorHelp::_add_type(const String &p_type, const String &p_enum) { String t = p_type; - if (t == "") + if (t.empty()) t = "void"; - bool can_ref = (t != "int" && t != "real" && t != "bool" && t != "void") || p_enum != String(); + bool can_ref = (t != "void") || !p_enum.empty(); - if (p_enum != String()) { + if (!p_enum.empty()) { if (p_enum.get_slice_count(".") > 1) { t = p_enum.get_slice(".", 1); } else { @@ -200,7 +200,7 @@ void EditorHelp::_add_type(const String &p_type, const String &p_enum) { const Color type_color = get_color("accent_color", "Editor").linear_interpolate(text_color, 0.5); class_desc->push_color(type_color); if (can_ref) { - if (p_enum == "") { + if (p_enum.empty()) { class_desc->push_meta("#" + t); //class } else { class_desc->push_meta("$" + p_enum); //class diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index f05c7709d4..6b71ee14d5 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -587,11 +587,24 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_color("icon_color_pressed", "Button", icon_color_pressed); // OptionButton - theme->set_stylebox("normal", "OptionButton", style_widget); - theme->set_stylebox("hover", "OptionButton", style_widget_hover); - theme->set_stylebox("pressed", "OptionButton", style_widget_pressed); - theme->set_stylebox("focus", "OptionButton", style_widget_focus); - theme->set_stylebox("disabled", "OptionButton", style_widget_disabled); + Ref<StyleBoxFlat> style_option_button_normal = style_widget->duplicate(); + Ref<StyleBoxFlat> style_option_button_hover = style_widget_hover->duplicate(); + Ref<StyleBoxFlat> style_option_button_pressed = style_widget_pressed->duplicate(); + Ref<StyleBoxFlat> style_option_button_focus = style_widget_focus->duplicate(); + Ref<StyleBoxFlat> style_option_button_disabled = style_widget_disabled->duplicate(); + + int option_button_arrow_margin = theme->get_icon("GuiOptionArrow", "EditorIcons")->get_size().width + (default_margin_size + 4) * EDSCALE; + style_option_button_normal->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin); + style_option_button_hover->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin); + style_option_button_pressed->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin); + style_option_button_focus->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin); + style_option_button_disabled->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin); + + theme->set_stylebox("normal", "OptionButton", style_option_button_normal); + theme->set_stylebox("hover", "OptionButton", style_option_button_hover); + theme->set_stylebox("pressed", "OptionButton", style_option_button_pressed); + theme->set_stylebox("focus", "OptionButton", style_option_button_focus); + theme->set_stylebox("disabled", "OptionButton", style_option_button_disabled); theme->set_color("font_color", "OptionButton", font_color); theme->set_color("font_color_hover", "OptionButton", font_color_hl); diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index 318fee01f2..68ce709090 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -691,7 +691,7 @@ ExportTemplateManager::ExportTemplateManager() { template_open = memnew(FileDialog); template_open->set_title(TTR("Select Template File")); - template_open->add_filter("*.tpz ; Godot Export Templates"); + template_open->add_filter("*.tpz ; " + TTR("Godot Export Templates")); template_open->set_access(FileDialog::ACCESS_FILESYSTEM); template_open->set_mode(FileDialog::MODE_OPEN_FILE); template_open->connect("file_selected", this, "_install_from_file", varray(true)); diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index 95767a96d8..b261ca4712 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -652,12 +652,12 @@ const char *EditorAssetLibrary::sort_key[SORT_MAX] = { }; const char *EditorAssetLibrary::sort_text[SORT_MAX] = { - "Recently Updated", - "Least Recently Updated", - "Name (A-Z)", - "Name (Z-A)", - "License (A-Z)", // "cost" stores the SPDX license name in the Godot Asset Library. - "License (Z-A)", // "cost" stores the SPDX license name in the Godot Asset Library. + TTRC("Recently Updated"), + TTRC("Least Recently Updated"), + TTRC("Name (A-Z)"), + TTRC("Name (Z-A)"), + TTRC("License (A-Z)"), // "cost" stores the SPDX license name in the Godot Asset Library. + TTRC("License (Z-A)"), // "cost" stores the SPDX license name in the Godot Asset Library. }; const char *EditorAssetLibrary::support_key[SUPPORT_MAX] = { @@ -1383,7 +1383,7 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) { search_hb2->add_child(memnew(Label(TTR("Sort:") + " "))); sort = memnew(OptionButton); for (int i = 0; i < SORT_MAX; i++) { - sort->add_item(sort_text[i]); + sort->add_item(TTRGET(sort_text[i])); } search_hb2->add_child(sort); diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index 9e873b641b..66935d047b 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -1176,6 +1176,31 @@ void TileSetEditor::_on_workspace_overlay_draw() { } } +int TileSetEditor::get_grabbed_point(const Vector2 &p_mouse_pos, real_t p_grab_threshold) { + Transform2D xform = workspace->get_transform(); + + int grabbed_point = -1; + real_t min_distance = 1e10; + + for (int i = 0; i < current_shape.size(); i++) { + const real_t distance = xform.xform(current_shape[i]).distance_to(xform.xform(p_mouse_pos)); + if (distance < p_grab_threshold && distance < min_distance) { + min_distance = distance; + grabbed_point = i; + } + } + + return grabbed_point; +} + +bool TileSetEditor::is_within_grabbing_distance_of_first_point(const Vector2 &p_pos, real_t p_grab_threshold) { + Transform2D xform = workspace->get_transform(); + + const real_t distance = xform.xform(current_shape[0]).distance_to(xform.xform(p_pos)); + + return distance < p_grab_threshold; +} + void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) { if (tileset.is_null() || !get_current_texture().is_valid()) @@ -1528,18 +1553,19 @@ void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) { shape_anchor.x *= (size.x + spacing); shape_anchor.y *= (size.y + spacing); } + const real_t grab_threshold = EDITOR_GET("editors/poly_editor/point_grab_radius"); shape_anchor += current_tile_region.position; if (tools[TOOL_SELECT]->is_pressed()) { if (mb.is_valid()) { if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { if (edit_mode != EDITMODE_PRIORITY && current_shape.size() > 0) { - for (int i = 0; i < current_shape.size(); i++) { - if ((current_shape[i] - mb->get_position()).length_squared() <= grab_threshold) { - dragging_point = i; - workspace->update(); - return; - } + int grabbed_point = get_grabbed_point(mb->get_position(), grab_threshold); + + if (grabbed_point >= 0) { + dragging_point = grabbed_point; + workspace->update(); + return; } } if ((tileset->tile_get_tile_mode(get_current_tile()) == TileSet::AUTO_TILE || tileset->tile_get_tile_mode(get_current_tile()) == TileSet::ATLAS_TILE) && current_tile_region.has_point(mb->get_position())) { @@ -1633,13 +1659,12 @@ void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) { Vector2 pos = mb->get_position(); pos = snap_point(pos); if (creating_shape) { - if (current_shape.size() > 0) { - if ((pos - current_shape[0]).length_squared() <= grab_threshold) { - if (current_shape.size() > 2) { - close_shape(shape_anchor); - workspace->update(); - return; - } + if (current_shape.size() > 2) { + + if (is_within_grabbing_distance_of_first_point(mb->get_position(), grab_threshold)) { + close_shape(shape_anchor); + workspace->update(); + return; } } current_shape.push_back(pos); @@ -1685,12 +1710,15 @@ void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) { } } else if (!mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { if (creating_shape) { - if ((current_shape[0] - current_shape[1]).length_squared() <= grab_threshold) { + + // if the first two corners are within grabbing distance of one another, expand the rect to fill the tile + if (is_within_grabbing_distance_of_first_point(current_shape[1], grab_threshold)) { current_shape.set(0, snap_point(shape_anchor)); current_shape.set(1, snap_point(shape_anchor + Vector2(current_tile_region.size.x, 0))); current_shape.set(2, snap_point(shape_anchor + current_tile_region.size)); current_shape.set(3, snap_point(shape_anchor + Vector2(0, current_tile_region.size.y))); } + close_shape(shape_anchor); workspace->update(); return; diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h index 944dc04e4e..5ff86000c5 100644 --- a/editor/plugins/tile_set_editor_plugin.h +++ b/editor/plugins/tile_set_editor_plugin.h @@ -244,6 +244,8 @@ private: void update_workspace_tile_mode(); void update_workspace_minsize(); void update_edited_region(const Vector2 &end_point); + int get_grabbed_point(const Vector2 &p_mouse_pos, real_t grab_threshold); + bool is_within_grabbing_distance_of_first_point(const Vector2 &p_pos, real_t p_grab_threshold); int get_current_tile() const; void set_current_tile(int p_id); diff --git a/editor/project_export.cpp b/editor/project_export.cpp index 617ad62d4a..0a9ecca79c 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -253,9 +253,9 @@ void ProjectExportDialog::_edit_preset(int p_index) { TreeItem *patch_add = patches->create_item(patch_root); patch_add->set_metadata(0, patchlist.size()); if (patchlist.size() == 0) - patch_add->set_text(0, "Add initial export..."); + patch_add->set_text(0, TTR("Add initial export...")); else - patch_add->set_text(0, "Add previous patches..."); + patch_add->set_text(0, TTR("Add previous patches...")); patch_add->add_button(0, get_icon("folder", "FileDialog"), 1); diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index a38c6b98cc..a780b117e1 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -233,14 +233,23 @@ void EditorSettingsDialog::_update_shortcuts() { section->set_custom_bg_color(1, get_color("prop_subsection", "Editor")); } - if (shortcut_filter.is_subsequence_ofi(sc->get_name()) || shortcut_filter.is_subsequence_ofi(sc->get_as_text())) { + // Don't match unassigned shortcuts when searching for assigned keys in search results. + // This prevents all unassigned shortcuts from appearing when searching a string like "no". + if (shortcut_filter.is_subsequence_ofi(sc->get_name()) || (sc->get_as_text() != "None" && shortcut_filter.is_subsequence_ofi(sc->get_as_text()))) { TreeItem *item = shortcuts->create_item(section); item->set_text(0, sc->get_name()); item->set_text(1, sc->get_as_text()); + if (!sc->is_shortcut(original) && !(sc->get_shortcut().is_null() && original.is_null())) { item->add_button(1, get_icon("Reload", "EditorIcons"), 2); } + + if (sc->get_as_text() == "None") { + // Fade out unassigned shortcut labels for easier visual grepping. + item->set_custom_color(1, get_color("font_color", "Label") * Color(1, 1, 1, 0.5)); + } + item->add_button(1, get_icon("Edit", "EditorIcons"), 0); item->add_button(1, get_icon("Close", "EditorIcons"), 1); item->set_tooltip(0, E->get()); diff --git a/editor/translations/af.po b/editor/translations/af.po index 329d165510..5d0b920ef4 100644 --- a/editor/translations/af.po +++ b/editor/translations/af.po @@ -3519,6 +3519,10 @@ msgid "Select Template File" msgstr "Skep Vouer" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4965,6 +4969,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Lisensie" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Lisensie" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -9088,6 +9118,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Gunstelinge:" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/ar.po b/editor/translations/ar.po index 9ffb777a0f..949bb8c162 100644 --- a/editor/translations/ar.po +++ b/editor/translations/ar.po @@ -30,12 +30,13 @@ # PhoenixHO <oussamahaddouche0@gmail.com>, 2019. # orcstudio <orcstudio@orcstudio.org>, 2019. # Rachid Graphicos <graphicos1d@gmail.com>, 2019. +# traveller010 <manar.bushnaq.001@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-10-04 03:15+0000\n" -"Last-Translator: Omar Aglan <omar.aglan91@yahoo.com>\n" +"PO-Revision-Date: 2019-12-12 09:06+0000\n" +"Last-Translator: traveller010 <manar.bushnaq.001@gmail.com>\n" "Language-Team: Arabic <https://hosted.weblate.org/projects/godot-engine/" "godot/ar/>\n" "Language: ar\n" @@ -44,7 +45,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 3.9-dev\n" +"X-Generator: Weblate 3.10-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -182,29 +183,24 @@ msgid "Anim Change Call" msgstr "نداء تغيير التحريك" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Anim Multi Change Keyframe Time" -msgstr "تغيير وقت الإطار الرئيسي للحركة" +msgstr "وقت الإطار متعدد التغييرات للرسم المتحرك" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Anim Multi Change Transition" -msgstr "تغيير المقطع الإنتقالي" +msgstr "المراحل الانتقالية للرسم المتحرك متعدد التغييرات" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Anim Multi Change Transform" -msgstr "تحويل تغيير التحريك" +msgstr "التَحَوّل متعدد التغيير للرسوم المتحركة" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Anim Multi Change Keyframe Value" -msgstr "تغيير قيمة الإطار الأساسي للحركة" +msgstr "قيمة الإطار متعدد التغييرات للرسم المتحرك" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Anim Multi Change Call" -msgstr "نداء تغيير التحريك" +msgstr "استدعاء الرسوم المتحركة متعددة التغيير" #: editor/animation_track_editor.cpp msgid "Change Animation Length" @@ -443,9 +439,8 @@ msgid "Not possible to add a new track without a root" msgstr "لا يمكن إضافة مقطع جديد بدون جذر" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Add Bezier Track" -msgstr "إضافة مسار" +msgstr "إضافة مسار لمنحنى بريزير" #: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." @@ -517,12 +512,12 @@ msgstr "" #: editor/animation_track_editor.cpp msgid "Warning: Editing imported animation" -msgstr "" +msgstr "تحذير: تعديل رسوم متحركة مستوردة" #: editor/animation_track_editor.cpp #, fuzzy msgid "Select an AnimationPlayer node to create and edit animations." -msgstr "حدد مشغل حركة من شجرة المشهد لكي تعدل الحركة." +msgstr "إختر مشغل الرسم المتحرك من شجرة المشهد لكي تنشئ أو تعدل الحركة." #: editor/animation_track_editor.cpp msgid "Only show tracks from nodes selected in tree." @@ -533,9 +528,8 @@ msgid "Group tracks by node or display them as plain list." msgstr "قم بتجميع المقاطع حسب العقد (Nodes) أو إظهارهم كقائمة بسيطة." #: editor/animation_track_editor.cpp -#, fuzzy msgid "Snap:" -msgstr "خطوة أو خطوات: " +msgstr "إنطباق أو محاذاة:" #: editor/animation_track_editor.cpp msgid "Animation step value." @@ -655,9 +649,8 @@ msgid "Scale Ratio:" msgstr "نسبة التكبير:" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Select Tracks to Copy" -msgstr "حدد مقاطع لنسخ:" +msgstr "إختر المقاطع المراد نسخها" #: editor/animation_track_editor.cpp editor/editor_log.cpp #: editor/editor_properties.cpp @@ -669,9 +662,8 @@ msgid "Copy" msgstr "أنسخ" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Select All/None" -msgstr "تحديد الوضع" +msgstr "إختر الكل/لا شيء" #: editor/animation_track_editor_plugins.cpp msgid "Add Audio Track Clip" @@ -711,12 +703,11 @@ msgstr "إستبُدل %d حادثة(حوادث)." #: editor/code_editor.cpp editor/editor_help.cpp msgid "%d match." -msgstr "" +msgstr "تطابق %d." #: editor/code_editor.cpp editor/editor_help.cpp -#, fuzzy msgid "%d matches." -msgstr "لا مطابقة" +msgstr "%d تطابقات." #: editor/code_editor.cpp editor/find_in_files.cpp msgid "Match Case" @@ -741,7 +732,7 @@ msgstr "المحدد فقط" #: editor/code_editor.cpp editor/plugins/script_text_editor.cpp #: editor/plugins/text_editor.cpp msgid "Standard" -msgstr "" +msgstr "معياري" #: editor/code_editor.cpp editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/texture_region_editor_plugin.cpp @@ -768,21 +759,18 @@ msgid "Line and column numbers." msgstr "أرقام الخط و العمود." #: editor/connections_dialog.cpp -#, fuzzy msgid "Method in target node must be specified." -msgstr "الطريقة في العقدة المستهدفة يجب أن تكون محدّدة!" +msgstr "يجب تحديد الدالة في العقدة المستهدفة." #: editor/connections_dialog.cpp -#, fuzzy msgid "" "Target method not found. Specify a valid method or attach a script to the " "target node." msgstr "" -"لم يتم العثور على الطريقة المستهدفة! حدّد طريقة سليمة أو أرفق كود لإستهداف " -"العقدة." +"لم يتم العثور على الدالة المستهدفة. حدّد دالة سليمة أو أرفق كود للعقدة " +"المستهدفة." #: editor/connections_dialog.cpp -#, fuzzy msgid "Connect to Node:" msgstr "صلها بالعقدة:" @@ -791,14 +779,12 @@ msgid "Connect to Script:" msgstr "الإتصال بالمخطوطة:" #: editor/connections_dialog.cpp -#, fuzzy msgid "From Signal:" -msgstr "الإشارات:" +msgstr "من إشارة:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Scene does not contain any script." -msgstr "العقدة لا تحتوي على هندسة." +msgstr "لا يحتوي المشهد علي اي برنامج نصي." #: editor/connections_dialog.cpp editor/editor_autoload_settings.cpp #: editor/groups_editor.cpp editor/plugins/item_list_editor_plugin.cpp @@ -836,7 +822,7 @@ msgstr "مؤجل" #: editor/connections_dialog.cpp msgid "" "Defers the signal, storing it in a queue and only firing it at idle time." -msgstr "" +msgstr "تأخير الإشارة وتخزينها في قائمة الانتظار و تشغيلها فقط في وقت الفراغ." #: editor/connections_dialog.cpp msgid "Oneshot" @@ -844,12 +830,11 @@ msgstr "لقطة واحدة" #: editor/connections_dialog.cpp msgid "Disconnects the signal after its first emission." -msgstr "" +msgstr "فصل الإشارة بعد انبعاثها الأول." #: editor/connections_dialog.cpp -#, fuzzy msgid "Cannot connect signal" -msgstr "قم بوصل الإشارة: " +msgstr "إشارة غير قادر على الاتصال" #: editor/connections_dialog.cpp editor/dependency_editor.cpp #: editor/export_template_manager.cpp editor/groups_editor.cpp @@ -873,7 +858,7 @@ msgstr "وصل" #: editor/connections_dialog.cpp #, fuzzy msgid "Signal:" -msgstr "الإشارات:" +msgstr "إشارة:" #: editor/connections_dialog.cpp msgid "Connect '%s' to '%s'" @@ -897,14 +882,12 @@ msgid "Disconnect" msgstr "قطع الاتصال" #: editor/connections_dialog.cpp -#, fuzzy msgid "Connect a Signal to a Method" -msgstr "قم بوصل الإشارة: " +msgstr "قم بوصل الإشارة إلى الدالة" #: editor/connections_dialog.cpp -#, fuzzy msgid "Edit Connection:" -msgstr "قم بتعديل الإتصال: " +msgstr "تعديل الإتصال:" #: editor/connections_dialog.cpp msgid "Are you sure you want to remove all connections from the \"%s\" signal?" @@ -980,22 +963,20 @@ msgid "Dependencies For:" msgstr "تابعة لـ:" #: editor/dependency_editor.cpp -#, fuzzy msgid "" "Scene '%s' is currently being edited.\n" "Changes will only take effect when reloaded." msgstr "" "المشهد '%s' هو حالياً جاري تعديله.\n" -"التغييرات لن تحصل حتي يتم إعادة التشغيل." +"ستسري التغييرات فقط عند إعادة التحميل." #: editor/dependency_editor.cpp -#, fuzzy msgid "" "Resource '%s' is in use.\n" "Changes will only take effect when reloaded." msgstr "" "المورد '%s' قيد الإستخدام.\n" -"التغييرات ستظهر بعد إعادة التشغيل." +" ستسري التغييرات فقط عند إعادة التحميل." #: editor/dependency_editor.cpp #: modules/gdnative/gdnative_library_editor_plugin.cpp @@ -1042,9 +1023,8 @@ msgid "Owners Of:" msgstr "ملاك:" #: editor/dependency_editor.cpp -#, fuzzy msgid "Remove selected files from the project? (Can't be restored)" -msgstr "إمسح الملفات المحددة من المشروع؟ (لا رجعة)" +msgstr "إمسح الملفات المختارة من المشروع؟ (لا يمكن استعادتها)" #: editor/dependency_editor.cpp msgid "" @@ -1088,9 +1068,8 @@ msgid "Permanently delete %d item(s)? (No undo!)" msgstr "إمسح نهائيا %d عنصر(عناصر)؟ (بلا رجعة!)" #: editor/dependency_editor.cpp -#, fuzzy msgid "Show Dependencies" -msgstr "التبعيات" +msgstr "إظهار التبعيات" #: editor/dependency_editor.cpp msgid "Orphan Resource Explorer" @@ -1181,12 +1160,10 @@ msgid "License" msgstr "الرخصة" #: editor/editor_about.cpp -#, fuzzy msgid "Third-party Licenses" -msgstr "ترخيص الطرف الثالث" +msgstr "تراخيص الجهات الخارجية" #: 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 " @@ -1211,9 +1188,8 @@ msgid "Licenses" msgstr "تراخيص" #: editor/editor_asset_installer.cpp editor/project_manager.cpp -#, fuzzy msgid "Error opening package file, not in ZIP format." -msgstr "خطأ عندفتح ملف الحزمة بسبب أن الملف ليس في صيغة \"ZIP\"." +msgstr "حدث خطأ عندفتح ملف الحزمة بسبب أن الملف ليس في صيغة \"ZIP\"." #: editor/editor_asset_installer.cpp msgid "Uncompressing Assets" @@ -1281,9 +1257,8 @@ msgid "Delete Bus Effect" msgstr "مسح تأثير البيوس" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Drag & drop to rearrange." -msgstr "بيوس الصوت، سحب وإسقاط لإعادة الترتيب." +msgstr "إسحب وأسقط لإعادة الترتيب." #: editor/editor_audio_buses.cpp msgid "Solo" @@ -1356,7 +1331,7 @@ msgstr "إفتح نسق بيوس الصوت" #: editor/editor_audio_buses.cpp msgid "There is no '%s' file." -msgstr "" +msgstr "لا يوجد ملف 's%'." #: editor/editor_audio_buses.cpp editor/plugins/canvas_item_editor_plugin.cpp msgid "Layout" @@ -1413,9 +1388,8 @@ msgid "Valid characters:" msgstr "الأحرف الصالحة:" #: editor/editor_autoload_settings.cpp -#, fuzzy msgid "Must not collide with an existing engine class name." -msgstr "إسم غير صالح، يجب أن لا يتصادم مع أسم فصل خاص بالمحرك." +msgstr "إسم غير صالح، يجب أن لا يتصادم مع أسم فئة خاصة بالمحرك." #: editor/editor_autoload_settings.cpp #, fuzzy @@ -3592,6 +3566,11 @@ msgid "Select Template File" msgstr "حدد ملف القالب" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "إدارة قوالب التصدير" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "تصدير مدير القوالب" @@ -5069,6 +5048,32 @@ msgid "Download for this asset is already in progress!" msgstr "تحميل هذا الأصل قيد التنفيذ أصلاً!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "الرخصة" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "الرخصة" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "الأول" @@ -9301,6 +9306,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "أضف مدخله" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/bg.po b/editor/translations/bg.po index da370687cb..1b3b4ff1d9 100644 --- a/editor/translations/bg.po +++ b/editor/translations/bg.po @@ -3500,6 +3500,11 @@ msgid "Select Template File" msgstr "Избиране на всичко" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Шаблони" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4974,6 +4979,32 @@ msgid "Download for this asset is already in progress!" msgstr "Този актив вече се сваля!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Лиценз" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Лиценз" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Начална" @@ -9152,6 +9183,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Любими:" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/bn.po b/editor/translations/bn.po index fda8528844..d26da26875 100644 --- a/editor/translations/bn.po +++ b/editor/translations/bn.po @@ -6,12 +6,13 @@ # Abdullah Zubair <abdullahzubair109@gmail.com>, 2017. # Tahmid Karim <tahmidk15@gmail.com>, 2016. # Tawhid H. <Tawhidk757@yahoo.com>, 2019. +# Hasibul Hasan <hasibeng78@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-09-26 11:50+0000\n" -"Last-Translator: Tawhid H. <Tawhidk757@yahoo.com>\n" +"PO-Revision-Date: 2019-12-13 09:38+0000\n" +"Last-Translator: Hasibul Hasan <hasibeng78@gmail.com>\n" "Language-Team: Bengali <https://hosted.weblate.org/projects/godot-engine/" "godot/bn/>\n" "Language: bn\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 3.9-dev\n" +"X-Generator: Weblate 3.10-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -39,7 +40,7 @@ msgstr "অবৈধ ইনপুট %i (পাস করা হয়নি) #: core/math/expression.cpp #, fuzzy msgid "self can't be used because instance is null (not passed)" -msgstr "স্ব ব্যবহার করা যাবে না কারণ উদাহরণটি হলো null(উত্তীর্ণ হয়নি)" +msgstr "self ব্যবাহার করা যাবে না কারণ instance যুক্তিযুক্ত নয়" #: core/math/expression.cpp #, fuzzy @@ -3729,6 +3730,11 @@ msgstr "নির্বাচিত ফাইলসমূহ অপসারণ #: editor/export_template_manager.cpp #, fuzzy +msgid "Godot Export Templates" +msgstr "এক্সপোর্ট টেমপ্লেটসমূহ লোড হচ্ছে" + +#: editor/export_template_manager.cpp +#, fuzzy msgid "Export Template Manager" msgstr "এক্সপোর্ট টেমপ্লেটসমূহ লোড হচ্ছে" @@ -5257,6 +5263,32 @@ msgid "Download for this asset is already in progress!" msgstr "এই অ্যাসেটটি ইতমধ্যে ডাউনলোড হচ্ছে!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "লাইসেন্স" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "লাইসেন্স" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "প্রথম" @@ -9618,6 +9650,15 @@ msgstr "সক্রিয় করুন" #: editor/project_export.cpp #, fuzzy +msgid "Add initial export..." +msgstr "ইনপুট যোগ করুন" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp +#, fuzzy msgid "Delete patch '%s' from list?" msgstr "ইনপুট অপসারণ করুন" @@ -14004,9 +14045,6 @@ msgstr "" #~ msgid "Re-Import Changed Resources" #~ msgstr "পুন-ইম্পোর্টে রিসোর্স-সমূহ পরিবর্তিত হয়েছে" -#~ msgid "Loading Export Templates" -#~ msgstr "এক্সপোর্ট টেমপ্লেটসমূহ লোড হচ্ছে" - #, fuzzy #~ msgid "" #~ "\n" diff --git a/editor/translations/ca.po b/editor/translations/ca.po index db3074ef51..815508351f 100644 --- a/editor/translations/ca.po +++ b/editor/translations/ca.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-10-04 03:15+0000\n" +"PO-Revision-Date: 2019-12-09 11:36+0000\n" "Last-Translator: roger <616steam@gmail.com>\n" "Language-Team: Catalan <https://hosted.weblate.org/projects/godot-engine/" "godot/ca/>\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.9-dev\n" +"X-Generator: Weblate 3.10-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -63,7 +63,6 @@ msgid "On call to '%s':" msgstr "En la crida a '%s':" #: core/ustring.cpp -#, fuzzy msgid "B" msgstr "B" @@ -72,9 +71,8 @@ msgid "KiB" msgstr "KiB" #: core/ustring.cpp -#, fuzzy msgid "MiB" -msgstr "Mesclar" +msgstr "MiB" #: core/ustring.cpp msgid "GiB" @@ -633,9 +631,8 @@ msgid "Scale Ratio:" msgstr "Relació d'Escala:" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Select Tracks to Copy" -msgstr "Tria les Pistes per copiar:" +msgstr "Seleccioneu les Pistes a Copiar" #: editor/animation_track_editor.cpp editor/editor_log.cpp #: editor/editor_properties.cpp @@ -649,7 +646,7 @@ msgstr "Copia" #: editor/animation_track_editor.cpp #, fuzzy msgid "Select All/None" -msgstr "No seleccionar-ne cap" +msgstr "Seleccionar Totes/Cap" #: editor/animation_track_editor_plugins.cpp msgid "Add Audio Track Clip" @@ -690,12 +687,12 @@ msgstr "%d ocurrència/es reemplaçades." #: editor/code_editor.cpp editor/editor_help.cpp #, fuzzy msgid "%d match." -msgstr "S'han trobat %d coincidències." +msgstr "%d coincidència." #: editor/code_editor.cpp editor/editor_help.cpp #, fuzzy msgid "%d matches." -msgstr "S'han trobat %d coincidències." +msgstr "%d coincidències." #: editor/code_editor.cpp editor/find_in_files.cpp msgid "Match Case" @@ -1152,7 +1149,7 @@ msgstr "Llicència" #: editor/editor_about.cpp #, fuzzy msgid "Third-party Licenses" -msgstr "Llicència externa" +msgstr "Llicències de Tercers" #: editor/editor_about.cpp #, fuzzy @@ -1182,7 +1179,7 @@ msgstr "Llicències" #: editor/editor_asset_installer.cpp editor/project_manager.cpp #, fuzzy msgid "Error opening package file, not in ZIP format." -msgstr "Error en obrir el paquet d'arxius. El fitxer no té el format zip." +msgstr "Error en obrir el arxiu comprimit, el fitxer no té el format ZIP." #: editor/editor_asset_installer.cpp msgid "Uncompressing Assets" @@ -1252,7 +1249,7 @@ msgstr "Elimina l'Efecte de Bus" #: editor/editor_audio_buses.cpp #, fuzzy msgid "Drag & drop to rearrange." -msgstr "Bus d'Àudio, reorganitza Arrossegant i Deixant anar." +msgstr "Arrossegueu i deixeu anar per reordenar." #: editor/editor_audio_buses.cpp msgid "Solo" @@ -2931,8 +2928,9 @@ msgid "Play" msgstr "Reprodueix" #: editor/editor_node.cpp +#, fuzzy msgid "Pause the scene execution for debugging." -msgstr "" +msgstr "Pausa l’execució d’escena per a la depuració." #: editor/editor_node.cpp msgid "Pause Scene" @@ -3544,6 +3542,11 @@ msgid "Select Template File" msgstr "Seleccioneu un Fitxer de Plantilla" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Carregant Plantilles d'Exportació" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Gestor de Plantilles d'Exportació" @@ -4953,6 +4956,32 @@ msgid "Download for this asset is already in progress!" msgstr "Ja s'està baixant aquest actiu!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Llicència" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Llicència" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Primer" @@ -4974,7 +5003,7 @@ msgstr "Tot" #: editor/plugins/asset_library_editor_plugin.cpp msgid "No results for \"%s\"." -msgstr "" +msgstr "Cap resultat per \"%s\"." #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy @@ -5068,8 +5097,9 @@ msgid "Grid Step:" msgstr "Pas de la Graella:" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy msgid "Primary Line Every:" -msgstr "" +msgstr "Línia principal cada:" #: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy @@ -9222,6 +9252,15 @@ msgid "Runnable" msgstr "Executable" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Afegeix una Entrada" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Eliminar el Pedaç '%s' de la llista?" @@ -9694,8 +9733,9 @@ msgid "Projects" msgstr "Projecte" #: editor/project_manager.cpp +#, fuzzy msgid "Last Modified" -msgstr "" +msgstr "Última modificació" #: editor/project_manager.cpp msgid "Scan" @@ -10350,8 +10390,9 @@ msgid "Delete the root node \"%s\"?" msgstr "Elimina el(s) Node(s) de Graf d'Ombreig" #: editor/scene_tree_dock.cpp +#, fuzzy msgid "Delete node \"%s\" and its children?" -msgstr "" +msgstr "Voleu suprimir el node \"%s\" i els seus fills?" #: editor/scene_tree_dock.cpp #, fuzzy @@ -11069,8 +11110,9 @@ msgid "GDNative" msgstr "GDNative" #: modules/gdscript/gdscript_functions.cpp +#, fuzzy msgid "Expected a string of length 1 (a character)." -msgstr "" +msgstr "S'esperava una cadena de longitud 1 (un caràcter)." #: modules/gdscript/gdscript_functions.cpp #, fuzzy @@ -11585,12 +11627,14 @@ msgid "Can't create function of nodes from nodes of multiple functions." msgstr "" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy msgid "Select at least one node with sequence port." -msgstr "" +msgstr "Seleccioneu almenys un node amb port de seqüència." #: modules/visual_script/visual_script_editor.cpp +#, fuzzy msgid "Try to only have one sequence input in selection." -msgstr "" +msgstr "Intenteu tenir només una entrada de seqüència a la selecció." #: modules/visual_script/visual_script_editor.cpp #, fuzzy @@ -13592,9 +13636,6 @@ msgstr "Les constants no es poden modificar." #~ msgid "Re-Import Changed Resources" #~ msgstr "ReImporta Recursos Modificats" -#~ msgid "Loading Export Templates" -#~ msgstr "Carregant Plantilles d'Exportació" - #, fuzzy #~ msgid "" #~ "\n" diff --git a/editor/translations/cs.po b/editor/translations/cs.po index dfe9b3b4e9..55c9ccf864 100644 --- a/editor/translations/cs.po +++ b/editor/translations/cs.po @@ -13,12 +13,14 @@ # Peeter Angelo <contact@peeterangelo.com>, 2019. # VojtechBrezina <vojta.brezina@gmail.com>, 2019. # Garrom Orc Shaman <garromorcshaman@gmail.com>, 2019. +# David Husička <davidek251@seznam.cz>, 2019. +# Luboš Nečas <lubosnecas506@seznam.cz>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-08-21 15:57+0000\n" -"Last-Translator: VojtechBrezina <vojta.brezina@gmail.com>\n" +"PO-Revision-Date: 2019-12-09 11:36+0000\n" +"Last-Translator: Luboš Nečas <lubosnecas506@seznam.cz>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/godot-engine/godot/" "cs/>\n" "Language: cs\n" @@ -26,7 +28,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 3.9-dev\n" +"X-Generator: Weblate 3.10-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -70,31 +72,31 @@ msgstr "Při volání '%s':" #: core/ustring.cpp msgid "B" -msgstr "" +msgstr "B" #: core/ustring.cpp msgid "KiB" -msgstr "" +msgstr "KiB" #: core/ustring.cpp msgid "MiB" -msgstr "" +msgstr "MiB" #: core/ustring.cpp msgid "GiB" -msgstr "" +msgstr "GiB" #: core/ustring.cpp msgid "TiB" -msgstr "" +msgstr "TiB" #: core/ustring.cpp msgid "PiB" -msgstr "" +msgstr "PiB" #: core/ustring.cpp msgid "EiB" -msgstr "" +msgstr "EiB" #: editor/animation_bezier_editor.cpp msgid "Free" @@ -276,9 +278,8 @@ msgid "Time (s): " msgstr "Čas (s): " #: editor/animation_track_editor.cpp -#, fuzzy msgid "Toggle Track Enabled" -msgstr "Povolit" +msgstr "Přepínací Stopa Povolena" #: editor/animation_track_editor.cpp msgid "Continuous" @@ -2117,7 +2118,7 @@ msgstr "Stáhnout" #: editor/editor_network_profiler.cpp msgid "Up" -msgstr "" +msgstr "Nahoru" #: editor/editor_network_profiler.cpp editor/editor_node.cpp msgid "Node" @@ -2141,7 +2142,7 @@ msgstr "" #: editor/editor_node.cpp editor/project_manager.cpp msgid "New Window" -msgstr "" +msgstr "Nové okno" #: editor/editor_node.cpp msgid "Project export failed with error code %d." @@ -3561,6 +3562,11 @@ msgid "Select Template File" msgstr "Vybrat soubor šablony" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Spravovat exportní šablony" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Správce exportních šablon" @@ -4660,7 +4666,7 @@ msgstr "" #: editor/plugins/animation_state_machine_editor.cpp msgid "Travel" -msgstr "" +msgstr "Cestovat" #: editor/plugins/animation_state_machine_editor.cpp msgid "Start and end nodes are needed for a sub-transition." @@ -4974,6 +4980,32 @@ msgid "Download for this asset is already in progress!" msgstr "Stahování tohoto assetu právě probíhá!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licence" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licence" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "První" @@ -9182,6 +9214,15 @@ msgstr "Spustitelný" #: editor/project_export.cpp #, fuzzy +msgid "Add initial export..." +msgstr "Přidat vstup" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp +#, fuzzy msgid "Delete patch '%s' from list?" msgstr "Odstranit" diff --git a/editor/translations/da.po b/editor/translations/da.po index 8c28f898aa..46968e8dca 100644 --- a/editor/translations/da.po +++ b/editor/translations/da.po @@ -3590,6 +3590,11 @@ msgid "Select Template File" msgstr "Vælg template fil" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Organiser Eksport Skabeloner" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Eksporter Skabelon Manager" @@ -5075,6 +5080,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licens" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licens" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -9268,6 +9299,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Tilføj punkt" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/de.po b/editor/translations/de.po index 76dc2130bc..1f0ec9af2d 100644 --- a/editor/translations/de.po +++ b/editor/translations/de.po @@ -47,12 +47,13 @@ # Linux User <no-ads@mail.de>, 2019. # David May <wasser@gmail.com>, 2019. # Draco Drache <jan.holger.te@gmail.com>, 2019. +# Jonas <dotchucknorris@gmx.de>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-11-25 04:04+0000\n" -"Last-Translator: So Wieso <sowieso@dukun.de>\n" +"PO-Revision-Date: 2019-12-12 09:05+0000\n" +"Last-Translator: Jonas <dotchucknorris@gmx.de>\n" "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/" "godot/de/>\n" "Language: de\n" @@ -3564,6 +3565,11 @@ msgid "Select Template File" msgstr "Vorlagendatei auswählen" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Lade Exportvorlagen" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Exportvorlagenverwaltung" @@ -4958,6 +4964,32 @@ msgid "Download for this asset is already in progress!" msgstr "Dieser Nutzerinhalt wird bereits herunter geladen!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Lizenz" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Lizenz" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Erste" @@ -4979,7 +5011,7 @@ msgstr "Alle" #: editor/plugins/asset_library_editor_plugin.cpp msgid "No results for \"%s\"." -msgstr "Keine Ergebnisse für „%s“." +msgstr "Keine Ergebnisse für \"%s\"." #: editor/plugins/asset_library_editor_plugin.cpp msgid "Import..." @@ -5086,7 +5118,7 @@ msgstr "Rotationsabstand:" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Scale Step:" -msgstr "Skalierungsabschnitte:" +msgstr "Skalierungsschritte:" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Move Vertical Guide" @@ -9094,6 +9126,15 @@ msgid "Runnable" msgstr "ausführbar" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Eingangsschnittstelle hinzufügen" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Patch ‚%s‘ von Liste löschen?" @@ -9563,9 +9604,8 @@ msgid "Projects" msgstr "Projekte" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "Bearbeitet" +msgstr "Zuletzt bearbeitet" #: editor/project_manager.cpp msgid "Scan" @@ -11694,7 +11734,7 @@ msgstr "Benötigtes Icon wurde nicht in der Vorlage festgelegt." #: platform/javascript/export/export.cpp msgid "Stop HTTP Server" -msgstr "HTTP-Server stoppen" +msgstr "HTTP Server Anhalten" #: platform/javascript/export/export.cpp msgid "Run in Browser" @@ -13576,9 +13616,6 @@ msgstr "Konstanten können nicht verändert werden." #~ msgid "Re-Import Changed Resources" #~ msgstr "Veränderte Ressourcen neu importieren" -#~ msgid "Loading Export Templates" -#~ msgstr "Lade Exportvorlagen" - #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/de_CH.po b/editor/translations/de_CH.po index 1ad8fb046f..2987c5f7eb 100644 --- a/editor/translations/de_CH.po +++ b/editor/translations/de_CH.po @@ -3484,6 +3484,11 @@ msgid "Select Template File" msgstr "Node(s) löschen" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Ungültige Bilder löschen" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4934,6 +4939,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -9101,6 +9130,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Script hinzufügen" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/editor.pot b/editor/translations/editor.pot index 34ff822dc4..7b57188664 100644 --- a/editor/translations/editor.pot +++ b/editor/translations/editor.pot @@ -3346,6 +3346,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4710,6 +4714,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8686,6 +8714,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/el.po b/editor/translations/el.po index 969f63fbd1..6b6b7dd304 100644 --- a/editor/translations/el.po +++ b/editor/translations/el.po @@ -3541,6 +3541,11 @@ msgid "Select Template File" msgstr "Επιλογή Αρχείου Προτύπων" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Φόρτωση προτύπων εξαγωγής" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Διαχειριστής προτύπων εξαγωγής" @@ -4953,6 +4958,32 @@ msgid "Download for this asset is already in progress!" msgstr "Η λήψη είναι ήδη σε εξέλιξη!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Άδεια" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Άδεια" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Πρώτο" @@ -9124,6 +9155,15 @@ msgid "Runnable" msgstr "Εκτελέσιμο" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Προσθήκη θύρας εισόδου" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Διαγραφή ενημέρωσης '%s' από την λίστα;" @@ -13664,9 +13704,6 @@ msgstr "Οι σταθερές δεν μπορούν να τροποποιηθο #~ msgid "Re-Import Changed Resources" #~ msgstr "Επανεισαγωγή τροποπιημένων πόρων" -#~ msgid "Loading Export Templates" -#~ msgstr "Φόρτωση προτύπων εξαγωγής" - #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/eo.po b/editor/translations/eo.po index 8ce8f7c298..aec7bd1893 100644 --- a/editor/translations/eo.po +++ b/editor/translations/eo.po @@ -3432,6 +3432,11 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Mastrumi eksportaj ŝablonoj" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4807,6 +4812,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8797,6 +8826,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/es.po b/editor/translations/es.po index 0c04cb5fff..5bc99dd4a6 100644 --- a/editor/translations/es.po +++ b/editor/translations/es.po @@ -46,8 +46,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-11-29 14:49+0000\n" -"Last-Translator: Javier Ocampos <xavier.ocampos@gmail.com>\n" +"PO-Revision-Date: 2019-12-09 11:36+0000\n" +"Last-Translator: Lisandro Lorea <lisandrolorea@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/" "godot/es/>\n" "Language: es\n" @@ -60,7 +60,7 @@ msgstr "" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." -msgstr "El argumento para convert() es invalido, utiliza constantes TYPE_*." +msgstr "Argumento de tipo inválido para convert(), utiliza constantes TYPE_*." #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/mono/glue/gd_glue.cpp @@ -3564,6 +3564,11 @@ msgid "Select Template File" msgstr "Selecciona un Archivo de Plantilla" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Cargando plantillas de exportación" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Gestor de Plantillas de Exportación" @@ -4960,6 +4965,32 @@ msgid "Download for this asset is already in progress!" msgstr "¡Éste asset ya está descargándose!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licencia" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licencia" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Primero" @@ -9081,6 +9112,15 @@ msgid "Runnable" msgstr "Ejecutable" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Agregar puerto de entrada" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "¿Eliminar patch '%s' de la lista?" @@ -9550,9 +9590,8 @@ msgid "Projects" msgstr "Proyectos" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "Modificado/s" +msgstr "Ultima Modificación" #: editor/project_manager.cpp msgid "Scan" @@ -13583,9 +13622,6 @@ msgstr "Las constantes no pueden modificarse." #~ msgid "Re-Import Changed Resources" #~ msgstr "Reimportar recursos cambiados" -#~ msgid "Loading Export Templates" -#~ msgstr "Cargando plantillas de exportación" - #, fuzzy #~ msgid "" #~ "\n" diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po index eea6a6da6b..eaeef3d1ba 100644 --- a/editor/translations/es_AR.po +++ b/editor/translations/es_AR.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-11-29 14:49+0000\n" +"PO-Revision-Date: 2019-12-09 11:37+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" @@ -3529,6 +3529,11 @@ msgid "Select Template File" msgstr "Elegir Archivo de Plantilla" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Cargando Plantillas de Exportación" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Gestor de Plantillas de Exportación" @@ -4926,6 +4931,32 @@ msgid "Download for this asset is already in progress!" msgstr "La descarga de este asset ya está en progreso!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licencia" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licencia" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Primero" @@ -9044,6 +9075,15 @@ msgid "Runnable" msgstr "Ejecutable" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Agregar puerto de entrada" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Eliminar parche '%s' de la lista?" @@ -9515,9 +9555,8 @@ msgid "Projects" msgstr "Proyectos" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "Modificado/s" +msgstr "Ultima Modificación" #: editor/project_manager.cpp msgid "Scan" @@ -13347,9 +13386,6 @@ msgstr "Las constantes no pueden modificarse." #~ msgid "Re-Import Changed Resources" #~ msgstr "Reimportar Recursos Cambiados" -#~ msgid "Loading Export Templates" -#~ msgstr "Cargando Plantillas de Exportación" - #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/et.po b/editor/translations/et.po index 05e6e4fb73..8ae92343a4 100644 --- a/editor/translations/et.po +++ b/editor/translations/et.po @@ -3357,6 +3357,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4726,6 +4730,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8708,6 +8736,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/eu.po b/editor/translations/eu.po index af877a08a2..185dec4340 100644 --- a/editor/translations/eu.po +++ b/editor/translations/eu.po @@ -3351,6 +3351,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4715,6 +4719,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8691,6 +8719,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/fa.po b/editor/translations/fa.po index 2376b0ac59..7d5eb43c0f 100644 --- a/editor/translations/fa.po +++ b/editor/translations/fa.po @@ -3537,6 +3537,11 @@ msgid "Select Template File" msgstr "انتخاب پرونده قالب" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "مدیریت صدور قالب ها" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -5005,6 +5010,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "مجوز" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "مجوز" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -9215,6 +9246,15 @@ msgstr "" #: editor/project_export.cpp #, fuzzy +msgid "Add initial export..." +msgstr "افزودن عمل ورودی" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp +#, fuzzy msgid "Delete patch '%s' from list?" msgstr "حذف کن" diff --git a/editor/translations/fi.po b/editor/translations/fi.po index dd1d867ae2..ffa352c674 100644 --- a/editor/translations/fi.po +++ b/editor/translations/fi.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-11-29 14:49+0000\n" +"PO-Revision-Date: 2019-12-09 11:37+0000\n" "Last-Translator: Tapani Niemi <tapani.niemi@kapsi.fi>\n" "Language-Team: Finnish <https://hosted.weblate.org/projects/godot-engine/" "godot/fi/>\n" @@ -3491,6 +3491,11 @@ msgid "Select Template File" msgstr "Valitse mallitiedosto" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Hallinnoi vientimalleja" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Vientimallien hallinta" @@ -4883,6 +4888,32 @@ msgid "Download for this asset is already in progress!" msgstr "Tämän assetin lataus on jo käynnissä!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Lisenssi" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Lisenssi" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Ensimmäinen" @@ -8998,6 +9029,15 @@ msgid "Runnable" msgstr "Suoritettava" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Lisää tuloportti" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Poista päivitys '%s' listasta?" @@ -9463,9 +9503,8 @@ msgid "Projects" msgstr "Projektit" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "Muutettu" +msgstr "Viimeksi muutettu" #: editor/project_manager.cpp msgid "Scan" diff --git a/editor/translations/fil.po b/editor/translations/fil.po index 3568aed2ea..91964a5f01 100644 --- a/editor/translations/fil.po +++ b/editor/translations/fil.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2019-11-21 14:24+0000\n" +"PO-Revision-Date: 2019-12-12 09:05+0000\n" "Last-Translator: Bakainkorp <Ryan.Bautista86@myhunter.cuny.edu>\n" "Language-Team: Filipino <https://hosted.weblate.org/projects/godot-engine/" "godot/fil/>\n" @@ -657,7 +657,7 @@ msgstr "" #: editor/code_editor.cpp msgid "Go to Line" -msgstr "" +msgstr "Pumunta sa Linya" #: editor/code_editor.cpp msgid "Line Number:" @@ -817,7 +817,7 @@ msgstr "Isara" #: editor/connections_dialog.cpp msgid "Connect" -msgstr "" +msgstr "Ikabit" #: editor/connections_dialog.cpp msgid "Signal:" @@ -837,7 +837,7 @@ msgstr "" #: editor/connections_dialog.cpp msgid "Connect..." -msgstr "" +msgstr "Ikabit..." #: editor/connections_dialog.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp @@ -3359,6 +3359,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4724,6 +4728,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8707,6 +8735,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/fr.po b/editor/translations/fr.po index 23b73c25b0..3bec7dcf40 100644 --- a/editor/translations/fr.po +++ b/editor/translations/fr.po @@ -73,7 +73,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-12-03 14:05+0000\n" +"PO-Revision-Date: 2019-12-09 11:36+0000\n" "Last-Translator: Pierre Stempin <pierre.stempin@gmail.com>\n" "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/" "godot/fr/>\n" @@ -3597,6 +3597,11 @@ msgid "Select Template File" msgstr "Sélectionner le fichier de modèle" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Gérer les modèles d'exportation" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Gestionnaire d'export de modèles" @@ -4998,6 +5003,32 @@ msgid "Download for this asset is already in progress!" msgstr "Le téléchargement de cette ressource est déjà en cours !" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licence" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licence" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Premier" @@ -9138,6 +9169,15 @@ msgid "Runnable" msgstr "Exécutable" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Ajouter un port d'entrée" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Supprimer le patch « %s » de la liste ?" @@ -9609,9 +9649,8 @@ msgid "Projects" msgstr "Projets" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "Modifié" +msgstr "Dernière modification" #: editor/project_manager.cpp msgid "Scan" diff --git a/editor/translations/ga.po b/editor/translations/ga.po index 8b96d258ad..b296c82cd2 100644 --- a/editor/translations/ga.po +++ b/editor/translations/ga.po @@ -3353,6 +3353,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4720,6 +4724,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8701,6 +8729,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/he.po b/editor/translations/he.po index db308bff70..f4ca1e490a 100644 --- a/editor/translations/he.po +++ b/editor/translations/he.po @@ -3531,6 +3531,11 @@ msgid "Select Template File" msgstr "בחירת קובץ תבנית" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "ניהול תבניות ייצוא" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "מנהל ייצוא תבניות" @@ -4997,6 +5002,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "רישיון" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "רישיון" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -9191,6 +9222,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "מועדפים:" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/hi.po b/editor/translations/hi.po index 267e705a88..80934bb8b5 100644 --- a/editor/translations/hi.po +++ b/editor/translations/hi.po @@ -3467,6 +3467,10 @@ msgid "Select Template File" msgstr "चयनित फ़ाइलें हटाएं?" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4877,6 +4881,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "लाइसेंस" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "लाइसेंस" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8947,6 +8977,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "पसंदीदा:" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/hr.po b/editor/translations/hr.po index 33566267a1..f6ff59130a 100644 --- a/editor/translations/hr.po +++ b/editor/translations/hr.po @@ -3369,6 +3369,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4737,6 +4741,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licenca" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licenca" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8732,6 +8762,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/hu.po b/editor/translations/hu.po index 244d3c903e..5a0ffba23d 100644 --- a/editor/translations/hu.po +++ b/editor/translations/hu.po @@ -3636,6 +3636,11 @@ msgid "Select Template File" msgstr "Válasszon sablonfájlt" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Export Sablonok Kezelése" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Export Sablon Kezelő" @@ -5119,6 +5124,32 @@ msgid "Download for this asset is already in progress!" msgstr "Ennek az eszköznek a letöltése már folyamatban van!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licenc" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licenc" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "első" @@ -9383,6 +9414,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Bemenet Hozzáadása" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/id.po b/editor/translations/id.po index 68edb05284..5edf17d1e9 100644 --- a/editor/translations/id.po +++ b/editor/translations/id.po @@ -21,12 +21,13 @@ # I Dewa Agung Adhinata <agungnata2003@gmail.com>, 2019. # herri siagian <herry.it.2007@gmail.com>, 2019. # MonsterGila <fikrirazor@outlook.co.id>, 2019. +# Modeus Darksono <garuga17@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-10-04 03:15+0000\n" -"Last-Translator: Sofyan Sugianto <sofyanartem@gmail.com>\n" +"PO-Revision-Date: 2019-12-13 09:38+0000\n" +"Last-Translator: Modeus Darksono <garuga17@gmail.com>\n" "Language-Team: Indonesian <https://hosted.weblate.org/projects/godot-engine/" "godot/id/>\n" "Language: id\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 3.9-dev\n" +"X-Generator: Weblate 3.10-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -646,7 +647,6 @@ msgid "Scale Ratio:" msgstr "Rasio Skala:" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Select Tracks to Copy" msgstr "Pilih track untuk disalin:" @@ -660,9 +660,8 @@ msgid "Copy" msgstr "Kopy" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Select All/None" -msgstr "Pilih Tidak Ada" +msgstr "Pilih Semua/Tidak Pilih Semua" #: editor/animation_track_editor_plugins.cpp msgid "Add Audio Track Clip" @@ -3516,6 +3515,11 @@ msgid "Select Template File" msgstr "Pilih berkas templat" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Memuat Ekspor Template-template." + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Manajer Templat Ekspor" @@ -4907,6 +4911,32 @@ msgid "Download for this asset is already in progress!" msgstr "Unduhan untuk aset ini sedang diproses!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Lisensi" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Lisensi" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Pertama" @@ -9038,6 +9068,15 @@ msgid "Runnable" msgstr "Dapat dijalankan" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Tambah port masukan" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Hapus entri penambalan '%s' dari daftar?" @@ -12260,13 +12299,12 @@ msgid "(Other)" msgstr "(Yang Lain)" #: scene/main/scene_tree.cpp -#, fuzzy msgid "" "Default Environment as specified in Project Settings (Rendering -> " "Environment -> Default Environment) could not be loaded." msgstr "" "Lingkungan Baku yang ditetapkan di Pengaturan Proyek (Rendering -> Viewport -" -"> Lingkungan Baku) tidak dapat dimuat" +"> Lingkungan Baku) tidak dapat dimuat." #: scene/main/viewport.cpp msgid "" @@ -12282,14 +12320,12 @@ msgstr "" "beberapa node untuk ditampilkan." #: scene/resources/visual_shader_nodes.cpp -#, fuzzy msgid "Invalid source for preview." -msgstr "Ukuran font tidak sah." +msgstr "Sumber tidak sah untuk pratinjau." #: scene/resources/visual_shader_nodes.cpp -#, fuzzy msgid "Invalid source for shader." -msgstr "Ukuran font tidak sah." +msgstr "Sumber tidak sah untuk shader." #: scene/resources/visual_shader_nodes.cpp msgid "Invalid comparison function for that type." @@ -12951,9 +12987,6 @@ msgstr "Konstanta tidak dapat dimodifikasi." #~ msgid "Re-Importing" #~ msgstr "Mengimpor ulang" -#~ msgid "Loading Export Templates" -#~ msgstr "Memuat Ekspor Template-template." - #~ msgid "Pick New Name and Location For:" #~ msgstr "Tentukan Nama dan Lokasi Baru untuk:" diff --git a/editor/translations/is.po b/editor/translations/is.po index 50e5bfac37..646ef5bf18 100644 --- a/editor/translations/is.po +++ b/editor/translations/is.po @@ -3396,6 +3396,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4776,6 +4780,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8801,6 +8829,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/it.po b/editor/translations/it.po index 77b9437753..455873bfd2 100644 --- a/editor/translations/it.po +++ b/editor/translations/it.po @@ -3555,6 +3555,11 @@ msgid "Select Template File" msgstr "Seleziona file template" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Caricamento Template d'Esportazione" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Gestore Template Esportazione" @@ -4954,6 +4959,32 @@ msgid "Download for this asset is already in progress!" msgstr "Il download per questo asset è già in corso!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licenza" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licenza" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Primo" @@ -9093,6 +9124,15 @@ msgid "Runnable" msgstr "Eseguibile" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Aggiungi porta di Input" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Eliminare patch '%s' dalla lista?" @@ -13401,9 +13441,6 @@ msgstr "Le constanti non possono essere modificate." #~ msgid "Re-Import Changed Resources" #~ msgstr "Re-Importando Risorse Cambiate" -#~ msgid "Loading Export Templates" -#~ msgstr "Caricamento Template d'Esportazione" - #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/ja.po b/editor/translations/ja.po index a5697f71d9..3e25e9f0e9 100644 --- a/editor/translations/ja.po +++ b/editor/translations/ja.po @@ -3520,6 +3520,11 @@ msgid "Select Template File" msgstr "テンプレートファイルを選択" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "エクスポート テンプレートの読み込み" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "テンプレートのエクスポート マネージャー" @@ -4910,6 +4915,32 @@ msgid "Download for this asset is already in progress!" msgstr "このアセットのダウンロードは既に進行中！" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "ライセンス" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "ライセンス" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "最初" @@ -9052,6 +9083,15 @@ msgid "Runnable" msgstr "実行可能" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "入力ポートの追加" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "パッチ '%s' をリストから削除しますか?" @@ -13414,10 +13454,6 @@ msgstr "定数は変更できません。" #~ msgstr "変更したリソースを再インポート" #, fuzzy -#~ msgid "Loading Export Templates" -#~ msgstr "エクスポート テンプレートの読み込み" - -#, fuzzy #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/ka.po b/editor/translations/ka.po index d4710402f2..353798a3b0 100644 --- a/editor/translations/ka.po +++ b/editor/translations/ka.po @@ -3478,6 +3478,10 @@ msgid "Select Template File" msgstr "წავშალოთ მონიშნული ფაილები?" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4888,6 +4892,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "ლიცენზია" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "ლიცენზია" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8982,6 +9012,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "საყვარლები:" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/ko.po b/editor/translations/ko.po index 3aac1a2e39..0d5ffb8eb1 100644 --- a/editor/translations/ko.po +++ b/editor/translations/ko.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-11-25 04:05+0000\n" +"PO-Revision-Date: 2019-12-09 11:37+0000\n" "Last-Translator: 송태섭 <xotjq237@gmail.com>\n" "Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/" "godot/ko/>\n" @@ -3478,6 +3478,11 @@ msgid "Select Template File" msgstr "템플릿 파일 선택하기" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "내보내기 템플릿 로딩 중" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "내보내기 템플릿 매니저" @@ -4861,6 +4866,32 @@ msgid "Download for this asset is already in progress!" msgstr "이 애셋은 이미 다운로드 중이에요!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "라이선스" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "라이선스" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "처음으로" @@ -8934,6 +8965,15 @@ msgid "Runnable" msgstr "실행가능" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "입력 포트 추가하기" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "'%s'을(를) 패치 목록에서 삭제할까요?" @@ -9390,9 +9430,8 @@ msgid "Projects" msgstr "프로젝트" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "수정됨" +msgstr "마지막으로 수정됨" #: editor/project_manager.cpp msgid "Scan" @@ -13291,9 +13330,6 @@ msgstr "상수는 수정할 수 없어요." #~ msgid "Re-Import Changed Resources" #~ msgstr "변경된 리소스 다시 가져오기" -#~ msgid "Loading Export Templates" -#~ msgstr "내보내기 템플릿 로딩 중" - #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/lt.po b/editor/translations/lt.po index 5971331785..44f09a361a 100644 --- a/editor/translations/lt.po +++ b/editor/translations/lt.po @@ -3451,6 +3451,10 @@ msgid "Select Template File" msgstr "Pasirinkite Nodus, kuriuos norite importuoti" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4871,6 +4875,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "pirmas" @@ -8966,6 +8994,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Mėgstamiausi:" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/lv.po b/editor/translations/lv.po index 97c80f9a22..8ee5f32d43 100644 --- a/editor/translations/lv.po +++ b/editor/translations/lv.po @@ -3444,6 +3444,10 @@ msgid "Select Template File" msgstr "Izvēlēties šo Mapi" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4852,6 +4856,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licence" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licence" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8939,6 +8969,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Favorīti:" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/mi.po b/editor/translations/mi.po index 693a0f1535..c880cc0c55 100644 --- a/editor/translations/mi.po +++ b/editor/translations/mi.po @@ -3344,6 +3344,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4708,6 +4712,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8684,6 +8712,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/ml.po b/editor/translations/ml.po index 0ea1566617..75b09327f3 100644 --- a/editor/translations/ml.po +++ b/editor/translations/ml.po @@ -3354,6 +3354,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4721,6 +4725,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8697,6 +8725,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/ms.po b/editor/translations/ms.po index cef1d6dcc0..4b4bb6cceb 100644 --- a/editor/translations/ms.po +++ b/editor/translations/ms.po @@ -3376,6 +3376,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4751,6 +4755,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Lesen" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Lesen" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8753,6 +8783,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/nb.po b/editor/translations/nb.po index 59a2d5553d..036ad8620a 100644 --- a/editor/translations/nb.po +++ b/editor/translations/nb.po @@ -3679,6 +3679,11 @@ msgstr "Velg malfil" #: editor/export_template_manager.cpp #, fuzzy +msgid "Godot Export Templates" +msgstr "Håndter Eksportmaler" + +#: editor/export_template_manager.cpp +#, fuzzy msgid "Export Template Manager" msgstr "Eksporter Mal-Manager" @@ -5193,6 +5198,32 @@ msgid "Download for this asset is already in progress!" msgstr "Nedlastning for denne asset'en er allerede i gang!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Lisens" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Lisens" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "første" @@ -9458,6 +9489,15 @@ msgid "Runnable" msgstr "Kjørbar" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Legg til Input" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/nl.po b/editor/translations/nl.po index 3f5fb5908a..76c1adf640 100644 --- a/editor/translations/nl.po +++ b/editor/translations/nl.po @@ -3545,6 +3545,11 @@ msgid "Select Template File" msgstr "Selecteer sjabloonbestand" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Beheer Export Templates" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Export Sjabloon Manager" @@ -4979,6 +4984,32 @@ msgid "Download for this asset is already in progress!" msgstr "Download voor dit onderdeel is al bezig!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licentie" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licentie" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Eerste" @@ -9298,6 +9329,15 @@ msgid "Runnable" msgstr "Uitvoerbaar" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Voeg invoer toe" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Verwijder patch '%s' van lijst?" diff --git a/editor/translations/or.po b/editor/translations/or.po index 9585062994..7b7c4d85c4 100644 --- a/editor/translations/or.po +++ b/editor/translations/or.po @@ -3350,6 +3350,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4714,6 +4718,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8690,6 +8718,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/pl.po b/editor/translations/pl.po index 43b4580dd8..4c4ef7b9c6 100644 --- a/editor/translations/pl.po +++ b/editor/translations/pl.po @@ -42,7 +42,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-11-25 04:05+0000\n" +"PO-Revision-Date: 2019-12-12 09:05+0000\n" "Last-Translator: Tomek <kobewi4e@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/" "godot/pl/>\n" @@ -3524,6 +3524,11 @@ msgid "Select Template File" msgstr "Wybierz plik szablonu" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Wczytywanie szablonów eksportu" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Menedżer szablonów eksportu" @@ -4918,6 +4923,32 @@ msgid "Download for this asset is already in progress!" msgstr "Pobieranie tego zasobu jest już w toku!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licencja" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licencja" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Początek" @@ -5229,7 +5260,7 @@ msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Alt+RMB: Depth list selection" -msgstr "Alt + RMB: Głębokość listy" +msgstr "Alt+PPM: Lista obiektów pod spodem" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -9033,6 +9064,15 @@ msgid "Runnable" msgstr "Uruchamiany" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Dodaj port wejściowy" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Usunąć ścieżkę \"%s\" z listy?" @@ -9499,9 +9539,8 @@ msgid "Projects" msgstr "Projekty" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "Zmodyfikowany" +msgstr "Data modyfikacji" #: editor/project_manager.cpp msgid "Scan" @@ -13299,9 +13338,6 @@ msgstr "Stałe nie mogą być modyfikowane." #~ msgid "Re-Import Changed Resources" #~ msgstr "Zaimportuj ponownie zmienione zasoby" -#~ msgid "Loading Export Templates" -#~ msgstr "Wczytywanie szablonów eksportu" - #, fuzzy #~ msgid "" #~ "\n" diff --git a/editor/translations/pr.po b/editor/translations/pr.po index fc619b3da7..5b7b72cfd5 100644 --- a/editor/translations/pr.po +++ b/editor/translations/pr.po @@ -3452,6 +3452,11 @@ msgid "Select Template File" msgstr "Slit th' Node" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Discharge ye' Variable" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4867,6 +4872,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8989,6 +9018,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Add Signal" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po index 8ec43fd0e0..2bac1f5a81 100644 --- a/editor/translations/pt_BR.po +++ b/editor/translations/pt_BR.po @@ -72,12 +72,14 @@ # Wow Bitch <hahaj@itmailr.com>, 2019. # Alan Tavares <alan1tavares@gmail.com>, 2019. # Rafael Silveira <res883@gmail.com>, 2019. +# Luigi <luigimendeszanchett@gmail.com>, 2019. +# Nicolas Abril <nicolas.abril@protonmail.ch>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: 2016-05-30\n" -"PO-Revision-Date: 2019-12-03 14:05+0000\n" -"Last-Translator: Joaquim Ferreira <joaquimferreira1996@bol.com.br>\n" +"PO-Revision-Date: 2019-12-13 09:38+0000\n" +"Last-Translator: Nicolas Abril <nicolas.abril@protonmail.ch>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "godot-engine/godot/pt_BR/>\n" "Language: pt_BR\n" @@ -227,14 +229,12 @@ msgid "Anim Multi Change Keyframe Time" msgstr "Alterar Tempo de Quadro-Chave da Animação" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Anim Multi Change Transition" -msgstr "Alterar Transição da Animação" +msgstr "Alterar Transição da Animação Multipla" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Anim Multi Change Transform" -msgstr "Alterar Transformação da Anim" +msgstr "Transformação de Animação com Múltiplas Mudanças" #: editor/animation_track_editor.cpp msgid "Anim Multi Change Keyframe Value" @@ -754,7 +754,6 @@ msgid "%d match." msgstr "%d correspondência." #: editor/code_editor.cpp editor/editor_help.cpp -#, fuzzy msgid "%d matches." msgstr "%d correspondências." @@ -3054,7 +3053,6 @@ msgstr "" "predefinições de exportação do Android." #: editor/editor_node.cpp -#, fuzzy msgid "" "The Android build template is already installed in this project and it won't " "be overwritten.\n" @@ -3062,7 +3060,8 @@ msgid "" "operation again." msgstr "" "O modelo de compilação do Android já está instalado e não será substituído.\n" -"Remova a pasta \"build\" manualmente antes de tentar esta operação novamente." +"Remova a pasta \"res://android/build\" manualmente antes de tentar esta " +"operação novamente." #: editor/editor_node.cpp msgid "Import Templates From ZIP File" @@ -3125,9 +3124,8 @@ msgid "Open the previous Editor" msgstr "Abrir o Editor anterior" #: editor/editor_path.cpp -#, fuzzy msgid "No sub-resources found." -msgstr "Nenhuma superfície de origem especificada." +msgstr "Nenhum sub-recurso encontrado." #: editor/editor_plugin.cpp msgid "Creating Mesh Previews" @@ -3138,9 +3136,8 @@ msgid "Thumbnail..." msgstr "Miniatura..." #: editor/editor_plugin_settings.cpp -#, fuzzy msgid "Main Script:" -msgstr "Abrir script" +msgstr "Script Principal:" #: editor/editor_plugin_settings.cpp msgid "Edit Plugin" @@ -3575,6 +3572,11 @@ msgid "Select Template File" msgstr "Selecionar o Arquivo de Modelo" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Carregando Modelos de Exportação" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Gerenciador de Exportação de Modelo" @@ -3653,9 +3655,8 @@ msgid "New Inherited Scene" msgstr "Nova Cena Herdada" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Set As Main Scene" -msgstr "Cena Principal" +msgstr "Definido como Cena Principal" #: editor/filesystem_dock.cpp msgid "Open Scenes" @@ -3974,9 +3975,8 @@ msgid "Import As:" msgstr "Importar como:" #: editor/import_dock.cpp -#, fuzzy msgid "Preset" -msgstr "Predefinições" +msgstr "Predefinição" #: editor/import_dock.cpp msgid "Reimport" @@ -4389,14 +4389,12 @@ msgstr "" "possível obter os nomes das trilhas." #: editor/plugins/animation_blend_tree_editor_plugin.cpp -#, fuzzy msgid "Anim Clips" -msgstr "Clipes de Animação:" +msgstr "Clipes de Animação" #: editor/plugins/animation_blend_tree_editor_plugin.cpp -#, fuzzy msgid "Audio Clips" -msgstr "Clipes de Áudio:" +msgstr "Clipes de Áudio" #: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "Functions" @@ -4974,6 +4972,32 @@ msgid "Download for this asset is already in progress!" msgstr "Download deste asset já está em progresso!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licença" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licença" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Primeiro" @@ -5088,9 +5112,8 @@ msgid "Primary Line Every:" msgstr "Linha Primária a Cada:" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "steps" -msgstr "2 passos" +msgstr "passos" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Rotation Offset:" @@ -5101,7 +5124,6 @@ msgid "Rotation Step:" msgstr "Passo de Rotação:" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Scale Step:" msgstr "Escala:" @@ -5322,50 +5344,44 @@ msgid "Pan Mode" msgstr "Modo Panorâmico" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Ruler Mode" -msgstr "Modo de Início:" +msgstr "Modo Régua" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggle smart snapping." -msgstr "Alternar o snap." +msgstr "Alternar Encaixe Inteligente." #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Use Smart Snap" -msgstr "Usar Snap" +msgstr "Usar Encaixe Inteligente" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggle grid snapping." -msgstr "Alternar o snap." +msgstr "Alternar Encaixe de grade." #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Use Grid Snap" -msgstr "Snap de Grade" +msgstr "Usar Encaixe de Grade" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snapping Options" -msgstr "Opções de agarramento" +msgstr "Opções de encaixe" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Rotation Snap" -msgstr "Usar Snap de Rotação" +msgstr "Usar Encaixe de Rotação" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Use Scale Snap" -msgstr "Usar Snap" +msgstr "Usar Encaixe Escalar" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap Relative" -msgstr "Snap Relativo" +msgstr "Encaixe Relativo" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Pixel Snap" -msgstr "Usar Snap de Pixel" +msgstr "Usar Encaixe de Pixel" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Smart Snapping" @@ -5374,7 +5390,7 @@ msgstr "Encaixe inteligente" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp msgid "Configure Snap..." -msgstr "Configurar Snap..." +msgstr "Configurar Encaixe..." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to Parent" @@ -5442,9 +5458,8 @@ msgid "View" msgstr "Visualizar" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Always Show Grid" -msgstr "Mostrar Grade" +msgstr "Sempre Mostrar a Grade" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show Helpers" @@ -5499,15 +5514,14 @@ msgid "Insert keys (based on mask)." msgstr "Inserir Chaves (baseado na máscara)" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "" "Auto insert keys when objects are translated, rotated or scaled (based on " "mask).\n" "Keys are only added to existing tracks, no new tracks will be created.\n" "Keys must be inserted manually for the first time." msgstr "" -"Inserir chaves automaticamente quando os objetos são transladados, girados " -"em escala (com base na máscara). \n" +"Inserir chaves automaticamente quando os objetos são transladados, " +"rotacionados ou escalados (com base na máscara). \n" "As chaves são adicionadas apenas às faixas existentes, nenhuma nova trilha " "será criada. \n" "As chaves devem ser inseridas manualmente pela primeira vez." @@ -5712,9 +5726,8 @@ msgid "Hold Shift to edit tangents individually" msgstr "Segure Shift para editar tangentes individualmente" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Right click to add point" -msgstr "Clique Direito: Excluir Ponto" +msgstr "Clique com o botão direito para adicionar o ponto" #: editor/plugins/gi_probe_editor_plugin.cpp msgid "Bake GI Probe" @@ -7444,9 +7457,8 @@ msgid "Simplification: " msgstr "Simplificação: " #: editor/plugins/sprite_editor_plugin.cpp -#, fuzzy msgid "Shrink (Pixels): " -msgstr "Produzir (Pixels): " +msgstr "Diminuir (Pixels): " #: editor/plugins/sprite_editor_plugin.cpp msgid "Grow (Pixels): " @@ -7497,9 +7509,8 @@ msgid "(empty)" msgstr "(vazio)" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Move Frame" -msgstr "Colar Frame" +msgstr "Mover Quadro" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Animations:" @@ -7816,9 +7827,8 @@ msgid "Enable Priority" msgstr "Ativar Prioridade" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Filter tiles" -msgstr "Filtrar Arquivos..." +msgstr "Filtros do tile" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Give a TileSet resource to this TileMap to use its tiles." @@ -8134,27 +8144,24 @@ msgid "TileSet" msgstr "Conjunto de Telha" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "No VCS addons are available." -msgstr "Nome pai do nó, se disponível" +msgstr "Nenhum complemento VCS está disponível." #: editor/plugins/version_control_editor_plugin.cpp editor/rename_dialog.cpp msgid "Error" msgstr "Erro" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "No commit message was provided" -msgstr "Nenhum nome fornecido" +msgstr "Nenhuma mensagem de confirmação foi fornecida" #: editor/plugins/version_control_editor_plugin.cpp msgid "No files added to stage" msgstr "Nenhum arquivo adicionado ao palco" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Commit" -msgstr "Comunidade" +msgstr "Confirmação" #: editor/plugins/version_control_editor_plugin.cpp msgid "VCS Addon is not initialized" @@ -8165,37 +8172,32 @@ msgid "Version Control System" msgstr "Sistema de Controle de Versionamento" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Initialize" -msgstr "Capitalizar" +msgstr "Inicializar" #: editor/plugins/version_control_editor_plugin.cpp msgid "Staging area" msgstr "Área Temporária" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Detect new changes" -msgstr "Criar um novo retângulo." +msgstr "Detectar novas mudanças" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Changes" -msgstr "Alterar" +msgstr "Mudanças" #: editor/plugins/version_control_editor_plugin.cpp msgid "Modified" msgstr "Modificado" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Renamed" -msgstr "Renomear" +msgstr "Renomeado" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Deleted" -msgstr "Excluir" +msgstr "Excluído" #: editor/plugins/version_control_editor_plugin.cpp #, fuzzy @@ -8203,9 +8205,8 @@ msgid "Typechange" msgstr "Alterar" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "Stage Selected" -msgstr "Excluir Selecionados" +msgstr "Estágio selecionado" #: editor/plugins/version_control_editor_plugin.cpp #, fuzzy @@ -8231,9 +8232,8 @@ msgid "View file diffs before committing them to the latest version" msgstr "Ver aquivos diff antes do commit para a última versão" #: editor/plugins/version_control_editor_plugin.cpp -#, fuzzy msgid "No file diff is active" -msgstr "Nenhum arquivo selecionado!" +msgstr "Nenhuma mudança no arquivo" #: editor/plugins/version_control_editor_plugin.cpp msgid "Detect changes in file diff" @@ -8244,9 +8244,8 @@ msgid "(GLES3 only)" msgstr "(Apenas GLES3)" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Add Output" -msgstr "Adicionar saída +" +msgstr "Adicionar saída" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Scalar" @@ -8395,9 +8394,8 @@ msgid "Dodge operator." msgstr "Operador de desvio." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "HardLight operator." -msgstr "Operador HardLight" +msgstr "Operador HardLight." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Lighten operator." @@ -8480,11 +8478,10 @@ msgstr "" "falso." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "" "Returns an associated scalar if the provided boolean value is true or false." msgstr "" -"Retorna um vetor associado se o valor lógico fornecido for verdadeiro ou " +"Retorna um vetor associado se o valor booleano fornecido for verdadeiro ou " "falso." #: editor/plugins/visual_shader_editor_plugin.cpp @@ -8724,7 +8721,6 @@ msgid "Returns the square root of the parameter." msgstr "Retorna a raiz quadrada do parâmetro." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "" "SmoothStep function( scalar(edge0), scalar(edge1), scalar(x) ).\n" "\n" @@ -8732,20 +8728,19 @@ msgid "" "'edge1'. Otherwise the return value is interpolated between 0.0 and 1.0 " "using Hermite polynomials." msgstr "" -"Função SmoothStep( escalar(edge0), escalar(edge1), escalar(x) ).\n" +"SmoothStep function( scalar(edge0), scalar(edge1), scalar(x) ).\n" "\n" "Retorna 0.0 se 'x' é menor que 'edge0' e 1.0 se 'x' é maior que 'edge1'. " -"Caso contrário o valor retornado é interpolado entre 0.0 e 1.0 utilizando " +"Caso contrário, o valor retornado é interpolado entre 0.0 e 1.0 utilizando " "polinômios de Hermite." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "" "Step function( scalar(edge), scalar(x) ).\n" "\n" "Returns 0.0 if 'x' is smaller than 'edge' and otherwise 1.0." msgstr "" -"Função Step( escalar(edge), escalar(x) ).\n" +"Step function( scalar(edge), scalar(x) ).\n" "\n" "Retorna 0.0 se 'x' é menor que 'edge' e 1.0 caso contrário." @@ -8762,9 +8757,8 @@ msgid "Finds the truncated value of the parameter." msgstr "Encontra o valor truncado do parâmetro." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Adds scalar to scalar." -msgstr "Adiciona escalar a escalar." +msgstr "Adiciona um escalar a um escalar." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Divides scalar by scalar." @@ -8783,43 +8777,36 @@ msgid "Subtracts scalar from scalar." msgstr "Subtrai o escalar do escalar." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Scalar constant." -msgstr "Alterar Constante Escalar" +msgstr "Constante Escalar" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Scalar uniform." -msgstr "Alterar Uniforme Escalar" +msgstr "Escalar uniforme." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Perform the cubic texture lookup." msgstr "Execute a pesquisa de textura cúbica." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Perform the texture lookup." -msgstr "Fazer pesquisa da textura." +msgstr "Faz uma busca de texturas." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Cubic texture uniform lookup." -msgstr "Alterar Uniforme da Textura" +msgstr "Pesquisa uniforme de textura cúbica." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "2D texture uniform lookup." -msgstr "Alterar Uniforme da Textura" +msgstr "Consulta de textura 2D uniforme." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "2D texture uniform lookup with triplanar." -msgstr "Alterar Uniforme da Textura" +msgstr "Consulta de textura 2D uniforme com triplanar." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Transform function." -msgstr "Diálogo Transformação..." +msgstr "Função Transform." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "" @@ -8848,19 +8835,16 @@ msgid "Decomposes transform to four vectors." msgstr "Decompõe transformação em quatro vetores." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Calculates the determinant of a transform." -msgstr "(Somente em GLES3) Calcula o determinante da transform." +msgstr "Calcula o determinante de uma transformada." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Calculates the inverse of a transform." -msgstr "(Somente em GLES3) Calcula a inversa da transform." +msgstr "Calcula a inversa de uma transformada." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Calculates the transpose of a transform." -msgstr "(Somente em GLES3) Calcula a transposta da transform." +msgstr "Calcula a transposta de uma transformada." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Multiplies transform by transform." @@ -8911,17 +8895,16 @@ msgid "Calculates the dot product of two vectors." msgstr "Calcula o produto escalar de dois vetores." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "" "Returns the vector that points in the same direction as a reference vector. " "The function has three vector parameters : N, the vector to orient, I, the " "incident vector, and Nref, the reference vector. If the dot product of I and " "Nref is smaller than zero the return value is N. Otherwise -N is returned." msgstr "" -"Retorna um vetor que aponta na mesma direção que um vetor de referência. A " +"Retorna o vetor que aponta na mesma direção que um vetor de referência. A " "função tem três vetores como parâmetros: N, o vetor para orientar, I, o " -"vetor incidente, e Nref, o vetor de referência. Se o produto escalar de I e " -"Nref for menor do que zero o valor de retorno é N. Caso contrário -N é " +"vetor incidente, e Nref, o vetor de referência. Se o produto escalar de I e " +"Nref for menor do que zero, o valor de retorno é N. Caso contrário, -N é " "retornado." #: editor/plugins/visual_shader_editor_plugin.cpp @@ -8933,9 +8916,8 @@ msgid "Linear interpolation between two vectors." msgstr "Interpolação linear entre dois vetores." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Linear interpolation between two vectors using scalar." -msgstr "Interpolação linear entre dois vetores." +msgstr "Interpolação linear entre dois vetores usando escalar." #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Calculates the normalize product of vector." @@ -8950,21 +8932,18 @@ msgid "1.0 / vector" msgstr "1,0 / vetor" #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "" "Returns the vector that points in the direction of reflection ( a : incident " "vector, b : normal vector )." msgstr "" -"Retorna um vetor que aponta na direção da reflexão ( a: vetor incidente, b: " +"Retorna o vetor que aponta na direção da reflexão ( a: vetor incidente, b: " "vetor normal )." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "Returns the vector that points in the direction of refraction." -msgstr "Retorna um vetor que aponta na direção da refração." +msgstr "Retorna o vetor que aponta na direção da refração." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "" "SmoothStep function( vector(edge0), vector(edge1), vector(x) ).\n" "\n" @@ -8972,14 +8951,13 @@ msgid "" "'edge1'. Otherwise the return value is interpolated between 0.0 and 1.0 " "using Hermite polynomials." msgstr "" -"Função SmoothStep( escalar(edge0), escalar(edge1), escalar(x) ).\n" +"SmoothStep function( vector(edge0), vector(edge1), vector(x) ).\n" "\n" "Retorna 0.0 se 'x' é menor que 'edge0' e 1.0 se 'x' é maior que 'edge1'. " -"Caso contrário o valor retornado é interpolado entre 0.0 e 1.0 utilizando " +"Caso contrário, o valor retornado é interpolado entre 0.0 e 1.0 utilizando " "polinômios de Hermite." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "" "SmoothStep function( scalar(edge0), scalar(edge1), vector(x) ).\n" "\n" @@ -8987,31 +8965,29 @@ msgid "" "'edge1'. Otherwise the return value is interpolated between 0.0 and 1.0 " "using Hermite polynomials." msgstr "" -"Função SmoothStep( escalar(edge0), escalar(edge1), escalar(x) ).\n" +"SmoothStep function( scalar(edge0), scalar(edge1), vector(x) ).\n" "\n" "Retorna 0.0 se 'x' é menor que 'edge0' e 1.0 se 'x' é maior que 'edge1'. " -"Caso contrário o valor retornado é interpolado entre 0.0 e 1.0 utilizando " +"Caso contrário, o valor retornado é interpolado entre 0.0 e 1.0 utilizando " "polinômios de Hermite." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "" "Step function( vector(edge), vector(x) ).\n" "\n" "Returns 0.0 if 'x' is smaller than 'edge' and otherwise 1.0." msgstr "" -"Função Step( escalar(edge), escalar(x) ).\n" +"Step function( vector(edge), vector(x) ).\n" "\n" "Retorna 0.0 se 'x' é menor que 'edge' e 1.0 caso contrário." #: editor/plugins/visual_shader_editor_plugin.cpp -#, fuzzy msgid "" "Step function( scalar(edge), vector(x) ).\n" "\n" "Returns 0.0 if 'x' is smaller than 'edge' and otherwise 1.0." msgstr "" -"Função Step( escalar(edge), escalar(x) ).\n" +"Step function( scalar(edge), vector(x) ).\n" "\n" "Retorna 0.0 se 'x' é menor que 'edge' e 1.0 caso contrário." @@ -9147,6 +9123,15 @@ msgid "Runnable" msgstr "Executável" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Adicionar porta de entrada" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Excluir alteração '%s' da lista?" @@ -9236,22 +9221,20 @@ msgid "Resources to export:" msgstr "Recursos para exportar:" #: editor/project_export.cpp -#, fuzzy msgid "" "Filters to export non-resource files/folders\n" "(comma-separated, e.g: *.json, *.txt, docs/*)" msgstr "" -"Filtros para exportar arquivos que não sejam recursos (separados por " -"vírgula, e.g.: *.json, *.txt)" +"Filtros para exportar arquivos/pastas que não sejam recursos\n" +"(separados por vírgula, e.g.: *.json, *.txt)" #: editor/project_export.cpp -#, fuzzy msgid "" "Filters to exclude files/folders from project\n" "(comma-separated, e.g: *.json, *.txt, docs/*)" msgstr "" -"Filtros para excluir arquivos do projeto (separados por vírgula, ex.: *." -"json, *.txt)" +"Filtros para excluir arquivos/pastas do projeto\n" +"(separados por vírgula, ex.: *.json, *.txt)" #: editor/project_export.cpp msgid "Patches" @@ -9481,9 +9464,8 @@ msgid "Unnamed Project" msgstr "Projeto Sem Nome" #: editor/project_manager.cpp -#, fuzzy msgid "Missing Project" -msgstr "Importar Projeto Existente" +msgstr "Projeto ausente" #: editor/project_manager.cpp msgid "Error: Project is missing on the filesystem." @@ -9498,7 +9480,6 @@ msgid "Are you sure to open more than one project?" msgstr "Tem certeza de que quer abrir mais de um projeto?" #: editor/project_manager.cpp -#, fuzzy msgid "" "The following project settings file does not specify the version of Godot " "through which it was created.\n" @@ -9510,16 +9491,16 @@ msgid "" "Warning: You won't be able to open the project with previous versions of the " "engine anymore." msgstr "" -"O seguinte arquivo de configurações do projeto foi gerado por uma versão " -"mais antiga do Godot e precisa ser convertido para esta versão:\n" +"O seguinte arquivo de configurações do projeto não especifica com qual " +"versão do Godot ele foi criado.\n" "\n" "%s\n" "\n" -"Você deseja realizar a conversão?\n" -"Aviso: você não poderá mais abrir o projeto com versões anteriores do Godot." +"Se escolher abrí-lo, será convertido para o formato atual de arquivo de " +"configuração do Godot\n" +"Aviso: Você não poderá mais abrir o projeto com versões anteriores do Godot." #: editor/project_manager.cpp -#, fuzzy msgid "" "The following project settings file was generated by an older engine " "version, and needs to be converted for this version:\n" @@ -9531,13 +9512,13 @@ msgid "" "engine anymore." msgstr "" "O seguinte arquivo de configurações do projeto foi gerado por uma versão " -"mais antiga do mecanismo e precisa ser convertido para esta versão:\n" +"mais antiga da engine, e precisa ser convertido para esta versão:\n" "\n" "%s\n" "\n" -"Você deseja realizar a conversão?\n" -"Aviso: você não poderá mais abrir o projeto com versões anteriores do " -"mecanismo." +"Deseja convertê-lo?\n" +"Aviso: Você não será mais capaz de abrir o projeto com versões anteriores da " +"engine." #: editor/project_manager.cpp msgid "" @@ -9548,15 +9529,14 @@ msgstr "" "mecanismo, cujas configurações não são compatíveis com esta versão." #: editor/project_manager.cpp -#, fuzzy msgid "" "Can't run project: no main scene defined.\n" "Please edit the project and set the main scene in the Project Settings under " "the \"Application\" category." msgstr "" -"Não foi possível executar o projeto: cena principal não definida.\n" -"Por favor, defina a cena principal nas Configurações do Projeto no menu " -"Projeto." +"Não é possível executar o projeto: nenhuma cena principal definida.\n" +"Por favor, edite o projeto e defina a cena principal nas Configurações do " +"Projeto na categoria \"Aplicativo\"." #: editor/project_manager.cpp msgid "" @@ -9567,63 +9547,62 @@ msgstr "" "Por favor, edite o projeto para iniciar a importação inicial." #: editor/project_manager.cpp -#, fuzzy msgid "Are you sure to run %d projects at once?" -msgstr "Tem certeza de que quer executar mais de um projeto?" +msgstr "Tem certeza de que quer executar %d projetos ao mesmo tempo?" #: editor/project_manager.cpp -#, fuzzy msgid "" "Remove %d projects from the list?\n" "The project folders' contents won't be modified." -msgstr "Remover projeto da lista? (O conteúdo da pasta não será modificado)" +msgstr "" +"Remover %d projetos da lista?\n" +"O conteúdo das pastas do projeto não será modificado." #: editor/project_manager.cpp -#, fuzzy msgid "" "Remove this project from the list?\n" "The project folder's contents won't be modified." -msgstr "Remover projeto da lista? (O conteúdo da pasta não será modificado)" +msgstr "" +"Remover este projeto da lista?\n" +"O conteúdo da pasta do projeto não será modificado." #: editor/project_manager.cpp -#, fuzzy msgid "" "Remove all missing projects from the list?\n" "The project folders' contents won't be modified." -msgstr "Remover projeto da lista? (O conteúdo da pasta não será modificado)" +msgstr "" +"Remover todos os projetos faltantes da lista?\n" +"O conteúdo da pasta dos projetos não será modificado." #: editor/project_manager.cpp -#, fuzzy msgid "" "Language changed.\n" "The interface will update after restarting the editor or project manager." msgstr "" -"Linguagem alterada.\n" -"A interface será atualizada na próxima vez que o editor ou o gerenciador de " -"projetos iniciar." +"Idioma alterado.\n" +"A interface será atualizada após reiniciar o editor ou o gerenciador de " +"projetos." #: editor/project_manager.cpp -#, fuzzy msgid "" "Are you sure to scan %s folders for existing Godot projects?\n" "This could take a while." msgstr "" -"Você está para analisar %s pastas por projetos existentes da Godot. Você " -"confirma?" +"Tem certeza que quer escanear %s pastam em busca de projetos Godot " +"existentes?\n" +"Isso pode levar algum tempo." #: editor/project_manager.cpp msgid "Project Manager" msgstr "Gerenciador de Projetos" #: editor/project_manager.cpp -#, fuzzy msgid "Projects" -msgstr "Projeto" +msgstr "Projetos" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "Modificado" +msgstr "Ultima Modificação" #: editor/project_manager.cpp msgid "Scan" @@ -9638,9 +9617,8 @@ msgid "New Project" msgstr "Novo Projeto" #: editor/project_manager.cpp -#, fuzzy msgid "Remove Missing" -msgstr "Remover ponto" +msgstr "Remover Ausentes" #: editor/project_manager.cpp msgid "Templates" @@ -9655,13 +9633,12 @@ msgid "Can't run project" msgstr "Não é possível executar o projeto" #: editor/project_manager.cpp -#, fuzzy msgid "" "You currently don't have any projects.\n" "Would you like to explore official example projects in the Asset Library?" msgstr "" -"Você não tem nenhum projeto atualmente.\n" -"Gostaria de explorar os projetos de exemplo oficiais na Biblioteca de Assets?" +"Você não tem nenhum projeto no momento.\n" +"Gostaria de explorar projetos de exemplo oficiais na Asset Library?" #: editor/project_settings_editor.cpp msgid "Key " @@ -9844,9 +9821,8 @@ msgid "Settings saved OK." msgstr "Configurações Salvas." #: editor/project_settings_editor.cpp -#, fuzzy msgid "Moved Input Action Event" -msgstr "Adicionar Evento de Ação de Entrada" +msgstr "Evento de Ação de Entrada Movido" #: editor/project_settings_editor.cpp msgid "Override for Feature" @@ -9901,9 +9877,8 @@ msgid "Override For..." msgstr "Sobrescrever Para..." #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -#, fuzzy msgid "The editor must be restarted for changes to take effect." -msgstr "O editor deve ser reiniciado para que as mudanças surtam efeito" +msgstr "O editor deve ser reiniciado para que as alterações tenham efeito." #: editor/project_settings_editor.cpp msgid "Input Map" @@ -10056,9 +10031,8 @@ msgid "Suffix" msgstr "Sufixo" #: editor/rename_dialog.cpp -#, fuzzy msgid "Advanced Options" -msgstr "Opções avançadas" +msgstr "Opções Avançadas" #: editor/rename_dialog.cpp msgid "Substitute" @@ -10264,23 +10238,20 @@ msgid "Make node as Root" msgstr "Tornar Raiz o Nó" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Delete %d nodes?" -msgstr "Excluir Nós" +msgstr "Excluir %d nós?" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Delete the root node \"%s\"?" -msgstr "Deletar Nó(s) de Shader Graph(s)" +msgstr "Excluir o nó raiz \"%s\"?" #: editor/scene_tree_dock.cpp msgid "Delete node \"%s\" and its children?" msgstr "Deletar nó \"%s\" e seus filhos?" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Delete node \"%s\"?" -msgstr "Excluir Nós" +msgstr "Excluir o nó \"%s\"?" #: editor/scene_tree_dock.cpp msgid "Can not perform with the root node." @@ -10303,13 +10274,12 @@ msgstr "" "sejam revertidas para o padrão." #: editor/scene_tree_dock.cpp -#, fuzzy msgid "" "Enabling \"Load As Placeholder\" will disable \"Editable Children\" and " "cause all properties of the node to be reverted to their default." msgstr "" -"Desativar \"editable_instance\" fará com que todas as propriedades do nó " -"sejam revertidas para o padrão." +"Habilitar \"Carregar como Placeholder\" desabilitará \"Filhos Editáveis\" e " +"fará que todas as propriedades do nó sejam revertidas para o padrão." #: editor/scene_tree_dock.cpp msgid "Make Local" @@ -10336,9 +10306,8 @@ msgid "User Interface" msgstr "Interface de Usuário" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Other Node" -msgstr "Excluir Nó" +msgstr "Outro Nó" #: editor/scene_tree_dock.cpp msgid "Can't operate on nodes from a foreign scene!" @@ -10357,9 +10326,8 @@ msgid "Remove Node(s)" msgstr "Remover Nó(s)" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Change type of node(s)" -msgstr "Alterar nome da porta de saída" +msgstr "Alterar tipo do(s) nó(s)" #: editor/scene_tree_dock.cpp msgid "" @@ -10394,27 +10362,24 @@ msgid "Load As Placeholder" msgstr "Carregar como Substituto" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Open Documentation" -msgstr "Abrir a documentação" +msgstr "Abrir Documentação" #: editor/scene_tree_dock.cpp msgid "Add Child Node" msgstr "Adicionar Nó Filho" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Expand/Collapse All" -msgstr "Recolher Tudo" +msgstr "Expandir/Colapsar Tudo" #: editor/scene_tree_dock.cpp msgid "Change Type" msgstr "Mudar Tipo" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Reparent to New Node" -msgstr "Reparentar Nó" +msgstr "Reparentar para Novo Nó" #: editor/scene_tree_dock.cpp msgid "Make Scene Root" @@ -10474,9 +10439,8 @@ msgid "Toggle Visible" msgstr "Alternar Visibilidade" #: editor/scene_tree_editor.cpp -#, fuzzy msgid "Unlock Node" -msgstr "Selecionar Nó" +msgstr "Desbloquear Nó" #: editor/scene_tree_editor.cpp #, fuzzy @@ -10484,45 +10448,40 @@ msgid "Button Group" msgstr "Botão 7" #: editor/scene_tree_editor.cpp -#, fuzzy msgid "(Connecting From)" -msgstr "Erro de Conexão" +msgstr "(Conectando de)" #: editor/scene_tree_editor.cpp msgid "Node configuration warning:" msgstr "Aviso de configuração de nó:" #: editor/scene_tree_editor.cpp -#, fuzzy msgid "" "Node has %s connection(s) and %s group(s).\n" "Click to show signals dock." msgstr "" -"O nó tem conexão(ões) e grupo(s)\n" +"O nó tem %s conexão(ões) e %s grupo(s).\n" "Clique para mostrar o painel de sinais." #: editor/scene_tree_editor.cpp -#, fuzzy msgid "" "Node has %s connection(s).\n" "Click to show signals dock." msgstr "" -"O nó tem conexões.\n" +"O nó tem %s conexão(ões).\n" "Clique para mostrar o painel de sinais." #: editor/scene_tree_editor.cpp -#, fuzzy msgid "" "Node is in %s group(s).\n" "Click to show groups dock." msgstr "" -"O nó está em grupo(s).\n" +"O nó está em %s grupo(s).\n" "Clique para mostrar o painel de grupos." #: editor/scene_tree_editor.cpp -#, fuzzy msgid "Open Script:" -msgstr "Abrir script" +msgstr "Abrir Script:" #: editor/scene_tree_editor.cpp msgid "" @@ -10573,39 +10532,32 @@ msgid "Select a Node" msgstr "Selecione um Nó" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Path is empty." -msgstr "O caminho está vazio" +msgstr "O caminho está vazio." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Filename is empty." -msgstr "O nome do arquivo está vazio" +msgstr "O nome do arquivo está vazio." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Path is not local." -msgstr "O caminho não é local" +msgstr "O caminho não é local." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Invalid base path." -msgstr "Caminho base inválido" +msgstr "Caminho base inválido." #: editor/script_create_dialog.cpp -#, fuzzy msgid "A directory with the same name exists." -msgstr "Um diretório de mesmo nome existe" +msgstr "Existe um diretório com o mesmo nome." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Invalid extension." -msgstr "Extensão inválida" +msgstr "Extensão inválida." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Wrong extension chosen." -msgstr "Extensão errada escolhida" +msgstr "Extensão errada escolhida." #: editor/script_create_dialog.cpp msgid "Error loading template '%s'" @@ -10620,67 +10572,56 @@ msgid "Error loading script from %s" msgstr "Erro ao carregar script de %s" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Overrides" -msgstr "Sobrescrever" +msgstr "Sobrescreve" #: editor/script_create_dialog.cpp msgid "N/A" msgstr "N/D" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Open Script / Choose Location" -msgstr "Abrir Script/Escolher Localização" +msgstr "Abrir Script / Escolher Local" #: editor/script_create_dialog.cpp msgid "Open Script" msgstr "Abrir script" #: editor/script_create_dialog.cpp -#, fuzzy msgid "File exists, it will be reused." -msgstr "O arquivo existe, será reaproveitado" +msgstr "O arquivo existe, será reaproveitado." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Invalid class name." -msgstr "Nome de classe inválido" +msgstr "Nome da classe inválido." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Invalid inherited parent name or path." -msgstr "Nome ou caminho de pai herdado invláido" +msgstr "Nome ou caminho do pai herdado inválido." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Script is valid." -msgstr "Script válido" +msgstr "Script válido." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Allowed: a-z, A-Z, 0-9, _ and ." -msgstr "Permitidos: a-z, A-Z, 0-9 e _" +msgstr "Permitidos: a-z, A-Z, 0-9, _ e ." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Built-in script (into scene file)." -msgstr "Script embutido (no arquivo da cena)" +msgstr "Script embutido (no arquivo da cena)." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Will create a new script file." -msgstr "Criar novo arquivo de script" +msgstr "Criará novo arquivo de script." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Will load an existing script file." -msgstr "Carregar arquivo de script existente" +msgstr "Carregará arquivo de script existente." #: editor/script_create_dialog.cpp -#, fuzzy msgid "Class Name:" -msgstr "Nome da Classe" +msgstr "Nome da Classe:" #: editor/script_create_dialog.cpp #, fuzzy @@ -13529,9 +13470,6 @@ msgstr "Constantes não podem serem modificadas." #~ msgid "Re-Import Changed Resources" #~ msgstr "Re-Importar Recursos Alterados" -#~ msgid "Loading Export Templates" -#~ msgstr "Carregando Modelos de Exportação" - #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/pt_PT.po b/editor/translations/pt_PT.po index f739893486..5cfd0f8590 100644 --- a/editor/translations/pt_PT.po +++ b/editor/translations/pt_PT.po @@ -14,12 +14,13 @@ # SARDON <fabio3_Santos@hotmail.com>, 2017. # Vinicius Gonçalves <viniciusgoncalves21@gmail.com>, 2017. # ssantos <ssantos@web.de>, 2018, 2019. +# Gonçalo Dinis Guerreiro João <goncalojoao205@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-11-29 14:49+0000\n" -"Last-Translator: João Lopes <linux-man@hotmail.com>\n" +"PO-Revision-Date: 2019-12-09 11:37+0000\n" +"Last-Translator: Gonçalo Dinis Guerreiro João <goncalojoao205@gmail.com>\n" "Language-Team: Portuguese (Portugal) <https://hosted.weblate.org/projects/" "godot-engine/godot/pt_PT/>\n" "Language: pt_PT\n" @@ -3511,6 +3512,11 @@ msgid "Select Template File" msgstr "Selecionar Ficheiro de Modelo" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Gerir Modelos de Exportação" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Exportar Gestor de Modelos" @@ -4900,6 +4906,32 @@ msgid "Download for this asset is already in progress!" msgstr "A transferência deste Ativo já está em andamento!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licença" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licença" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Primeiro" @@ -9000,6 +9032,15 @@ msgid "Runnable" msgstr "Executável" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Adicionar porta de entrada" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Apagar correção '%s' da lista?" @@ -9468,9 +9509,8 @@ msgid "Projects" msgstr "Projetos" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "Modificado" +msgstr "Última modificação" #: editor/project_manager.cpp msgid "Scan" diff --git a/editor/translations/ro.po b/editor/translations/ro.po index f16520008f..df9641e07d 100644 --- a/editor/translations/ro.po +++ b/editor/translations/ro.po @@ -3628,6 +3628,11 @@ msgid "Select Template File" msgstr "Selectează fișierul șablon" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Administrează Șabloanele de Export" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Exportă Managerul de Șabloane" @@ -5108,6 +5113,32 @@ msgid "Download for this asset is already in progress!" msgstr "Descărcarea acestui asset rulează deja!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licență" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licență" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "primul" @@ -9351,6 +9382,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Adaugă Intrare(Input)" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/ru.po b/editor/translations/ru.po index 3cfe0f6353..5c212fe7a7 100644 --- a/editor/translations/ru.po +++ b/editor/translations/ru.po @@ -63,7 +63,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-11-29 14:48+0000\n" +"PO-Revision-Date: 2019-12-09 11:36+0000\n" "Last-Translator: Danil Alexeev <danil@alexeev.xyz>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/" "godot/ru/>\n" @@ -2023,7 +2023,7 @@ msgstr "" #: editor/editor_help_search.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp msgid "Search Help" -msgstr "Помощь" +msgstr "Справка" #: editor/editor_help_search.cpp msgid "Display All" @@ -2664,7 +2664,7 @@ msgstr "Новая сцена" #: editor/editor_node.cpp msgid "New Inherited Scene..." -msgstr "Новая унаследованная Сцена..." +msgstr "Новая унаследованная сцена..." #: editor/editor_node.cpp msgid "Open Scene..." @@ -3555,6 +3555,11 @@ msgid "Select Template File" msgstr "Выбрать файл шаблона" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Загрузка шаблонов экспорта" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Менеджер шаблонов экспорта" @@ -3842,7 +3847,7 @@ msgstr "Узлы не в группе" #: editor/groups_editor.cpp editor/scene_tree_dock.cpp #: editor/scene_tree_editor.cpp msgid "Filter nodes" -msgstr "Фильтрация узлов" +msgstr "Фильтр узлов" #: editor/groups_editor.cpp msgid "Nodes in Group" @@ -4051,7 +4056,7 @@ msgstr "Свойства объекта." #: editor/inspector_dock.cpp msgid "Filter properties" -msgstr "Свойства фильтра" +msgstr "Фильтр свойств" #: editor/inspector_dock.cpp msgid "Changes may be lost!" @@ -4949,6 +4954,32 @@ msgid "Download for this asset is already in progress!" msgstr "Загрузка этого шаблона уже идёт!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Лицензия" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Лицензия" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Первая" @@ -6796,7 +6827,7 @@ msgstr "Список автозавершения" #: editor/plugins/script_text_editor.cpp msgid "Evaluate Selection" -msgstr "Вычислить выделеннное" +msgstr "Вычислить выделенное" #: editor/plugins/script_text_editor.cpp msgid "Trim Trailing Whitespace" @@ -9082,6 +9113,15 @@ msgid "Runnable" msgstr "Активный" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Добавить входной порт" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Удалить латку '%s' из списка?" @@ -13368,9 +13408,6 @@ msgstr "Константы не могут быть изменены." #~ msgid "Re-Import Changed Resources" #~ msgstr "Переимпортировать изменённые ресурсы" -#~ msgid "Loading Export Templates" -#~ msgstr "Загрузка шаблонов экспорта" - #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/si.po b/editor/translations/si.po index 357ae506ad..37c886bd11 100644 --- a/editor/translations/si.po +++ b/editor/translations/si.po @@ -3374,6 +3374,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4749,6 +4753,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8756,6 +8784,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/sk.po b/editor/translations/sk.po index ec290311e0..08e373c7c9 100644 --- a/editor/translations/sk.po +++ b/editor/translations/sk.po @@ -3461,6 +3461,11 @@ msgid "Select Template File" msgstr "Vytvoriť adresár" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Všetky vybrané" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4884,6 +4889,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licencia" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licencia" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -9018,6 +9049,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Signály:" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/sl.po b/editor/translations/sl.po index ad23f0c63b..e668419c22 100644 --- a/editor/translations/sl.po +++ b/editor/translations/sl.po @@ -3621,6 +3621,11 @@ msgid "Select Template File" msgstr "Izberi datoteko predloge" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Upravljaj Izvozne Predloge" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Izvozni Upravitelj Predlog" @@ -5102,6 +5107,32 @@ msgid "Download for this asset is already in progress!" msgstr "Prenos za ta dodatek je že v teku!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licenca" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licenca" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "prvi" @@ -9326,6 +9357,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Dodaj Vnos" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/sq.po b/editor/translations/sq.po index 1c78705413..dcd3bcb8b4 100644 --- a/editor/translations/sq.po +++ b/editor/translations/sq.po @@ -3548,6 +3548,11 @@ msgid "Select Template File" msgstr "Zgjidh skedarin e shabllonit" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Menaxho Shabllonet e Eksportit" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Menaxheri i Shablloneve të Eksportimit" @@ -4950,6 +4955,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Liçensa" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Liçensa" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8999,6 +9030,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Shto te të preferuarat" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/sr_Cyrl.po b/editor/translations/sr_Cyrl.po index 24eb88b805..50c8b167bf 100644 --- a/editor/translations/sr_Cyrl.po +++ b/editor/translations/sr_Cyrl.po @@ -3637,6 +3637,11 @@ msgid "Select Template File" msgstr "Одабери шаблонску датотеку" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Управљај извозним шаблонима" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Менаџер извозних шаблона" @@ -5129,6 +5134,32 @@ msgid "Download for this asset is already in progress!" msgstr "Преузимање овог ресурса је у току!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Лиценса" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Лиценса" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "први" @@ -9433,6 +9464,15 @@ msgid "Runnable" msgstr "Покретљива" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Додај улаз" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Обриши закрпу „%s“ са листе?" diff --git a/editor/translations/sr_Latn.po b/editor/translations/sr_Latn.po index 22b3059a68..42f8e6441b 100644 --- a/editor/translations/sr_Latn.po +++ b/editor/translations/sr_Latn.po @@ -3391,6 +3391,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4774,6 +4778,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8828,6 +8856,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/sv.po b/editor/translations/sv.po index 02197303ce..af034aa33b 100644 --- a/editor/translations/sv.po +++ b/editor/translations/sv.po @@ -3600,6 +3600,11 @@ msgid "Select Template File" msgstr "Välj mall-fil" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Mallar" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -5080,6 +5085,32 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Licens" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Licens" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -9264,6 +9295,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Favoriter:" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/ta.po b/editor/translations/ta.po index 7015199f0c..485d7d9b6c 100644 --- a/editor/translations/ta.po +++ b/editor/translations/ta.po @@ -3379,6 +3379,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4756,6 +4760,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8760,6 +8788,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/te.po b/editor/translations/te.po index d9136f04b0..34d033ccb2 100644 --- a/editor/translations/te.po +++ b/editor/translations/te.po @@ -3352,6 +3352,10 @@ msgid "Select Template File" msgstr "" #: editor/export_template_manager.cpp +msgid "Godot Export Templates" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4716,6 +4720,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8693,6 +8721,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/th.po b/editor/translations/th.po index db9cd3f577..2ede382d78 100644 --- a/editor/translations/th.po +++ b/editor/translations/th.po @@ -3598,6 +3598,11 @@ msgid "Select Template File" msgstr "เลือกไฟล์แม่แบบ" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "กำลังโหลดแม่แบบส่งออก" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "จัดการแม่แบบส่งออก" @@ -5083,6 +5088,32 @@ msgid "Download for this asset is already in progress!" msgstr "กำลังดาวน์โหลดไฟล์นี้อยู่แล้ว!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "สัญญาอนุญาต" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "สัญญาอนุญาต" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "แรกสุด" @@ -9384,6 +9415,15 @@ msgid "Runnable" msgstr "รันได้" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "เพิ่มอินพุต" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "ลบแพตช์ '%s' จากรายชื่อ?" @@ -13611,9 +13651,6 @@ msgstr "" #~ msgid "Re-Import Changed Resources" #~ msgstr "นำเข้ารีซอร์สที่แก้ไขอีกครั้ง" -#~ msgid "Loading Export Templates" -#~ msgstr "กำลังโหลดแม่แบบส่งออก" - #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/tr.po b/editor/translations/tr.po index 1cbce49f6d..f72bb90ac0 100644 --- a/editor/translations/tr.po +++ b/editor/translations/tr.po @@ -3526,6 +3526,11 @@ msgid "Select Template File" msgstr "Şablon Dosyası Seç" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Dışa Aktarım Kalıpları Yükleniyor" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Dışa Aktarım Şablonu Yöneticisi" @@ -4922,6 +4927,32 @@ msgid "Download for this asset is already in progress!" msgstr "Bu nesne için zaten sürdürülen bir indirme var!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Lisans" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Lisans" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "İlk" @@ -9014,6 +9045,15 @@ msgid "Runnable" msgstr "Koşturulabilir" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Giriş noktası ekle" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "'%s' yaması listeden silinsin mi?" @@ -13335,9 +13375,6 @@ msgstr "Sabit değerler değiştirilemez." #~ msgid "Re-Import Changed Resources" #~ msgstr "Değiştirilmiş Kaynakları Yeniden İçe Aktar" -#~ msgid "Loading Export Templates" -#~ msgstr "Dışa Aktarım Kalıpları Yükleniyor" - #, fuzzy #~ msgid "" #~ "\n" diff --git a/editor/translations/uk.po b/editor/translations/uk.po index 1b8d883ca1..1f38a1c02b 100644 --- a/editor/translations/uk.po +++ b/editor/translations/uk.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Ukrainian (Godot Engine)\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-11-25 04:04+0000\n" +"PO-Revision-Date: 2019-12-09 11:36+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/godot-engine/" "godot/uk/>\n" @@ -3514,6 +3514,11 @@ msgid "Select Template File" msgstr "Виберіть файл шаблону" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Управління шаблонами експорту" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "Менеджер експорту шаблонів" @@ -4909,6 +4914,32 @@ msgid "Download for this asset is already in progress!" msgstr "Завантаження цього активу вже виконується!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Ліцензія" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Ліцензія" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Перший" @@ -9032,6 +9063,15 @@ msgid "Runnable" msgstr "Активний" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Додати вхідний порт" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "Вилучити латку «%s» зі списку?" @@ -9498,9 +9538,8 @@ msgid "Projects" msgstr "Проєкти" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "Змінено" +msgstr "Востаннє змінено" #: editor/project_manager.cpp msgid "Scan" diff --git a/editor/translations/ur_PK.po b/editor/translations/ur_PK.po index e0c20b597a..5546647ac6 100644 --- a/editor/translations/ur_PK.po +++ b/editor/translations/ur_PK.po @@ -3411,6 +3411,11 @@ msgid "Select Template File" msgstr ".تمام کا انتخاب" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr ".تمام کا انتخاب" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4810,6 +4815,30 @@ msgid "Download for this asset is already in progress!" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "License (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "" @@ -8905,6 +8934,14 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +msgid "Add initial export..." +msgstr "" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/vi.po b/editor/translations/vi.po index c20e09409b..8ff39ec400 100644 --- a/editor/translations/vi.po +++ b/editor/translations/vi.po @@ -3466,6 +3466,11 @@ msgid "Select Template File" msgstr "Chọn file template" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "Quản lý mẫu Xuất ra" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -4871,6 +4876,32 @@ msgid "Download for this asset is already in progress!" msgstr "Tải xuống nguyên liệu này đã được tiến hành!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "Cấp phép" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "Cấp phép" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "Đầu tiên" @@ -9004,6 +9035,15 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "Thêm Input" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po index 397f17a1cd..437a6a5f59 100644 --- a/editor/translations/zh_CN.po +++ b/editor/translations/zh_CN.po @@ -63,7 +63,7 @@ msgid "" msgstr "" "Project-Id-Version: Chinese (Simplified) (Godot Engine)\n" "POT-Creation-Date: 2018-01-20 12:15+0200\n" -"PO-Revision-Date: 2019-11-29 14:49+0000\n" +"PO-Revision-Date: 2019-12-13 09:38+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" @@ -248,7 +248,7 @@ msgstr "3D变换轨道" #: editor/animation_track_editor.cpp msgid "Call Method Track" -msgstr "调用方法轨道" +msgstr "方法调用轨道" #: editor/animation_track_editor.cpp msgid "Bezier Curve Track" @@ -1238,23 +1238,23 @@ msgstr "添加效果" #: editor/editor_audio_buses.cpp msgid "Rename Audio Bus" -msgstr "重命名音频总线（Audio Bus）" +msgstr "重命名音频总线" #: editor/editor_audio_buses.cpp msgid "Change Audio Bus Volume" -msgstr "修改音频Bus音量" +msgstr "修改音频总线音量" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" -msgstr "切换音频独奏" +msgstr "开关音频总线独奏" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Mute" -msgstr "切换音频静音" +msgstr "开关音频总线静音" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Bypass Effects" -msgstr "切换音频旁通效果" +msgstr "开关音频总线旁通效果" #: editor/editor_audio_buses.cpp msgid "Select Audio Bus Send" @@ -1290,7 +1290,7 @@ msgstr "旁通" #: editor/editor_audio_buses.cpp msgid "Bus options" -msgstr "音频总线选项" +msgstr "总线选项" #: editor/editor_audio_buses.cpp editor/filesystem_dock.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -1311,11 +1311,11 @@ msgstr "音频" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" -msgstr "添加音频总线（Audio Bus）" +msgstr "添加音频总线" #: editor/editor_audio_buses.cpp msgid "Master bus can't be deleted!" -msgstr "不能删除主音频总线!" +msgstr "不能删除主音频总线！" #: editor/editor_audio_buses.cpp msgid "Delete Audio Bus" @@ -1335,7 +1335,7 @@ msgstr "移动音频总线" #: editor/editor_audio_buses.cpp msgid "Save Audio Bus Layout As..." -msgstr "将音频Bus布局保存为..." +msgstr "音频总线布局另存为..." #: editor/editor_audio_buses.cpp msgid "Location for New Layout..." @@ -1343,7 +1343,7 @@ msgstr "新布局的位置..." #: editor/editor_audio_buses.cpp msgid "Open Audio Bus Layout" -msgstr "打开音频Bus布局" +msgstr "打开音频总线布局" #: editor/editor_audio_buses.cpp msgid "There is no '%s' file." @@ -1355,11 +1355,11 @@ msgstr "布局" #: editor/editor_audio_buses.cpp msgid "Invalid file, not an audio bus layout." -msgstr "无效文件,不存在音频总线布局。" +msgstr "无效文件，不是音频总线布局。" #: editor/editor_audio_buses.cpp msgid "Add Bus" -msgstr "添加Bus" +msgstr "添加总线" #: editor/editor_audio_buses.cpp msgid "Add a new Audio Bus to this layout." @@ -1381,7 +1381,7 @@ msgstr "另存为" #: editor/editor_audio_buses.cpp msgid "Save this Bus Layout to a file." -msgstr "将音频Bus布局保存为..." +msgstr "将该音频总线布局保存到文件。" #: editor/editor_audio_buses.cpp editor/import_dock.cpp msgid "Load Default" @@ -1397,7 +1397,7 @@ msgstr "创建一个新的总线布局。" #: editor/editor_autoload_settings.cpp msgid "Invalid name." -msgstr "名称非法:。" +msgstr "名称无效。" #: editor/editor_autoload_settings.cpp msgid "Valid characters:" @@ -1482,7 +1482,7 @@ msgstr "名称" #: editor/editor_autoload_settings.cpp msgid "Singleton" -msgstr "单独（Singleton）" +msgstr "单例" #: editor/editor_data.cpp msgid "Updating Scene" @@ -1743,7 +1743,7 @@ msgstr "选择此文件夹" #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp msgid "Copy Path" -msgstr "拷贝路径" +msgstr "复制路径" #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp msgid "Open in File Manager" @@ -2691,7 +2691,7 @@ msgstr "工具" #: editor/editor_node.cpp msgid "Orphan Resource Explorer..." -msgstr "单一资源浏览器..." +msgstr "孤立资源浏览器..." #: editor/editor_node.cpp msgid "Quit to Project List" @@ -3297,7 +3297,7 @@ msgstr "卸载" #: editor/export_template_manager.cpp msgid "(Installed)" -msgstr "(安装)" +msgstr "（已安装）" #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp @@ -3310,11 +3310,11 @@ msgstr "开发构建下官方导出模板不可用。" #: editor/export_template_manager.cpp msgid "(Missing)" -msgstr "(丢失)" +msgstr "（缺失）" #: editor/export_template_manager.cpp msgid "(Current)" -msgstr "(当前)" +msgstr "（当前）" #: editor/export_template_manager.cpp msgid "Retrieving mirrors, please wait..." @@ -3471,6 +3471,11 @@ msgid "Select Template File" msgstr "选择模板文件" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "正在加载导出模板" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "模板导出工具" @@ -3916,7 +3921,7 @@ msgstr "编辑资源剪贴板" #: editor/inspector_dock.cpp msgid "Copy Resource" -msgstr "拷贝资源" +msgstr "复制资源" #: editor/inspector_dock.cpp msgid "Make Built-In" @@ -4354,7 +4359,7 @@ msgstr "复制动画" #: editor/plugins/animation_player_editor_plugin.cpp msgid "No animation to copy!" -msgstr "没有需要拷贝的动画！" +msgstr "没有需要复制的动画！" #: editor/plugins/animation_player_editor_plugin.cpp msgid "No animation resource on clipboard!" @@ -4439,7 +4444,7 @@ msgstr "方向" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Past" -msgstr "穿过" +msgstr "过去" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Future" @@ -4845,6 +4850,32 @@ msgid "Download for this asset is already in progress!" msgstr "此资源文件正在下载中！" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "许可证" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "许可证" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "第一项" @@ -5226,7 +5257,7 @@ msgstr "设置吸附..." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to Parent" -msgstr "吸附到父级" +msgstr "吸附到父节点" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to Node Anchor" @@ -5242,7 +5273,7 @@ msgstr "吸附到节点中心位置" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to Other Nodes" -msgstr "吸附到其他node节点" +msgstr "吸附到其它节点" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to Guides" @@ -5366,7 +5397,7 @@ msgstr "插入关键帧（已有轨道）" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Copy Pose" -msgstr "拷贝姿势" +msgstr "复制姿势" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Clear Pose" @@ -6275,7 +6306,7 @@ msgstr "AnimationPlayer 路径无效" #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" -msgstr "清理当前文件" +msgstr "清除最近打开文件列表" #: editor/plugins/script_editor_plugin.cpp msgid "Close and save changes?" @@ -6409,7 +6440,7 @@ msgstr "软重载脚本" #: editor/plugins/script_editor_plugin.cpp msgid "Copy Script Path" -msgstr "拷贝脚本路径" +msgstr "复制脚本路径" #: editor/plugins/script_editor_plugin.cpp msgid "History Previous" @@ -6462,7 +6493,7 @@ msgstr "单步跳过" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp msgid "Break" -msgstr "跳过" +msgstr "暂停" #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp #: editor/script_editor_debugger.cpp @@ -6947,7 +6978,7 @@ msgstr "视图环境" #: editor/plugins/spatial_editor_plugin.cpp msgid "View Gizmos" -msgstr "Gizmos（可视化调试工具）" +msgstr "查看控制器" #: editor/plugins/spatial_editor_plugin.cpp msgid "View Information" @@ -7130,7 +7161,7 @@ msgstr "4个视口" #: editor/plugins/spatial_editor_plugin.cpp msgid "Gizmos" -msgstr "Gizmos（小工具）" +msgstr "控制器" #: editor/plugins/spatial_editor_plugin.cpp msgid "View Origin" @@ -7207,7 +7238,7 @@ msgstr "发布(Post)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Nameless gizmo" -msgstr "未命名的Gizmo" +msgstr "无名控制器" #: editor/plugins/sprite_editor_plugin.cpp msgid "Create Mesh2D" @@ -8889,6 +8920,15 @@ msgid "Runnable" msgstr "可执行的" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "添加输入端口" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "从列表中删除补丁''%s'？" @@ -9328,9 +9368,8 @@ msgid "Projects" msgstr "工程" #: editor/project_manager.cpp -#, fuzzy msgid "Last Modified" -msgstr "已修改" +msgstr "修改时间" #: editor/project_manager.cpp msgid "Scan" @@ -9401,7 +9440,7 @@ msgstr "重命名输入事件" #: editor/project_settings_editor.cpp msgid "Change Action deadzone" -msgstr "改变操作隔离区" +msgstr "改变动作盲区" #: editor/project_settings_editor.cpp msgid "Add Input Action Event" @@ -9599,7 +9638,7 @@ msgstr "常规" #: editor/project_settings_editor.cpp msgid "Override For..." -msgstr "重写的......" +msgstr "覆盖......" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "The editor must be restarted for changes to take effect." @@ -9615,11 +9654,11 @@ msgstr "动作:" #: editor/project_settings_editor.cpp msgid "Action" -msgstr "动作（``Action``）" +msgstr "动作" #: editor/project_settings_editor.cpp msgid "Deadzone" -msgstr "隔离区" +msgstr "盲区" #: editor/project_settings_editor.cpp msgid "Device:" @@ -10108,7 +10147,7 @@ msgstr "将分支保存为场景" #: editor/scene_tree_dock.cpp editor/script_editor_debugger.cpp msgid "Copy Node Path" -msgstr "拷贝节点路径" +msgstr "复制节点路径" #: editor/scene_tree_dock.cpp msgid "Delete (No Confirm)" @@ -10216,7 +10255,7 @@ msgstr "" #: editor/scene_tree_editor.cpp msgid "Invalid node name, the following characters are not allowed:" -msgstr "节点名称非法，不允许包含以下字符:" +msgstr "节点名称无效，不允许包含以下字符：" #: editor/scene_tree_editor.cpp msgid "Rename Node" @@ -10404,15 +10443,15 @@ msgstr "编辑下一个实例" #: editor/script_editor_debugger.cpp msgid "Stack Frames" -msgstr "堆栈帧（Stack Frames）" +msgstr "栈帧" #: editor/script_editor_debugger.cpp msgid "Profiler" -msgstr "性能分析" +msgstr "性能分析器" #: editor/script_editor_debugger.cpp msgid "Network Profiler" -msgstr "网络检视" +msgstr "网络分析器" #: editor/script_editor_debugger.cpp msgid "Monitor" @@ -11207,7 +11246,7 @@ msgstr "迭代器失效： " #: modules/visual_script/visual_script_func_nodes.cpp msgid "Invalid index property name." -msgstr "属性名称非法。" +msgstr "属性名称索引无效。" #: modules/visual_script/visual_script_func_nodes.cpp msgid "Base object is not a Node!" @@ -13005,9 +13044,6 @@ msgstr "不允许修改常量。" #~ msgid "Re-Import Changed Resources" #~ msgstr "重新导入改变的资源" -#~ msgid "Loading Export Templates" -#~ msgstr "正在加载导出模板" - #~ msgid "" #~ "\n" #~ "Status: Needs Re-Import" diff --git a/editor/translations/zh_HK.po b/editor/translations/zh_HK.po index 59b5a5b7a2..4692a74bc9 100644 --- a/editor/translations/zh_HK.po +++ b/editor/translations/zh_HK.po @@ -3642,6 +3642,11 @@ msgid "Select Template File" msgstr "要刪除選中檔案?" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "管理輸出範本" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "" @@ -5130,6 +5135,32 @@ msgid "Download for this asset is already in progress!" msgstr "Asset已在下載中" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "授權條款" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "授權條款" + +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "First" msgstr "首頁" @@ -9343,6 +9374,15 @@ msgstr "啟用" #: editor/project_export.cpp #, fuzzy +msgid "Add initial export..." +msgstr "新增訊號" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp +#, fuzzy msgid "Delete patch '%s' from list?" msgstr "刪除" diff --git a/editor/translations/zh_TW.po b/editor/translations/zh_TW.po index 5b360169e1..910c74ada7 100644 --- a/editor/translations/zh_TW.po +++ b/editor/translations/zh_TW.po @@ -3620,6 +3620,11 @@ msgid "Select Template File" msgstr "選擇範本檔案" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Godot Export Templates" +msgstr "管理輸出模板" + +#: editor/export_template_manager.cpp msgid "Export Template Manager" msgstr "導出範本管理器" @@ -5088,6 +5093,32 @@ msgid "Download for this asset is already in progress!" msgstr "此資源文檔正在下載中!" #: editor/plugins/asset_library_editor_plugin.cpp +msgid "Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Least Recently Updated" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (A-Z)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Name (Z-A)" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (A-Z)" +msgstr "授權" + +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "License (Z-A)" +msgstr "授權" + +#: editor/plugins/asset_library_editor_plugin.cpp msgid "First" msgstr "第一項" @@ -9309,6 +9340,15 @@ msgid "Runnable" msgstr "可運行的" #: editor/project_export.cpp +#, fuzzy +msgid "Add initial export..." +msgstr "添加輸入" + +#: editor/project_export.cpp +msgid "Add previous patches..." +msgstr "" + +#: editor/project_export.cpp msgid "Delete patch '%s' from list?" msgstr "" diff --git a/main/main.cpp b/main/main.cpp index cdaee06135..3ac343a3c5 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1126,6 +1126,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(GLOBAL_DEF("application/run/low_processor_mode_sleep_usec", 6900)); // Roughly 144 FPS ProjectSettings::get_singleton()->set_custom_property_info("application/run/low_processor_mode_sleep_usec", PropertyInfo(Variant::INT, "application/run/low_processor_mode_sleep_usec", PROPERTY_HINT_RANGE, "0,33200,1,or_greater")); // No negative numbers + GLOBAL_DEF("display/window/ios/hide_home_indicator", true); + Engine::get_singleton()->set_frame_delay(frame_delay); message_queue = memnew(MessageQueue); diff --git a/main/splash_editor.png b/main/splash_editor.png Binary files differindex 8c605f0eed..29931a71db 100644 --- a/main/splash_editor.png +++ b/main/splash_editor.png diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 2f620df8fb..03b51be27f 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -946,18 +946,29 @@ bool GDScriptInstance::set(const StringName &p_name, const Variant &p_value) { { const Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.find(p_name); if (E) { - if (E->get().setter) { + const GDScript::MemberInfo *member = &E->get(); + if (member->setter) { const Variant *val = &p_value; Variant::CallError err; - call(E->get().setter, &val, 1, err); + call(member->setter, &val, 1, err); if (err.error == Variant::CallError::CALL_OK) { return true; //function exists, call was successful } } else { - if (!E->get().data_type.is_type(p_value)) { - return false; // Type mismatch + if (!member->data_type.is_type(p_value)) { + // Try conversion + Variant::CallError ce; + const Variant *value = &p_value; + Variant converted = Variant::construct(member->data_type.builtin_type, &value, 1, ce); + if (ce.error == Variant::CallError::CALL_OK) { + members.write[member->index] = converted; + return true; + } else { + return false; + } + } else { + members.write[member->index] = p_value; } - members.write[E->get().index] = p_value; } return true; } diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp index dea2225e91..7ce19f5adc 100644 --- a/modules/gdscript/gdscript_compiler.cpp +++ b/modules/gdscript/gdscript_compiler.cpp @@ -1144,7 +1144,7 @@ int GDScriptCompiler::_parse_expression(CodeGen &codegen, const GDScriptParser:: GDScriptDataType assign_type = _gdtype_from_datatype(on->arguments[0]->get_datatype()); - if (assign_type.has_type && !on->arguments[1]->get_datatype().has_type) { + if (assign_type.has_type && !on->datatype.has_type) { // Typed assignment switch (assign_type.kind) { case GDScriptDataType::BUILTIN: { diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 280bc37dc0..97b8dda6d0 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -744,6 +744,14 @@ static bool _guess_expression_type(GDScriptCompletionContext &p_context, const G r_type.type.kind = GDScriptParser::DataType::BUILTIN; r_type.type.builtin_type = Variant::ARRAY; } break; + case GDScriptParser::Node::TYPE_CAST: { + const GDScriptParser::CastNode *cn = static_cast<const GDScriptParser::CastNode *>(p_expression); + GDScriptCompletionIdentifier value; + if (_guess_expression_type(p_context, cn->source_node, r_type)) { + r_type.type = cn->get_datatype(); + found = true; + } + } break; case GDScriptParser::Node::TYPE_OPERATOR: { const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(p_expression); switch (op->op) { @@ -1232,6 +1240,9 @@ static bool _guess_identifier_type(GDScriptCompletionContext &p_context, const S c.line = last_assign_line; r_type.assigned_expression = last_assigned_expression; if (_guess_expression_type(c, last_assigned_expression, r_type)) { + if (var_type.has_type) { + r_type.type = var_type; + } return true; } } diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp index 0a01321851..4518a5be4b 100644 --- a/modules/gdscript/gdscript_function.cpp +++ b/modules/gdscript/gdscript_function.cpp @@ -764,15 +764,17 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a GET_VARIANT_PTR(dst, 2); GET_VARIANT_PTR(src, 3); -#ifdef DEBUG_ENABLED Variant::Type var_type = (Variant::Type)_code_ptr[ip + 1]; GD_ERR_BREAK(var_type < 0 || var_type >= Variant::VARIANT_MAX); if (src->get_type() != var_type) { +#ifdef DEBUG_ENABLED if (Variant::can_convert_strict(src->get_type(), var_type)) { +#endif // DEBUG_ENABLED Variant::CallError ce; *dst = Variant::construct(var_type, const_cast<const Variant **>(&src), 1, ce); } else { +#ifdef DEBUG_ENABLED err_text = "Trying to assign value of type '" + Variant::get_type_name(src->get_type()) + "' to a variable of type '" + Variant::get_type_name(var_type) + "'."; OPCODE_BREAK; @@ -780,9 +782,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a } else { #endif // DEBUG_ENABLED *dst = *src; -#ifdef DEBUG_ENABLED } -#endif // DEBUG_ENABLED ip += 4; } diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index ef1a282e51..4405393b96 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -8185,7 +8185,9 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) { } #endif // DEBUG_ENABLED + bool type_match = check_types; if (check_types && !_is_type_compatible(lh_type, rh_type)) { + type_match = false; // Try supertype test if (_is_type_compatible(rh_type, lh_type)) { _mark_line_as_unsafe(op->line); @@ -8197,23 +8199,27 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) { op->line); return; } - // Replace assignment with implicit conversion - BuiltInFunctionNode *convert = alloc_node<BuiltInFunctionNode>(); - convert->line = op->line; - convert->function = GDScriptFunctions::TYPE_CONVERT; - - ConstantNode *tgt_type = alloc_node<ConstantNode>(); - tgt_type->line = op->line; - tgt_type->value = (int)lh_type.builtin_type; - - OperatorNode *convert_call = alloc_node<OperatorNode>(); - convert_call->line = op->line; - convert_call->op = OperatorNode::OP_CALL; - convert_call->arguments.push_back(convert); - convert_call->arguments.push_back(op->arguments[1]); - convert_call->arguments.push_back(tgt_type); - - op->arguments.write[1] = convert_call; + if (op->op == OperatorNode::OP_ASSIGN) { + // Replace assignment with implicit conversion + BuiltInFunctionNode *convert = alloc_node<BuiltInFunctionNode>(); + convert->line = op->line; + convert->function = GDScriptFunctions::TYPE_CONVERT; + + ConstantNode *tgt_type = alloc_node<ConstantNode>(); + tgt_type->line = op->line; + tgt_type->value = (int)lh_type.builtin_type; + + OperatorNode *convert_call = alloc_node<OperatorNode>(); + convert_call->line = op->line; + convert_call->op = OperatorNode::OP_CALL; + convert_call->arguments.push_back(convert); + convert_call->arguments.push_back(op->arguments[1]); + convert_call->arguments.push_back(tgt_type); + + op->arguments.write[1] = convert_call; + + type_match = true; // Since we are converting, the type is matching + } #ifdef DEBUG_ENABLED if (lh_type.builtin_type == Variant::INT && rh_type.builtin_type == Variant::REAL) { _add_warning(GDScriptWarning::NARROWING_CONVERSION, op->line); @@ -8226,6 +8232,7 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) { _mark_line_as_unsafe(op->line); } #endif // DEBUG_ENABLED + op->datatype.has_type = type_match; } break; case OperatorNode::OP_CALL: case OperatorNode::OP_PARENT_CALL: { diff --git a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotBuildLogger.cs b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotBuildLogger.cs index a0f6f1ff32..6015cb22b6 100644 --- a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotBuildLogger.cs +++ b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotBuildLogger.cs @@ -18,7 +18,7 @@ namespace GodotTools.BuildLogger if (null == Parameters) throw new LoggerException("Log directory was not set."); - var parameters = Parameters.Split(new[] {';'}); + var parameters = Parameters.Split(new[] { ';' }); string logDir = parameters[0]; diff --git a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj index dcfdd83831..1eaa36c1aa 100644 --- a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj +++ b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj b/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj index 24c7cb1573..1974220f2f 100644 --- a/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj +++ b/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs b/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs index 8cd7e76303..b531b6aeee 100644 --- a/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs +++ b/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs @@ -26,7 +26,7 @@ namespace GodotTools.Core path = path.Replace('\\', '/'); - string[] parts = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries); + string[] parts = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); path = string.Join(Path.DirectorySeparatorChar.ToString(), parts).Trim(); @@ -44,7 +44,7 @@ namespace GodotTools.Core public static string CsvEscape(this string value, char delimiter = ',') { - bool hasSpecialChar = value.IndexOfAny(new char[] {'\"', '\n', '\r', delimiter}) != -1; + bool hasSpecialChar = value.IndexOfAny(new char[] { '\"', '\n', '\r', delimiter }) != -1; if (hasSpecialChar) return "\"" + value.Replace("\"", "\"\"") + "\""; @@ -54,8 +54,8 @@ namespace GodotTools.Core public static string ToSafeDirName(this string dirName, bool allowDirSeparator) { - var invalidChars = new List<string> {":", "*", "?", "\"", "<", ">", "|"}; - + var invalidChars = new List<string> { ":", "*", "?", "\"", "<", ">", "|" }; + if (allowDirSeparator) { // Directory separators are allowed, but disallow ".." to avoid going up the filesystem diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeClient.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeClient.cs index 4f56a8d71b..2bf3b83c75 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeClient.cs +++ b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeClient.cs @@ -106,7 +106,7 @@ namespace GodotTools.IdeConnection try { Logger.LogInfo("Connecting to Godot Ide Server"); - + tcpClient.Connect(IPAddress.Loopback, GodotIdeMetadata.Port); Logger.LogInfo("Connection open with Godot Ide Server"); @@ -130,7 +130,7 @@ namespace GodotTools.IdeConnection public void Start() { Logger.LogInfo("Starting Godot Ide Client"); - + fsWatcher.Changed += OnMetaFileChanged; fsWatcher.Deleted += OnMetaFileDeleted; fsWatcher.EnableRaisingEvents = true; diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnection.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnection.cs index e7e81f175e..6441be8d6e 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnection.cs +++ b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnection.cs @@ -149,7 +149,7 @@ namespace GodotTools.IdeConnection public bool WriteMessage(Message message) { Logger.LogDebug($"Sending message {message}"); - + var messageComposer = new MessageComposer(); messageComposer.AddArgument(message.Id); @@ -201,7 +201,7 @@ namespace GodotTools.IdeConnection clientReader?.Dispose(); clientWriter?.Dispose(); - ((IDisposable) tcpClient)?.Dispose(); + ((IDisposable)tcpClient)?.Dispose(); } } } diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotTools.IdeConnection.csproj b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotTools.IdeConnection.csproj index 94e525715b..427a26508f 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotTools.IdeConnection.csproj +++ b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotTools.IdeConnection.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageComposer.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageComposer.cs index 9e4cd6ec1a..30ffe7a06e 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageComposer.cs +++ b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageComposer.cs @@ -22,14 +22,14 @@ namespace GodotTools.IdeConnection if (quoted) { stringBuilder.Append('"'); - + foreach (char @char in argument) { if (CharsToEscape.Contains(@char)) stringBuilder.Append('\\'); stringBuilder.Append(@char); } - + stringBuilder.Append('"'); } else diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageParser.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageParser.cs index ed691e481f..4365d69989 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageParser.cs +++ b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageParser.cs @@ -37,7 +37,7 @@ namespace GodotTools.IdeConnection while (i < messageLine.Length) { @char = messageLine[i]; - + if (quoted && @char == '"') { i++; @@ -60,10 +60,10 @@ namespace GodotTools.IdeConnection { stringBuilder.Append(@char); } - + i++; } - + arguments.Add(stringBuilder.ToString()); stringBuilder.Clear(); diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs index 4f21871f1a..b40d985d51 100644 --- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs +++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs @@ -26,8 +26,8 @@ namespace GodotTools.ProjectEditor mainGroup.SetProperty("BaseIntermediateOutputPath", "obj"); GenAssemblyInfoFile(root, dir, CoreApiProjectName, - new[] {"[assembly: InternalsVisibleTo(\"" + EditorApiProjectName + "\")]"}, - new[] {"System.Runtime.CompilerServices"}); + new[] { "[assembly: InternalsVisibleTo(\"" + EditorApiProjectName + "\")]" }, + new[] { "System.Runtime.CompilerServices" }); foreach (var item in compileItems) { diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/packages.config b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/packages.config index 13915000e4..2db030f9d8 100644 --- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/packages.config +++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/packages.config @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <packages> <package id="DotNet.Glob" version="2.1.1" targetFramework="net45" /> -</packages>
\ No newline at end of file +</packages> diff --git a/modules/mono/editor/GodotTools/GodotTools/BottomPanel.cs b/modules/mono/editor/GodotTools/GodotTools/BottomPanel.cs index 44813f962c..4c76d2abf1 100644 --- a/modules/mono/editor/GodotTools/GodotTools/BottomPanel.cs +++ b/modules/mono/editor/GodotTools/GodotTools/BottomPanel.cs @@ -34,7 +34,7 @@ namespace GodotTools for (int i = 0; i < buildTabs.GetChildCount(); i++) { - var tab = (BuildTab) buildTabs.GetChild(i); + var tab = (BuildTab)buildTabs.GetChild(i); if (tab == null) continue; @@ -120,7 +120,7 @@ namespace GodotTools if (currentTab < 0 || currentTab >= buildTabs.GetTabCount()) throw new InvalidOperationException("No tab selected"); - var buildTab = (BuildTab) buildTabs.GetChild(currentTab); + var buildTab = (BuildTab)buildTabs.GetChild(currentTab); buildTab.WarningsVisible = pressed; buildTab.UpdateIssuesList(); } @@ -132,7 +132,7 @@ namespace GodotTools if (currentTab < 0 || currentTab >= buildTabs.GetTabCount()) throw new InvalidOperationException("No tab selected"); - var buildTab = (BuildTab) buildTabs.GetChild(currentTab); + var buildTab = (BuildTab)buildTabs.GetChild(currentTab); buildTab.ErrorsVisible = pressed; buildTab.UpdateIssuesList(); } @@ -193,7 +193,7 @@ namespace GodotTools int selectedItem = selectedItems[0]; - var buildTab = (BuildTab) buildTabs.GetTabControl(selectedItem); + var buildTab = (BuildTab)buildTabs.GetTabControl(selectedItem); OS.ShellOpen(Path.Combine(buildTab.BuildInfo.LogsDirPath, BuildManager.MsBuildLogFileName)); } @@ -249,14 +249,14 @@ namespace GodotTools var editorBaseControl = editorInterface.GetBaseControl(); - SizeFlagsVertical = (int) SizeFlags.ExpandFill; + SizeFlagsVertical = (int)SizeFlags.ExpandFill; SetAnchorsAndMarginsPreset(LayoutPreset.Wide); panelTabs = new TabContainer { TabAlign = TabContainer.TabAlignEnum.Left, RectMinSize = new Vector2(0, 228) * EditorScale, - SizeFlagsVertical = (int) SizeFlags.ExpandFill + SizeFlagsVertical = (int)SizeFlags.ExpandFill }; panelTabs.AddStyleboxOverride("panel", editorBaseControl.GetStylebox("DebuggerPanel", "EditorStyles")); panelTabs.AddStyleboxOverride("tab_fg", editorBaseControl.GetStylebox("DebuggerTabFG", "EditorStyles")); @@ -268,11 +268,11 @@ namespace GodotTools panelBuildsTab = new VBoxContainer { Name = "Builds".TTR(), - SizeFlagsHorizontal = (int) SizeFlags.ExpandFill + SizeFlagsHorizontal = (int)SizeFlags.ExpandFill }; panelTabs.AddChild(panelBuildsTab); - var toolBarHBox = new HBoxContainer {SizeFlagsHorizontal = (int) SizeFlags.ExpandFill}; + var toolBarHBox = new HBoxContainer { SizeFlagsHorizontal = (int)SizeFlags.ExpandFill }; panelBuildsTab.AddChild(toolBarHBox); var buildProjectBtn = new Button @@ -320,12 +320,12 @@ namespace GodotTools var hsc = new HSplitContainer { - SizeFlagsHorizontal = (int) SizeFlags.ExpandFill, - SizeFlagsVertical = (int) SizeFlags.ExpandFill + SizeFlagsHorizontal = (int)SizeFlags.ExpandFill, + SizeFlagsVertical = (int)SizeFlags.ExpandFill }; panelBuildsTab.AddChild(hsc); - buildTabsList = new ItemList {SizeFlagsHorizontal = (int) SizeFlags.ExpandFill}; + buildTabsList = new ItemList { SizeFlagsHorizontal = (int)SizeFlags.ExpandFill }; buildTabsList.Connect("item_selected", this, nameof(_BuildTabsItemSelected)); buildTabsList.Connect("nothing_selected", this, nameof(_BuildTabsNothingSelected)); hsc.AddChild(buildTabsList); @@ -333,7 +333,7 @@ namespace GodotTools buildTabs = new TabContainer { TabAlign = TabContainer.TabAlignEnum.Left, - SizeFlagsHorizontal = (int) SizeFlags.ExpandFill, + SizeFlagsHorizontal = (int)SizeFlags.ExpandFill, TabsVisible = false }; hsc.AddChild(buildTabs); diff --git a/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs b/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs index da90c960e5..43c96d2e30 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs @@ -46,7 +46,7 @@ namespace GodotTools.Build { if (OS.IsWindows) { - return (BuildManager.BuildTool) EditorSettings.GetSetting("mono/builds/build_tool") + return (BuildManager.BuildTool)EditorSettings.GetSetting("mono/builds/build_tool") == BuildManager.BuildTool.MsBuildMono; } @@ -55,7 +55,7 @@ namespace GodotTools.Build } private static bool PrintBuildOutput => - (bool) EditorSettings.GetSetting("mono/builds/print_build_output"); + (bool)EditorSettings.GetSetting("mono/builds/print_build_output"); private static Process LaunchBuild(string solution, string config, string loggerOutputDir, IEnumerable<string> customProperties = null) { @@ -90,7 +90,7 @@ namespace GodotTools.Build // Needed when running from Developer Command Prompt for VS RemovePlatformVariable(startInfo.EnvironmentVariables); - var process = new Process {StartInfo = startInfo}; + var process = new Process { StartInfo = startInfo }; process.Start(); diff --git a/modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs b/modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs index ad8a6516ab..c3db52aa9e 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs @@ -19,7 +19,7 @@ namespace GodotTools.Build public static string FindMsBuild() { var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); - var buildTool = (BuildManager.BuildTool) editorSettings.GetSetting("mono/builds/build_tool"); + var buildTool = (BuildManager.BuildTool)editorSettings.GetSetting("mono/builds/build_tool"); if (OS.IsWindows) { @@ -136,11 +136,11 @@ namespace GodotTools.Build string vsWherePath = Environment.GetEnvironmentVariable(Internal.GodotIs32Bits() ? "ProgramFiles" : "ProgramFiles(x86)"); vsWherePath += "\\Microsoft Visual Studio\\Installer\\vswhere.exe"; - var vsWhereArgs = new[] {"-latest", "-products", "*", "-requires", "Microsoft.Component.MSBuild"}; + var vsWhereArgs = new[] { "-latest", "-products", "*", "-requires", "Microsoft.Component.MSBuild" }; var outputArray = new Godot.Collections.Array<string>(); int exitCode = Godot.OS.Execute(vsWherePath, vsWhereArgs, - blocking: true, output: (Godot.Collections.Array) outputArray); + blocking: true, output: (Godot.Collections.Array)outputArray); if (exitCode != 0) return string.Empty; diff --git a/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs b/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs index 217bf5c144..fa6bf4dafd 100644 --- a/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs +++ b/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs @@ -172,7 +172,7 @@ namespace GodotTools } var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); - var buildTool = (BuildTool) editorSettings.GetSetting("mono/builds/build_tool"); + var buildTool = (BuildTool)editorSettings.GetSetting("mono/builds/build_tool"); using (var pr = new EditorProgress("mono_project_debug_build", "Building project solution...", 1)) { diff --git a/modules/mono/editor/GodotTools/GodotTools/BuildTab.cs b/modules/mono/editor/GodotTools/GodotTools/BuildTab.cs index 807a20d9a1..727581daab 100644 --- a/modules/mono/editor/GodotTools/GodotTools/BuildTab.cs +++ b/modules/mono/editor/GodotTools/GodotTools/BuildTab.cs @@ -113,7 +113,7 @@ namespace GodotTools throw new IndexOutOfRangeException("Item list index out of range"); // Get correct issue idx from issue list - int issueIndex = (int) issuesList.GetItemMetadata(idx); + int issueIndex = (int)issuesList.GetItemMetadata(idx); if (idx < 0 || idx >= issues.Count) throw new IndexOutOfRangeException("Issue index out of range"); @@ -134,7 +134,7 @@ namespace GodotTools if (file.StartsWith("res://")) { - var script = (Script) ResourceLoader.Load(file, typeHint: Internal.CSharpLanguageType); + var script = (Script)ResourceLoader.Load(file, typeHint: Internal.CSharpLanguageType); if (script != null && Internal.ScriptEditorEdit(script, issue.Line, issue.Column)) Internal.EditorNodeShowScriptScreen(); @@ -220,7 +220,7 @@ namespace GodotTools issuesList.Clear(); - var issue = new BuildIssue {Message = cause, Warning = false}; + var issue = new BuildIssue { Message = cause, Warning = false }; ErrorCount += 1; issues.Add(issue); @@ -250,7 +250,7 @@ namespace GodotTools { base._Ready(); - issuesList = new ItemList {SizeFlagsVertical = (int) SizeFlags.ExpandFill}; + issuesList = new ItemList { SizeFlagsVertical = (int)SizeFlags.ExpandFill }; issuesList.Connect("item_activated", this, nameof(_IssueActivated)); AddChild(issuesList); } diff --git a/modules/mono/editor/GodotTools/GodotTools/CsProjOperations.cs b/modules/mono/editor/GodotTools/GodotTools/CsProjOperations.cs index c021a9051e..174509dc5b 100644 --- a/modules/mono/editor/GodotTools/GodotTools/CsProjOperations.cs +++ b/modules/mono/editor/GodotTools/GodotTools/CsProjOperations.cs @@ -26,7 +26,7 @@ namespace GodotTools public static void AddItem(string projectPath, string itemType, string include) { - if (!(bool) GlobalDef("mono/project/auto_update_project", true)) + if (!(bool)GlobalDef("mono/project/auto_update_project", true)) return; ProjectUtils.AddItemToProjectChecked(projectPath, itemType, include); @@ -49,7 +49,7 @@ namespace GodotTools private static ulong ConvertToTimestamp(this DateTime value) { TimeSpan elapsedTime = value - Epoch; - return (ulong) elapsedTime.TotalSeconds; + return (ulong)elapsedTime.TotalSeconds; } public static void GenerateScriptsMetadata(string projectPath, string outputPath) @@ -68,7 +68,7 @@ namespace GodotTools if (oldDict.TryGetValue(projectIncludeFile, out var oldFileVar)) { - var oldFileDict = (Dictionary) oldFileVar; + var oldFileDict = (Dictionary)oldFileVar; if (ulong.TryParse(oldFileDict["modified_time"] as string, out ulong storedModifiedTime)) { @@ -108,7 +108,7 @@ namespace GodotTools if (classDict.Count == 0) continue; // Not found - newDict[projectIncludeFile] = new Dictionary {["modified_time"] = $"{modifiedTime}", ["class"] = classDict}; + newDict[projectIncludeFile] = new Dictionary { ["modified_time"] = $"{modifiedTime}", ["class"] = classDict }; } if (newDict.Count > 0) diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs index c7e8ea511a..b17a3f4491 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs @@ -54,7 +54,7 @@ namespace GodotTools.Export // TODO What if the source file is not part of the game's C# project - bool includeScriptsContent = (bool) ProjectSettings.GetSetting("mono/export/include_scripts_content"); + bool includeScriptsContent = (bool)ProjectSettings.GetSetting("mono/export/include_scripts_content"); if (!includeScriptsContent) { @@ -114,7 +114,7 @@ namespace GodotTools.Export var dependencies = new Godot.Collections.Dictionary<string, string>(); - var projectDllName = (string) ProjectSettings.GetSetting("application/config/name"); + var projectDllName = (string)ProjectSettings.GetSetting("application/config/name"); if (projectDllName.Empty()) { projectDllName = "UnnamedProject"; @@ -147,7 +147,7 @@ namespace GodotTools.Export string apiConfig = isDebug ? "Debug" : "Release"; string resAssembliesDir = Path.Combine(GodotSharpDirs.ResAssembliesBaseDir, apiConfig); - bool assembliesInsidePck = (bool) ProjectSettings.GetSetting("mono/export/export_assemblies_inside_pck") || outputDataDir == null; + bool assembliesInsidePck = (bool)ProjectSettings.GetSetting("mono/export/export_assemblies_inside_pck") || outputDataDir == null; if (!assembliesInsidePck) { @@ -174,7 +174,7 @@ namespace GodotTools.Export // AOT - if ((bool) ProjectSettings.GetSetting("mono/export/aot/enabled")) + if ((bool)ProjectSettings.GetSetting("mono/export/aot/enabled")) { AotCompileDependencies(features, platform, isDebug, outputDir, outputDataDir, dependencies); } @@ -336,7 +336,7 @@ namespace GodotTools.Export AotCompileAssembly(platform, isDebug, data, assemblyPath, outputFilePathForThisAbi); - AddSharedObject(outputFilePathForThisAbi, tags: new[] {abi}); + AddSharedObject(outputFilePathForThisAbi, tags: new[] { abi }); } } else @@ -377,7 +377,7 @@ namespace GodotTools.Export string compilerCommand = Path.Combine(monoCrossBin, $"{toolPrefix}{monoExeName}{exeExt}"); - bool fullAot = (bool) ProjectSettings.GetSetting("mono/export/aot/full_aot"); + bool fullAot = (bool)ProjectSettings.GetSetting("mono/export/aot/full_aot"); string EscapeOption(string option) => option.Contains(',') ? $"\"{option}\"" : option; string OptionsToString(IEnumerable<string> options) => string.Join(",", options.Select(EscapeOption)); @@ -394,7 +394,7 @@ namespace GodotTools.Export { string abi = data["abi"]; - string androidToolchain = (string) ProjectSettings.GetSetting("mono/export/aot/android_toolchain_path"); + string androidToolchain = (string)ProjectSettings.GetSetting("mono/export/aot/android_toolchain_path"); if (string.IsNullOrEmpty(androidToolchain)) { @@ -419,13 +419,13 @@ namespace GodotTools.Export aotOptions.Add("tool-prefix=" + Path.Combine(androidToolchain, "bin", androidToolPrefixes[abi])); string triple = GetAndroidTriple(abi); - aotOptions.Add ($"mtriple={triple}"); + aotOptions.Add($"mtriple={triple}"); } aotOptions.Add($"outfile={outputFilePath}"); - var extraAotOptions = (string[]) ProjectSettings.GetSetting("mono/export/aot/extra_aot_options"); - var extraOptimizerOptions = (string[]) ProjectSettings.GetSetting("mono/export/aot/extra_optimizer_options"); + var extraAotOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_aot_options"); + var extraOptimizerOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_optimizer_options"); if (extraAotOptions.Length > 0) aotOptions.AddRange(extraAotOptions); @@ -575,7 +575,7 @@ namespace GodotTools.Export private static bool PlatformHasTemplateDir(string platform) { // OSX export templates are contained in a zip, so we place our custom template inside it and let Godot do the rest. - return !new[] {OS.Platforms.OSX, OS.Platforms.Android, OS.Platforms.HTML5}.Contains(platform); + return !new[] { OS.Platforms.OSX, OS.Platforms.Android, OS.Platforms.HTML5 }.Contains(platform); } private static string DeterminePlatformFromFeatures(IEnumerable<string> features) @@ -623,7 +623,7 @@ namespace GodotTools.Export /// </summary> private static bool PlatformRequiresCustomBcl(string platform) { - if (new[] {OS.Platforms.Android, OS.Platforms.HTML5}.Contains(platform)) + if (new[] { OS.Platforms.Android, OS.Platforms.HTML5 }.Contains(platform)) return true; // The 'net_4_x' BCL is not compatible between Windows and the other platforms. @@ -663,7 +663,7 @@ namespace GodotTools.Export { get { - var appName = (string) ProjectSettings.GetSetting("application/config/name"); + var appName = (string)ProjectSettings.GetSetting("application/config/name"); string appNameSafe = appName.ToSafeDirName(allowDirSeparator: false); return $"data_{appNameSafe}"; } diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs b/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs index 660971d912..147bc95bb8 100644 --- a/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs +++ b/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs @@ -44,7 +44,7 @@ namespace GodotTools string resourceDir = ProjectSettings.GlobalizePath("res://"); string path = resourceDir; - string name = (string) ProjectSettings.GetSetting("application/config/name"); + string name = (string)ProjectSettings.GetSetting("application/config/name"); if (name.Empty()) name = "UnnamedProject"; @@ -61,7 +61,7 @@ namespace GodotTools { Guid = guid, PathRelativeToSolution = name + ".csproj", - Configs = new List<string> {"Debug", "Release", "Tools"} + Configs = new List<string> { "Debug", "Release", "Tools" } }; solution.AddNewProject(name, projectInfo); @@ -110,20 +110,20 @@ namespace GodotTools private void _RemoveCreateSlnMenuOption() { - menuPopup.RemoveItem(menuPopup.GetItemIndex((int) MenuOptions.CreateSln)); + menuPopup.RemoveItem(menuPopup.GetItemIndex((int)MenuOptions.CreateSln)); bottomPanelBtn.Show(); } private void _ShowAboutDialog() { - bool showOnStart = (bool) editorSettings.GetSetting("mono/editor/show_info_on_start"); + bool showOnStart = (bool)editorSettings.GetSetting("mono/editor/show_info_on_start"); aboutDialogCheckBox.Pressed = showOnStart; aboutDialog.PopupCenteredMinsize(); } private void _ToggleAboutDialogOnStart(bool enabled) { - bool showOnStart = (bool) editorSettings.GetSetting("mono/editor/show_info_on_start"); + bool showOnStart = (bool)editorSettings.GetSetting("mono/editor/show_info_on_start"); if (showOnStart != enabled) editorSettings.SetSetting("mono/editor/show_info_on_start", enabled); } @@ -160,7 +160,7 @@ namespace GodotTools if (what == NotificationReady) { - bool showInfoDialog = (bool) editorSettings.GetSetting("mono/editor/show_info_on_start"); + bool showInfoDialog = (bool)editorSettings.GetSetting("mono/editor/show_info_on_start"); if (showInfoDialog) { aboutDialog.PopupExclusive = true; @@ -194,7 +194,7 @@ namespace GodotTools [UsedImplicitly] public Error OpenInExternalEditor(Script script, int line, int col) { - var editor = (ExternalEditorId) editorSettings.GetSetting("mono/editor/external_editor"); + var editor = (ExternalEditorId)editorSettings.GetSetting("mono/editor/external_editor"); switch (editor) { @@ -318,7 +318,7 @@ namespace GodotTools [UsedImplicitly] public bool OverridesExternalEditor() { - return (ExternalEditorId) editorSettings.GetSetting("mono/editor/external_editor") != ExternalEditorId.None; + return (ExternalEditorId)editorSettings.GetSetting("mono/editor/external_editor") != ExternalEditorId.None; } public override bool Build() @@ -346,7 +346,7 @@ namespace GodotTools bottomPanelBtn = AddControlToBottomPanel(BottomPanel, "Mono".TTR()); - AddChild(new HotReloadAssemblyWatcher {Name = "HotReloadAssemblyWatcher"}); + AddChild(new HotReloadAssemblyWatcher { Name = "HotReloadAssemblyWatcher" }); menuPopup = new PopupMenu(); menuPopup.Hide(); @@ -356,7 +356,7 @@ namespace GodotTools // TODO: Remove or edit this info dialog once Mono support is no longer in alpha { - menuPopup.AddItem("About C# support".TTR(), (int) MenuOptions.AboutCSharp); + menuPopup.AddItem("About C# support".TTR(), (int)MenuOptions.AboutCSharp); aboutDialog = new AcceptDialog(); editorBaseControl.AddChild(aboutDialog); aboutDialog.WindowTitle = "Important: C# support is not feature-complete"; @@ -379,7 +379,7 @@ namespace GodotTools var aboutLabel = new Label(); aboutHBox.AddChild(aboutLabel); aboutLabel.RectMinSize = new Vector2(600, 150) * EditorScale; - aboutLabel.SizeFlagsVertical = (int) Control.SizeFlags.ExpandFill; + aboutLabel.SizeFlagsVertical = (int)Control.SizeFlags.ExpandFill; aboutLabel.Autowrap = true; aboutLabel.Text = "C# support in Godot Engine is in late alpha stage and, while already usable, " + @@ -394,7 +394,7 @@ namespace GodotTools EditorDef("mono/editor/show_info_on_start", true); // CheckBox in main container - aboutDialogCheckBox = new CheckBox {Text = "Show this warning when starting the editor"}; + aboutDialogCheckBox = new CheckBox { Text = "Show this warning when starting the editor" }; aboutDialogCheckBox.Connect("toggled", this, nameof(_ToggleAboutDialogOnStart)); aboutVBox.AddChild(aboutDialogCheckBox); } @@ -407,7 +407,7 @@ namespace GodotTools else { bottomPanelBtn.Hide(); - menuPopup.AddItem("Create C# solution".TTR(), (int) MenuOptions.CreateSln); + menuPopup.AddItem("Create C# solution".TTR(), (int)MenuOptions.CreateSln); } menuPopup.Connect("id_pressed", this, nameof(_MenuOptionPressed)); @@ -428,22 +428,22 @@ namespace GodotTools if (OS.IsWindows) { - settingsHintStr += $",MonoDevelop:{(int) ExternalEditorId.MonoDevelop}" + - $",Visual Studio Code:{(int) ExternalEditorId.VsCode}" + - $",JetBrains Rider:{(int) ExternalEditorId.Rider}"; + settingsHintStr += $",MonoDevelop:{(int)ExternalEditorId.MonoDevelop}" + + $",Visual Studio Code:{(int)ExternalEditorId.VsCode}" + + $",JetBrains Rider:{(int)ExternalEditorId.Rider}"; } else if (OS.IsOSX) { - settingsHintStr += $",Visual Studio:{(int) ExternalEditorId.VisualStudioForMac}" + - $",MonoDevelop:{(int) ExternalEditorId.MonoDevelop}" + - $",Visual Studio Code:{(int) ExternalEditorId.VsCode}" + - $",JetBrains Rider:{(int) ExternalEditorId.Rider}"; + settingsHintStr += $",Visual Studio:{(int)ExternalEditorId.VisualStudioForMac}" + + $",MonoDevelop:{(int)ExternalEditorId.MonoDevelop}" + + $",Visual Studio Code:{(int)ExternalEditorId.VsCode}" + + $",JetBrains Rider:{(int)ExternalEditorId.Rider}"; } else if (OS.IsUnixLike()) { - settingsHintStr += $",MonoDevelop:{(int) ExternalEditorId.MonoDevelop}" + - $",Visual Studio Code:{(int) ExternalEditorId.VsCode}" + - $",JetBrains Rider:{(int) ExternalEditorId.Rider}"; + settingsHintStr += $",MonoDevelop:{(int)ExternalEditorId.MonoDevelop}" + + $",Visual Studio Code:{(int)ExternalEditorId.VsCode}" + + $",JetBrains Rider:{(int)ExternalEditorId.Rider}"; } editorSettings.AddPropertyInfo(new Godot.Collections.Dictionary diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj b/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj index be2b70529e..dbd774a66a 100644 --- a/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj +++ b/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> diff --git a/modules/mono/editor/GodotTools/GodotTools/HotReloadAssemblyWatcher.cs b/modules/mono/editor/GodotTools/GodotTools/HotReloadAssemblyWatcher.cs index 0f6f5ffadc..0ed567afd1 100644 --- a/modules/mono/editor/GodotTools/GodotTools/HotReloadAssemblyWatcher.cs +++ b/modules/mono/editor/GodotTools/GodotTools/HotReloadAssemblyWatcher.cs @@ -38,7 +38,7 @@ namespace GodotTools watchTimer = new Timer { OneShot = false, - WaitTime = (float) EditorDef("mono/assembly_watch_interval_sec", 0.5) + WaitTime = (float)EditorDef("mono/assembly_watch_interval_sec", 0.5) }; watchTimer.Connect("timeout", this, nameof(TimerTimeout)); AddChild(watchTimer); diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs index 3213de0127..54f0ffab96 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs @@ -64,7 +64,7 @@ namespace GodotTools.Ides private void LaunchIde() { - var editor = (ExternalEditorId) GodotSharpEditor.Instance.GetEditorInterface() + var editor = (ExternalEditorId)GodotSharpEditor.Instance.GetEditorInterface() .GetEditorSettings().GetSetting("mono/editor/external_editor"); switch (editor) diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeServer.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeServer.cs index 309b917c71..72676a8b24 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeServer.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeServer.cs @@ -45,7 +45,7 @@ namespace GodotTools.Ides listener = new TcpListener(new IPEndPoint(IPAddress.Loopback, port: 0)); listener.Start(); - int port = ((IPEndPoint) listener.Server.LocalEndPoint).Port; + int port = ((IPEndPoint)listener.Server.LocalEndPoint).Port; using (var metaFileWriter = new StreamWriter(metaFile, Encoding.UTF8)) { metaFileWriter.WriteLine(port); @@ -57,7 +57,7 @@ namespace GodotTools.Ides public void StartServer() { - var serverThread = new Thread(RunServerThread) {Name = "Godot Ide Connection Server"}; + var serverThread = new Thread(RunServerThread) { Name = "Godot Ide Connection Server" }; serverThread.Start(); } diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/.editorconfig b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/.editorconfig deleted file mode 100644 index aca19790ca..0000000000 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/.editorconfig +++ /dev/null @@ -1,6 +0,0 @@ -root = true - -[*] -indent_style = space -indent_size = 2 -end_of_line = lf
\ No newline at end of file diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs index 901ade71e3..b752535dcb 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -14,403 +14,403 @@ using OS = GodotTools.Utils.OS; namespace GodotTools.Ides.Rider { - /// <summary> - /// This code is a modified version of the JetBrains resharper-unity plugin listed under Apache License 2.0 license: - /// https://github.com/JetBrains/resharper-unity/blob/master/unity/JetBrains.Rider.Unity.Editor/EditorPlugin/RiderPathLocator.cs - /// </summary> - public static class RiderPathLocator - { - public static RiderInfo[] GetAllRiderPaths() + /// <summary> + /// This code is a modified version of the JetBrains resharper-unity plugin listed under Apache License 2.0 license: + /// https://github.com/JetBrains/resharper-unity/blob/master/unity/JetBrains.Rider.Unity.Editor/EditorPlugin/RiderPathLocator.cs + /// </summary> + public static class RiderPathLocator { - try - { - if (OS.IsWindows) + public static RiderInfo[] GetAllRiderPaths() { - return CollectRiderInfosWindows(); - } - if (OS.IsOSX) - { - return CollectRiderInfosMac(); - } - if (OS.IsUnixLike()) - { - return CollectAllRiderPathsLinux(); - } - throw new Exception("Unexpected OS."); - } - catch (Exception e) - { - GD.PushWarning(e.Message); - } - - return new RiderInfo[0]; - } + try + { + if (OS.IsWindows) + { + return CollectRiderInfosWindows(); + } + if (OS.IsOSX) + { + return CollectRiderInfosMac(); + } + if (OS.IsUnixLike()) + { + return CollectAllRiderPathsLinux(); + } + throw new Exception("Unexpected OS."); + } + catch (Exception e) + { + GD.PushWarning(e.Message); + } - private static RiderInfo[] CollectAllRiderPathsLinux() - { - var installInfos = new List<RiderInfo>(); - var home = Environment.GetEnvironmentVariable("HOME"); - if (!string.IsNullOrEmpty(home)) - { - var toolboxRiderRootPath = GetToolboxBaseDir(); - installInfos.AddRange(CollectPathsFromToolbox(toolboxRiderRootPath, "bin", "rider.sh", false) - .Select(a => new RiderInfo(a, true)).ToList()); - - //$Home/.local/share/applications/jetbrains-rider.desktop - var shortcut = new FileInfo(Path.Combine(home, @".local/share/applications/jetbrains-rider.desktop")); - - if (shortcut.Exists) - { - var lines = File.ReadAllLines(shortcut.FullName); - foreach (var line in lines) - { - if (!line.StartsWith("Exec=\"")) - continue; - var path = line.Split('"').Where((item, index) => index == 1).SingleOrDefault(); - if (string.IsNullOrEmpty(path)) - continue; - - if (installInfos.Any(a => a.Path == path)) // avoid adding similar build as from toolbox - continue; - installInfos.Add(new RiderInfo(path, false)); - } + return new RiderInfo[0]; } - } - - // snap install - var snapInstallPath = "/snap/rider/current/bin/rider.sh"; - if (new FileInfo(snapInstallPath).Exists) - installInfos.Add(new RiderInfo(snapInstallPath, false)); - - return installInfos.ToArray(); - } - private static RiderInfo[] CollectRiderInfosMac() - { - var installInfos = new List<RiderInfo>(); - // "/Applications/*Rider*.app" - var folder = new DirectoryInfo("/Applications"); - if (folder.Exists) - { - installInfos.AddRange(folder.GetDirectories("*Rider*.app") - .Select(a => new RiderInfo(a.FullName, false)) - .ToList()); - } - - // /Users/user/Library/Application Support/JetBrains/Toolbox/apps/Rider/ch-1/181.3870.267/Rider EAP.app - var toolboxRiderRootPath = GetToolboxBaseDir(); - var paths = CollectPathsFromToolbox(toolboxRiderRootPath, "", "Rider*.app", true) - .Select(a => new RiderInfo(a, true)); - installInfos.AddRange(paths); - - return installInfos.ToArray(); - } + private static RiderInfo[] CollectAllRiderPathsLinux() + { + var installInfos = new List<RiderInfo>(); + var home = Environment.GetEnvironmentVariable("HOME"); + if (!string.IsNullOrEmpty(home)) + { + var toolboxRiderRootPath = GetToolboxBaseDir(); + installInfos.AddRange(CollectPathsFromToolbox(toolboxRiderRootPath, "bin", "rider.sh", false) + .Select(a => new RiderInfo(a, true)).ToList()); + + //$Home/.local/share/applications/jetbrains-rider.desktop + var shortcut = new FileInfo(Path.Combine(home, @".local/share/applications/jetbrains-rider.desktop")); + + if (shortcut.Exists) + { + var lines = File.ReadAllLines(shortcut.FullName); + foreach (var line in lines) + { + if (!line.StartsWith("Exec=\"")) + continue; + var path = line.Split('"').Where((item, index) => index == 1).SingleOrDefault(); + if (string.IsNullOrEmpty(path)) + continue; + + if (installInfos.Any(a => a.Path == path)) // avoid adding similar build as from toolbox + continue; + installInfos.Add(new RiderInfo(path, false)); + } + } + } - private static RiderInfo[] CollectRiderInfosWindows() - { - var installInfos = new List<RiderInfo>(); - var toolboxRiderRootPath = GetToolboxBaseDir(); - var installPathsToolbox = CollectPathsFromToolbox(toolboxRiderRootPath, "bin", "rider64.exe", false).ToList(); - installInfos.AddRange(installPathsToolbox.Select(a => new RiderInfo(a, true)).ToList()); - - var installPaths = new List<string>(); - const string registryKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"; - CollectPathsFromRegistry(registryKey, installPaths); - const string wowRegistryKey = @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"; - CollectPathsFromRegistry(wowRegistryKey, installPaths); - - installInfos.AddRange(installPaths.Select(a => new RiderInfo(a, false)).ToList()); - - return installInfos.ToArray(); - } + // snap install + var snapInstallPath = "/snap/rider/current/bin/rider.sh"; + if (new FileInfo(snapInstallPath).Exists) + installInfos.Add(new RiderInfo(snapInstallPath, false)); - private static string GetToolboxBaseDir() - { - if (OS.IsWindows) - { - var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); - return Path.Combine(localAppData, @"JetBrains\Toolbox\apps\Rider"); - } - - if (OS.IsOSX) - { - var home = Environment.GetEnvironmentVariable("HOME"); - if (!string.IsNullOrEmpty(home)) - { - return Path.Combine(home, @"Library/Application Support/JetBrains/Toolbox/apps/Rider"); + return installInfos.ToArray(); } - } - if (OS.IsUnixLike()) - { - var home = Environment.GetEnvironmentVariable("HOME"); - if (!string.IsNullOrEmpty(home)) + private static RiderInfo[] CollectRiderInfosMac() { - return Path.Combine(home, @".local/share/JetBrains/Toolbox/apps/Rider"); + var installInfos = new List<RiderInfo>(); + // "/Applications/*Rider*.app" + var folder = new DirectoryInfo("/Applications"); + if (folder.Exists) + { + installInfos.AddRange(folder.GetDirectories("*Rider*.app") + .Select(a => new RiderInfo(a.FullName, false)) + .ToList()); + } + + // /Users/user/Library/Application Support/JetBrains/Toolbox/apps/Rider/ch-1/181.3870.267/Rider EAP.app + var toolboxRiderRootPath = GetToolboxBaseDir(); + var paths = CollectPathsFromToolbox(toolboxRiderRootPath, "", "Rider*.app", true) + .Select(a => new RiderInfo(a, true)); + installInfos.AddRange(paths); + + return installInfos.ToArray(); } - } - throw new Exception("Unexpected OS."); - } - - internal static ProductInfo GetBuildVersion(string path) - { - var buildTxtFileInfo = new FileInfo(Path.Combine(path, GetRelativePathToBuildTxt())); - var dir = buildTxtFileInfo.DirectoryName; - if (!Directory.Exists(dir)) - return null; - var buildVersionFile = new FileInfo(Path.Combine(dir, "product-info.json")); - if (!buildVersionFile.Exists) - return null; - var json = File.ReadAllText(buildVersionFile.FullName); - return ProductInfo.GetProductInfo(json); - } - - internal static Version GetBuildNumber(string path) - { - var file = new FileInfo(Path.Combine(path, GetRelativePathToBuildTxt())); - if (!file.Exists) - return null; - var text = File.ReadAllText(file.FullName); - if (text.Length <= 3) - return null; - - var versionText = text.Substring(3); - return Version.TryParse(versionText, out var v) ? v : null; - } + private static RiderInfo[] CollectRiderInfosWindows() + { + var installInfos = new List<RiderInfo>(); + var toolboxRiderRootPath = GetToolboxBaseDir(); + var installPathsToolbox = CollectPathsFromToolbox(toolboxRiderRootPath, "bin", "rider64.exe", false).ToList(); + installInfos.AddRange(installPathsToolbox.Select(a => new RiderInfo(a, true)).ToList()); - internal static bool IsToolbox(string path) - { - return path.StartsWith(GetToolboxBaseDir()); - } + var installPaths = new List<string>(); + const string registryKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"; + CollectPathsFromRegistry(registryKey, installPaths); + const string wowRegistryKey = @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"; + CollectPathsFromRegistry(wowRegistryKey, installPaths); - private static string GetRelativePathToBuildTxt() - { - if (OS.IsWindows || OS.IsUnixLike()) - return "../../build.txt"; - if (OS.IsOSX) - return "Contents/Resources/build.txt"; - throw new Exception("Unknown OS."); - } + installInfos.AddRange(installPaths.Select(a => new RiderInfo(a, false)).ToList()); - private static void CollectPathsFromRegistry(string registryKey, List<string> installPaths) - { - using (var key = Registry.LocalMachine.OpenSubKey(registryKey)) - { - if (key == null) return; - foreach (var subkeyName in key.GetSubKeyNames().Where(a => a.Contains("Rider"))) - { - using (var subkey = key.OpenSubKey(subkeyName)) - { - var folderObject = subkey?.GetValue("InstallLocation"); - if (folderObject == null) continue; - var folder = folderObject.ToString(); - var possiblePath = Path.Combine(folder, @"bin\rider64.exe"); - if (File.Exists(possiblePath)) - installPaths.Add(possiblePath); - } + return installInfos.ToArray(); } - } - } - - private static string[] CollectPathsFromToolbox(string toolboxRiderRootPath, string dirName, string searchPattern, - bool isMac) - { - if (!Directory.Exists(toolboxRiderRootPath)) - return new string[0]; - var channelDirs = Directory.GetDirectories(toolboxRiderRootPath); - var paths = channelDirs.SelectMany(channelDir => + private static string GetToolboxBaseDir() { - try - { - // use history.json - last entry stands for the active build https://jetbrains.slack.com/archives/C07KNP99D/p1547807024066500?thread_ts=1547731708.057700&cid=C07KNP99D - var historyFile = Path.Combine(channelDir, ".history.json"); - if (File.Exists(historyFile)) + if (OS.IsWindows) { - var json = File.ReadAllText(historyFile); - var build = ToolboxHistory.GetLatestBuildFromJson(json); - if (build != null) - { - var buildDir = Path.Combine(channelDir, build); - var executablePaths = GetExecutablePaths(dirName, searchPattern, isMac, buildDir); - if (executablePaths.Any()) - return executablePaths; - } + var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); + return Path.Combine(localAppData, @"JetBrains\Toolbox\apps\Rider"); } - var channelFile = Path.Combine(channelDir, ".channel.settings.json"); - if (File.Exists(channelFile)) + if (OS.IsOSX) { - var json = File.ReadAllText(channelFile).Replace("active-application", "active_application"); - var build = ToolboxInstallData.GetLatestBuildFromJson(json); - if (build != null) - { - var buildDir = Path.Combine(channelDir, build); - var executablePaths = GetExecutablePaths(dirName, searchPattern, isMac, buildDir); - if (executablePaths.Any()) - return executablePaths; - } + var home = Environment.GetEnvironmentVariable("HOME"); + if (!string.IsNullOrEmpty(home)) + { + return Path.Combine(home, @"Library/Application Support/JetBrains/Toolbox/apps/Rider"); + } } - // changes in toolbox json files format may brake the logic above, so return all found Rider installations - return Directory.GetDirectories(channelDir) - .SelectMany(buildDir => GetExecutablePaths(dirName, searchPattern, isMac, buildDir)); - } - catch (Exception e) - { - // do not write to Debug.Log, just log it. - Logger.Warn($"Failed to get RiderPath from {channelDir}", e); - } - - return new string[0]; - }) - .Where(c => !string.IsNullOrEmpty(c)) - .ToArray(); - return paths; - } - - private static string[] GetExecutablePaths(string dirName, string searchPattern, bool isMac, string buildDir) - { - var folder = new DirectoryInfo(Path.Combine(buildDir, dirName)); - if (!folder.Exists) - return new string[0]; - - if (!isMac) - return new[] {Path.Combine(folder.FullName, searchPattern)}.Where(File.Exists).ToArray(); - return folder.GetDirectories(searchPattern).Select(f => f.FullName) - .Where(Directory.Exists).ToArray(); - } - - // Disable the "field is never assigned" compiler warning. We never assign it, but Unity does. - // Note that Unity disable this warning in the generated C# projects -#pragma warning disable 0649 + if (OS.IsUnixLike()) + { + var home = Environment.GetEnvironmentVariable("HOME"); + if (!string.IsNullOrEmpty(home)) + { + return Path.Combine(home, @".local/share/JetBrains/Toolbox/apps/Rider"); + } + } - [Serializable] - class ToolboxHistory - { - public List<ItemNode> history; + throw new Exception("Unexpected OS."); + } - public static string GetLatestBuildFromJson(string json) - { - try + internal static ProductInfo GetBuildVersion(string path) { - return JsonConvert.DeserializeObject<ToolboxHistory>(json).history.LastOrDefault()?.item.build; + var buildTxtFileInfo = new FileInfo(Path.Combine(path, GetRelativePathToBuildTxt())); + var dir = buildTxtFileInfo.DirectoryName; + if (!Directory.Exists(dir)) + return null; + var buildVersionFile = new FileInfo(Path.Combine(dir, "product-info.json")); + if (!buildVersionFile.Exists) + return null; + var json = File.ReadAllText(buildVersionFile.FullName); + return ProductInfo.GetProductInfo(json); } - catch (Exception) + + internal static Version GetBuildNumber(string path) { - Logger.Warn($"Failed to get latest build from json {json}"); + var file = new FileInfo(Path.Combine(path, GetRelativePathToBuildTxt())); + if (!file.Exists) + return null; + var text = File.ReadAllText(file.FullName); + if (text.Length <= 3) + return null; + + var versionText = text.Substring(3); + return Version.TryParse(versionText, out var v) ? v : null; } - return null; - } - } - - [Serializable] - class ItemNode - { - public BuildNode item; - } + internal static bool IsToolbox(string path) + { + return path.StartsWith(GetToolboxBaseDir()); + } - [Serializable] - class BuildNode - { - public string build; - } + private static string GetRelativePathToBuildTxt() + { + if (OS.IsWindows || OS.IsUnixLike()) + return "../../build.txt"; + if (OS.IsOSX) + return "Contents/Resources/build.txt"; + throw new Exception("Unknown OS."); + } - [Serializable] - public class ProductInfo - { - public string version; - public string versionSuffix; + private static void CollectPathsFromRegistry(string registryKey, List<string> installPaths) + { + using (var key = Registry.LocalMachine.OpenSubKey(registryKey)) + { + if (key == null) return; + foreach (var subkeyName in key.GetSubKeyNames().Where(a => a.Contains("Rider"))) + { + using (var subkey = key.OpenSubKey(subkeyName)) + { + var folderObject = subkey?.GetValue("InstallLocation"); + if (folderObject == null) continue; + var folder = folderObject.ToString(); + var possiblePath = Path.Combine(folder, @"bin\rider64.exe"); + if (File.Exists(possiblePath)) + installPaths.Add(possiblePath); + } + } + } + } - [CanBeNull] - internal static ProductInfo GetProductInfo(string json) - { - try + private static string[] CollectPathsFromToolbox(string toolboxRiderRootPath, string dirName, string searchPattern, + bool isMac) { - var productInfo = JsonConvert.DeserializeObject<ProductInfo>(json); - return productInfo; + if (!Directory.Exists(toolboxRiderRootPath)) + return new string[0]; + + var channelDirs = Directory.GetDirectories(toolboxRiderRootPath); + var paths = channelDirs.SelectMany(channelDir => + { + try + { + // use history.json - last entry stands for the active build https://jetbrains.slack.com/archives/C07KNP99D/p1547807024066500?thread_ts=1547731708.057700&cid=C07KNP99D + var historyFile = Path.Combine(channelDir, ".history.json"); + if (File.Exists(historyFile)) + { + var json = File.ReadAllText(historyFile); + var build = ToolboxHistory.GetLatestBuildFromJson(json); + if (build != null) + { + var buildDir = Path.Combine(channelDir, build); + var executablePaths = GetExecutablePaths(dirName, searchPattern, isMac, buildDir); + if (executablePaths.Any()) + return executablePaths; + } + } + + var channelFile = Path.Combine(channelDir, ".channel.settings.json"); + if (File.Exists(channelFile)) + { + var json = File.ReadAllText(channelFile).Replace("active-application", "active_application"); + var build = ToolboxInstallData.GetLatestBuildFromJson(json); + if (build != null) + { + var buildDir = Path.Combine(channelDir, build); + var executablePaths = GetExecutablePaths(dirName, searchPattern, isMac, buildDir); + if (executablePaths.Any()) + return executablePaths; + } + } + + // changes in toolbox json files format may brake the logic above, so return all found Rider installations + return Directory.GetDirectories(channelDir) + .SelectMany(buildDir => GetExecutablePaths(dirName, searchPattern, isMac, buildDir)); + } + catch (Exception e) + { + // do not write to Debug.Log, just log it. + Logger.Warn($"Failed to get RiderPath from {channelDir}", e); + } + + return new string[0]; + }) + .Where(c => !string.IsNullOrEmpty(c)) + .ToArray(); + return paths; } - catch (Exception) + + private static string[] GetExecutablePaths(string dirName, string searchPattern, bool isMac, string buildDir) { - Logger.Warn($"Failed to get version from json {json}"); + var folder = new DirectoryInfo(Path.Combine(buildDir, dirName)); + if (!folder.Exists) + return new string[0]; + + if (!isMac) + return new[] { Path.Combine(folder.FullName, searchPattern) }.Where(File.Exists).ToArray(); + return folder.GetDirectories(searchPattern).Select(f => f.FullName) + .Where(Directory.Exists).ToArray(); } - return null; - } - } + // Disable the "field is never assigned" compiler warning. We never assign it, but Unity does. + // Note that Unity disable this warning in the generated C# projects +#pragma warning disable 0649 - // ReSharper disable once ClassNeverInstantiated.Global - [Serializable] - class ToolboxInstallData - { - // ReSharper disable once InconsistentNaming - public ActiveApplication active_application; + [Serializable] + class ToolboxHistory + { + public List<ItemNode> history; + + public static string GetLatestBuildFromJson(string json) + { + try + { + return JsonConvert.DeserializeObject<ToolboxHistory>(json).history.LastOrDefault()?.item.build; + } + catch (Exception) + { + Logger.Warn($"Failed to get latest build from json {json}"); + } + + return null; + } + } - [CanBeNull] - public static string GetLatestBuildFromJson(string json) - { - try + [Serializable] + class ItemNode { - var toolbox = JsonConvert.DeserializeObject<ToolboxInstallData>(json); - var builds = toolbox.active_application.builds; - if (builds != null && builds.Any()) - return builds.First(); + public BuildNode item; } - catch (Exception) + + [Serializable] + class BuildNode { - Logger.Warn($"Failed to get latest build from json {json}"); + public string build; } - return null; - } - } + [Serializable] + public class ProductInfo + { + public string version; + public string versionSuffix; - [Serializable] - class ActiveApplication - { - // ReSharper disable once InconsistentNaming - public List<string> builds; - } + [CanBeNull] + internal static ProductInfo GetProductInfo(string json) + { + try + { + var productInfo = JsonConvert.DeserializeObject<ProductInfo>(json); + return productInfo; + } + catch (Exception) + { + Logger.Warn($"Failed to get version from json {json}"); + } + + return null; + } + } -#pragma warning restore 0649 + // ReSharper disable once ClassNeverInstantiated.Global + [Serializable] + class ToolboxInstallData + { + // ReSharper disable once InconsistentNaming + public ActiveApplication active_application; - public struct RiderInfo - { - public bool IsToolbox; - public string Presentation; - public Version BuildNumber; - public ProductInfo ProductInfo; - public string Path; - - public RiderInfo(string path, bool isToolbox) - { - BuildNumber = GetBuildNumber(path); - ProductInfo = GetBuildVersion(path); - Path = new FileInfo(path).FullName; // normalize separators - var presentation = $"Rider {BuildNumber}"; - - if (ProductInfo != null && !string.IsNullOrEmpty(ProductInfo.version)) + [CanBeNull] + public static string GetLatestBuildFromJson(string json) + { + try + { + var toolbox = JsonConvert.DeserializeObject<ToolboxInstallData>(json); + var builds = toolbox.active_application.builds; + if (builds != null && builds.Any()) + return builds.First(); + } + catch (Exception) + { + Logger.Warn($"Failed to get latest build from json {json}"); + } + + return null; + } + } + + [Serializable] + class ActiveApplication { - var suffix = string.IsNullOrEmpty(ProductInfo.versionSuffix) ? "" : $" {ProductInfo.versionSuffix}"; - presentation = $"Rider {ProductInfo.version}{suffix}"; + // ReSharper disable once InconsistentNaming + public List<string> builds; } - if (isToolbox) - presentation += " (JetBrains Toolbox)"; +#pragma warning restore 0649 - Presentation = presentation; - IsToolbox = isToolbox; - } - } + public struct RiderInfo + { + public bool IsToolbox; + public string Presentation; + public Version BuildNumber; + public ProductInfo ProductInfo; + public string Path; - private static class Logger - { - internal static void Warn(string message, Exception e = null) - { - throw new Exception(message, e); - } + public RiderInfo(string path, bool isToolbox) + { + BuildNumber = GetBuildNumber(path); + ProductInfo = GetBuildVersion(path); + Path = new FileInfo(path).FullName; // normalize separators + var presentation = $"Rider {BuildNumber}"; + + if (ProductInfo != null && !string.IsNullOrEmpty(ProductInfo.version)) + { + var suffix = string.IsNullOrEmpty(ProductInfo.versionSuffix) ? "" : $" {ProductInfo.versionSuffix}"; + presentation = $"Rider {ProductInfo.version}{suffix}"; + } + + if (isToolbox) + presentation += " (JetBrains Toolbox)"; + + Presentation = presentation; + IsToolbox = isToolbox; + } + } + + private static class Logger + { + internal static void Warn(string message, Exception e = null) + { + throw new Exception(message, e); + } + } } - } } diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs index b7dba13bbe..558a242bf9 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs @@ -7,111 +7,111 @@ using GodotTools.Internals; namespace GodotTools.Ides.Rider { - public static class RiderPathManager - { - private static readonly string editorPathSettingName= "mono/editor/editor_path_optional"; - - private static string GetRiderPathFromSettings() - { - var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); - if (editorSettings.HasSetting(editorPathSettingName)) - return (string) editorSettings.GetSetting(editorPathSettingName); - return null; - } - - public static void Initialize() + public static class RiderPathManager { - var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); - var editor = (ExternalEditorId) editorSettings.GetSetting("mono/editor/external_editor"); - if (editor == ExternalEditorId.Rider) - { - if (!editorSettings.HasSetting(editorPathSettingName)) + private static readonly string editorPathSettingName = "mono/editor/editor_path_optional"; + + private static string GetRiderPathFromSettings() { - Globals.EditorDef(editorPathSettingName, "Optional"); - editorSettings.AddPropertyInfo(new Godot.Collections.Dictionary - { - ["type"] = Variant.Type.String, - ["name"] = editorPathSettingName, - ["hint"] = PropertyHint.File, - ["hint_string"] = "" - }); + var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); + if (editorSettings.HasSetting(editorPathSettingName)) + return (string)editorSettings.GetSetting(editorPathSettingName); + return null; } - var riderPath = (string) editorSettings.GetSetting(editorPathSettingName); - if (IsRiderAndExists(riderPath)) + public static void Initialize() { - Globals.EditorDef(editorPathSettingName, riderPath); - return; + var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); + var editor = (ExternalEditorId)editorSettings.GetSetting("mono/editor/external_editor"); + if (editor == ExternalEditorId.Rider) + { + if (!editorSettings.HasSetting(editorPathSettingName)) + { + Globals.EditorDef(editorPathSettingName, "Optional"); + editorSettings.AddPropertyInfo(new Godot.Collections.Dictionary + { + ["type"] = Variant.Type.String, + ["name"] = editorPathSettingName, + ["hint"] = PropertyHint.File, + ["hint_string"] = "" + }); + } + + var riderPath = (string)editorSettings.GetSetting(editorPathSettingName); + if (IsRiderAndExists(riderPath)) + { + Globals.EditorDef(editorPathSettingName, riderPath); + return; + } + + var paths = RiderPathLocator.GetAllRiderPaths(); + + if (!paths.Any()) + return; + + var newPath = paths.Last().Path; + Globals.EditorDef(editorPathSettingName, newPath); + editorSettings.SetSetting(editorPathSettingName, newPath); + } } - var paths = RiderPathLocator.GetAllRiderPaths(); + private static bool IsRider(string path) + { + if (string.IsNullOrEmpty(path)) + { + return false; + } - if (!paths.Any()) - return; + var fileInfo = new FileInfo(path); + var filename = fileInfo.Name.ToLowerInvariant(); + return filename.StartsWith("rider", StringComparison.Ordinal); + } - var newPath = paths.Last().Path; - Globals.EditorDef(editorPathSettingName, newPath); - editorSettings.SetSetting(editorPathSettingName, newPath); - } - } + private static string CheckAndUpdatePath(string riderPath) + { + if (IsRiderAndExists(riderPath)) + { + return riderPath; + } - private static bool IsRider(string path) - { - if (string.IsNullOrEmpty(path)) - { - return false; - } - - var fileInfo = new FileInfo(path); - var filename = fileInfo.Name.ToLowerInvariant(); - return filename.StartsWith("rider", StringComparison.Ordinal); - } + var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); + var paths = RiderPathLocator.GetAllRiderPaths(); - private static string CheckAndUpdatePath(string riderPath) - { - if (IsRiderAndExists(riderPath)) - { - return riderPath; - } - - var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); - var paths = RiderPathLocator.GetAllRiderPaths(); - - if (!paths.Any()) - return null; - - var newPath = paths.Last().Path; - editorSettings.SetSetting(editorPathSettingName, newPath); - Globals.EditorDef(editorPathSettingName, newPath); - return newPath; - } + if (!paths.Any()) + return null; - private static bool IsRiderAndExists(string riderPath) - { - return !string.IsNullOrEmpty(riderPath) && IsRider(riderPath) && new FileInfo(riderPath).Exists; - } + var newPath = paths.Last().Path; + editorSettings.SetSetting(editorPathSettingName, newPath); + Globals.EditorDef(editorPathSettingName, newPath); + return newPath; + } - public static void OpenFile(string slnPath, string scriptPath, int line) - { - var pathFromSettings = GetRiderPathFromSettings(); - var path = CheckAndUpdatePath(pathFromSettings); - - var args = new List<string>(); - args.Add(slnPath); - if (line >= 0) - { - args.Add("--line"); - args.Add(line.ToString()); - } - args.Add(scriptPath); - try - { - Utils.OS.RunProcess(path, args); - } - catch (Exception e) - { - GD.PushError($"Error when trying to run code editor: JetBrains Rider. Exception message: '{e.Message}'"); - } + private static bool IsRiderAndExists(string riderPath) + { + return !string.IsNullOrEmpty(riderPath) && IsRider(riderPath) && new FileInfo(riderPath).Exists; + } + + public static void OpenFile(string slnPath, string scriptPath, int line) + { + var pathFromSettings = GetRiderPathFromSettings(); + var path = CheckAndUpdatePath(pathFromSettings); + + var args = new List<string>(); + args.Add(slnPath); + if (line >= 0) + { + args.Add("--line"); + args.Add(line.ToString()); + } + args.Add(scriptPath); + try + { + Utils.OS.RunProcess(path, args); + } + catch (Exception e) + { + GD.PushError($"Error when trying to run code editor: JetBrains Rider. Exception message: '{e.Message}'"); + } + } } - } } diff --git a/modules/mono/editor/GodotTools/GodotTools/Internals/GodotSharpDirs.cs b/modules/mono/editor/GodotTools/GodotTools/Internals/GodotSharpDirs.cs index ddf3b829b5..6893bc1974 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Internals/GodotSharpDirs.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Internals/GodotSharpDirs.cs @@ -33,10 +33,10 @@ namespace GodotTools.Internals #region Windows-only public static string DataMonoBinDir => internal_DataMonoBinDir(); #endregion - - + + #region Internal - + [MethodImpl(MethodImplOptions.InternalCall)] private static extern string internal_ResDataDir(); [MethodImpl(MethodImplOptions.InternalCall)] @@ -85,7 +85,7 @@ namespace GodotTools.Internals [MethodImpl(MethodImplOptions.InternalCall)] private static extern string internal_DataMonoBinDir(); #endregion - + #endregion } } diff --git a/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs b/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs index 2497d276a9..80e45b3a3c 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs @@ -39,10 +39,10 @@ namespace GodotTools.Internals foreach (var classDeclDict in classesArray) { classesList.Add(new ClassDecl( - (string) classDeclDict["name"], - (string) classDeclDict["namespace"], - (bool) classDeclDict["nested"], - (int) classDeclDict["base_count"] + (string)classDeclDict["name"], + (string)classDeclDict["namespace"], + (bool)classDeclDict["nested"], + (int)classDeclDict["base_count"] )); } diff --git a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs index 1fe07e0bb6..5a867b7f8b 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs @@ -75,7 +75,7 @@ namespace GodotTools.Utils public static bool IsHTML5 => _isHTML5.Value; private static bool? _isUnixCache; - private static readonly string[] UnixLikePlatforms = {Names.OSX, Names.X11, Names.Server, Names.Haiku, Names.Android}; + private static readonly string[] UnixLikePlatforms = { Names.OSX, Names.X11, Names.Server, Names.Haiku, Names.Android }; public static bool IsUnixLike() { @@ -113,10 +113,10 @@ namespace GodotTools.Utils return searchDirs.Select(dir => Path.Combine(dir, name)).FirstOrDefault(File.Exists); return (from dir in searchDirs - select Path.Combine(dir, name) + select Path.Combine(dir, name) into path - from ext in windowsExts - select path + ext).FirstOrDefault(File.Exists); + from ext in windowsExts + select path + ext).FirstOrDefault(File.Exists); } private static string PathWhichUnix(string name) @@ -157,7 +157,7 @@ namespace GodotTools.Utils process.BeginOutputReadLine(); process.BeginErrorReadLine(); - if (IsWindows && process.Id>0) + if (IsWindows && process.Id > 0) User32Dll.AllowSetForegroundWindow(process.Id); // allows application to focus itself } } diff --git a/modules/mono/editor/GodotTools/GodotTools/packages.config b/modules/mono/editor/GodotTools/GodotTools/packages.config index 2db4b4acc6..dd3de2865a 100644 --- a/modules/mono/editor/GodotTools/GodotTools/packages.config +++ b/modules/mono/editor/GodotTools/GodotTools/packages.config @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <packages> <package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net45" /> <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" /> -</packages>
\ No newline at end of file +</packages> diff --git a/modules/mono/editor/script_class_parser.cpp b/modules/mono/editor/script_class_parser.cpp index dcb0ca5a80..1c3a583601 100644 --- a/modules/mono/editor/script_class_parser.cpp +++ b/modules/mono/editor/script_class_parser.cpp @@ -501,12 +501,15 @@ Error ScriptClassParser::parse(const String &p_code) { int type_curly_stack = 0; while (!error && tk != TK_EOF) { - if (tk == TK_IDENTIFIER && String(value) == "class") { + String identifier = value; + if (tk == TK_IDENTIFIER && (identifier == "class" || identifier == "struct")) { + bool is_class = identifier == "class"; + tk = get_token(); if (tk == TK_IDENTIFIER) { String name = value; - int at_level = type_curly_stack; + int at_level = curly_stack; ClassDecl class_decl; @@ -568,48 +571,22 @@ Error ScriptClassParser::parse(const String &p_code) { NameDecl name_decl; name_decl.name = name; - name_decl.type = NameDecl::CLASS_DECL; + name_decl.type = is_class ? NameDecl::CLASS_DECL : NameDecl::STRUCT_DECL; name_stack[at_level] = name_decl; - if (!generic) { // no generics, thanks - classes.push_back(class_decl); - } else if (OS::get_singleton()->is_stdout_verbose()) { - String full_name = class_decl.namespace_; - if (full_name.length()) - full_name += "."; - full_name += class_decl.name; - OS::get_singleton()->print("Ignoring generic class declaration: %s\n", class_decl.name.utf8().get_data()); - } - } - } else if (tk == TK_IDENTIFIER && String(value) == "struct") { - String name; - int at_level = type_curly_stack; - while (true) { - tk = get_token(); - if (tk == TK_IDENTIFIER && name.empty()) { - name = String(value); - } else if (tk == TK_CURLY_BRACKET_OPEN) { - if (name.empty()) { - error_str = "Expected " + get_token_name(TK_IDENTIFIER) + " after keyword 'struct', found " + get_token_name(TK_CURLY_BRACKET_OPEN); - error = true; - return ERR_PARSE_ERROR; + if (is_class) { + if (!generic) { // no generics, thanks + classes.push_back(class_decl); + } else if (OS::get_singleton()->is_stdout_verbose()) { + String full_name = class_decl.namespace_; + if (full_name.length()) + full_name += "."; + full_name += class_decl.name; + OS::get_singleton()->print("Ignoring generic class declaration: %s\n", full_name.utf8().get_data()); } - - curly_stack++; - type_curly_stack++; - break; - } else if (tk == TK_EOF) { - error_str = "Expected " + get_token_name(TK_CURLY_BRACKET_OPEN) + " after struct decl, found " + get_token_name(TK_EOF); - error = true; - return ERR_PARSE_ERROR; } } - - NameDecl name_decl; - name_decl.name = name; - name_decl.type = NameDecl::STRUCT_DECL; - name_stack[at_level] = name_decl; - } else if (tk == TK_IDENTIFIER && String(value) == "namespace") { + } else if (tk == TK_IDENTIFIER && identifier == "namespace") { if (type_curly_stack > 0) { error_str = "Found namespace nested inside type."; error = true; diff --git a/modules/mono/glue/Managed/Files/StringExtensions.cs b/modules/mono/glue/Managed/Files/StringExtensions.cs index 6045c83e95..079e9912d6 100644 --- a/modules/mono/glue/Managed/Files/StringExtensions.cs +++ b/modules/mono/glue/Managed/Files/StringExtensions.cs @@ -18,7 +18,7 @@ namespace Godot int pos = 0; int slices = 1; - while ((pos = instance.Find(splitter, pos)) >= 0) + while ((pos = instance.Find(splitter, true, pos)) >= 0) { slices++; pos += splitter.Length; @@ -325,17 +325,17 @@ namespace Godot // <summary> // Find the first occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed. // </summary> - public static int Find(this string instance, string what, int from = 0) + public static int Find(this string instance, string what, bool caseSensitive = true, int from = 0) { - return instance.IndexOf(what, StringComparison.OrdinalIgnoreCase); + return instance.IndexOf(what, from, caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase); } // <summary> // Find the last occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed. // </summary> - public static int FindLast(this string instance, string what) + public static int FindLast(this string instance, string what, bool caseSensitive = true, int from = 0) { - return instance.LastIndexOf(what, StringComparison.OrdinalIgnoreCase); + return instance.LastIndexOf(what, from, caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase); } // <summary> @@ -343,7 +343,7 @@ namespace Godot // </summary> public static int FindN(this string instance, string what, int from = 0) { - return instance.IndexOf(what, StringComparison.Ordinal); + return instance.IndexOf(what, from, StringComparison.OrdinalIgnoreCase); } // <summary> @@ -928,7 +928,7 @@ namespace Godot while (true) { - int end = instance.Find(divisor, from); + int end = instance.Find(divisor, true, from); if (end < 0) end = len; if (allowEmpty || end > from) diff --git a/modules/mono/glue/Managed/Managed.csproj b/modules/mono/glue/Managed/Managed.csproj index c8eca71199..8bde3b6d22 100644 --- a/modules/mono/glue/Managed/Managed.csproj +++ b/modules/mono/glue/Managed/Managed.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> diff --git a/modules/mono/mono_gd/gd_mono_android.cpp b/modules/mono/mono_gd/gd_mono_android.cpp index 86af8d1812..29ae4856be 100644 --- a/modules/mono/mono_gd/gd_mono_android.cpp +++ b/modules/mono/mono_gd/gd_mono_android.cpp @@ -81,7 +81,8 @@ struct ScopedLocalRef { ScopedLocalRef &operator=(const ScopedLocalRef &) = delete; ScopedLocalRef(JNIEnv *p_env, T p_local_ref) : - env(p_env), local_ref(p_local_ref) { + env(p_env), + local_ref(p_local_ref) { } ~ScopedLocalRef() { diff --git a/platform/iphone/view_controller.h b/platform/iphone/view_controller.h index 68e3bc64fc..c2ef95acb5 100644 --- a/platform/iphone/view_controller.h +++ b/platform/iphone/view_controller.h @@ -45,4 +45,6 @@ - (BOOL)prefersStatusBarHidden; +- (BOOL)prefersHomeIndicatorAutoHidden; + @end diff --git a/platform/iphone/view_controller.mm b/platform/iphone/view_controller.mm index e52ad92bf2..5bdce6277b 100644 --- a/platform/iphone/view_controller.mm +++ b/platform/iphone/view_controller.mm @@ -32,6 +32,8 @@ #include "os_iphone.h" +#include "core/project_settings.h" + extern "C" { int add_path(int, char **); @@ -129,6 +131,14 @@ int add_cmdline(int p_argc, char **p_args) { return YES; } +- (BOOL)prefersHomeIndicatorAutoHidden { + if (GLOBAL_GET("display/window/ios/hide_home_indicator")) { + return YES; + } else { + return NO; + } +} + #ifdef GAME_CENTER_ENABLED - (void)gameCenterViewControllerDidFinish:(GKGameCenterViewController *)gameCenterViewController { //[gameCenterViewController dismissViewControllerAnimated:YES completion:^{GameCenter::get_singleton()->game_center_closed();}];//version for signaling when overlay is completely gone diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index ce3f2b3b1a..72e8ae1b26 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -239,14 +239,14 @@ void Tween::_bind_methods() { ClassDB::bind_method(D_METHOD("get_runtime"), &Tween::get_runtime); // Bind interpolation and follow methods - ClassDB::bind_method(D_METHOD("interpolate_property", "object", "property", "initial_val", "final_val", "duration", "trans_type", "ease_type", "delay"), &Tween::interpolate_property, DEFVAL(0)); - ClassDB::bind_method(D_METHOD("interpolate_method", "object", "method", "initial_val", "final_val", "duration", "trans_type", "ease_type", "delay"), &Tween::interpolate_method, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("interpolate_property", "object", "property", "initial_val", "final_val", "duration", "trans_type", "ease_type", "delay"), &Tween::interpolate_property, DEFVAL(TRANS_LINEAR), DEFVAL(EASE_IN_OUT), DEFVAL(0)); + ClassDB::bind_method(D_METHOD("interpolate_method", "object", "method", "initial_val", "final_val", "duration", "trans_type", "ease_type", "delay"), &Tween::interpolate_method, DEFVAL(TRANS_LINEAR), DEFVAL(EASE_IN_OUT), DEFVAL(0)); ClassDB::bind_method(D_METHOD("interpolate_callback", "object", "duration", "callback", "arg1", "arg2", "arg3", "arg4", "arg5"), &Tween::interpolate_callback, DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant())); ClassDB::bind_method(D_METHOD("interpolate_deferred_callback", "object", "duration", "callback", "arg1", "arg2", "arg3", "arg4", "arg5"), &Tween::interpolate_deferred_callback, DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant())); - ClassDB::bind_method(D_METHOD("follow_property", "object", "property", "initial_val", "target", "target_property", "duration", "trans_type", "ease_type", "delay"), &Tween::follow_property, DEFVAL(0)); - ClassDB::bind_method(D_METHOD("follow_method", "object", "method", "initial_val", "target", "target_method", "duration", "trans_type", "ease_type", "delay"), &Tween::follow_method, DEFVAL(0)); - ClassDB::bind_method(D_METHOD("targeting_property", "object", "property", "initial", "initial_val", "final_val", "duration", "trans_type", "ease_type", "delay"), &Tween::targeting_property, DEFVAL(0)); - ClassDB::bind_method(D_METHOD("targeting_method", "object", "method", "initial", "initial_method", "final_val", "duration", "trans_type", "ease_type", "delay"), &Tween::targeting_method, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("follow_property", "object", "property", "initial_val", "target", "target_property", "duration", "trans_type", "ease_type", "delay"), &Tween::follow_property, DEFVAL(TRANS_LINEAR), DEFVAL(EASE_IN_OUT), DEFVAL(0)); + ClassDB::bind_method(D_METHOD("follow_method", "object", "method", "initial_val", "target", "target_method", "duration", "trans_type", "ease_type", "delay"), &Tween::follow_method, DEFVAL(TRANS_LINEAR), DEFVAL(EASE_IN_OUT), DEFVAL(0)); + ClassDB::bind_method(D_METHOD("targeting_property", "object", "property", "initial", "initial_val", "final_val", "duration", "trans_type", "ease_type", "delay"), &Tween::targeting_property, DEFVAL(TRANS_LINEAR), DEFVAL(EASE_IN_OUT), DEFVAL(0)); + ClassDB::bind_method(D_METHOD("targeting_method", "object", "method", "initial", "initial_method", "final_val", "duration", "trans_type", "ease_type", "delay"), &Tween::targeting_method, DEFVAL(TRANS_LINEAR), DEFVAL(EASE_IN_OUT), DEFVAL(0)); // Add the Tween signals ADD_SIGNAL(MethodInfo("tween_started", PropertyInfo(Variant::OBJECT, "object"), PropertyInfo(Variant::NODE_PATH, "key"))); diff --git a/scene/animation/tween.h b/scene/animation/tween.h index e4c95a93d6..f301d8d76b 100644 --- a/scene/animation/tween.h +++ b/scene/animation/tween.h @@ -179,21 +179,14 @@ public: real_t tell() const; real_t get_runtime() const; - bool interpolate_property(Object *p_object, NodePath p_property, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); - - bool interpolate_method(Object *p_object, StringName p_method, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); - + bool interpolate_property(Object *p_object, NodePath p_property, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type = TRANS_LINEAR, EaseType p_ease_type = EASE_IN_OUT, real_t p_delay = 0); + bool interpolate_method(Object *p_object, StringName p_method, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type = TRANS_LINEAR, EaseType p_ease_type = EASE_IN_OUT, real_t p_delay = 0); bool interpolate_callback(Object *p_object, real_t p_duration, String p_callback, VARIANT_ARG_DECLARE); - bool interpolate_deferred_callback(Object *p_object, real_t p_duration, String p_callback, VARIANT_ARG_DECLARE); - - bool follow_property(Object *p_object, NodePath p_property, Variant p_initial_val, Object *p_target, NodePath p_target_property, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); - - bool follow_method(Object *p_object, StringName p_method, Variant p_initial_val, Object *p_target, StringName p_target_method, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); - - bool targeting_property(Object *p_object, NodePath p_property, Object *p_initial, NodePath p_initial_property, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); - - bool targeting_method(Object *p_object, StringName p_method, Object *p_initial, StringName p_initial_method, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); + bool follow_property(Object *p_object, NodePath p_property, Variant p_initial_val, Object *p_target, NodePath p_target_property, real_t p_duration, TransitionType p_trans_type = TRANS_LINEAR, EaseType p_ease_type = EASE_IN_OUT, real_t p_delay = 0); + bool follow_method(Object *p_object, StringName p_method, Variant p_initial_val, Object *p_target, StringName p_target_method, real_t p_duration, TransitionType p_trans_type = TRANS_LINEAR, EaseType p_ease_type = EASE_IN_OUT, real_t p_delay = 0); + bool targeting_property(Object *p_object, NodePath p_property, Object *p_initial, NodePath p_initial_property, Variant p_final_val, real_t p_duration, TransitionType p_trans_type = TRANS_LINEAR, EaseType p_ease_type = EASE_IN_OUT, real_t p_delay = 0); + bool targeting_method(Object *p_object, StringName p_method, Object *p_initial, StringName p_initial_method, Variant p_final_val, real_t p_duration, TransitionType p_trans_type = TRANS_LINEAR, EaseType p_ease_type = EASE_IN_OUT, real_t p_delay = 0); Tween(); ~Tween(); diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index ca4c255855..a68462f4d4 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -190,6 +190,13 @@ void Button::_notification(int p_what) { Point2 icon_ofs = !_icon.is_null() ? Point2(icon_region.size.width + get_constant("hseparation"), 0) : Point2(); int text_clip = size.width - style->get_minimum_size().width - icon_ofs.width; + if (_internal_margin[MARGIN_LEFT] > 0) { + text_clip -= _internal_margin[MARGIN_LEFT] + get_constant("hseparation"); + } + if (_internal_margin[MARGIN_RIGHT] > 0) { + text_clip -= _internal_margin[MARGIN_RIGHT] + get_constant("hseparation"); + } + Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - font->get_string_size(xl_text) - Point2(_internal_margin[MARGIN_RIGHT] - _internal_margin[MARGIN_LEFT], 0)) / 2.0; switch (align) { diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 08faaf7d45..5561bce714 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -191,16 +191,20 @@ void PopupMenu::_submenu_timeout() { void PopupMenu::_scroll(float p_factor, const Point2 &p_over) { - const float global_y = get_global_position().y; - int vseparation = get_constant("vseparation"); Ref<Font> font = get_font("font"); float dy = (vseparation + font->get_height()) * 3 * p_factor * get_global_transform().get_scale().y; - if (dy > 0 && global_y < 0) - dy = MIN(dy, -global_y - 1); - else if (dy < 0 && global_y + get_size().y * get_global_transform().get_scale().y > get_viewport_rect().size.y) - dy = -MIN(-dy, global_y + get_size().y * get_global_transform().get_scale().y - get_viewport_rect().size.y - 1); + if (dy > 0) { + const float global_top = get_global_position().y; + const float limit = global_top < 0 ? -global_top : 0; + dy = MIN(dy, limit); + } else if (dy < 0) { + const float global_bottom = get_global_position().y + get_size().y * get_global_transform().get_scale().y; + const float viewport_height = get_viewport_rect().size.y; + const float limit = global_bottom > viewport_height ? global_bottom - viewport_height : 0; + dy = -MIN(-dy, limit); + } set_position(get_position() + Vector2(0, dy)); Ref<InputEventMouseMotion> ie; diff --git a/scene/gui/rich_text_effect.cpp b/scene/gui/rich_text_effect.cpp index f9e0be5b31..ab2f8d2172 100644 --- a/scene/gui/rich_text_effect.cpp +++ b/scene/gui/rich_text_effect.cpp @@ -89,8 +89,6 @@ void CharFXTransform::_bind_methods() { ClassDB::bind_method(D_METHOD("get_character"), &CharFXTransform::get_character); ClassDB::bind_method(D_METHOD("set_character", "character"), &CharFXTransform::set_character); - ClassDB::bind_method(D_METHOD("get_value_or", "key", "default_value"), &CharFXTransform::get_value_or); - ADD_PROPERTY(PropertyInfo(Variant::INT, "relative_index"), "set_relative_index", "get_relative_index"); ADD_PROPERTY(PropertyInfo(Variant::INT, "absolute_index"), "set_absolute_index", "get_absolute_index"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "elapsed_time"), "set_elapsed_time", "get_elapsed_time"); @@ -101,17 +99,6 @@ void CharFXTransform::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "character"), "set_character", "get_character"); } -Variant CharFXTransform::get_value_or(String p_key, Variant p_default_value) { - if (!this->environment.has(p_key)) - return p_default_value; - - Variant r = environment[p_key]; - if (r.get_type() != p_default_value.get_type()) - return p_default_value; - - return r; -} - CharFXTransform::CharFXTransform() { relative_index = 0; absolute_index = 0; diff --git a/scene/gui/rich_text_effect.h b/scene/gui/rich_text_effect.h index 4330cebfe6..9e0065b199 100644 --- a/scene/gui/rich_text_effect.h +++ b/scene/gui/rich_text_effect.h @@ -82,8 +82,6 @@ public: void set_character(int p_char) { character = (CharType)p_char; } Dictionary get_environment() { return environment; } void set_environment(Dictionary p_environment) { environment = p_environment; } - - Variant get_value_or(String p_key, Variant p_default_value); }; #endif // RICH_TEXT_EFFECT_H diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 0331046492..abca865ae0 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -1701,6 +1701,9 @@ bool RichTextLabel::remove_line(const int p_line) { if (!was_newline) { current_frame->lines.remove(p_line); + if (current_frame->lines.size() == 0) { + current_frame->lines.resize(1); + } } if (p_line == 0 && current->subitems.size() > 0) diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index 4afb07cb6f..0d94d4dbf4 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -483,6 +483,7 @@ void Mesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_lightmap_size_hint", "size"), &Mesh::set_lightmap_size_hint); ClassDB::bind_method(D_METHOD("get_lightmap_size_hint"), &Mesh::get_lightmap_size_hint); + ClassDB::bind_method(D_METHOD("get_aabb"), &Mesh::get_aabb); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "lightmap_size_hint"), "set_lightmap_size_hint", "get_lightmap_size_hint"); diff --git a/scene/resources/visual_shader_nodes.cpp b/scene/resources/visual_shader_nodes.cpp index a94fdd9d7b..6e4b5d9af0 100644 --- a/scene/resources/visual_shader_nodes.cpp +++ b/scene/resources/visual_shader_nodes.cpp @@ -715,6 +715,7 @@ void VisualShaderNodeTexture::_bind_methods() { BIND_ENUM_CONSTANT(SOURCE_2D_TEXTURE); BIND_ENUM_CONSTANT(SOURCE_2D_NORMAL); BIND_ENUM_CONSTANT(SOURCE_DEPTH); + BIND_ENUM_CONSTANT(SOURCE_PORT); BIND_ENUM_CONSTANT(TYPE_DATA); BIND_ENUM_CONSTANT(TYPE_COLOR); BIND_ENUM_CONSTANT(TYPE_NORMALMAP); diff --git a/servers/audio/effects/audio_effect_record.cpp b/servers/audio/effects/audio_effect_record.cpp index 83d78daff4..3b6b1de806 100644 --- a/servers/audio/effects/audio_effect_record.cpp +++ b/servers/audio/effects/audio_effect_record.cpp @@ -192,10 +192,11 @@ void AudioEffectRecord::set_recording_active(bool p_record) { } ensure_thread_stopped(); + recording_active = true; current_instance->init(); + } else { + recording_active = false; } - - recording_active = p_record; } bool AudioEffectRecord::is_recording_active() const { diff --git a/thirdparty/vhacd/0004-fix-uwp-arm-build.patch b/thirdparty/vhacd/0004-fix-uwp-arm-build.patch new file mode 100644 index 0000000000..a5bba3fd7d --- /dev/null +++ b/thirdparty/vhacd/0004-fix-uwp-arm-build.patch @@ -0,0 +1,16 @@ +diff --git a/thirdparty/vhacd/inc/btScalar.h b/thirdparty/vhacd/inc/btScalar.h +index 3999a71521..4c9e0cf7ab 100644 +--- a/thirdparty/vhacd/inc/btScalar.h ++++ b/thirdparty/vhacd/inc/btScalar.h +@@ -72,7 +72,10 @@ inline int32_t btGetVersion() + #define btFsel(a, b, c) __fsel((a), (b), (c)) + #else + +-#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) ++// -- GODOT start -- ++//#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) ++#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) ++// -- GODOT end -- + #define BT_USE_SSE + #include <emmintrin.h> + #endif diff --git a/thirdparty/vhacd/inc/btScalar.h b/thirdparty/vhacd/inc/btScalar.h index 3999a71521..4c9e0cf7ab 100644 --- a/thirdparty/vhacd/inc/btScalar.h +++ b/thirdparty/vhacd/inc/btScalar.h @@ -72,7 +72,10 @@ inline int32_t btGetVersion() #define btFsel(a, b, c) __fsel((a), (b), (c)) #else -#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) +// -- GODOT start -- +//#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) +#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) +// -- GODOT end -- #define BT_USE_SSE #include <emmintrin.h> #endif |
